X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finigo%2Finigo.c;h=291e1a4c9917c5ba860c0189122a8d6d503d1fbf;hb=34c7916b96a65dbfb6d9414aca781d6292474f98;hp=77575d5e56ac10f881658c7d85e3b68cae1e8b84;hpb=4b72d1071d80828a599085618bbba67a18d14e56;p=melted

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index 77575d5..291e1a4 100644
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -5,12 +5,17 @@
 
 #include <framework/mlt.h>
 
+#ifdef __DARWIN__
+#include <SDL.h>
+#endif
+
 #include "io.h"
 
 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 +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;
@@ -110,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':
@@ -122,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 );
@@ -138,10 +147,38 @@ 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;
 }
 
+#ifdef __DARWIN__
+
+static void event_handling( mlt_producer producer, mlt_consumer consumer )
+{
+	SDL_Event event;
+
+	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 );
@@ -171,10 +208,17 @@ 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 );
+			}
+
+#ifdef __DARWIN__
+			event_handling( producer, consumer );
+#endif
 
 			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 );
@@ -197,7 +241,9 @@ int main( int argc, char **argv )
 	// 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 );