configure

[melted] / src / inigo / inigo.c

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index bc2f156..b3a4b10 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,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 );
@@ -134,17 +140,18 @@ static mlt_consumer create_consumer( char *id, mlt_producer producer )
        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" );
+       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 ) )
@@ -170,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 );
@@ -191,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 );
@@ -213,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 );
@@ -256,11 +274,11 @@ int main( int argc, char **argv )
                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 );