Audio: adjust UI
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2765 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
13ddd0648b
commit
c4f7c95fec
|
@ -77,6 +77,8 @@ std::vector<std::string> GetSoundBackends() {
|
||||||
backends.push_back("DSound");
|
backends.push_back("DSound");
|
||||||
if (AOSound::isValid())
|
if (AOSound::isValid())
|
||||||
backends.push_back("AOSound");
|
backends.push_back("AOSound");
|
||||||
|
if (OpenALStream::isValid())
|
||||||
|
backends.push_back("OpenAL");
|
||||||
backends.push_back("NullSound");
|
backends.push_back("NullSound");
|
||||||
|
|
||||||
return backends;
|
return backends;
|
||||||
|
|
|
@ -41,6 +41,7 @@ void CConfig::Load()
|
||||||
#else
|
#else
|
||||||
file.Get("Config", "Backend", &sBackend, "AOSound");
|
file.Get("Config", "Backend", &sBackend, "AOSound");
|
||||||
#endif
|
#endif
|
||||||
|
file.Get("Config", "Backend", &sBackend, "OpenAL");
|
||||||
}
|
}
|
||||||
|
|
||||||
void CConfig::Save()
|
void CConfig::Save()
|
||||||
|
|
|
@ -331,7 +331,8 @@ void DSP_SendAIBuffer(unsigned int address, int sample_rate)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (soundStream->GetMixer())
|
CMixer* pMixer = soundStream->GetMixer();
|
||||||
|
if (pMixer)
|
||||||
{
|
{
|
||||||
short samples[16] = {0}; // interleaved stereo
|
short samples[16] = {0}; // interleaved stereo
|
||||||
if (address)
|
if (address)
|
||||||
|
@ -345,7 +346,7 @@ void DSP_SendAIBuffer(unsigned int address, int sample_rate)
|
||||||
//if (log_ai)
|
//if (log_ai)
|
||||||
// g_wave_writer.AddStereoSamples(samples, 8);
|
// g_wave_writer.AddStereoSamples(samples, 8);
|
||||||
}
|
}
|
||||||
soundStream->GetMixer()->PushSamples(samples, 32 / 4);
|
pMixer->PushSamples(samples, 32 / 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
// SoundStream is updated only when necessary (there is no 70 ms limit
|
// SoundStream is updated only when necessary (there is no 70 ms limit
|
||||||
|
|
Loading…
Reference in New Issue