[Mlt-devel] SF.net SVN: mlt:[1386] trunk/mlt
Brought to you by:
ddennedy,
lilo_booter
Menu
▾
▴
[Mlt-devel] SF.net SVN: mlt:[1386] trunk/mlt
|
From: <dde...@us...> - 2009-04-10 07:18:49
|
Revision: 1386
http://mlt.svn.sourceforge.net/mlt/?rev=1386&view=rev
Author: ddennedy
Date: 2009-04-10 07:18:41 +0000 (Fri, 10 Apr 2009)
Log Message:
-----------
Merge branch 'review-1' of git://github.com/rayl/mlt
Modified Paths:
--------------
trunk/mlt/src/framework/mlt_events.c
trunk/mlt/src/framework/mlt_events.h
trunk/mlt/src/framework/mlt_factory.c
trunk/mlt/src/framework/mlt_factory.h
trunk/mlt/src/framework/mlt_multitrack.c
trunk/mlt/src/framework/mlt_properties.c
trunk/mlt/src/framework/mlt_repository.c
trunk/mlt/src/framework/mlt_repository.h
trunk/mlt/src/framework/mlt_tokeniser.c
trunk/mlt/src/framework/mlt_tokeniser.h
trunk/mlt/src/humperdink/client.c
trunk/mlt/src/humperdink/io.c
trunk/mlt/src/humperdink/io.h
trunk/mlt/src/inigo/inigo.c
trunk/mlt/src/miracle/miracle_connection.c
trunk/mlt/src/miracle/miracle_local.c
trunk/mlt/src/miracle/miracle_log.c
trunk/mlt/src/miracle/miracle_log.h
trunk/mlt/src/miracle/miracle_server.c
trunk/mlt/src/miracle/miracle_server.h
trunk/mlt/src/modules/avformat/consumer_avformat.c
trunk/mlt/src/modules/avformat/factory.c
trunk/mlt/src/modules/core/filter_data_show.c
trunk/mlt/src/modules/core/filter_watermark.c
trunk/mlt/src/modules/core/transition_composite.c
trunk/mlt/src/modules/core/transition_region.c
trunk/mlt/src/modules/effectv/image.c
trunk/mlt/src/modules/gtk2/producer_pango.c
trunk/mlt/src/modules/jackrack/jack_rack.c
trunk/mlt/src/modules/kino/filehandler.cc
trunk/mlt/src/modules/motion_est/filter_motion_est.c
trunk/mlt/src/modules/plus/transition_affine.c
trunk/mlt/src/modules/westley/consumer_westley.c
trunk/mlt/src/modules/westley/producer_westley.c
trunk/mlt/src/modules/xine/deinterlace.c
trunk/mlt/src/modules/xine/deinterlace.h
trunk/mlt/src/modules/xine/xineutils.h
trunk/mlt/src/valerie/valerie.c
trunk/mlt/src/valerie/valerie.h
trunk/mlt/src/valerie/valerie_parser.c
trunk/mlt/src/valerie/valerie_parser.h
trunk/mlt/src/valerie/valerie_response.c
trunk/mlt/src/valerie/valerie_response.h
trunk/mlt/src/valerie/valerie_socket.c
trunk/mlt/src/valerie/valerie_socket.h
trunk/mlt/src/valerie/valerie_status.c
trunk/mlt/src/valerie/valerie_tokeniser.c
trunk/mlt/src/valerie/valerie_tokeniser.h
Added Paths:
-----------
trunk/mlt/.gitignore
Added: trunk/mlt/.gitignore
===================================================================
--- trunk/mlt/.gitignore (rev 0)
+++ trunk/mlt/.gitignore 2009-04-10 07:18:41 UTC (rev 1386)
@@ -0,0 +1,6 @@
+*.o
+*.so
+*.so.*
+config.mak
+config.h
+.depend
Modified: trunk/mlt/src/framework/mlt_events.c
===================================================================
--- trunk/mlt/src/framework/mlt_events.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_events.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -158,7 +158,7 @@
* \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 @@
* \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 @@
* \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 @@
* \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;
Modified: trunk/mlt/src/framework/mlt_events.h
===================================================================
--- trunk/mlt/src/framework/mlt_events.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_events.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -43,14 +43,14 @@
#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 );
Modified: trunk/mlt/src/framework/mlt_factory.c
===================================================================
--- trunk/mlt/src/framework/mlt_factory.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_factory.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -226,7 +226,7 @@
* \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 @@
* \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 @@
* \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 @@
* \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;
Modified: trunk/mlt/src/framework/mlt_factory.h
===================================================================
--- trunk/mlt/src/framework/mlt_factory.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_factory.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -43,10 +43,10 @@
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( );
Modified: trunk/mlt/src/framework/mlt_multitrack.c
===================================================================
--- trunk/mlt/src/framework/mlt_multitrack.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_multitrack.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -261,7 +261,7 @@
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.
Modified: trunk/mlt/src/framework/mlt_properties.c
===================================================================
--- trunk/mlt/src/framework/mlt_properties.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_properties.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -456,7 +456,7 @@
{
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_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.
Modified: trunk/mlt/src/framework/mlt_repository.c
===================================================================
--- trunk/mlt/src/framework/mlt_repository.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_repository.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -208,7 +208,7 @@
* \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 )
Modified: trunk/mlt/src/framework/mlt_repository.h
===================================================================
--- trunk/mlt/src/framework/mlt_repository.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_repository.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -39,7 +39,7 @@
/** 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 @@
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 );
Modified: trunk/mlt/src/framework/mlt_tokeniser.c
===================================================================
--- trunk/mlt/src/framework/mlt_tokeniser.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_tokeniser.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -77,7 +77,7 @@
/** 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 );
Modified: trunk/mlt/src/framework/mlt_tokeniser.h
===================================================================
--- trunk/mlt/src/framework/mlt_tokeniser.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/framework/mlt_tokeniser.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -41,7 +41,7 @@
*/
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 );
Modified: trunk/mlt/src/humperdink/client.c
===================================================================
--- trunk/mlt/src/humperdink/client.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/humperdink/client.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -47,10 +47,10 @@
typedef struct
{
- char *description;
+ const char *description;
struct menu_item
{
- char *option;
+ const char *option;
demo_function function;
}
array[ 50 ];
@@ -613,7 +613,7 @@
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_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;
Modified: trunk/mlt/src/humperdink/io.c
===================================================================
--- trunk/mlt/src/humperdink/io.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/humperdink/io.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -72,7 +72,7 @@
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 @@
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: " );
Modified: trunk/mlt/src/humperdink/io.h
===================================================================
--- trunk/mlt/src/humperdink/io.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/humperdink/io.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -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
Modified: trunk/mlt/src/inigo/inigo.c
===================================================================
--- trunk/mlt/src/inigo/inigo.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/inigo/inigo.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -265,7 +265,7 @@
}
}
-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_services( mlt_repository repo, mlt_service_type type )
{
mlt_properties services = NULL;
- char *typestr = NULL;
+ const char *typestr = NULL;
switch ( type )
{
case consumer_type:
Modified: trunk/mlt/src/miracle/miracle_connection.c
===================================================================
--- trunk/mlt/src/miracle/miracle_connection.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/miracle/miracle_connection.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -133,7 +133,7 @@
}
else
{
- char *message = "500 Empty Response\r\n\r\n";
+ const char *message = "500 Empty Response\r\n\r\n";
write( fd, message, strlen( message ) );
}
Modified: trunk/mlt/src/miracle/miracle_local.c
===================================================================
--- trunk/mlt/src/miracle/miracle_local.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/miracle/miracle_local.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -105,7 +105,7 @@
typedef struct
{
int code;
- char *message;
+ const char *message;
}
responses_t;
@@ -146,7 +146,7 @@
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 @@
/* What type is the argument (RTTI :-) ATYPE_whatever */
int type;
/* online help information */
- char *help;
+ const char *help;
}
command_t;
@@ -217,7 +217,7 @@
/** 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 ++ ) ;
Modified: trunk/mlt/src/miracle/miracle_log.c
===================================================================
--- trunk/mlt/src/miracle/miracle_log.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/miracle/miracle_log.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -36,7 +36,7 @@
}
-void miracle_log( int priority, char *format, ... )
+void miracle_log( int priority, const char *format, ... )
{
va_list list;
va_start( list, format );
Modified: trunk/mlt/src/miracle/miracle_log.h
===================================================================
--- trunk/mlt/src/miracle/miracle_log.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/miracle/miracle_log.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -34,7 +34,7 @@
};
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
}
Modified: trunk/mlt/src/miracle/miracle_server.c
===================================================================
--- trunk/mlt/src/miracle/miracle_server.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/miracle/miracle_server.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -92,7 +92,7 @@
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 )
{
Modified: trunk/mlt/src/miracle/miracle_server.h
===================================================================
--- trunk/mlt/src/miracle/miracle_server.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/miracle/miracle_server.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -61,7 +61,7 @@
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 );
Modified: trunk/mlt/src/modules/avformat/consumer_avformat.c
===================================================================
--- trunk/mlt/src/modules/avformat/consumer_avformat.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/avformat/consumer_avformat.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -845,7 +845,7 @@
// 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 @@
// 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 );
Modified: trunk/mlt/src/modules/avformat/factory.c
===================================================================
--- trunk/mlt/src/modules/avformat/factory.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/avformat/factory.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -124,7 +124,7 @@
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:
Modified: trunk/mlt/src/modules/core/filter_data_show.c
===================================================================
--- trunk/mlt/src/modules/core/filter_data_show.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/core/filter_data_show.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -144,7 +144,7 @@
{
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
Modified: trunk/mlt/src/modules/core/filter_watermark.c
===================================================================
--- trunk/mlt/src/modules/core/filter_watermark.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/core/filter_watermark.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -181,7 +181,7 @@
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 );
Modified: trunk/mlt/src/modules/core/transition_composite.c
===================================================================
--- trunk/mlt/src/modules/core/transition_composite.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/core/transition_composite.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -201,7 +201,7 @@
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 @@
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 );
Modified: trunk/mlt/src/modules/core/transition_region.c
===================================================================
--- trunk/mlt/src/modules/core/transition_region.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/core/transition_region.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -272,7 +272,7 @@
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" );
Modified: trunk/mlt/src/modules/effectv/image.c
===================================================================
--- trunk/mlt/src/modules/effectv/image.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/effectv/image.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -51,12 +51,12 @@
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_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);
Modified: trunk/mlt/src/modules/gtk2/producer_pango.c
===================================================================
--- trunk/mlt/src/modules/gtk2/producer_pango.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/gtk2/producer_pango.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -146,7 +146,7 @@
( *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_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 @@
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 @@
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 @@
/** 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;
Modified: trunk/mlt/src/modules/jackrack/jack_rack.c
===================================================================
--- trunk/mlt/src/modules/jackrack/jack_rack.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/jackrack/jack_rack.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -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)
Modified: trunk/mlt/src/modules/kino/filehandler.cc
===================================================================
--- trunk/mlt/src/modules/kino/filehandler.cc 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/kino/filehandler.cc 2009-04-10 07:18:41 UTC (rev 1386)
@@ -873,7 +873,7 @@
{
Init();
- fd = quicktime_open( ( char * ) s, 1, 0 );
+ fd = quicktime_open( s, 1, 0 );
if ( fd == NULL )
{
fprintf( stderr, "Error opening: %s\n", s );
Modified: trunk/mlt/src/modules/motion_est/filter_motion_est.c
===================================================================
--- trunk/mlt/src/modules/motion_est/filter_motion_est.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/motion_est/filter_motion_est.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -392,7 +392,7 @@
int ncompare (const void * a, const void * b)
{
- return ( *(int*)a - *(int*)b );
+ return ( *(const int*)a - *(const int*)b );
}
// motion vector denoising
Modified: trunk/mlt/src/modules/plus/transition_affine.c
===================================================================
--- trunk/mlt/src/modules/plus/transition_affine.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/plus/transition_affine.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -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 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 @@
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;
Modified: trunk/mlt/src/modules/westley/consumer_westley.c
===================================================================
--- trunk/mlt/src/modules/westley/consumer_westley.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/westley/consumer_westley.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -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_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;
Modified: trunk/mlt/src/modules/westley/producer_westley.c
===================================================================
--- trunk/mlt/src/modules/westley/producer_westley.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/westley/producer_westley.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -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,7 +170,7 @@
// 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 && resource[0] )
@@ -297,7 +297,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
// 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 @@
// 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 @@
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 @@
}
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 @@
}
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 @@
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 )
Modified: trunk/mlt/src/modules/xine/deinterlace.c
===================================================================
--- trunk/mlt/src/modules/xine/deinterlace.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/xine/deinterlace.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -846,7 +846,7 @@
return 0;
}
-char *deinterlace_methods[] = {
+const char *deinterlace_methods[] = {
"none",
"bob",
"weave",
Modified: trunk/mlt/src/modules/xine/deinterlace.h
===================================================================
--- trunk/mlt/src/modules/xine/deinterlace.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/xine/deinterlace.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -42,6 +42,6 @@
#define DEINTERLACE_ONEFIELDXV 5
#define DEINTERLACE_LINEARBLEND 6
-extern char *deinterlace_methods[];
+extern const char *deinterlace_methods[];
#endif
Modified: trunk/mlt/src/modules/xine/xineutils.h
===================================================================
--- trunk/mlt/src/modules/xine/xineutils.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/modules/xine/xineutils.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -659,13 +659,13 @@
#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;
}
Modified: trunk/mlt/src/valerie/valerie.c
===================================================================
--- trunk/mlt/src/valerie/valerie.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -117,7 +117,7 @@
/** 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 @@
/** 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 @@
/** 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 @@
/** 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 @@
/** 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 @@
/** 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:
Modified: trunk/mlt/src/valerie/valerie.h
===================================================================
--- trunk/mlt/src/valerie/valerie.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -122,7 +122,7 @@
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 @@
*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 @@
/* 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 );
Modified: trunk/mlt/src/valerie/valerie_parser.c
===================================================================
--- trunk/mlt/src/valerie/valerie_parser.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_parser.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -63,7 +63,7 @@
/** 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;
Modified: trunk/mlt/src/valerie/valerie_parser.h
===================================================================
--- trunk/mlt/src/valerie/valerie_parser.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_parser.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -64,7 +64,7 @@
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 );
Modified: trunk/mlt/src/valerie/valerie_response.c
===================================================================
--- trunk/mlt/src/valerie/valerie_response.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_response.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -80,9 +80,9 @@
/** 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 @@
/** 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 @@
/** 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 @@
/** 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. */
Modified: trunk/mlt/src/valerie/valerie_response.h
===================================================================
--- trunk/mlt/src/valerie/valerie_response.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_response.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -46,12 +46,12 @@
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
Modified: trunk/mlt/src/valerie/valerie_socket.c
===================================================================
--- trunk/mlt/src/valerie/valerie_socket.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_socket.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -125,7 +125,7 @@
/** 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;
Modified: trunk/mlt/src/valerie/valerie_socket.h
===================================================================
--- trunk/mlt/src/valerie/valerie_socket.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_socket.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -46,7 +46,7 @@
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
Modified: trunk/mlt/src/valerie/valerie_status.c
===================================================================
--- trunk/mlt/src/valerie/valerie_status.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_status.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -84,7 +84,7 @@
char *valerie_status_serialise( valerie_status status, char *text, int length )
{
- char *status_string = NULL;
+ const char *status_string = NULL;
switch( status->status )
{
Modified: trunk/mlt/src/valerie/valerie_tokeniser.c
===================================================================
--- trunk/mlt/src/valerie/valerie_tokeniser.c 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_tokeniser.c 2009-04-10 07:18:41 UTC (rev 1386)
@@ -77,7 +77,7 @@
/** 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 );
Modified: trunk/mlt/src/valerie/valerie_tokeniser.h
===================================================================
--- trunk/mlt/src/valerie/valerie_tokeniser.h 2009-04-09 07:17:17 UTC (rev 1385)
+++ trunk/mlt/src/valerie/valerie_tokeniser.h 2009-04-10 07:18:41 UTC (rev 1386)
@@ -42,7 +42,7 @@
*/
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 );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|