X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fvideo.c;h=61ba1af6129779a2a2734baad23f02999ed70d10;hb=688f0a8d8913f20ac5d3e27bf4f2bbe35c9f5de7;hp=8db50d25a0419bbabdfc5a9b13d1383486bd8ebd;hpb=bf1292e44390c6469483cea3817d6c2a3dbd811c;p=vlc

diff --git a/src/control/video.c b/src/control/video.c
index 8db50d25a0..61ba1af612 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -32,8 +32,7 @@
 #include <vlc_vout.h>
 
 /*
- * Remember to release the returned vout_thread_t since it is locked at
- * the end of this function.
+ * Remember to release the returned vout_thread_t.
  */
 static vout_thread_t *GetVout( libvlc_media_player_t *p_mi,
                                libvlc_exception_t *p_exception )
@@ -43,7 +42,7 @@ static vout_thread_t *GetVout( libvlc_media_player_t *p_mi,
 
     if( p_input_thread )
     {
-        p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+        p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
         if( !p_vout )
         {
             libvlc_exception_raise( p_exception, "No active video output" );
@@ -61,68 +60,47 @@ void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen,
                             libvlc_exception_t *p_e )
 {
     /* We only work on the first vout */
-    vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
-    vlc_value_t val; int i_ret;
+    vout_thread_t *p_vout = GetVout( p_mi, p_e );
 
     /* GetVout will raise the exception for us */
-    if( !p_vout1 )
-    {
-        return;
-    }
+    if( !p_vout ) return;
 
-    if( b_fullscreen ) val.b_bool = VLC_TRUE;
-    else               val.b_bool = VLC_FALSE;
+    var_SetBool( p_vout, "fullscreen", b_fullscreen );
 
-    i_ret = var_Set( p_vout1, "fullscreen", val );
-    if( i_ret )
-        libvlc_exception_raise( p_e,
-                        "Unexpected error while setting fullscreen value" );
-
-    vlc_object_release( p_vout1 );
+    vlc_object_release( p_vout );
 }
 
 int libvlc_get_fullscreen( libvlc_media_player_t *p_mi,
                             libvlc_exception_t *p_e )
 {
     /* We only work on the first vout */
-    vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
-    vlc_value_t val; int i_ret;
+    vout_thread_t *p_vout = GetVout( p_mi, p_e );
+    int i_ret;
 
     /* GetVout will raise the exception for us */
-    if( !p_vout1 )
-        return 0;
+    if( !p_vout ) return 0;
 
-    i_ret = var_Get( p_vout1, "fullscreen", &val );
-    if( i_ret )
-        libvlc_exception_raise( p_e,
-                        "Unexpected error while looking up fullscreen value" );
+    i_ret = var_GetBool( p_vout, "fullscreen" );
+
+    vlc_object_release( p_vout );
 
-    return val.b_bool == VLC_TRUE ? 1 : 0;
+    return i_ret;
 }
 
 void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi,
                                libvlc_exception_t *p_e )
 {
     /* We only work on the first vout */
-    vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
-    vlc_value_t val; int i_ret;
+    vout_thread_t *p_vout = GetVout( p_mi, p_e );
+    bool ret;
 
     /* GetVout will raise the exception for us */
-    if( !p_vout1 )
-        return;
+    if( !p_vout ) return;
 
-    i_ret = var_Get( p_vout1, "fullscreen", &val );
-    if( i_ret )
-        libvlc_exception_raise( p_e,
-                        "Unexpected error while looking up fullscreen value" );
-
-    val.b_bool = !val.b_bool;
-    i_ret = var_Set( p_vout1, "fullscreen", val );
-    if( i_ret )
-        libvlc_exception_raise( p_e,
-                        "Unexpected error while setting fullscreen value" );
+    ret = var_GetBool( p_vout, "fullscreen" );
+    var_SetBool( p_vout, "fullscreen", !ret );
 
-    vlc_object_release( p_vout1 );
+    vlc_object_release( p_vout );
 }
 
 void
@@ -133,10 +111,7 @@ libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, char *psz_filepath,
     input_thread_t *p_input_thread;
 
     /* GetVout will raise the exception for us */
-    if( !p_vout )
-    {
-        return;
-    }
+    if( !p_vout ) return;
 
     if( !psz_filepath )
     {
@@ -164,32 +139,38 @@ libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, char *psz_filepath,
 int libvlc_video_get_height( libvlc_media_player_t *p_mi,
                              libvlc_exception_t *p_e )
 {
-    vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
-    if( !p_vout1 )
-        return 0;
+    int height;
 
-    vlc_object_release( p_vout1 );
+    vout_thread_t *p_vout = GetVout( p_mi, p_e );
+    if( !p_vout ) return 0;
+
+    height = p_vout->i_window_height;
+
+    vlc_object_release( p_vout );
 
-    return p_vout1->i_window_height;
+    return height;
 }
 
 int libvlc_video_get_width( libvlc_media_player_t *p_mi,
                             libvlc_exception_t *p_e )
 {
-    vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
-    if( !p_vout1 )
-        return 0;
+    int width;
 
-    vlc_object_release( p_vout1 );
+    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 );
 
-    return p_vout1->i_window_width;
+    return width;
 }
 
 int libvlc_media_player_has_vout( libvlc_media_player_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;
+    bool has_vout = false;
 
     if( p_input_thread )
     {
@@ -198,7 +179,7 @@ int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
         p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
         if( p_vout )
         {
-            has_vout = VLC_TRUE;
+            has_vout = true;
             vlc_object_release( p_vout );
         }
         vlc_object_release( p_input_thread );
@@ -250,29 +231,22 @@ void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi,
 
 /* global video settings */
 
+/* Deprecated use libvlc_media_player_set_drawable() */
 void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d,
                               libvlc_exception_t *p_e )
 {
     /* set as default for future vout instances */
     var_SetInteger(p_instance->p_libvlc_int, "drawable", (int)d);
 
-    if( libvlc_playlist_isplaying(p_instance, p_e) )
+    libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
+    if( p_mi )
     {
-        libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
-        if( p_mi )
-        {
-            vout_thread_t *p_vout = GetVout( p_mi, p_e );
-            if( p_vout )
-            {
-                /* tell running vout to re-parent */
-                vout_Control( p_vout , VOUT_REPARENT, d);
-                vlc_object_release( p_vout );
-            }
-            libvlc_media_player_release(p_mi);
-        }
+        libvlc_media_player_set_drawable( p_mi, d, p_e );
+        libvlc_media_player_release(p_mi);
     }
 }
 
+/* Deprecated use libvlc_media_player_get_drawable() */
 libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
 {
     VLC_UNUSED(p_e);
@@ -292,20 +266,17 @@ void libvlc_video_set_size( libvlc_instance_t *p_instance, int width, int height
     config_PutInt(p_instance->p_libvlc_int, "width", width);
     config_PutInt(p_instance->p_libvlc_int, "height", height);
 
-    if( libvlc_playlist_isplaying(p_instance, p_e) )
+    libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
+    if( p_mi )
     {
-        libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
-        if( p_mi )
+        vout_thread_t *p_vout = GetVout( p_mi, p_e );
+        if( p_vout )
         {
-            vout_thread_t *p_vout = GetVout( p_mi, p_e );
-            if( p_vout )
-            {
-                /* tell running vout to re-size */
-                vout_Control( p_vout , VOUT_SET_SIZE, width, height);
-                vlc_object_release( p_vout );
-            }
-            libvlc_media_player_release(p_mi);
+            /* tell running vout to re-size */
+            vout_Control( p_vout , VOUT_SET_SIZE, width, height);
+            vlc_object_release( p_vout );
         }
+        libvlc_media_player_release(p_mi);
     }
 }
 
@@ -313,13 +284,14 @@ void libvlc_video_set_viewport( libvlc_instance_t *p_instance,
                             const libvlc_rectangle_t *view, const libvlc_rectangle_t *clip,
                            libvlc_exception_t *p_e )
 {
-    if( NULL == view )
+    if( !view )
     {
         libvlc_exception_raise( p_e, "viewport is NULL" );
+        return;
     }
 
     /* if clip is NULL, then use view rectangle as clip */
-    if( NULL == clip )
+    if( !clip )
         clip = view;
 
     /* set as default for future vout instances */
@@ -332,22 +304,19 @@ void libvlc_video_set_viewport( libvlc_instance_t *p_instance,
     var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-bottom", clip->bottom );
     var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-right", clip->right );
 
-    if( libvlc_playlist_isplaying(p_instance, p_e) )
+    libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
+    if( p_mi )
     {
-        libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
-        if( p_mi )
+        vout_thread_t *p_vout = GetVout( p_mi, p_e );
+        if( p_vout )
         {
-            vout_thread_t *p_vout = GetVout( p_mi, p_e );
-            if( p_vout )
-            {
-                /* change viewport for running vout */
-                vout_Control( p_vout , VOUT_SET_VIEWPORT,
-                                   view->top, view->left, view->bottom, view->right,
-                                   clip->top, clip->left, clip->bottom, clip->right );
-                vlc_object_release( p_vout );
-            }
-            libvlc_media_player_release(p_mi);
+            /* change viewport for running vout */
+            vout_Control( p_vout , VOUT_SET_VIEWPORT,
+                               view->top, view->left, view->bottom, view->right,
+                               clip->top, clip->left, clip->bottom, clip->right );
+            vlc_object_release( p_vout );
         }
+        libvlc_media_player_release(p_mi);
     }
 }
 
@@ -357,8 +326,7 @@ char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi,
     char *psz_aspect = 0;
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
 
-    if( !p_vout )
-        return 0;
+    if( !p_vout ) return 0;
 
     psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" );
     vlc_object_release( p_vout );
@@ -371,8 +339,7 @@ void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi,
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
     int i_ret = -1;
 
-    if( !p_vout )
-        return;
+    if( !p_vout ) return;
 
     i_ret = var_SetString( p_vout, "aspect-ratio", psz_aspect );
     if( i_ret )
@@ -392,8 +359,7 @@ int libvlc_video_get_spu( libvlc_media_player_t *p_mi,
     int i_ret = -1;
     int i;
 
-    if( !p_input_thread )
-        return -1;
+    if( !p_input_thread ) return -1;
 
     i_ret = var_Get( p_input_thread, "spu-es", &val );
     if( i_ret < 0 )
@@ -425,14 +391,13 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu,
     int i_ret = -1;
     int i;
 
-    if( !p_input_thread )
-        return;
+    if( !p_input_thread ) return;
 
     var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
     for( i = 0; i < val_list.p_list->i_count; i++ )
     {
         vlc_value_t val = val_list.p_list->p_values[i];
-        if( i_spu == i )
+        if( i_spu == val.i_int )
         {
             vlc_value_t new_val;
 
@@ -450,14 +415,29 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu,
     vlc_object_release( p_input_thread );
 }
 
+int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
+                                    char *psz_subtitle,
+                                    libvlc_exception_t *p_e )
+{
+    input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
+    bool b_ret = false;
+
+    if( p_input_thread )
+    {
+        if( input_AddSubtitles( p_input_thread, psz_subtitle, true ) )
+            b_ret = true;
+        vlc_object_release( p_input_thread );
+    }
+    return b_ret;
+}
+
 char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi,
                                    libvlc_exception_t *p_e )
 {
     char *psz_geometry = 0;
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
 
-    if( !p_vout )
-        return 0;
+    if( !p_vout ) return 0;
 
     psz_geometry = var_GetNonEmptyString( p_vout, "crop" );
     vlc_object_release( p_vout );
@@ -470,8 +450,7 @@ void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
     int i_ret = -1;
 
-    if( !p_vout )
-        return;
+    if( !p_vout ) return;
 
     i_ret = var_SetString( p_vout, "crop", psz_geometry );
     if( i_ret )
@@ -488,8 +467,7 @@ int libvlc_video_get_teletext( libvlc_media_player_t *p_mi,
     vlc_object_t *p_vbi;
     int i_ret = -1;
 
-    if( !p_vout )
-        return i_ret;
+    if( !p_vout ) return i_ret;
 
     p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi",
                                                    FIND_ANYWHERE );
@@ -510,8 +488,7 @@ void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page,
     vlc_object_t *p_vbi;
     int i_ret = -1;
 
-    if( !p_vout )
-        return;
+    if( !p_vout ) return;
 
     p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi",
                                                    FIND_ANYWHERE );
@@ -531,19 +508,13 @@ void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
 {
     /* We only work on the first vout */
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    vlc_value_t val; int i_ret;
+    bool opaque; int i_ret;
 
     /* GetVout will raise the exception for us */
-    if( !p_vout )
-        return;
+    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 );
+    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 value" );
@@ -557,7 +528,7 @@ int libvlc_video_destroy( libvlc_media_player_t *p_mi,
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
     vlc_object_detach( p_vout );
     vlc_object_release( p_vout );
-    vout_Destroy( p_vout );
+    vlc_object_release( p_vout );
 
     return 0;
 }