Browse Source

Minor changes

Josh Yelon 18 years ago
parent
commit
13bf1aca21

+ 3 - 3
panda/src/movies/config_movies.h

@@ -25,9 +25,9 @@
 #include "configVariableDouble.h"
 #include "dconfig.h"
 
-ConfigureDecl(config_movies, EXPCL_PANDASKEL, EXPTP_PANDASKEL);
-NotifyCategoryDecl(movies, EXPCL_PANDASKEL, EXPTP_PANDASKEL);
+ConfigureDecl(config_movies, EXPCL_PANDA, EXPTP_PANDA);
+NotifyCategoryDecl(movies, EXPCL_PANDA, EXPTP_PANDA);
 
-extern EXPCL_PANDASKEL void init_libmovies();
+extern EXPCL_PANDA void init_libmovies();
 
 #endif /* __CONFIG_MOVIES_H__ */

+ 1 - 1
panda/src/movies/movie.h

@@ -32,7 +32,7 @@
 //               an AVI file, or an internet TV station.  It could
 //               also be an MP3 file paired with a dummy video stream.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDASKEL Movie : public TypedWritableReferenceCount, public Namable{
+class EXPCL_PANDA Movie : public TypedWritableReferenceCount, public Namable{
 
 PUBLISHED:
   Movie(const string &name, double len);

+ 1 - 1
panda/src/movies/movieAudio.h

@@ -28,7 +28,7 @@
 //       Class : MovieAudio
 // Description : A stream that generates a sequence of audio samples.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDASKEL MovieAudio : public TypedWritableReferenceCount, public Namable {
+class EXPCL_PANDA MovieAudio : public TypedWritableReferenceCount, public Namable {
 
 PUBLISHED:
   MovieAudio(const string &name, double len);

+ 1 - 1
panda/src/movies/movieVideo.h

@@ -27,7 +27,7 @@
 //       Class : MovieVideo
 // Description : A stream that generates a series of images.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDASKEL MovieVideo : public TypedWritableReferenceCount, public Namable {
+class EXPCL_PANDA MovieVideo : public TypedWritableReferenceCount, public Namable {
 
  PUBLISHED:
   MovieVideo(const string &name, double len);

+ 1 - 4
panda/src/movies/movies_composite.cxx

@@ -1,4 +1 @@
-#include "movieVideo.cxx"
-#include "movieAudio.cxx"
-#include "movie.cxx"
-#include "config_movies.cxx"
+#include "movies_composite1.cxx"