diff options
| author | skidau <skidau@gmail.com> | 2012-04-23 22:40:58 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2012-04-23 22:40:58 +1000 |
| commit | 8878ae5fc379dce0f47ee46c380b9f2fcbbd78b7 (patch) | |
| tree | 82f6617a8aac17c3c879f4f133004ab78a31acff /Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | |
| parent | 8ff395406932b10f96bfee08db80268afde16907 (diff) | |
| parent | f0e1b4c1dddf6ffe5f3eb79c364bc5ed07f0b55e (diff) | |
Merge branch 'AudioStreaming'
* AudioStreaming:
Reset the stream playing flag on init.
force VolumeDirectory to align files to 32KB (only streaming audio files really need to be aligned...)
Removed the DTK Music option. It is now always enabled.
Added the response for audio streaming disc offset requests. Generate an AI interrupt at the end of the audio streaming loop. Fixes Pac-man Fever and the background music in Eternal Darkness.
Fixed the erroneous looping in audio streaming games like Eternal Darkness and Zoids: Battle Legends. Thanks for the tip, tueidj.
Diffstat (limited to 'Source/Core/AudioCommon/Src/AudioCommonConfig.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index 533c6b4313..08902e1c3f 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -31,7 +31,6 @@ void AudioCommonConfig::Load() IniFile file; file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); - file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true); file.Get("Config", "EnableJIT", &m_EnableJIT, true); file.Get("Config", "DumpAudio", &m_DumpAudio, false); #if defined __linux__ && HAVE_ALSA @@ -53,7 +52,6 @@ void AudioCommonConfig::SaveSettings() IniFile file; file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); - file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic); file.Set("Config", "EnableJIT", m_EnableJIT); file.Set("Config", "DumpAudio", m_DumpAudio); file.Set("Config", "Backend", sBackend); @@ -67,7 +65,6 @@ void AudioCommonConfig::SaveSettings() void AudioCommonConfig::Update() { if (soundStream) { soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); - soundStream->GetMixer()->SetDTKMusic(m_EnableDTKMusic); soundStream->SetVolume(m_Volume); } } |