From 13bf1aca218dbe6d93fd5d72d1711406cde1824c Mon Sep 17 00:00:00 2001
From: Josh Yelon <jyelon@gmail.com>
Date: Wed, 4 Jul 2007 18:10:14 +0000
Subject: [PATCH] Minor changes

---
 panda/src/movies/config_movies.h      | 6 +++---
 panda/src/movies/movie.h              | 2 +-
 panda/src/movies/movieAudio.h         | 2 +-
 panda/src/movies/movieVideo.h         | 2 +-
 panda/src/movies/movies_composite.cxx | 5 +----
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/panda/src/movies/config_movies.h b/panda/src/movies/config_movies.h
index d30433fc64..d97af2be9f 100644
--- a/panda/src/movies/config_movies.h
+++ b/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__ */
diff --git a/panda/src/movies/movie.h b/panda/src/movies/movie.h
index cbd222756e..d994b5d125 100644
--- a/panda/src/movies/movie.h
+++ b/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);
diff --git a/panda/src/movies/movieAudio.h b/panda/src/movies/movieAudio.h
index 1e7a79cc1b..53ae8576c9 100644
--- a/panda/src/movies/movieAudio.h
+++ b/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);
diff --git a/panda/src/movies/movieVideo.h b/panda/src/movies/movieVideo.h
index 883efd69e4..28e5e940da 100644
--- a/panda/src/movies/movieVideo.h
+++ b/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);
diff --git a/panda/src/movies/movies_composite.cxx b/panda/src/movies/movies_composite.cxx
index 1a25017ebe..2fe02680b2 100644
--- a/panda/src/movies/movies_composite.cxx
+++ b/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"