move binary modules to libdir - affects MLT_REPOSITORY

[melted] / src / modules / qimage / producer_qimage.c

diff --git a/src/modules/qimage/producer_qimage.c b/src/modules/qimage/producer_qimage.c
index 550df36..6008b7e 100644 (file)
--- a/src/modules/qimage/producer_qimage.c
+++ b/src/modules/qimage/producer_qimage.c
@@ -1,8 +1,7 @@
 /*
  * producer_image.c -- a QT/QImage based producer for MLT
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
- * Author: Dan Dennedy <dan@dennedy.org>
- *         Charles Yates <charles.yates@gmail.com>
+ * Copyright (C) 2006 Visual Media
+ * Author: Charles Yates <charles.yates@gmail.com>
  *
  * NB: This module is designed to be functionally equivalent to the 
  * gtk2 image loading module so it can be used as replacement.
@@ -22,7 +21,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "producer_qimage.h"
+#include <framework/mlt_producer.h>
 #include "qimage_wrapper.h"
 
 #include <stdio.h>
@@ -36,7 +35,7 @@
 static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index );
 static void producer_close( mlt_producer parent );
 
-mlt_producer producer_qimage_init( char *filename )
+mlt_producer producer_qimage_init( mlt_profile profile, mlt_service_type type, const char *id, char *filename )
 {
        producer_qimage this = calloc( sizeof( struct producer_qimage_s ), 1 );
        if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
@@ -47,6 +46,7 @@ mlt_producer producer_qimage_init( char *filename )
                mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent );
        
                // Callback registration
+               init_qimage();
                producer->get_frame = producer_get_frame;
                producer->close = ( mlt_destructor )producer_close;
 
@@ -241,7 +241,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        }
 
        // Generate a frame
-       *frame = mlt_frame_init( );
+       *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
 
        if ( *frame != NULL && this->count > 0 )
        {