From 73e7afaf180b28daa561c7c24908f104be44858e Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 22 Jul 2003 20:36:43 +0000 Subject: adjusted to play_cdrom parameter name change in common/system.h svn-id: r9132 --- backends/PalmOS/Src/palm.cpp | 10 +++++----- backends/PalmOS/Src/palm.h | 2 +- backends/dc/dc.h | 2 +- backends/dc/dcmain.cpp | 5 ++--- backends/gp32/gp32.cpp | 2 +- backends/gp32/gp32.h | 2 +- backends/morphos/morphos.cpp | 6 +++--- backends/morphos/morphos.h | 2 +- backends/sdl/sdl-common.cpp | 16 ++++++++-------- backends/sdl/sdl-common.h | 4 ++-- backends/wince/wince.cpp | 2 +- backends/wince/wince.h | 2 +- backends/x11/x11.cpp | 4 ++-- 13 files changed, 29 insertions(+), 30 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(); diff --git a/backends/dc/dc.h b/backends/dc/dc.h index 77513c14e0..e022976de9 100644 --- a/backends/dc/dc.h +++ b/backends/dc/dc.h @@ -60,7 +60,7 @@ class OSystem_Dreamcast : public OSystem { 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(); diff --git a/backends/dc/dcmain.cpp b/backends/dc/dcmain.cpp index e0114673c8..3b7b1e584c 100644 --- a/backends/dc/dcmain.cpp +++ b/backends/dc/dcmain.cpp @@ -74,8 +74,7 @@ static bool find_track(int track, int &first_sec, int &last_sec) return false; } -void OSystem_Dreamcast::play_cdrom(int track, int num_loops, - int start_frame, int end_frame) +void OSystem_Dreamcast::play_cdrom(int track, int num_loops, int start_frame, int duration) { int first_sec, last_sec; #if 1 @@ -87,7 +86,7 @@ void OSystem_Dreamcast::play_cdrom(int track, int num_loops, if(!find_track(track, first_sec, last_sec)) return; if(end_frame) - last_sec = first_sec + start_frame + end_frame; + last_sec = first_sec + start_frame + duration; first_sec += start_frame; play_cdda_sectors(first_sec, last_sec, num_loops); } diff --git a/backends/gp32/gp32.cpp b/backends/gp32/gp32.cpp index d0427f2846..2c266aeca4 100644 --- a/backends/gp32/gp32.cpp +++ b/backends/gp32/gp32.cpp @@ -1067,7 +1067,7 @@ uint32 OSystem_GP32::property(int param, Property *value) { bool OSystem_GP32::poll_cdrom() { return false; } // Play cdrom audio track -void OSystem_GP32::play_cdrom(int track, int num_loops, int start_frame, int end_frame) { } +void OSystem_GP32::play_cdrom(int track, int num_loops, int start_frame, int duration) { } // Stop cdrom audio track void OSystem_GP32::stop_cdrom() { } diff --git a/backends/gp32/gp32.h b/backends/gp32/gp32.h index 764ed4e18f..61ca9e7a37 100644 --- a/backends/gp32/gp32.h +++ b/backends/gp32/gp32.h @@ -93,7 +93,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(); diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp index 3905522be1..04def0ebe0 100644 --- a/backends/morphos/morphos.cpp +++ b/backends/morphos/morphos.cpp @@ -446,7 +446,7 @@ uint32 OSystem_MorphOS::property(int param, Property *value) return 0; } -void OSystem_MorphOS::play_cdrom(int track, int num_loops, int start_frame, int length) +void OSystem_MorphOS::play_cdrom(int track, int num_loops, int start_frame, int duration) { if (CDrive && start_frame >= 0) { @@ -455,8 +455,8 @@ void OSystem_MorphOS::play_cdrom(int track, int num_loops, int start_frame, int PlayTags[0].ti_Data = track; PlayTags[1].ti_Data = start_frame; - PlayTags[2].ti_Data = (length == 0) ? track+1 : track; - PlayTags[3].ti_Data = length ? start_frame+length : 0; + PlayTags[2].ti_Data = (duration == 0) ? track+1 : track; + PlayTags[3].ti_Data = duration ? start_frame+duration : 0; PlayTags[4].ti_Data = (num_loops == 0) ? 1 : num_loops; CDDA_PlayA(CDrive, PlayTags); } diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h index 5076c2d479..ff4052f7bc 100644 --- a/backends/morphos/morphos.h +++ b/backends/morphos/morphos.h @@ -112,7 +112,7 @@ class OSystem_MorphOS : public OSystem virtual bool poll_cdrom(); // Play cdrom audio track - virtual void play_cdrom(int track, int num_loops, int start_frame, int length); + virtual void play_cdrom(int track, int num_loops, int start_frame, int duration); // Stop cdrom audio track virtual void stop_cdrom(); diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp index 6578cf7685..f39525893c 100644 --- a/backends/sdl/sdl-common.cpp +++ b/backends/sdl/sdl-common.cpp @@ -1090,26 +1090,26 @@ void OSystem_SDL_Common::stop_cdrom() { /* Stop CD Audio in 1/10th of a second * cd_num_loops = 0; } -void OSystem_SDL_Common::play_cdrom(int track, int num_loops, int start_frame, int end_frame) { +void OSystem_SDL_Common::play_cdrom(int track, int num_loops, int start_frame, int duration) { if (!num_loops && !start_frame) return; if (!_cdrom) return; - if (end_frame > 0) - end_frame +=5; + if (duration > 0) + duration +=5; cd_track = track; cd_num_loops = num_loops; cd_start_frame = start_frame; SDL_CDStatus(_cdrom); - if (start_frame == 0 && end_frame == 0) + if (start_frame == 0 && duration == 0) SDL_CDPlayTracks(_cdrom, track, 0, 1, 0); else - SDL_CDPlayTracks(_cdrom, track, start_frame, 0, end_frame); - cd_end_frame = end_frame; + SDL_CDPlayTracks(_cdrom, track, start_frame, 0, duration); + cd_duration = duration; cd_stop_time = 0; cd_end_time = SDL_GetTicks() + _cdrom->track[track].length * 1000 / CD_FPS; } @@ -1145,10 +1145,10 @@ void OSystem_SDL_Common::update_cdrom() { cd_num_loops--; if (cd_num_loops != 0) { - if (cd_start_frame == 0 && cd_end_frame == 0) + if (cd_start_frame == 0 && cd_duration == 0) SDL_CDPlayTracks(_cdrom, cd_track, 0, 1, 0); else - SDL_CDPlayTracks(_cdrom, cd_track, cd_start_frame, 0, cd_end_frame); + SDL_CDPlayTracks(_cdrom, cd_track, cd_start_frame, 0, cd_duration); cd_end_time = SDL_GetTicks() + _cdrom->track[cd_track].length * 1000 / CD_FPS; } } diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h index 4a2a8d0087..2a5fba2af8 100644 --- a/backends/sdl/sdl-common.h +++ b/backends/sdl/sdl-common.h @@ -87,7 +87,7 @@ public: bool poll_cdrom(); // Play CD 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 CD audio track void stop_cdrom(); @@ -146,7 +146,7 @@ protected: // CD Audio SDL_CD *_cdrom; - int cd_track, cd_num_loops, cd_start_frame, cd_end_frame; + int cd_track, cd_num_loops, cd_start, cd_duration; Uint32 cd_end_time, cd_stop_time, cd_next_second; enum { diff --git a/backends/wince/wince.cpp b/backends/wince/wince.cpp index ac5584d7dd..703e752ab3 100644 --- a/backends/wince/wince.cpp +++ b/backends/wince/wince.cpp @@ -1831,7 +1831,7 @@ void OSystem_WINCE3::quit() { /* CDRom Audio */ void OSystem_WINCE3::stop_cdrom() {;} -void OSystem_WINCE3::play_cdrom(int track, int num_loops, int start_frame, int end_frame) {;} +void OSystem_WINCE3::play_cdrom(int track, int num_loops, int start_frame, int duration) {;} bool OSystem_WINCE3::poll_cdrom() {return 0;} void OSystem_WINCE3::update_cdrom() {;} diff --git a/backends/wince/wince.h b/backends/wince/wince.h index 7e52cc5e5b..2bc05abf0e 100644 --- a/backends/wince/wince.h +++ b/backends/wince/wince.h @@ -123,7 +123,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(); diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp index 175f9bb722..026dbeb148 100644 --- a/backends/x11/x11.cpp +++ b/backends/x11/x11.cpp @@ -105,7 +105,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(); @@ -801,7 +801,7 @@ bool OSystem_X11::poll_cdrom() return false; } -void OSystem_X11::play_cdrom(int track, int num_loops, int start_frame, int end_frame) +void OSystem_X11::play_cdrom(int track, int num_loops, int start_frame, int duration) { } -- cgit v1.2.3