[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibmusic.cpp,1.24,1.25 adlibmusic.h,1.13,1.14

[Max Horn]

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

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

Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- adlibmusic.cpp	28 Jan 2005 22:05:47 -0000	1.24
+++ adlibmusic.cpp	10 May 2005 23:48:45 -0000	1.25
@@ -26,7 +26,7 @@
 
 namespace Sky {
 
-AdlibMusic::AdlibMusic(SoundMixer *pMixer, Disk *pDisk)
+AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk)
 	: MusicBase(pDisk) {
 	
 	_driverFileBase = 60202;

Index: adlibmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- adlibmusic.h	28 Jan 2005 22:05:48 -0000	1.13
+++ adlibmusic.h	10 May 2005 23:48:45 -0000	1.14
@@ -26,13 +26,15 @@
 #include "sound/audiostream.h"
 #include "sound/fmopl.h"
 
-class SoundMixer;
+namespace Audio {
+	class Mixer;
+}
 
 namespace Sky {
 
 class AdlibMusic : public AudioStream, public MusicBase {
 public:
-	AdlibMusic(SoundMixer *pMixer, Disk *pDisk);
+	AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk);
 	~AdlibMusic(void);
 	virtual void setVolume(uint8 volume);
 
@@ -47,7 +49,7 @@
 
 private:
 	FM_OPL *_opl;
-	SoundMixer *_mixer;
+	Audio::Mixer *_mixer;
 	uint8 *_initSequence;
 	uint32 _sampleRate, _nextMusicPoll;
 	virtual void setupPointers(void);