diff options
author | Max Horn | 2010-11-08 22:53:36 +0000 |
---|---|---|
committer | Max Horn | 2010-11-08 22:53:36 +0000 |
commit | 82e473bc3b1498325bad28d804e4314f0c3a528c (patch) | |
tree | f186d8b9eeb665a81897deca3a3fadcf74007c16 /sound/softsynth/fmtowns_pc98 | |
parent | 4242229c91c356bdd90c66ce8c0642488a1b4bf5 (diff) | |
parent | 74a53df11b51fa4956745c086b2e6351b8383568 (diff) | |
download | scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.gz scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.bz2 scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.zip |
BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).
The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.
svn-id: r54147
Diffstat (limited to 'sound/softsynth/fmtowns_pc98')
-rw-r--r-- | sound/softsynth/fmtowns_pc98/towns_audio.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.cpp b/sound/softsynth/fmtowns_pc98/towns_audio.cpp index d745afbc17..a9e67c5266 100644 --- a/sound/softsynth/fmtowns_pc98/towns_audio.cpp +++ b/sound/softsynth/fmtowns_pc98/towns_audio.cpp @@ -24,7 +24,6 @@ */ #include "sound/softsynth/fmtowns_pc98/towns_audio.h" -#include "sound/audiocd.h" #include "common/endian.h" @@ -1405,8 +1404,8 @@ void TownsAudioInterface::updateOutputVolume() { int volume = (int)(((float)(maxVol * 255) / 63.0f)); int balance = maxVol ? (int)( ( ((int)_outputLevel[13] - _outputLevel[12]) * 127) / (float)maxVol) : 0; - AudioCD.setVolume(volume); - AudioCD.setBalance(balance); + g_system->getAudioCDManager()->setVolume(volume); + g_system->getAudioCDManager()->setBalance(balance); } const uint8 TownsAudioInterface::_chanFlags[] = { |