Commit 7d5bf1ea authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

(p?)gettext -> vlc_\1gettext

parent 5268ecca
......@@ -288,7 +288,7 @@ static inline const char *config_CategoryNameGet( int i_value )
{
if( categories_array[i].i_id == i_value )
{
return gettext(categories_array[i].psz_name);
return vlc_gettext(categories_array[i].psz_name);
}
i++;
}
......@@ -303,7 +303,7 @@ static inline const char *config_CategoryHelpGet( int i_value )
{
if( categories_array[i].i_id == i_value )
{
return gettext(categories_array[i].psz_help);
return vlc_gettext(categories_array[i].psz_help);
}
i++;
}
......
......@@ -175,11 +175,8 @@ typedef void *locale_t;
#endif
/* libintl support */
#define _(str) gettext(str)
#define gettext(str) vlc_gettext (str)
#define pgettext(ctx,id) vlc_pgettext(ctx,id)
#define N_(str) gettext_noop (str)
#define _(str) vlc_gettext (str)
#define N_(str) gettext_noop (str)
#define gettext_noop(str) (str)
#ifndef HAVE_SWAB
......
......@@ -38,7 +38,6 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#undef gettext
#include <inttypes.h>
......
......@@ -402,8 +402,10 @@ static int DemuxStation( demux_t *p_demux )
input_item_CopyOptions( p_sys->p_current_input, p_input );
free( psz_mrl );
#define SADD_INFO( type, field ) if( field ) { input_item_AddInfo( \
p_input, _("Shoutcast"), gettext(type), "%s", field ) ; }
#define SADD_INFO( type, field ) \
if( field ) \
input_item_AddInfo( p_input, _("Shoutcast"), \
vlc_gettext(type), "%s", field )
SADD_INFO( N_("Mime"), psz_mt );
SADD_INFO( N_("Bitrate"), psz_br );
SADD_INFO( N_("Listeners"), psz_lc );
......
......@@ -3265,7 +3265,7 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid,
{
p_fmt->subs.teletext.i_magazine = -1;
p_fmt->subs.teletext.i_page = 0;
p_fmt->psz_description = strdup( gettext(ppsz_teletext_type[1]) );
p_fmt->psz_description = strdup( vlc_gettext(ppsz_teletext_type[1]) );
dvbpsi_descriptor_t *p_dr;
p_dr = PMTEsFindDescriptor( p_es, 0x46 );
......@@ -3320,7 +3320,7 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid,
/* */
const ts_teletext_page_t *p = &p_page[i];
p_es->fmt.psz_language = strndup( p->p_iso639, 3 );
p_es->fmt.psz_description = strdup(gettext(ppsz_teletext_type[p->i_type]));
p_es->fmt.psz_description = strdup(vlc_gettext(ppsz_teletext_type[p->i_type]));
p_es->fmt.subs.teletext.i_magazine = p->i_magazine;
p_es->fmt.subs.teletext.i_page = p->i_page;
......
......@@ -780,7 +780,7 @@ static int DemuxRecVideo( demux_t *p_demux, ty_rec_hdr_t *rec_hdr, block_t *p_bl
continue;
es_format_Init( &fmt, SPU_ES, fcc[i] );
fmt.psz_description = strdup( gettext(ppsz_description[i]) );
fmt.psz_description = strdup( vlc_gettext(ppsz_description[i]) );
fmt.i_group = TY_ES_GROUP;
p_sys->p_cc[i] = es_out_Add( p_demux->out, &fmt );
es_format_Clean( &fmt );
......
......@@ -86,7 +86,7 @@ struct intf_sys_t
#define THEMIM MainInputManager::getInstance( p_intf )
#define qfu( i ) QString::fromUtf8( i )
#define qtr( i ) QString::fromUtf8( gettext(i) )
#define qtr( i ) QString::fromUtf8( vlc_gettext(i) )
#define qtu( i ) ((i).toUtf8().constData())
#define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
......
......@@ -187,7 +187,7 @@ static input_item_t * CreateInputItemFromShoutItem( services_discovery_t *p_sd,
int i;
/* Create the item */
input_item_t *p_input = input_item_New( p_sd, p_item->psz_url,
gettext(p_item->psz_name) );
vlc_gettext(p_item->psz_name) );
/* Copy options */
for( i = 0; p_item->ppsz_options[i] != NULL; i++ )
......
......@@ -162,9 +162,9 @@ static int Open (vlc_object_t *obj)
* No cut&paste nor drag&drop, only Window Manager communication. */
/* Plain ASCII localization of VLC for ICCCM window name */
set_ascii_prop (conn, window, XA_WM_NAME,
pgettext ("ASCII VLC media player", "VLC media player"));
vlc_pgettext ("ASCII VLC media player", "VLC media player"));
set_ascii_prop (conn, window, XA_WM_ICON_NAME,
pgettext ("ASCII VLC", "VLC"));
vlc_pgettext ("ASCII VLC", "VLC"));
xcb_change_property (conn, XCB_PROP_MODE_REPLACE, window, XA_WM_CLASS,
XA_STRING, 8, 8, "vlc\0Vlc");
set_hostname_prop (conn, window);
......
......@@ -375,7 +375,7 @@ config_Write (FILE *file, const char *type, const char *desc,
if (desc == NULL)
desc = "?";
if (fprintf (file, "# %s (%s)\n%s%s=", desc, gettext (type),
if (fprintf (file, "# %s (%s)\n%s%s=", desc, vlc_gettext (type),
comment ? "#" : "", name) < 0)
return -1;
......
......@@ -93,7 +93,7 @@
When compiling libc, the _ macro is predefined. */
#ifdef HAVE_LIBINTL_H
#include <libintl.h>
#define _(msgid) gettext (msgid)
#define _(msgid) vlc_gettext (msgid)
#else
#define _(msgid) (msgid)
#endif
......
......@@ -192,7 +192,6 @@ int vlc_wclosedir( void *_p_dir )
}
#ifdef ENABLE_NLS
# undef gettext
# include <libintl.h>
#endif
......
......@@ -1206,7 +1206,7 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
for( i = 0; ppsz_all_keys[i]; i++ )
{
input_Control( p_input, INPUT_ADD_INFO, psz_cat,
gettext(ppsz_all_keys[i]),
vlc_gettext(ppsz_all_keys[i]),
vlc_dictionary_value_for_key( &p_meta->extra_tags,
ppsz_all_keys[i] ) );
free( ppsz_all_keys[i] );
......@@ -2759,7 +2759,7 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t *
if( psz_value )
input_Control( p_input, INPUT_ADD_INFO, psz_cat,
gettext(psz_key), gettext(psz_value) );
vlc_gettext(psz_key), vlc_gettext(psz_value) );
free( psz_key );
}
free( ppsz_all_keys );
......
......@@ -67,7 +67,6 @@
#endif
#ifdef ENABLE_NLS
# undef gettext
# include <libintl.h> /* bindtextdomain */
#endif
......
......@@ -29,7 +29,6 @@
#include <stdarg.h>
#ifdef ENABLE_NLS
# undef gettext
# include <libintl.h>
#endif
......
......@@ -2038,7 +2038,7 @@ static void DeinterlaceEnable( vout_thread_t *p_vout )
for( int i = 0; p_deinterlace_mode[i].psz_mode; i++ )
{
val.psz_string = (char*)p_deinterlace_mode[i].psz_mode;
text.psz_string = (char*)gettext(p_deinterlace_mode[i].psz_description);
text.psz_string = (char*)vlc_gettext(p_deinterlace_mode[i].psz_description);
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
}
var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
......
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