From 2ec3359e476bc73d56e09fb597e1a424f2d1708d Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Thu, 15 Jan 2004 11:27:35 +0000 Subject: [PATCH] in/out specification on .inigo serialisations git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@80 d19143bc-622f-0410-bfdd-b5b2a6649095 --- mlt/src/framework/mlt_producer.c | 8 ++++---- mlt/src/framework/mlt_tractor.c | 4 ++-- src/framework/mlt_producer.c | 8 ++++---- src/framework/mlt_tractor.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mlt/src/framework/mlt_producer.c b/mlt/src/framework/mlt_producer.c index c8a3e69..c3ba4e6 100644 --- a/mlt/src/framework/mlt_producer.c +++ b/mlt/src/framework/mlt_producer.c @@ -115,6 +115,10 @@ int mlt_producer_seek( mlt_producer this, mlt_position position ) mlt_position mlt_producer_position( mlt_producer this ) { + //char *resource = mlt_properties_get( mlt_producer_properties( this ), "resource" ); + //mlt_position frame = mlt_properties_get_position( mlt_producer_properties( this ), "frame" ); + //mlt_position position = mlt_properties_get_position( mlt_producer_properties( this ), "position" ); + //fprintf( stderr, "%s: %lld %lld\n", resource, frame, position ); return mlt_properties_get_position( mlt_producer_properties( this ), "position" ); } @@ -123,10 +127,6 @@ mlt_position mlt_producer_position( mlt_producer this ) mlt_position mlt_producer_frame( mlt_producer this ) { - //char *resource = mlt_properties_get( mlt_producer_properties( this ), "resource" ); - //mlt_position frame = mlt_properties_get_position( mlt_producer_properties( this ), "frame" ); - //mlt_position position = mlt_properties_get_position( mlt_producer_properties( this ), "position" ); - //fprintf( stderr, "%s: %lld %lld\n", resource, frame, position ); return mlt_properties_get_position( mlt_producer_properties( this ), "frame" ); } diff --git a/mlt/src/framework/mlt_tractor.c b/mlt/src/framework/mlt_tractor.c index 72f9e72..147c45d 100644 --- a/mlt/src/framework/mlt_tractor.c +++ b/mlt/src/framework/mlt_tractor.c @@ -135,7 +135,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra mlt_producer target = mlt_multitrack_producer( multitrack ); mlt_producer_seek( target, mlt_producer_frame( parent ) ); mlt_producer_set_speed( target, mlt_producer_get_speed( parent ) ); - mlt_producer_set_in_and_out( parent, mlt_producer_get_in( target ), mlt_producer_get_out( target ) ); + //mlt_producer_set_in_and_out( parent, mlt_producer_get_in( target ), mlt_producer_get_out( target ) ); } else { @@ -158,7 +158,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra *frame = temp; } else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && looking && - mlt_producer_position( parent ) == mlt_properties_get_position( mlt_frame_properties( temp ), "position" ) ) + mlt_producer_frame( parent ) == mlt_frame_get_position( temp ) ) { *frame = temp; looking = 0; diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index c8a3e69..c3ba4e6 100644 --- a/src/framework/mlt_producer.c +++ b/src/framework/mlt_producer.c @@ -115,6 +115,10 @@ int mlt_producer_seek( mlt_producer this, mlt_position position ) mlt_position mlt_producer_position( mlt_producer this ) { + //char *resource = mlt_properties_get( mlt_producer_properties( this ), "resource" ); + //mlt_position frame = mlt_properties_get_position( mlt_producer_properties( this ), "frame" ); + //mlt_position position = mlt_properties_get_position( mlt_producer_properties( this ), "position" ); + //fprintf( stderr, "%s: %lld %lld\n", resource, frame, position ); return mlt_properties_get_position( mlt_producer_properties( this ), "position" ); } @@ -123,10 +127,6 @@ mlt_position mlt_producer_position( mlt_producer this ) mlt_position mlt_producer_frame( mlt_producer this ) { - //char *resource = mlt_properties_get( mlt_producer_properties( this ), "resource" ); - //mlt_position frame = mlt_properties_get_position( mlt_producer_properties( this ), "frame" ); - //mlt_position position = mlt_properties_get_position( mlt_producer_properties( this ), "position" ); - //fprintf( stderr, "%s: %lld %lld\n", resource, frame, position ); return mlt_properties_get_position( mlt_producer_properties( this ), "frame" ); } diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c index 72f9e72..147c45d 100644 --- a/src/framework/mlt_tractor.c +++ b/src/framework/mlt_tractor.c @@ -135,7 +135,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra mlt_producer target = mlt_multitrack_producer( multitrack ); mlt_producer_seek( target, mlt_producer_frame( parent ) ); mlt_producer_set_speed( target, mlt_producer_get_speed( parent ) ); - mlt_producer_set_in_and_out( parent, mlt_producer_get_in( target ), mlt_producer_get_out( target ) ); + //mlt_producer_set_in_and_out( parent, mlt_producer_get_in( target ), mlt_producer_get_out( target ) ); } else { @@ -158,7 +158,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra *frame = temp; } else if ( ( !mlt_frame_is_test_card( temp ) || !mlt_frame_is_test_audio( temp ) ) && looking && - mlt_producer_position( parent ) == mlt_properties_get_position( mlt_frame_properties( temp ), "position" ) ) + mlt_producer_frame( parent ) == mlt_frame_get_position( temp ) ) { *frame = temp; looking = 0; -- 1.7.4.4