diff options
author | Max Horn | 2005-05-10 23:48:48 +0000 |
---|---|---|
committer | Max Horn | 2005-05-10 23:48:48 +0000 |
commit | 1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch) | |
tree | f687ac73ffbfa29088a403b6311bb4db13265fde /sound/softsynth/ym2612.cpp | |
parent | 72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff) | |
download | scummvm-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/ym2612.cpp')
-rw-r--r-- | sound/softsynth/ym2612.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp index 8d37ee8ec6..e37b50170e 100644 --- a/sound/softsynth/ym2612.cpp +++ b/sound/softsynth/ym2612.cpp @@ -168,7 +168,7 @@ protected: void generateSamples(int16 *buf, int len); public: - MidiDriver_YM2612(SoundMixer *mixer); + MidiDriver_YM2612(Audio::Mixer *mixer); virtual ~MidiDriver_YM2612(); int open(); @@ -710,7 +710,7 @@ void MidiChannel_YM2612::rate(uint16 r) { // //////////////////////////////////////// -MidiDriver_YM2612::MidiDriver_YM2612(SoundMixer *mixer) +MidiDriver_YM2612::MidiDriver_YM2612(Audio::Mixer *mixer) : MidiDriver_Emulated(mixer) { _next_voice = 0; @@ -903,6 +903,6 @@ void MidiDriver_YM2612::createLookupTables() { // //////////////////////////////////////// -MidiDriver *MidiDriver_YM2612_create(SoundMixer *mixer) { +MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) { return new MidiDriver_YM2612(mixer); } |