remove invalid metadata item for pango

[mlt] / src / modules / core / producer_noise.c

diff --git a/src/modules/core/producer_noise.c b/src/modules/core/producer_noise.c
index 1b71cda49638c967fb1d07712447c872107e812c..655ff23caec45121501f4e3a5b28b40b893f04d0 100644 (file)
--- a/src/modules/core/producer_noise.c
+++ b/src/modules/core/producer_noise.c
@@ -3,22 +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 "producer_noise.h"
+#include <framework/mlt_producer.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_pool.h>
 
@@ -32,7 +32,7 @@
 static unsigned int seed_x = 521288629;
 static unsigned int seed_y = 362436069;
 
-static unsigned inline int fast_rand( )
+static inline unsigned int fast_rand( )
 {
    static unsigned int a = 18000, b = 30903;
    seed_x = a * ( seed_x & 65535 ) + ( seed_x >> 16 );
@@ -47,19 +47,14 @@ static void producer_close( mlt_producer this );
 /** Initialise.
 */
 
-mlt_producer producer_noise_init( void *arg )
+mlt_producer producer_noise_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
        // Create a new producer object
-       mlt_producer this = mlt_producer_new( );
+       mlt_producer this = mlt_producer_new( profile );
 
        // Initialise the producer
        if ( this != NULL )
        {
-               int is_pal = mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( this ), "normalised_height" ) == 576;
-
-               // Synthetic - aspect ratio of 1
-               mlt_properties_set_double( MLT_PRODUCER_PROPERTIES( this ), "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.0 );
-
                // Callback registration
                this->get_frame = producer_get_frame;
                this->close = ( mlt_destructor )producer_close;
@@ -70,9 +65,6 @@ mlt_producer producer_noise_init( void *arg )
 
 static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
-       // Obtain properties of frame
-       mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
-
        // Calculate the size of the image
        int size = *width * *height * 2;
 
@@ -83,9 +75,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        *buffer = mlt_pool_alloc( size );
 
        // Update the frame
-       mlt_properties_set_data( properties, "image", *buffer, size, mlt_pool_release, NULL );
-       mlt_properties_set_int( properties, "width", *width );
-       mlt_properties_set_int( properties, "height", *height );
+       mlt_frame_set_image( frame, *buffer, size, mlt_pool_release );
 
        // Before we write to the image, make sure we have one
        if ( *buffer != NULL )
@@ -110,9 +100,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 
 static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
-       // Get the frame properties
-       mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
-
        int size = 0;
 
        // Correct the returns if necessary
@@ -135,7 +122,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        }
 
        // Set the buffer for destruction
-       mlt_properties_set_data( properties, "audio", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
+       mlt_frame_set_audio( frame, *buffer, *format, size, mlt_pool_release );
 
        return 0;
 }
@@ -143,7 +130,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index )
 {
        // Generate a frame
-       *frame = mlt_frame_init( );
+       *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( this ) );
 
        // Check that we created a frame and initialise it
        if ( *frame != NULL )
@@ -152,7 +139,7 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index
                mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
 
                // Aspect ratio is whatever it needs to be
-               mlt_properties_set_double( properties, "aspect_ratio", 0 );
+               mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( MLT_PRODUCER_PROPERTIES( this ), "aspect_ratio" ) );
 
                // Set producer-specific frame properties
                mlt_properties_set_int( properties, "progressive", 1 );