[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.148,1.149 sound.h,1.36,1.37
Max Horn
fingolfin at users.sourceforge.net
Mon Jun 30 15:26:04 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.132,1.133 boxes.cpp,1.41,1.42
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.127,1.128 sound.cpp,1.149,1.150 sound.h,1.37,1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24708
Modified Files:
sound.cpp sound.h
Log Message:
Fixes as per bug #762593 (Zak256 Audio CD handling); some cleanup (e.g. renamed start/delay -> startFrame/endFrame)
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- sound.cpp 30 Jun 2003 20:50:52 -0000 1.148
+++ sound.cpp 30 Jun 2003 22:25:08 -0000 1.149
@@ -46,7 +46,7 @@
class DigitalTrackInfo {
public:
virtual bool error() = 0;
- virtual int play(SoundMixer *mixer, int start, int delay) = 0;
+ virtual int play(SoundMixer *mixer, int startFrame, int endFrame) = 0;
virtual ~DigitalTrackInfo() { }
};
@@ -62,7 +62,7 @@
MP3TrackInfo(File *file);
~MP3TrackInfo();
bool error() { return _error_flag; }
- int play(SoundMixer *mixer, int start, int delay);
+ int play(SoundMixer *mixer, int startFrame, int endFrame);
};
#endif
@@ -77,7 +77,7 @@
VorbisTrackInfo(File *file);
~VorbisTrackInfo();
bool error() { return _error_flag; }
- int play(SoundMixer *mixer, int start, int delay);
+ int play(SoundMixer *mixer, int startFrame, int endFrame);
};
#endif
@@ -193,10 +193,12 @@
return;
}
else if (READ_UINT32(ptr) == MKID('SOUN')) {
- ptr += 8;
+ ptr += 24;
+ int track = ptr[0];
+ int loops = ptr[1];
+ int start = (ptr[2] * 60 + ptr[3]) * 75 + ptr[4];
_scumm->VAR(_scumm->VAR_MUSIC_TIMER) = 0;
- playCDTrack(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
- (ptr[18] * 60 + ptr[19]) * 75 + ptr[20], 0);
+ playCDTrack(track, loops == 0xff ? -1 : loops, start, 0);
_current_cd_sound = soundID;
return;
@@ -367,15 +369,21 @@
*/
#endif
rate = 11000;
-
- if (size == 30) {
- int track = *(ptr + 0x16);
+ int type = *(ptr + 0x0D);
+
+ // Check if it is a CD playback resource
+ if (type == 2) {
+ ptr += 0x16;
+ int track = ptr[0];
+ int loops = ptr[1];
+ int start = (ptr[2] * 60 + ptr[3]) * 75 + ptr[4];
+ int end = (ptr[5] * 60 + ptr[6]) * 75 + ptr[7];
if (soundID == _current_cd_sound)
if (pollCD() == 1)
return;
- playCDTrack(track, 1, 0, 0);
+ playCDTrack(track, loops == 0xff ? -1 : loops, start, end);
_current_cd_sound = soundID;
return;
}
@@ -1437,9 +1445,9 @@
_scumm->_timer->releaseProcedure(&cd_timer_handler);
}
-void Sound::playCDTrack(int track, int num_loops, int start, int delay) {
- if (playMP3CDTrack(track, num_loops, start, delay) == -1)
- _scumm->_system->play_cdrom(track, num_loops, start, delay);
+void Sound::playCDTrack(int track, int numLoops, int startFrame, int endFrame) {
+ if (playMP3CDTrack(track, numLoops, startFrame, endFrame) == -1)
+ _scumm->_system->play_cdrom(track, numLoops, startFrame, endFrame);
// Start the timer after starting the track. Starting an MP3 track is
// almost instantaneous, but a CD player may take some time. Hopefully
@@ -1527,14 +1535,14 @@
return -1;
}
-int Sound::playMP3CDTrack(int track, int num_loops, int start, int delay) {
+int Sound::playMP3CDTrack(int track, int numLoops, int startFrame, int endFrame) {
int index;
_scumm->VAR(_scumm->VAR_MUSIC_TIMER) = 0;
if (_soundsPaused)
return 0;
- if ((num_loops == 0) && (start == 0)) {
+ if ((numLoops == 0) && (startFrame == 0)) {
return 0;
}
@@ -1544,12 +1552,12 @@
if (_dig_cd_playing)
_scumm->_mixer->stop(_dig_cd_index);
- _dig_cd_index = _track_info[index]->play(_scumm->_mixer, start, delay);
+ _dig_cd_index = _track_info[index]->play(_scumm->_mixer, startFrame, endFrame);
_dig_cd_playing = true;
_dig_cd_track = track;
- _dig_cd_num_loops = num_loops;
- _dig_cd_start = start;
- _dig_cd_delay = delay;
+ _dig_cd_num_loops = numLoops;
+ _dig_cd_start = startFrame;
+ _dig_cd_end = endFrame;
return 0;
}
@@ -1560,7 +1568,7 @@
_dig_cd_track = 0;
_dig_cd_num_loops = 0;
_dig_cd_start = 0;
- _dig_cd_delay = 0;
+ _dig_cd_end = 0;
return 0;
}
return -1;
@@ -1583,7 +1591,7 @@
if (!_scumm->_mixer->isActiveChannel(_dig_cd_index)) {
if (_dig_cd_num_loops == -1 || --_dig_cd_num_loops > 0)
- playMP3CDTrack(_dig_cd_track, _dig_cd_num_loops, _dig_cd_start, _dig_cd_delay);
+ playMP3CDTrack(_dig_cd_track, _dig_cd_num_loops, _dig_cd_start, _dig_cd_end);
else
stopMP3CD();
}
@@ -1663,19 +1671,19 @@
delete file;
}
-int MP3TrackInfo::play(SoundMixer *mixer, int start, int delay) {
+int MP3TrackInfo::play(SoundMixer *mixer, int startFrame, int endFrame) {
unsigned int offset;
mad_timer_t duration;
// Calc offset. As all bitrates are in kilobit per seconds, the division by 200 is always exact
- offset = (start * (_mad_header.bitrate / (8 * 25))) / 3;
+ offset = (startFrame * (_mad_header.bitrate / (8 * 25))) / 3;
// Calc delay
- if (!delay) {
+ if (!endFrame) {
mad_timer_set(&duration, (_size * 8) / _mad_header.bitrate,
(_size * 8) % _mad_header.bitrate, _mad_header.bitrate);
} else {
- mad_timer_set(&duration, delay / 75, delay % 75, 75);
+ mad_timer_set(&duration, endFrame / 75, endFrame % 75, 75);
}
// Go
@@ -1782,14 +1790,14 @@
#define VORBIS_TREMOR
#endif
-int VorbisTrackInfo::play(SoundMixer *mixer, int start, int delay) {
+int VorbisTrackInfo::play(SoundMixer *mixer, int startFrame, int endFrame) {
#ifdef VORBIS_TREMOR
- ov_time_seek(&_ov_file, (ogg_int64_t)(start / 75.0 * 1000));
+ ov_time_seek(&_ov_file, (ogg_int64_t)(startFrame / 75.0 * 1000));
#else
- ov_time_seek(&_ov_file, start / 75.0);
+ ov_time_seek(&_ov_file, startFrame / 75.0);
#endif
return mixer->playVorbis(NULL, &_ov_file,
- delay * ov_info(&_ov_file, -1)->rate / 75,
+ endFrame * ov_info(&_ov_file, -1)->rate / 75,
true);
}
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- sound.h 26 Jun 2003 23:04:41 -0000 1.36
+++ sound.h 30 Jun 2003 22:25:08 -0000 1.37
@@ -88,7 +88,7 @@
int _dig_cd_index;
int _dig_cd_track;
int _dig_cd_start;
- int _dig_cd_delay;
+ int _dig_cd_end;
int _dig_cd_num_loops;
bool _dig_cd_playing;
@@ -139,7 +139,7 @@
void startCDTimer();
void stopCDTimer();
- void playCDTrack(int track, int num_loops, int start, int delay);
+ void playCDTrack(int track, int numLoops, int startFrame, int endFrame);
void stopCD();
int pollCD() const;
void updateCD();
@@ -156,7 +156,7 @@
int playSfxSound_Vorbis(void *sound, uint32 size);
int getCachedTrack(int track);
- int playMP3CDTrack(int track, int num_loops, int start, int delay);
+ int playMP3CDTrack(int track, int numLoops, int startFrame, int endFrame);
int stopMP3CD();
int pollMP3CD() const;
int updateMP3CD();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.132,1.133 boxes.cpp,1.41,1.42
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.127,1.128 sound.cpp,1.149,1.150 sound.h,1.37,1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list