X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_unit.c;h=2f7391792013f6cc945bbea990eab43cf8c91ccf;hb=73345685f05e06c7b2c6a9d2b5c6bcf1c642d82b;hp=a1043df4ee1f20888eb0461e94d71a03139cdcc6;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted

diff --git a/src/miracle/miracle_unit.c b/src/miracle/miracle_unit.c
index a1043df..2f73917 100644
--- a/src/miracle/miracle_unit.c
+++ b/src/miracle/miracle_unit.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
+#include <limits.h>
 
 #include <sys/mman.h>
 
@@ -161,6 +162,10 @@ static mlt_producer create_producer( miracle_unit unit, char *file )
 			result = mlt_factory_producer( "pixbuf", file );
 		else if ( strstr( file, ".png" ) )
 			result = mlt_factory_producer( "pixbuf", file );
+		else if ( strstr( file, ".tga" ) )
+			result = mlt_factory_producer( "pixbuf", file );
+		else if ( strstr( file, ".txt" ) )
+			result = mlt_factory_producer( "pango", file );
 	
 		// 2nd Line fallbacks
 		if ( result == NULL && strstr( file, ".dv" ) )
@@ -170,7 +175,7 @@ static mlt_producer create_producer( miracle_unit unit, char *file )
 	
 		// 3rd line fallbacks 
 		if ( result == NULL )
-			result = mlt_factory_producer( "ffmpeg", file );
+			result = mlt_factory_producer( "avformat", file );
 
 		// Now store the result
 		mlt_properties_set_data( properties, file, result, 0, ( mlt_destructor )mlt_producer_close, NULL );
@@ -298,6 +303,7 @@ valerie_error_code miracle_unit_clean( miracle_unit unit )
 {
 	clear_unit( unit );
 	miracle_log( LOG_DEBUG, "Cleaned playlist" );
+	miracle_unit_status_communicate( unit );
 	return valerie_ok;
 }
 
@@ -339,9 +345,7 @@ valerie_error_code miracle_unit_append( miracle_unit unit, char *clip, int64_t i
 	return valerie_invalid_file;
 }
 
-/** Start playing the clip.
-
-    Start a dv-pump and commence dv1394 transmission.
+/** Start playing the unit.
 
     \todo error handling
     \param unit A miracle_unit handle.
@@ -354,7 +358,9 @@ void miracle_unit_play( miracle_unit_t *unit, int speed )
 	mlt_properties properties = unit->properties;
 	mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
 	mlt_producer producer = mlt_playlist_producer( playlist );
+	mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL );
 	mlt_producer_set_speed( producer, ( double )speed / 1000 );
+	mlt_consumer_start( consumer );
 	miracle_unit_status_communicate( unit );
 }
 
@@ -367,6 +373,9 @@ void miracle_unit_play( miracle_unit_t *unit, int speed )
 
 void miracle_unit_terminate( miracle_unit unit )
 {
+	mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL );
+	mlt_consumer_stop( consumer );
+	miracle_unit_status_communicate( unit );
 }
 
 /** Query the status of unit playback.
@@ -377,7 +386,8 @@ void miracle_unit_terminate( miracle_unit unit )
 
 int miracle_unit_has_terminated( miracle_unit unit )
 {
-	return 0;
+	mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL );
+	return mlt_consumer_is_stopped( consumer );
 }
 
 /** Transfer the currently loaded clip to another unit
@@ -436,7 +446,9 @@ int miracle_unit_get_status( miracle_unit unit, valerie_status status )
 
 		status->generation = mlt_properties_get_int( properties, "generation" );
 
-		if ( !strcmp( status->clip, "" ) )
+		if ( miracle_unit_has_terminated( unit ) )
+			status->status = unit_stopped;
+		else if ( !strcmp( status->clip, "" ) )
 			status->status = unit_not_loaded;
 		else if ( status->speed == 0 )
 			status->status = unit_paused;
@@ -471,7 +483,7 @@ void miracle_unit_change_position( miracle_unit unit, int clip, int64_t position
 	else if ( clip >= mlt_playlist_count( playlist ) )
 	{
 		clip = mlt_playlist_count( playlist ) - 1;
-		position = 999999999999;
+		position = LONG_MAX;
 	}
 
 	if ( mlt_playlist_get_clip_info( playlist, &info, clip ) == 0 )