X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fplus%2Ftransition_affine.c;h=806b14084d7883e4211430413b72cc974e97a5e2;hb=421997fe7b5ef0735d706c3976ef90fa5b65bd99;hp=a8c92d03570af30c3c7886403e47678391ef585c;hpb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;p=melted

diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c
index a8c92d0..806b140 100644
--- a/src/modules/plus/transition_affine.c
+++ b/src/modules/plus/transition_affine.c
@@ -177,7 +177,7 @@ static struct geometry_s *transition_parse_keys( mlt_transition this,  int norma
 	int i = 0;
 
 	// Get the properties of the transition
-	mlt_properties properties = mlt_transition_properties( this );
+	mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
 
 	// Get the in and out position
 	mlt_position in = mlt_transition_get_in( this );
@@ -257,10 +257,10 @@ static struct geometry_s *transition_parse_keys( mlt_transition this,  int norma
 struct geometry_s *composite_calculate( struct geometry_s *result, mlt_transition this, mlt_frame a_frame, float position )
 {
 	// Get the properties from the transition
-	mlt_properties properties = mlt_transition_properties( this );
+	mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
 
 	// Get the properties from the frame
-	mlt_properties a_props = mlt_frame_properties( a_frame );
+	mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
 	
 	// Structures for geometry
 	struct geometry_s *start = mlt_properties_get_data( properties, "geometries", NULL );
@@ -476,13 +476,13 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 	mlt_transition this = mlt_frame_pop_service( a_frame );
 
 	// Get the properties of the transition
-	mlt_properties properties = mlt_transition_properties( this );
+	mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
 
 	// Get the properties of the a frame
-	mlt_properties a_props = mlt_frame_properties( a_frame );
+	mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
 
 	// Get the properties of the b frame
-	mlt_properties b_props = mlt_frame_properties( b_frame );
+	mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
 
 	// Image, format, width, height and image for the b frame
 	uint8_t *b_image = NULL;
@@ -540,7 +540,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 		mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
 	}
 
-	mlt_properties_set( b_props, "distort", mlt_properties_get( properties, "distort" ) );
+	mlt_properties_set_int( b_props, "distort", mlt_properties_get_int( properties, "distort" ) );
 	mlt_frame_get_image( b_frame, &b_image, &b_format, &b_width, &b_height, 0 );
 	result.w = b_width;
 	result.h = b_height;
@@ -670,10 +670,10 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 static mlt_frame transition_process( mlt_transition transition, mlt_frame a_frame, mlt_frame b_frame )
 {
 	// Get a unique name to store the frame position
-	char *name = mlt_properties_get( mlt_transition_properties( transition ), "_unique_id" );
+	char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( transition ), "_unique_id" );
 
 	// Assign the current position to the name
-	mlt_properties a_props = mlt_frame_properties( a_frame );
+	mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
 	mlt_properties_set_position( a_props, name, mlt_frame_get_position( a_frame ) );
 
 	// Push the transition on to the frame
@@ -696,10 +696,10 @@ mlt_transition transition_affine_init( char *arg )
 	mlt_transition transition = mlt_transition_new( );
 	if ( transition != NULL )
 	{
-		mlt_properties_set_int( mlt_transition_properties( transition ), "sx", 1 );
-		mlt_properties_set_int( mlt_transition_properties( transition ), "sy", 1 );
-		mlt_properties_set( mlt_transition_properties( transition ), "distort", NULL );
-		mlt_properties_set( mlt_transition_properties( transition ), "start", "0,0:100%x100%" );
+		mlt_properties_set_int( MLT_TRANSITION_PROPERTIES( transition ), "sx", 1 );
+		mlt_properties_set_int( MLT_TRANSITION_PROPERTIES( transition ), "sy", 1 );
+		mlt_properties_set_int( MLT_TRANSITION_PROPERTIES( transition ), "distort", 0 );
+		mlt_properties_set( MLT_TRANSITION_PROPERTIES( transition ), "start", "0,0:100%x100%" );
 		transition->process = transition_process;
 	}
 	return transition;