Revision: 4471 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4471&view=rev Author: zmoelnig Date: 2011-08-15 14:10:14 +0000 (Mon, 15 Aug 2011)
Log Message: ----------- made it compile on w32 again Modified Paths: -------------- trunk/Gem/plugins/filmAVI/filmAVI.cpp trunk/Gem/plugins/filmQT/filmQT.cpp trunk/Gem/plugins/recordQT/recordQT.cpp trunk/Gem/plugins/recordQT/recordQT.h trunk/Gem/src/RTE/Symbol.cpp Modified: trunk/Gem/plugins/filmAVI/filmAVI.cpp =================================================================== --- trunk/Gem/plugins/filmAVI/filmAVI.cpp 2011-08-15 13:59:35 UTC (rev 4470) +++ trunk/Gem/plugins/filmAVI/filmAVI.cpp 2011-08-15 14:10:14 UTC (rev 4471) @@ -25,9 +25,10 @@ #include "Gem/Properties.h" #include "Gem/RTE.h" +using namespace gem::plugins; + REGISTER_FILMFACTORY("AVI", filmAVI); -using namespace gem::plugins; ///////////////////////////////////////////////////////// // @@ -38,7 +39,7 @@ // ///////////////////////////////////////////////////////// -filmAVI :: filmAVI(void) : filmBase() +filmAVI :: filmAVI(void) : filmBase(), m_nRawBuffSize(0), m_RawBuffer(NULL), m_format(GL_BGR_EXT), Modified: trunk/Gem/plugins/filmQT/filmQT.cpp =================================================================== --- trunk/Gem/plugins/filmQT/filmQT.cpp 2011-08-15 13:59:35 UTC (rev 4470) +++ trunk/Gem/plugins/filmQT/filmQT.cpp 2011-08-15 14:10:14 UTC (rev 4471) @@ -32,6 +32,7 @@ #include "filmQT.h" #include "plugins/PluginFactory.h" +#include "Gem/Properties.h" #include "Gem/RTE.h" using namespace gem::plugins; Modified: trunk/Gem/plugins/recordQT/recordQT.cpp =================================================================== --- trunk/Gem/plugins/recordQT/recordQT.cpp 2011-08-15 13:59:35 UTC (rev 4470) +++ trunk/Gem/plugins/recordQT/recordQT.cpp 2011-08-15 14:10:14 UTC (rev 4471) @@ -7,6 +7,19 @@ # include "config.h" #endif + +#if defined __APPLE__ +# if !defined __x86_64__ +// with OSX10.6, apple has removed loads of Carbon functionality (in 64bit mode) +// LATER make this a real check in configure +# define HAVE_CARBONQUICKTIME +# elif defined HAVE_QUICKTIME +# undef HAVE_QUICKTIME +# endif +#endif + +#ifdef HAVE_QUICKTIME + #include "recordQT.h" #include "plugins/PluginFactory.h" #include "Gem/Exception.h" @@ -43,7 +56,7 @@ // Constructor // ///////////////////////////////////////////////////////// -recordQT :: recordQT() +recordQT :: recordQT(void) : recordBase(), m_recordSetup(false), m_recordStart(false), @@ -64,7 +77,7 @@ { m_filename[0] = 0; -# ifdef _WIN32 +#ifdef _WIN32 // Initialize QuickTime Media Layer /* isn't this done in GemMan/GemWinCreateNT already? */ OSErr err = noErr; @@ -79,7 +92,7 @@ throw(GemException("unable to initialize QuickTime/Movies")); } verbose(1, "recordQT: QT init done"); -# endif // WINDOWS +#endif // WINDOWS //get list of codecs installed -- useful later CodecNameSpecListPtr codecList; @@ -248,7 +261,7 @@ post("recordQT: using YUV"); } if (m_compressImage->format == GL_BGRA){ -# ifdef __BIG_ENDIAN__ +#ifdef __BIG_ENDIAN__ colorspace = k32BGRAPixelFormat;// k32RGBAPixelFormat; #else colorspace = k32ARGBPixelFormat; Modified: trunk/Gem/plugins/recordQT/recordQT.h =================================================================== --- trunk/Gem/plugins/recordQT/recordQT.h 2011-08-15 13:59:35 UTC (rev 4470) +++ trunk/Gem/plugins/recordQT/recordQT.h 2011-08-15 14:10:14 UTC (rev 4471) @@ -12,31 +12,16 @@ #define _INCLUDE_GEMPLUGIN__RECORDQT_RECORDQT_H_ #include "plugins/recordBase.h" - - -#if defined __APPLE__ -# if !defined __x86_64__ -// with OSX10.6, apple has removed loads of Carbon functionality (in 64bit mode) -// LATER make this a real check in configure -# define HAVE_CARBONQUICKTIME -# elif defined HAVE_QUICKTIME -# undef HAVE_QUICKTIME -# endif -#endif - - #define QT_MAX_FILENAMELENGTH 256 -#if defined HAVE_QUICKTIME -# if defined _WIN32 -# include <QTML.h> -# include <Movies.h> -# include <QuicktimeComponents.h> -# endif -# ifdef __APPLE__ -# include <QuickTime/QuickTime.h> -# endif // __APPLE__ +#if defined _WIN32 +# include <QTML.h> +# include <Movies.h> +# include <QuicktimeComponents.h> #endif +#ifdef __APPLE__ +# include <QuickTime/QuickTime.h> +#endif // __APPLE__ /*----------------------------------------------------------------- @@ -74,8 +59,7 @@ ////////// // Destructor virtual ~recordQT(void); - -#ifdef HAVE_QUICKTIME + virtual void close(void); virtual bool open(const std::string filename); @@ -118,13 +102,13 @@ imageStruct *m_compressImage; -# ifdef __APPLE__ +#ifdef __APPLE__ UnsignedWide startTime, endTime; -# endif +#endif -# ifdef _WIN32 +#ifdef _WIN32 LARGE_INTEGER freq, startTime, endTime; -# endif +#endif float seconds; //number of QT ticks for a frame 600/frameDuration (used by AddMediaSample) @@ -171,7 +155,6 @@ codecListStorage *codecContainer; int numCodecContainer; -#endif /* QT */ }; };}; #endif // for header file Modified: trunk/Gem/src/RTE/Symbol.cpp =================================================================== --- trunk/Gem/src/RTE/Symbol.cpp 2011-08-15 13:59:35 UTC (rev 4470) +++ trunk/Gem/src/RTE/Symbol.cpp 2011-08-15 14:10:14 UTC (rev 4471) @@ -72,12 +72,15 @@ gem::RTE::Symbol&gem::RTE::Symbol::operator=(const std::string&name) { m_pimpl->sym=gensym(name.c_str()); + return (*this); } gem::RTE::Symbol&gem::RTE::Symbol::operator=(const gem::RTE::Symbol&Sym) { m_pimpl->sym=Sym.m_pimpl->sym; + return (*this); } gem::RTE::Symbol&gem::RTE::Symbol::operator=(const t_symbol*name) { m_pimpl->sym=name; + return (*this); } gem::RTE::Symbol&gem::RTE::Symbol::setSymbol(const unsigned int argc, const t_atom*argv) { char buf[MAXPDSTRING]; @@ -102,6 +105,7 @@ } m_pimpl->sym=gensym(name.c_str()); + return (*this); } t_symbol*gem::RTE::Symbol::getRTESymbol(void) const { 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