aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMax Horn2005-01-01 19:19:06 +0000
committerMax Horn2005-01-01 19:19:06 +0000
commit74bf578bda4c9adcc70ce4cda7d4617a9b95267c (patch)
treeb46f1664b5ffd69ebc5623f83444fd7f5de724e2 /sound
parentc418282ec724d01e37b13f7372aa2d6b48f6cbe2 (diff)
downloadscummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.tar.gz
scummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.tar.bz2
scummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.zip
Changed the singleton code to allow for custom object factories; this allowed me to change OSystem to use the singleton base class, too
svn-id: r16404
Diffstat (limited to 'sound')
-rw-r--r--sound/audiocd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/audiocd.h b/sound/audiocd.h
index 98ab462d9a..e852b2939f 100644
--- a/sound/audiocd.h
+++ b/sound/audiocd.h
@@ -54,7 +54,7 @@ public:
Status getStatus() const;
private:
- friend class Common::Singleton<AudioCDManager>;
+ friend SingletonBaseType *makeInstance<>();
AudioCDManager();
int getCachedTrack(int track);