Merge ../mlt

[melted] / src / framework / mlt_properties.c

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index 6057b68..97ee02d 100644 (file)
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -1,8 +1,9 @@
 /**
  * \file mlt_properties.c
  * \brief Properties class definition
+ * \see mlt_properties_s
  *
- * Copyright (C) 2003-2008 Ushodaya Enterprises Limited
+ * Copyright (C) 2003-2009 Ushodaya Enterprises Limited
  * \author Charles Yates <charles.yates@pandora.be>
  * \author Dan Dennedy <dan@dennedy.org>
  *
@@ -455,7 +456,7 @@ int mlt_properties_pass_list( mlt_properties this, mlt_properties that, const ch
 {
        char *props = strdup( list );
        char *ptr = props;
-       char *delim = " ,\t\n"; // Any combination of spaces, commas, tabs, and newlines
+       const char *delim = " ,\t\n";   // Any combination of spaces, commas, tabs, and newlines
        int count, done = 0;
 
        while( !done )
@@ -638,7 +639,7 @@ char *mlt_properties_get_value( mlt_properties this, int index )
  * \public \memberof mlt_properties_s
  * \param this a properties list
  * \param index the numeric index of the property
- * \param size the size of the binary data in bytes or NULL if the index is out of range
+ * \param[out] size the size of the binary data in bytes or NULL if the index is out of range
  */
 
 void *mlt_properties_get_data_at( mlt_properties this, int index, int *size )
@@ -881,7 +882,7 @@ int mlt_properties_set_position( mlt_properties this, const char *name, mlt_posi
  * \public \memberof mlt_properties_s
  * \param this a properties list
  * \param name the property to get
- * \param length The size of the binary data in bytes, if available (often it is not, you should know)
+ * \param[out] length The size of the binary data in bytes, if available (often it is not, you should know)
  */
 
 void *mlt_properties_get_data( mlt_properties this, const char *name, int *length )
@@ -1072,7 +1073,7 @@ static int mlt_fnmatch( const char *wild, const char *file )
 
 static int mlt_compare( const void *this, const void *that )
 {
-       return strcmp( mlt_property_get_string( *( mlt_property * )this ), mlt_property_get_string( *( mlt_property * )that ) );
+       return strcmp( mlt_property_get_string( *( const mlt_property * )this ), mlt_property_get_string( *( const mlt_property * )that ) );
 }
 
 /** Get the contents of a directory.
@@ -1534,7 +1535,7 @@ mlt_properties mlt_properties_parse_yaml( const char *filename )
 /** How many bytes to grow at a time */
 #define STRBUF_GROWTH (1024)
 
-/** \brief Self-growing buffer for building strings
+/** \brief Private to mlt_properties_s, a self-growing buffer for building strings
  * \private
  */