]> git.sesse.net Git - vlc/commitdiff
* More compiler warning fixes (const mostly)
authorDerk-Jan Hartman <hartman@videolan.org>
Thu, 14 Dec 2006 20:56:18 +0000 (20:56 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Thu, 14 Dec 2006 20:56:18 +0000 (20:56 +0000)
modules/access_filter/record.c
modules/audio_filter/channel_mixer/mono.c
modules/audio_filter/equalizer_presets.h
modules/codec/cmml/browser_open.c
modules/codec/cmml/history.c
modules/codec/cmml/history.h
modules/codec/sdl_image.c
modules/codec/x264.c

index 82c167e972729bdb5ebd8689366c839d2c3ce122..e42a9f6d88414b8aab3c39cbbabf1024817fb423 100644 (file)
@@ -320,9 +320,9 @@ static void Notify( access_t *p_access, vlc_bool_t b_dump )
     if( p_sys->i_vout_chan != -1 )
     {
         if( b_dump )
-            vout_OSDMessage( p_vout, p_sys->i_vout_chan, "Recording" );
+            vout_OSDMessage( p_vout, p_sys->i_vout_chan, _("Recording") );
         else
-            vout_OSDMessage( p_vout, p_sys->i_vout_chan, "Recording done" );
+            vout_OSDMessage( p_vout, p_sys->i_vout_chan, _("Recording done") );
     }
     vlc_object_release( p_vout );
 }
index 211a9624614646e3bfb79b122e492f3bea78debd..4ad93c2c2b5a9750798ca43feb38736699452152 100644 (file)
@@ -94,8 +94,8 @@ struct filter_sys_t
     "except the selected channel. Choose one from (0=left, 1=right " \
     "2=rear left, 3=rear right, 4=center, 5=left front)")
 
-static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5 };
-static char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5 };
+static const char *ppsz_pos_descriptions[] =
 { N_("Left"), N_("Right"), N_("Left rear"), N_("Right rear"), N_("Center"),
   N_("Left front") };
 
index e2647b9781dee43c6a921a0250d9129bf3ddcae4..6c1f2f1b7f95654420aad916e96ba585a69ce00c 100644 (file)
 #define EQZ_BANDS_MAX 10
 
 #define NB_PRESETS 18
-static char *preset_list[] = {
+static const char *preset_list[] = {
     "flat", "classical", "club", "dance", "fullbass", "fullbasstreble",
     "fulltreble", "headphones","largehall", "live", "party", "pop", "reggae",
     "rock", "ska", "soft", "softrock", "techno"
 };
-static char *preset_list_text[] = {
+static const char *preset_list_text[] = {
     N_("Flat"), N_("Classical"), N_("Club"), N_("Dance"), N_("Full bass"),
     N_("Full bass and treble"), N_("Full treble"), N_("Headphones"),
     N_("Large Hall"), N_("Live"), N_("Party"), N_("Pop"), N_("Reggae"),
@@ -45,7 +45,7 @@ static char *preset_list_text[] = {
 
 typedef struct
 {
-    char *psz_name;
+    const char *psz_name;
     int  i_band;
     float f_preamp;
     float f_amp[EQZ_BANDS_MAX];
index f8a8a8e9caa38b52f4966a32a10392f37c6339ab..514c7ee62679473bf070e541211248ae716ea453 100644 (file)
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "xstrcat.h"
+#include "browser_open.h"
 
 int browser_Open( const char *psz_url )
 {
index 70377bb0d467169f426e4992006049bfef30aa5a..f1cb6d735ed79b814243b40003de222b197659dc 100644 (file)
@@ -49,7 +49,7 @@ static void history_Dump( history_t *p_history );
  * Actual history code
  *****************************************************************************/
 
-history_t *history_New()
+history_t *history_New( void )
 {
    history_t *p_new_history;
    
index a1319b921eae77a3cdbc75b4518136fa58f01645..902ec77930d74144b779e2a319d6d59c635957c6 100644 (file)
@@ -49,7 +49,7 @@ typedef struct history_t history_t;
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-history_t       * history_New                        ();
+history_t       * history_New                        ( void );
 vlc_bool_t        history_GoBackSavingCurrentItem    ( history_t *,
                                                        history_item_t * );
 vlc_bool_t        history_GoForwardSavingCurrentItem ( history_t *,
index 70a8c6c0b9120673054d86a4501e0c4a06b32190..2d40b422041f2fa0978db29021d852e90d5f1167 100644 (file)
@@ -61,7 +61,7 @@ vlc_module_end();
 static const struct supported_fmt_t
 {
     vlc_fourcc_t i_fourcc;
-    char *psz_sdl_type;
+    const char *psz_sdl_type;
 } p_supported_fmt[] =
 {
     { VLC_FOURCC('t','g','a',' '), "TGA" },
index 98aad69c84a9437857bead6188ecaf3b5a626799..622a8feb826dde152109c7a9fe67eca54095bf1e 100644 (file)
@@ -309,26 +309,26 @@ static void Close( vlc_object_t * );
 #define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.")
 
 #if X264_BUILD >= 24
-static char *enc_me_list[] =
+static const char *enc_me_list[] =
   { "dia", "hex", "umh", "esa" };
-static char *enc_me_list_text[] =
+static const char *enc_me_list_text[] =
   { N_("dia"), N_("hex"), N_("umh"), N_("esa") };
 #endif
 
-static char *enc_analyse_list[] =
+static const char *enc_analyse_list[] =
   { "none", "fast", "normal", "slow", "all" };
-static char *enc_analyse_list_text[] =
+static const char *enc_analyse_list_text[] =
   { N_("none"), N_("fast"), N_("normal"), N_("slow"), N_("all") };
 
 #if X264_BUILD >= 45 /* r457 */
-static char *direct_pred_list[] =
+static const char *direct_pred_list[] =
   { "none", "spatial", "temporal", "auto" };
-static char *direct_pred_list_text[] =
+static const char *direct_pred_list_text[] =
   { N_("none"), N_("spatial"), N_("temporal"), N_("auto") };
 #else
-static char *direct_pred_list[] =
+static const char *direct_pred_list[] =
   { "none", "spatial", "temporal" };
-static char *direct_pred_list_text[] =
+static const char *direct_pred_list_text[] =
   { N_("none"), N_("spatial"), N_("temporal") };
 #endif