X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Ftests%2Fdan.c;h=8f0dca5dd88091bb66128b3f4a0e3ded117c577d;hb=0bd5d91026b8bd143f957f119d61d5fedd45cf70;hp=8e499bcdeb059b6001e81a1b686c22ce4147eedf;hpb=163b1bf05b39b9d2f226b63a370badd233612656;p=melted

diff --git a/src/tests/dan.c b/src/tests/dan.c
index 8e499bc..8f0dca5 100644
--- a/src/tests/dan.c
+++ b/src/tests/dan.c
@@ -19,18 +19,24 @@ int main( int argc, char **argv )
 	// Start the consumer...
 	int vstd = mlt_video_standard_ntsc;
 	//mlt_consumer consumer = mlt_factory_consumer( "bluefish", &vstd );
-	mlt_consumer consumer = mlt_factory_consumer( "sdl", "NTSC" );
+	mlt_consumer consumer = mlt_factory_consumer( "westley", NULL );
 
 	// Create the producer(s)
-	mlt_producer dv1 = mlt_factory_producer( "mcmpeg", file1 );
+	mlt_producer dv1 = mlt_factory_producer( "westley", file1 );
+	//mlt_producer_set_in_and_out( dv1, 0, 5 );
 
-#if 0
-	// Connect the tractor to the consumer
+	mlt_producer dv2 = mlt_factory_producer( "libdv", file2 );
+	//mlt_producer_set_in_and_out( dv2, 10.0, 30.0 );
+
+#if 1
+	// Connect the consumer to the producer
 	mlt_consumer_connect( consumer, mlt_producer_service( dv1 ) );
 
 	// Do stuff until we're told otherwise...
-	fprintf( stderr, "Press return to continue\n" );
-	fgets( temp, 132, stdin );
+	mlt_consumer_start( consumer );
+//	fprintf( stderr, "Press return to continue\n" );
+//	fgets( temp, 132, stdin );
+	mlt_consumer_stop( consumer );
 	mlt_consumer_close( consumer );
 	return 0;
 #endif
@@ -38,30 +44,42 @@ int main( int argc, char **argv )
 	//mlt_producer dv1 = producer_pixbuf_init( file1 );
 	//mlt_producer dv2 = producer_libdv_init( file2 );
 	//mlt_producer dv2 = mlt_factory_producer( "pixbuf", file2 );
-	mlt_producer dv2 = mlt_factory_producer( "pango", NULL ); //"<span font_desc=\"Sans Bold 36\">Mutton <span font_desc=\"Luxi Serif Bold Oblique 36\">Lettuce</span> Tomato</span>" );
-	mlt_properties_set( mlt_producer_properties( dv2 ), "font", "Sans Bold 36" );
-	mlt_properties_set( mlt_producer_properties( dv2 ), "text", "Mutton Lettuce\nTomato" );
-	mlt_properties_set_int( mlt_producer_properties( dv2 ), "video_standard", mlt_video_standard_ntsc );
-	mlt_properties_set_int( mlt_producer_properties( dv2 ), "bgcolor", 0x0000007f );
-	mlt_properties_set_int( mlt_producer_properties( dv2 ), "pad", 8 );
-	mlt_properties_set_int( mlt_producer_properties( dv2 ), "align", 1 );
-	mlt_properties_set_int( mlt_producer_properties( dv2 ), "x", -20 );
-	mlt_properties_set_int( mlt_producer_properties( dv2 ), "y", 40 );
+#if 0
+	mlt_producer title = mlt_factory_producer( "pango", NULL ); //"<span font_desc=\"Sans Bold 36\">Mutton <span font_desc=\"Luxi Serif Bold Oblique 36\">Lettuce</span> Tomato</span>" );
+	mlt_properties_set_int( mlt_producer_properties( title ), "video_standard", mlt_video_standard_ntsc );
+	mlt_properties_set( mlt_producer_properties( title ), "font", "Sans Bold 36" );
+	mlt_properties_set( mlt_producer_properties( title ), "text", "Mutton Lettuce\nTomato" );
+	mlt_properties_set_int( mlt_producer_properties( title ), "bgcolor", 0x0000007f );
+	mlt_properties_set_int( mlt_producer_properties( title ), "pad", 8 );
+	mlt_properties_set_int( mlt_producer_properties( title ), "align", 1 );
+	mlt_properties_set_int( mlt_producer_properties( title ), "x", 20 );
+	mlt_properties_set_int( mlt_producer_properties( title ), "y", 40 );
+#endif
 
+	mlt_playlist playlist1 = mlt_playlist_init();
+	mlt_playlist_append( playlist1, dv1 );
+	mlt_playlist_blank( playlist1, 1.0 );
+
+	mlt_playlist playlist2 = mlt_playlist_init();
+	mlt_playlist_blank( playlist2, 3.0 );
+	mlt_playlist_append( playlist2, dv2 );
+	
 	// Register producers(s) with a multitrack object
 	mlt_multitrack multitrack = mlt_multitrack_init( );
-	mlt_multitrack_connect( multitrack, dv1, 0 );
-	mlt_multitrack_connect( multitrack, dv2, 1 );
+	mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist1 ), 0 );
+	mlt_multitrack_connect( multitrack, mlt_playlist_producer( playlist2 ), 1 );
 
 	// Create a filter and associate it to track 0
-	mlt_filter filter = mlt_factory_filter( "deinterlace", NULL );
-	mlt_filter_connect( filter, mlt_multitrack_service( multitrack ), 0 );
-	mlt_filter_set_in_and_out( filter, 0, 1000 );
+	//mlt_filter filter = mlt_factory_filter( "deinterlace", NULL );
+	//mlt_filter_connect( filter, mlt_multitrack_service( multitrack ), 0 );
+	//mlt_filter_set_in_and_out( filter, 0, 1000 );
 
 	// Define a transition
-	mlt_transition transition = mlt_factory_transition( "composite", NULL );
-	mlt_transition_connect( transition, mlt_filter_service( filter ), 0, 1 );
-	mlt_transition_set_in_and_out( transition, 0, 5.0 );
+	mlt_transition transition = mlt_factory_transition( "luma", NULL );
+	mlt_transition_connect( transition, mlt_multitrack_service( multitrack ), 0, 1 );
+	mlt_transition_set_in_and_out( transition, 3.0, 5.0 );
+	//mlt_properties_set( mlt_transition_properties( transition ), "filename", "clock.pgm" );
+	mlt_properties_set_double( mlt_transition_properties( transition ), "softness", 0.1 );
 
 	// Buy a tractor and connect it to the filter
 	mlt_tractor tractor = mlt_tractor_init( );
@@ -74,17 +92,10 @@ int main( int argc, char **argv )
 	fprintf( stderr, "Press return to continue\n" );
 	fgets( temp, 132, stdin );
 
-	mlt_properties_set( mlt_producer_properties( dv2 ), "font", "Sans Oblique 36" );
-	mlt_properties_set( mlt_producer_properties( dv2 ), "text", "Mutton\nLettuce Tomato" );
-
-	// Do stuff until we're told otherwise...
-	fprintf( stderr, "Press return to continue\n" );
-	fgets( temp, 132, stdin );
-	
 	// Close everything...
 	mlt_consumer_close( consumer );
 	mlt_tractor_close( tractor );
-	//mlt_filter_close( filter );
+	mlt_transition_close( transition );
 	mlt_multitrack_close( multitrack );
 	mlt_producer_close( dv1 );
 	mlt_producer_close( dv2 );