Changeset ae6af36087215d55b3b05313d04e3b12ec5ccb4f

Show
Ignore:
Timestamp:
11/12/06 18:22:20 (2 years ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1165857740 +0000
git-parent:

[94a01b369b1e70d554d87d29a09939aca1082a38]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1165857740 +0000
Message:

* motion_detect: use playlist_Control's "lock" argument
* const string fixes
* make a couple of functions static

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_filter/colorthres.c

    r4e26c57 rae6af36  
    5555  0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x0000FF00, 0x000000FF, 0x0000FFFF }; 
    5656 
    57 static char *ppsz_color_descriptions[] = { 
     57static const char *ppsz_color_descriptions[] = { 
    5858  N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Lime"), N_("Blue"), N_("Aqua") }; 
    5959 

  • modules/video_filter/deinterlace.c

    rd3fe7f2 rae6af36  
    114114#define FILTER_CFG_PREFIX "sout-deinterlace-" 
    115115 
    116 static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", "x" }; 
    117 static char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"), 
     116static const char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", "x" }; 
     117static const char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"), 
    118118                                  N_("Bob"), N_("Linear"), "X" }; 
    119119 

  • modules/video_filter/gradient.c

    r9ce7298 rae6af36  
    6565    "\"gradient\" and \"edge\".") 
    6666 
    67 static char *mode_list[] = { "gradient", "edge", "hough" }; 
    68 static char *mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Hough") }; 
     67static const char *mode_list[] = { "gradient", "edge", "hough" }; 
     68static const char *mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Hough") }; 
    6969 
    7070#define FILTER_PREFIX "gradient-" 

  • modules/video_filter/logo.c

    r8a26156 rae6af36  
    9494 
    9595static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; 
    96 static char *ppsz_pos_descriptions[] = 
     96static const char *ppsz_pos_descriptions[] = 
    9797{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), 
    9898  N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; 
    …… 
    191191 *****************************************************************************/ 
    192192#define LoadLogoList( a, b ) __LoadLogoList( VLC_OBJECT( a ), b ) 
    193 void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list ) 
     193static void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list ) 
    194194{ 
    195195    char *psz_list; /* the list: <logo>[,[<delay>[,[<alpha>]]]][;...] */ 
    …… 
    264264 * FreeLogoList 
    265265 *****************************************************************************/ 
    266 void FreeLogoList( logo_list_t *p_logo_list ) 
     266static void FreeLogoList( logo_list_t *p_logo_list ) 
    267267{ 
    268268    unsigned int i; 

  • modules/video_filter/mosaic.c

    r9ce7298 rae6af36  
    174174 
    175175static int pi_pos_values[] = { 0, 1, 2 }; 
    176 static char * ppsz_pos_descriptions[] = 
     176static const char * ppsz_pos_descriptions[] = 
    177177{ N_("auto"), N_("fixed"), N_("offsets") }; 
    178178 
    179179static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; 
    180 static char *ppsz_align_descriptions[] = 
     180static const char *ppsz_align_descriptions[] = 
    181181     { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), 
    182182     N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; 
    …… 
    242242 * and set the corresponding struct filter_sys_t entries. 
    243243 *****************************************************************************/ 
    244 void mosaic_ParseSetOffsets( vlc_object_t *p_this, filter_sys_t *p_sys, char *psz_offsets ) 
     244static void mosaic_ParseSetOffsets( vlc_object_t *p_this, filter_sys_t *p_sys, char *psz_offsets ) 
    245245{ 
    246246    if( psz_offsets[0] != 0 ) 

  • modules/video_filter/motiondetect.c

    rd3fe7f2 rae6af36  
    409409                                        pp_curent_area->psz_mrl ); 
    410410                    playlist_Control( p_vout->p_sys->p_playlist, 
    411                                         PLAYLIST_VIEWPLAY, NULL, p_item ); 
     411                                        PLAYLIST_VIEWPLAY, VLC_TRUE, NULL, p_item ); 
    412412                    pp_curent_area->i_matches = 0; 
    413413                } 

  • modules/video_filter/puzzle.c

    r9ce7298 rae6af36  
    282282#define SHUFFLE_WIDTH 81 
    283283#define SHUFFLE_HEIGHT 13 
    284 static char *shuffle_button[] = 
     284static const char *shuffle_button[] = 
    285285{ 
    286286".................................................................................", 

  • modules/video_filter/rss.c

    rd3fe7f2 rae6af36  
    6161               0x00808000, 0x00008000, 0x00008080, 0x0000FF00, 0x00800080, 
    6262               0x00000080, 0x000000FF, 0x0000FFFF}; 
    63 static char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"), 
     63static const char *ppsz_color_descriptions[] = { N_("Default"), N_("Black"), 
    6464               N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"), N_("Red"), 
    6565               N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"), 
    …… 
    157157 
    158158static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; 
    159 static char *ppsz_pos_descriptions[] = 
     159static const char *ppsz_pos_descriptions[] = 
    160160     { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), 
    161161     N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; 
    …… 
    506506 * download and resize image located at psz_url 
    507507 ***************************************************************************/ 
    508 picture_t *LoadImage( filter_t *p_filter, const char *psz_url ) 
     508static picture_t *LoadImage( filter_t *p_filter, const char *psz_url ) 
    509509{ 
    510510    filter_sys_t *p_sys = p_filter->p_sys; 
    …… 
    552552 * string. 
    553553 ***************************************************************************/ 
    554 char *removeWhiteChars( char *psz_src ) 
     554static char *removeWhiteChars( char *psz_src ) 
    555555{ 
    556556    char *psz_src2 = strdup( psz_src ); 

  • modules/video_filter/transform.c

    rd3fe7f2 rae6af36  
    5858#define TYPE_LONGTEXT N_("One of '90', '180', '270', 'hflip' and 'vflip'") 
    5959 
    60 static char *type_list[] = { "90", "180", "270", "hflip", "vflip" }; 
    61 static char *type_list_text[] = { N_("Rotate by 90 degrees"), 
     60static const char *type_list[] = { "90", "180", "270", "hflip", "vflip" }; 
     61static const char *type_list_text[] = { N_("Rotate by 90 degrees"), 
    6262  N_("Rotate by 180 degrees"), N_("Rotate by 270 degrees"), 
    6363  N_("Flip horizontally"), N_("Flip vertically") };