Revision: 4462 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4462&view=rev Author: zmoelnig Date: 2011-08-15 12:33:55 +0000 (Mon, 15 Aug 2011)
Log Message: ----------- when including a plugin-file, the includer has to make sure that the needed headers are available Modified Paths: -------------- trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.cpp trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h Modified: trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.cpp =================================================================== --- trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.cpp 2011-08-15 12:33:25 UTC (rev 4461) +++ trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.cpp 2011-08-15 12:33:55 UTC (rev 4462) @@ -16,15 +16,20 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif + +#ifdef HAVE_LIBGMERLIN_AVDEC +# define HAVE_GMERLIN +#endif + + +#ifdef HAVE_GMERLIN #include "filmGMERLIN.h" #include "plugins/PluginFactory.h" #include "Gem/RTE.h" using namespace gem::plugins; -#ifdef HAVE_GMERLIN REGISTER_FILMFACTORY("gmerlin", filmGMERLIN); -#endif ///////////////////////////////////////////////////////// // @@ -36,7 +41,6 @@ ///////////////////////////////////////////////////////// filmGMERLIN :: filmGMERLIN(void) : filmBase(), -#ifdef HAVE_GMERLIN m_file(NULL), m_opt(NULL), m_seekable(false), @@ -52,13 +56,10 @@ #ifdef USE_FRAMETABLE m_frametable(NULL), #endif -#endif /* GMERLIN */ m_lastFrame(0), m_doConvert(false) { -#ifdef HAVE_GMERLIN m_gconverter=gavl_video_converter_create (); -#endif } //////////////////////////////////////////////////////// @@ -68,12 +69,9 @@ filmGMERLIN :: ~filmGMERLIN() { close(); -#ifdef HAVE_GMERLIN if(m_gconverter)gavl_video_converter_destroy(m_gconverter);m_gconverter=NULL; -#endif } -#ifdef HAVE_GMERLIN void filmGMERLIN :: close(void) { if(m_file)bgav_close(m_file);m_file=NULL; Modified: trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h =================================================================== --- trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h 2011-08-15 12:33:25 UTC (rev 4461) +++ trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h 2011-08-15 12:33:55 UTC (rev 4462) @@ -17,11 +17,6 @@ #include "plugins/filmBase.h" #include <stdio.h> -#ifdef HAVE_LIBGMERLIN_AVDEC -# define HAVE_GMERLIN -#endif - -#ifdef HAVE_GMERLIN # ifdef __cplusplus extern "C" { # endif @@ -39,7 +34,6 @@ # ifdef __cplusplus } # endif -#endif // GMERLIN /*----------------------------------------------------------------- ------------------------------------------------------------------- @@ -66,7 +60,6 @@ // Destructor virtual ~filmGMERLIN(void); -#ifdef HAVE_GMERLIN ////////// // open a movie up virtual bool open(const std::string filename, const gem::Properties&); @@ -104,8 +97,6 @@ static void log_callback(void *data, bgav_log_level_t level, const char *log_domain, const char *message); virtual void log(bgav_log_level_t level, const char *log_domain, const char *message); - -#endif int m_lastFrame; private: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ uberSVN's rich system and user administration capabilities and model configuration take the hassle out of deploying and managing Subversion and the tools developers use with it. Learn more about uberSVN and get a free download at: http://p.sf.net/sfu/wandisco-dev2dev _______________________________________________ pd-gem-CVS mailing list pd-gem-CVS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs