Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)

svn-id: r18039

2 files changed, 6 insertions, 4 deletions

diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp
index 6db9b83359..57f507ff46 100644
--- a/sky/music/adlibmusic.cpp
+++ b/sky/music/adlibmusic.cpp
@@ -26,7 +26,7 @@
 
 namespace Sky {
 
-AdlibMusic::AdlibMusic(SoundMixer *pMixer, Disk *pDisk)
+AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk)
 	: MusicBase(pDisk) {
 	
 	_driverFileBase = 60202;
diff --git a/sky/music/adlibmusic.h b/sky/music/adlibmusic.h
index b4be9b8cde..d24fe7256e 100644
--- a/sky/music/adlibmusic.h
+++ b/sky/music/adlibmusic.h
@@ -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 @@ public:
 
 private:
 	FM_OPL *_opl;
-	SoundMixer *_mixer;
+	Audio::Mixer *_mixer;
 	uint8 *_initSequence;
 	uint32 _sampleRate, _nextMusicPoll;
 	virtual void setupPointers(void);