X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fvideo.c;h=18b14a0e4981c514e1d780eb970521379fa392a1;hb=efd8144e169d0cc9b71e1d90ccc329e75753361f;hp=a4beca631461ffd6bd4377441d7b5095ea88289d;hpb=ec8b0a2dd7c1d5e81d710a53b268ad70a37a0693;p=vlc diff --git a/src/control/video.c b/src/control/video.c index a4beca6314..18b14a0e49 100644 --- a/src/control/video.c +++ b/src/control/video.c @@ -5,7 +5,7 @@ * * $Id$ * - * Authors: Cl�ent Stenac + * Authors: Clément Stenac * Filippo Carone * Jean-Paul Saman * Damien Fouilleul @@ -25,29 +25,40 @@ * 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 ) { - input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_exception ); + input_thread_t *p_input = libvlc_get_input_thread( p_mi, p_exception ); vout_thread_t *p_vout = NULL; - if( p_input_thread ) + if( p_input ) { - p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD ); + p_vout = input_GetVout( p_input ); if( !p_vout ) { - libvlc_exception_raise( p_exception, "No active video output" ); + libvlc_exception_raise( p_exception ); + libvlc_printerr( "No active video output" ); } - vlc_object_release( p_input_thread ); + vlc_object_release( p_input ); } return p_vout; } @@ -92,47 +103,42 @@ 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 ); - bool ret; /* GetVout will raise the exception for us */ if( !p_vout ) return; - ret = var_GetBool( p_vout, "fullscreen" ); - var_SetBool( p_vout, "fullscreen", !ret ); + var_ToggleBool( p_vout, "fullscreen" ); vlc_object_release( p_vout ); } void -libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, char *psz_filepath, +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 ) { - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - input_thread_t *p_input_thread; + vout_thread_t *p_vout; - /* GetVout will raise the exception for us */ - if( !p_vout ) return; + assert( psz_filepath ); - if( !psz_filepath ) + /* We must have an input */ + if( !p_mi->p_input_thread ) { - libvlc_exception_raise( p_e, "filepath is null" ); + 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; + var_SetInteger( p_vout, "snapshot-width", i_width ); var_SetInteger( p_vout, "snapshot-height", i_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; - } - var_SetString( p_vout, "snapshot-path", psz_filepath ); var_SetString( p_vout, "snapshot-format", "png" ); - vout_Control( p_vout, VOUT_SNAPSHOT ); + var_TriggerCallback( p_vout, "video-snapshot" ); vlc_object_release( p_vout ); } @@ -176,7 +182,7 @@ int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi, { vout_thread_t *p_vout; - p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD ); + p_vout = input_GetVout( p_input_thread ); if( p_vout ) { has_vout = true; @@ -187,146 +193,40 @@ int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi, return has_vout; } -int libvlc_video_reparent( libvlc_media_player_t *p_mi, libvlc_drawable_t d, - libvlc_exception_t *p_e ) -{ - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - - if( p_vout ) - { - vout_Control( p_vout , VOUT_REPARENT, d); - vlc_object_release( p_vout ); - } - return 0; -} - -void libvlc_video_resize( libvlc_media_player_t *p_mi, int width, int height, libvlc_exception_t *p_e ) -{ - 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 ); - } -} - -void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi, - const libvlc_rectangle_t *area, - libvlc_exception_t *p_e ) -{ - if( (NULL != area) - && ((area->bottom - area->top) > 0) - && ((area->right - area->left) > 0) ) - { - 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 ); - } - } -} - -/* global video settings */ - -/* Deprecated use libvlc_media_player_set_drawable() */ -void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d, +float libvlc_video_get_scale( libvlc_media_player_t *p_mp, libvlc_exception_t *p_e ) { - /* set as default for future vout instances */ - var_SetInteger(p_instance->p_libvlc_int, "drawable", (int)d); - - libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e); - if( 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); + vout_thread_t *p_vout = GetVout( p_mp, p_e ); + if( !p_vout ) + return 0.; - libvlc_drawable_t result; - - result = var_GetInteger( p_instance->p_libvlc_int, "drawable" ); - - return result; -} - - -void libvlc_video_set_size( libvlc_instance_t *p_instance, int width, int height, - libvlc_exception_t *p_e ) -{ - /* 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); - - 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); - } + float f_scale = var_GetFloat( p_vout, "scale" ); + if( var_GetBool( p_vout, "autoscale" ) ) + f_scale = 0.; + vlc_object_release( p_vout ); + return f_scale; } -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_video_set_scale( libvlc_media_player_t *p_mp, float f_scale, + libvlc_exception_t *p_e ) { - if( !view ) - { - libvlc_exception_raise( p_e, "viewport is NULL" ); + vout_thread_t *p_vout = GetVout( p_mp, p_e ); + if( !p_vout ) return; - } - - /* if clip is NULL, then use view rectangle as clip */ - if( !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 ); - - 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 ) - { - /* 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( f_scale != 0. ) + var_SetFloat( p_vout, "scale", f_scale ); + var_SetBool( p_vout, "autoscale", f_scale != 0. ); + vlc_object_release( p_vout ); } char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { - char *psz_aspect = 0; + char *psz_aspect = NULL; vout_thread_t *p_vout = GetVout( p_mi, p_e ); - if( !p_vout ) return 0; + if( !p_vout ) return NULL; psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" ); vlc_object_release( p_vout ); @@ -334,7 +234,7 @@ char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi, } void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, - char *psz_aspect, libvlc_exception_t *p_e ) + const char *psz_aspect, libvlc_exception_t *p_e ) { vout_thread_t *p_vout = GetVout( p_mi, p_e ); int i_ret = -1; @@ -342,11 +242,12 @@ void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, 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 ); + if( i_ret ) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Bad or unsupported aspect ratio" ); + } } int libvlc_video_get_spu( libvlc_media_player_t *p_mi, @@ -364,59 +265,83 @@ int libvlc_video_get_spu( libvlc_media_player_t *p_mi, i_ret = var_Get( p_input_thread, "spu-es", &val ); if( i_ret < 0 ) { - libvlc_exception_raise( p_e, "Getting subtitle information failed" ); vlc_object_release( p_input_thread ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Subtitle informations not found" ); return i_ret; } 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 spu_val = val_list.p_list->p_values[i]; - if( val.i_int == spu_val.i_int ) + if( val.i_int == val_list.p_list->p_values[i].i_int ) { i_spu = i; break; } } + var_FreeList( &val_list, NULL ); vlc_object_release( p_input_thread ); return i_spu; } +int libvlc_video_get_spu_count( 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 ); + int i_spu_count; + + if( !p_input_thread ) + return -1; + + 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 ) +{ + return libvlc_get_track_description( p_mi, "spu-es", p_e); +} + void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu, libvlc_exception_t *p_e ) { 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; - int i; 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++ ) + + if( ( val_list.p_list->i_count == 0 ) + || (i_spu < 0) || (i_spu > val_list.p_list->i_count) ) { - vlc_value_t val = val_list.p_list->p_values[i]; - if( i_spu == i ) - { - vlc_value_t new_val; + libvlc_exception_raise( p_e ); + libvlc_printerr( "Subtitle number out of range" ); + goto end; + } - 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; - } + 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" ); } - libvlc_exception_raise( p_e, "Subtitle value out of range" ); + +end: + var_FreeList( &val_list, NULL ); vlc_object_release( p_input_thread ); } int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi, - char *psz_subtitle, + const char *psz_subtitle, libvlc_exception_t *p_e ) { input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); @@ -424,13 +349,30 @@ int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi, if( p_input_thread ) { - if( input_AddSubtitles( p_input_thread, psz_subtitle, true ) ) + if( !input_AddSubtitle( p_input_thread, psz_subtitle, true ) ) b_ret = true; vlc_object_release( p_input_thread ); } return b_ret; } +libvlc_track_description_t * + libvlc_video_get_title_description( libvlc_media_player_t *p_mi, + libvlc_exception_t * p_e ) +{ + return libvlc_get_track_description( p_mi, "title", p_e); +} + +libvlc_track_description_t * + libvlc_video_get_chapter_description( libvlc_media_player_t *p_mi, + int i_title, + libvlc_exception_t *p_e ) +{ + char psz_title[12]; + sprintf( psz_title, "title %2i", i_title ); + return libvlc_get_track_description( p_mi, psz_title, p_e); +} + char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { @@ -445,7 +387,7 @@ char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi, } void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, - char *psz_geometry, libvlc_exception_t *p_e ) + const char *psz_geometry, libvlc_exception_t *p_e ) { vout_thread_t *p_vout = GetVout( p_mi, p_e ); int i_ret = -1; @@ -453,16 +395,19 @@ void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, if( !p_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_release( p_vout ); + + if( i_ret ) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Bad or unsupported cropping geometry" ); + } } int libvlc_video_get_teletext( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { +#if 0 vout_thread_t *p_vout = GetVout( p_mi, p_e ); vlc_object_t *p_vbi; int i_ret = -1; @@ -470,7 +415,7 @@ int libvlc_video_get_teletext( libvlc_media_player_t *p_mi, if( !p_vout ) return i_ret; p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi", - FIND_ANYWHERE ); + FIND_CHILD ); if( p_vbi ) { i_ret = var_GetInteger( p_vbi, "vbi-page" ); @@ -479,11 +424,17 @@ int libvlc_video_get_teletext( libvlc_media_player_t *p_mi, vlc_object_release( p_vout ); return i_ret; +#else + VLC_UNUSED( p_mi ); + VLC_UNUSED( p_e ); + return -1; +#endif } void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page, libvlc_exception_t *p_e ) { +#if 0 vout_thread_t *p_vout = GetVout( p_mi, p_e ); vlc_object_t *p_vbi; int i_ret = -1; @@ -491,44 +442,384 @@ void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page, if( !p_vout ) return; p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi", - FIND_ANYWHERE ); + FIND_CHILD ); if( p_vbi ) { 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 ); +#else + VLC_UNUSED( p_mi ); + VLC_UNUSED( p_e ); + VLC_UNUSED( i_page ); +#endif } void libvlc_toggle_teletext( libvlc_media_player_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 ); - bool opaque; int i_ret; + input_thread_t *p_input_thread; - /* GetVout will raise the exception for us */ - if( !p_vout ) return; + p_input_thread = libvlc_get_input_thread(p_mi, p_e); + if( !p_input_thread ) return; - 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" ); + if( var_CountChoices( p_input_thread, "teletext-es" ) <= 0 ) + { + vlc_object_release( p_input_thread ); + return; + } + const bool b_selected = var_GetInteger( p_input_thread, "teletext-es" ) >= 0; +#if 0 + int i_ret; + vlc_object_t *p_vbi; + p_vbi = (vlc_object_t *)vlc_object_find_name( p_input_thread, "zvbi", + FIND_CHILD ); + if( p_vbi ) + { + if( b_selected ) + { + /* FIXME Gni, why that ? */ + i_ret = var_SetInteger( p_vbi, "vbi-page", + var_GetInteger( p_vbi, "vbi-page" ) ); + if( i_ret ) + libvlc_exception_raise( p_e, + "Unexpected error while setting teletext page" ); + } + else + { + /* FIXME Gni^2 */ + i_ret = var_SetBool( p_vbi, "vbi-opaque", + !var_GetBool( p_vbi, "vbi-opaque" ) ); + if( i_ret ) + libvlc_exception_raise( p_e, + "Unexpected error while setting teletext transparency" ); + } + vlc_object_release( p_vbi ); + } + else +#endif + if( b_selected ) + { + 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 ) ) + { + if( list.p_list->i_count > 0 ) + var_SetInteger( p_input_thread, "spu-es", list.p_list->p_values[0].i_int ); - vlc_object_release( p_vout ); + var_FreeList( &list, NULL ); + } + } + vlc_object_release( p_input_thread ); } -int libvlc_video_destroy( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) +int libvlc_video_get_track_count( 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 ); + int i_track_count; + + if( !p_input_thread ) + return -1; + + i_track_count = var_CountChoices( p_input_thread, "video-es" ); + + vlc_object_release( p_input_thread ); + return i_track_count; +} + +libvlc_track_description_t * + libvlc_video_get_track_description( libvlc_media_player_t *p_mi, + libvlc_exception_t *p_e ) +{ + return libvlc_get_track_description( p_mi, "video-es", p_e); +} + +int libvlc_video_get_track( 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_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 ) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Video track information not found" ); + vlc_object_release( p_input_thread ); + return i_ret; + } + + var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL ); + for( i = 0; i < val_list.p_list->i_count; i++ ) + { + if( val_list.p_list->p_values[i].i_int == val.i_int ) + { + i_track = i; + break; + } + } + var_FreeList( &val_list, NULL ); + vlc_object_release( p_input_thread ); + return i_track; +} + +void libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track, + libvlc_exception_t *p_e ) +{ + input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + vlc_value_t val_list; + int i_ret = -1; + int i; + + if( !p_input_thread ) + return; + + var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL ); + for( 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 ) + break; + 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 ); +} + +/****************************************************************************** + * 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 ); - vlc_object_detach( p_vout ); - vlc_object_release( p_vout ); + + if( !p_vout ) + return; + + if( b_enable ) + { + /* 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") ) + { + /* set deinterlace filter chosen */ + var_SetString( p_vout, "deinterlace-mode", psz_mode ); + } + else + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Bad or unsuported deinterlacing mode" ); + } + } + else + { + /* disable deinterlace filter */ + var_SetString( p_vout, "deinterlace-mode", "" ); + } + vlc_object_release( p_vout ); +} + +/***************************************************************************** + * Marquee: FIXME: That implementation has no persistent state and requires + * a vout + *****************************************************************************/ + +static const char *get_marquee_int_option_identifier(unsigned option) +{ + static const char tab[][16] = + { + "marq", + "marq-color", + "marq-opacity", + "marq-position", + "marq-refresh", + "marq-size", + "marq-timeout", + "marq-x", + "marq-y", + }; + if( option >= sizeof( tab ) / sizeof( tab[0] ) ) + return NULL; + return tab[option]; +} - return 0; +static const char *get_marquee_string_option_identifier(unsigned option) +{ + static const char tab[][16] = + { + "marq-marquee", + }; + if( option >= sizeof( tab ) / sizeof( tab[0] ) ) + return NULL; + return tab[option]; +} + + +static vlc_object_t *get_marquee_object( libvlc_media_player_t * p_mi ) +{ + libvlc_exception_t e; + libvlc_exception_init(&e); + vout_thread_t * vout = GetVout( p_mi, &e ); + libvlc_exception_clear(&e); + if( !vout ) + return NULL; + vlc_object_t * object = vlc_object_find_name( vout, "marq", FIND_CHILD ); + vlc_object_release(vout); + return object; +} + +/***************************************************************************** + * libvlc_video_get_marquee_option_as_int : get a marq option value + *****************************************************************************/ +int libvlc_video_get_marquee_option_as_int( libvlc_media_player_t *p_mi, + libvlc_video_marquee_int_option_t option, + libvlc_exception_t *p_e ) +{ + const char * identifier = get_marquee_int_option_identifier(option); + if(!identifier) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Unknown marquee option" ); + return 0; + } + vlc_object_t * marquee = get_marquee_object(p_mi); + + /* Handle the libvlc_marquee_Enabled separately */ + if(option == libvlc_marquee_Enabled) + { + bool isEnabled = marquee != NULL; + vlc_object_release(marquee); + return isEnabled; + } + + /* Generic case */ + if(!identifier) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Marquee not enabled" ); + return 0; + } +#warning This and the next function may crash due to type checking! + int ret = var_GetInteger(marquee, identifier); + vlc_object_release(marquee); + return ret; +} + +/***************************************************************************** + * libvlc_video_get_marquee_option_as_string : get a marq option value + *****************************************************************************/ +char * libvlc_video_get_marquee_option_as_string( libvlc_media_player_t *p_mi, + libvlc_video_marquee_string_option_t option, + libvlc_exception_t *p_e ) +{ + const char * identifier = get_marquee_string_option_identifier(option); + if(!identifier) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Unknown marquee option" ); + return NULL; + } + + vlc_object_t * marquee = get_marquee_object(p_mi); + if(!marquee) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Marquee not enabled" ); + return NULL; + } + char *ret = var_GetString(marquee, identifier); + vlc_object_release(marquee); + return ret; +} + +/***************************************************************************** + * libvlc_video_set_marquee_option_as_int: enable, disable or set an int option + *****************************************************************************/ +void libvlc_video_set_marquee_option_as_int( libvlc_media_player_t *p_mi, + libvlc_video_marquee_int_option_t option, + int value, libvlc_exception_t *p_e ) +{ + const char * identifier = get_marquee_int_option_identifier(option); + if(!identifier) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Unknown marquee option" ); + return; + } + + /* Handle the libvlc_marquee_Enabled separately */ + if(option == libvlc_marquee_Enabled) + { + libvlc_exception_t e; + libvlc_exception_init(&e); + vout_thread_t * vout = GetVout( p_mi, &e ); + libvlc_exception_clear(&e); + if (vout) + { + vout_EnableFilter(vout, identifier, value, false); + vlc_object_release(vout); + } + return; + } + + vlc_object_t * marquee = get_marquee_object(p_mi); + if(!marquee) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Marquee not enabled" ); + return; + } + var_SetInteger(marquee, identifier, value); + vlc_object_release(marquee); +} + +/***************************************************************************** + * libvlc_video_set_marquee_option_as_string: set a string option + *****************************************************************************/ +void libvlc_video_set_marquee_option_as_string( libvlc_media_player_t *p_mi, + libvlc_video_marquee_string_option_t option, + const char * value, + libvlc_exception_t *p_e ) +{ + const char * identifier = get_marquee_string_option_identifier(option); + if(!identifier) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Unknown marquee option" ); + return; + } + vlc_object_t * marquee = get_marquee_object(p_mi); + if(!marquee) + { + libvlc_exception_raise( p_e ); + libvlc_printerr( "Marquee not enabled" ); + return; + } + var_SetString(marquee, identifier, value); + vlc_object_release(marquee); }