From f4d4669b66a9f23be85527f65dec19a566db561c Mon Sep 17 00:00:00 2001
From: Ray Lehtiniemi <rayl@mail.com>
Date: Tue, 7 Apr 2009 12:54:32 -0600
Subject: [PATCH] Constness changes

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
---
 src/framework/mlt_multitrack.c             |    2 +-
 src/modules/effectv/image.c                |    9 +++++----
 src/modules/gtk2/producer_pango.c          |    8 ++++----
 src/modules/jackrack/jack_rack.c           |    4 ++--
 src/modules/motion_est/filter_motion_est.c |    2 +-
 src/modules/xine/xineutils.h               |    4 ++--
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c
index 89d1dc2..a98d412 100644
--- 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/modules/effectv/image.c b/src/modules/effectv/image.c
index dbd848f..ce8157f 100644
--- 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 4756213..7b14d3a 100644
--- 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
diff --git a/src/modules/jackrack/jack_rack.c b/src/modules/jackrack/jack_rack.c
index 2d66f95..92f8272 100644
--- 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/motion_est/filter_motion_est.c b/src/modules/motion_est/filter_motion_est.c
index 80a11ad..6e8b021 100644
--- 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/xine/xineutils.h b/src/modules/xine/xineutils.h
index d4dba64..f0d74ce 100644
--- 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;
   }
 
-- 
1.7.4.4