aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.h
diff options
context:
space:
mode:
authorTravis Howell2002-09-21 13:48:03 +0000
committerTravis Howell2002-09-21 13:48:03 +0000
commitf1a273e09240d6a439cccbe5dffa99a54cc43229 (patch)
tree010a738669c4ec193a0c0ef36913499c6f930eb7 /scumm/sound.h
parenta2a3fb5636b3d12301490db715c5732f5e211915 (diff)
downloadscummvm-rg350-f1a273e09240d6a439cccbe5dffa99a54cc43229.tar.gz
scummvm-rg350-f1a273e09240d6a439cccbe5dffa99a54cc43229.tar.bz2
scummvm-rg350-f1a273e09240d6a439cccbe5dffa99a54cc43229.zip
Add the following patches:
[ 609649 ] Sound patch for GF_OLD256 games [ 611997 ] RFC: Timer-based CD audio sync svn-id: r4986
Diffstat (limited to 'scumm/sound.h')
-rw-r--r--scumm/sound.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/scumm/sound.h b/scumm/sound.h
index 773fc51787..a0c6af1725 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -23,6 +23,7 @@
#include "scummsys.h"
#include "sound/mixer.h"
+#include "common/timer.h"
class Scumm;
class File;
@@ -88,6 +89,7 @@ public:
#endif
+ int _cd_timer_value;
bool _soundsPaused;
int16 _sound_volume_master, _sound_volume_music, _sound_volume_sfx;
byte _sfxMode;
@@ -124,6 +126,10 @@ public:
int playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned);
int playSfxSound_MP3(void *sound, uint32 size);
+ int readCDTimer();
+ void startCDTimer();
+ void stopCDTimer();
+
void playCDTrack(int track, int num_loops, int start, int delay);
void stopCD();
int pollCD();