X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Ftests%2Fdan.c;h=cdfd211839fd7e7247bc8837a04ef1428f692f00;hb=885cb897cfb90465e61c39c1c266891b7e499055;hp=ee76bb01d21fc0d1696eb8c979e5a501360afcb9;hpb=661165812e3410fe2f6f49d7af882b36a0efcf82;p=melted

diff --git a/src/tests/dan.c b/src/tests/dan.c
index ee76bb0..cdfd211 100644
--- a/src/tests/dan.c
+++ b/src/tests/dan.c
@@ -1,16 +1,5 @@
-#include "mlt_producer.h"
-#include "mlt_consumer.h"
-#include "mlt_filter.h"
-#include "mlt_tractor.h"
-#include "mlt_transition.h"
-#include "mlt_multitrack.h"
-
-#include "producer_libdv.h"
-#include "filter_deinterlace.h"
-#include "consumer_sdl.h"
-#include "producer_ppm.h"
-#include "producer_pixbuf.h"
-#include "transition_composite.h"
+
+#include <framework/mlt.h>
 
 #include <stdio.h>
 
@@ -20,19 +9,39 @@ int main( int argc, char **argv )
 	char *file1 = NULL;
 	char *file2 = NULL;
 
+	mlt_factory_init( "../modules" );
+
 	if ( argc >= 2 )
 		file1 = argv[ 1 ];
 	if ( argc >= 3 )
 		file2 = argv[ 2 ];
 
 	// Start the consumer...
-	mlt_consumer sdl_out = consumer_sdl_init( NULL );
+	int vstd = mlt_video_standard_ntsc;
+	mlt_consumer consumer = mlt_factory_consumer( "bluefish", &vstd );
+	mlt_properties_set_int( mlt_consumer_properties( consumer ), "video_standard", mlt_video_standard_ntsc );
 
 	// Create the producer(s)
-	mlt_producer dv1 = producer_libdv_init( file1 );
+	mlt_producer dv1 = mlt_factory_producer( "mcmpeg", file1 );
+
+#if 0
+	// Connect the tractor to the consumer
+	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_close( consumer );
+	return 0;
+#endif
+
 	//mlt_producer dv1 = producer_pixbuf_init( file1 );
 	//mlt_producer dv2 = producer_libdv_init( file2 );
-	mlt_producer dv2 = producer_pixbuf_init( file2 );
+	//mlt_producer dv2 = mlt_factory_producer( "pixbuf", file2 );
+	mlt_producer dv2 = mlt_factory_producer( "pango", "<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( 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 );
 
 	// Register producers(s) with a multitrack object
 	mlt_multitrack multitrack = mlt_multitrack_init( );
@@ -40,13 +49,13 @@ int main( int argc, char **argv )
 	mlt_multitrack_connect( multitrack, dv2, 1 );
 
 	// Create a filter and associate it to track 0
-	mlt_filter filter = filter_deinterlace_init( 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 = transition_composite_init( NULL );
-	mlt_transition_connect( transition, mlt_filter_service( filter ), 0, 1 );
+	mlt_transition transition = mlt_factory_transition( "composite", NULL );
+	mlt_transition_connect( transition, mlt_multitrack_service( multitrack ), 0, 1 );
 	mlt_transition_set_in_and_out( transition, 0, 1000 );
 
 	// Buy a tractor and connect it to the filter
@@ -54,16 +63,16 @@ int main( int argc, char **argv )
 	mlt_tractor_connect( tractor, mlt_transition_service( transition ) );
 
 	// Connect the tractor to the consumer
-	mlt_consumer_connect( sdl_out, mlt_tractor_service( tractor ) );
+	mlt_consumer_connect( consumer, mlt_tractor_service( tractor ) );
 
 	// Do stuff until we're told otherwise...
 	fprintf( stderr, "Press return to continue\n" );
 	fgets( temp, 132, stdin );
 
 	// Close everything...
-	mlt_consumer_close( sdl_out );
+	mlt_consumer_close( consumer );
 	mlt_tractor_close( tractor );
-	mlt_filter_close( filter );
+	//mlt_filter_close( filter );
 	mlt_multitrack_close( multitrack );
 	mlt_producer_close( dv1 );
 	mlt_producer_close( dv2 );