X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fvideo.c;h=aac2c653ab92194e14330c853da6754f6eb082d7;hb=7e30f80eed086fafd1583b4e852a550ecc118d32;hp=3cec0029642087fcbc525eb067387fb15bc3a2fc;hpb=da87f0fe504c5c4126b6bed5f7c660ddf42d4a54;p=vlc

diff --git a/src/control/video.c b/src/control/video.c
index 3cec002964..aac2c653ab 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -44,22 +44,41 @@
 /*
  * Remember to release the returned vout_thread_t.
  */
-static vout_thread_t *GetVout( libvlc_media_player_t *p_mi,
-                               libvlc_exception_t *p_exception )
+static vout_thread_t **GetVouts( libvlc_media_player_t *p_mi, size_t *n )
 {
-    input_thread_t *p_input = libvlc_get_input_thread( p_mi, p_exception );
-    vout_thread_t *p_vout = NULL;
+    input_thread_t *p_input = libvlc_get_input_thread( p_mi );
+    if( !p_input )
+        return NULL;
 
-    if( p_input )
+    vout_thread_t **pp_vouts;
+    if (input_Control( p_input, INPUT_GET_VOUTS, &pp_vouts, n))
     {
-        p_vout = input_GetVout( p_input );
-        if( !p_vout )
-        {
-            libvlc_exception_raise( p_exception );
-            libvlc_printerr( "No active video output" );
-        }
-        vlc_object_release( p_input );
+        *n = 0;
+        pp_vouts = NULL;
     }
+    vlc_object_release (p_input);
+    return pp_vouts;
+}
+
+static vout_thread_t *GetVout (libvlc_media_player_t *mp, size_t num)
+{
+    vout_thread_t *p_vout = NULL;
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (mp, &n);
+    if (pp_vouts == NULL)
+        goto err;
+
+    if (num < n)
+        p_vout = pp_vouts[num];
+
+    for (size_t i = 0; i < n; i++)
+        if (i != num)
+            vlc_object_release (pp_vouts[i]);
+    free (pp_vouts);
+
+    if (p_vout == NULL)
+err:
+        libvlc_printerr ("Video output not active");
     return p_vout;
 }
 
@@ -67,218 +86,202 @@ static vout_thread_t *GetVout( libvlc_media_player_t *p_mi,
  * Exported functions
  **********************************************************************/
 
-void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen,
-                            libvlc_exception_t *p_e )
+void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen )
 {
-    /* We only work on the first vout */
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-
-    /* GetVout will raise the exception for us */
-    if( !p_vout ) return;
+    /* This will work even if the video is not currently active */
+    var_SetBool (p_mi, "fullscreen", !!b_fullscreen);
 
-    var_SetBool( p_vout, "fullscreen", b_fullscreen );
-
-    vlc_object_release( p_vout );
+    /* Apply to current video outputs (if any) */
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
+    for (size_t i = 0; i < n; i++)
+    {
+        var_SetBool (pp_vouts[i], "fullscreen", b_fullscreen);
+        vlc_object_release (pp_vouts[i]);
+    }
+    free (pp_vouts);
 }
 
-int libvlc_get_fullscreen( libvlc_media_player_t *p_mi,
-                            libvlc_exception_t *p_e )
+int libvlc_get_fullscreen( libvlc_media_player_t *p_mi )
 {
-    /* We only work on the first vout */
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    int i_ret;
-
-    /* GetVout will raise the exception for us */
-    if( !p_vout ) return 0;
-
-    i_ret = var_GetBool( p_vout, "fullscreen" );
-
-    vlc_object_release( p_vout );
-
-    return i_ret;
+    return var_GetBool (p_mi, "fullscreen");
 }
 
-void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi,
-                               libvlc_exception_t *p_e )
+void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi )
 {
-    /* We only work on the first vout */
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-
-    /* GetVout will raise the exception for us */
-    if( !p_vout ) return;
+    bool b_fullscreen = var_ToggleBool (p_mi, "fullscreen");
 
-    var_ToggleBool( p_vout, "fullscreen" );
+    /* Apply to current video outputs (if any) */
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
+    for (size_t i = 0; i < n; i++)
+    {
+        vout_thread_t *p_vout = pp_vouts[i];
 
-    vlc_object_release( p_vout );
+        var_SetBool (p_vout, "fullscreen", b_fullscreen);
+        vlc_object_release (p_vout);
+    }
+    free (pp_vouts);
 }
 
 void libvlc_video_set_key_input( libvlc_media_player_t *p_mi, unsigned on )
 {
-    p_mi->keyboard_events = !!on;
+    var_SetBool (p_mi, "keyboard-events", !!on);
 }
 
 void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned on )
 {
-    p_mi->mouse_events = !!on;
+    var_SetBool (p_mi, "mouse-events", !!on);
 }
 
-void
-libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, const char *psz_filepath,
-        unsigned int i_width, unsigned int i_height, libvlc_exception_t *p_e )
+int
+libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, unsigned num,
+                            const char *psz_filepath,
+                            unsigned int i_width, unsigned int i_height )
 {
-    vout_thread_t *p_vout;
-
     assert( psz_filepath );
 
-    /* We must have an input */
-    if( !p_mi->p_input_thread )
-    {
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Input does not exist" );
-        return;
-    }
-
-    /* GetVout will raise the exception for us */
-    p_vout = GetVout( p_mi, p_e );
-    if( !p_vout ) return;
+    vout_thread_t *p_vout = GetVout (p_mi, num);
+    if (p_vout == NULL)
+        return -1;
 
-    var_SetInteger( p_vout, "snapshot-width", i_width );
+    /* FIXME: This is not atomic. Someone else could change the values,
+     * at least in theory. */
+    var_SetInteger( p_vout, "snapshot-width", i_width);
     var_SetInteger( p_vout, "snapshot-height", i_height );
-
     var_SetString( p_vout, "snapshot-path", psz_filepath );
     var_SetString( p_vout, "snapshot-format", "png" );
-
-    var_TriggerCallback( p_vout, "video-snapshot" );
-    vlc_object_release( p_vout );
+    var_TriggerCallback (p_vout, "video-snapshot" );
+    return 0;
 }
 
-int libvlc_video_get_height( libvlc_media_player_t *p_mi,
-                             libvlc_exception_t *p_e )
+int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
+                           unsigned *restrict px, unsigned *restrict py )
 {
-    int height;
-
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    if( !p_vout ) return 0;
+    vout_thread_t *p_vout = GetVout (p_mi, num);
+    if (p_vout == NULL)
+        return -1;
 
-    height = p_vout->i_window_height;
+    *px = p_vout->i_window_height;
+    *py = p_vout->i_window_width;
+    vlc_object_release (p_vout);
+    return 0;
+}
 
-    vlc_object_release( p_vout );
+int libvlc_video_get_height( libvlc_media_player_t *p_mi )
+{
+    unsigned height, width;
 
+    if (libvlc_video_get_size (p_mi, 0, &height, &width))
+        return 0;
     return height;
 }
 
-int libvlc_video_get_width( libvlc_media_player_t *p_mi,
-                            libvlc_exception_t *p_e )
+int libvlc_video_get_width( libvlc_media_player_t *p_mi )
 {
-    int width;
-
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    if( !p_vout ) return 0;
-
-    width = p_vout->i_window_width;
-
-    vlc_object_release( p_vout );
+    unsigned height, width;
 
+    if (libvlc_video_get_size (p_mi, 0, &height, &width))
+        return 0;
     return width;
 }
 
-int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
-                                     libvlc_exception_t *p_e )
+int libvlc_video_get_cursor( libvlc_media_player_t *mp, unsigned num,
+                             int *restrict px, int *restrict py )
 {
-    input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi, p_e);
-    bool has_vout = false;
-
-    if( p_input_thread )
-    {
-        vout_thread_t *p_vout;
+    vout_thread_t *p_vout = GetVout (mp, num);
+    if (p_vout == NULL)
+        return -1;
 
-        p_vout = input_GetVout( p_input_thread );
-        if( p_vout )
-        {
-            has_vout = true;
-            vlc_object_release( p_vout );
-        }
-        vlc_object_release( p_input_thread );
-    }
-    return has_vout;
+    var_GetCoords (p_vout, "mouse-moved", px, py);
+    vlc_object_release (p_vout);
+    return 0;
 }
 
-float libvlc_video_get_scale( libvlc_media_player_t *p_mp,
-                              libvlc_exception_t *p_e )
+unsigned libvlc_media_player_has_vout( libvlc_media_player_t *p_mi )
 {
-    vout_thread_t *p_vout = GetVout( p_mp, p_e );
-    if( !p_vout )
-        return 0.;
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
+    for (size_t i = 0; i < n; i++)
+        vlc_object_release (pp_vouts[i]);
+    free (pp_vouts);
+    return n;
+}
 
-    float f_scale = var_GetFloat( p_vout, "scale" );
-    if( var_GetBool( p_vout, "autoscale" ) )
+float libvlc_video_get_scale( libvlc_media_player_t *mp )
+{
+    float f_scale = var_GetFloat (mp, "scale");
+    if (var_GetBool (mp, "autoscale"))
         f_scale = 0.;
-    vlc_object_release( p_vout );
     return f_scale;
 }
 
-void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale,
-                             libvlc_exception_t *p_e )
+void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale )
 {
-    vout_thread_t *p_vout = GetVout( p_mp, p_e );
-    if( !p_vout )
-        return;
+    if (f_scale != 0.)
+        var_SetFloat (p_mp, "scale", f_scale);
+    var_SetBool (p_mp, "autoscale", f_scale != 0.);
 
-    if( f_scale != 0. )
-        var_SetFloat( p_vout, "scale", f_scale );
-    var_SetBool( p_vout, "autoscale", f_scale != 0. );
-    vlc_object_release( p_vout );
+    /* Apply to current video outputs (if any) */
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (p_mp, &n);
+    for (size_t i = 0; i < n; i++)
+    {
+        vout_thread_t *p_vout = pp_vouts[i];
+
+        if (f_scale != 0.)
+            var_SetFloat (p_vout, "scale", f_scale);
+        var_SetBool (p_mp, "autoscale", f_scale != 0.);
+        vlc_object_release (p_vout);
+    }
+    free (pp_vouts);
 }
 
-char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi,
-                                     libvlc_exception_t *p_e )
+char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi )
 {
-    char *psz_aspect = NULL;
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-
-    if( !p_vout ) return NULL;
-
-    psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" );
-    vlc_object_release( p_vout );
-    return psz_aspect ? psz_aspect : strdup("");
+    return var_GetNonEmptyString (p_mi, "aspect-ratio");
 }
 
 void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi,
-                                    const char *psz_aspect, libvlc_exception_t *p_e )
+                                    const char *psz_aspect )
 {
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    int i_ret = -1;
+    if (psz_aspect == NULL)
+        psz_aspect = "";
+    var_SetString (p_mi, "aspect-ratio", psz_aspect);
 
-    if( !p_vout ) return;
-
-    i_ret = var_SetString( p_vout, "aspect-ratio", psz_aspect );
-    vlc_object_release( p_vout );
-    if( i_ret )
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
+    for (size_t i = 0; i < n; i++)
     {
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Bad or unsupported aspect ratio" );
+        vout_thread_t *p_vout = pp_vouts[i];
+
+        var_SetString (p_vout, "aspect-ratio", psz_aspect);
+        vlc_object_release (p_vout);
     }
+    free (pp_vouts);
 }
 
-int libvlc_video_get_spu( libvlc_media_player_t *p_mi,
-                          libvlc_exception_t *p_e )
+int libvlc_video_get_spu( libvlc_media_player_t *p_mi )
 {
-    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
     vlc_value_t val_list;
     vlc_value_t val;
     int i_spu = -1;
     int i_ret = -1;
     int i;
 
-    if( !p_input_thread ) return -1;
+    if( !p_input_thread )
+    {
+        libvlc_printerr( "No active input" );
+        return -1;
+    }
 
     i_ret = var_Get( p_input_thread, "spu-es", &val );
     if( i_ret < 0 )
     {
         vlc_object_release( p_input_thread );
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "Subtitle informations not found" );
-        return i_ret;
+        return -1;
     }
 
     var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
@@ -295,66 +298,55 @@ int libvlc_video_get_spu( libvlc_media_player_t *p_mi,
     return i_spu;
 }
 
-int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi,
-                                libvlc_exception_t *p_e )
+int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi )
 {
-    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
     int i_spu_count;
 
     if( !p_input_thread )
-        return -1;
+        return 0;
 
     i_spu_count = var_CountChoices( p_input_thread, "spu-es" );
-
     vlc_object_release( p_input_thread );
     return i_spu_count;
 }
 
 libvlc_track_description_t *
-        libvlc_video_get_spu_description( libvlc_media_player_t *p_mi,
-                                          libvlc_exception_t *p_e )
+        libvlc_video_get_spu_description( libvlc_media_player_t *p_mi )
 {
-    return libvlc_get_track_description( p_mi, "spu-es", p_e);
+    return libvlc_get_track_description( p_mi, "spu-es" );
 }
 
-void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu,
-                           libvlc_exception_t *p_e )
+int libvlc_video_set_spu( libvlc_media_player_t *p_mi, unsigned i_spu )
 {
-    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
-    vlc_value_t val_list;
-    vlc_value_t newval;
-    int i_ret = -1;
+    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
+    vlc_value_t list;
+    int i_ret = 0;
 
-    if( !p_input_thread ) return;
+    if( !p_input_thread )
+        return -1;
 
-    var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
+    var_Change (p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &list, NULL);
 
-    if( ( val_list.p_list->i_count == 0 )
-     || (i_spu < 0) || (i_spu > val_list.p_list->i_count) )
+    if (i_spu > (unsigned)list.p_list->i_count)
     {
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Subtitle number out of range" );
+        libvlc_printerr( "Subtitle number out of range (%u/%u)",
+                         i_spu, list.p_list->i_count );
+        i_ret = -1;
         goto end;
     }
-
-    newval = val_list.p_list->p_values[i_spu];
-    i_ret = var_Set( p_input_thread, "spu-es", newval );
-    if( i_ret < 0 )
-    {
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Subtitle selection error" );
-    }
-
+    var_SetInteger (p_input_thread, "spu-es",
+                    list.p_list->p_values[i_spu].i_int);
 end:
-    var_FreeList( &val_list, NULL );
-    vlc_object_release( p_input_thread );
+    vlc_object_release (p_input_thread);
+    var_FreeList (&list, NULL);
+    return i_ret;
 }
 
 int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
-                                    const char *psz_subtitle,
-                                    libvlc_exception_t *p_e )
+                                    const char *psz_subtitle )
 {
-    input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+    input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
     bool b_ret = false;
 
     if( p_input_thread )
@@ -367,59 +359,83 @@ int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
 }
 
 libvlc_track_description_t *
-        libvlc_video_get_title_description( libvlc_media_player_t *p_mi,
-                                            libvlc_exception_t * p_e )
+        libvlc_video_get_title_description( libvlc_media_player_t *p_mi )
 {
-    return libvlc_get_track_description( p_mi, "title", p_e);
+    return libvlc_get_track_description( p_mi, "title" );
 }
 
 libvlc_track_description_t *
         libvlc_video_get_chapter_description( libvlc_media_player_t *p_mi,
-                                              int i_title,
-                                              libvlc_exception_t *p_e )
+                                              int i_title )
 {
     char psz_title[12];
     sprintf( psz_title,  "title %2i", i_title );
-    return libvlc_get_track_description( p_mi, psz_title, p_e);
+    return libvlc_get_track_description( p_mi, psz_title );
 }
 
-char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi,
-                                   libvlc_exception_t *p_e )
+char *libvlc_video_get_crop_geometry (libvlc_media_player_t *p_mi)
 {
-    char *psz_geometry = 0;
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
+    return var_GetNonEmptyString (p_mi, "crop");
+}
 
-    if( !p_vout ) return 0;
+void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
+                                     const char *psz_geometry )
+{
+    if (psz_geometry == NULL)
+        psz_geometry = "";
+
+    var_SetString (p_mi, "crop", psz_geometry);
+
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
+
+    for (size_t i = 0; i < n; i++)
+    {
+        vout_thread_t *p_vout = pp_vouts[i];
 
-    psz_geometry = var_GetNonEmptyString( p_vout, "crop" );
-    vlc_object_release( p_vout );
-    return psz_geometry ? psz_geometry : strdup("");
+        var_SetString (p_vout, "crop", psz_geometry);
+        vlc_object_release (p_vout);
+    }
+    free (pp_vouts);
 }
 
-void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
-                                     const char *psz_geometry, libvlc_exception_t *p_e )
+int libvlc_video_get_teletext( libvlc_media_player_t *p_mi )
 {
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    int i_ret = -1;
+    return var_GetInteger (p_mi, "vbi-page");
+}
 
-    if( !p_vout ) return;
+void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page )
+{
+    input_thread_t *p_input_thread;
+    vlc_object_t *p_zvbi = NULL;
+    int telx;
+
+    var_SetInteger (p_mi, "vbi-page", i_page);
 
-    i_ret = var_SetString( p_vout, "crop", psz_geometry );
-    vlc_object_release( p_vout );
+    p_input_thread = libvlc_get_input_thread( p_mi );
+    if( !p_input_thread ) return;
+
+    if( var_CountChoices( p_input_thread, "teletext-es" ) <= 0 )
+    {
+        vlc_object_release( p_input_thread );
+        return;
+    }
 
-    if( i_ret )
+    telx = var_GetInteger( p_input_thread, "teletext-es" );
+    if( input_GetEsObjects( p_input_thread, telx, &p_zvbi, NULL, NULL )
+        == VLC_SUCCESS )
     {
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Bad or unsupported cropping geometry" );
+        var_SetInteger( p_zvbi, "vbi-page", i_page );
+        vlc_object_release( p_zvbi );
     }
+    vlc_object_release( p_input_thread );
 }
 
-void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
-                             libvlc_exception_t *p_e )
+void libvlc_toggle_teletext( libvlc_media_player_t *p_mi )
 {
     input_thread_t *p_input_thread;
 
-    p_input_thread = libvlc_get_input_thread(p_mi, p_e);
+    p_input_thread = libvlc_get_input_thread(p_mi);
     if( !p_input_thread ) return;
 
     if( var_CountChoices( p_input_thread, "teletext-es" ) <= 0 )
@@ -446,10 +462,9 @@ void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
     vlc_object_release( p_input_thread );
 }
 
-int libvlc_video_get_track_count( libvlc_media_player_t *p_mi,
-                                  libvlc_exception_t *p_e )
+int libvlc_video_get_track_count( libvlc_media_player_t *p_mi )
 {
-    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
     int i_track_count;
 
     if( !p_input_thread )
@@ -462,36 +477,30 @@ int libvlc_video_get_track_count( libvlc_media_player_t *p_mi,
 }
 
 libvlc_track_description_t *
-        libvlc_video_get_track_description( libvlc_media_player_t *p_mi,
-                                            libvlc_exception_t *p_e )
+        libvlc_video_get_track_description( libvlc_media_player_t *p_mi )
 {
-    return libvlc_get_track_description( p_mi, "video-es", p_e);
+    return libvlc_get_track_description( p_mi, "video-es" );
 }
 
-int libvlc_video_get_track( libvlc_media_player_t *p_mi,
-                            libvlc_exception_t *p_e )
+int libvlc_video_get_track( libvlc_media_player_t *p_mi )
 {
-    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
     vlc_value_t val_list;
     vlc_value_t val;
     int i_track = -1;
-    int i_ret = -1;
-    int i;
 
     if( !p_input_thread )
         return -1;
 
-    i_ret = var_Get( p_input_thread, "video-es", &val );
-    if( i_ret < 0 )
+    if( var_Get( p_input_thread, "video-es", &val ) < 0 )
     {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "Video track information not found" );
         vlc_object_release( p_input_thread );
-        return i_ret;
+        return -1;
     }
 
     var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
-    for( i = 0; i < val_list.p_list->i_count; i++ )
+    for( int i = 0; i < val_list.p_list->i_count; i++ )
     {
         if( val_list.p_list->p_values[i].i_int == val.i_int )
         {
@@ -504,116 +513,114 @@ int libvlc_video_get_track( libvlc_media_player_t *p_mi,
     return i_track;
 }
 
-void libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track,
-                             libvlc_exception_t *p_e )
+int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track )
 {
-    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+    input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
     vlc_value_t val_list;
     int i_ret = -1;
-    int i;
 
     if( !p_input_thread )
-        return;
+        return -1;
 
     var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
-    for( i = 0; i < val_list.p_list->i_count; i++ )
+    for( int i = 0; i < val_list.p_list->i_count; i++ )
     {
         if( i_track == val_list.p_list->p_values[i].i_int )
         {
-            i_ret = var_SetInteger( p_input_thread, "video-es", i_track );
-            if( i_ret < 0 )
+            if( var_SetInteger( p_input_thread, "video-es", i_track ) < 0 )
                 break;
+            i_ret = 0;
             goto end;
         }
     }
-    libvlc_exception_raise( p_e );
     libvlc_printerr( "Video track number out of range" );
 end:
     var_FreeList( &val_list, NULL );
     vlc_object_release( p_input_thread );
+    return i_ret;
 }
 
 /******************************************************************************
  * libvlc_video_set_deinterlace : enable deinterlace
  *****************************************************************************/
-void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi, int b_enable,
-                                   const char *psz_mode,
-                                   libvlc_exception_t *p_e )
-{
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-
-    if( !p_vout )
+void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
+                                   const char *psz_mode )
+{
+    if (psz_mode == NULL)
+        psz_mode = "";
+    if (*psz_mode
+     && strcmp (psz_mode, "blend")   && strcmp (psz_mode, "bob")
+     && strcmp (psz_mode, "discard") && strcmp (psz_mode, "linear")
+     && strcmp (psz_mode, "mean")    && strcmp (psz_mode, "x")
+     && strcmp (psz_mode, "yadif")   && strcmp (psz_mode, "yadif2x"))
         return;
 
-    if( b_enable )
+    if (*psz_mode)
     {
-        /* be sure that the filter name given is supported */
-        if( !strcmp(psz_mode, "blend")   || !strcmp(psz_mode, "bob")
-         || !strcmp(psz_mode, "discard") || !strcmp(psz_mode, "linear")
-         || !strcmp(psz_mode, "mean")    || !strcmp(psz_mode, "x")
-         || !strcmp(psz_mode, "yadif")   || !strcmp(psz_mode, "yadif2x") )
-        {
-            /* set deinterlace filter chosen */
-            var_SetString( p_vout, "deinterlace-mode", psz_mode );
-            var_SetInteger( p_vout, "deinterlace", 1 );
-        }
-        else
-        {
-            libvlc_exception_raise( p_e );
-            libvlc_printerr( "Bad or unsupported deinterlacing mode" );
-        }
+        var_SetString (p_mi, "deinterlace-mode", psz_mode);
+        var_SetInteger (p_mi, "deinterlace", 1);
     }
     else
+        var_SetInteger (p_mi, "deinterlace", 0);
+
+    size_t n;
+    vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
+    for (size_t i = 0; i < n; i++)
     {
-        /* disable deinterlace filter */
-        var_SetInteger( p_vout, "deinterlace", 0 );
-    }
+        vout_thread_t *p_vout = pp_vouts[i];
 
-    vlc_object_release( p_vout );
+        if (*psz_mode)
+        {
+            var_SetString (p_vout, "deinterlace-mode", psz_mode);
+            var_SetInteger (p_vout, "deinterlace", 1);
+        }
+        else
+            var_SetInteger (p_vout, "deinterlace", 0);
+        vlc_object_release (p_vout);
+    }
+    free (pp_vouts);
 }
 
-
 /* ************** */
 /* module helpers */
 /* ************** */
 
 
 static vlc_object_t *get_object( libvlc_media_player_t * p_mi,
-                                 const char *name, libvlc_exception_t *p_e )
+                                 const char *name )
 {
-    vlc_object_t *object = NULL;
-    vout_thread_t  *vout = GetVout( p_mi, p_e );
-    libvlc_exception_clear( p_e );
+    vlc_object_t *object;
+    vout_thread_t *vout = GetVout( p_mi, 0 );
+
     if( vout )
     {
         object = vlc_object_find_name( vout, name, FIND_CHILD );
         vlc_object_release(vout);
     }
+    else
+        object = NULL;
+
     if( !object )
-    {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "%s not enabled", name );
-    }
     return object;
 }
 
 
 typedef const struct {
-    const char name[20]; /* probably will become a const char * sometime */
-    unsigned type; 
+    const char name[20];
+    unsigned type;
 } opt_t;
 
 
 static void
-set_int( libvlc_media_player_t *p_mi, const char *name,
-         const opt_t *opt, int value, libvlc_exception_t *p_e )
+set_int( libvlc_media_player_t *p_mi, const char *restrict name,
+         const opt_t *restrict opt, int value )
 {
     if( !opt ) return;
 
     if( !opt->type ) /* the enabler */
     {
-        vout_thread_t *vout = GetVout( p_mi, p_e );
-        libvlc_exception_clear( p_e );
+        vout_thread_t *vout = GetVout( p_mi, 0 );
         if (vout)
         {
             vout_EnableFilter( vout, opt->name, value, false );
@@ -622,108 +629,88 @@ set_int( libvlc_media_player_t *p_mi, const char *name,
         return;
     }
 
-    vlc_object_t *object = get_object( p_mi, name, p_e );
-    if( !object ) return;
+    if( opt->type != VLC_VAR_INTEGER )
+    {
+        libvlc_printerr( "Invalid argument to %s in %s", name, "set int" );
+        return;
+    }
 
-    switch( opt->type )
+    var_SetInteger(p_mi, opt->name, value);
+    vlc_object_t *object = get_object( p_mi, name );
+    if( object )
     {
-    case VLC_VAR_INTEGER:
         var_SetInteger(object, opt->name, value);
-        break;
-    default:
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Invalid argument for %s in %s", name, "set int" );
-        break;
+        vlc_object_release( object );
     }
-    vlc_object_release( object );
 }
 
 
 static int
-get_int( libvlc_media_player_t *p_mi, const char *name,
-        const opt_t *opt, libvlc_exception_t *p_e )
+get_int( libvlc_media_player_t *p_mi, const char *restrict name,
+         const opt_t *restrict opt )
 {
     if( !opt ) return 0;
 
-    vlc_object_t *object = get_object( p_mi, name, p_e );
-    if( !object ) return 0;
-
-    int ret;
     switch( opt->type )
     {
-    case 0: /* the enabler */
-        ret = NULL != object;
-        break;
+        case 0: /* the enabler */
+        {
+            vlc_object_t *object = get_object( p_mi, name );
+            vlc_object_release( object );
+            return object != NULL;
+        }
     case VLC_VAR_INTEGER:
-        ret = var_GetInteger(object, opt->name);
-        break;
+        return var_GetInteger(p_mi, opt->name);
     default:
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Invalid argument for %s in %s", name, "get int" );
-        ret = 0;
-        break;
+        libvlc_printerr( "Invalid argument to %s in %s", name, "get int" );
+        return 0;
     }
-    vlc_object_release( object );
-    return ret;
 }
 
 
 static void
-set_string( libvlc_media_player_t *p_mi, const char *name, const opt_t *opt,
-            const char *psz_value, libvlc_exception_t *p_e )
+set_string( libvlc_media_player_t *p_mi, const char *restrict name,
+            const opt_t *restrict opt, const char *restrict psz_value )
 {
     if( !opt ) return;
-    vlc_object_t *object = get_object( p_mi, name, p_e );
-    if( !object ) return;
 
-    switch( opt->type )
+    if( opt->type != VLC_VAR_STRING )
     {
-    case VLC_VAR_STRING:
-        var_SetString( object, opt->name, psz_value );
-        break;
-    default:
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Invalid argument for %s in %s", name, "set string" );
-        break;
+        libvlc_printerr( "Invalid argument to %s in %s", name, "set string" );
+        return;
+    }
+
+    var_SetString( p_mi, opt->name, psz_value );
+
+    vlc_object_t *object = get_object( p_mi, name );
+    if( object )
+    {
+        var_SetString(object, opt->name, psz_value );
+        vlc_object_release( object );
     }
-    vlc_object_release( object );
 }
 
 
 static char *
-get_string( libvlc_media_player_t *p_mi, const char *name,
-            const opt_t *opt, libvlc_exception_t *p_e )
+get_string( libvlc_media_player_t *p_mi, const char *restrict name,
+            const opt_t *restrict opt )
 {
     if( !opt ) return NULL;
-    vlc_object_t *object = get_object( p_mi, name, p_e );
-    if( !object ) return NULL;
 
-    char *ret;
-    switch( opt->type )
+    if( opt->type != VLC_VAR_STRING )
     {
-    case VLC_VAR_STRING:
-        ret = var_GetString( object, opt->name );
-        break;
-    default:
-        libvlc_exception_raise( p_e );
-        libvlc_printerr( "Invalid argument for %s in %s", name, "get string" );
-        ret = NULL;
-        break;
+        libvlc_printerr( "Invalid argument to %s in %s", name, "get string" );
+        return NULL;
     }
-    vlc_object_release( object );
-    return ret;
-}
 
+    return var_GetString( p_mi, opt->name );
+}
 
-/*****************************************************************************
- * Marquee: FIXME: That implementation has no persistent state and requires
- * a vout
- *****************************************************************************/
 
 static const opt_t *
-marq_option_bynumber(unsigned option, libvlc_exception_t *p_e)
+marq_option_bynumber(unsigned option)
 {
-    opt_t optlist[] =
+    static const opt_t optlist[] =
     {
         { "marq",          0 },
         { "marq-marquee",  VLC_VAR_STRING },
@@ -740,50 +727,46 @@ marq_option_bynumber(unsigned option, libvlc_exception_t *p_e)
 
     opt_t *r = option < num_opts ? optlist+option : NULL;
     if( !r )
-    {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "Unknown marquee option" );
-    }
     return r;
 }
 
-static vlc_object_t *get_object( libvlc_media_player_t *,
-                                 const char *, libvlc_exception_t *);
+static vlc_object_t *get_object( libvlc_media_player_t *, const char *);
 
 /*****************************************************************************
  * libvlc_video_get_marquee_int : get a marq option value
  *****************************************************************************/
 int libvlc_video_get_marquee_int( libvlc_media_player_t *p_mi,
-                                  unsigned option, libvlc_exception_t *p_e )
+                                  unsigned option )
 {
-    return get_int( p_mi, "marq", marq_option_bynumber(option,p_e), p_e );
+    return get_int( p_mi, "marq", marq_option_bynumber(option) );
 }
 
 /*****************************************************************************
  * libvlc_video_get_marquee_string : get a marq option value
  *****************************************************************************/
 char * libvlc_video_get_marquee_string( libvlc_media_player_t *p_mi,
-                                    unsigned option, libvlc_exception_t *p_e )
+                                        unsigned option )
 {
-    return get_string( p_mi, "marq", marq_option_bynumber(option,p_e), p_e );
+    return get_string( p_mi, "marq", marq_option_bynumber(option) );
 }
 
 /*****************************************************************************
  * libvlc_video_set_marquee_int: enable, disable or set an int option
  *****************************************************************************/
 void libvlc_video_set_marquee_int( libvlc_media_player_t *p_mi,
-                         unsigned option, int value, libvlc_exception_t *p_e )
+                         unsigned option, int value )
 {
-    set_int( p_mi, "marq", marq_option_bynumber(option,p_e), value, p_e );
+    set_int( p_mi, "marq", marq_option_bynumber(option), value );
 }
 
 /*****************************************************************************
  * libvlc_video_set_marquee_string: set a string option
  *****************************************************************************/
 void libvlc_video_set_marquee_string( libvlc_media_player_t *p_mi,
-                unsigned option, const char * value, libvlc_exception_t *p_e )
+                unsigned option, const char * value )
 {
-    set_string( p_mi, "marq", marq_option_bynumber(option,p_e), value, p_e );
+    set_string( p_mi, "marq", marq_option_bynumber(option), value );
 }
 
 
@@ -791,9 +774,10 @@ void libvlc_video_set_marquee_string( libvlc_media_player_t *p_mi,
 
 
 static opt_t *
-logo_option_bynumber( unsigned option, libvlc_exception_t *p_e )
+logo_option_bynumber( unsigned option )
 {
-    opt_t vlogo_optlist[] = /* depends on libvlc_video_logo_option_t */
+    static const opt_t vlogo_optlist[] =
+    /* depends on libvlc_video_logo_option_t */
     {
         { "logo",          0 },
         { "logo-file",     VLC_VAR_STRING },
@@ -808,34 +792,29 @@ logo_option_bynumber( unsigned option, libvlc_exception_t *p_e )
 
     opt_t *r = option < num_vlogo_opts ? vlogo_optlist+option : NULL;
     if( !r )
-    {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "Unknown logo option" );
-    }
     return r;
 }
 
 
 void libvlc_video_set_logo_string( libvlc_media_player_t *p_mi,
-                                   unsigned option, const char *psz_value,
-                                   libvlc_exception_t *p_e )
+                                   unsigned option, const char *psz_value )
 {
-    set_string( p_mi,"logo",logo_option_bynumber(option,p_e),psz_value,p_e );
+    set_string( p_mi,"logo",logo_option_bynumber(option),psz_value );
 }
 
 
 void libvlc_video_set_logo_int( libvlc_media_player_t *p_mi,
-                                unsigned option, int value,
-                                libvlc_exception_t *p_e )
+                                unsigned option, int value )
 {
-    set_int( p_mi, "logo", logo_option_bynumber(option, p_e), value, p_e );
+    set_int( p_mi, "logo", logo_option_bynumber(option), value );
 }
 
 
 int libvlc_video_get_logo_int( libvlc_media_player_t *p_mi,
-                               unsigned option, libvlc_exception_t *p_e )
+                               unsigned option )
 {
-    return get_int( p_mi, "logo", logo_option_bynumber(option,p_e), p_e );
+    return get_int( p_mi, "logo", logo_option_bynumber(option) );
 }