implemented the display device selector.

[vlc] / src / control / video.c

diff --git a/src/control/video.c b/src/control/video.c
index ebdd6df1316363bd17306b916b64afbda1268068..d9e95cfa054d9bcc48f411adc3a047ad05137b3d 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -3,7 +3,7 @@
  *****************************************************************************
  * Copyright (C) 2005 the VideoLAN team
  *
- * $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
+ * $Id$
  *
  * Authors: Cl�ent Stenac <zorglub@videolan.org>
  *          Filippo Carone <littlejohn@videolan.org>
@@ -25,12 +25,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "libvlc_internal.h"
+
 #include <vlc/libvlc.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>
 
-#include "libvlc_internal.h"
-
 /*
  * Remember to release the returned vout_thread_t since it is locked at
  * the end of this function.
@@ -147,10 +147,8 @@ libvlc_video_take_snapshot( libvlc_media_instance_t *p_mi, char *psz_filepath,
     var_SetInteger( p_vout, "snapshot-width", i_width );
     var_SetInteger( p_vout, "snapshot-height", i_height );
 
-    p_input_thread = (input_thread_t*)vlc_object_get(
-                                 p_mi->p_libvlc_instance->p_libvlc_int,
-                                 p_mi->i_input_id );
-    if( !p_input_thread )
+    p_input_thread = p_mi->p_input_thread;
+    if( !p_mi->p_input_thread )
     {
         libvlc_exception_raise( p_e, "Input does not exist" );
         return;
@@ -161,7 +159,6 @@ libvlc_video_take_snapshot( libvlc_media_instance_t *p_mi, char *psz_filepath,
 
     vout_Control( p_vout, VOUT_SNAPSHOT );
     vlc_object_release( p_vout );
-    vlc_object_release( p_input_thread );
 }
 
 int libvlc_video_get_height( libvlc_media_instance_t *p_mi,
@@ -188,8 +185,8 @@ int libvlc_video_get_width( libvlc_media_instance_t *p_mi,
     return p_vout1->i_window_width;
 }
 
-vlc_bool_t libvlc_media_instance_has_vout( libvlc_media_instance_t *p_mi,
-                                  libvlc_exception_t *p_e )
+int libvlc_media_instance_has_vout( libvlc_media_instance_t *p_mi,
+                                     libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi, p_e);
     vlc_bool_t has_vout = VLC_FALSE;
@@ -278,6 +275,8 @@ void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d
 
 libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
 {
+    VLC_UNUSED(p_e);
+
     libvlc_drawable_t result;
  
     result = var_GetInteger( p_instance->p_libvlc_int, "drawable" );
@@ -496,7 +495,7 @@ int libvlc_video_get_teletext( libvlc_media_instance_t *p_mi,
                                                    FIND_ANYWHERE );
     if( p_vbi )
     {
-        i_ret = var_GetInteger( p_vout, "vbi-page" );
+        i_ret = var_GetInteger( p_vbi, "vbi-page" );
         vlc_object_release( p_vbi );
     }
 
@@ -527,6 +526,31 @@ void libvlc_video_set_teletext( libvlc_media_instance_t *p_mi, int i_page,
     vlc_object_release( p_vout );
 }
 
+void libvlc_toggle_teletext( libvlc_media_instance_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 );
+    vlc_value_t val; int i_ret;
+
+    /* GetVout will raise the exception for us */
+    if( !p_vout )
+        return;
+
+    i_ret = var_Get( p_vout, "vbi-opaque", &val );
+    if( i_ret )
+        libvlc_exception_raise( p_e,
+                        "Unexpected error while looking up teletext value" );
+
+    val.b_bool = !val.b_bool;
+    i_ret = var_Set( p_vout, "vbi-opaque", val );
+    if( i_ret )
+        libvlc_exception_raise( p_e,
+                        "Unexpected error while setting teletext value" );
+
+    vlc_object_release( p_vout );
+}
+
 int libvlc_video_destroy( libvlc_media_instance_t *p_mi,
                           libvlc_exception_t *p_e )
 {