[vlc-devel] commit: Fix regression in libvlc_video_set_teletext(). (Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Mon Sep 29 12:56:21 2008 +0200| [96abd1a0729cbeb800ceb6dd43106f19ee8ce7b1] | committer: Jean-Paul Saman 

Fix regression in libvlc_video_set_teletext().

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96abd1a0729cbeb800ceb6dd43106f19ee8ce7b1
---

 src/control/video.c |   66 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/control/video.c b/src/control/video.c
index 90697f5..c4a3e83 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -486,7 +486,7 @@ void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page,
 {
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
     vlc_object_t *p_vbi;
-    int i_ret;
+    int i_ret = -1;
 
     if( !p_vout ) return;
 
@@ -506,20 +506,62 @@ void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page,
 void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
                              libvlc_exception_t *p_e )
 {
-    /* We only work on the first vout */
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    bool opaque; int i_ret;
+    input_thread_t *p_input_thread;
+    vlc_object_t *p_vbi;
+    int i_ret;
 
-    /* GetVout will raise the exception for us */
-    if( !p_vout ) return;
+    p_input_thread = libvlc_get_input_thread(p_mi, p_e);
+    if( !p_input_thread ) return;
 
-    opaque = var_GetBool( p_vout, "vbi-opaque" );
-    i_ret = var_SetBool( p_vout, "vbi-opaque", !opaque );
-    if( i_ret )
-        libvlc_exception_raise( p_e,
-                        "Unexpected error while setting teletext transparency" );
+    p_vbi = (vlc_object_t *) vlc_object_find_name( p_input_thread, "zvbi",
+                                                   FIND_ANYWHERE );
+    if( p_vbi )
+    {
+        const int i_teletext_es = var_GetInteger( p_input_thread, "teletext-es" );
+        const int i_spu_es = var_GetInteger( p_input_thread, "spu-es" );
 
-    vlc_object_release( p_vout );
+        if( (i_teletext_es >= 0) && (i_teletext_es == i_spu_es) )
+        {
+            int i_page = 100;
+
+            i_page = var_GetInteger( p_vbi, "vbi-page" );
+            i_page = (i_teletext_es >= 0) ? i_page : 0;
+
+            i_ret = var_SetInteger( p_vbi, "vbi-page", i_page );
+            if( i_ret )
+                libvlc_exception_raise( p_e,
+                                "Unexpected error while setting teletext page" );
+        }
+        else if( i_teletext_es >= 0 )
+        {
+            bool opaque = true;
+
+            opaque = var_GetBool( p_vbi, "vbi-opaque" );
+            i_ret = var_SetBool( p_vbi, "vbi-opaque", !opaque );
+            if( i_ret )
+                libvlc_exception_raise( p_e,
+                                "Unexpected error while setting teletext transparency" );
+        }
+        vlc_object_release( p_vbi );
+    }
+    else
+    {
+        /* Teletext is not enabled yet, so enable it.
+         * Only after it is enable it is possible to view teletext pages
+         */
+        const int i_teletext_es = var_GetInteger( p_input_thread, "teletext-es" );
+
+        if( i_teletext_es >= 0 )
+        {
+            const int i_spu_es = var_GetInteger( p_input_thread, "spu-es" );
+
+            if( i_teletext_es == i_spu_es )
+                var_SetInteger( p_input_thread, "spu-es", -1 );
+            else
+                var_SetInteger( p_input_thread, "spu-es", i_teletext_es );
+        }
+    }
+    vlc_object_release( p_input_thread );
 }
 
 int libvlc_video_destroy( libvlc_media_player_t *p_mi,