Update ChangeLog and remove svn log from the make install target.

[melted] / src / modules / resample / filter_resample.c

diff --git a/src/modules/resample/filter_resample.c b/src/modules/resample/filter_resample.c
index c2f8144..6838465 100644 (file)
--- a/src/modules/resample/filter_resample.c
+++ b/src/modules/resample/filter_resample.c
@@ -18,8 +18,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "filter_resample.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -37,13 +36,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" );
@@ -58,9 +57,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 );
 
@@ -164,11 +160,10 @@ 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 )
 {
-       if ( frame->get_audio != NULL )
+       if ( mlt_frame_is_test_audio( frame ) == 0 )
        {
-               mlt_frame_push_audio( frame, frame->get_audio );
                mlt_frame_push_audio( frame, this );
-               frame->get_audio = resample_get_audio;
+               mlt_frame_push_audio( frame, resample_get_audio );
        }
 
        return frame;
@@ -177,7 +172,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_resample_init( char *arg )
+mlt_filter filter_resample_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        mlt_filter this = mlt_filter_new( );
        if ( this != NULL )
@@ -190,11 +185,11 @@ mlt_filter filter_resample_init( char *arg )
                        void *output_buffer = mlt_pool_alloc( BUFFER_LEN );
                        this->process = filter_process;
                        if ( arg != NULL )
-                               mlt_properties_set_int( mlt_filter_properties( this ), "frequency", atoi( arg ) );
-                       mlt_properties_set_int( mlt_filter_properties( this ), "channels", 2 );
-                       mlt_properties_set_data( mlt_filter_properties( this ), "state", state, 0, (mlt_destructor)src_delete, NULL );
-                       mlt_properties_set_data( mlt_filter_properties( this ), "input_buffer", input_buffer, BUFFER_LEN, mlt_pool_release, NULL );
-                       mlt_properties_set_data( mlt_filter_properties( this ), "output_buffer", output_buffer, BUFFER_LEN, mlt_pool_release, NULL );
+                               mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "frequency", atoi( arg ) );
+                       mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "channels", 2 );
+                       mlt_properties_set_data( MLT_FILTER_PROPERTIES( this ), "state", state, 0, (mlt_destructor)src_delete, NULL );
+                       mlt_properties_set_data( MLT_FILTER_PROPERTIES( this ), "input_buffer", input_buffer, BUFFER_LEN, mlt_pool_release, NULL );
+                       mlt_properties_set_data( MLT_FILTER_PROPERTIES( this ), "output_buffer", output_buffer, BUFFER_LEN, mlt_pool_release, NULL );
                }
                else
                {