X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2Fsrc%2Ftests%2Fcharlie.c;h=bcd4dae68008873c0658b41483ce6a35d20bf05b;hb=092636b85449e57fd33ffd4954a2de23c2a5f81c;hp=99fbdbf5c46546d31b64d8e48fd5a72598496383;hpb=fdff32bbd09ff13df3a3a12896690a4950b7d0d0;p=melted

diff --git a/mlt/src/tests/charlie.c b/mlt/src/tests/charlie.c
index 99fbdbf..bcd4dae 100644
--- a/mlt/src/tests/charlie.c
+++ b/mlt/src/tests/charlie.c
@@ -4,6 +4,8 @@
 
 #include <framework/mlt.h>
 
+#include "io.h"
+
 mlt_producer create_producer( char *file )
 {
 	mlt_producer result = NULL;
@@ -19,6 +21,10 @@ mlt_producer create_producer( char *file )
 		result = mlt_factory_producer( "mcdv", file );
 	else if ( strstr( file, ".jpg" ) )
 		result = mlt_factory_producer( "pixbuf", file );
+	else if ( strstr( file, ".JPG" ) )
+		result = mlt_factory_producer( "pixbuf", file );
+	else if ( strstr( file, ".jpeg" ) )
+		result = mlt_factory_producer( "pixbuf", file );
 	else if ( strstr( file, ".png" ) )
 		result = mlt_factory_producer( "pixbuf", file );
 
@@ -31,12 +37,62 @@ mlt_producer create_producer( char *file )
 	return result;
 }
 
-mlt_consumer create_consumer( char *id )
+void transport_action( mlt_producer producer, char *value )
+{
+	mlt_properties properties = mlt_producer_properties( producer );
+
+	switch( value[ 0 ] )
+	{
+		case 'q':
+			mlt_properties_set_int( properties, "done", 1 );
+			break;
+		case '0':
+			mlt_producer_set_speed( producer, 1 );
+			mlt_producer_seek( producer, 0 );
+			break;
+		case '1':
+			mlt_producer_set_speed( producer, -5 );
+			break;
+		case '2':
+			mlt_producer_set_speed( producer, -2.5 );
+			break;
+		case '3':
+			mlt_producer_set_speed( producer, -1 );
+			break;
+		case '4':
+			mlt_producer_set_speed( producer, -0.5 );
+			break;
+		case '5':
+			mlt_producer_set_speed( producer, 0 );
+			break;
+		case '6':
+			mlt_producer_set_speed( producer, 0.5 );
+			break;
+		case '7':
+			mlt_producer_set_speed( producer, 1 );
+			break;
+		case '8':
+			mlt_producer_set_speed( producer, 2.5 );
+			break;
+		case '9':
+			mlt_producer_set_speed( producer, 5 );
+			break;
+	}
+}
+
+mlt_consumer create_consumer( char *id, mlt_producer producer )
 {
 	char *arg = strchr( id, ':' );
 	if ( arg != NULL )
 		*arg ++ = '\0';
-	return mlt_factory_consumer( id, arg );
+	mlt_consumer consumer = mlt_factory_consumer( id, arg );
+	if ( consumer != NULL )
+	{
+		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 );
+	}
+	return consumer;
 }
 
 void track_service( mlt_field field, void *service, mlt_destructor destructor )
@@ -70,9 +126,16 @@ void set_properties( mlt_service service, char *namevalue )
 
 void transport( mlt_producer producer )
 {
-	char temp[ 132 ];
-	fprintf( stderr, "Press return to continue\n" );
-	fgets( temp, 132, stdin );
+	mlt_properties properties = mlt_producer_properties( producer );
+
+	term_init( );
+	fprintf( stderr, "Press 'q' to continue\n" );
+	while( mlt_properties_get_int( properties, "done" ) == 0 )
+	{
+		int value = term_read( );
+		if ( value != -1 )
+			transport_action( producer, ( char * )&value );
+	}
 }
 
 int main( int argc, char **argv )
@@ -81,7 +144,6 @@ int main( int argc, char **argv )
 	mlt_service  service = NULL;
 	mlt_consumer consumer = NULL;
 	mlt_multitrack multitrack = NULL;
-	mlt_tractor tractor = NULL;
 	mlt_producer producer = NULL;
 	mlt_playlist playlist = NULL;
 	mlt_field field = NULL;
@@ -91,20 +153,23 @@ int main( int argc, char **argv )
 
 	// Set up containers
 	playlist = mlt_playlist_init( );
-	multitrack = mlt_multitrack_init( );
-	tractor = mlt_tractor_init( );
 
-	// Field must be connected on construction
-	field = mlt_field_init( mlt_multitrack_service( multitrack ) );
+	// Construct the field
+	field = mlt_field_init( );
+
+	// We need to track the number of registered filters
 	mlt_properties properties = mlt_field_properties( field );
 	mlt_properties_set_int( properties, "registered", 0 );
 
+	// Get the multitrack from the field
+	multitrack = mlt_field_multitrack( field );
+
 	// Parse the arguments
 	for ( i = 1; i < argc; i ++ )
 	{
 		if ( !strcmp( argv[ i ], "-consumer" ) )
 		{
-			consumer = create_consumer( argv[ ++ i ] );
+			consumer = create_consumer( argv[ ++ i ], mlt_multitrack_producer( multitrack ) );
 			if ( consumer != NULL )
 				service = mlt_consumer_service( consumer );
 		}
@@ -130,28 +195,24 @@ int main( int argc, char **argv )
 
 	// If we have no consumer, default to sdl
 	if ( consumer == NULL )
-		consumer= mlt_factory_consumer( "sdl", NULL );
+		consumer = create_consumer( "sdl", mlt_multitrack_producer( multitrack ) );
 
 	// Connect producer to playlist
-	mlt_playlist_append( playlist, producer );
+	if ( producer != NULL )
+		mlt_playlist_append( playlist, producer );
 
 	// Connect multitrack to producer
 	mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist ), 0 );
 
-	// Connect tractor to field
-	mlt_tractor_connect( tractor, mlt_field_service( field ) );
-
 	// Connect consumer to tractor
-	mlt_consumer_connect( consumer, mlt_tractor_service( tractor ) );
+	mlt_consumer_connect( consumer, mlt_field_service( field ) );
 
 	// Transport functionality
-	transport( producer );
+	transport( mlt_multitrack_producer( multitrack ) );
 
 	// Close the services
 	mlt_consumer_close( consumer );
-	mlt_tractor_close( tractor );
 	mlt_field_close( field );
-	mlt_multitrack_close( multitrack );
 	mlt_producer_close( producer );
 
 	// Close the factory