X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_channelcopy.c;h=8de9913fb703b642612f241bca25113228ec2214;hb=7651a182bf7191ab5db9b3741caeac2f86540281;hp=fd49d12f83a08c59b3cdaa13daa5aa01f455f3b3;hpb=0d368e962076c3b96040b86cd5d87a1bbfe0a594;p=melted

diff --git a/src/modules/core/filter_channelcopy.c b/src/modules/core/filter_channelcopy.c
index fd49d12..8de9913 100644
--- a/src/modules/core/filter_channelcopy.c
+++ b/src/modules/core/filter_channelcopy.c
@@ -33,14 +33,11 @@
 static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
 	// Get the properties of the a frame
-	mlt_properties properties = mlt_frame_properties( frame );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 	int i, j;
 	int from = mlt_properties_get_int( properties, "channelcopy.from" );
 	int to = mlt_properties_get_int( properties, "channelcopy.to" );
 
-	// Restore the original get_audio
-	frame->get_audio = mlt_properties_get_data( properties, "channelcopy.get_audio", NULL );
-
 	// Get the producer's audio
 	mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
 
@@ -69,18 +66,15 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format
 
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
-	mlt_properties properties = mlt_filter_properties( this );
-	mlt_properties frame_props = mlt_frame_properties( frame );
+	mlt_properties properties = MLT_FILTER_PROPERTIES( this );
+	mlt_properties frame_props = MLT_FRAME_PROPERTIES( frame );
 
 	// Propogate the parameters
 	mlt_properties_set_int( frame_props, "channelcopy.to", mlt_properties_get_int( properties, "to" ) );
 	mlt_properties_set_int( frame_props, "channelcopy.from", mlt_properties_get_int( properties, "from" ) );
 
-	// Backup the original get_audio (it's still needed)
-	mlt_properties_set_data( frame_props, "channelcopy.get_audio", frame->get_audio, 0, NULL, NULL );
-
 	// Override the get_audio method
-	frame->get_audio = filter_get_audio;
+	mlt_frame_push_audio( frame, filter_get_audio );
 
 	return frame;
 }
@@ -95,9 +89,9 @@ mlt_filter filter_channelcopy_init( char *arg )
 	{
 		this->process = filter_process;
 		if ( arg != NULL )
-			mlt_properties_set_int( mlt_filter_properties( this ), "to", atoi( arg ) );
+			mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "to", atoi( arg ) );
 		else
-			mlt_properties_set_int( mlt_filter_properties( this ), "to", 1 );
+			mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "to", 1 );
 	}
 	return this;
 }