Merge branch 'review-2' of git://github.com/rayl/mlt

Conflicts:
	src/miracle/miracle_connection.c

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1398 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..63f6b59
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.o
+*.so
+*.so.*
+config.mak
+config.h
+.depend

diff --git a/src/framework/mlt_events.c b/src/framework/mlt_events.c
index 4a813fe6697cd31c584f4ac1f8801a4368045d10..5c841901ed215296a9d809d1fc2b71f2994dc28d 100644 (file)
--- a/src/framework/mlt_events.c
+++ b/src/framework/mlt_events.c
@@ -158,7 +158,7 @@ void mlt_events_init( mlt_properties this )
  * \return true if there was an error
  */
 
-int mlt_events_register( mlt_properties this, char *id, mlt_transmitter transmitter )
+int mlt_events_register( mlt_properties this, const char *id, mlt_transmitter transmitter )
 {
        int error = 1;
        mlt_events events = mlt_events_fetch( this );
@@ -183,7 +183,7 @@ int mlt_events_register( mlt_properties this, char *id, mlt_transmitter transmit
  * \param id the name of an event
  */
 
-void mlt_events_fire( mlt_properties this, char *id, ... )
+void mlt_events_fire( mlt_properties this, const char *id, ... )
 {
        mlt_events events = mlt_events_fetch( this );
        if ( events != NULL )
@@ -231,7 +231,7 @@ void mlt_events_fire( mlt_properties this, char *id, ... )
  * \return
  */
 
-mlt_event mlt_events_listen( mlt_properties this, void *service, char *id, mlt_listener listener )
+mlt_event mlt_events_listen( mlt_properties this, void *service, const char *id, mlt_listener listener )
 {
        mlt_event event = NULL;
        mlt_events events = mlt_events_fetch( this );
@@ -413,7 +413,7 @@ static void mlt_events_listen_for( mlt_properties this, condition_pair *pair )
  * \return an event
  */
 
-mlt_event mlt_events_setup_wait_for( mlt_properties this, char *id )
+mlt_event mlt_events_setup_wait_for( mlt_properties this, const char *id )
 {
        condition_pair *pair = malloc( sizeof( condition_pair ) );
        pair->done = 0;

diff --git a/src/framework/mlt_events.h b/src/framework/mlt_events.h
index 850016091164c54b5c8d73f530b6953ad7245cc6..55bb18f495b0a24e0f7c5a6f90467a84d0250866 100644 (file)
--- a/src/framework/mlt_events.h
+++ b/src/framework/mlt_events.h
@@ -43,14 +43,14 @@ typedef void ( *mlt_listener )( );
 #endif
 
 extern void mlt_events_init( mlt_properties self );
-extern int mlt_events_register( mlt_properties self, char *id, mlt_transmitter transmitter );
-extern void mlt_events_fire( mlt_properties self, char *id, ... );
-extern mlt_event mlt_events_listen( mlt_properties self, void *service, char *id, mlt_listener listener );
+extern int mlt_events_register( mlt_properties self, const char *id, mlt_transmitter transmitter );
+extern void mlt_events_fire( mlt_properties self, const char *id, ... );
+extern mlt_event mlt_events_listen( mlt_properties self, void *service, const char *id, mlt_listener listener );
 extern void mlt_events_block( mlt_properties self, void *service );
 extern void mlt_events_unblock( mlt_properties self, void *service );
 extern void mlt_events_disconnect( mlt_properties self, void *service );
 
-extern mlt_event mlt_events_setup_wait_for( mlt_properties self, char *id );
+extern mlt_event mlt_events_setup_wait_for( mlt_properties self, const char *id );
 extern void mlt_events_wait_for( mlt_properties self, mlt_event event );
 extern void mlt_events_close_wait_for( mlt_properties self, mlt_event event );
 

diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c
index c9bdb11c7fc2dd63bb83617739682ea66a86ea1a..552b8ce30304ce78715f211b1ec6008b8cc6a35e 100644 (file)
--- a/src/framework/mlt_factory.c
+++ b/src/framework/mlt_factory.c
@@ -226,7 +226,7 @@ static void set_common_properties( mlt_properties properties, mlt_profile profil
  * \return a new producer
  */
 
-mlt_producer mlt_factory_producer( mlt_profile profile, const char *service, void *input )
+mlt_producer mlt_factory_producer( mlt_profile profile, const char *service, const void *input )
 {
        mlt_producer obj = NULL;
 
@@ -259,7 +259,7 @@ mlt_producer mlt_factory_producer( mlt_profile profile, const char *service, voi
  * \return a new filter
  */
 
-mlt_filter mlt_factory_filter( mlt_profile profile, const char *service, void *input )
+mlt_filter mlt_factory_filter( mlt_profile profile, const char *service, const void *input )
 {
        mlt_filter obj = NULL;
 
@@ -288,7 +288,7 @@ mlt_filter mlt_factory_filter( mlt_profile profile, const char *service, void *i
  * \return a new transition
  */
 
-mlt_transition mlt_factory_transition( mlt_profile profile, const char *service, void *input )
+mlt_transition mlt_factory_transition( mlt_profile profile, const char *service, const void *input )
 {
        mlt_transition obj = NULL;
 
@@ -317,7 +317,7 @@ mlt_transition mlt_factory_transition( mlt_profile profile, const char *service,
  * \return a new consumer
  */
 
-mlt_consumer mlt_factory_consumer( mlt_profile profile, const char *service, void *input )
+mlt_consumer mlt_factory_consumer( mlt_profile profile, const char *service, const void *input )
 {
        mlt_consumer obj = NULL;
 

diff --git a/src/framework/mlt_factory.h b/src/framework/mlt_factory.h
index cd0dc7fb98ee9dbe1e6ae053e97b0742dd8bd650..29dc62a9fef1b3e41bbc49c57a0c326090a67069 100644 (file)
--- a/src/framework/mlt_factory.h
+++ b/src/framework/mlt_factory.h
@@ -43,10 +43,10 @@ extern const char *mlt_factory_directory( );
 extern char *mlt_environment( const char *name );
 extern int mlt_environment_set( const char *name, const char *value );
 extern mlt_properties mlt_factory_event_object( );
-extern mlt_producer mlt_factory_producer( mlt_profile profile, const char *name, void *input );
-extern mlt_filter mlt_factory_filter( mlt_profile profile, const char *name, void *input );
-extern mlt_transition mlt_factory_transition( mlt_profile profile, const char *name, void *input );
-extern mlt_consumer mlt_factory_consumer( mlt_profile profile, const char *name, void *input );
+extern mlt_producer mlt_factory_producer( mlt_profile profile, const char *name, const void *input );
+extern mlt_filter mlt_factory_filter( mlt_profile profile, const char *name, const void *input );
+extern mlt_transition mlt_factory_transition( mlt_profile profile, const char *name, const void *input );
+extern mlt_consumer mlt_factory_consumer( mlt_profile profile, const char *name, const void *input );
 extern void mlt_factory_register_for_clean_up( void *ptr, mlt_destructor destructor );
 extern void mlt_factory_close( );
 extern mlt_properties mlt_global_properties( );

diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c
index 89d1dc2652c620b5b080cfb847266ba3e2d81314..a98d4120e5fe7e3a0950f779499707b3ad81e9a0 100644 (file)
--- a/src/framework/mlt_multitrack.c
+++ b/src/framework/mlt_multitrack.c
@@ -261,7 +261,7 @@ mlt_producer mlt_multitrack_track( mlt_multitrack this, int track )
 
 static int position_compare( const void *p1, const void *p2 )
 {
-       return *( mlt_position * )p1 - *( mlt_position * )p2;
+       return *( const mlt_position * )p1 - *( const mlt_position * )p2;
 }
 
 /** Add a position to a set.

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index da69c85ed59f55ea3a40d5ecbd38f60a298edd71..97ee02deee2eec8ff603a7d994f2e0c9bd9dab5a 100644 (file)
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -456,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 )
@@ -1073,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.

diff --git a/src/framework/mlt_repository.c b/src/framework/mlt_repository.c
index d4241e2bacfab8976fcb5cdef4bbf20a4fa73b0c..c843ecb2f4d9cfeadd10006e81b573c347180c58 100644 (file)
--- a/src/framework/mlt_repository.c
+++ b/src/framework/mlt_repository.c
@@ -208,7 +208,7 @@ static mlt_properties get_service_properties( mlt_repository this, mlt_service_t
  * \param input an optional argument to the service constructor
  */
 
-void *mlt_repository_create( mlt_repository this, mlt_profile profile, mlt_service_type type, const char *service, void *input )
+void *mlt_repository_create( mlt_repository this, mlt_profile profile, mlt_service_type type, const char *service, const void *input )
 {
        mlt_properties properties = get_service_properties( this, type, service );
        if ( properties != NULL )

diff --git a/src/framework/mlt_repository.h b/src/framework/mlt_repository.h
index 428efc87422602237927420428fbb8cbde25a4bd..a653b490cb0e8727b2b82f62b2ec028ba04c04e6 100644 (file)
--- a/src/framework/mlt_repository.h
+++ b/src/framework/mlt_repository.h
@@ -39,7 +39,7 @@ typedef void ( *mlt_repository_callback )( mlt_repository );
 /** The callback function that modules implement to construct a service.
  */
 
-typedef void *( *mlt_register_callback )( mlt_profile, mlt_service_type, const char * /* service name */, void * /* arg */ );
+typedef void *( *mlt_register_callback )( mlt_profile, mlt_service_type, const char * /* service name */, const void * /* arg */ );
 
 /** The callback function that modules implement to supply metadata as a properties list.
  */
@@ -57,7 +57,7 @@ typedef mlt_properties ( *mlt_metadata_callback )( mlt_service_type, const char
 
 extern mlt_repository mlt_repository_init( const char *directory );
 extern void mlt_repository_register( mlt_repository self, mlt_service_type service_type, const char *service, mlt_register_callback );
-extern void *mlt_repository_create( mlt_repository self, mlt_profile profile, mlt_service_type type, const char *service, void *arg );
+extern void *mlt_repository_create( mlt_repository self, mlt_profile profile, mlt_service_type type, const char *service, const void *arg );
 extern void mlt_repository_close( mlt_repository self );
 extern mlt_properties mlt_repository_consumers( mlt_repository self );
 extern mlt_properties mlt_repository_filters( mlt_repository self );

diff --git a/src/framework/mlt_tokeniser.c b/src/framework/mlt_tokeniser.c
index 9f35376d3a04071353aac4572d81a312229b7a67..1fa28b03fcc21756fbf97ed0a30dbc052593d395 100644 (file)
--- a/src/framework/mlt_tokeniser.c
+++ b/src/framework/mlt_tokeniser.c
@@ -77,7 +77,7 @@ static int mlt_tokeniser_append( mlt_tokeniser tokeniser, char *token )
 /** Parse a string by splitting on the delimiter provided.
 */
 
-int mlt_tokeniser_parse_new( mlt_tokeniser tokeniser, char *string, char *delimiter )
+int mlt_tokeniser_parse_new( mlt_tokeniser tokeniser, char *string, const char *delimiter )
 {
        int count = 0;
        int length = strlen( string );

diff --git a/src/framework/mlt_tokeniser.h b/src/framework/mlt_tokeniser.h
index 147f8fc9b37bc9726a93715874d529b63757e1d4..d4715af5204f8beeab8877f71ad7912074caa12e 100644 (file)
--- a/src/framework/mlt_tokeniser.h
+++ b/src/framework/mlt_tokeniser.h
@@ -41,7 +41,7 @@ typedef struct
 */
 
 extern mlt_tokeniser mlt_tokeniser_init( );
-extern int mlt_tokeniser_parse_new( mlt_tokeniser self, char *text, char *delimiter );
+extern int mlt_tokeniser_parse_new( mlt_tokeniser self, char *text, const char *delimiter );
 extern char *mlt_tokeniser_get_input( mlt_tokeniser self );
 extern int mlt_tokeniser_count( mlt_tokeniser self );
 extern char *mlt_tokeniser_get_string( mlt_tokeniser self, int index );

diff --git a/src/humperdink/client.c b/src/humperdink/client.c
index bd69d06f783f3a5feeb24d14a090e585a9aa0719..afd2bbda7205dc6f0aead2921ce59551dab72b29 100644 (file)
--- a/src/humperdink/client.c
+++ b/src/humperdink/client.c
@@ -47,10 +47,10 @@ typedef valerie_error_code (*demo_function)( dv_demo );
 
 typedef struct
 {
-       char *description;
+       const char *description;
        struct menu_item
        {
-               char *option;
+               const char *option;
                demo_function function;
        }
        array[ 50 ];
@@ -613,7 +613,7 @@ valerie_error_code dv_demo_load( dv_demo demo )
 
                                if ( refresh )
                                {
-                                       char *action = "Load & Play";
+                                       const char *action = "Load & Play";
                                        if ( demo->queues[ demo->selected_unit ].mode )
                                                action = "Queue";
                                        printf( "%s from %s\n\n", action, demo->current_directory );
@@ -931,7 +931,7 @@ valerie_error_code dv_demo_transport( dv_demo demo )
 
 valerie_error_code dv_demo_run_menu( dv_demo demo, dv_demo_menu menu )
 {
-       char *items = "123456789abcdefghijklmnopqrstuvwxyz";
+       const char *items = "123456789abcdefghijklmnopqrstuvwxyz";
        int refresh_menu = 1;
        int terminated = 0;
        int item_count = 0;

diff --git a/src/humperdink/io.c b/src/humperdink/io.c
index e5f54b701382bd1a3357ae140eda8eb319013b3c..42718df0249700958c5fd48ebb75d0c2a218efdc 100644 (file)
--- a/src/humperdink/io.c
+++ b/src/humperdink/io.c
@@ -72,7 +72,7 @@ char *strip_quotes( char *input )
        return input;
 }
 
-char *io_get_string( char *output, int maxlength, char *use )
+char *io_get_string( char *output, int maxlength, const char *use )
 {
        char *value = NULL;
        strcpy( output, use );
@@ -186,7 +186,7 @@ char get_keypress( )
        return value;
 }
 
-void wait_for_any_key( char *message )
+void wait_for_any_key( const char *message )
 {
        if ( message == NULL )
                printf( "Press any key to continue: " );

diff --git a/src/humperdink/io.h b/src/humperdink/io.h
index 1b4deecff36b481fb44e08c5477aa53f8edc3e7c..f4ac23ad3499b177463354fc7d733698850b900d 100644 (file)
--- a/src/humperdink/io.h
+++ b/src/humperdink/io.h
@@ -24,13 +24,13 @@
 extern char *chomp( char * );
 extern char *trim( char * );
 extern char *strip_quotes( char * );
-extern char *io_get_string( char *, int, char * );
+extern char *io_get_string( char *, int, const char * );
 extern int *get_int( int *, int );
 extern void term_init( );
 extern int term_read( );
 extern void term_exit( );
 extern char get_keypress( );
-extern void wait_for_any_key( char * );
+extern void wait_for_any_key( const char * );
 extern void beep( );
 
 #endif

diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index 64638d23f166499dc0606889202564490ba2420d..698908e7f6acdc4fa349e7dd08b9134c7243a7c1 100644 (file)
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -265,7 +265,7 @@ static void transport( mlt_producer producer, mlt_consumer consumer )
        }
 }
 
-static void query_metadata( mlt_repository repo, mlt_service_type type, char *typestr, char *id )
+static void query_metadata( mlt_repository repo, mlt_service_type type, const char *typestr, char *id )
 {
        mlt_properties metadata = mlt_repository_metadata( repo, type, id );
        if ( metadata )
@@ -283,7 +283,7 @@ static void query_metadata( mlt_repository repo, mlt_service_type type, char *ty
 static void query_services( mlt_repository repo, mlt_service_type type )
 {
        mlt_properties services = NULL;
-       char *typestr = NULL;
+       const char *typestr = NULL;
        switch ( type )
        {
                case consumer_type:

diff --git a/src/miracle/miracle_connection.c b/src/miracle/miracle_connection.c
index c9ce694ced7cebd8e77e7000929aa063ade8aaff..7f287e34194ef49bde4eb51247cc56385133184d 100644 (file)
--- a/src/miracle/miracle_connection.c
+++ b/src/miracle/miracle_connection.c
@@ -134,7 +134,7 @@ static int connection_send( int fd, valerie_response response )
        }
        else
        {
-               char *message = "500 Empty Response\r\n\r\n";
+               const char *message = "500 Empty Response\r\n\r\n";
                if ( write( fd, message, strlen( message ) ) != strlen( message ))
                        miracle_log( LOG_ERR, "write(%s) failed!", message );
        }

diff --git a/src/miracle/miracle_local.c b/src/miracle/miracle_local.c
index 143f101d50b8ecbfda217adc45ef84d04dab5576..c1029a19d828530f712ed605e998370692f58dcc 100644 (file)
--- a/src/miracle/miracle_local.c
+++ b/src/miracle/miracle_local.c
@@ -105,7 +105,7 @@ valerie_parser miracle_parser_init_local( )
 typedef struct 
 {
        int code;
-       char *message;
+       const char *message;
 } 
 responses_t;
 
@@ -146,7 +146,7 @@ arguments_types;
 typedef struct 
 {
 /* The command string corresponding to this operation (e.g. "play") */
-       char *command;
+       const char *command;
 /* The function associated with it */
        response_codes (*operation) ( command_argument );
 /* a boolean to indicate if this is a unit or global command
@@ -155,7 +155,7 @@ typedef struct
 /* What type is the argument (RTTI :-) ATYPE_whatever */
        int type;
 /* online help information */
-       char *help;
+       const char *help;
 } 
 command_t;
 
@@ -217,7 +217,7 @@ static char helpstr [] =
 /** Lookup the response message for a status code.
 */
 
-inline char *get_response_msg( int code )
+inline const char *get_response_msg( int code )
 {
        int i = 0;
        for ( i = 0; responses[ i ].message != NULL && code != responses[ i ].code; i ++ ) ;

diff --git a/src/miracle/miracle_log.c b/src/miracle/miracle_log.c
index f5f7e1a705af9bd91a024ba22d8e7845ae6cfaa9..62b7f73e627fefd3e53e2e8c632f7eda79c07704 100644 (file)
--- a/src/miracle/miracle_log.c
+++ b/src/miracle/miracle_log.c
@@ -36,7 +36,7 @@ void miracle_log_init( enum log_output method, int new_threshold )
 
 }
 
-void miracle_log( int priority, char *format, ... )
+void miracle_log( int priority, const char *format, ... )
 {
        va_list list;
        va_start( list, format );

diff --git a/src/miracle/miracle_log.h b/src/miracle/miracle_log.h
index 3788ee52b1407bce61e07030821487c50be0626a..be21893fafe75a8a00c33617d242d634e52327fc 100644 (file)
--- a/src/miracle/miracle_log.h
+++ b/src/miracle/miracle_log.h
@@ -34,7 +34,7 @@ enum log_output {
 };
 
 void miracle_log_init( enum log_output method, int threshold );
-void miracle_log( int priority, char *format, ... );
+void miracle_log( int priority, const char *format, ... );
 
 #ifdef __cplusplus
 }

diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c
index 30182af7135a4f960cd3362d4d3cdc132183b6ae..629da5583cae2882f936553ccec10658c804be95 100644 (file)
--- a/src/miracle/miracle_server.c
+++ b/src/miracle/miracle_server.c
@@ -92,7 +92,7 @@ const char *miracle_server_id( miracle_server server )
        return server != NULL && server->id != NULL ? server->id : "miracle";
 }
 
-void miracle_server_set_config( miracle_server server, char *config )
+void miracle_server_set_config( miracle_server server, const char *config )
 {
        if ( server != NULL )
        {

diff --git a/src/miracle/miracle_server.h b/src/miracle/miracle_server.h
index 7c7541fed70f5a29825e353f5b0e70a45028ae17..592ff3a1164c2b036bc70eaaa543dbc712e91202 100644 (file)
--- a/src/miracle/miracle_server.h
+++ b/src/miracle/miracle_server.h
@@ -61,7 +61,7 @@ typedef struct
 
 extern miracle_server miracle_server_init( char * );
 extern const char *miracle_server_id( miracle_server );
-extern void miracle_server_set_config( miracle_server, char * );
+extern void miracle_server_set_config( miracle_server, const char * );
 extern void miracle_server_set_port( miracle_server, int );
 extern void miracle_server_set_proxy( miracle_server, char * );
 extern int miracle_server_execute( miracle_server );

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 7757bb7bf9f15e9f440bdc823f36c7f5a2cf6599..bc83b0b9b275b3b48f98ee28355743c81e13d18e 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -597,9 +597,9 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                if ( mlt_properties_get_int( properties, "progressive" ) == 0 &&
                     mlt_properties_get_int( properties, "deinterlace" ) == 0 )
                {
-                       if ( mlt_properties_get_int( properties, "ildct" ) )
+                       if ( ! mlt_properties_get( properties, "ildct" ) || mlt_properties_get_int( properties, "ildct" ) )
                                c->flags |= CODEC_FLAG_INTERLACED_DCT;
-                       if ( mlt_properties_get_int( properties, "ilme" ) )
+                       if ( ! mlt_properties_get( properties, "ilme" ) || mlt_properties_get_int( properties, "ilme" ) )
                                c->flags |= CODEC_FLAG_INTERLACED_ME;
                }
                
@@ -845,7 +845,7 @@ static void *consumer_thread( void *arg )
 
        // Determine the format
        AVOutputFormat *fmt = NULL;
-       char *filename = mlt_properties_get( properties, "target" );
+       const char *filename = mlt_properties_get( properties, "target" );
        char *format = mlt_properties_get( properties, "f" );
        char *vcodec = mlt_properties_get( properties, "vcodec" );
        char *acodec = mlt_properties_get( properties, "acodec" );
@@ -1338,7 +1338,7 @@ static void *consumer_thread( void *arg )
 
                // Remove the x264 dual pass logs
                char *cwd = getcwd( NULL, 0 );
-               char *file = "x264_2pass.log";
+               const char *file = "x264_2pass.log";
                char *full = malloc( strlen( cwd ) + strlen( file ) + 2 );
                sprintf( full, "%s/%s", cwd, file );
                remove( full );

diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
index 28917f5c48c5a79308ca34bb4662413e33335dae..54adf936d9026e1b41c6bc32b1e808d2920e23bd 100644 (file)
--- a/src/modules/avformat/factory.c
+++ b/src/modules/avformat/factory.c
@@ -124,7 +124,7 @@ static void *create_service( mlt_profile profile, mlt_service_type type, const c
 static mlt_properties avformat_metadata( mlt_service_type type, const char *id, void *data )
 {
        char file[ PATH_MAX ];
-       char *service_type = NULL;
+       const char *service_type = NULL;
        switch ( type )
        {
                case consumer_type:

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 7febf47113396267586d186804e0e7cb47e585c5..1ce2dca7301771f751978bc2e203c0f974cdb23d 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -634,8 +634,8 @@ static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
        else
        {
                AVPicture output;
-               avpicture_fill( &output, buffer, PIX_FMT_YUV422, width, height );
-               img_convert( &output, PIX_FMT_YUV422, (AVPicture *)frame, pix_fmt, width, height );
+               avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
+               img_convert( &output, PIX_FMT_YUYV422, (AVPicture *)frame, pix_fmt, width, height );
        }
 #endif
 }

diff --git a/src/modules/core/filter_data_show.c b/src/modules/core/filter_data_show.c
index 6782a8b1270d663fd11c8779e1621092ecbe4185..d62bd58991013f2200c01ed8ba7f8d0ca792d396 100644 (file)
--- a/src/modules/core/filter_data_show.c
+++ b/src/modules/core/filter_data_show.c
@@ -144,7 +144,7 @@ static int process_feed( mlt_properties feed, mlt_filter filter, mlt_frame frame
        {
                int i = 0;
                mlt_properties properties = MLT_FILTER_PROPERTIES( requested );
-               static char *prefix = "properties.";
+               static const char *prefix = "properties.";
                int len = strlen( prefix );
 
                // Determine if this is an absolute or relative feed

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index dd3e0af93f2acd8f0c4bbe47a8ad830fabf0d1ea..2e88e082adc7ff6a82ce11cfbc8568acf234ed72 100644 (file)
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -181,7 +181,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                                char temp[ 132 ];
                                int count = 0;
                                uint8_t *alpha = NULL;
-                               char *rescale = mlt_properties_get( a_props, "rescale.interp" );
+                               const char *rescale = mlt_properties_get( a_props, "rescale.interp" );
                                if ( rescale == NULL || !strcmp( rescale, "none" ) )
                                        rescale = "hyper";
                                mlt_transition_process( composite, b_frame, frame );

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 1f4ad894c8d96a41ccc2b216062e3cda0fc35ec3..04a518f53b569297a019abe0e8b42e71cbdae34d 100644 (file)
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -201,7 +201,7 @@ static inline double delta_calculate( mlt_transition this, mlt_frame frame, mlt_
        return length * ( y - x ) / 2.0;
 }
 
-static int get_value( mlt_properties properties, char *preferred, char *fallback )
+static int get_value( mlt_properties properties, const char *preferred, const char *fallback )
 {
        int value = mlt_properties_get_int( properties, preferred );
        if ( value == 0 )
@@ -1138,7 +1138,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
                uint8_t *alpha_b = NULL;
 
                // Composites always need scaling... defaulting to lowest
-               char *rescale = mlt_properties_get( a_props, "rescale.interp" );
+               const char *rescale = mlt_properties_get( a_props, "rescale.interp" );
                if ( rescale == NULL || !strcmp( rescale, "none" ) )
                        rescale = "nearest";
                mlt_properties_set( a_props, "rescale.interp", rescale );

diff --git a/src/modules/core/transition_region.c b/src/modules/core/transition_region.c
index b75a2904329e2cb2d06a66dc9c5a0d57f7a6af8b..52bcb0f8eac7092670efd6a1c4e5e3e6cd01ef74 100644 (file)
--- a/src/modules/core/transition_region.c
+++ b/src/modules/core/transition_region.c
@@ -272,7 +272,7 @@ static int transition_get_image( mlt_frame frame, uint8_t **image, mlt_image_for
        if ( composite != NULL )
        {
                // Get the resource of this filter (could be a shape [rectangle/circle] or an alpha provider of choice
-               char *resource =  mlt_properties_get( properties, "resource" );
+               const char *resource =  mlt_properties_get( properties, "resource" );
 
                // Get the old resource in case it's changed
                char *old_resource =  mlt_properties_get( properties, "_old_resource" );

diff --git a/src/modules/effectv/image.c b/src/modules/effectv/image.c
index dbd848f34316f67c1b0189e8154fec2d29fc0052..ce8157f231f55d82e5a4f959bcf4965bfa50609d 100644 (file)
--- a/src/modules/effectv/image.c
+++ b/src/modules/effectv/image.c
@@ -51,12 +51,12 @@ void image_bgsubtract_y(unsigned char *diff, const RGB32 *background, const RGB3
        int i;
        int R, G, B;
        const RGB32 *p;
-       short *q;
+       const short *q;
        unsigned char *r;
        int v;
 
        p = src;
-       q = (short *)background;
+       q = (const short *)background;
        r = diff;
        for(i=0; i<video_area; i++) {
                /* FIXME: endianess */
@@ -256,12 +256,13 @@ void image_y_under(unsigned char *diff, const RGB32 *src, int video_area, int y_
 void image_edge(unsigned char *diff2, const RGB32 *src, int width, int height, int y_threshold)
 {
        int x, y;
-       unsigned char *p, *q;
+       const unsigned char *p;
+       unsigned char *q;
        int r, g, b;
        int ar, ag, ab;
        int w;
 
-       p = (unsigned char *)src;
+       p = (const unsigned char *)src;
        q = diff2;
        w = width * sizeof(RGB32);
 

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index 4756213eef8e22deed81af2c990fb3b08c85e3cc..3398e79a285cce6f19fca18d76e6ad10310881ba 100644 (file)
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -146,7 +146,7 @@ mlt_producer producer_pango_init( const char *filename )
                        ( *strrchr( markup, '.' ) ) = '\0';
                        while ( strchr( markup, '~' ) )
                                ( *strchr( markup, '~' ) ) = '\n';
-                       mlt_properties_set( properties, "resource", ( char * )filename );
+                       mlt_properties_set( properties, "resource", filename );
                        mlt_properties_set( properties, "markup", markup );
                        free( copy );
                }
@@ -156,7 +156,7 @@ mlt_producer producer_pango_init( const char *filename )
                        mlt_properties contents = mlt_properties_load( filename );
                        mlt_geometry key_frames = mlt_geometry_init( );
                        struct mlt_geometry_item_s item;
-                       mlt_properties_set( properties, "resource", ( char * )filename );
+                       mlt_properties_set( properties, "resource", filename );
                        mlt_properties_set_data( properties, "contents", contents, 0, ( mlt_destructor )mlt_properties_close, NULL );
                        mlt_properties_set_data( properties, "key_frames", key_frames, 0, ( mlt_destructor )mlt_geometry_close, NULL );
 
@@ -202,8 +202,8 @@ mlt_producer producer_pango_init( const char *filename )
                                if ( markup[ strlen( markup ) - 1 ] == '\n' ) 
                                        markup[ strlen( markup ) - 1 ] = '\0';
 
-                               mlt_properties_set( properties, "resource", ( char * ) filename );
-                               mlt_properties_set( properties, "markup", ( char * ) ( markup == NULL ? "" : markup ) );
+                               mlt_properties_set( properties, "resource", filename );
+                               mlt_properties_set( properties, "markup", ( markup == NULL ? "" : markup ) );
                                free( markup );
                        }
                        else
@@ -218,7 +218,7 @@ mlt_producer producer_pango_init( const char *filename )
        return NULL;
 }
 
-static void set_string( char **string, char *value, char *fallback )
+static void set_string( char **string, const char *value, const char *fallback )
 {
        if ( value != NULL )
        {
@@ -282,7 +282,7 @@ rgba_color parse_color( char *color )
 
 /** Convert a string property to UTF-8
 */
-static int iconv_utf8( mlt_properties properties, char *prop_name, const char* encoding )
+static int iconv_utf8( mlt_properties properties, const char *prop_name, const char* encoding )
 {
        char *text = mlt_properties_get( properties, prop_name );
        int result = -1;

diff --git a/src/modules/jackrack/jack_rack.c b/src/modules/jackrack/jack_rack.c
index 2d66f951d38edf4dda129d9a73b651d08db6d74c..92f82721c2452486ac418598d668a5dbf353e19a 100644 (file)
--- a/src/modules/jackrack/jack_rack.c
+++ b/src/modules/jackrack/jack_rack.c
@@ -39,8 +39,8 @@
 #ifndef _
 #define _(x) x
 #endif
-#define _x (xmlChar*)
-#define _s (char*)
+#define _x (const xmlChar*)
+#define _s (const char*)
 
 jack_rack_t *
 jack_rack_new (const char * client_name, unsigned long channels)

diff --git a/src/modules/kino/filehandler.cc b/src/modules/kino/filehandler.cc
index 1a0aeac659302bd93b426e64eb481f01c71aa055..e5e552cc52739cbf47d515c8b1997d601598fd0e 100644 (file)
--- a/src/modules/kino/filehandler.cc
+++ b/src/modules/kino/filehandler.cc
@@ -873,7 +873,7 @@ bool QtHandler::Open( const char *s )
 {
        Init();
 
-       fd = quicktime_open( ( char * ) s, 1, 0 );
+       fd = quicktime_open( s, 1, 0 );
        if ( fd == NULL )
        {
                fprintf( stderr, "Error opening: %s\n", s );

diff --git a/src/modules/motion_est/filter_motion_est.c b/src/modules/motion_est/filter_motion_est.c
index 80a11ad950a03505f21173347cb7ee017947124c..6e8b021880e0938cebe6bf4cfe34293c2cf6718b 100644 (file)
--- a/src/modules/motion_est/filter_motion_est.c
+++ b/src/modules/motion_est/filter_motion_est.c
@@ -392,7 +392,7 @@ static void full_search(
 
 int ncompare (const void * a, const void * b)
 {
-       return ( *(int*)a - *(int*)b );
+       return ( *(const int*)a - *(const int*)b );
 }
 
 // motion vector denoising

diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c
index 0c6bb1fd316d0a119bce723738e744f159b83a65..719705618605edc4c6d9c8cc6bb041d00c8e2d57 100644 (file)
--- a/src/modules/plus/transition_affine.c
+++ b/src/modules/plus/transition_affine.c
@@ -30,7 +30,7 @@
 /** Calculate real geometry.
 */
 
-static void geometry_calculate( mlt_transition this, char *store, struct mlt_geometry_item_s *output, float position )
+static void geometry_calculate( mlt_transition this, const char *store, struct mlt_geometry_item_s *output, float position )
 {
        mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
        mlt_geometry geometry = mlt_properties_get_data( properties, store, NULL );
@@ -52,7 +52,7 @@ static void geometry_calculate( mlt_transition this, char *store, struct mlt_geo
 }
 
 
-static mlt_geometry transition_parse_keys( mlt_transition this, char *name, char *store, int normalised_width, int normalised_height )
+static mlt_geometry transition_parse_keys( mlt_transition this, const char *name, const char *store, int normalised_width, int normalised_height )
 {
        // Get the properties of the transition
        mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
@@ -108,7 +108,7 @@ static mlt_geometry composite_calculate( mlt_transition this, struct mlt_geometr
        return start;
 }
 
-static inline float composite_calculate_key( mlt_transition this, char *name, char *store, int norm, float position )
+static inline float composite_calculate_key( mlt_transition this, const char *name, const char *store, int norm, float position )
 {
        // Struct for the result
        struct mlt_geometry_item_s result;

diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c
index 696bbffc6acf955fa0573753a646e3f9f2a766c8..29174be253b4eb0493b92568a7716cc95b7c2bd4 100644 (file)
--- a/src/modules/westley/consumer_westley.c
+++ b/src/modules/westley/consumer_westley.c
@@ -28,8 +28,8 @@
 
 #define ID_SIZE 128
 
-#define _x (xmlChar*)
-#define _s (char*)
+#define _x (const xmlChar*)
+#define _s (const char*)
 
 // This maintains counters for adding ids to elements
 struct serialise_context_s
@@ -200,7 +200,7 @@ static void serialise_properties( serialise_context context, mlt_properties prop
        }
 }
 
-static void serialise_store_properties( serialise_context context, mlt_properties properties, xmlNode *node, char *store )
+static void serialise_store_properties( serialise_context context, mlt_properties properties, xmlNode *node, const char *store )
 {
        int i;
        xmlNode *p;

diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c
index aeac267a281547ac062838635cb29834c0c1b780..35f77393e873cbc020d5332a93d924695e6c81f2 100644 (file)
--- a/src/modules/westley/producer_westley.c
+++ b/src/modules/westley/producer_westley.c
@@ -35,8 +35,8 @@
 #define STACK_SIZE 1000
 #define BRANCH_SIG_LEN 4000
 
-#define _x (xmlChar*)
-#define _s (char*)
+#define _x (const xmlChar*)
+#define _s (const char*)
 
 #undef DEBUG
 #ifdef DEBUG
@@ -170,10 +170,10 @@ static void track_service( mlt_properties properties, void *service, mlt_destruc
 
 
 // Prepend the property value with the document root
-static inline void qualify_property( deserialise_context context, mlt_properties properties, char *name )
+static inline void qualify_property( deserialise_context context, mlt_properties properties, const char *name )
 {
        char *resource = mlt_properties_get( properties, name );
-       if ( resource != NULL )
+       if ( resource != NULL && resource[0] )
        {
                // Qualify file name properties 
                char *root = mlt_properties_get( context->producer_map, "root" );
@@ -297,7 +297,7 @@ static void on_start_tractor( deserialise_context context, const xmlChar *name,
        track_service( context->destructors, service, (mlt_destructor) mlt_tractor_close );
 
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
-               mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
+               mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] );
 
        mlt_properties_set_int( MLT_TRACTOR_PROPERTIES( tractor ), "global_feed", 1 );
 
@@ -353,7 +353,7 @@ static void on_start_multitrack( deserialise_context context, const xmlChar *nam
                mlt_service service = MLT_SERVICE( mlt_tractor_multitrack( MLT_TRACTOR( parent ) ) );
                mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
                for ( ; atts != NULL && *atts != NULL; atts += 2 )
-                       mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
+                       mlt_properties_set( properties, (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] );
 
                if ( mlt_properties_get( properties, "id" ) != NULL )
                        mlt_properties_set_data( context->producer_map, mlt_properties_get( properties,"id" ), service, 0, NULL, NULL );
@@ -387,11 +387,11 @@ static void on_start_playlist( deserialise_context context, const xmlChar *name,
 
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
        {
-               mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
+               mlt_properties_set( properties, (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] );
 
                // Out will be overwritten later as we append, so we need to save it
                if ( xmlStrcmp( atts[ 0 ], _x("out") ) == 0 )
-                       mlt_properties_set( properties, "_westley.out", ( char* )atts[ 1 ] );
+                       mlt_properties_set( properties, "_westley.out", ( const char* )atts[ 1 ] );
        }
 
        if ( mlt_properties_get( properties, "id" ) != NULL )
@@ -433,7 +433,7 @@ static void on_start_producer( deserialise_context context, const xmlChar *name,
        context_push_service( context, service, mlt_dummy_producer_type );
 
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
-               mlt_properties_set( properties, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
+               mlt_properties_set( properties, (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] );
 }
 
 // Parse a SMIL clock value (as produced by Kino 0.9.1) and return position in frames
@@ -657,12 +657,12 @@ static void on_start_entry( deserialise_context context, const xmlChar *name, co
 
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
        {
-               mlt_properties_set( temp, (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
+               mlt_properties_set( temp, (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] );
                
                // Look for the producer attribute
                if ( xmlStrcmp( atts[ 0 ], _x("producer") ) == 0 )
                {
-                       mlt_producer producer = mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL );
+                       mlt_producer producer = mlt_properties_get_data( context->producer_map, (const char*) atts[1], NULL );
                        if ( producer !=  NULL )
                                mlt_properties_set_data( temp, "producer", producer, 0, NULL, NULL );
                }
@@ -740,12 +740,12 @@ static void on_start_track( deserialise_context context, const xmlChar *name, co
        
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
        {
-               mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (char*) atts[0], atts[1] == NULL ? "" : (char*) atts[1] );
+               mlt_properties_set( MLT_SERVICE_PROPERTIES( service ), (const char*) atts[0], atts[1] == NULL ? "" : (const char*) atts[1] );
                
                // Look for the producer attribute
                if ( xmlStrcmp( atts[ 0 ], _x("producer") ) == 0 )
                {
-                       mlt_producer producer = mlt_properties_get_data( context->producer_map, (char*) atts[1], NULL );
+                       mlt_producer producer = mlt_properties_get_data( context->producer_map, (const char*) atts[1], NULL );
                        if ( producer !=  NULL )
                                mlt_properties_set_data( MLT_SERVICE_PROPERTIES( service ), "producer", producer, 0, NULL, NULL );
                }
@@ -830,7 +830,7 @@ static void on_start_filter( deserialise_context context, const xmlChar *name, c
 
        // Set the properties
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
-               mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] );
+               mlt_properties_set( properties, (const char*) atts[0], (const char*) atts[1] );
 }
 
 static void on_end_filter( deserialise_context context, const xmlChar *name )
@@ -905,7 +905,7 @@ static void on_start_transition( deserialise_context context, const xmlChar *nam
 
        // Set the properties
        for ( ; atts != NULL && *atts != NULL; atts += 2 )
-               mlt_properties_set( properties, (char*) atts[0], (char*) atts[1] );
+               mlt_properties_set( properties, (const char*) atts[0], (const char*) atts[1] );
 }
 
 static void on_end_transition( deserialise_context context, const xmlChar *name )
@@ -978,7 +978,7 @@ static void on_start_property( deserialise_context context, const xmlChar *name,
        enum service_type type;
        mlt_service service = context_pop_service( context, &type );
        mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
-       char *value = NULL;
+       const char *value = NULL;
 
        if ( service != NULL )
        {
@@ -1001,7 +1001,7 @@ static void on_start_property( deserialise_context context, const xmlChar *name,
        }
        else
        {
-               fprintf( stderr, "Property without a service '%s'?\n", ( char * )name );
+               fprintf( stderr, "Property without a service '%s'?\n", ( const char * )name );
        }
 }
 
@@ -1038,7 +1038,7 @@ static void on_end_property( deserialise_context context, const xmlChar *name )
        }
        else
        {
-               fprintf( stderr, "Property without a service '%s'??\n", (char *)name );
+               fprintf( stderr, "Property without a service '%s'??\n", (const char *)name );
        }
 }
 
@@ -1095,7 +1095,7 @@ static void on_start_element( void *ctx, const xmlChar *name, const xmlChar **at
                on_start_property( context, name, atts );
        else if ( xmlStrcmp( name, _x("westley") ) == 0 )
                for ( ; atts != NULL && *atts != NULL; atts += 2 )
-                       mlt_properties_set( context->producer_map, ( char * )atts[ 0 ], ( char * )atts[ 1 ] );
+                       mlt_properties_set( context->producer_map, ( const char * )atts[ 0 ], ( const char * )atts[ 1 ] );
 }
 
 static void on_end_element( void *ctx, const xmlChar *name )

diff --git a/src/modules/xine/deinterlace.c b/src/modules/xine/deinterlace.c
index 3e1400770ae6a1ca8cbb68e9ebf10d4ba09ac255..4a99e94337559e355e8b5ca4215696a64365a1ed 100644 (file)
--- a/src/modules/xine/deinterlace.c
+++ b/src/modules/xine/deinterlace.c
@@ -846,7 +846,7 @@ int deinterlace_yuv_supported ( int method )
   return 0;
 }
 
-char *deinterlace_methods[] = {
+const char *deinterlace_methods[] = {
   "none",
   "bob",
   "weave",

diff --git a/src/modules/xine/deinterlace.h b/src/modules/xine/deinterlace.h
index 5d9018cab58a6bcb4f071a42a7be2db87fc18149..0cad92a095e4bf60c1d28a8b3e3621c4228fc50b 100644 (file)
--- a/src/modules/xine/deinterlace.h
+++ b/src/modules/xine/deinterlace.h
@@ -42,6 +42,6 @@ void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc[],
 #define DEINTERLACE_ONEFIELDXV  5
 #define DEINTERLACE_LINEARBLEND 6
 
-extern char *deinterlace_methods[];
+extern const char *deinterlace_methods[];
 
 #endif

diff --git a/src/modules/xine/xineutils.h b/src/modules/xine/xineutils.h
index d4dba6498a0cfedc5328e7fded54b327e1dcb3ea..f0d74cea5b7e216ca0469dee9484dadbb40bc34a 100644 (file)
--- a/src/modules/xine/xineutils.h
+++ b/src/modules/xine/xineutils.h
@@ -659,13 +659,13 @@ void xine_strdupa(char *dest, char *src);
 #ifdef HAVE_STRPBRK
 #define xine_strpbrk strpbrk
 #else
-static inline char *_private_strpbrk(const char *s, const char *accept) {
+static inline const char *_private_strpbrk(const char *s, const char *accept) {
 
   while(*s != '\0') {
     const char *a = accept;
     while(*a != '\0')
       if(*a++ == *s)
-       return(char *) s;
+       return s;
     ++s;
   }
 

diff --git a/src/valerie/valerie.c b/src/valerie/valerie.c
index f6a79d8c0302588c0bf76323f9b8f6a3fe2021eb..b7f1cc69029a7689091787e831eaed66d2de4859 100644 (file)
--- a/src/valerie/valerie.c
+++ b/src/valerie/valerie.c
@@ -117,7 +117,7 @@ static valerie_error_code valerie_get_error_code( valerie this, valerie_response
 /** Execute a command.
 */
 
-valerie_error_code valerie_execute( valerie this, size_t size, char *format, ... )
+valerie_error_code valerie_execute( valerie this, size_t size, const char *format, ... )
 {
        valerie_error_code error = valerie_server_unavailable;
        char *command = malloc( size );
@@ -148,7 +148,7 @@ valerie_error_code valerie_execute( valerie this, size_t size, char *format, ...
 /** Execute a command.
 */
 
-valerie_error_code valerie_receive( valerie this, char *doc, size_t size, char *format, ... )
+valerie_error_code valerie_receive( valerie this, char *doc, size_t size, const char *format, ... )
 {
        valerie_error_code error = valerie_server_unavailable;
        char *command = malloc( size );
@@ -179,7 +179,7 @@ valerie_error_code valerie_receive( valerie this, char *doc, size_t size, char *
 /** Execute a command.
 */
 
-valerie_error_code valerie_push( valerie this, mlt_service service, size_t size, char *format, ... )
+valerie_error_code valerie_push( valerie this, mlt_service service, size_t size, const char *format, ... )
 {
        valerie_error_code error = valerie_server_unavailable;
        char *command = malloc( size );
@@ -534,7 +534,7 @@ valerie_error_code valerie_unit_clear_in_out( valerie this, int unit )
 /** Set a unit configuration property.
 */
 
-valerie_error_code valerie_unit_set( valerie this, int unit, char *name, char *value )
+valerie_error_code valerie_unit_set( valerie this, int unit, const char *name, const char *value )
 {
        return valerie_execute( this, 1024, "USET U%d %s=%s", unit, name, value );
 }
@@ -587,7 +587,7 @@ valerie_notifier valerie_get_notifier( valerie this )
 /** List the contents of the specified directory.
 */
 
-valerie_dir valerie_dir_init( valerie this, char *directory )
+valerie_dir valerie_dir_init( valerie this, const char *directory )
 {
        valerie_dir dir = malloc( sizeof( valerie_dir_t ) );
        if ( dir != NULL )
@@ -911,9 +911,9 @@ valerie_response valerie_get_last_response( valerie this )
 /** Obtain a printable message associated to the error code provided.
 */
 
-char *valerie_error_description( valerie_error_code error )
+const char *valerie_error_description( valerie_error_code error )
 {
-       char *msg = "Unrecognised error";
+       const char *msg = "Unrecognised error";
        switch( error )
        {
                case valerie_ok:

diff --git a/src/valerie/valerie.h b/src/valerie/valerie.h
index fdd165b6a5a477e87a682e0bf8ab97105e040ac2..3b5ead2dc7322879d0f452e5cdf4659565db1558 100644 (file)
--- a/src/valerie/valerie.h
+++ b/src/valerie/valerie.h
@@ -122,7 +122,7 @@ extern valerie_error_code valerie_unit_set_out( valerie, int, int32_t );
 extern valerie_error_code valerie_unit_clear_in( valerie, int );
 extern valerie_error_code valerie_unit_clear_out( valerie, int );
 extern valerie_error_code valerie_unit_clear_in_out( valerie, int );
-extern valerie_error_code valerie_unit_set( valerie, int, char *, char * );
+extern valerie_error_code valerie_unit_set( valerie, int, const char *, const char * );
 extern valerie_error_code valerie_unit_get( valerie, int, char * );
 extern valerie_error_code valerie_unit_status( valerie, int, valerie_status );
 extern valerie_error_code valerie_unit_transfer( valerie, int, int );
@@ -153,7 +153,7 @@ typedef struct
 *valerie_dir_entry, valerie_dir_entry_t;
 
 /* Directory reading. */
-extern valerie_dir valerie_dir_init( valerie, char * );
+extern valerie_dir valerie_dir_init( valerie, const char * );
 extern valerie_error_code valerie_dir_get_error_code( valerie_dir );
 extern valerie_error_code valerie_dir_get( valerie_dir, int, valerie_dir_entry );
 extern int valerie_dir_count( valerie_dir );
@@ -248,11 +248,11 @@ extern void valerie_units_close( valerie_units );
 
 /* Miscellaenous functions */
 extern valerie_response valerie_get_last_response( valerie );
-extern char *valerie_error_description( valerie_error_code );
+extern const char *valerie_error_description( valerie_error_code );
 
 /* Courtesy functions. */
-extern valerie_error_code valerie_execute( valerie, size_t, char *, ... );
-extern valerie_error_code valerie_push( valerie, mlt_service, size_t, char *, ... );
+extern valerie_error_code valerie_execute( valerie, size_t, const char *, ... );
+extern valerie_error_code valerie_push( valerie, mlt_service, size_t, const char *, ... );
 
 /* Close function. */
 extern void valerie_close( valerie );

diff --git a/src/valerie/valerie_parser.c b/src/valerie/valerie_parser.c
index 7d6e6d3c21439bd5f5b461e944366b448c7e9941..1a74c50fb059b048b78c5ee34d60c21e36aab7f8 100644 (file)
--- a/src/valerie/valerie_parser.c
+++ b/src/valerie/valerie_parser.c
@@ -63,7 +63,7 @@ valerie_response valerie_parser_push( valerie_parser parser, char *command, mlt_
 /** Execute a formatted command via the parser.
 */
 
-valerie_response valerie_parser_executef( valerie_parser parser, char *format, ... )
+valerie_response valerie_parser_executef( valerie_parser parser, const char *format, ... )
 {
        char *command = malloc( 10240 );
        valerie_response response = NULL;

diff --git a/src/valerie/valerie_parser.h b/src/valerie/valerie_parser.h
index 7d9d8a5518a238ff86b3909043da7e1e98f1356a..2860dd5a8f70697e84404ebb1eb67139efe8a7a9 100644 (file)
--- a/src/valerie/valerie_parser.h
+++ b/src/valerie/valerie_parser.h
@@ -64,7 +64,7 @@ extern valerie_response valerie_parser_connect( valerie_parser );
 extern valerie_response valerie_parser_push( valerie_parser, char *, mlt_service );
 extern valerie_response valerie_parser_received( valerie_parser, char *, char * );
 extern valerie_response valerie_parser_execute( valerie_parser, char * );
-extern valerie_response valerie_parser_executef( valerie_parser, char *, ... );
+extern valerie_response valerie_parser_executef( valerie_parser, const char *, ... );
 extern valerie_response valerie_parser_run( valerie_parser, char * );
 extern valerie_notifier valerie_parser_get_notifier( valerie_parser );
 extern void valerie_parser_close( valerie_parser );

diff --git a/src/valerie/valerie_response.c b/src/valerie/valerie_response.c
index 5b9491ca4c3b266db74b173b3aa9028b3a854da2..6be2c873d0d2c40a96e084d57f46e3519fd136f9 100644 (file)
--- a/src/valerie/valerie_response.c
+++ b/src/valerie/valerie_response.c
@@ -80,9 +80,9 @@ int valerie_response_get_error_code( valerie_response response )
 /** Get the error description associated to the response.
 */
 
-char *valerie_response_get_error_string( valerie_response response )
+const char *valerie_response_get_error_string( valerie_response response )
 {
-       char *error_string = "No message specified";
+       const char *error_string = "No message specified";
        if ( response->count > 0 )
        {
                char *ptr = strchr( response->array[ 0 ], ' ' ) ;
@@ -119,7 +119,7 @@ int valerie_response_count( valerie_response response )
 /** Set the error and description associated to the response.
 */
 
-void valerie_response_set_error( valerie_response response, int error_code, char *error_string )
+void valerie_response_set_error( valerie_response response, int error_code, const char *error_string )
 {
        if ( response->count == 0 )
        {
@@ -137,7 +137,7 @@ void valerie_response_set_error( valerie_response response, int error_code, char
 /** Write formatted text to the response. 
 */
 
-int valerie_response_printf( valerie_response response, size_t size, char *format, ... )
+int valerie_response_printf( valerie_response response, size_t size, const char *format, ... )
 {
        int length = 0;
        char *text = malloc( size );
@@ -157,15 +157,15 @@ int valerie_response_printf( valerie_response response, size_t size, char *forma
 /** Write text to the reponse.
 */
 
-int valerie_response_write( valerie_response response, char *text, int size )
+int valerie_response_write( valerie_response response, const char *text, int size )
 {
        int ret = 0;
-       char *ptr = text;
+       const char *ptr = text;
 
        while ( size > 0 )
        {
                int index = response->count - 1;
-               char *lf = strchr( ptr, '\n' );
+               const char *lf = strchr( ptr, '\n' );
                int length_of_string = 0;
 
                /* Make sure we have space in the dynamic array. */

diff --git a/src/valerie/valerie_response.h b/src/valerie/valerie_response.h
index b59ac880a71c6ad9e8bf4b009a9ce30a2fd18b5e..5bef606db9b23a632457da5074bae41c0c6b2a7a 100644 (file)
--- a/src/valerie/valerie_response.h
+++ b/src/valerie/valerie_response.h
@@ -46,12 +46,12 @@ typedef struct
 extern valerie_response valerie_response_init( );
 extern valerie_response valerie_response_clone( valerie_response );
 extern int valerie_response_get_error_code( valerie_response );
-extern char *valerie_response_get_error_string( valerie_response );
+extern const char *valerie_response_get_error_string( valerie_response );
 extern char *valerie_response_get_line( valerie_response, int );
 extern int valerie_response_count( valerie_response );
-extern void valerie_response_set_error( valerie_response, int, char * );
-extern int valerie_response_printf( valerie_response, size_t, char *, ... );
-extern int valerie_response_write( valerie_response, char *, int );
+extern void valerie_response_set_error( valerie_response, int, const char * );
+extern int valerie_response_printf( valerie_response, size_t, const char *, ... );
+extern int valerie_response_write( valerie_response, const char *, int );
 extern void valerie_response_close( valerie_response );
 
 #ifdef __cplusplus

diff --git a/src/valerie/valerie_socket.c b/src/valerie/valerie_socket.c
index 2ed79ef5f19408ab2cf3a3fd71e45fc015114549..8a918328ec2efc6ddafcab2893cf03a13a3bbe8e 100644 (file)
--- a/src/valerie/valerie_socket.c
+++ b/src/valerie/valerie_socket.c
@@ -125,7 +125,7 @@ int valerie_socket_read_data( valerie_socket socket, char *data, int length )
 /** Write an arbitrarily formatted block of data to the server.
 */
 
-int valerie_socket_write_data( valerie_socket socket, char *data, int length )
+int valerie_socket_write_data( valerie_socket socket, const char *data, int length )
 {
        int used = 0;
        

diff --git a/src/valerie/valerie_socket.h b/src/valerie/valerie_socket.h
index f016ca1a988a4a1894594eac4fbf596582978609..61838de1e90aa97193a4bf2f340cbb90d70b0570 100644 (file)
--- a/src/valerie/valerie_socket.h
+++ b/src/valerie/valerie_socket.h
@@ -46,7 +46,7 @@ extern valerie_socket valerie_socket_init( char *, int );
 extern int valerie_socket_connect( valerie_socket );
 extern valerie_socket valerie_socket_init_fd( int );
 extern int valerie_socket_read_data( valerie_socket, char *, int );
-extern int valerie_socket_write_data( valerie_socket, char *, int );
+extern int valerie_socket_write_data( valerie_socket, const char *, int );
 extern void valerie_socket_close( valerie_socket );
 
 #ifdef __cplusplus

diff --git a/src/valerie/valerie_status.c b/src/valerie/valerie_status.c
index 1b1d55159aaffbc30b452b9664d8f6cc74aadeba..963a3c9c1c4189c2454fa66ad0a3c81c71457689 100644 (file)
--- a/src/valerie/valerie_status.c
+++ b/src/valerie/valerie_status.c
@@ -84,7 +84,7 @@ void valerie_status_parse( valerie_status status, char *text )
 
 char *valerie_status_serialise( valerie_status status, char *text, int length )
 {
-       char *status_string = NULL;
+       const char *status_string = NULL;
 
        switch( status->status )
        {

diff --git a/src/valerie/valerie_tokeniser.c b/src/valerie/valerie_tokeniser.c
index 7acaf853a6b18eb7f38ef18c9a4b3298745b1d59..a5dd91b977be5638cdfbb4daf8dfb98537998630 100644 (file)
--- a/src/valerie/valerie_tokeniser.c
+++ b/src/valerie/valerie_tokeniser.c
@@ -77,7 +77,7 @@ static int valerie_tokeniser_append( valerie_tokeniser tokeniser, char *token )
 /** Parse a string by splitting on the delimiter provided.
 */
 
-int valerie_tokeniser_parse_new( valerie_tokeniser tokeniser, char *string, char *delimiter )
+int valerie_tokeniser_parse_new( valerie_tokeniser tokeniser, char *string, const char *delimiter )
 {
        int count = 0;
        int length = strlen( string );

diff --git a/src/valerie/valerie_tokeniser.h b/src/valerie/valerie_tokeniser.h
index 9d0838cc315d2ce5995cc743bba700890080f838..3cf81503500b0cc0d2a41ce3f17087aad3b8ecc9 100644 (file)
--- a/src/valerie/valerie_tokeniser.h
+++ b/src/valerie/valerie_tokeniser.h
@@ -42,7 +42,7 @@ typedef struct
 */
 
 extern valerie_tokeniser valerie_tokeniser_init( );
-extern int valerie_tokeniser_parse_new( valerie_tokeniser, char *, char * );
+extern int valerie_tokeniser_parse_new( valerie_tokeniser, char *, const char * );
 extern char *valerie_tokeniser_get_input( valerie_tokeniser );
 extern int valerie_tokeniser_count( valerie_tokeniser );
 extern char *valerie_tokeniser_get_string( valerie_tokeniser, int );