X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_properties.h;h=e1e84e033ade4195af7c5c064a0128fa38c61fac;hb=eabc3498604fc7983bbd805d40dad2e7df135f17;hp=e6e956ba9f43bfbe069c5814fc53a11c3750960c;hpb=94dce1aea965163f8dcd2f97271f2652abb0e62d;p=melted

diff --git a/src/framework/mlt_properties.h b/src/framework/mlt_properties.h
index e6e956b..e1e84e0 100644
--- a/src/framework/mlt_properties.h
+++ b/src/framework/mlt_properties.h
@@ -22,6 +22,7 @@
 #define _MLT_PROPERTIES_H_
 
 #include "mlt_types.h"
+#include "mlt_events.h"
 #include <stdio.h>
 
 /** The properties base class defines the basic property propagation and
@@ -31,7 +32,9 @@
 struct mlt_properties_s
 {
 	void *child;
-	void *private;
+	void *local;
+	mlt_destructor close;
+	void *close_object;
 };
 
 /** Public interface.
@@ -39,25 +42,36 @@ struct mlt_properties_s
 
 extern int mlt_properties_init( mlt_properties, void *child );
 extern mlt_properties mlt_properties_new( );
-extern void mlt_properties_mirror( mlt_properties this, mlt_properties that );
-extern int mlt_properties_inherit( mlt_properties this, mlt_properties that );
-extern int mlt_properties_set( mlt_properties this, char *name, char *value );
-extern int mlt_properties_parse( mlt_properties this, char *namevalue );
-extern char *mlt_properties_get( mlt_properties this, char *name );
-extern char *mlt_properties_get_name( mlt_properties this, int index );
-extern char *mlt_properties_get_value( mlt_properties this, int index );
-extern void *mlt_properties_get_data_at( mlt_properties this, int index, int *size );
-extern int mlt_properties_get_int( mlt_properties this, char *name );
-extern int mlt_properties_set_int( mlt_properties this, char *name, int value );
-extern double mlt_properties_get_double( mlt_properties this, char *name );
-extern int mlt_properties_set_double( mlt_properties this, char *name, double value );
-extern mlt_position mlt_properties_get_position( mlt_properties this, char *name );
-extern int mlt_properties_set_position( mlt_properties this, char *name, mlt_position value );
-extern int mlt_properties_set_data( mlt_properties this, char *name, void *value, int length, mlt_destructor, mlt_serialiser );
-extern void *mlt_properties_get_data( mlt_properties this, char *name, int *length );
-extern int mlt_properties_rename( mlt_properties this, char *source, char *dest );
-extern int mlt_properties_count( mlt_properties this );
-extern void mlt_properties_dump( mlt_properties this, FILE *output );
-extern void mlt_properties_close( mlt_properties this );
+extern mlt_properties mlt_properties_load( const char *file );
+extern int mlt_properties_inc_ref( mlt_properties self );
+extern int mlt_properties_dec_ref( mlt_properties self );
+extern int mlt_properties_ref_count( mlt_properties self );
+extern void mlt_properties_mirror( mlt_properties self, mlt_properties that );
+extern int mlt_properties_inherit( mlt_properties self, mlt_properties that );
+extern int mlt_properties_pass( mlt_properties self, mlt_properties that, const char *prefix );
+extern void mlt_properties_pass_property( mlt_properties self, mlt_properties that, const char *name );
+extern int mlt_properties_pass_list( mlt_properties self, mlt_properties that, const char *list );
+extern int mlt_properties_set( mlt_properties self, const char *name, const char *value );
+extern int mlt_properties_set_or_default( mlt_properties self, const char *name, const char *value, const char *def );
+extern int mlt_properties_parse( mlt_properties self, const char *namevalue );
+extern char *mlt_properties_get( mlt_properties self, const char *name );
+extern char *mlt_properties_get_name( mlt_properties self, int index );
+extern char *mlt_properties_get_value( mlt_properties self, int index );
+extern void *mlt_properties_get_data_at( mlt_properties self, int index, int *size );
+extern int mlt_properties_get_int( mlt_properties self, const char *name );
+extern int mlt_properties_set_int( mlt_properties self, const char *name, int value );
+extern int64_t mlt_properties_get_int64( mlt_properties self, const char *name );
+extern int mlt_properties_set_int64( mlt_properties self, const char *name, int64_t value );
+extern double mlt_properties_get_double( mlt_properties self, const char *name );
+extern int mlt_properties_set_double( mlt_properties self, const char *name, double value );
+extern mlt_position mlt_properties_get_position( mlt_properties self, const char *name );
+extern int mlt_properties_set_position( mlt_properties self, const char *name, mlt_position value );
+extern int mlt_properties_set_data( mlt_properties self, const char *name, void *value, int length, mlt_destructor, mlt_serialiser );
+extern void *mlt_properties_get_data( mlt_properties self, const char *name, int *length );
+extern int mlt_properties_rename( mlt_properties self, const char *source, const char *dest );
+extern int mlt_properties_count( mlt_properties self );
+extern void mlt_properties_dump( mlt_properties self, FILE *output );
+extern void mlt_properties_debug( mlt_properties self, const char *title, FILE *output );
+extern void mlt_properties_close( mlt_properties self );
 
 #endif