X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avresample.c;h=a79d453c051ad7123afb29fdf1c5a22a572fd5aa;hb=2a04e5dceebd174e24be42da8643a815640db27d;hp=4c37ae099cc84bf3a1e5cf810b34d69254ffb0fd;hpb=757e8d55530954c3002b71f78d5027a222e810f7;p=melted

diff --git a/src/modules/avformat/filter_avresample.c b/src/modules/avformat/filter_avresample.c
index 4c37ae0..a79d453 100644
--- a/src/modules/avformat/filter_avresample.c
+++ b/src/modules/avformat/filter_avresample.c
@@ -35,13 +35,13 @@
 static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
 	// Get the properties of the frame
-	mlt_properties properties = mlt_frame_properties( frame );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 
 	// Get the filter service
 	mlt_filter filter = mlt_frame_pop_audio( frame );
 
 	// Get the filter properties
-	mlt_properties filter_properties = mlt_filter_properties( filter );
+	mlt_properties filter_properties = MLT_FILTER_PROPERTIES( filter );
 
 	// Get the resample information
 	int output_rate = mlt_properties_get_int( filter_properties, "frequency" );
@@ -60,9 +60,6 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 	if ( output_rate == 0 )
 		output_rate = *frequency;
 
-	// Restore the original get_audio
-	frame->get_audio = mlt_frame_pop_audio( frame );
-
 	// Get the producer's audio
 	mlt_frame_get_audio( frame, buffer, format, frequency, &channels_avail, samples );
 
@@ -153,16 +150,13 @@ static int resample_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
 	// Only call this if we have a means to get audio
-	if ( frame->get_audio != NULL )
+	if ( mlt_frame_is_test_audio( frame ) == 0 )
 	{
-		// Push the original method on to the stack
-		mlt_frame_push_audio( frame, frame->get_audio );
-
 		// Push the filter on to the stack
 		mlt_frame_push_audio( frame, this );
 
 		// Assign our get_audio method
-		frame->get_audio = resample_get_audio;
+		mlt_frame_push_audio( frame, resample_get_audio );
 	}
 
 	return frame;
@@ -190,13 +184,13 @@ mlt_filter filter_avresample_init( char *arg )
 
 		// Deal with argument
 		if ( arg != NULL )
-			mlt_properties_set( mlt_filter_properties( this ), "frequency", arg );
+			mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "frequency", arg );
 
 		// Default to 2 channel output
-		mlt_properties_set_int( mlt_filter_properties( this ), "channels", 2 );
+		mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "channels", 2 );
 
 		// Store the buffer
-		mlt_properties_set_data( mlt_filter_properties( this ), "buffer", buffer, size, mlt_pool_release, NULL );
+		mlt_properties_set_data( MLT_FILTER_PROPERTIES( this ), "buffer", buffer, size, mlt_pool_release, NULL );
 	}
 
 	return this;