OS/X Patch from Torsten Spindler

[melted] / src / inigo / inigo.c

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index e39b21d..5fbdff6 100644 (file)
--- 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,7 +9,7 @@
 
 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_properties_set_int( properties, "stats_off", 0 );
@@ -128,13 +129,13 @@ 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 );
        }
@@ -143,15 +144,16 @@ static mlt_consumer create_consumer( char *id, mlt_producer producer )
 
 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 +168,16 @@ 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 );
 
                        if ( !silent && mlt_properties_get_int( properties, "stats_off" ) == 0 )
                                fprintf( stderr, "Current Position: %10d\r", mlt_producer_position( producer ) );
+
+                       if ( silent )
+                               nanosleep( &tm, NULL );
                }
 
                if ( !silent )
@@ -186,6 +192,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 +222,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 +260,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 );