aboutsummaryrefslogtreecommitdiff
path: root/engines/tony/sound.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/tony/sound.h')
-rw-r--r--engines/tony/sound.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index 446dc68d80..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
};
/**
@@ -179,7 +182,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);
@@ -246,7 +249,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
@@ -297,12 +299,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).