libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed CD playing a bit, now playing directly from the CD should be possible again. Playing without an audio track at all works now, too

Browse Source 
svn-id: r24903
This commit is contained in:
Sven Hesse 2006-12-20 15:50:13 +00:00
parent c51d89061f
commit 97ad57e9bb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/gob/cdrom.cpp
View File

@ -147,7 +147,6 @@ void CDROM::playMultMusic() {
for (int i = 0; i < ARRAYSIZE(tracks); i++)
if (!scumm_stricmp(_vm->_game->_curTotFile, tracks[i][0])) {
_cdPlaying = true;
startTrack(tracks[i][_vm->_global->_language + 1]);
break;
}
@ -203,13 +202,14 @@ void CDROM::play(uint32 from, uint32 to) {
// plus frame, minus 150
debugC(1, DEBUG_MUSIC, "play(%d, %d)", from, to);
AudioCD.play(1, 0, from, to - from + 1);
AudioCD.play(1, 1, from, to - from + 1);
_cdPlaying = true;
}
int32 CDROM::getTrackPos(void) {
uint32 curPos = _vm->_util->getTimeKey() - _startTime;
if (AudioCD.isPlaying() && (_vm->_util->getTimeKey() < _trackStop))
if (_cdPlaying && (_vm->_util->getTimeKey() < _trackStop))
return curPos * 3 / 40;
else
return -1;
@ -229,6 +229,7 @@ void CDROM::stop(void) {
debugC(1, DEBUG_MUSIC, "stop()");
AudioCD.stop();
_cdPlaying = false;
}
void CDROM::testCD(int trySubst, const char *label) {