i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The mixer gain controls must change the physical input channels, not the virtual mixer internal channels.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3781 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2003-07-01 01:53:42 +00:00
parent b326a30e21
commit 57b75f140b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
+10 -10
View File
@@ -897,11 +897,11 @@ AudioMixer::GetParameterValue(int32 id, bigtime_t *last_change,
} }
if (PARAM_IS_GAIN(id)) { if (PARAM_IS_GAIN(id)) {
// input gain control // input gain control
if (*ioSize < input->GetMixerChannelCount() * sizeof(float)) if (*ioSize < input->GetInputChannelCount() * sizeof(float))
goto err; goto err;
*ioSize = input->GetMixerChannelCount() * sizeof(float); *ioSize = input->GetInputChannelCount() * sizeof(float);
for (int chan = 0; chan < input->GetMixerChannelCount(); chan++) for (int chan = 0; chan < input->GetInputChannelCount(); chan++)
static_cast<float *>(value)[chan] = DB_TO_GAIN(input->GetMixerChannelGain(chan)); static_cast<float *>(value)[chan] = DB_TO_GAIN(input->GetInputChannelGain(chan));
} }
} }
*last_change = TimeSource()->Now(); // XXX we could do better *last_change = TimeSource()->Now(); // XXX we could do better
@@ -951,10 +951,10 @@ AudioMixer::SetParameterValue(int32 id, bigtime_t when,
} }
if (PARAM_IS_GAIN(id)) { if (PARAM_IS_GAIN(id)) {
// input gain control // input gain control
if (size < input->GetMixerChannelCount() * sizeof(float)) if (size < input->GetInputChannelCount() * sizeof(float))
goto err; goto err;
for (int chan = 0; chan < input->GetMixerChannelCount(); chan++) for (int chan = 0; chan < input->GetInputChannelCount(); chan++)
input->SetMixerChannelGain(chan, GAIN_TO_DB(static_cast<const float *>(value)[chan])); input->SetInputChannelGain(chan, GAIN_TO_DB(static_cast<const float *>(value)[chan]));
} }
} }
BroadcastNewParameterValue(when, id, const_cast<void *>(value), size); BroadcastNewParameterValue(when, id, const_cast<void *>(value), size);
@@ -1005,7 +1005,7 @@ AudioMixer::UpdateParameterWeb()
group->MakeNullParameter(PARAM_FORMAT(in->ID()), B_MEDIA_RAW_AUDIO, StringForFormat(in), B_GENERIC); group->MakeNullParameter(PARAM_FORMAT(in->ID()), B_MEDIA_RAW_AUDIO, StringForFormat(in), B_GENERIC);
group->MakeDiscreteParameter(PARAM_MUTE(in->ID()), B_MEDIA_RAW_AUDIO, "Mute", B_MUTE); group->MakeDiscreteParameter(PARAM_MUTE(in->ID()), B_MEDIA_RAW_AUDIO, "Mute", B_MUTE);
group->MakeContinuousParameter(PARAM_GAIN(in->ID()), B_MEDIA_RAW_AUDIO, "Gain", B_GAIN, "dB", -60.0, 18.0, 0.5) group->MakeContinuousParameter(PARAM_GAIN(in->ID()), B_MEDIA_RAW_AUDIO, "Gain", B_GAIN, "dB", -60.0, 18.0, 0.5)
->SetChannelCount(in->GetMixerChannelCount()); ->SetChannelCount(in->GetInputChannelCount());
group->MakeNullParameter(PARAM_OUTPUT(in->ID()), B_MEDIA_RAW_AUDIO, "To Master", B_WEB_BUFFER_OUTPUT); group->MakeNullParameter(PARAM_OUTPUT(in->ID()), B_MEDIA_RAW_AUDIO, "To Master", B_WEB_BUFFER_OUTPUT);
} }
@@ -1024,9 +1024,9 @@ AudioMixer::UpdateParameterWeb()
group = inputchannels->MakeGroup(""); group = inputchannels->MakeGroup("");
group->MakeNullParameter(10003, B_MEDIA_RAW_AUDIO, "Input Channel Sources 1", B_WEB_BUFFER_OUTPUT); group->MakeNullParameter(10003, B_MEDIA_RAW_AUDIO, "Input Channel Sources 1", B_WEB_BUFFER_OUTPUT);
SetParameterWeb(web);
fCore->Unlock(); fCore->Unlock();
SetParameterWeb(web);
} }
#if USE_MEDIA_FORMAT_WORKAROUND #if USE_MEDIA_FORMAT_WORKAROUND
src/add-ons/media/media-add-ons/mixer/MixerOutput.cpp
+1 -1
View File
@@ -319,4 +319,4 @@ void
MixerOutput::SetMuted(bool yesno) MixerOutput::SetMuted(bool yesno)
{ {
fMuted = yesno; fMuted = yesno;
} }