Changeset e67e5e4988eee2f83a0420b89debac5557caed43

Timestamp:

18/09/07 14:45:03 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1190119503 +0000

git-parent:

[fa6fe6ce21e31d2fcbb3f0e90280cf4f0b830e4b]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1190119503 +0000

Message:

Let user change position of Teletext subtitles.

Files:

• modules/codec/zvbi.c (modified) (13 diffs)

modules/codec/zvbi.c

@@ -45 +45 @@
-#include "vlc_bits.h"
-#include "vlc_codec.h"
+#include "vlc_image.h"
-
-typedef enum {
@@ -77 +78 @@
-#define OPAQUE_LONGTEXT N_("Setting vbi-opaque to false " \
-        "makes the boxed text transparent." )
+
+#define POS_TEXT N_("Teletext alignment")
+#define POS_LONGTEXT N_( \
+  "You can enforce the teletext position on the video " \
+  "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \
+  "also use combinations of these values, eg. 6 = top-right).")
+
+static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *ppsz_pos_descriptions[] =
+{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
+  N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
-
-vlc_module_begin();
@@ -90 +102 @@
-    add_bool( "vbi-opaque", VLC_TRUE, NULL,
-                 OPAQUE_TEXT, OPAQUE_LONGTEXT, VLC_FALSE );
+    add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
-vlc_module_end();
-
@@ -98 +112 @@
-struct decoder_sys_t
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-};
-
@@ -111 +128 @@
-static int Opaque( vlc_object_t *p_this, char const *psz_cmd,
-                   vlc_value_t oldval, vlc_value_t newval, void *p_data );
+static int Position( vlc_object_t *p_this, char const *psz_cmd,
+                     vlc_value_t oldval, vlc_value_t newval, void *p_data );
-
-/*****************************************************************************
@@ -160 +179 @@
-    p_sys->b_opaque = var_CreateGetBool( p_dec, "vbi-opaque" );
-    var_AddCallback( p_dec, "vbi-opaque", Opaque, p_sys );
+
+    p_sys->i_align = var_CreateGetInteger( p_dec, "vbi-position" );
+    var_AddCallback( p_dec, "vbi-position", Position, p_sys );
+
-    return VLC_SUCCESS;
-}
@@ -171 +194 @@
-    decoder_sys_t *p_sys = p_dec->p_sys;
-
-
-
-
-
+
+
-    free( p_sys );
-}
@@ -191 +212 @@
-    vlc_bool_t      b_cached = VLC_FALSE;
-    vbi_page        p_page;
-uint8_t      
+const uint8_t
-    unsigned int    i_left;
-
@@ -197 +218 @@
-    uint32_t        *p_begin, *p_end;
-    unsigned        int x = 0, y = 0;
-
+    
-    /* end part of kludge */
-
@@ -267 +288 @@
-    p_spu->p_region->i_x = 0;
-    p_spu->p_region->i_y = 0;
+    p_spu->p_region->i_align = SUBPICTURE_ALIGN_TOP;
-
-    /* Normal text subs, easy markup */
@@ -272 +294 @@
-
-    p_spu->i_start = p_block->i_pts;
-
+(mtime_t) 
-    p_spu->b_ephemer = VLC_TRUE;
-    p_spu->b_absolute = VLC_FALSE;
@@ -350 +372 @@
-}
-
-
+ 
-{
-    decoder_t *p_dec        = (decoder_t *)user_data;
@@ -399 +421 @@
-    return VLC_SUCCESS;
-}
+
+static int Position( vlc_object_t *p_this, char const *psz_cmd,
+                     vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    decoder_sys_t *p_sys = p_data;
+
+    if( p_sys )
+        p_sys->i_align = newval.i_int;
+    return VLC_SUCCESS;
+}