X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMltProperties.cpp;h=f168eb92fc4f7bc2e224a6e93ce5a221a8650e43;hb=55757b000043f6e370b9e963ce2e3542962c03c0;hp=98e87f9ba67be04059cdf7f3da89e1af8424210e;hpb=cdf2dbd4142d046054baf2f675ff5bec30bb449a;p=melted

diff --git a/mlt++/src/MltProperties.cpp b/mlt++/src/MltProperties.cpp
index 98e87f9..f168eb9 100644
--- 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,14 +71,24 @@ 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 );
+	mlt_events_block( get_properties( ), object != NULL ? object : get_properties( ) );
 }
 
 void Properties::unblock( void *object )
 {
-	mlt_events_unblock( get_properties( ), 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( )
@@ -93,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 );
 }
@@ -168,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 );
 }
@@ -178,13 +191,24 @@ 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 )
 {
+#ifdef WIN32
+	return mlt_properties_save( get_properties( ), file );
+#else
 	int error = 0;
 	FILE *f = fopen( file, "w" );
 	if ( f != NULL )
@@ -197,19 +221,37 @@ int Properties::save( char *file )
 		error = 1;
 	}
 	return error;
+#endif
+}
+
+#if defined( __DARWIN__ ) && GCC_VERSION < 40000
+
+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 )
 {
 	mlt_event event = mlt_events_listen( get_properties( ), object, id, listener );
 	return new Event( event );
 }
 
+#endif
+
 Event *Properties::setup_wait_for( char *id )
 {
 	return new Event( mlt_events_setup_wait_for( get_properties( ), id ) );
 }
 
+void Properties::delete_event( Event *event )
+{
+	delete event;
+}
+
 void Properties::wait_for( Event *event, bool destroy )
 {
 	mlt_events_wait_for( get_properties( ), event->get_event( ) );