Cleanup license declarations and remove dv1394d references.

[melted] / src / modules / sox / filter_sox.c

diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c
index 6cd8ae9..d459360 100644 (file)
--- a/src/modules/sox/filter_sox.c
+++ b/src/modules/sox/filter_sox.c
@@ -3,25 +3,25 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Dan Dennedy <dan@dennedy.org>
  *
- * 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_sox.h"
 
 #include <framework/mlt_frame.h>
-#include "valerie/valerie_tokeniser.c"
+#include <framework/mlt_tokeniser.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -60,13 +60,13 @@ static inline double mean( double *buf, int count )
 */
 static int create_effect( mlt_filter this, char *value, int count, int channel, int frequency )
 {
-       valerie_tokeniser tokeniser = valerie_tokeniser_init();
+       mlt_tokeniser tokeniser = mlt_tokeniser_init();
        eff_t eff = mlt_pool_alloc( sizeof( struct st_effect ) );
        char id[ 256 ];
        int error = 1;
 
        // Tokenise the effect specification
-       valerie_tokeniser_parse_new( tokeniser, value, " " );
+       mlt_tokeniser_parse_new( tokeniser, value, " " );
 
        // Locate the effect
        int opt_count = st_geteffect_opt( eff, tokeniser->count, tokeniser->tokens );
@@ -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;
                        }
                }
@@ -99,7 +99,7 @@ static int create_effect( mlt_filter this, char *value, int count, int channel,
        if ( error == 1 )
                mlt_pool_release( eff );
        
-       valerie_tokeniser_close( tokeniser );
+       mlt_tokeniser_close( tokeniser );
        
        return error;
 }
@@ -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;