small reorg (keep private classes out of header files, if possible -> decreases compile times a bit); fixed a small memory leak for Simon2mac; don't delete _file twice in Sound subclasses

svn-id: r8506

1 files changed, 2 insertions, 35 deletions

diff --git a/simon/sound.h b/simon/sound.h
index 40bce72735..e17a331c14 100644
--- a/simon/sound.h
+++ b/simon/sound.h
@@ -20,43 +20,10 @@
 #include "sound/mixer.h"
 #include "simon/intern.h"
 
+class Sound;
+
 class SimonSound {
 private:
-	class Sound {
-	protected:
-		File *_file;
-		uint32 *_offsets;
-		SoundMixer *_mixer;
-
-	public:
-		Sound(SoundMixer *mixer, File *file, uint32 base = 0);
-		Sound(SoundMixer *mixer, File *file, uint32 *offsets);
-		virtual ~Sound();
-		virtual int playSound(uint sound, PlayingSoundHandle *handle, byte flags = 0) = 0;
-	};
-
-	class WavSound : public Sound {
-	public:
-		WavSound(SoundMixer *mixer, File *file, uint32 base = 0) : Sound(mixer, file, base) {};
-		WavSound(SoundMixer *mixer, File *file, uint32 *offsets) : Sound(mixer, file, offsets) {};
-		~WavSound();
-		int playSound(uint sound, PlayingSoundHandle *handle, byte flags = 0);
-	};
-
-	class VocSound : public Sound {
-	public:
-		VocSound(SoundMixer *mixer, File *file, uint32 base = 0) : Sound(mixer, file, base) {};
-		~VocSound();
-		int playSound(uint sound, PlayingSoundHandle *handle, byte flags = 0);
-	};
-
-	class MP3Sound : public Sound {
-	public:
-		MP3Sound(SoundMixer *mixer, File *file, uint32 base = 0) : Sound(mixer, file, base) {};
-		~MP3Sound();
-		int playSound(uint sound, PlayingSoundHandle *handle, byte flags = 0);
-	};
-
 	byte _game;
 	const char *_gameDataPath;