X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fvideo.c;h=8956c23b3bd03a7c1b5368ab3e6a3bd6051e2da5;hb=4678f5e8835c8212bf0826e4d287d9f4da5fbb82;hp=49783337e62f7f3970bea1b9202759bebe4defec;hpb=d5aaf6b2714a65b9fd25f1c34624ca551c0ce99d;p=vlc diff --git a/src/control/video.c b/src/control/video.c index 49783337e6..8956c23b3b 100644 --- a/src/control/video.c +++ b/src/control/video.c @@ -1,11 +1,11 @@ /***************************************************************************** * video.c: libvlc new API video functions ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2010 the VideoLAN team * * $Id$ * - * Authors: Cl�ent Stenac + * Authors: Clément Stenac * Filippo Carone * Jean-Paul Saman * Damien Fouilleul @@ -25,30 +25,60 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include "libvlc_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include +#include +#include + +#include #include #include +#include "media_player_internal.h" +#include +#include + /* * 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_thread = 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_thread ) + vout_thread_t **pp_vouts; + if (input_Control( p_input, INPUT_GET_VOUTS, &pp_vouts, n)) { - 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" ); - } - vlc_object_release( p_input_thread ); + *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; } @@ -56,489 +86,720 @@ 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; + return var_GetBool (p_mi, "fullscreen"); +} - /* GetVout will raise the exception for us */ - if( !p_vout ) - return 0; +void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi ) +{ + var_ToggleBool (p_mi, "fullscreen"); + bool b_fullscreen = var_GetBool (p_mi, "fullscreen"); - i_ret = var_GetBool( 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); +} - return i_ret; +void libvlc_video_set_key_input( libvlc_media_player_t *p_mi, unsigned on ) +{ + var_SetBool (p_mi, "keyboard-events", !!on); } -void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned on ) { - /* We only work on the first vout */ - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - bool ret; + var_SetBool (p_mi, "mouse-events", !!on); +} - /* GetVout will raise the exception for us */ - if( !p_vout ) return; +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 ) +{ + assert( psz_filepath ); - ret = var_GetBool( p_vout, "fullscreen" ); - var_SetBool( p_vout, "fullscreen", !ret ); + vout_thread_t *p_vout = GetVout (p_mi, num); + if (p_vout == NULL) + return -1; - vlc_object_release( p_vout ); + /* 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" ); + return 0; } -void -libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, char *psz_filepath, - unsigned int i_width, unsigned int i_height, libvlc_exception_t *p_e ) +int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num, + unsigned *restrict px, unsigned *restrict py ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - input_thread_t *p_input_thread; + vout_thread_t *p_vout = GetVout (p_mi, num); + if (p_vout == NULL) + return -1; - /* GetVout will raise the exception for us */ - if( !p_vout ) - { - return; - } + *px = p_vout->i_window_height; + *py = p_vout->i_window_width; + vlc_object_release (p_vout); + return 0; +} - if( !psz_filepath ) - { - libvlc_exception_raise( p_e, "filepath is null" ); - return; - } +int libvlc_video_get_height( libvlc_media_player_t *p_mi ) +{ + unsigned height, width; - var_SetInteger( p_vout, "snapshot-width", i_width ); - var_SetInteger( p_vout, "snapshot-height", i_height ); + if (libvlc_video_get_size (p_mi, 0, &height, &width)) + return 0; + return height; +} - p_input_thread = p_mi->p_input_thread; - if( !p_mi->p_input_thread ) - { - libvlc_exception_raise( p_e, "Input does not exist" ); - return; - } +int libvlc_video_get_width( libvlc_media_player_t *p_mi ) +{ + unsigned height, width; - var_SetString( p_vout, "snapshot-path", psz_filepath ); - var_SetString( p_vout, "snapshot-format", "png" ); + if (libvlc_video_get_size (p_mi, 0, &height, &width)) + return 0; + return width; +} - vout_Control( p_vout, VOUT_SNAPSHOT ); - vlc_object_release( p_vout ); +unsigned libvlc_media_player_has_vout( libvlc_media_player_t *p_mi ) +{ + 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; } -int libvlc_video_get_height( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +float libvlc_video_get_scale( libvlc_media_player_t *mp ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - if( !p_vout ) - return 0; + float f_scale = var_GetFloat (mp, "scale"); + if (var_GetBool (mp, "autoscale")) + f_scale = 0.; + return f_scale; +} - vlc_object_release( p_vout ); +void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale ) +{ + if (f_scale != 0.) + var_SetFloat (p_mp, "scale", f_scale); + var_SetBool (p_mp, "autoscale", f_scale != 0.); + + /* 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]; - return p_vout->i_window_height; + 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); } -int libvlc_video_get_width( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - if( !p_vout ) - return 0; + return var_GetNonEmptyString (p_mi, "aspect-ratio"); +} + +void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, + const char *psz_aspect ) +{ + if (psz_aspect == NULL) + psz_aspect = ""; + var_SetString (p_mi, "aspect-ratio", psz_aspect); - vlc_object_release( p_vout ); + 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]; - return p_vout->i_window_width; + var_SetString (p_vout, "aspect-ratio", psz_aspect); + vlc_object_release (p_vout); + } + free (pp_vouts); } -int libvlc_media_player_has_vout( 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); - bool has_vout = false; + 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 ) + if( !p_input_thread ) { - vout_thread_t *p_vout; + 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_printerr( "Subtitle informations not found" ); + return -1; + } - p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD ); - if( p_vout ) + var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL ); + for( i = 0; i < val_list.p_list->i_count; i++ ) + { + if( val.i_int == val_list.p_list->p_values[i].i_int ) { - has_vout = true; - vlc_object_release( p_vout ); + i_spu = i; + break; } - vlc_object_release( p_input_thread ); } - return has_vout; + var_FreeList( &val_list, NULL ); + vlc_object_release( p_input_thread ); + return i_spu; } -int libvlc_video_reparent( libvlc_media_player_t *p_mi, libvlc_drawable_t d, - libvlc_exception_t *p_e ) +int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); + input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); + int i_spu_count; - if( p_vout ) - { - vout_Control( p_vout , VOUT_REPARENT, d); - vlc_object_release( p_vout ); - } - return 0; + if( !p_input_thread ) + return 0; + + i_spu_count = var_CountChoices( p_input_thread, "spu-es" ); + vlc_object_release( p_input_thread ); + return i_spu_count; } -void libvlc_video_resize( libvlc_media_player_t *p_mi, int width, int height, libvlc_exception_t *p_e ) +libvlc_track_description_t * + libvlc_video_get_spu_description( libvlc_media_player_t *p_mi ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - if( p_vout ) - { - vout_Control( p_vout, VOUT_SET_SIZE, width, height ); - vlc_object_release( p_vout ); - } + return libvlc_get_track_description( p_mi, "spu-es" ); } -void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi, - const libvlc_rectangle_t *area, - libvlc_exception_t *p_e ) +int libvlc_video_set_spu( libvlc_media_player_t *p_mi, unsigned i_spu ) { - if( (NULL != area) - && ((area->bottom - area->top) > 0) - && ((area->right - area->left) > 0) ) + 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 -1; + + var_Change (p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &list, NULL); + + if (i_spu > (unsigned)list.p_list->i_count) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - if( p_vout ) - { - /* tell running vout to redraw area */ - vout_Control( p_vout , VOUT_REDRAW_RECT, - area->top, area->left, area->bottom, area->right ); - vlc_object_release( p_vout ); - } + libvlc_printerr( "Subtitle number out of range (%u/%u)", + i_spu, list.p_list->i_count ); + i_ret = -1; + goto end; } + var_SetInteger (p_input_thread, "spu-es", + list.p_list->p_values[i_spu].i_int); +end: + vlc_object_release (p_input_thread); + var_FreeList (&list, NULL); + return i_ret; } -/* global video settings */ - -void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d, - libvlc_exception_t *p_e ) +int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi, + const char *psz_subtitle ) { - /* set as default for future vout instances */ - var_SetInteger(p_instance->p_libvlc_int, "drawable", (int)d); + input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi ); + bool b_ret = false; - if( libvlc_playlist_isplaying(p_instance, p_e) ) + if( p_input_thread ) { - 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); - } + if( !input_AddSubtitle( p_input_thread, psz_subtitle, true ) ) + b_ret = true; + vlc_object_release( p_input_thread ); } + return b_ret; } -libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) +libvlc_track_description_t * + libvlc_video_get_title_description( libvlc_media_player_t *p_mi ) { - VLC_UNUSED(p_e); + return libvlc_get_track_description( p_mi, "title" ); +} - libvlc_drawable_t result; - - result = var_GetInteger( p_instance->p_libvlc_int, "drawable" ); - - return result; +libvlc_track_description_t * + libvlc_video_get_chapter_description( libvlc_media_player_t *p_mi, + int i_title ) +{ + char psz_title[12]; + sprintf( psz_title, "title %2i", i_title ); + return libvlc_get_track_description( p_mi, psz_title ); } +char *libvlc_video_get_crop_geometry (libvlc_media_player_t *p_mi) +{ + return var_GetNonEmptyString (p_mi, "crop"); +} -void libvlc_video_set_size( libvlc_instance_t *p_instance, int width, int height, - libvlc_exception_t *p_e ) +void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, + const char *psz_geometry ) { - /* set as default for future vout instances */ - config_PutInt(p_instance->p_libvlc_int, "width", width); - config_PutInt(p_instance->p_libvlc_int, "height", height); + if (psz_geometry == NULL) + psz_geometry = ""; + + var_SetString (p_mi, "crop", psz_geometry); - if( libvlc_playlist_isplaying(p_instance, p_e) ) + size_t n; + vout_thread_t **pp_vouts = GetVouts (p_mi, &n); + + for (size_t i = 0; i < n; i++) { - 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-size */ - vout_Control( p_vout , VOUT_SET_SIZE, width, height); - vlc_object_release( p_vout ); - } - libvlc_media_player_release(p_mi); - } + vout_thread_t *p_vout = pp_vouts[i]; + + var_SetString (p_vout, "crop", psz_geometry); + vlc_object_release (p_vout); } + free (pp_vouts); } -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 ) +void libvlc_toggle_teletext( libvlc_media_player_t *p_mi ) { - if( NULL == view ) + input_thread_t *p_input_thread; + + p_input_thread = libvlc_get_input_thread(p_mi); + if( !p_input_thread ) return; + + if( var_CountChoices( p_input_thread, "teletext-es" ) <= 0 ) { - libvlc_exception_raise( p_e, "viewport is NULL" ); + vlc_object_release( p_input_thread ); + return; } - - /* if clip is NULL, then use view rectangle as clip */ - if( NULL == clip ) - clip = view; - - /* set as default for future vout instances */ - var_SetInteger( p_instance->p_libvlc_int, "drawable-view-top", view->top ); - var_SetInteger( p_instance->p_libvlc_int, "drawable-view-left", view->left ); - var_SetInteger( p_instance->p_libvlc_int, "drawable-view-bottom", view->bottom ); - var_SetInteger( p_instance->p_libvlc_int, "drawable-view-right", view->right ); - var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-top", clip->top ); - var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-left", clip->left ); - 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) ) + const bool b_selected = var_GetInteger( p_input_thread, "teletext-es" ) >= 0; + if( b_selected ) { - libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e); - if( p_mi ) + var_SetInteger( p_input_thread, "spu-es", -1 ); + } + else + { + vlc_value_t list; + if( !var_Change( p_input_thread, "teletext-es", VLC_VAR_GETLIST, &list, NULL ) ) { - 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); + if( list.p_list->i_count > 0 ) + var_SetInteger( p_input_thread, "spu-es", list.p_list->p_values[0].i_int ); + + var_FreeList( &list, NULL ); } } + vlc_object_release( p_input_thread ); } -char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +int libvlc_video_get_track_count( libvlc_media_player_t *p_mi ) { - char *psz_aspect = 0; - vout_thread_t *p_vout = GetVout( p_mi, p_e ); + input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi ); + int i_track_count; - if( !p_vout ) return 0; + if( !p_input_thread ) + return -1; - psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" ); - vlc_object_release( p_vout ); - return psz_aspect ? psz_aspect : strdup(""); + i_track_count = var_CountChoices( p_input_thread, "video-es" ); + + vlc_object_release( p_input_thread ); + return i_track_count; } -void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, - char *psz_aspect, libvlc_exception_t *p_e ) +libvlc_track_description_t * + libvlc_video_get_track_description( libvlc_media_player_t *p_mi ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - int i_ret = -1; - - if( !p_vout ) return; - - i_ret = var_SetString( p_vout, "aspect-ratio", psz_aspect ); - if( i_ret ) - libvlc_exception_raise( p_e, - "Unexpected error while setting aspect-ratio value" ); - - vlc_object_release( p_vout ); + return libvlc_get_track_description( p_mi, "video-es" ); } -int libvlc_video_get_spu( 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_spu = -1; - int i_ret = -1; - int i; + int i_track = -1; - 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 ) + if( var_Get( p_input_thread, "video-es", &val ) < 0 ) { - libvlc_exception_raise( p_e, "Getting subtitle information failed" ); + libvlc_printerr( "Video track information not found" ); vlc_object_release( p_input_thread ); - return i_ret; + return -1; } - var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL ); - for( i = 0; i < val_list.p_list->i_count; i++ ) + var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL ); + for( int i = 0; i < val_list.p_list->i_count; i++ ) { - vlc_value_t spu_val = val_list.p_list->p_values[i]; - if( val.i_int == spu_val.i_int ) + if( val_list.p_list->p_values[i].i_int == val.i_int ) { - i_spu = i; + i_track = i; break; } } + var_FreeList( &val_list, NULL ); vlc_object_release( p_input_thread ); - return i_spu; + return i_track; } -void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu, - 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; + if( !p_input_thread ) + return -1; - var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL ); - for( i = 0; i < val_list.p_list->i_count; i++ ) + var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL ); + for( int 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_track == val_list.p_list->p_values[i].i_int ) { - vlc_value_t new_val; - - new_val.i_int = val.i_int; - i_ret = var_Set( p_input_thread, "spu-es", new_val ); - if( i_ret < 0 ) - { - libvlc_exception_raise( p_e, "Setting subtitle value failed" ); - } - vlc_object_release( p_input_thread ); - return; + if( var_SetInteger( p_input_thread, "video-es", i_track ) < 0 ) + break; + i_ret = 0; + goto end; } } - libvlc_exception_raise( p_e, "Subtitle value out of range" ); + libvlc_printerr( "Video track number out of range" ); +end: + var_FreeList( &val_list, NULL ); vlc_object_release( p_input_thread ); + return i_ret; } -int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi, - char *psz_subtitle, - libvlc_exception_t *p_e ) +/****************************************************************************** + * libvlc_video_set_deinterlace : enable deinterlace + *****************************************************************************/ +void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi, + const char *psz_mode ) { - input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); - bool b_ret = false; + 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( p_input_thread ) + if (*psz_mode) { - if( input_AddSubtitles( p_input_thread, psz_subtitle, true ) ) - b_ret = true; - vlc_object_release( p_input_thread ); + var_SetString (p_mi, "deinterlace-mode", psz_mode); + var_SetInteger (p_mi, "deinterlace", 1); } - return b_ret; + 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++) + { + vout_thread_t *p_vout = pp_vouts[i]; + + 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); } -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 ); +/* ************** */ +/* module helpers */ +/* ************** */ - if( !p_vout ) return 0; - psz_geometry = var_GetNonEmptyString( p_vout, "crop" ); - vlc_object_release( p_vout ); - return psz_geometry ? psz_geometry : strdup(""); +static vlc_object_t *get_object( libvlc_media_player_t * p_mi, + const char *name, libvlc_exception_t *p_e ) +{ + vlc_object_t *object = NULL; + vout_thread_t *vout = GetVout( p_mi, 0 ); + libvlc_exception_clear( p_e ); + if( vout ) + { + object = vlc_object_find_name( vout, name, FIND_CHILD ); + vlc_object_release(vout); + } + if( !object ) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "%s not enabled", name ); + } + return object; } -void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, - char *psz_geometry, libvlc_exception_t *p_e ) + +typedef const struct { + const char name[20]; /* probably will become a const char * sometime */ + 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 ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - int i_ret = -1; + if( !opt ) return; - if( !p_vout ) return; + if( !opt->type ) /* the enabler */ + { + vout_thread_t *vout = GetVout( p_mi, 0 ); + if (vout) + { + vout_EnableFilter( vout, opt->name, value, false ); + vlc_object_release( vout ); + } + return; + } - i_ret = var_SetString( p_vout, "crop", psz_geometry ); - if( i_ret ) - libvlc_exception_raise( p_e, - "Unexpected error while setting crop geometry" ); + vlc_object_t *object = get_object( p_mi, name, p_e ); + if( !object ) return; - vlc_object_release( p_vout ); + switch( opt->type ) + { + 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 ); } -int libvlc_video_get_teletext( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) + +static int +get_int( libvlc_media_player_t *p_mi, const char *name, + const opt_t *opt, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - vlc_object_t *p_vbi; - int i_ret = -1; + if( !opt ) return 0; - if( !p_vout ) return i_ret; + vlc_object_t *object = get_object( p_mi, name, p_e ); + if( !object ) return 0; - p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi", - FIND_ANYWHERE ); - if( p_vbi ) + int ret; + switch( opt->type ) { - i_ret = var_GetInteger( p_vbi, "vbi-page" ); - vlc_object_release( p_vbi ); + case 0: /* the enabler */ + ret = NULL != object; + break; + case VLC_VAR_INTEGER: + ret = var_GetInteger(object, opt->name); + break; + default: + libvlc_exception_raise( p_e ); + libvlc_printerr( "Invalid argument for %s in %s", name, "get int" ); + ret = 0; + break; } + vlc_object_release( object ); + return ret; +} - vlc_object_release( p_vout ); - return i_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 ) +{ + if( !opt ) return; + vlc_object_t *object = get_object( p_mi, name, p_e ); + if( !object ) return; + + switch( opt->type ) + { + 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; + } + vlc_object_release( object ); } -void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page, - libvlc_exception_t *p_e ) + +static char * +get_string( libvlc_media_player_t *p_mi, const char *name, + const opt_t *opt, libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - vlc_object_t *p_vbi; - int i_ret = -1; + if( !opt ) return NULL; + vlc_object_t *object = get_object( p_mi, name, p_e ); + if( !object ) return NULL; + + char *ret; + switch( opt->type ) + { + 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; + } + vlc_object_release( object ); + return ret; +} + - if( !p_vout ) return; +/***************************************************************************** + * Marquee: FIXME: That implementation has no persistent state and requires + * a vout + *****************************************************************************/ - p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi", - FIND_ANYWHERE ); - if( p_vbi ) +static const opt_t * +marq_option_bynumber(unsigned option, libvlc_exception_t *p_e) +{ + opt_t optlist[] = + { + { "marq", 0 }, + { "marq-marquee", VLC_VAR_STRING }, + { "marq-color", VLC_VAR_INTEGER }, + { "marq-opacity", VLC_VAR_INTEGER }, + { "marq-position", VLC_VAR_INTEGER }, + { "marq-refresh", VLC_VAR_INTEGER }, + { "marq-size", VLC_VAR_INTEGER }, + { "marq-timeout", VLC_VAR_INTEGER }, + { "marq-x", VLC_VAR_INTEGER }, + { "marq-y", VLC_VAR_INTEGER }, + }; + enum { num_opts = sizeof(optlist) / sizeof(*optlist) }; + + opt_t *r = option < num_opts ? optlist+option : NULL; + if( !r ) { - i_ret = var_SetInteger( p_vbi, "vbi-page", i_page ); - vlc_object_release( p_vbi ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Unknown marquee option" ); } - if( i_ret ) - libvlc_exception_raise( p_e, - "Unexpected error while setting teletext page" ); - vlc_object_release( p_vout ); + return r; +} + +static vlc_object_t *get_object( libvlc_media_player_t *, + const char *, libvlc_exception_t *); + +/***************************************************************************** + * 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 ) +{ + return get_int( p_mi, "marq", marq_option_bynumber(option,p_e), p_e ); +} + +/***************************************************************************** + * 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 ) +{ + return get_string( p_mi, "marq", marq_option_bynumber(option,p_e), p_e ); } -void libvlc_toggle_teletext( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +/***************************************************************************** + * 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 ) { - /* We only work on the first vout */ - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - bool opaque; int i_ret; + set_int( p_mi, "marq", marq_option_bynumber(option,p_e), value, p_e ); +} + +/***************************************************************************** + * 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 ) +{ + set_string( p_mi, "marq", marq_option_bynumber(option,p_e), value, p_e ); +} + + +/* logo module support */ + - /* GetVout will raise the exception for us */ - if( !p_vout ) return; +static opt_t * +logo_option_bynumber( unsigned option, libvlc_exception_t *p_e ) +{ + opt_t vlogo_optlist[] = /* depends on libvlc_video_logo_option_t */ + { + { "logo", 0 }, + { "logo-file", VLC_VAR_STRING }, + { "logo-x", VLC_VAR_INTEGER }, + { "logo-y", VLC_VAR_INTEGER }, + { "logo-delay", VLC_VAR_INTEGER }, + { "logo-repeat", VLC_VAR_INTEGER }, + { "logo-opacity", VLC_VAR_INTEGER }, + { "logo-position", VLC_VAR_INTEGER }, + }; + enum { num_vlogo_opts = sizeof(vlogo_optlist) / sizeof(*vlogo_optlist) }; + + 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; +} - 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" ); - vlc_object_release( p_vout ); +void libvlc_video_set_logo_string( libvlc_media_player_t *p_mi, + unsigned option, const char *psz_value, + libvlc_exception_t *p_e ) +{ + set_string( p_mi,"logo",logo_option_bynumber(option,p_e),psz_value,p_e ); } -int libvlc_video_destroy( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) + +void libvlc_video_set_logo_int( libvlc_media_player_t *p_mi, + unsigned option, int value, + libvlc_exception_t *p_e ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - vlc_object_detach( p_vout ); - vlc_object_release( p_vout ); - vlc_object_release( p_vout ); + set_int( p_mi, "logo", logo_option_bynumber(option, p_e), value, p_e ); +} - return 0; + +int libvlc_video_get_logo_int( libvlc_media_player_t *p_mi, + unsigned option, libvlc_exception_t *p_e ) +{ + return get_int( p_mi, "logo", logo_option_bynumber(option,p_e), p_e ); } + +