x264: do not make it harder for translators

[vlc] / modules / codec / zvbi.c

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 346f747c74aff78faa0e9fd527ef312fca8b1847..3b02ae9c0ec75d34ba84fd694daf2162ac6f1d52 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -47,7 +47,6 @@
 #include <libzvbi.h>
 
 #include <vlc_codec.h>
-#include <vlc_osd.h>
 
 /*****************************************************************************
  * Module descriptor.
@@ -59,7 +58,7 @@ static void Close( vlc_object_t * );
 #define PAGE_LONGTEXT N_("Open the indicated Teletext page." \
         "Default page is index 100")
 
-#define OPAQUE_TEXT N_("Text is always opaque")
+#define OPAQUE_TEXT N_("Teletext transparency")
 #define OPAQUE_LONGTEXT N_("Setting vbi-opaque to false " \
         "makes the boxed text transparent." )
 
@@ -86,13 +85,13 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_SCODEC )
     set_callbacks( Open, Close )
 
-    add_integer( "vbi-page", 100, NULL,
+    add_integer( "vbi-page", 100,
                  PAGE_TEXT, PAGE_LONGTEXT, false )
-    add_bool( "vbi-opaque", true, NULL,
+    add_bool( "vbi-opaque", true,
                  OPAQUE_TEXT, OPAQUE_LONGTEXT, false )
-    add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
-    add_bool( "vbi-text", false, NULL,
+    add_integer( "vbi-position", 4, POS_TEXT, POS_LONGTEXT, false )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions );
+    add_bool( "vbi-text", false,
               TELX_TEXT, TELX_LONGTEXT, false )
 vlc_module_end ()
 
@@ -206,10 +205,9 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
 
     p_dec->pf_decode_sub = Decode;
-    p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
+    p_sys = p_dec->p_sys = calloc( 1, sizeof(decoder_sys_t) );
     if( p_sys == NULL )
         return VLC_ENOMEM;
-    memset( p_sys, 0, sizeof(decoder_sys_t) );
 
     p_sys->i_key[0] = p_sys->i_key[1] = p_sys->i_key[2] = '*' - '0';
     p_sys->b_update = false;
@@ -246,8 +244,7 @@ static int Open( vlc_object_t *p_this )
 
     /* Create the var on vlc_global. */
     p_sys->i_wanted_page = var_CreateGetInteger( p_dec, "vbi-page" );
-    var_AddCallback( p_dec, "vbi-page",
-                     RequestPage, p_sys );
+    var_AddCallback( p_dec, "vbi-page", RequestPage, p_sys );
 
     /* Check if the Teletext track has a known "initial page". */
     if( p_sys->i_wanted_page == 100 && p_dec->fmt_in.subs.teletext.i_magazine != -1 )
@@ -322,7 +319,6 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
     vbi_page        p_page;
     const uint8_t   *p_pos;
     unsigned int    i_left;
-    int64_t         i_pts = 0;
 
     if( (pp_block == NULL) || (*pp_block == NULL) )
         return NULL;
@@ -337,6 +333,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
     {
         vbi_sliced      p_sliced[MAX_SLICES];
         unsigned int    i_lines = 0;
+        int64_t         i_pts;
 
         i_lines = vbi_dvb_demux_cor( p_sys->p_dvb_demux, p_sliced,
                                      MAX_SLICES, &i_pts, &p_pos, &i_left );
@@ -363,7 +360,6 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
     if( i_wanted_page == p_sys->i_last_page && !p_sys->b_update )
         goto error;
 
-    i_pts = i_pts ? i_pts : p_block->i_pts;
     if( !b_cached )
     {
         if( p_sys->i_last_page != i_wanted_page )
@@ -371,7 +367,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
             /* We need to reset the subtitle */
             p_spu = Subpicture( p_dec, &fmt, true,
                                 p_page.columns, p_page.rows,
-                                i_align, i_pts );
+                                i_align, p_block->i_pts );
             if( !p_spu )
                 goto error;
             p_spu->p_region->psz_text = strdup("");
@@ -393,7 +389,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
     /* Create the subpicture unit */
     p_spu = Subpicture( p_dec, &fmt, p_sys->b_text,
                         p_page.columns, p_page.rows,
-                        i_align, i_pts );
+                        i_align, p_block->i_pts );
     if( !p_spu )
         goto error;
 
@@ -458,7 +454,7 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
 
     /* If there is a page or sub to render, then we do that here */
     /* Create the subpicture unit */
-    p_spu = decoder_NewSubpicture( p_dec );
+    p_spu = decoder_NewSubpicture( p_dec, NULL );
     if( !p_spu )
     {
         msg_Warn( p_dec, "can't get spu buffer" );
@@ -670,7 +666,7 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
     decoder_t *p_dec = p_data;
     decoder_sys_t *p_sys = p_dec->p_sys;
 
-    VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
+    VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED( p_this );
 
     /* FIXME: Capture + and - key for subpage browsing */
     if( newval.i_int == '-' || newval.i_int == '+' )
@@ -686,7 +682,8 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
         if ( !vbi_bcd_digits_greater( p_sys->i_wanted_subpage, 0x00 ) || vbi_bcd_digits_greater( p_sys->i_wanted_subpage, 0x99 ) )
                 p_sys->i_wanted_subpage = VBI_ANY_SUBNO;
         else
-            vout_OSDMessage( p_this, DEFAULT_CHAN, "%s: %d", _("Subpage"), vbi_bcd2dec( p_sys->i_wanted_subpage) );
+            msg_Info( p_dec, "subpage: %d",
+                      vbi_bcd2dec( p_sys->i_wanted_subpage) );
 
         p_sys->b_update = true;
         vlc_mutex_unlock( &p_sys->lock );
@@ -700,7 +697,8 @@ static int EventKey( vlc_object_t *p_this, char const *psz_cmd,
     p_sys->i_key[0] = p_sys->i_key[1];
     p_sys->i_key[1] = p_sys->i_key[2];
     p_sys->i_key[2] = (int)(newval.i_int - '0');
-    vout_OSDMessage( p_this, DEFAULT_CHAN, "%s: %c%c%c", _("Page"), (char)(p_sys->i_key[0]+'0'), (char)(p_sys->i_key[1]+'0'), (char)(p_sys->i_key[2]+'0') );
+    msg_Info( p_dec, "page: %c%c%c", (char)(p_sys->i_key[0]+'0'),
+              (char)(p_sys->i_key[1]+'0'), (char)(p_sys->i_key[2]+'0') );
 
     int i_new_page = 0;