From 7ee36a97ee8c43b28c5dd4d8a0d3211698d1dc7f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 31 Dec 2015 14:41:18 +0100
Subject: TONY: As codec is always ADPCM, remove some dead code

---
 engines/tony/sound.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/tony/sound.h')

diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index 446dc68d80..50ef78ae0d 100644
--- a/engines/tony/sound.h
+++ b/engines/tony/sound.h
@@ -179,7 +179,7 @@ public:
 	 * @returns             True is everything is OK, False otherwise
 	 */
 
-	bool loadFile(const char *fileName, uint32 codec = FPCODEC_RAW);
+	bool loadFile(const char *fileName);
 	bool loadWave(Common::SeekableReadStream *stream);
 	bool loadVoiceFromVDB(Common::File &vdbFP);
 
-- 
cgit v1.2.3


From 88c19138cf18a40e478447c4600d92d63ff0ed50 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 31 Dec 2015 14:48:38 +0100
Subject: TONY: Remove more dead code related to unused raw codec

---
 engines/tony/sound.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/tony/sound.h')

diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index 50ef78ae0d..6aa4ae9496 100644
--- a/engines/tony/sound.h
+++ b/engines/tony/sound.h
@@ -297,12 +297,11 @@ public:
 	 * Opens a file stream
 	 *
 	 * @param fileName      Filename to be opened
-	 * @param codec         CODEC to be used to uncompress samples
 	 *
 	 * @returns             True is everything is OK, False otherwise
 	 */
 
-	bool loadFile(const Common::String &fileName, uint32 codec = FPCODEC_RAW, int sync = 2000);
+	bool loadFile(const Common::String &fileName, int sync);
 
 	/**
 	 * Closes a file stream (opened or not).
-- 
cgit v1.2.3


From 92f3a9f4824c89e4f300d561f1d48ac6f02e0b00 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 1 Jan 2016 04:24:17 +0100
Subject: TONY: Remove an unused variable

---
 engines/tony/sound.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/tony/sound.h')

diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index 6aa4ae9496..2ea1162d98 100644
--- a/engines/tony/sound.h
+++ b/engines/tony/sound.h
@@ -246,7 +246,6 @@ class FPStream {
 private:
 	uint32 _bufferSize;                  // Buffer size (bytes)
 	uint32 _size;                        // Stream size (bytes)
-	uint32 _codec;                       // CODEC used
 
 	Common::File _file;                  // File handle used for the stream
 
-- 
cgit v1.2.3


From 35f08ca0fbcead4f18b65baba35f83c3e9f2a914 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 3 Jan 2016 00:16:52 +0100
Subject: TONY: Add support for compressed music and sfx

---
 engines/tony/sound.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'engines/tony/sound.h')

diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index 2ea1162d98..206935f314 100644
--- a/engines/tony/sound.h
+++ b/engines/tony/sound.h
@@ -45,8 +45,11 @@ class FPStream;
 class FPSfx;
 
 enum SoundCodecs {
-	FPCODEC_RAW,
-	FPCODEC_ADPCM
+	FPCODEC_UNKNOWN,
+	FPCODEC_ADPCM,
+	FPCODEC_MP3,
+	FPCODEC_OGG,
+	FPCODEC_FLAC
 };
 
 /**
-- 
cgit v1.2.3