X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsox%2Ffilter_sox.c;h=8a1eed875304439ae157eb2d00ba5a807a6e0856;hb=a718f7848696034f1e1b37e715fffaffafa7adad;hp=b707f5b3d074d51169b1461990b1700f26576822;hpb=b8c758109a74acfedf42212a47497d750590d911;p=melted

diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c
index b707f5b..8a1eed8 100644
--- a/src/modules/sox/filter_sox.c
+++ b/src/modules/sox/filter_sox.c
@@ -90,7 +90,7 @@ static int create_effect( mlt_filter this, char *value, int count, int channel,
 				sprintf( id, "_effect_%d_%d", count, channel );
 
 				// Save the effect state
-				mlt_properties_set_data( mlt_filter_properties( this ), id, eff, 0, mlt_pool_release, NULL );
+				mlt_properties_set_data( MLT_FILTER_PROPERTIES( this ), id, eff, 0, mlt_pool_release, NULL );
 				error = 0;
 			}
 		}
@@ -110,13 +110,13 @@ static int create_effect( mlt_filter this, char *value, int count, int channel,
 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 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 properties
 	st_sample_t *input_buffer = mlt_properties_get_data( filter_properties, "input_buffer", NULL );
@@ -125,9 +125,6 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format
 	int i; // channel
 	int count = mlt_properties_get_int( filter_properties, "effect_count" );
 
-	// 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 );
 
@@ -337,15 +334,14 @@ 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 )
 {
-	if ( frame->get_audio != NULL )
+	if ( mlt_frame_is_test_audio( frame ) != 0 )
 	{
 		// Add the filter to the frame
-		mlt_frame_push_audio( frame, frame->get_audio );
 		mlt_frame_push_audio( frame, this );
-		frame->get_audio = filter_get_audio;
+		mlt_frame_push_audio( frame, filter_get_audio );
 		
 		// Parse the window property and allocate smoothing buffer if needed
-		mlt_properties properties = mlt_filter_properties( this );
+		mlt_properties properties = MLT_FILTER_PROPERTIES( this );
 		int window = mlt_properties_get_int( properties, "window" );
 		if ( mlt_properties_get( properties, "smooth_buffer" ) == NULL && window > 1 )
 		{
@@ -371,7 +367,7 @@ mlt_filter filter_sox_init( char *arg )
 	{
 		void *input_buffer = mlt_pool_alloc( BUFFER_LEN );
 		void *output_buffer = mlt_pool_alloc( BUFFER_LEN );
-		mlt_properties properties = mlt_filter_properties( this );
+		mlt_properties properties = MLT_FILTER_PROPERTIES( this );
 		
 		this->process = filter_process;