Use gettext() as per gettext standard for non-constant parameters

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 208fd0728182d0bd4b27437dc2f8871990c0bdb5..5ad70ad6d2777a030ce108d80d904e5afa5d4d8a 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -288,7 +288,7 @@ static inline const char *config_CategoryNameGet( int i_value )
     {
         if( categories_array[i].i_id == i_value )
         {
-            return _(categories_array[i].psz_name);
+            return 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 _(categories_array[i].psz_help);
+            return gettext(categories_array[i].psz_help);
         }
         i++;
     }

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 5f4f8f7bf639155062619d0ceaa016c243f24bbb..efed861e7d727c2acf3fa95177b65ea4a00285a1 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -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( _(ppsz_teletext_type[1]) );
+        p_fmt->psz_description = strdup( 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(_(ppsz_teletext_type[p->i_type]));
+            p_es->fmt.psz_description = strdup(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;
 

diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index a4db231772801801dcbc191ec7e92cc3cbf732e1..68aa57f112bdc62681d9057ba0dffa3bea740321 100644 (file)
--- a/modules/demux/ty.c
+++ b/modules/demux/ty.c
@@ -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( _(ppsz_description[i]) );
+        fmt.psz_description = strdup( 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 );

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index e2f7ec5f51c94120348bd8289d58caba1fe11044..3510084bbb63317887b7d71984a66366fc706764 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -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( _(i) )
+#define qtr( i ) QString::fromUtf8( gettext(i) )
 #define qtu( i ) ((i).toUtf8().constData())
 
 #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )

diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c
index 7b7417b79ff30ce1e7e5f58f404d596a122166bd..8575370ef739ad7d1fdf2a3b49919714ba86bbb4 100644 (file)
--- a/modules/services_discovery/shout.c
+++ b/modules/services_discovery/shout.c
@@ -186,7 +186,8 @@ 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, _(p_item->psz_name) );
+    input_item_t *p_input = input_item_New( p_sd, p_item->psz_url,
+                                            gettext(p_item->psz_name) );
 
     /* Copy options */
     for( i = 0; p_item->ppsz_options[i] != NULL; i++ )

diff --git a/src/config/file.c b/src/config/file.c
index d6cc24e75a3f8db66c8da7978cfbf903e85f0c10..3f2c3557ca3d6d2d870c256fdf6167b0b442c5b3 100644 (file)
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -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, _(type),
+    if (fprintf (file, "# %s (%s)\n%s%s=", desc, gettext (type),
                  comment ? "#" : "", name) < 0)
         return -1;
 

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 0c8c1d902ea4bf241489dc737305fc3d0f8dceac..76555e87698fd074c677cf5e0c8c92595aa95cba 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1205,8 +1205,10 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
     char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags );
     for( i = 0; ppsz_all_keys[i]; i++ )
     {
-        input_Control( p_input, INPUT_ADD_INFO, psz_cat, _(ppsz_all_keys[i]),
-                       vlc_dictionary_value_for_key( &p_meta->extra_tags, ppsz_all_keys[i] ) );
+        input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+                       gettext(ppsz_all_keys[i]),
+                       vlc_dictionary_value_for_key( &p_meta->extra_tags,
+                       ppsz_all_keys[i] ) );
         free( ppsz_all_keys[i] );
     }
     free( ppsz_all_keys );
@@ -2756,7 +2758,8 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t *
             char *psz_value = vlc_dictionary_value_for_key( &p_meta->extra_tags, psz_key );
 
             if( psz_value )
-                input_Control( p_input, INPUT_ADD_INFO, psz_cat, _(psz_key), _(psz_value) );
+                input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+                               gettext(psz_key), gettext(psz_value) );
             free( psz_key );
         }
         free( ppsz_all_keys );

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 8dd1d601ef3d70cb6dda8c6c8a7ab466a003b698..02ba01048dd62ca39fdf1fa1ce8319ce8503e38a 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -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*)_(p_deinterlace_mode[i].psz_description);
+        text.psz_string = (char*)gettext(p_deinterlace_mode[i].psz_description);
         var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
     }
     var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );