X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_tractor.c;h=6d9fe1bf639e9307b7e2dc338e9d67c5ac22d183;hb=43b8637d43111412e4de944a4eeb3668ab838f9b;hp=094352e32678ccb70ef7959dbabaec3f91dcc304;hpb=c974f8e87e0bd3de851fb638660f502092b1425e;p=melted

diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 094352e..6d9fe1b 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -1,25 +1,25 @@
-/*
- * mlt_tractor.c -- tractor service class
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
- * Author: Charles Yates <charles.yates@pandora.be>
+/**
+ * \file mlt_tractor.c
+ * \brief tractor service class
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Copyright (C) 2003-2008 Ushodaya Enterprises Limited
+ * \author Charles Yates <charles.yates@pandora.be>
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 #include "mlt_tractor.h"
 #include "mlt_frame.h"
 #include "mlt_multitrack.h"
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <ctype.h>
 
-/** Forward references to static methods.
+/* Forward references to static methods.
 */
 
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int track );
@@ -205,6 +205,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 	mlt_frame frame = mlt_frame_pop_service( this );
 	mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
 	mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
+	mlt_properties_set_int( frame_properties, "resize_alpha", mlt_properties_get_int( properties, "resize_alpha" ) );
 	mlt_properties_set_int( frame_properties, "distort", mlt_properties_get_int( properties, "distort" ) );
 	mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
 	mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "consumer_deinterlace" ) );
@@ -284,7 +285,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 		// Determine whether this tractor feeds to the consumer or stops here
 		int global_feed = mlt_properties_get_int( properties, "global_feed" );
 
-		// If we don't have one, we're in trouble... 
+		// If we don't have one, we're in trouble...
 		if ( multitrack != NULL )
 		{
 			// Used to garbage collect all frames
@@ -310,7 +311,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 			mlt_producer_set_speed( target, mlt_producer_get_speed( parent ) );
 
 			// We will create one frame and attach everything to it
-			*frame = mlt_frame_init( );
+			*frame = mlt_frame_init( MLT_PRODUCER_SERVICE( parent ) );
 
 			// Get the properties of the frame
 			frame_properties = MLT_FRAME_PROPERTIES( *frame );
@@ -391,14 +392,14 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 						first_video = temp;
 
 					// Ensure that all frames know the aspect ratio of the background
-					mlt_properties_set_double( temp_properties, "output_ratio", 
+					mlt_properties_set_double( temp_properties, "output_ratio",
 											   mlt_properties_get_double( MLT_FRAME_PROPERTIES( first_video ), "aspect_ratio" ) );
 
 					mlt_properties_set_int( MLT_FRAME_PROPERTIES( temp ), "image_count", ++ image_count );
 					image_count = 1;
 				}
 			}
-	
+
 			// Now stack callbacks
 			if ( audio != NULL )
 			{
@@ -453,7 +454,7 @@ static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int tra
 	else
 	{
 		// Generate a test card
-		*frame = mlt_frame_init( );
+		*frame = mlt_frame_init( MLT_PRODUCER_SERVICE( parent ) );
 		return 0;
 	}
 }