diff options
| author | Max Horn | 2003-07-22 20:36:43 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-22 20:36:43 +0000 |
| commit | 73e7afaf180b28daa561c7c24908f104be44858e (patch) | |
| tree | 6adaa18785fcc4f51222035891e60caa7fdb1b15 /backends/PalmOS | |
| parent | d15039d2e4f63a1c8c3cefe64bc8e8bb4364aa77 (diff) | |
| download | scummvm-rg350-73e7afaf180b28daa561c7c24908f104be44858e.tar.gz scummvm-rg350-73e7afaf180b28daa561c7c24908f104be44858e.tar.bz2 scummvm-rg350-73e7afaf180b28daa561c7c24908f104be44858e.zip | |
adjusted to play_cdrom parameter name change in common/system.h
svn-id: r9132
Diffstat (limited to 'backends/PalmOS')
| -rw-r--r-- | backends/PalmOS/Src/palm.cpp | 10 | ||||
| -rw-r--r-- | backends/PalmOS/Src/palm.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp index 529b720897..c6db8a2ee5 100644 --- a/backends/PalmOS/Src/palm.cpp +++ b/backends/PalmOS/Src/palm.cpp @@ -1089,7 +1089,7 @@ static void doErr(Err e, const Char *msg) { FrmCustomAlert(1000,err,0,0); } -void OSystem_PALMOS::play_cdrom(int track, int num_loops, int start_frame, int end_frame) { +void OSystem_PALMOS::play_cdrom(int track, int num_loops, int start_frame, int duration) { if (!_isCDRomAvalaible) return; @@ -1131,13 +1131,13 @@ void OSystem_PALMOS::play_cdrom(int track, int num_loops, int start_frame, int e if (start_frame > 0) start_frame += CD_FPS >> 1; - if (end_frame > 0) - end_frame += CD_FPS >> 1; + if (duration > 0) + duration += CD_FPS >> 1; _msaLoops = num_loops; _msaTrack = track + gVars->music.firstTrack - 1; // first track >= 1 ?, not 0 (0=album) _msaStartFrame = TO_MSECS(start_frame); - _msaEndFrame = TO_MSECS(end_frame); + _msaEndFrame = TO_MSECS(duration); // if gVars->MP3 audio track // Err e; @@ -1182,7 +1182,7 @@ void OSystem_PALMOS::play_cdrom(int track, int num_loops, int start_frame, int e _msaEndTime = get_msecs() + _msaTrackLength - 2000; // 2sec less ... // try to play the track - if (start_frame == 0 && end_frame == 0) { + if (start_frame == 0 && duration == 0) { MsaPlay(_msaRefNum, _msaTrack, 0, _msaPBRate); } else { // FIXME : MsaTimeToSu doesn't work ... (may work with previous FIXME) diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h index 63498b4497..c2524c95aa 100644 --- a/backends/PalmOS/Src/palm.h +++ b/backends/PalmOS/Src/palm.h @@ -126,7 +126,7 @@ public: bool poll_cdrom(); // Play cdrom audio track - void play_cdrom(int track, int num_loops, int start_frame, int end_frame); + void play_cdrom(int track, int num_loops, int start_frame, int duration); // Stop cdrom audio track void stop_cdrom(); |