Browse Source

*** empty log message ***

Joe Shochet 25 years ago
parent
commit
93dabec7bb
2 changed files with 12 additions and 0 deletions
  1. 10 0
      panda/src/audio/audio_manager.cxx
  2. 2 0
      panda/src/audio/audio_manager.h

+ 10 - 0
panda/src/audio/audio_manager.cxx

@@ -15,6 +15,16 @@ mutex AudioManager::_manager_mutex;
 bool* AudioManager::_quit = (bool*)0L;
 bool* AudioManager::_quit = (bool*)0L;
 thread* AudioManager::_spawned = (thread*)0L;
 thread* AudioManager::_spawned = (thread*)0L;
 
 
+////////////////////////////////////////////////////////////////////
+//     Function: AudioManager::destructor
+//       Access: Public
+//  Description: delete the AudioManager singleton
+////////////////////////////////////////////////////////////////////
+AudioManager::~AudioManager(void) {
+  shutdown();
+  _global_ptr = (AudioManager*)0L;
+}
+
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: AudioManager::set_update_func
 //     Function: AudioManager::set_update_func
 //       Access: Public, Static
 //       Access: Public, Static

+ 2 - 0
panda/src/audio/audio_manager.h

@@ -36,6 +36,8 @@ private:
   static bool* _quit;
   static bool* _quit;
   static thread* _spawned;
   static thread* _spawned;
 public:
 public:
+  virtual ~AudioManager(void);
+
   static void set_update_func(UpdateFunc*);
   static void set_update_func(UpdateFunc*);
   static void set_shutdown_func(ShutdownFunc*);
   static void set_shutdown_func(ShutdownFunc*);