[Scummvm-cvs-logs] scummvm master -> 1cbab62211b24e265da0eff4c8e16c83b3e3953f
lordhoto
lordhoto at gmail.com
Wed Apr 6 23:43:45 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1cbab62211 DC: Fix compilation errors due to AudioCD changes.
Commit: 1cbab62211b24e265da0eff4c8e16c83b3e3953f
https://github.com/scummvm/scummvm/commit/1cbab62211b24e265da0eff4c8e16c83b3e3953f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-04-06T23:40:26+02:00
Commit Message:
DC: Fix compilation errors due to AudioCD changes.
Changed paths:
backends/platform/dc/dc.h
backends/platform/dc/dcmain.cpp
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index b567142..6cd938e 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -63,7 +63,7 @@ public:
bool isPlaying() const;
// Play cdrom audio track
- void play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false);
+ bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false);
// Stop cdrom audio track
void stop();
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index bd66b81..c84aef9 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -90,12 +90,18 @@ static bool find_track(int track, int &first_sec, int &last_sec)
return false;
}
-void DCCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate) {
+bool DCCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate) {
DefaultAudioCDManager::play(track, numLoops, startFrame, duration, onlyEmulate);
- // If we're playing now, are set to only emulate, return here
- if (isPlaying() || onlyEmulate)
- return;
+ // If we're playing now return here
+ if (isPlaying()) {
+ return true;
+ }
+
+ // If we should only play emulated tracks stop here.
+ if (onlyEmulate) {
+ return false;
+ }
int firstSec, lastSec;
#if 1
@@ -106,16 +112,18 @@ void DCCDManager::play(int track, int numLoops, int startFrame, int duration, bo
if (numLoops > 14)
numLoops = 14;
else if (numLoops < 0)
- num_loops = 15; // infinity
+ numLoops = 15; // infinity
if (!find_track(track, firstSec, lastSec))
- return;
+ return false;
if (duration)
lastSec = firstSec + startFrame + duration;
- firstSec += startFrame;
+ firstSec += startFrame;
play_cdda_sectors(firstSec, lastSec, numLoops);
+
+ return true;
}
void DCCDManager::stop() {
More information about the Scummvm-git-logs
mailing list