Revision: 4437 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4437&view=rev Author: zmoelnig Date: 2011-08-08 14:28:35 +0000 (Mon, 08 Aug 2011)
Log Message: ----------- adapted to "film" -> "film"|"filmBase" split Modified Paths: -------------- trunk/Gem/plugins/filmAVI/filmAVI.cpp trunk/Gem/plugins/filmAVI/filmAVI.h trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.cpp trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.h trunk/Gem/plugins/filmDS/filmDS.cpp trunk/Gem/plugins/filmDS/filmDS.h trunk/Gem/plugins/filmDarwin/filmDarwin.cpp trunk/Gem/plugins/filmDarwin/filmDarwin.h trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.cpp trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h trunk/Gem/plugins/filmMPEG1/filmMPEG1.cpp trunk/Gem/plugins/filmMPEG1/filmMPEG1.h trunk/Gem/plugins/filmMPEG3/filmMPEG3.cpp trunk/Gem/plugins/filmMPEG3/filmMPEG3.h trunk/Gem/plugins/filmQT/filmQT.cpp trunk/Gem/plugins/filmQT/filmQT.h trunk/Gem/plugins/filmQT4L/filmQT4L.cpp trunk/Gem/plugins/filmQT4L/filmQT4L.h trunk/Gem/plugins/filmTEST/filmTEST.cpp trunk/Gem/plugins/filmTEST/filmTEST.h Modified: trunk/Gem/plugins/filmAVI/filmAVI.cpp =================================================================== --- trunk/Gem/plugins/filmAVI/filmAVI.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmAVI/filmAVI.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -18,8 +18,11 @@ #endif #include "filmAVI.h" +#include "plugins/PluginFactory.h" + using namespace gem::plugins; + #include "Utils/Functions.h" #ifdef _WIN32 @@ -35,7 +38,7 @@ // ///////////////////////////////////////////////////////// -filmAVI :: filmAVI(void) : film() { +filmAVI :: filmAVI(void) : filmBase() { #ifdef _WIN32 m_getFrame = NULL; m_streamVid = NULL; @@ -231,18 +234,18 @@ return &m_image; } -int filmAVI :: changeImage(int imgNum, int trackNum){ - if (imgNum<0)return FILM_ERROR_FAILURE; +film::errCode filmAVI :: changeImage(int imgNum, int trackNum){ + if (imgNum<0)return film::FAILURE; if (m_numFrames<0){ m_reqFrame = imgNum; - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } if (imgNum>m_numFrames){ m_reqFrame=m_numFrames; - return FILM_ERROR_FAILURE; + return film::FAILURE; } m_reqFrame = imgNum; - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } #endif Modified: trunk/Gem/plugins/filmAVI/filmAVI.h =================================================================== --- trunk/Gem/plugins/filmAVI/filmAVI.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmAVI/filmAVI.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -16,7 +16,7 @@ #ifndef INCLUDE_FILMAVI_H_ #define INCLUDE_FILMAVI_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #ifdef _WIN32 #include <vfw.h> @@ -36,7 +36,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmAVI : public gem::plugins::film { +class GEM_EXPORT filmAVI : public filmBase { public: ////////// @@ -45,7 +45,7 @@ ////////// // Destructor - virtual ~filmAVI(); + virtual ~filmAVI(void); #ifdef _WIN32 ////////// @@ -57,11 +57,11 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum=-1); + virtual errCode changeImage(int imgNum, int trackNum=-1); // the raw buffer for decoding... Modified: trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.cpp =================================================================== --- trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -18,6 +18,8 @@ #endif #include "filmAVIPLAY.h" +#include "plugins/PluginFactory.h" + using namespace gem::plugins; #ifdef HAVE_LIBAVIPLAY @@ -35,7 +37,7 @@ // ///////////////////////////////////////////////////////// -filmAVIPLAY :: filmAVIPLAY(void) : film() , +filmAVIPLAY :: filmAVIPLAY(void) : filmBase() , #ifdef HAVE_LIBAVIPLAY m_avifile(NULL), m_avistream(NULL), @@ -148,10 +150,10 @@ return 0; } -int filmAVIPLAY :: changeImage(int imgNum, int trackNum){ - if (!m_avistream)return FILM_ERROR_FAILURE; +film::errCode filmAVIPLAY :: changeImage(int imgNum, int trackNum){ + if (!m_avistream)return film::FAILURE; m_avistream->Seek(imgNum); m_readNext=true; - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } #endif // AVIPLAY Modified: trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.h =================================================================== --- trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmAVIPLAY/filmAVIPLAY.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -15,7 +15,7 @@ #ifndef INCLUDE_FILMAVIPLAY_H_ #define INCLUDE_FILMAVIPLAY_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #if defined (_WIN32) & defined (HAVE_LIBAVIPLAY) // un windows there are other ways... @@ -56,7 +56,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmAVIPLAY : public gem::plugins::film { +class GEM_EXPORT filmAVIPLAY : public filmBase { public: ////////// @@ -65,7 +65,7 @@ ////////// // Destructor - ~filmAVIPLAY(); + ~filmAVIPLAY(void); #ifdef HAVE_LIBAVIPLAY ////////// @@ -77,11 +77,11 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum=-1); + virtual errCode changeImage(int imgNum, int trackNum=-1); protected: IAviReadFile *m_avifile; Modified: trunk/Gem/plugins/filmDS/filmDS.cpp =================================================================== --- trunk/Gem/plugins/filmDS/filmDS.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmDS/filmDS.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -17,6 +17,8 @@ # include "config.h" #endif #include "filmDS.h" +#include "plugins/PluginFactory.h" + using namespace gem::plugins; #if defined(_WIN32) && defined(HAVE_DIRECTSHOW) @@ -44,7 +46,7 @@ // ///////////////////////////////////////////////////////// -filmDS :: filmDS(void) : film() { +filmDS :: filmDS(void) : filmBase() { #if defined(_WIN32) && defined(HAVE_DIRECTSHOW) HRESULT RetVal; m_reqFrame = 1; @@ -689,13 +691,13 @@ return &m_image; } -int filmDS :: changeImage(int imgNum, int trackNum){ +film::errCode filmDS :: changeImage(int imgNum, int trackNum){ m_reqFrame = imgNum; - if (m_reqFrame > m_Duration) return FILM_ERROR_FAILURE; + if (m_reqFrame > m_Duration) return film::FAILURE; - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } HRESULT filmGetPin(IBaseFilter *pFilter, PIN_DIRECTION PinDir, IPin **ppPin) Modified: trunk/Gem/plugins/filmDS/filmDS.h =================================================================== --- trunk/Gem/plugins/filmDS/filmDS.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmDS/filmDS.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -15,7 +15,7 @@ #ifndef INCLUDE_filmDS_H_ #define INCLUDE_filmDS_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #if defined(_WIN32) && defined(HAVE_DIRECTSHOW) # include <dshow.h> @@ -36,7 +36,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmDS : public gem::plugins::film { +class GEM_EXPORT filmDS : public filmBase { public: ////////// @@ -45,7 +45,7 @@ ////////// // Destructor - virtual ~filmDS(); + virtual ~filmDS(void); #if defined(_WIN32) && defined(HAVE_DIRECTSHOW) ////////// @@ -57,11 +57,11 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum=-1); + virtual errCode changeImage(int imgNum, int trackNum=-1); // the raw buffer for decoding... Modified: trunk/Gem/plugins/filmDarwin/filmDarwin.cpp =================================================================== --- trunk/Gem/plugins/filmDarwin/filmDarwin.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmDarwin/filmDarwin.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -18,6 +18,8 @@ # include "config.h" #endif #include "filmDarwin.h" +#include "plugins/PluginFactory.h" + using namespace gem::plugins; #ifdef HAVE_CARBONQUICKTIME @@ -33,7 +35,7 @@ // ///////////////////////////////////////////////////////// -filmDarwin :: filmDarwin(void) : film(false), +filmDarwin :: filmDarwin(void) : filmBase(false), #ifdef HAVE_CARBONQUICKTIME m_movie(NULL), m_srcGWorld(NULL), @@ -272,8 +274,8 @@ return &m_image; } -int filmDarwin :: changeImage(int imgNum, int trackNum){ +film::errCode filmDarwin :: changeImage(int imgNum, int trackNum){ m_curFrame=imgNum; // return 0; - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } Modified: trunk/Gem/plugins/filmDarwin/filmDarwin.h =================================================================== --- trunk/Gem/plugins/filmDarwin/filmDarwin.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmDarwin/filmDarwin.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -22,7 +22,7 @@ # define HAVE_CARBONQUICKTIME #endif -#include "plugins/film.h" +#include "plugins/filmBase.h" #ifdef HAVE_CARBONQUICKTIME # include <Carbon/carbon.h> @@ -43,7 +43,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmDarwin : public gem::plugins::film { +class GEM_EXPORT filmDarwin : public filmBase { public: ////////// @@ -52,7 +52,7 @@ ////////// // Destructor - virtual ~filmDarwin(); + virtual ~filmDarwin(void); ////////// // open a movie up @@ -63,11 +63,11 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum=-1); + virtual errCode changeImage(int imgNum, int trackNum=-1); protected: #ifdef HAVE_CARBONQUICKTIME Modified: trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.cpp =================================================================== --- trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -16,8 +16,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include <string.h> #include "filmGMERLIN.h" +#include "plugins/PluginFactory.h" + using namespace gem::plugins; #ifdef HAVE_GMERLIN @@ -33,7 +34,7 @@ // ///////////////////////////////////////////////////////// -filmGMERLIN :: filmGMERLIN(void) : film(), +filmGMERLIN :: filmGMERLIN(void) : filmBase(), #ifdef HAVE_GMERLIN m_file(NULL), m_opt(NULL), @@ -282,13 +283,13 @@ // changeFrame // ///////////////////////////////////////////////////////// -int filmGMERLIN :: changeImage(int imgNum, int trackNum){ +film::errCode filmGMERLIN :: changeImage(int imgNum, int trackNum){ if(trackNum<0) { /* just automatically proceed to the next frame: this might speed up things for linear decoding */ - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } - if(!m_file)return FILM_ERROR_FAILURE; + if(!m_file)return film::FAILURE; #if 0 // LATER implement track-switching @@ -314,7 +315,7 @@ } #endif - if(imgNum>m_numFrames || imgNum<0)return FILM_ERROR_FAILURE; + if(imgNum>m_numFrames || imgNum<0)return film::FAILURE; if (imgNum>0)m_curFrame=imgNum; @@ -325,7 +326,7 @@ // no assumptions about fixed framerate int64_t seekpos = gavl_frame_table_frame_to_time(m_frametable, imgNum, NULL); bgav_seek_video(m_file, m_track, seekpos); - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } #else if(0) { @@ -349,7 +350,7 @@ #define TIMESTAMP_OFFSET_MAX 5 if(diff<TIMESTAMP_OFFSET_MAX && diff>(TIMESTAMP_OFFSET_MAX * -1)) { // hey we are already there... - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } #endif @@ -357,12 +358,12 @@ bgav_seek_scaled(m_file, &seekpos, m_fps_num); if(seekposOrg == seekpos) - return FILM_ERROR_SUCCESS; + return film::SUCCESS; /* never mind: always return success... */ - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } } - return FILM_ERROR_FAILURE; + return film::FAILURE; } #endif // GMERLIN Modified: trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h =================================================================== --- trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmGMERLIN/filmGMERLIN.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -14,7 +14,7 @@ -----------------------------------------------------------------*/ #ifndef INCLUDE_FILMGMERLIN_H_ #define INCLUDE_FILMGMERLIN_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #include <stdio.h> #ifdef HAVE_LIBGMERLIN_AVDEC @@ -55,7 +55,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmGMERLIN : public gem::plugins::film { +class GEM_EXPORT filmGMERLIN : public filmBase { public: ////////// @@ -64,7 +64,7 @@ ////////// // Destructor - virtual ~filmGMERLIN(); + virtual ~filmGMERLIN(void); #ifdef HAVE_GMERLIN ////////// @@ -76,11 +76,11 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum = -1); + virtual errCode changeImage(int imgNum, int trackNum = -1); //----------------------------------- // GROUP: Movie data Modified: trunk/Gem/plugins/filmMPEG1/filmMPEG1.cpp =================================================================== --- trunk/Gem/plugins/filmMPEG1/filmMPEG1.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmMPEG1/filmMPEG1.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -17,10 +17,12 @@ # include "config.h" #endif -#include <string.h> #include "filmMPEG1.h" +#include "plugins/PluginFactory.h" + using namespace gem::plugins; + #ifdef HAVE_LIBMPEG REGISTER_FILMFACTORY("MPEG1", filmMPEG1); #endif @@ -34,7 +36,7 @@ // ///////////////////////////////////////////////////////// -filmMPEG1 :: filmMPEG1(void) : film(), +filmMPEG1 :: filmMPEG1(void) : filmBase(), m_data(NULL), m_length(0) { #ifdef HAVE_LIBMPEG @@ -149,15 +151,15 @@ return 0; } -int filmMPEG1 :: changeImage(int imgNum, int trackNum){ - if (m_reachedEnd&&imgNum>0)return FILM_ERROR_FAILURE; +film::errCode filmMPEG1 :: changeImage(int imgNum, int trackNum){ + if (m_reachedEnd&&imgNum>0)return film::FAILURE; m_readNext = true; if (imgNum==0){ - if (!RewindMPEG(m_streamfile, &m_streamVid))return FILM_ERROR_FAILURE; + if (!RewindMPEG(m_streamfile, &m_streamVid))return film::FAILURE; m_curFrame=0; m_reachedEnd=false; } - return FILM_ERROR_DONTKNOW; + return film::DONTKNOW; } #endif Modified: trunk/Gem/plugins/filmMPEG1/filmMPEG1.h =================================================================== --- trunk/Gem/plugins/filmMPEG1/filmMPEG1.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmMPEG1/filmMPEG1.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -15,7 +15,7 @@ #ifndef INCLUDE_FILMMPEG1_H_ #define INCLUDE_FILMMPEG1_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #include <stdio.h> #ifdef HAVE_LIBMPEG @@ -36,7 +36,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmMPEG1 : public gem::plugins::film { +class GEM_EXPORT filmMPEG1 : public filmBase { public: ////////// @@ -45,7 +45,7 @@ ////////// // Destructor - virtual ~filmMPEG1(); + virtual ~filmMPEG1(void); #ifdef HAVE_LIBMPEG ////////// @@ -57,15 +57,15 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // get the number of frames - virtual int getFrameNum() {return -1;} + virtual int getFrameNum(void) {return -1;} ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum = -1); + virtual errCode changeImage(int imgNum, int trackNum = -1); //----------------------------------- // GROUP: Movie data Modified: trunk/Gem/plugins/filmMPEG3/filmMPEG3.cpp =================================================================== --- trunk/Gem/plugins/filmMPEG3/filmMPEG3.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmMPEG3/filmMPEG3.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -18,6 +18,7 @@ #endif #include "filmMPEG3.h" +#include "plugins/PluginFactory.h" using namespace gem::plugins; #ifdef HAVE_LIBMPEG3 @@ -41,7 +42,7 @@ // ///////////////////////////////////////////////////////// -filmMPEG3 :: filmMPEG3(void) : film(false) { +filmMPEG3 :: filmMPEG3(void) : filmBase(false) { #ifdef HAVE_LIBMPEG3 mpeg_file=0; #endif @@ -167,18 +168,18 @@ return &m_image; } -int filmMPEG3 :: changeImage(int imgNum, int trackNum){ +film::errCode filmMPEG3 :: changeImage(int imgNum, int trackNum){ m_readNext = true; if (imgNum ==-1) imgNum=m_curFrame; - if (m_numFrames>1 && imgNum>=m_numFrames)return FILM_ERROR_FAILURE; + if (m_numFrames>1 && imgNum>=m_numFrames)return film::FAILURE; if (trackNum==-1||trackNum>m_numTracks)trackNum=m_curTrack; int test; if ((test=mpeg3_set_frame(mpeg_file, imgNum, trackNum))) { } m_curFrame=imgNum; m_curTrack=trackNum; - return FILM_ERROR_SUCCESS; + return film::SUCCESS; m_readNext=false; - return FILM_ERROR_FAILURE; + return film::FAILURE; } #endif Modified: trunk/Gem/plugins/filmMPEG3/filmMPEG3.h =================================================================== --- trunk/Gem/plugins/filmMPEG3/filmMPEG3.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmMPEG3/filmMPEG3.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -15,7 +15,7 @@ #ifndef INCLUDE_FILMMPEG3_H_ #define INCLUDE_FILMMPEG3_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #include <stdio.h> #ifdef HAVE_LIBMPEG3 #include <libmpeg3.h> @@ -35,7 +35,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmMPEG3 : public gem::plugins::film { +class GEM_EXPORT filmMPEG3 : public filmBase { public: ////////// @@ -44,7 +44,7 @@ ////////// // Destructor - virtual ~filmMPEG3(); + virtual ~filmMPEG3(void); #ifdef HAVE_LIBMPEG3 ////////// @@ -56,11 +56,11 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum = -1); + virtual errCode changeImage(int imgNum, int trackNum = -1); //----------------------------------- // GROUP: Movie data Modified: trunk/Gem/plugins/filmQT/filmQT.cpp =================================================================== --- trunk/Gem/plugins/filmQT/filmQT.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmQT/filmQT.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -31,6 +31,7 @@ #include "filmQT.h" +#include "plugins/PluginFactory.h" using namespace gem::plugins; REGISTER_FILMFACTORY("QuickTime", filmQT); @@ -83,7 +84,7 @@ // ///////////////////////////////////////////////////////// -filmQT :: filmQT(void) : film(false), +filmQT :: filmQT(void) : filmBase(false), m_movie(NULL), m_srcGWorld(NULL), m_movieTime(0), @@ -280,12 +281,12 @@ return m_fps; } -int filmQT :: changeImage(int imgNum, int trackNum){ +film::errCode filmQT :: changeImage(int imgNum, int trackNum){ m_readNext = false; if (imgNum ==-1) imgNum=m_curFrame; if (m_numFrames>1 && imgNum>=m_numFrames){ m_movieTime=0; - return FILM_ERROR_FAILURE; + return film::FAILURE; } if (trackNum==-1||trackNum>m_numTracks)trackNum=m_curTrack; m_readNext=true; @@ -297,7 +298,7 @@ */ m_movieTime = static_cast<long>(m_curFrame * duration); - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } #ifdef LOADRAM Modified: trunk/Gem/plugins/filmQT/filmQT.h =================================================================== --- trunk/Gem/plugins/filmQT/filmQT.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmQT/filmQT.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -13,7 +13,7 @@ -----------------------------------------------------------------*/ #ifndef INCLUDE_FILMQT_H_ #define INCLUDE_FILMQT_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #ifdef HAVE_CARBONQUICKTIME # include <Carbon/Carbon.h> @@ -37,7 +37,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmQT : public gem::plugins::film +class GEM_EXPORT filmQT : public filmBase { public: ////////// @@ -55,15 +55,15 @@ virtual void close(void); // get the frames per seconds (or "-1" if unknown) - virtual double getFPS(); + virtual double getFPS(void); ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum = -1); + virtual errCode changeImage(int imgNum, int trackNum = -1); protected: //----------------------------------- Modified: trunk/Gem/plugins/filmQT4L/filmQT4L.cpp =================================================================== --- trunk/Gem/plugins/filmQT4L/filmQT4L.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmQT4L/filmQT4L.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -17,8 +17,8 @@ # include "config.h" #endif -#include <string.h> #include "filmQT4L.h" +#include "plugins/PluginFactory.h" using namespace gem::plugins; #ifdef HAVE_LIBQUICKTIME @@ -36,7 +36,7 @@ // ///////////////////////////////////////////////////////// -filmQT4L :: filmQT4L(void) : film() { +filmQT4L :: filmQT4L(void) : filmBase() { #ifdef HAVE_LIBQUICKTIME m_quickfile=0; #endif @@ -151,8 +151,8 @@ return pimage; } -int filmQT4L :: changeImage(int imgNum, int trackNum){ - if(imgNum>m_numFrames || imgNum<0)return FILM_ERROR_FAILURE; +film::errCode filmQT4L :: changeImage(int imgNum, int trackNum){ + if(imgNum>m_numFrames || imgNum<0)return film::FAILURE; if (imgNum>0)m_curFrame=imgNum; if(trackNum>0)m_curTrack=trackNum; @@ -162,6 +162,6 @@ #else if ((i=quicktime_set_video_position(m_quickfile, m_curFrame, m_curTrack))){ } #endif - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } #endif // QT4L Modified: trunk/Gem/plugins/filmQT4L/filmQT4L.h =================================================================== --- trunk/Gem/plugins/filmQT4L/filmQT4L.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmQT4L/filmQT4L.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -15,7 +15,7 @@ #ifndef INCLUDE_FILMQT4L_H_ #define INCLUDE_FILMQT4L_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #include <stdio.h> #ifdef HAVE_LIBQUICKTIME @@ -37,7 +37,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmQT4L : public gem::plugins::film { +class GEM_EXPORT filmQT4L : public filmBase { public: ////////// @@ -46,7 +46,7 @@ ////////// // Destructor - virtual ~filmQT4L(); + virtual ~filmQT4L(void); #ifdef HAVE_LIBQUICKTIME ////////// @@ -58,11 +58,11 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum = -1); + virtual errCode changeImage(int imgNum, int trackNum = -1); //----------------------------------- // GROUP: Movie data Modified: trunk/Gem/plugins/filmTEST/filmTEST.cpp =================================================================== --- trunk/Gem/plugins/filmTEST/filmTEST.cpp 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmTEST/filmTEST.cpp 2011-08-08 14:28:35 UTC (rev 4437) @@ -19,6 +19,8 @@ #include <string.h> #include "filmTEST.h" +#include "plugins/PluginFactory.h" +#include "Gem/RTE.h" using namespace gem::plugins; @@ -33,7 +35,7 @@ // ///////////////////////////////////////////////////////// -filmTEST :: filmTEST(void) : film(), +filmTEST :: filmTEST(void) : filmBase(), m_data(NULL), m_length(0) { m_image.image.setCsizeByFormat(GL_RGBA); @@ -68,7 +70,7 @@ return &m_image; } -int filmTEST :: changeImage(int imgNum, int trackNum){ +film::errCode filmTEST :: changeImage(int imgNum, int trackNum){ unsigned char*data=m_image.image.data; unsigned int size=m_image.image.xsize*m_image.image.ysize*m_image.image.csize; @@ -81,5 +83,5 @@ m_image.newimage=true; - return FILM_ERROR_SUCCESS; + return film::SUCCESS; } Modified: trunk/Gem/plugins/filmTEST/filmTEST.h =================================================================== --- trunk/Gem/plugins/filmTEST/filmTEST.h 2011-08-08 14:27:22 UTC (rev 4436) +++ trunk/Gem/plugins/filmTEST/filmTEST.h 2011-08-08 14:28:35 UTC (rev 4437) @@ -15,7 +15,7 @@ #ifndef INCLUDE_FILMTEST_H_ #define INCLUDE_FILMTEST_H_ -#include "plugins/film.h" +#include "plugins/filmBase.h" #include <stdio.h> /*----------------------------------------------------------------- @@ -32,7 +32,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT filmTEST : public gem::plugins::film { +class GEM_EXPORT filmTEST : public filmBase { public: ////////// @@ -45,11 +45,11 @@ ////////// // get the next frame - virtual pixBlock* getFrame(); + virtual pixBlock* getFrame(void); ////////// // set the next frame to read; - virtual int changeImage(int imgNum, int trackNum = -1); + virtual errCode changeImage(int imgNum, int trackNum = -1); //----------------------------------- unsigned char*m_data; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ pd-gem-CVS mailing list pd-gem-CVS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs