X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=df0677ce2753cce5733c5d2bc4dfe3877574c46f;hb=f0f9e433051b21e14471bb48bc5d140e6c2b14c5;hp=5d3963c5e52e42f0413842b5ef5ee6eab54c0043;hpb=a07c3da76259d6ba479d800ffecc5617a9ad158f;p=melted diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index 5d3963c..df0677c 100644 --- a/src/framework/mlt_producer.c +++ b/src/framework/mlt_producer.c @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" #include "mlt_producer.h" #include "mlt_factory.h" #include "mlt_frame.h" @@ -289,7 +288,8 @@ double mlt_producer_get_speed( mlt_producer this ) double mlt_producer_get_fps( mlt_producer this ) { - return mlt_profile_fps( NULL ); + mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( this ) ); + return mlt_profile_fps( profile ); } /** Set the in and out points. @@ -416,7 +416,7 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind if ( this->get_frame == NULL || ( !strcmp( eof, "continue" ) && mlt_producer_position( this ) > mlt_producer_get_out( this ) ) ) { // Generate a test frame - *frame = mlt_frame_init( ); + *frame = mlt_frame_init( service ); // Set the position result = mlt_frame_set_position( *frame, mlt_producer_position( this ) ); @@ -496,7 +496,7 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind } else { - *frame = mlt_frame_init( ); + *frame = mlt_frame_init( service ); result = 0; } @@ -553,14 +553,15 @@ static mlt_producer mlt_producer_clone( mlt_producer this ) mlt_properties properties = MLT_PRODUCER_PROPERTIES( this ); char *resource = mlt_properties_get( properties, "resource" ); char *service = mlt_properties_get( properties, "mlt_service" ); + mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( this ) ); mlt_events_block( mlt_factory_event_object( ), mlt_factory_event_object( ) ); if ( service != NULL ) - clone = mlt_factory_producer( service, resource ); + clone = mlt_factory_producer( profile, service, resource ); if ( clone == NULL && resource != NULL ) - clone = mlt_factory_producer( "fezzik", resource ); + clone = mlt_factory_producer( profile, mlt_environment( "MLT_PRODUCER" ), resource ); if ( clone != NULL ) mlt_properties_inherit( MLT_PRODUCER_PROPERTIES( clone ), properties );