* motion_detect: use playlist_Control's "lock" argument

* const string fixes
* make a couple of functions static

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index 06354ca923e1137a58b1a3f6ca6314d36e3fc8c5..e7e2751a28c38a24819280e7cc75960fe4a57c58 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -54,7 +54,7 @@ static picture_t *Filter( filter_t *, picture_t * );
 static int pi_color_values[] = {
   0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x0000FF00, 0x000000FF, 0x0000FFFF };
 
-static char *ppsz_color_descriptions[] = {
+static const char *ppsz_color_descriptions[] = {
   N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Lime"), N_("Blue"), N_("Aqua") };
 
 

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 6e8bccae5b57cb0f6e761d6fb842a54bf7f2b905..469211c31aea82c6cd69a02dc8f803f3ee195638 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -113,8 +113,8 @@ static int FilterCallback ( vlc_object_t *, char const *,
 
 #define FILTER_CFG_PREFIX "sout-deinterlace-"
 
-static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", "x" };
-static char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"),
+static const char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", "x" };
+static const char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"),
                                   N_("Bob"), N_("Linear"), "X" };
 
 vlc_module_begin();

diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index 0dd5f637927a7d0c78f87137c3bb35111bf1edf7..c3457487b12bef62ae24d37d6497a5555b73cec7 100644 (file)
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -64,8 +64,8 @@ static void FilterHough   ( filter_t *, picture_t *, picture_t * );
 #define CARTOON_LONGTEXT N_("Apply cartoon effect. It is only used by " \
     "\"gradient\" and \"edge\".")
 
-static char *mode_list[] = { "gradient", "edge", "hough" };
-static char *mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Hough") };
+static const char *mode_list[] = { "gradient", "edge", "hough" };
+static const char *mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Hough") };
 
 #define FILTER_PREFIX "gradient-"
 

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index c21668aa8a1f2ecb557a01b9f8460039202e9f1b..4eb6556f8f524645b2a3a04e1418cc48794bdbd1 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -93,7 +93,7 @@ static int LogoCallback( vlc_object_t *, char const *,
 #define CFG_PREFIX "logo-"
 
 static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static char *ppsz_pos_descriptions[] =
+static const char *ppsz_pos_descriptions[] =
 { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
   N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
@@ -190,7 +190,7 @@ static picture_t *LoadImage( vlc_object_t *p_this, char *psz_filename )
  * logo-transparency values.
  *****************************************************************************/
 #define LoadLogoList( a, b ) __LoadLogoList( VLC_OBJECT( a ), b )
-void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list )
+static void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list )
 {
     char *psz_list; /* the list: <logo>[,[<delay>[,[<alpha>]]]][;...] */
     unsigned int i;
@@ -263,7 +263,7 @@ void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list )
 /*****************************************************************************
  * FreeLogoList
  *****************************************************************************/
-void FreeLogoList( logo_list_t *p_logo_list )
+static void FreeLogoList( logo_list_t *p_logo_list )
 {
     unsigned int i;
     FREENULL( p_logo_list->psz_filename );

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 384840057cc207515cb2f47b44392089fab4cef4..8b69a177009a4e273a1288233f5888014e3a81d6 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -173,11 +173,11 @@ struct filter_sys_t
         "seems sensible." )
 
 static int pi_pos_values[] = { 0, 1, 2 };
-static char * ppsz_pos_descriptions[] =
+static const char * ppsz_pos_descriptions[] =
 { N_("auto"), N_("fixed"), N_("offsets") };
 
 static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static char *ppsz_align_descriptions[] =
+static const char *ppsz_align_descriptions[] =
      { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
      N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
@@ -241,7 +241,7 @@ static const char *ppsz_filter_options[] = {
  * parse the "--mosaic-offsets x1,y1,x2,y2,x3,y3" parameter
  * and set the corresponding struct filter_sys_t entries.
  *****************************************************************************/
-void mosaic_ParseSetOffsets( vlc_object_t *p_this, filter_sys_t *p_sys, char *psz_offsets )
+static void mosaic_ParseSetOffsets( vlc_object_t *p_this, filter_sys_t *p_sys, char *psz_offsets )
 {
     if( psz_offsets[0] != 0 )
     {

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 4b395e2d2b08b2ed4aead28551535fb3c86be6d7..19d677cdd016ebd02317a7c15060c7d219c13165 100644 (file)
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -408,7 +408,7 @@ static void MotionDetect( vout_thread_t *p_vout, picture_t *p_inpic,
                     msg_Dbg( p_vout, "Area(%d) matched, going to %s\n", i_area,
                                         pp_curent_area->psz_mrl );
                     playlist_Control( p_vout->p_sys->p_playlist,
-                                        PLAYLIST_VIEWPLAY, NULL, p_item );
+                                        PLAYLIST_VIEWPLAY, VLC_TRUE, NULL, p_item );
                     pp_curent_area->i_matches = 0;
                 }
             }

diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
index 27ce25bc56f307144fb479252da04e14bd762823..cc83d7e7a5f4b1c224aab21b28a3114035b5da4c 100644 (file)
--- a/modules/video_filter/puzzle.c
+++ b/modules/video_filter/puzzle.c
@@ -281,7 +281,7 @@ static void End( vout_thread_t *p_vout )
 
 #define SHUFFLE_WIDTH 81
 #define SHUFFLE_HEIGHT 13
-static char *shuffle_button[] =
+static const char *shuffle_button[] =
 {
 ".................................................................................",
 "..............  ............................   ........   ......  ...............",

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 4761f30b1ae84d75e2c453182520f83f0dde1120..852e49dbb5e2818026efab516197cc6f50db60e7 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -60,7 +60,7 @@ static int pi_color_values[] = { 0xf0000000, 0x00000000, 0x00808080, 0x00C0C0C0,
                0x00FFFFFF, 0x00800000, 0x00FF0000, 0x00FF00FF, 0x00FFFF00,
                0x00808000, 0x00008000, 0x00008080, 0x0000FF00, 0x00800080,
                0x00000080, 0x000000FF, 0x0000FFFF};
-static char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"),
+static const char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"),
                N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"), N_("Red"),
                N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"),
                N_("Teal"), N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"),
@@ -156,7 +156,7 @@ struct filter_sys_t
   "also use combinations of these values, eg 6 = top-right).")
 
 static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static char *ppsz_pos_descriptions[] =
+static const char *ppsz_pos_descriptions[] =
      { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
      N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
@@ -505,7 +505,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
 /****************************************************************************
  * download and resize image located at psz_url
  ***************************************************************************/
-picture_t *LoadImage( filter_t *p_filter, const char *psz_url )
+static picture_t *LoadImage( filter_t *p_filter, const char *psz_url )
 {
     filter_sys_t *p_sys = p_filter->p_sys;
 
@@ -551,7 +551,7 @@ picture_t *LoadImage( filter_t *p_filter, const char *psz_url )
  * remove all ' ' '\t' '\n' '\r' characters from the begining and end of the
  * string.
  ***************************************************************************/
-char *removeWhiteChars( char *psz_src )
+static char *removeWhiteChars( char *psz_src )
 {
     char *psz_src2 = strdup( psz_src );
     char *psz_clean = strdup( psz_src2 );

diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c
index 5dc45714e3108176f37e1a9ea37e0881a4ac5339..c7deb77fc11a2f8a5e782063680ac2c588048594 100644 (file)
--- a/modules/video_filter/transform.c
+++ b/modules/video_filter/transform.c
@@ -57,8 +57,8 @@ static int  SendEvents( vlc_object_t *, char const *,
 #define TYPE_TEXT N_("Transform type")
 #define TYPE_LONGTEXT N_("One of '90', '180', '270', 'hflip' and 'vflip'")
 
-static char *type_list[] = { "90", "180", "270", "hflip", "vflip" };
-static char *type_list_text[] = { N_("Rotate by 90 degrees"),
+static const char *type_list[] = { "90", "180", "270", "hflip", "vflip" };
+static const char *type_list_text[] = { N_("Rotate by 90 degrees"),
   N_("Rotate by 180 degrees"), N_("Rotate by 270 degrees"),
   N_("Flip horizontally"), N_("Flip vertically") };