X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltProperties.h;h=e236675727f4911cfb59fb979a27eb2f55c55a84;hb=14cff280de066eb895c91bb13245ac81f5fdb25b;hp=ab66ecdb1ce8f9263dd60af3953a2c8b6ab624db;hpb=7c8efa096472fc2d30e4d07ca63ddfe380f964ab;p=melted diff --git a/mlt++/src/MltProperties.h b/mlt++/src/MltProperties.h index ab66ecd..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 #include @@ -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,12 +74,13 @@ namespace Mlt void debug( const char *title = "Object", FILE *output = stderr ); void load( const char *file ); int save( const char *file ); - #ifdef __DARWIN__ - Event *listen( char *id, void *object, void (*)(...) ); + #if defined( __DARWIN__ ) && GCC_VERSION < 40000 + Event *listen( const char *id, void *object, void (*)( ... ) ); #else - Event *listen( char *id, void *object, mlt_listener ); + Event *listen( const char *id, void *object, mlt_listener ); #endif - Event *setup_wait_for( char *id ); + static void delete_event( Event * ); + Event *setup_wait_for( const char *id ); void wait_for( Event *, bool destroy = true ); }; }