[Scummvm-cvs-logs] CVS: scummvm/sound audiocd.h,1.11,1.12 flac.cpp,1.9,1.10 mixer.h,1.105,1.106 mp3.cpp,1.20,1.21 rate.cpp,1.38,1.39 rate.h,1.26,1.27 vorbis.cpp,1.24,1.25

[Max Horn]

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

Modified Files:
	audiocd.h flac.cpp mixer.h mp3.cpp rate.cpp rate.h vorbis.cpp 
Log Message:
Moved some more stuff to namespace Audio (enough for tonight)

Index: audiocd.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- audiocd.h	10 May 2005 23:48:45 -0000	1.11
+++ audiocd.h	11 May 2005 00:01:34 -0000	1.12
@@ -30,7 +30,7 @@
 class DigitalTrackInfo {
 public:
 	virtual bool error() = 0;
-	virtual void play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration) = 0;
+	virtual void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) = 0;
 	virtual ~DigitalTrackInfo() { }
 };
 
@@ -62,7 +62,7 @@
 private:
 	/* used for emulated CD music */
 	struct ExtStatus : Status {
-		SoundHandle handle;
+		Audio::SoundHandle handle;
 	};
 	ExtStatus _cd;
 

Index: flac.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/flac.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- flac.cpp	10 May 2005 23:48:45 -0000	1.9
+++ flac.cpp	11 May 2005 00:01:34 -0000	1.10
@@ -750,7 +750,7 @@
 	FlacTrackInfo(File *file);
 	~FlacTrackInfo();
 	bool error() { return _file == NULL; }
-	void play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration);
+	void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration);
 };
 
 FlacTrackInfo::FlacTrackInfo(File *file) : _file(NULL), _firstStream(NULL)
@@ -764,7 +764,7 @@
 		delete tempStream;
 }
 
-void FlacTrackInfo::play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration) {
+void FlacTrackInfo::play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) {
 	if (error()) {
 		debug(1, "FlacTrackInfo::play:  invalid state, method should not been called");
 	}

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- mixer.h	10 May 2005 23:48:46 -0000	1.105
+++ mixer.h	11 May 2005 00:01:35 -0000	1.106
@@ -29,12 +29,14 @@
 
 
 class AudioStream;
-namespace Audio {
-	class Channel;
-	class Mixer;
-}
 class OSystem;
 
+
+namespace Audio {
+
+class Channel;
+class Mixer;
+
 class SoundHandle {
 	friend class Audio::Channel;
 	friend class Audio::Mixer;
@@ -43,8 +45,6 @@
 	inline SoundHandle() : _val(0xFFFFFFFF) {}
 };
 
-namespace Audio {
-
 class Mixer {
 public:
 	enum {

Index: mp3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mp3.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mp3.cpp	10 May 2005 23:48:46 -0000	1.20
+++ mp3.cpp	11 May 2005 00:01:35 -0000	1.21
@@ -288,7 +288,7 @@
 	MP3TrackInfo(File *file);
 	~MP3TrackInfo();
 	bool error() { return _error_flag; }
-	void play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration);
+	void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration);
 };
 
 
@@ -363,7 +363,7 @@
 	delete file;
 }
 
-void MP3TrackInfo::play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration) {
+void MP3TrackInfo::play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) {
 	unsigned int offset;
 	mad_timer_t durationTime;
 

Index: rate.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/rate.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- rate.cpp	10 May 2005 23:48:46 -0000	1.38
+++ rate.cpp	11 May 2005 00:01:35 -0000	1.39
@@ -33,6 +33,8 @@
 #include "sound/mixer.h"
 #include "common/util.h"
 
+namespace Audio {
+
 /**
  * The precision of the fractional computations used by the rate converter.
  * Normally you should never have to modify this value.
@@ -277,3 +279,5 @@
 			return new CopyRateConverter<false, false>();
 	}
 }
+
+} // End of namespace Audio

Index: rate.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/rate.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- rate.h	10 Jan 2005 22:51:42 -0000	1.26
+++ rate.h	11 May 2005 00:01:35 -0000	1.27
@@ -25,9 +25,11 @@
 #include "common/scummsys.h"
 #include "base/engine.h"
 
-//#include "sound/audiostream.h"
 class AudioStream;
 
+
+namespace Audio {
+
 typedef int16 st_sample_t;
 typedef uint16 st_volume_t;
 typedef uint32 st_size_t;
@@ -76,4 +78,6 @@
 
 RateConverter *makeRateConverter(st_rate_t inrate, st_rate_t outrate, bool stereo, bool reverseStereo = false);
 
+} // End of namespace Audio
+
 #endif

Index: vorbis.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- vorbis.cpp	10 May 2005 23:48:46 -0000	1.24
+++ vorbis.cpp	11 May 2005 00:01:36 -0000	1.25
@@ -52,7 +52,7 @@
 	~VorbisTrackInfo();
 	bool openTrack();
 	bool error() { return _error_flag; }
-	void play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration);
+	void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration);
 };
 
 
@@ -168,7 +168,7 @@
 #define VORBIS_TREMOR
 #endif
 
-void VorbisTrackInfo::play(Audio::Mixer *mixer, SoundHandle *handle, int startFrame, int duration) {
+void VorbisTrackInfo::play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration) {
 
 	bool err = openTrack();
 	assert(!err);