Changeset 2838 in orxonox.OLD for orxonox/branches/sound/src/sound_control.h

Timestamp:

Nov 12, 2004, 2:41:26 PM (21 years ago)

Author:

simon

Message:

branches/sound: instance can now be freed via static deleteInstance()

File:

• orxonox/branches/sound/src/sound_control.h (modified) (2 diffs)

orxonox/branches/sound/src/sound_control.h

@@ -7 +7 @@
 
  public:
-  SoundControl* getObject();
+  static SoundControl* getInstance();
+  static void deleteInstance();
   void setNumberOfChannels(int number_of channels);
   int playMod(char* filename);
@@ -21 +22 @@
   void trackSelect();
 
+protected:
+  void initialise();
+  SoundControl();
+  ~SoundControl();
+
 private:
-  void initialise();
-  //SoundControl singleton object must be made via getObject()
-  SoundControl();
-  ~SoundControl()
+  static SoundControl* instance;
+
 }