Merge ../mlt

[melted] / src / framework / mlt_properties.c

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index 9714a2f..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>
  *
@@ -24,6 +25,7 @@
 #include "mlt_properties.h"
 #include "mlt_property.h"
 #include "mlt_deque.h"
+#include "mlt_log.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -285,8 +287,8 @@ void mlt_properties_mirror( mlt_properties this, mlt_properties that )
 /** Copy all serializable properties to another properties list.
  *
  * \public \memberof mlt_properties_s
- * \param this The properties to copy from
- * \param that The properties to copy to
+ * \param this The properties to copy to
+ * \param that The properties to copy from
  * \return false
  */
 
@@ -309,8 +311,8 @@ int mlt_properties_inherit( mlt_properties this, mlt_properties that )
 /** Pass all serializable properties that match a prefix to another properties object
  *
  * \public \memberof mlt_properties_s
- * \param this the properties to copy from
- * \param that The properties to copy to
+ * \param this the properties to copy to
+ * \param that The properties to copy from
  * \param prefix the property names to match (required)
  * \return false
  */
@@ -423,8 +425,8 @@ static mlt_property mlt_properties_fetch( mlt_properties this, const char *name
  *
  * \public \memberof mlt_properties_s
  * \author Zach <zachary.drew@gmail.com>
- * \param this the properties to copy from
- * \param that the properties to copy to
+ * \param this the properties to copy to
+ * \param that the properties to copy from
  * \param name the name of the property to copy
  */
 
@@ -443,8 +445,8 @@ void mlt_properties_pass_property( mlt_properties this, mlt_properties that, con
  * White space is also a delimiter.
  * \public \memberof mlt_properties_s
  * \author Zach <zachary.drew@gmail.com>
- * \param this the properties to copy from
- * \param that the properties to copy to
+ * \param this the properties to copy to
+ * \param that the properties to copy from
  * \param list a delimited list of property names
  * \return false
  */
@@ -454,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 )
@@ -498,7 +500,7 @@ int mlt_properties_set( mlt_properties this, const char *name, const char *value
        // Set it if not NULL
        if ( property == NULL )
        {
-               fprintf( stderr, "Whoops - %s not found (should never occur)\n", name );
+               mlt_log( NULL, MLT_LOG_FATAL, "Whoops - %s not found (should never occur)\n", name );
        }
        else if ( value == NULL )
        {
@@ -637,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 )
@@ -880,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 )
@@ -1071,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.
@@ -1149,7 +1151,7 @@ void mlt_properties_close( mlt_properties this )
                        properties_destroyed ++;
 
                        // Show current stats - these should match when the app is closed
-                       fprintf( stderr, "Created %d, destroyed %d\n", properties_created, properties_destroyed );
+                       mlt_log( NULL, MLT_LOG_DEBUG, "Created %d, destroyed %d\n", properties_created, properties_destroyed );
 #endif
 
                        // Clean up names and values
@@ -1533,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
  */