aboutsummaryrefslogtreecommitdiff
path: root/sound/softsynth/emumidi.h
diff options
context:
space:
mode:
authorMax Horn2005-05-10 23:48:48 +0000
committerMax Horn2005-05-10 23:48:48 +0000
commit1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch)
treef687ac73ffbfa29088a403b6311bb4db13265fde /sound/softsynth/emumidi.h
parent72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff)
downloadscummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.gz
scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.bz2
scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.zip
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
Diffstat (limited to 'sound/softsynth/emumidi.h')
-rw-r--r--sound/softsynth/emumidi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/softsynth/emumidi.h b/sound/softsynth/emumidi.h
index 19e2e86476..9fd0113a7f 100644
--- a/sound/softsynth/emumidi.h
+++ b/sound/softsynth/emumidi.h
@@ -28,7 +28,7 @@
class MidiDriver_Emulated : public AudioStream, public MidiDriver {
protected:
bool _isOpen;
- SoundMixer *_mixer;
+ Audio::Mixer *_mixer;
private:
Common::Timer::TimerProc _timerProc;
@@ -44,7 +44,7 @@ protected:
int _baseFreq;
public:
- MidiDriver_Emulated(SoundMixer *mixer) : _mixer(mixer) {
+ MidiDriver_Emulated(Audio::Mixer *mixer) : _mixer(mixer) {
_isOpen = false;
_timerProc = 0;