X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finigo%2Finigo.c;h=291e1a4c9917c5ba860c0189122a8d6d503d1fbf;hb=34c7916b96a65dbfb6d9414aca781d6292474f98;hp=b29df7030da9f7924c0a70bdb4f3534accf34dcd;hpb=2ffcb9719b9f3965f8e9daad58bed80455ec7eff;p=melted diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c index b29df70..291e1a4 100644 --- a/src/inigo/inigo.c +++ b/src/inigo/inigo.c @@ -1,15 +1,21 @@ #include #include #include +#include #include +#ifdef __DARWIN__ +#include +#endif + #include "io.h" 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 +70,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 +115,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 +129,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,49 +138,94 @@ 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 ) +#ifdef __DARWIN__ + +static void event_handling( mlt_producer producer, mlt_consumer consumer ) { - mlt_properties properties = mlt_producer_properties( producer ); + SDL_Event event; - term_init( ); + while ( SDL_PollEvent( &event ) ) + { + switch( event.type ) + { + case SDL_QUIT: + mlt_properties_set_int( MLT_PRODUCER_PROPERTIES( consumer ), "done", 1 ); + break; + + case SDL_KEYDOWN: + if ( event.key.keysym.unicode < 0x80 && event.key.keysym.unicode > 0 ) + { + char keyboard[ 2 ] = { event.key.keysym.unicode, 0 }; + transport_action( producer, keyboard ); + } + break; + } + } +} + +#endif + +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" ); + struct timespec tm = { 0, 40000 }; if ( mlt_properties_get_int( properties, "done" ) == 0 && !mlt_consumer_is_stopped( consumer ) ) { - 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" ); - - fprintf( stderr, "+---------------------------------------------------------------------+\n" ); - fprintf( stderr, "| H = back 1 minute, L = forward 1 minute |\n" ); - fprintf( stderr, "| h = previous frame, l = next frame |\n" ); - fprintf( stderr, "| g = start of clip, j = next clip, k = previous clip |\n" ); - fprintf( stderr, "| 0 = restart, q = quit, space = play |\n" ); - fprintf( stderr, "+---------------------------------------------------------------------+\n" ); + 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" ); + + fprintf( stderr, "+---------------------------------------------------------------------+\n" ); + fprintf( stderr, "| H = back 1 minute, L = forward 1 minute |\n" ); + fprintf( stderr, "| h = previous frame, l = next frame |\n" ); + fprintf( stderr, "| g = start of clip, j = next clip, k = previous clip |\n" ); + fprintf( stderr, "| 0 = restart, q = quit, space = play |\n" ); + fprintf( stderr, "+---------------------------------------------------------------------+\n" ); + } 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 ( mlt_properties_get_int( properties, "stats_off" ) == 0 ) - fprintf( stderr, "Current Position: %10d\r", mlt_producer_position( producer ) ); + { + char string[ 2 ] = { value, 0 }; + transport_action( producer, string ); + } + +#ifdef __DARWIN__ + event_handling( producer, consumer ); +#endif + + if ( !silent && mlt_properties_get_int( properties, "stats_off" ) == 0 ) + fprintf( stderr, "Current Position: %10d\r", (int)mlt_producer_position( producer ) ); + + if ( silent ) + nanosleep( &tm, NULL ); } - fprintf( stderr, "\n" ); + if ( !silent ) + fprintf( stderr, "\n" ); } } @@ -181,6 +236,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 ); @@ -203,7 +266,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 ); @@ -241,16 +304,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 );