[Scummvm-cvs-logs] CVS: scummvm/sound/softsynth adlib.cpp,1.3,1.4 emumidi.h,1.3,1.4 fluidsynth.cpp,1.1,1.2 mt32.cpp,1.11,1.12 ym2612.cpp,1.3,1.4

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound/softsynth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29875/sound/softsynth

Modified Files:
	adlib.cpp emumidi.h fluidsynth.cpp mt32.cpp ym2612.cpp 
Log Message:
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)

Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/adlib.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- adlib.cpp	3 Jan 2005 11:33:12 -0000	1.3
+++ adlib.cpp	10 May 2005 23:48:46 -0000	1.4
@@ -543,7 +543,7 @@
 	friend class AdlibPercussionChannel;
 
 public:
-	MidiDriver_ADLIB(SoundMixer *mixer);
+	MidiDriver_ADLIB(Audio::Mixer *mixer);
 
 	int open();
 	void close();
@@ -798,7 +798,7 @@
 
 // MidiDriver method implementations
 
-MidiDriver_ADLIB::MidiDriver_ADLIB(SoundMixer *mixer) 
+MidiDriver_ADLIB::MidiDriver_ADLIB(Audio::Mixer *mixer) 
 	: MidiDriver_Emulated(mixer) {
 	uint i;
 
@@ -962,7 +962,7 @@
 	return NULL;
 }
 
-MidiDriver *MidiDriver_ADLIB_create(SoundMixer *mixer) {
+MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
 	return new MidiDriver_ADLIB(mixer);
 }
 

Index: emumidi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/emumidi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- emumidi.h	10 May 2005 23:17:37 -0000	1.3
+++ emumidi.h	10 May 2005 23:48:46 -0000	1.4
@@ -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 @@
 	int _baseFreq;
 
 public:
-	MidiDriver_Emulated(SoundMixer *mixer) : _mixer(mixer) {
+	MidiDriver_Emulated(Audio::Mixer *mixer) : _mixer(mixer) {
 		_isOpen = false;
 	
 		_timerProc = 0;

Index: fluidsynth.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/fluidsynth.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fluidsynth.cpp	10 Apr 2005 14:35:11 -0000	1.1
+++ fluidsynth.cpp	10 May 2005 23:48:46 -0000	1.2
@@ -49,7 +49,7 @@
 	void generateSamples(int16 *buf, int len);
 
 public:
-	MidiDriver_FluidSynth(SoundMixer *mixer);
+	MidiDriver_FluidSynth(Mixer *mixer);
 
 	int open();
 	void close();
@@ -65,7 +65,7 @@
 
 // MidiDriver method implementations
 
-MidiDriver_FluidSynth::MidiDriver_FluidSynth(SoundMixer *mixer)
+MidiDriver_FluidSynth::MidiDriver_FluidSynth(Mixer *mixer)
 	: MidiDriver_Emulated(mixer) {
 
 	for (int i = 0; i < ARRAYSIZE(_midiChannels); i++) {
@@ -138,7 +138,7 @@
 	MidiDriver_Emulated::open();
 
 	// The MT-32 emulator uses kSFXSoundType here. I don't know why.
-	_mixer->playInputStream(SoundMixer::kMusicSoundType, &_handle, this, -1, 255, 0, false, true);
+	_mixer->playInputStream(Mixer::kMusicSoundType, &_handle, this, -1, 255, 0, false, true);
 	return 0;
 }
 
@@ -206,7 +206,7 @@
 	return &_midiChannels[9];
 }
 
-MidiDriver *MidiDriver_FluidSynth_create(SoundMixer *mixer) {
+MidiDriver *MidiDriver_FluidSynth_create(Mixer *mixer) {
 	return new MidiDriver_FluidSynth(mixer);
 }
 

Index: mt32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/mt32.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mt32.cpp	10 May 2005 22:56:20 -0000	1.11
+++ mt32.cpp	10 May 2005 23:48:46 -0000	1.12
@@ -56,7 +56,7 @@
 public:
 	bool _initialising;
 
-	MidiDriver_MT32(SoundMixer *mixer);
+	MidiDriver_MT32(Audio::Mixer *mixer);
 	virtual ~MidiDriver_MT32();
 
 	int open();
@@ -208,7 +208,7 @@
 //
 ////////////////////////////////////////
 
-MidiDriver_MT32::MidiDriver_MT32(SoundMixer *mixer) : MidiDriver_Emulated(mixer) {
+MidiDriver_MT32::MidiDriver_MT32(Audio::Mixer *mixer) : MidiDriver_Emulated(mixer) {
 	_channelMask = 0xFFFF; // Permit all 16 channels by default
 	uint i;
 	for (i = 0; i < ARRAYSIZE(_midiChannels); ++i) {
@@ -221,7 +221,7 @@
 	_baseFreq = 10000;
 	// Unfortunately bugs in the emulator cause inaccurate tuning
 	// at rates other than 32KHz, thus we produce data at 32KHz and
-	// rely on SoundMixer to convert.
+	// rely on Mixer to convert.
 	_outputRate = 32000; //_mixer->getOutputRate();
 	_initialising = false;
 }
@@ -267,7 +267,7 @@
 	_initialising = false;
 	g_system->clearScreen();
 	g_system->updateScreen();
-	_mixer->playInputStream(SoundMixer::kSFXSoundType, &_handle, this, -1, 255, 0, false, true);
+	_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_handle, this, -1, 255, 0, false, true);
 	return 0;
 }
 
@@ -388,7 +388,7 @@
 	void sysEx(byte *msg, uint16 length);
 
 public:
-	MidiDriver_ThreadedMT32(SoundMixer *mixer);
+	MidiDriver_ThreadedMT32(Audio::Mixer *mixer);
 
 	void onTimer();
 	void close();
@@ -396,7 +396,7 @@
 };
 
 
-MidiDriver_ThreadedMT32::MidiDriver_ThreadedMT32(SoundMixer *mixer) : MidiDriver_MT32(mixer) {
+MidiDriver_ThreadedMT32::MidiDriver_ThreadedMT32(Audio::Mixer *mixer) : MidiDriver_MT32(mixer) {
 	_events = NULL;
 	_timer_proc = NULL;
 }
@@ -468,7 +468,7 @@
 //
 ////////////////////////////////////////
 
-MidiDriver *MidiDriver_MT32_create(SoundMixer *mixer) {
+MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
 	// HACK: It will stay here until engine plugin loader overhaul
 	if (ConfMan.hasKey("extrapath"))                                        
 		Common::File::addDefaultDirectory(ConfMan.get("extrapath"));

Index: ym2612.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/ym2612.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ym2612.cpp	10 Jan 2005 22:51:42 -0000	1.3
+++ ym2612.cpp	10 May 2005 23:48:46 -0000	1.4
@@ -168,7 +168,7 @@
 	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 @@
 //
 ////////////////////////////////////////
 
-MidiDriver_YM2612::MidiDriver_YM2612(SoundMixer *mixer)
+MidiDriver_YM2612::MidiDriver_YM2612(Audio::Mixer *mixer)
 	: MidiDriver_Emulated(mixer) {
 	_next_voice = 0;
 
@@ -903,6 +903,6 @@
 //
 ////////////////////////////////////////
 
-MidiDriver *MidiDriver_YM2612_create(SoundMixer *mixer) {
+MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) {
 	return new MidiDriver_YM2612(mixer);
 }