aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.h
diff options
context:
space:
mode:
authorMax Horn2003-11-29 12:11:01 +0000
committerMax Horn2003-11-29 12:11:01 +0000
commitf00cd05b331cb5db1dfee140608d6189385950a4 (patch)
treedb1e0105eb9ef2cd266620357c551c5a058f4d37 /scumm/sound.h
parent493d64d91b9944cd91da6539cb41ee561ddafd92 (diff)
downloadscummvm-rg350-f00cd05b331cb5db1dfee140608d6189385950a4.tar.gz
scummvm-rg350-f00cd05b331cb5db1dfee140608d6189385950a4.tar.bz2
scummvm-rg350-f00cd05b331cb5db1dfee140608d6189385950a4.zip
moved Audio CD (emulation) code from scumm/sound.cpp to sound/, so that it may be reused by other engines in the future
svn-id: r11421
Diffstat (limited to 'scumm/sound.h')
-rw-r--r--scumm/sound.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/scumm/sound.h b/scumm/sound.h
index 28e9d135a6..e1b6c7c64d 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -29,7 +29,6 @@ class File;
namespace Scumm {
class Bundle;
-class DigitalTrackInfo;
class ScummEngine;
struct MP3OffsetTable;
@@ -74,27 +73,8 @@ protected:
int num_sound_effects; // SO3 MP3 compressed audio
bool _vorbis_mode; // true if using SOG, false if using SO3
- enum {
- CACHE_TRACKS = 10
- };
-
- /* used for mp3 CD music */
-
int _currentCDSound;
- int _cached_tracks[CACHE_TRACKS];
- struct {
- PlayingSoundHandle handle;
- int track;
- int start;
- int duration;
- int numLoops;
- bool playing;
- } _dig_cd;
-
- DigitalTrackInfo *_track_info[CACHE_TRACKS];
- int _current_cache;
-
ScummEngine *_scumm;
public:
@@ -147,9 +127,6 @@ protected:
void startSfxSound(File *file, int file_size, PlayingSoundHandle *handle);
bool isSfxFinished() const;
void playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned, PlayingSoundHandle *handle);
- void playSfxSound_Vorbis(File *file, uint32 size, PlayingSoundHandle *handle);
-
- int getCachedTrack(int track);
};
} // End of namespace Scumm