Cleanup license declarations and remove dv1394d references.

[melted] / src / modules / core / filter_channelcopy.c

diff --git a/src/modules/core/filter_channelcopy.c b/src/modules/core/filter_channelcopy.c
index fd49d12..0307370 100644 (file)
--- a/src/modules/core/filter_channelcopy.c
+++ b/src/modules/core/filter_channelcopy.c
@@ -3,19 +3,19 @@
  * 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_channelcopy.h"
@@ -33,14 +33,11 @@
 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 );
        int i, j;
        int from = mlt_properties_get_int( properties, "channelcopy.from" );
        int to = mlt_properties_get_int( properties, "channelcopy.to" );
 
-       // Restore the original get_audio
-       frame->get_audio = mlt_properties_get_data( properties, "channelcopy.get_audio", NULL );
-
        // Get the producer's audio
        mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
 
@@ -69,18 +66,15 @@ 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_filter_properties( this );
-       mlt_properties frame_props = mlt_frame_properties( frame );
+       mlt_properties properties = MLT_FILTER_PROPERTIES( this );
+       mlt_properties frame_props = MLT_FRAME_PROPERTIES( frame );
 
        // Propogate the parameters
        mlt_properties_set_int( frame_props, "channelcopy.to", mlt_properties_get_int( properties, "to" ) );
        mlt_properties_set_int( frame_props, "channelcopy.from", mlt_properties_get_int( properties, "from" ) );
 
-       // Backup the original get_audio (it's still needed)
-       mlt_properties_set_data( frame_props, "channelcopy.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;
 }
@@ -95,9 +89,9 @@ mlt_filter filter_channelcopy_init( char *arg )
        {
                this->process = filter_process;
                if ( arg != NULL )
-                       mlt_properties_set_int( mlt_filter_properties( this ), "to", atoi( arg ) );
+                       mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "to", atoi( arg ) );
                else
-                       mlt_properties_set_int( mlt_filter_properties( this ), "to", 1 );
+                       mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "to", 1 );
        }
        return this;
 }