Commit d2dff446 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* More compiler warning fixes (const mostly)

parent fe12c564
...@@ -320,9 +320,9 @@ static void Notify( access_t *p_access, vlc_bool_t b_dump ) ...@@ -320,9 +320,9 @@ static void Notify( access_t *p_access, vlc_bool_t b_dump )
if( p_sys->i_vout_chan != -1 ) if( p_sys->i_vout_chan != -1 )
{ {
if( b_dump ) if( b_dump )
vout_OSDMessage( p_vout, p_sys->i_vout_chan, "Recording" ); vout_OSDMessage( p_vout, p_sys->i_vout_chan, _("Recording") );
else 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 ); vlc_object_release( p_vout );
} }
......
...@@ -94,8 +94,8 @@ struct filter_sys_t ...@@ -94,8 +94,8 @@ struct filter_sys_t
"except the selected channel. Choose one from (0=left, 1=right " \ "except the selected channel. Choose one from (0=left, 1=right " \
"2=rear left, 3=rear right, 4=center, 5=left front)") "2=rear left, 3=rear right, 4=center, 5=left front)")
static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5 }; static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5 };
static char *ppsz_pos_descriptions[] = static const char *ppsz_pos_descriptions[] =
{ N_("Left"), N_("Right"), N_("Left rear"), N_("Right rear"), N_("Center"), { N_("Left"), N_("Right"), N_("Left rear"), N_("Right rear"), N_("Center"),
N_("Left front") }; N_("Left front") };
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
#define EQZ_BANDS_MAX 10 #define EQZ_BANDS_MAX 10
#define NB_PRESETS 18 #define NB_PRESETS 18
static char *preset_list[] = { static const char *preset_list[] = {
"flat", "classical", "club", "dance", "fullbass", "fullbasstreble", "flat", "classical", "club", "dance", "fullbass", "fullbasstreble",
"fulltreble", "headphones","largehall", "live", "party", "pop", "reggae", "fulltreble", "headphones","largehall", "live", "party", "pop", "reggae",
"rock", "ska", "soft", "softrock", "techno" "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_("Flat"), N_("Classical"), N_("Club"), N_("Dance"), N_("Full bass"),
N_("Full bass and treble"), N_("Full treble"), N_("Headphones"), N_("Full bass and treble"), N_("Full treble"), N_("Headphones"),
N_("Large Hall"), N_("Live"), N_("Party"), N_("Pop"), N_("Reggae"), N_("Large Hall"), N_("Live"), N_("Party"), N_("Pop"), N_("Reggae"),
...@@ -45,7 +45,7 @@ static char *preset_list_text[] = { ...@@ -45,7 +45,7 @@ static char *preset_list_text[] = {
typedef struct typedef struct
{ {
char *psz_name; const char *psz_name;
int i_band; int i_band;
float f_preamp; float f_preamp;
float f_amp[EQZ_BANDS_MAX]; float f_amp[EQZ_BANDS_MAX];
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#include "xstrcat.h" #include "xstrcat.h"
#include "browser_open.h"
int browser_Open( const char *psz_url ) int browser_Open( const char *psz_url )
{ {
......
...@@ -49,7 +49,7 @@ static void history_Dump( history_t *p_history ); ...@@ -49,7 +49,7 @@ static void history_Dump( history_t *p_history );
* Actual history code * Actual history code
*****************************************************************************/ *****************************************************************************/
history_t *history_New() history_t *history_New( void )
{ {
history_t *p_new_history; history_t *p_new_history;
......
...@@ -49,7 +49,7 @@ typedef struct history_t history_t; ...@@ -49,7 +49,7 @@ typedef struct history_t history_t;
/***************************************************************************** /*****************************************************************************
* Exported prototypes * Exported prototypes
*****************************************************************************/ *****************************************************************************/
history_t * history_New (); history_t * history_New ( void );
vlc_bool_t history_GoBackSavingCurrentItem ( history_t *, vlc_bool_t history_GoBackSavingCurrentItem ( history_t *,
history_item_t * ); history_item_t * );
vlc_bool_t history_GoForwardSavingCurrentItem ( history_t *, vlc_bool_t history_GoForwardSavingCurrentItem ( history_t *,
......
...@@ -61,7 +61,7 @@ vlc_module_end(); ...@@ -61,7 +61,7 @@ vlc_module_end();
static const struct supported_fmt_t static const struct supported_fmt_t
{ {
vlc_fourcc_t i_fourcc; vlc_fourcc_t i_fourcc;
char *psz_sdl_type; const char *psz_sdl_type;
} p_supported_fmt[] = } p_supported_fmt[] =
{ {
{ VLC_FOURCC('t','g','a',' '), "TGA" }, { VLC_FOURCC('t','g','a',' '), "TGA" },
......
...@@ -309,26 +309,26 @@ static void Close( vlc_object_t * ); ...@@ -309,26 +309,26 @@ static void Close( vlc_object_t * );
#define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.") #define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.")
#if X264_BUILD >= 24 #if X264_BUILD >= 24
static char *enc_me_list[] = static const char *enc_me_list[] =
{ "dia", "hex", "umh", "esa" }; { "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") }; { N_("dia"), N_("hex"), N_("umh"), N_("esa") };
#endif #endif
static char *enc_analyse_list[] = static const char *enc_analyse_list[] =
{ "none", "fast", "normal", "slow", "all" }; { "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") }; { N_("none"), N_("fast"), N_("normal"), N_("slow"), N_("all") };
#if X264_BUILD >= 45 /* r457 */ #if X264_BUILD >= 45 /* r457 */
static char *direct_pred_list[] = static const char *direct_pred_list[] =
{ "none", "spatial", "temporal", "auto" }; { "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") }; { N_("none"), N_("spatial"), N_("temporal"), N_("auto") };
#else #else
static char *direct_pred_list[] = static const char *direct_pred_list[] =
{ "none", "spatial", "temporal" }; { "none", "spatial", "temporal" };
static char *direct_pred_list_text[] = static const char *direct_pred_list_text[] =
{ N_("none"), N_("spatial"), N_("temporal") }; { N_("none"), N_("spatial"), N_("temporal") };
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment