Constness changes

[melted] / mlt++ / src / MltProperties.h

diff --git a/mlt++/src/MltProperties.h b/mlt++/src/MltProperties.h
index 3f33733..e236675 100644 (file)
--- a/mlt++/src/MltProperties.h
+++ b/mlt++/src/MltProperties.h
@@ -21,6 +21,8 @@
 #ifndef _MLTPP_PROPERTIES_H_
 #define _MLTPP_PROPERTIES_H_
 
+#include "config.h"
+
 #include <stdio.h>
 #include <framework/mlt.h>
 
@@ -31,12 +33,10 @@ namespace Mlt
        /** Abstract Properties class.
         */
 
-       class Properties 
+       class MLTPP_DECLSPEC Properties 
        {
                private:
                        mlt_properties instance;
-               protected:
-                       virtual mlt_properties get_properties( );
                public:
                        Properties( );
                        Properties( bool dummy );
@@ -44,6 +44,7 @@ namespace Mlt
                        Properties( mlt_properties properties );
                        Properties( const char *file );
                        virtual ~Properties( );
+                       virtual mlt_properties get_properties( );
                        int inc_ref( );
                        int dec_ref( );
                        int ref_count( );
@@ -73,8 +74,13 @@ namespace Mlt
                        void debug( const char *title = "Object", FILE *output = stderr );
                        void load( const char *file );
                        int save( const char *file );
-                       Event *listen( char *id, void *object, mlt_listener listener );
-                       Event *setup_wait_for( char *id );
+                       #if defined( __DARWIN__ ) && GCC_VERSION < 40000
+                       Event *listen( const char *id, void *object, void (*)( ... ) );
+                       #else
+                       Event *listen( const char *id, void *object, mlt_listener );
+                       #endif
+                       static void delete_event( Event * );
+                       Event *setup_wait_for( const char *id );
                        void wait_for( Event *, bool destroy = true );
        };
 }