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

git version control git at videolan.org
Sat Oct 4 14:39:41 CEST 2008


vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Sun Sep 28 19:25:54 2008 +0200| [efbb4154d04de74b0a9941c3ed043c3a54305bff] | committer: Jean-Paul Saman 

Fix bug in libvlc_video_set_teletext()
(cherry picked from commit 270e411db16224b26f348cf31b0d6c470c19ef27)

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

 src/control/video.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/control/video.c b/src/control/video.c
index 61ba1af..90697f5 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 = -1;
+    int i_ret;
 
     if( !p_vout ) return;
 
@@ -496,10 +496,10 @@ void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page,
     {
         i_ret = var_SetInteger( p_vbi, "vbi-page", i_page );
         vlc_object_release( p_vbi );
+        if( i_ret )
+            libvlc_exception_raise( p_e,
+                            "Unexpected error while setting teletext page" );
     }
-    if( i_ret )
-        libvlc_exception_raise( p_e,
-                        "Unexpected error while setting teletext page" );
     vlc_object_release( p_vout );
 }
 
@@ -517,7 +517,7 @@ void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
     i_ret = var_SetBool( p_vout, "vbi-opaque", !opaque );
     if( i_ret )
         libvlc_exception_raise( p_e,
-                        "Unexpected error while setting teletext value" );
+                        "Unexpected error while setting teletext transparency" );
 
     vlc_object_release( p_vout );
 }




More information about the vlc-devel mailing list