X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finigo%2Finigo.c;h=b3a4b105f1cce68ed6179d82ae7464e888b481ff;hb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;hp=f7ffffc26be16a6bbf04757ca4bca1c23715ad5c;hpb=db805d6e2f1945f27bfa7c3a9123f8c4bef5fdc4;p=melted diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c index f7ffffc..b3a4b10 100644 --- a/src/inigo/inigo.c +++ b/src/inigo/inigo.c @@ -11,6 +11,7 @@ static void transport_action( mlt_producer producer, char *value ) { mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); mlt_multitrack multitrack = mlt_properties_get_data( properties, "multitrack", NULL ); + mlt_consumer consumer = mlt_properties_get_data( properties, "transport_consumer", NULL ); mlt_properties_set_int( properties, "stats_off", 0 ); @@ -65,7 +66,7 @@ static void transport_action( mlt_producer producer, char *value ) if ( time == last ) break; last = time; - fprintf( stderr, "%d: %d\n", i, time ); + fprintf( stderr, "%d: %d\n", i, (int)time ); } } break; @@ -110,8 +111,10 @@ static void transport_action( mlt_producer producer, char *value ) if ( producer != NULL ) { mlt_position position = mlt_producer_position( producer ); - mlt_producer_set_speed( producer, 0 ); - mlt_producer_seek( producer, position + 1 ); + if ( mlt_producer_get_speed( producer ) != 0 ) + mlt_producer_set_speed( producer, 0 ); + else + mlt_producer_seek( producer, position + 1 ); } break; case 'L': @@ -122,6 +125,8 @@ static void transport_action( mlt_producer producer, char *value ) } break; } + + mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( consumer ), "refresh", 1 ); } mlt_properties_set_int( properties, "stats_off", 0 ); @@ -138,6 +143,7 @@ static mlt_consumer create_consumer( char *id, mlt_producer producer ) mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); mlt_properties_set_data( properties, "transport_callback", transport_action, 0, NULL, NULL ); mlt_properties_set_data( properties, "transport_producer", producer, 0, NULL, NULL ); + mlt_properties_set_data( MLT_PRODUCER_PROPERTIES( producer ), "transport_consumer", consumer, 0, NULL, NULL ); } return consumer; } @@ -171,10 +177,13 @@ static void transport( mlt_producer producer, mlt_consumer consumer ) int value = silent ? -1 : term_read( ); if ( value != -1 ) - transport_action( producer, ( char * )&value ); + { + char string[ 2 ] = { value, 0 }; + transport_action( producer, string ); + } if ( !silent && mlt_properties_get_int( properties, "stats_off" ) == 0 ) - fprintf( stderr, "Current Position: %10d\r", mlt_producer_position( producer ) ); + fprintf( stderr, "Current Position: %10d\r", (int)mlt_producer_position( producer ) ); if ( silent ) nanosleep( &tm, NULL );