Revision: 4436 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4436&view=rev Author: zmoelnig Date: 2011-08-08 14:27:22 +0000 (Mon, 08 Aug 2011)
Log Message: ----------- use gem::film::ERRCODE rather than FILM_ERR_ERRCODE Modified Paths: -------------- trunk/Gem/src/Pixes/pix_film.cpp trunk/Gem/src/Pixes/pix_movie.cpp Modified: trunk/Gem/src/Pixes/pix_film.cpp =================================================================== --- trunk/Gem/src/Pixes/pix_film.cpp 2011-08-08 14:26:47 UTC (rev 4435) +++ trunk/Gem/src/Pixes/pix_film.cpp 2011-08-08 14:27:22 UTC (rev 4436) @@ -8,7 +8,7 @@ // // Copyright (c) 1997-1999 Mark Danks. // Copyright (c) Günther Geiger. -// Copyright (c) 2001-2002 IOhannes m zmoelnig. forum::für::umläute. IEM +// Copyright (c) 2001-2011 IOhannes m zmoelnig. forum::für::umläute. IEM // Copyright (c) 2002 James Tittle & Chris Clepper // For information on usage and redistribution, and for a DISCLAIMER OF ALL // WARRANTIES, see the file, "GEM.LICENSE.TERMS" in this distribution. @@ -18,9 +18,11 @@ #ifndef GEM_FILMBACKEND #include "pix_film.h" +#include "Gem/Image.h" + #include "Gem/State.h" - #include "Gem/Cache.h" +#include "plugins/PluginFactory.h" #include <ctype.h> #include <stdio.h> @@ -129,7 +131,7 @@ if(reqFrame!=me->m_curFrame || reqTrack!=me->m_curTrack){ pthread_mutex_lock(me->m_mutex); - if (me->m_handle->changeImage(reqFrame, reqTrack)!=FILM_ERROR_FAILURE){ + if (gem::plugins::film::FAILURE!=me->m_handle->changeImage(reqFrame, reqTrack)){ me->m_frame=me->m_handle->getFrame(); } else me->m_frame=0; @@ -470,7 +472,7 @@ if(m_thread_running){ m_reqFrame+=m_auto; } else - if (m_handle->changeImage(static_cast<int>(m_reqFrame+=m_auto))==FILM_ERROR_FAILURE){ + if (gem::plugins::film::FAILURE==m_handle->changeImage(static_cast<int>(m_reqFrame+=m_auto))){ // m_reqFrame = m_numFrames; outlet_bang(m_outEnd); } @@ -495,7 +497,7 @@ #endif if (m_handle){ if(!m_thread_running){ - if (m_handle->changeImage(imgNum, trackNum)==FILM_ERROR_FAILURE){ + if (gem::plugins::film::FAILURE==m_handle->changeImage(imgNum, trackNum)){ outlet_bang(m_outEnd); } } Modified: trunk/Gem/src/Pixes/pix_movie.cpp =================================================================== --- trunk/Gem/src/Pixes/pix_movie.cpp 2011-08-08 14:26:47 UTC (rev 4435) +++ trunk/Gem/src/Pixes/pix_movie.cpp 2011-08-08 14:27:22 UTC (rev 4436) @@ -118,7 +118,7 @@ if(m_thread_running){ m_reqFrame+=m_auto; } else - if (m_handle->changeImage((int)(m_reqFrame+=m_auto))==FILM_ERROR_FAILURE){ + if (gem::plugins::film::FAILURE==m_handle->changeImage((int)(m_reqFrame+=m_auto))){ // m_reqFrame = m_numFrames; outlet_bang(m_outEnd); } 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