From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 22 Dec 2003 22:44:29 +0000 (+0000)
Subject: minor tidy up
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f2892649fc37814798758ad2da2bee85b17e2366;p=mlt

minor tidy up


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

diff --git a/mlt/src/modules/Makefile b/mlt/src/modules/Makefile
index 9cd51a41..7d512493 100644
--- a/mlt/src/modules/Makefile
+++ b/mlt/src/modules/Makefile
@@ -3,15 +3,17 @@ SUBDIRS = core gtk2 dv sdl mainconcept bluefish
 all clean depend install:
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		if [ -d $$subdir ] ; \
-			then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+		if [ -f $$subdir/Makefile ] ; \
+		then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
 		fi \
 	done
 
 dist-clean:
-	rm -f consumers.dat filters.dat producers.dat transitions.dat; \
+	rm -f consumers.dat filters.dat producers.dat transitions.dat *.so; \
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		[ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+		if [ -f $$subdir/Makefile ] ; \
+		then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+		fi \
 	done
 
diff --git a/mlt/src/modules/dv/producer_libdv.c b/mlt/src/modules/dv/producer_libdv.c
index 5d2c768e..2972d8a0 100644
--- a/mlt/src/modules/dv/producer_libdv.c
+++ b/mlt/src/modules/dv/producer_libdv.c
@@ -146,49 +146,6 @@ static int producer_collect_info( producer_libdv this )
 	return valid;
 }
 
-#if 0
-static int mc_producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
-{
-	// Get the frames properties
-	mlt_properties properties = mlt_frame_properties( this );
-
-	// Get the dv data
-	uint8_t *dv_data = mlt_properties_get_data( properties, "dv_data", NULL );
-
-	// Determine bytes in frame
-	int bytes_in_frame = dv_data[ 3 ] & 0x80 ? frame_size_625_50 : frame_size_525_60;
-
-	// Assign width and height from properties
-	*width = mlt_properties_get_int( properties, "width" );
-	*height = mlt_properties_get_int( properties, "height" );
-
-	if ( *format == mlt_image_yuv422 )
-	{
-		// Allocate image
-		*buffer = malloc( *width * *height * 2 );
-
-		// Decompress
-		DecompressBuffer_DV( dv_data, bytes_in_frame, *buffer, *width * 2, *width, *height, 0, FOURCC_YUYV, 0, NULL );
-
-		// Set the image on the properties
-		mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, free, NULL );
-	}
-	else
-	{
-		// Allocate image
-		*buffer = malloc( *width * *height * 3 );
-
-		// Decompress
-		DecompressBuffer_DV( dv_data, bytes_in_frame, *buffer, *width * 3, *width, *height, 0, FOURCC_R24C, 0, NULL );
-
-		// Set the image on the properties
-		mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, free, NULL );
-	}
-
-	return 0;
-}
-#endif
-
 static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
 	int pitches[3] = { 0, 0, 0 };
diff --git a/mlt/src/tests/charlie.c b/mlt/src/tests/charlie.c
index 12a45b2c..2d427345 100644
--- a/mlt/src/tests/charlie.c
+++ b/mlt/src/tests/charlie.c
@@ -1,12 +1,4 @@
-#include <framework/mlt_factory.h>
-
-#include <framework/mlt_producer.h>
-#include <framework/mlt_consumer.h>
-#include <framework/mlt_filter.h>
-#include <framework/mlt_tractor.h>
-#include <framework/mlt_transition.h>
-#include <framework/mlt_multitrack.h>
-
+#include <framework/mlt.h>
 #include <stdio.h>
 
 int main( int argc, char **argv )
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 9cd51a41..7d512493 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -3,15 +3,17 @@ SUBDIRS = core gtk2 dv sdl mainconcept bluefish
 all clean depend install:
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		if [ -d $$subdir ] ; \
-			then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+		if [ -f $$subdir/Makefile ] ; \
+		then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
 		fi \
 	done
 
 dist-clean:
-	rm -f consumers.dat filters.dat producers.dat transitions.dat; \
+	rm -f consumers.dat filters.dat producers.dat transitions.dat *.so; \
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		[ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+		if [ -f $$subdir/Makefile ] ; \
+		then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+		fi \
 	done
 
diff --git a/src/modules/dv/producer_libdv.c b/src/modules/dv/producer_libdv.c
index 5d2c768e..2972d8a0 100644
--- a/src/modules/dv/producer_libdv.c
+++ b/src/modules/dv/producer_libdv.c
@@ -146,49 +146,6 @@ static int producer_collect_info( producer_libdv this )
 	return valid;
 }
 
-#if 0
-static int mc_producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
-{
-	// Get the frames properties
-	mlt_properties properties = mlt_frame_properties( this );
-
-	// Get the dv data
-	uint8_t *dv_data = mlt_properties_get_data( properties, "dv_data", NULL );
-
-	// Determine bytes in frame
-	int bytes_in_frame = dv_data[ 3 ] & 0x80 ? frame_size_625_50 : frame_size_525_60;
-
-	// Assign width and height from properties
-	*width = mlt_properties_get_int( properties, "width" );
-	*height = mlt_properties_get_int( properties, "height" );
-
-	if ( *format == mlt_image_yuv422 )
-	{
-		// Allocate image
-		*buffer = malloc( *width * *height * 2 );
-
-		// Decompress
-		DecompressBuffer_DV( dv_data, bytes_in_frame, *buffer, *width * 2, *width, *height, 0, FOURCC_YUYV, 0, NULL );
-
-		// Set the image on the properties
-		mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, free, NULL );
-	}
-	else
-	{
-		// Allocate image
-		*buffer = malloc( *width * *height * 3 );
-
-		// Decompress
-		DecompressBuffer_DV( dv_data, bytes_in_frame, *buffer, *width * 3, *width, *height, 0, FOURCC_R24C, 0, NULL );
-
-		// Set the image on the properties
-		mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, free, NULL );
-	}
-
-	return 0;
-}
-#endif
-
 static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
 	int pitches[3] = { 0, 0, 0 };
diff --git a/src/tests/charlie.c b/src/tests/charlie.c
index 12a45b2c..2d427345 100644
--- a/src/tests/charlie.c
+++ b/src/tests/charlie.c
@@ -1,12 +1,4 @@
-#include <framework/mlt_factory.h>
-
-#include <framework/mlt_producer.h>
-#include <framework/mlt_consumer.h>
-#include <framework/mlt_filter.h>
-#include <framework/mlt_tractor.h>
-#include <framework/mlt_transition.h>
-#include <framework/mlt_multitrack.h>
-
+#include <framework/mlt.h>
 #include <stdio.h>
 
 int main( int argc, char **argv )