3 files changed, 60 insertions, 77 deletions

diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index d8ab549c3a..6cd938ec9c 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -57,21 +57,16 @@ class DCHardware {
 };
 
 class DCCDManager : public DefaultAudioCDManager {
-  // Initialize the specified CD drive for audio playback.
-  bool openCD(int drive);
-
-  // Poll cdrom status
-  // Returns true if cd audio is playing
-  bool pollCD();
-
-  // Play cdrom audio track
-  void playCD(int track, int num_loops, int start_frame, int duration);
+public:
+	// Poll cdrom status
+	// Returns true if cd audio is playing
+	bool isPlaying() const;
 
-  // Stop cdrom audio track
-  void stopCD();
+	// Play cdrom audio track
+	bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false);
 
-  // Update cdrom audio status
-  void updateCD();
+	// Stop cdrom audio track
+	void stop();
 };
 
 class OSystem_Dreamcast : private DCHardware, public EventsBaseBackend, public PaletteManager, public FilesystemFactory
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index eede796991..c84aef9c47 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -90,43 +90,53 @@ static bool find_track(int track, int &first_sec, int &last_sec)
   return false;
 }
 
-void DCCDManager::playCD(int track, int num_loops, int start_frame, int duration)
-{
-  int first_sec, last_sec;
+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 return here
+	if (isPlaying()) {
+		return true;
+	}
+
+	// If we should only play emulated tracks stop here.
+	if (onlyEmulate) {
+		return false;
+	}
+
+	int firstSec, lastSec;
 #if 1
-  if (num_loops)
-    --num_loops;
+	if (numLoops)
+		--numLoops;
 #endif
-  if (num_loops>14) num_loops=14;
-  else if (num_loops<0) num_loops=15; // infinity
-  if (!find_track(track, first_sec, last_sec))
-    return;
-  if (duration)
-    last_sec = first_sec + start_frame + duration;
-  first_sec += start_frame;
-  play_cdda_sectors(first_sec, last_sec, num_loops);
-}
 
-void DCCDManager::stopCD()
-{
-  stop_cdda();
-}
+	if (numLoops > 14)
+		numLoops = 14;
+	else if (numLoops < 0)
+		numLoops = 15; // infinity
 
-bool DCCDManager::pollCD()
-{
-  extern int getCdState();
-  return getCdState() == 3;
+	if (!find_track(track, firstSec, lastSec))
+		return false;
+
+	if (duration)
+		lastSec = firstSec + startFrame + duration;
+
+	firstSec += startFrame;
+	play_cdda_sectors(firstSec, lastSec, numLoops);
+
+	return true;
 }
 
-void DCCDManager::updateCD()
-{
-  // Dummy.  The CD drive takes care of itself.
+void DCCDManager::stop() {
+	DefaultAudioCDManager::stop();
+	stop_cdda();
 }
 
-bool DCCDManager::openCD(int drive)
-{
-  // Dummy.
-  return true;
+bool DCCDManager::isPlaying() const {
+	if (DefaultAudioCDManager::isPlaying())
+		return true;
+
+	extern int getCdState();
+	return getCdState() == 3;
 }
 
 void OSystem_Dreamcast::setWindowCaption(const char *caption)
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index 5f5cdff24f..d896ba1299 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -165,30 +165,7 @@ static bool tryDelete(const char *filename, int vm)
   return true;
 }
 
-static bool matches(const char *glob, const char *name)
-{
-  while(*glob)
-    if(*glob == '*') {
-      while(*glob == '*')
-	glob++;
-      do {
-	if((*name == *glob || *glob == '?') &&
-	   matches(glob, name))
-	  return true;
-      } while(*name++);
-      return false;
-    } else if(!*name)
-      return false;
-    else if(*glob == '?' || *glob == *name) {
-      glob++;
-      name++;
-    }
-    else
-      return false;
-  return !*name;
-}
-
-static void tryList(const char *glob, int vm, Common::StringArray &list)
+static void tryList(const Common::String &glob, int vm, Common::StringArray &list)
 {
   struct vmsinfo info;
   struct superblock super;
@@ -205,7 +182,7 @@ static void tryList(const char *glob, int vm, Common::StringArray &list)
       char buf[16];
       strncpy(buf, (char *)de.entry+4, 12);
       buf[12] = 0;
-      if (matches(glob, buf))
+      if (Common::matchString(buf, glob.c_str()))
 	list.push_back(buf);
     }
 }
@@ -292,15 +269,16 @@ public:
 class OutVMSave : public Common::OutSaveFile {
 private:
   char *buffer;
-  int pos, size, committed;
+  int _pos, size, committed;
   char filename[16];
   bool iofailed;
 
 public:
   uint32 write(const void *buf, uint32 cnt);
+  virtual int32 pos() const { return _pos; }
 
   OutVMSave(const char *_filename)
-    : pos(0), committed(-1), iofailed(false)
+    : _pos(0), committed(-1), iofailed(false)
   {
     strncpy(filename, _filename, 16);
     buffer = new char[size = MAX_SAVE_SIZE];
@@ -343,14 +321,14 @@ void OutVMSave::finalize()
   extern const char *gGameName;
   extern Icon icon;
 
-  if (committed >= pos)
+  if (committed >= _pos)
     return;
 
   char *data = buffer;
-  int len = pos;
+  int len = _pos;
 
   vmsaveResult r = writeSaveGame(gGameName, data, len, filename, icon);
-  committed = pos;
+  committed = _pos;
   if (r != VMSAVE_OK)
     iofailed = true;
   displaySaveResult(r);
@@ -409,13 +387,13 @@ bool InVMSave::seek(int32 offs, int whence)
 uint32 OutVMSave::write(const void *buf, uint32 cnt)
 {
   int nbyt = cnt;
-  if (pos + nbyt > size) {
-    cnt = (size - pos);
+  if (_pos + nbyt > size) {
+    cnt = (size - _pos);
     nbyt = cnt;
   }
   if (nbyt)
-    memcpy(buffer + pos, buf, nbyt);
-  pos += nbyt;
+    memcpy(buffer + _pos, buf, nbyt);
+  _pos += nbyt;
   return cnt;
 }
 
@@ -425,7 +403,7 @@ Common::StringArray VMSaveManager::listSavefiles(const Common::String &pattern)
   Common::StringArray list;
 
   for (int i=0; i<24; i++)
-    tryList(pattern.c_str(), i, list);
+    tryList(pattern, i, list);
 
   return list;
 }