X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=df0677ce2753cce5733c5d2bc4dfe3877574c46f;hb=f0f9e433051b21e14471bb48bc5d140e6c2b14c5;hp=56d1d3f36fa8d935b03abae7341670264bb91730;hpb=40b169c095486ba1b868486eb98a47c41f36ce8c;p=melted

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 56d1d3f..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"
@@ -85,9 +84,6 @@ int mlt_producer_init( mlt_producer this, void *child )
 			mlt_properties_set( properties, "mlt_type", "mlt_producer" );
 			mlt_properties_set_position( properties, "_position", 0.0 );
 			mlt_properties_set_double( properties, "_frame", 0 );
-			mlt_properties_set_double( properties, "fps", mlt_profile_fps( NULL ) );
-			mlt_properties_set_int( properties, "frame_rate_num", mlt_profile_get()->frame_rate_num );
-			mlt_properties_set_int( properties, "frame_rate_den", mlt_profile_get()->frame_rate_den );
 			mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( NULL ) );
 			mlt_properties_set_double( properties, "_speed", 1.0 );
 			mlt_properties_set_position( properties, "in", 0 );
@@ -292,7 +288,8 @@ double mlt_producer_get_speed( mlt_producer this )
 
 double mlt_producer_get_fps( mlt_producer this )
 {
-	return mlt_properties_get_double( MLT_PRODUCER_PROPERTIES( this ), "fps" );
+	mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( this ) );
+	return mlt_profile_fps( profile );
 }
 
 /** Set the in and out points.
@@ -419,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 ) );
@@ -440,7 +437,6 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind
 		// Copy the fps and speed of the producer onto the frame
 		properties = MLT_FRAME_PROPERTIES( *frame );
 		mlt_properties_set_double( properties, "_speed", speed );
-		mlt_properties_set_double( properties, "fps", mlt_producer_get_fps( this ) );
 		mlt_properties_set_int( properties, "test_audio", mlt_frame_is_test_audio( *frame ) );
 		mlt_properties_set_int( properties, "test_image", mlt_frame_is_test_card( *frame ) );
 		if ( mlt_properties_get_data( properties, "_producer", NULL ) == NULL )
@@ -500,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;
 	}
 
@@ -557,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 );