c++ compatability

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@8 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/mlt/src/framework/mlt.h b/mlt/src/framework/mlt.h
index e38419ca3f54b244763e96f35167e59d062222a8..1725205eaa1629f5de59791d0325c3f67e298b0a 100644 (file)
--- a/mlt/src/framework/mlt.h
+++ b/mlt/src/framework/mlt.h
@@ -21,6 +21,11 @@
 #ifndef _MLT_H_
 #define _MLT_H_
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #include "mlt_factory.h"
 #include "mlt_frame.h"
 #include "mlt_multitrack.h"
@@ -33,5 +38,9 @@
 #include "mlt_properties.h"
 #include "mlt_tractor.h"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 

diff --git a/mlt/src/framework/mlt_repository.c b/mlt/src/framework/mlt_repository.c
index 0928b371965bbef65d248e795ffc34e7b891345a..dcb2c25797678c4424acc28b46fb001c5370aaab 100644 (file)
--- a/mlt/src/framework/mlt_repository.c
+++ b/mlt/src/framework/mlt_repository.c
@@ -66,7 +66,7 @@ static mlt_properties construct_service( mlt_properties object, char *id )
        return output;
 }
 
-void *construct_instance( mlt_properties service_properties, char *symbol, void *input )
+static void *construct_instance( mlt_properties service_properties, char *symbol, void *input )
 {
        // Extract the service
        char *service = mlt_properties_get( service_properties, "id" );
@@ -126,7 +126,7 @@ mlt_repository mlt_repository_init( mlt_properties object_list, char *prefix, ch
 
        // Construct the repository
        mlt_repository this = calloc( sizeof( struct mlt_repository_s ), 1 );
-       mlt_properties_init( &this->parent, NULL );
+       mlt_properties_init( &this->parent, this );
 
        // Add the symbol to THIS repository properties.
        mlt_properties_set( &this->parent, "_symbol", symbol );

diff --git a/src/framework/mlt.h b/src/framework/mlt.h
index e38419ca3f54b244763e96f35167e59d062222a8..1725205eaa1629f5de59791d0325c3f67e298b0a 100644 (file)
--- a/src/framework/mlt.h
+++ b/src/framework/mlt.h
@@ -21,6 +21,11 @@
 #ifndef _MLT_H_
 #define _MLT_H_
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #include "mlt_factory.h"
 #include "mlt_frame.h"
 #include "mlt_multitrack.h"
@@ -33,5 +38,9 @@
 #include "mlt_properties.h"
 #include "mlt_tractor.h"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 

diff --git a/src/framework/mlt_repository.c b/src/framework/mlt_repository.c
index 0928b371965bbef65d248e795ffc34e7b891345a..dcb2c25797678c4424acc28b46fb001c5370aaab 100644 (file)
--- a/src/framework/mlt_repository.c
+++ b/src/framework/mlt_repository.c
@@ -66,7 +66,7 @@ static mlt_properties construct_service( mlt_properties object, char *id )
        return output;
 }
 
-void *construct_instance( mlt_properties service_properties, char *symbol, void *input )
+static void *construct_instance( mlt_properties service_properties, char *symbol, void *input )
 {
        // Extract the service
        char *service = mlt_properties_get( service_properties, "id" );
@@ -126,7 +126,7 @@ mlt_repository mlt_repository_init( mlt_properties object_list, char *prefix, ch
 
        // Construct the repository
        mlt_repository this = calloc( sizeof( struct mlt_repository_s ), 1 );
-       mlt_properties_init( &this->parent, NULL );
+       mlt_properties_init( &this->parent, this );
 
        // Add the symbol to THIS repository properties.
        mlt_properties_set( &this->parent, "_symbol", symbol );