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/sdl | |
| 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/sdl')
| -rw-r--r-- | backends/sdl/sdl-common.cpp | 16 | ||||
| -rw-r--r-- | backends/sdl/sdl-common.h | 4 |
2 files changed, 10 insertions, 10 deletions
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 { |