Revision: 4513 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4513&view=rev Author: zmoelnig Date: 2011-08-28 13:40:49 +0000 (Sun, 28 Aug 2011) Log Message: ----------- merged back bugfixes from trunk
Modified Paths: -------------- branches/0.93/Gem/help/pix_freeframe-help.pd branches/0.93/Gem/help/pix_frei0r-help.pd branches/0.93/Gem/help/separator-help.pd branches/0.93/Gem/src/Pixes/pix_film.cpp branches/0.93/Gem/src/Pixes/pix_freeframe.cpp branches/0.93/Gem/src/Pixes/pix_frei0r.cpp Property Changed: ---------------- branches/0.93/Gem/src/Pixes/pix_film.cpp Modified: branches/0.93/Gem/help/pix_freeframe-help.pd =================================================================== (Binary files differ) Modified: branches/0.93/Gem/help/pix_frei0r-help.pd =================================================================== (Binary files differ) Modified: branches/0.93/Gem/help/separator-help.pd =================================================================== (Binary files differ) Modified: branches/0.93/Gem/src/Pixes/pix_film.cpp =================================================================== --- branches/0.93/Gem/src/Pixes/pix_film.cpp 2011-08-28 13:34:28 UTC (rev 4512) +++ branches/0.93/Gem/src/Pixes/pix_film.cpp 2011-08-28 13:40:49 UTC (rev 4513) @@ -336,6 +336,11 @@ double d=(double)format; wantProps.set("colorspace", format); + if(m_auto!=0.f) { + double v=m_auto; + wantProps.set("auto", v); + } + if(codec>=0){ codec=codec%m_handles.size(); if (m_handles[codec] && m_handles[codec]->open(buf, wantProps )) { @@ -367,7 +372,7 @@ if (!m_handle){ // post(" ... giving up!"); error("unable to open file: %s", filename->s_name); - return; + return; } double width=-1; @@ -416,7 +421,6 @@ } } #endif - } ///////////////////////////////////////////////////////// @@ -488,14 +492,13 @@ #endif /* PTHREADS */ // automatic proceeding - if (m_auto!=0){ - if(m_thread_running){ - m_reqFrame+=m_auto; - } else - if (gem::plugins::film::FAILURE==m_handle->changeImage(static_cast<int>(m_reqFrame+=m_auto))){ - // m_reqFrame = m_numFrames; - outlet_bang(m_outEnd); - } + m_reqFrame+=m_auto; + + if (m_auto!=0 && !m_thread_running){ + if (gem::plugins::film::FAILURE==m_handle->changeImage(static_cast<int>(m_reqFrame+=m_auto))){ + // m_reqFrame = m_numFrames; + outlet_bang(m_outEnd); + } } } @@ -568,11 +571,12 @@ void pix_film :: autoMess(double speed) { - m_auto=speed; + m_auto=(t_float)speed; gem::Properties props; gem::any value=speed; props.set("auto", value); - m_handle->setProperties(props); + if(m_handle) + m_handle->setProperties(props); } @@ -598,7 +602,7 @@ class_addmethod(classPtr, reinterpret_cast<t_method>(&pix_film::changeImageCallback), gensym("img_num"), A_GIMME, A_NULL); - CPPEXTERN_MSG1(classPtr, "auto", autoMess, double); + CPPEXTERN_MSG1(classPtr, "auto", autoMess, t_float); CPPEXTERN_MSG1(classPtr, "colorspace", csMess, t_symbol*); #if 0 class_addmethod(classPtr, reinterpret_cast<t_method>(&pix_film::csCallback), Property changes on: branches/0.93/Gem/src/Pixes/pix_film.cpp ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: branches/0.93/Gem/src/Pixes/pix_freeframe.cpp =================================================================== --- branches/0.93/Gem/src/Pixes/pix_freeframe.cpp 2011-08-28 13:34:28 UTC (rev 4512) +++ branches/0.93/Gem/src/Pixes/pix_freeframe.cpp 2011-08-28 13:40:49 UTC (rev 4513) @@ -538,6 +538,8 @@ m_parameter.clear(); unsigned int count=getNumParameters_(); unsigned int i; + + m_parameterNames.push_back(""); // dummy parameter for(i=0; i<count; i++) { std::string name=getParameterName_(i); FFUInt32 type = getParameterType_ (i); @@ -760,7 +762,7 @@ char tempVt[5]; unsigned int i; - for(i=0; i<numparams; i++) { + for(i=1; i<numparams; i++) { snprintf(tempVt, 5, "#%d", i); tempVt[4]=0; unsigned int parmType=0; @@ -934,7 +936,7 @@ error("no instance of plugin available"); return; } - std::string key=m_plugin->getParameterName(param); + std::string key=m_plugin->getParameterName(param-1); parmMess(key, value); } @@ -992,7 +994,7 @@ void pix_freeframe :: obj_setupCallback(t_class *classPtr) { class_addanything(classPtr, reinterpret_cast<t_method>(&pix_freeframe::parmCallback)); - class_addmethod (classPtr, reinterpret_cast<t_method>(&pix_freeframe::openCallback), gensym("open"), A_SYMBOL, A_NULL); + class_addmethod (classPtr, reinterpret_cast<t_method>(&pix_freeframe::openCallback), gensym("load"), A_SYMBOL, A_NULL); gem_register_loader(freeframe_loader); } Modified: branches/0.93/Gem/src/Pixes/pix_frei0r.cpp =================================================================== --- branches/0.93/Gem/src/Pixes/pix_frei0r.cpp 2011-08-28 13:34:28 UTC (rev 4512) +++ branches/0.93/Gem/src/Pixes/pix_frei0r.cpp 2011-08-28 13:40:49 UTC (rev 4513) @@ -541,7 +541,7 @@ void pix_frei0r :: obj_setupCallback(t_class *classPtr) { class_addanything(classPtr, reinterpret_cast<t_method>(&pix_frei0r::parmCallback)); - class_addmethod (classPtr, reinterpret_cast<t_method>(&pix_frei0r::openCallback), gensym("open"), A_SYMBOL, A_NULL); + class_addmethod (classPtr, reinterpret_cast<t_method>(&pix_frei0r::openCallback), gensym("load"), A_SYMBOL, A_NULL); gem_register_loader(frei0r_loader); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ EMC VNX: the world's simplest storage, starting under $10K The only unified storage solution that offers unified management Up to 160% more powerful than alternatives and 25% more efficient. Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev _______________________________________________ pd-gem-CVS mailing list pd-gem-CVS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs