From bebd3887114608b6d0b9313bae62336c2652d2ce Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 9 Jun 2006 20:42:03 +0000 Subject: [PATCH] NullAudioManager/Sound should have a TypeHandle --- panda/src/audio/config_audio.cxx | 4 ++++ panda/src/audio/nullAudioManager.cxx | 1 + panda/src/audio/nullAudioManager.h | 17 +++++++++++++++++ panda/src/audio/nullAudioSound.cxx | 1 + panda/src/audio/nullAudioSound.h | 17 +++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/panda/src/audio/config_audio.cxx b/panda/src/audio/config_audio.cxx index c24b883bfd..95bdd101d2 100644 --- a/panda/src/audio/config_audio.cxx +++ b/panda/src/audio/config_audio.cxx @@ -20,6 +20,8 @@ #include "dconfig.h" #include "audioManager.h" #include "audioSound.h" +#include "nullAudioManager.h" +#include "nullAudioSound.h" Configure(config_audio); NotifyCategoryDef(audio, ""); @@ -89,6 +91,8 @@ ConfigureFn(config_audio) { AudioManager::init_type(); AudioSound::init_type(); AudioDSP::init_type(); + NullAudioManager::init_type(); + NullAudioSound::init_type(); } diff --git a/panda/src/audio/nullAudioManager.cxx b/panda/src/audio/nullAudioManager.cxx index ff3e16b854..a6c8d59e23 100644 --- a/panda/src/audio/nullAudioManager.cxx +++ b/panda/src/audio/nullAudioManager.cxx @@ -19,6 +19,7 @@ #include "nullAudioManager.h" +TypeHandle NullAudioManager::_type_handle; //namespace { //static const string blank=""; diff --git a/panda/src/audio/nullAudioManager.h b/panda/src/audio/nullAudioManager.h index 8163f9e5f1..f2b2b52a6d 100644 --- a/panda/src/audio/nullAudioManager.h +++ b/panda/src/audio/nullAudioManager.h @@ -76,6 +76,23 @@ public: virtual void audio_3d_set_drop_off_factor(float factor); virtual float audio_3d_get_drop_off_factor() const; + +public: + static TypeHandle get_class_type() { + return _type_handle; + } + static void init_type() { + AudioManager::init_type(); + register_type(_type_handle, "NullAudioManager", + AudioManager::get_class_type()); + } + virtual TypeHandle get_type() const { + return get_class_type(); + } + virtual TypeHandle force_init_type() {init_type(); return get_class_type();} + +private: + static TypeHandle _type_handle; }; #endif /* __NULL_AUDIO_MANAGER_H__ */ diff --git a/panda/src/audio/nullAudioSound.cxx b/panda/src/audio/nullAudioSound.cxx index 556ed698fd..75d0f679ea 100644 --- a/panda/src/audio/nullAudioSound.cxx +++ b/panda/src/audio/nullAudioSound.cxx @@ -19,6 +19,7 @@ #include "nullAudioSound.h" +TypeHandle NullAudioSound::_type_handle; namespace { static const string blank=""; diff --git a/panda/src/audio/nullAudioSound.h b/panda/src/audio/nullAudioSound.h index 95c84951e4..c845f41f60 100644 --- a/panda/src/audio/nullAudioSound.h +++ b/panda/src/audio/nullAudioSound.h @@ -78,6 +78,23 @@ public: //protected: NullAudioSound(); +public: + static TypeHandle get_class_type() { + return _type_handle; + } + static void init_type() { + AudioSound::init_type(); + register_type(_type_handle, "NullAudioSound", + AudioSound::get_class_type()); + } + virtual TypeHandle get_type() const { + return get_class_type(); + } + virtual TypeHandle force_init_type() {init_type(); return get_class_type();} + +private: + static TypeHandle _type_handle; + friend class NullAudioManager; };