Browse Source

protect under HAVE_AUDIO

David Rose 16 years ago
parent
commit
b6dfe5d6c8

+ 2 - 0
panda/src/grutil/config_grutil.cxx

@@ -94,8 +94,10 @@ init_libgrutil() {
   PipeOcclusionCullTraverser::init_type();
   PipeOcclusionCullTraverser::init_type();
   SceneGraphAnalyzerMeter::init_type();
   SceneGraphAnalyzerMeter::init_type();
 
 
+#ifdef HAVE_AUDIO
   MovieTexture::init_type();
   MovieTexture::init_type();
   MovieTexture::register_with_read_factory();
   MovieTexture::register_with_read_factory();
+#endif  // HAVE_AUDIO
 #ifdef HAVE_OPENCV
 #ifdef HAVE_OPENCV
   OpenCVTexture::init_type();
   OpenCVTexture::init_type();
   OpenCVTexture::register_with_read_factory();
   OpenCVTexture::register_with_read_factory();

+ 4 - 0
panda/src/grutil/movieTexture.cxx

@@ -14,6 +14,8 @@
 
 
 #include "pandabase.h"
 #include "pandabase.h"
 
 
+#ifdef HAVE_AUDIO
+
 #include "movieVideo.h"
 #include "movieVideo.h"
 #include "movieVideoCursor.h"
 #include "movieVideoCursor.h"
 #include "movieTexture.h"
 #include "movieTexture.h"
@@ -671,3 +673,5 @@ unsynchronize() {
   CDWriter cdata(_cycler);
   CDWriter cdata(_cycler);
   cdata->_synchronize = 0;
   cdata->_synchronize = 0;
 }
 }
+
+#endif  // HAVE_AUDIO

+ 4 - 0
panda/src/grutil/movieTexture.h

@@ -16,6 +16,9 @@
 #define MOVIETEXTURE_H
 #define MOVIETEXTURE_H
 
 
 #include "pandabase.h"
 #include "pandabase.h"
+
+#ifdef HAVE_AUDIO
+
 #include "movieVideo.h"
 #include "movieVideo.h"
 #include "audioSound.h"
 #include "audioSound.h"
 #include "pipelineCycler.h"
 #include "pipelineCycler.h"
@@ -137,5 +140,6 @@ private:
 
 
 #include "movieTexture.I"
 #include "movieTexture.I"
 
 
+#endif  // HAVE_AUDIO
 
 
 #endif
 #endif