X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finigo%2Finigo.c;h=b3a4b105f1cce68ed6179d82ae7464e888b481ff;hb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;hp=e39b21d48080346f10ce5e5879170ed77a10e9ce;hpb=9ad7cb6cdea367db7a720fa0335f8b8eccf0ae09;p=melted

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index e39b21d..b3a4b10 100644
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sched.h>
 
 #include <framework/mlt.h>
 
@@ -8,8 +9,9 @@
 
 static void transport_action( mlt_producer producer, char *value )
 {
-	mlt_properties properties = mlt_producer_properties( producer );
+	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 );
 
@@ -64,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;
@@ -109,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':
@@ -121,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 );
@@ -128,30 +134,32 @@ static void transport_action( mlt_producer producer, char *value )
 
 static mlt_consumer create_consumer( char *id, mlt_producer producer )
 {
-	char *arg = strchr( id, ':' );
+	char *arg = id != NULL ? strchr( id, ':' ) : NULL;
 	if ( arg != NULL )
 		*arg ++ = '\0';
 	mlt_consumer consumer = mlt_factory_consumer( id, arg );
 	if ( consumer != NULL )
 	{
-		mlt_properties properties = mlt_consumer_properties( consumer );
+		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;
 }
 
 static void transport( mlt_producer producer, mlt_consumer consumer )
 {
-	mlt_properties properties = mlt_producer_properties( producer );
-	int silent = mlt_properties_get_int( mlt_consumer_properties( consumer ), "silent" );
-
-	term_init( );
+	mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
+	int silent = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "silent" );
+	struct timespec tm = { 0, 40000 };
 
 	if ( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) )
 	{
 		if ( !silent )
 		{
+			term_init( );
+
 			fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
 			fprintf( stderr, "|1=-10| |2= -5| |3= -2| |4= -1| |5=  0| |6=  1| |7=  2| |8=  5| |9= 10|\n" );
 			fprintf( stderr, "+-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+ +-----+\n" );
@@ -166,12 +174,19 @@ static void transport( mlt_producer producer, mlt_consumer consumer )
 
 		while( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) )
 		{
-			int value = term_read( );
+			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 );
 		}
 
 		if ( !silent )
@@ -186,6 +201,14 @@ int main( int argc, char **argv )
 	mlt_producer inigo = NULL;
 	FILE *store = NULL;
 	char *name = NULL;
+	struct sched_param scp;
+
+	// Use realtime scheduling if possible
+	memset( &scp, '\0', sizeof( scp ) );
+	scp.sched_priority = sched_get_priority_max( SCHED_FIFO ) - 1;
+#ifndef __DARWIN__
+	sched_setscheduler( 0, SCHED_FIFO, &scp );
+#endif
 
 	// Construct the factory
 	mlt_factory_init( NULL );
@@ -208,7 +231,7 @@ int main( int argc, char **argv )
 	if ( argc > 1 && inigo != NULL && mlt_producer_get_length( inigo ) > 0 )
 	{
 		// Get inigo's properties
-		mlt_properties inigo_props = mlt_producer_properties( inigo );
+		mlt_properties inigo_props = MLT_PRODUCER_PROPERTIES( inigo );
 
 		// Get the last group
 		mlt_properties group = mlt_properties_get_data( inigo_props, "group", 0 );
@@ -246,16 +269,16 @@ int main( int argc, char **argv )
 
 		// If we have no consumer, default to sdl
 		if ( store == NULL && consumer == NULL )
-			consumer = create_consumer( "sdl", inigo );
+			consumer = create_consumer( NULL, inigo );
 
 		if ( consumer != NULL && store == NULL )
 		{
 			// Apply group settings
-			mlt_properties properties = mlt_consumer_properties( consumer );
+			mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer );
 			mlt_properties_inherit( properties, group );
 
 			// Connect consumer to inigo
-			mlt_consumer_connect( consumer, mlt_producer_service( inigo ) );
+			mlt_consumer_connect( consumer, MLT_PRODUCER_SERVICE( inigo ) );
 
 			// Start the consumer
 			mlt_consumer_start( consumer );