X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltProperties.h;h=e236675727f4911cfb59fb979a27eb2f55c55a84;hb=14cff280de066eb895c91bb13245ac81f5fdb25b;hp=91570aec2fca4ab2a0902daddc12058a021bd156;hpb=b2acc89d28aa0be283f242a137a3104448dfdd2e;p=melted

diff --git a/mlt++/src/MltProperties.h b/mlt++/src/MltProperties.h
index 91570ae..e236675 100644
--- 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( );
@@ -56,6 +57,7 @@ namespace Mlt
 			int get_int( const char *name );
 			double get_double( const char *name );
 			void *get_data( const char *name, int &size );
+			void *get_data( const char *name );
 			int set( const char *name, const char *value );
 			int set( const char *name, int value );
 			int set( const char *name, double value );
@@ -72,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 );
 	};
 }