[Scummvm-cvs-logs] CVS: scummvm/sound audiocd.h,1.6,1.7

Max Horn fingolfin at users.sourceforge.net
Sat Jan 1 11:20:07 CET 2005


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4920/sound

Modified Files:
	audiocd.h 
Log Message:
Changed the singleton code to allow for custom object factories; this allowed me to change OSystem to use the singleton base class, too

Index: audiocd.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- audiocd.h	1 Jan 2005 16:09:22 -0000	1.6
+++ audiocd.h	1 Jan 2005 19:19:06 -0000	1.7
@@ -54,7 +54,7 @@
 	Status getStatus() const;
 
 private:
-	friend class Common::Singleton<AudioCDManager>;
+	friend SingletonBaseType *makeInstance<>();
 	AudioCDManager();
 
 	int getCachedTrack(int track);





More information about the Scummvm-git-logs mailing list