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

diff --git a/src/modules/avformat/filter_avresample.c b/src/modules/avformat/filter_avresample.c
index 4c37ae0..3252246 100644
--- a/src/modules/avformat/filter_avresample.c
+++ b/src/modules/avformat/filter_avresample.c
@@ -3,23 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_avresample.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -35,13 +34,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 +59,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 +149,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 +183,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;