diff options
| author | Max Horn | 2005-01-09 01:41:43 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-09 01:41:43 +0000 |
| commit | bc44b5ec15e7d7f933e455e46c2f603e2800cd82 (patch) | |
| tree | 7bad6a6b01f921662e3c9812e4828909719bea8a /common/system.h | |
| parent | 9c7a604c8bcf6903e83787dc3e8513515489d892 (diff) | |
| download | scummvm-rg350-bc44b5ec15e7d7f933e455e46c2f603e2800cd82.tar.gz scummvm-rg350-bc44b5ec15e7d7f933e455e46c2f603e2800cd82.tar.bz2 scummvm-rg350-bc44b5ec15e7d7f933e455e46c2f603e2800cd82.zip | |
Added new interface SeekableReadStream
svn-id: r16493
Diffstat (limited to 'common/system.h')
| -rw-r--r-- | common/system.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/common/system.h b/common/system.h index 8c672e18c9..39ff9b3d0d 100644 --- a/common/system.h +++ b/common/system.h @@ -29,14 +29,6 @@ #include "common/savefile.h" #include "common/singleton.h" -class OSystem; - -/** - * Custom object factory for OSystem. - */ -template <> -OSystem *Common::Singleton<OSystem>::makeInstance(); - /** * Interface for ScummVM backends. If you want to port ScummVM to a system @@ -49,6 +41,10 @@ OSystem *Common::Singleton<OSystem>::makeInstance(); * control audio CD playback, and sound output. */ class OSystem : public Common::Singleton<OSystem> { +protected: + static OSystem *createSystem(); + friend class Common::Singleton<SingletonBaseType>; + public: /** @name Feature flags */ @@ -682,6 +678,14 @@ public: //@} }; +/** + * Custom object factory for OSystem. + */ +template <> +OSystem *Common::Singleton<OSystem>::makeInstance(); + + + /** The global OSystem instance. Inited in main(). */ #define g_system (&OSystem::instance()) |