+ Whoops - had forgotten these OS/X patches...

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

diff --git a/mlt++/src/MltProperties.cpp b/mlt++/src/MltProperties.cpp
index f6e39da..e6ebfa6 100644 (file)
--- a/mlt++/src/MltProperties.cpp
+++ b/mlt++/src/MltProperties.cpp
@@ -36,18 +36,16 @@ Properties::Properties( bool dummy ) :
 Properties::Properties( Properties &properties ) :
        instance( properties.get_properties( ) )
 {
-       fprintf( stderr, "Incrementing ref count on properties #1\n" );
        inc_ref( );
 }
 
 Properties::Properties( mlt_properties properties ) :
        instance( properties )
 {
-       fprintf( stderr, "Incrementing ref count on properties #2\n" );
        inc_ref( );
 }
 
-Properties::Properties( char *file ) :
+Properties::Properties( const char *file ) :
        instance( NULL )
 {
        instance = mlt_properties_load( file );
@@ -73,6 +71,26 @@ int Properties::dec_ref( )
        return mlt_properties_dec_ref( get_properties( ) );
 }
 
+int Properties::ref_count( )
+{
+       return mlt_properties_ref_count( get_properties( ) );
+}
+
+void Properties::block( void *object )
+{
+       mlt_events_block( get_properties( ), object != NULL ? object : get_properties( ) );
+}
+
+void Properties::unblock( void *object )
+{
+       mlt_events_unblock( get_properties( ), object != NULL ? object : get_properties( ) );
+}
+
+void Properties::fire_event( const char *event )
+{
+       mlt_events_fire( get_properties( ), ( char * )event, NULL );
+}
+
 bool Properties::is_valid( )
 {
        return get_properties( ) != NULL;
@@ -83,52 +101,57 @@ int Properties::count( )
        return mlt_properties_count( get_properties( ) );
 }
 
-char *Properties::get( char *name )
+char *Properties::get( const char *name )
 {
        return mlt_properties_get( get_properties( ), name );
 }
 
-int Properties::get_int( char *name )
+int Properties::get_int( const char *name )
 {
        return mlt_properties_get_int( get_properties( ), name );
 }
 
-double Properties::get_double( char *name )
+double Properties::get_double( const char *name )
 {
        return mlt_properties_get_double( get_properties( ), name );
 }
 
-void *Properties::get_data( char *name, int &size )
+void *Properties::get_data( const char *name, int &size )
 {
        return mlt_properties_get_data( get_properties( ), name, &size );
 }
 
-int Properties::set( char *name, char *value )
+void *Properties::get_data( const char *name )
+{
+       return mlt_properties_get_data( get_properties( ), name, NULL );
+}
+
+int Properties::set( const char *name, const char *value )
 {
        return mlt_properties_set( get_properties( ), name, value );
 }
 
-int Properties::set( char *name, int value )
+int Properties::set( const char *name, int value )
 {
        return mlt_properties_set_int( get_properties( ), name, value );
 }
 
-int Properties::set( char *name, double value )
+int Properties::set( const char *name, double value )
 {
        return mlt_properties_set_double( get_properties( ), name, value );
 }
 
-int Properties::set( char *name, void *value, int size, mlt_destructor destructor, mlt_serialiser serialiser )
+int Properties::set( const char *name, void *value, int size, mlt_destructor destructor, mlt_serialiser serialiser )
 {
        return mlt_properties_set_data( get_properties( ), name, value, size, destructor, serialiser );
 }
 
-int Properties::pass_values( Properties &that, char *prefix )
+int Properties::pass_values( Properties &that, const char *prefix )
 {
        return mlt_properties_pass( get_properties( ), that.get_properties( ), prefix );
 }
 
-int Properties::parse( char *namevalue )
+int Properties::parse( const char *namevalue )
 {
        return mlt_properties_parse( get_properties( ), namevalue );
 }
@@ -158,7 +181,7 @@ int Properties::inherit( Properties &that )
        return mlt_properties_inherit( get_properties( ), that.get_properties( ) );
 }
 
-int Properties::rename( char *source, char *dest )
+int Properties::rename( const char *source, const char *dest )
 {
        return mlt_properties_rename( get_properties( ), source, dest );
 }
@@ -168,12 +191,20 @@ void Properties::dump( FILE *output )
        mlt_properties_dump( get_properties( ), output );
 }
 
-void Properties::debug( char *title, FILE *output )
+void Properties::debug( const char *title, FILE *output )
 {
        mlt_properties_debug( get_properties( ), title, output );
 }
 
-int Properties::save( char *file )
+void Properties::load( const char *file )
+{
+       mlt_properties properties = mlt_properties_load( file );
+       if ( properties != NULL )
+               mlt_properties_pass( get_properties( ), properties, "" );
+       mlt_properties_close( properties );
+}
+
+int Properties::save( const char *file )
 {
        int error = 0;
        FILE *f = fopen( file, "w" );
@@ -189,17 +220,24 @@ int Properties::save( char *file )
        return error;
 }
 
-void Properties::listen( char *id, void *object, mlt_listener listener )
+#ifdef __DARWIN__
+
+Event *Properties::listen( char *id, void *object, void (*listener)( ... ) )
+{
+       mlt_event event = mlt_events_listen( get_properties( ), object, id, ( mlt_listener )listener );
+       return new Event( event );
+}
+
+#else
+
+Event *Properties::listen( char *id, void *object, mlt_listener listener )
 {
-       char key[ 128 ];
        mlt_event event = mlt_events_listen( get_properties( ), object, id, listener );
-       if ( event != NULL )
-       {
-               sprintf( key, "_%p", event );
-               mlt_properties_set_data( get_properties( ), key, event, 0, ( mlt_destructor )mlt_event_close, NULL );
-       }
+       return new Event( event );
 }
 
+#endif
+
 Event *Properties::setup_wait_for( char *id )
 {
        return new Event( mlt_events_setup_wait_for( get_properties( ), id ) );
@@ -209,9 +247,6 @@ void Properties::wait_for( Event *event, bool destroy )
 {
        mlt_events_wait_for( get_properties( ), event->get_event( ) );
        if ( destroy )
-       {
                mlt_events_close_wait_for( get_properties( ), event->get_event( ) );
-               delete event;
-       }
 }