X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2Fsrc%2Ftests%2Fdan.c;h=0035b26958e8184647da93c5037d1aa6ad5cc641;hb=f4ddf54462a611e23ac0ad8ac52bb9c6f8aafb6f;hp=a896b146058c339d7280d6073a856c1048eb6bc7;hpb=8bf137cd71aafb9c8f6a42c78ddb6bd0a8fe99db;p=melted

diff --git a/mlt/src/tests/dan.c b/mlt/src/tests/dan.c
index a896b14..0035b26 100644
--- a/mlt/src/tests/dan.c
+++ b/mlt/src/tests/dan.c
@@ -19,13 +19,13 @@ 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( "sdl", "PAL" );
 
 	// Create the producer(s)
-	mlt_producer dv1 = mlt_factory_producer( "mcdv", file1 );
-	mlt_producer_set_in_and_out( dv1, 300.0, 303.0 );
+	mlt_producer dv1 = mlt_factory_producer( "libdv", file1 );
+	mlt_producer_set_in_and_out( dv1, 0, 5 );
 	
-	mlt_producer dv2 = mlt_factory_producer( "mcmpeg", file2 );
+	mlt_producer dv2 = mlt_factory_producer( "libdv", file2 );
 	//mlt_producer_set_in_and_out( dv2, 10.0, 30.0 );
 
 #if 0
@@ -43,22 +43,23 @@ int main( int argc, char **argv )
 	//mlt_producer dv2 = producer_libdv_init( file2 );
 	//mlt_producer dv2 = mlt_factory_producer( "pixbuf", file2 );
 #if 0
-	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 );
+	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, 1.0 );
+	mlt_playlist_blank( playlist2, 3.0 );
 	mlt_playlist_append( playlist2, dv2 );
 	
 	// Register producers(s) with a multitrack object
@@ -74,7 +75,7 @@ int main( int argc, char **argv )
 	// Define a transition
 	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, 1.0, 3.0 );
+	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 );
 
@@ -92,7 +93,7 @@ int main( int argc, char **argv )
 	// 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 );