allow for building mainconcept and bluefish plugins outside cvs

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@10 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/mlt/src/modules/Makefile b/mlt/src/modules/Makefile
index 0a4c7172a4f3a138531456144a69e82333313578..9cd51a41c2f7ff2a7465d37882af36e02ab8a07e 100644 (file)
--- a/mlt/src/modules/Makefile
+++ b/mlt/src/modules/Makefile
@@ -1,9 +1,11 @@
-SUBDIRS = core gtk2 dv sdl # bluefish mcmpeg
+SUBDIRS = core gtk2 dv sdl mainconcept bluefish
 
 all clean depend install:
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
-               [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+               if [ -d $$subdir ] ; \
+                       then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+               fi \
        done
 
 dist-clean:

diff --git a/mlt/src/modules/gtk2/configure b/mlt/src/modules/gtk2/configure
index 211233638f039766d1d541a0ea05084e3ff7cb45..04a232a88ddcbd13474f091b5af555907d99d196 100755 (executable)
--- a/mlt/src/modules/gtk2/configure
+++ b/mlt/src/modules/gtk2/configure
@@ -5,6 +5,7 @@ then
 
 cat << EOF >> ../producers.dat
 pixbuf                 libmltgtk2.so
+pango                  libmltgtk2.so
 EOF
 
 fi

diff --git a/mlt/src/tests/dan.c b/mlt/src/tests/dan.c
index cdd1b866b2c81fca2e16bc1145d1e54bc5e95870..208ee49eb6c194fdf52a106dff902b5be158b954 100644 (file)
--- a/mlt/src/tests/dan.c
+++ b/mlt/src/tests/dan.c
@@ -17,14 +17,15 @@ int main( int argc, char **argv )
                file2 = argv[ 2 ];
 
        // Start the consumer...
-       mlt_consumer sdl_out = mlt_factory_consumer( "sdl", NULL );
+       mlt_consumer consumer = mlt_factory_consumer( "bluefish", NULL );
 
        // Create the producer(s)
-       mlt_producer dv1 = mlt_factory_producer( "libdv", file1 );
+       mlt_producer dv1 = mlt_factory_producer( "mcmpeg", file1 );
+
        //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", "<span font_desc=\"Sans Bold 24\">Mutton Lettuce Tomato</span>" );
+       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>" );
 
        // Register producers(s) with a multitrack object
        mlt_multitrack multitrack = mlt_multitrack_init( );
@@ -32,13 +33,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 = 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_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
@@ -46,14 +47,14 @@ 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_multitrack_close( multitrack );

diff --git a/src/modules/Makefile b/src/modules/Makefile
index 0a4c7172a4f3a138531456144a69e82333313578..9cd51a41c2f7ff2a7465d37882af36e02ab8a07e 100644 (file)
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -1,9 +1,11 @@
-SUBDIRS = core gtk2 dv sdl # bluefish mcmpeg
+SUBDIRS = core gtk2 dv sdl mainconcept bluefish
 
 all clean depend install:
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
-               [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+               if [ -d $$subdir ] ; \
+                       then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+               fi \
        done
 
 dist-clean:

diff --git a/src/modules/gtk2/configure b/src/modules/gtk2/configure
index 211233638f039766d1d541a0ea05084e3ff7cb45..04a232a88ddcbd13474f091b5af555907d99d196 100755 (executable)
--- a/src/modules/gtk2/configure
+++ b/src/modules/gtk2/configure
@@ -5,6 +5,7 @@ then
 
 cat << EOF >> ../producers.dat
 pixbuf                 libmltgtk2.so
+pango                  libmltgtk2.so
 EOF
 
 fi

diff --git a/src/tests/dan.c b/src/tests/dan.c
index cdd1b866b2c81fca2e16bc1145d1e54bc5e95870..208ee49eb6c194fdf52a106dff902b5be158b954 100644 (file)
--- a/src/tests/dan.c
+++ b/src/tests/dan.c
@@ -17,14 +17,15 @@ int main( int argc, char **argv )
                file2 = argv[ 2 ];
 
        // Start the consumer...
-       mlt_consumer sdl_out = mlt_factory_consumer( "sdl", NULL );
+       mlt_consumer consumer = mlt_factory_consumer( "bluefish", NULL );
 
        // Create the producer(s)
-       mlt_producer dv1 = mlt_factory_producer( "libdv", file1 );
+       mlt_producer dv1 = mlt_factory_producer( "mcmpeg", file1 );
+
        //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", "<span font_desc=\"Sans Bold 24\">Mutton Lettuce Tomato</span>" );
+       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>" );
 
        // Register producers(s) with a multitrack object
        mlt_multitrack multitrack = mlt_multitrack_init( );
@@ -32,13 +33,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 = 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_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
@@ -46,14 +47,14 @@ 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_multitrack_close( multitrack );