diff options
| author | Paweł Kołodziejski | 2002-12-28 15:02:23 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-12-28 15:02:23 +0000 |
| commit | b90ef60f2aec3e33d1212d6700a91bd5adb538bf (patch) | |
| tree | b4802d39fbc25ecea24d17430abe7efff963737f /scumm/bundle.h | |
| parent | ab4b33f51c84842eed698ac12647c41564ed4b0d (diff) | |
| download | scummvm-rg350-b90ef60f2aec3e33d1212d6700a91bd5adb538bf.tar.gz scummvm-rg350-b90ef60f2aec3e33d1212d6700a91bd5adb538bf.tar.bz2 scummvm-rg350-b90ef60f2aec3e33d1212d6700a91bd5adb538bf.zip | |
added CMI sound codec
svn-id: r6232
Diffstat (limited to 'scumm/bundle.h')
| -rw-r--r-- | scumm/bundle.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/scumm/bundle.h b/scumm/bundle.h index 4b5e2c160a..84b3c6f797 100644 --- a/scumm/bundle.h +++ b/scumm/bundle.h @@ -41,7 +41,7 @@ struct BundleAudioTable { }; int32 compDecode(byte *src, byte *dst); - int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 size); + int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 size, int32 index, int32 & channels); CompTable _compVoiceTable[50]; CompTable _compMusicTable[2500]; File _voiceFile; @@ -52,18 +52,23 @@ struct BundleAudioTable { int32 _numMusicFiles; int32 _lastSong; + bool _initializedImcTables; + byte _destImcTable[93]; + uint32 _destImcTable2[5697]; + public: Bundle(); ~Bundle(); + void initializeImcTables(); bool openVoiceFile(const char *filename, const char *directory); bool openMusicFile(const char *filename, const char *directory); - int32 decompressVoiceSampleByName(char *name, byte *comp_final, bool use_extended=false); - int32 decompressVoiceSampleByIndex(int32 index, byte *comp_final); - int32 decompressMusicSampleByName(char *name, int32 number, byte *comp_final, bool fuzzy=false); - int32 decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final); + int32 decompressVoiceSampleByName(char *name, byte *comp_final, int32 & channels); + int32 decompressVoiceSampleByIndex(int32 index, byte *comp_final, int32 & channels); + int32 decompressMusicSampleByName(char *name, int32 number, byte *comp_final, int32 & channels); + int32 decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final, int32 & channels); int32 getNumberOfMusicSamplesByIndex(int32 index); - int32 getNumberOfMusicSamplesByName(char *name, bool fuzzy=false); + int32 getNumberOfMusicSamplesByName(char *name); }; #endif |