X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fnormalize%2Ffilter_volume.c;h=2c129c6a4e25d2f3747041cbcdbd9ac11e852d10;hb=cdf7162ebc07120e92166a0e43eaba21ecca25ba;hp=04fb9364ec4bbf0e284d1b7a5ce0a779cfe0ef07;hpb=d229cc4caa1e8d06e66ca05aba414455279ae54f;p=melted

diff --git a/src/modules/normalize/filter_volume.c b/src/modules/normalize/filter_volume.c
index 04fb936..2c129c6 100644
--- a/src/modules/normalize/filter_volume.c
+++ b/src/modules/normalize/filter_volume.c
@@ -167,7 +167,7 @@ double signal_max_power( int16_t *buffer, int channels, int samples, int16_t *pe
 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 );
 	double gain = mlt_properties_get_double( properties, "volume.gain" );
 	double max_gain = mlt_properties_get_double( properties, "volume.max_gain" );
 	double limiter_level = 0.5; /* -6 dBFS */
@@ -181,14 +181,11 @@ static int filter_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format
 	mlt_filter this = mlt_properties_get_data( properties, "filter_volume", NULL );
 
 	// Get the properties from the filter
-	mlt_properties filter_props = mlt_filter_properties( this );
+	mlt_properties filter_props = MLT_FILTER_PROPERTIES( this );
 
 	if ( mlt_properties_get( properties, "volume.limiter" ) != NULL )
 		limiter_level = mlt_properties_get_double( properties, "volume.limiter" );
 	
-	// Restore the original get_audio
-	frame->get_audio = mlt_properties_get_data( properties, "volume.get_audio", NULL );
-
 	// Get the producer's audio
 	mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
 //	fprintf( stderr, "filter_volume: frequency %d\n", *frequency );
@@ -283,8 +280,8 @@ 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_frame_properties( frame );
-	mlt_properties filter_props = mlt_filter_properties( this );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
+	mlt_properties filter_props = MLT_FILTER_PROPERTIES( this );
 
 	// Parse the gain property
 	if ( mlt_properties_get( properties, "gain" ) == NULL )
@@ -435,11 +432,8 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 	// Put a filter reference onto the frame
 	mlt_properties_set_data( properties, "filter_volume", this, 0, NULL, NULL );
 
-	// Backup the original get_audio (it's still needed)
-	mlt_properties_set_data( properties, "volume.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;
 }
@@ -452,7 +446,7 @@ mlt_filter filter_volume_init( char *arg )
 	mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 );
 	if ( this != NULL && mlt_filter_init( this, NULL ) == 0 )
 	{
-		mlt_properties properties = mlt_filter_properties( this );
+		mlt_properties properties = MLT_FILTER_PROPERTIES( this );
 		this->process = filter_process;
 		if ( arg != NULL )
 			mlt_properties_set( properties, "gain", arg );