X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=45918d50f460096ed1517659f00849488f5f4ac0;hb=4cc3727c580de72763117b1f6025c6a2aa623e5b;hp=3dbc50bd38d0ce6295ada9e302a28ca14aea38c0;hpb=5f8f3adaf7cc01a161092ea272f50279a7ad971a;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 3dbc50b..45918d5 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -42,6 +42,7 @@ struct mlt_tractor_s
 */
 
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int track );
+static void mlt_tractor_listener( mlt_multitrack tracks, mlt_tractor this );
 
 /** Constructor for the tractor.
 */
@@ -92,6 +93,8 @@ mlt_tractor mlt_tractor_new( )
 			mlt_properties_set_data( props, "multitrack", multitrack, 0, ( mlt_destructor )mlt_multitrack_close, NULL );
 			mlt_properties_set_data( props, "field", field, 0, ( mlt_destructor )mlt_field_close, NULL );
 
+			mlt_events_listen( mlt_multitrack_properties( multitrack ), this, "producer-changed", ( mlt_listener )mlt_tractor_listener );
+
 			producer->get_frame = producer_get_frame;
 			producer->close = ( mlt_destructor )mlt_tractor_close;
 			producer->close_object = this;
@@ -153,12 +156,21 @@ void mlt_tractor_refresh( mlt_tractor this )
 	mlt_multitrack multitrack = mlt_tractor_multitrack( this );
 	mlt_properties properties = mlt_multitrack_properties( multitrack );
 	mlt_properties self = mlt_tractor_properties( this );
+	mlt_events_block( properties, self );
+	mlt_events_block( self, self );
 	mlt_multitrack_refresh( multitrack );
 	mlt_properties_set_position( self, "in", 0 );
 	mlt_properties_set_position( self, "out", mlt_properties_get_position( properties, "out" ) );
+	mlt_events_unblock( self, self );
+	mlt_events_unblock( properties, self );
 	mlt_properties_set_position( self, "length", mlt_properties_get_position( properties, "length" ) );
 }
 
+static void mlt_tractor_listener( mlt_multitrack tracks, mlt_tractor this )
+{
+	mlt_tractor_refresh( this );
+}
+
 /** Connect the tractor.
 */
 
@@ -178,9 +190,7 @@ int mlt_tractor_connect( mlt_tractor this, mlt_service producer )
 
 int mlt_tractor_set_track( mlt_tractor this, mlt_producer producer, int index )
 {
-	int error = mlt_multitrack_connect( mlt_tractor_multitrack( this ), producer, index );
-	mlt_tractor_refresh( this );
-	return error;
+	return mlt_multitrack_connect( mlt_tractor_multitrack( this ), producer, index );
 }
 
 /** Get the producer for a specific track.
@@ -191,8 +201,14 @@ mlt_producer mlt_tractor_get_track( mlt_tractor this, int index )
 	return mlt_multitrack_track( mlt_tractor_multitrack( this ), index );
 }
 
+static uint8_t *mlt_tractor_alpha_mask( mlt_frame frame )
+{
+	return mlt_properties_get_data( mlt_frame_properties( frame ), "alpha", NULL );
+}
+
 static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
+	uint8_t *data = NULL;
 	mlt_properties properties = mlt_frame_properties( this );
 	mlt_frame frame = mlt_frame_pop_service( this );
 	mlt_properties_inherit( mlt_frame_properties( frame ), properties );
@@ -200,6 +216,10 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL );
 	mlt_properties_set_int( properties, "width", *width );
 	mlt_properties_set_int( properties, "height", *height );
+	mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( frame ) );
+	data = mlt_frame_get_alpha_mask( frame );
+	mlt_properties_set_data( properties, "alpha", data, 0, NULL, NULL );
+	this->get_alpha_mask = mlt_tractor_alpha_mask;
 	return 0;
 }