/*****************************************************************************
* video.c: libvlc new API video functions
*****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2010 the VideoLAN team
*
* $Id$
*
* 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 <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_player.h>
+
+#include <vlc_common.h>
#include <vlc_input.h>
#include <vlc_vout.h>
+#include "media_player_internal.h"
+#include <vlc_osd.h>
+#include <assert.h>
+
/*
* 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 = libvlc_get_input_thread( p_mi, p_exception );
+ input_thread_t *p_input = libvlc_get_input_thread( p_mi );
vout_thread_t *p_vout = NULL;
if( p_input )
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 );
}
+ else
+ {
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "No active input" );
+ }
return p_vout;
}
{
/* 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_set_key_input( libvlc_media_player_t *p_mi, unsigned on )
+{
+ var_SetBool (p_mi, "keyboard-events", !!on);
+}
+
+void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned 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 )
{
vout_thread_t *p_vout;
- /* The filepath must be not NULL */
- if( !psz_filepath )
- {
- libvlc_exception_raise( p_e, "filepath is null" );
- return;
- }
+ assert( psz_filepath );
+
/* We must have an input */
if( !p_mi->p_input_thread )
{
- libvlc_exception_raise( p_e, "Input does not exist" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Input does not exist" );
return;
}
return width;
}
-int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_has_vout( 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);
bool has_vout = false;
if( p_input_thread )
return has_vout;
}
-int libvlc_video_reparent( libvlc_media_player_t *p_mi, libvlc_drawable_t d,
- libvlc_exception_t *p_e )
-{
- (void) p_mi; (void) d;
- libvlc_exception_raise(p_e, "Reparenting not supported");
- return -1;
-}
-
-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 )
-{
-#ifdef __APPLE__
- 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 );
- }
- }
-#else
- (void) p_mi; (void) area; (void) p_e;
-#endif
-}
-
-/* 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 */
-#ifdef WIN32
- vlc_value_t val;
-
- if( sizeof(HWND) > sizeof(libvlc_drawable_t) )
- return; /* BOOM! we told you not to use this function! */
- val.p_address = (void *)(uintptr_t)d;
- var_Set( p_instance->p_libvlc_int, "drawable-hwnd", val );
-#elif defined(__APPLE__)
- var_SetInteger( p_instance->p_libvlc_int, "drawable-agl", d );
-#else
- var_SetInteger( p_instance->p_libvlc_int, "drawable-xid", d );
-#endif
-
- 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);
-
-#ifdef WIN32
- vlc_value_t val;
-
- if( sizeof(HWND) > sizeof(libvlc_drawable_t) )
- return 0;
- var_Get( p_instance->p_libvlc_int, "drawable-hwnd", &val );
- return (uintptr_t)val.p_address;
-#elif defined(__APPLE__)
- return var_GetInteger( p_instance->p_libvlc_int, "drawable-agl" );
-#else
- return var_GetInteger( p_instance->p_libvlc_int, "drawable-xid" );
-#endif
-}
-
-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);
- }
-}
-
-void libvlc_video_set_viewport( libvlc_instance_t *p_instance, libvlc_media_player_t *p_mi,
- const libvlc_rectangle_t *view, const libvlc_rectangle_t *clip,
- libvlc_exception_t *p_e )
-{
-#ifdef __APPLE__
- if( !view )
- {
- libvlc_exception_raise( p_e, "viewport is NULL" );
- 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 );
-
- 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 );
- }
- }
-#else
- (void) p_instance; (void) p_mi; (void) view; (void) clip; (void) p_e;
-#endif
-}
-
float libvlc_video_get_scale( libvlc_media_player_t *p_mp,
libvlc_exception_t *p_e )
{
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 );
}
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;
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,
libvlc_exception_t *p_e )
{
- 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_exception_raise( p_e );
+ libvlc_printerr( "No active input" );
+ return -1;
+ }
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;
}
break;
}
}
- var_Change( p_input_thread, "spu-es", VLC_VAR_FREELIST, &val_list, NULL );
+ 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 );
- vlc_value_t val_list;
+ input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
int i_spu_count;
if( !p_input_thread )
+ {
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "No active input" );
return -1;
+ }
- var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
- i_spu_count = val_list.p_list->i_count;
- var_Change( p_input_thread, "spu-es", VLC_VAR_FREELIST, &val_list, NULL );
+ 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 )
{
- 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 newval;
int i_ret = -1;
- if( !p_input_thread ) return;
-
- var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
-
- if( val_list.p_list->i_count == 0 )
+ if( !p_input_thread )
{
- libvlc_exception_raise( p_e, "Subtitle value out of range" );
- goto end;
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "No active input" );
+ return;
}
- if( (i_spu < 0) && (i_spu > val_list.p_list->i_count) )
+ var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
+
+ if( ( val_list.p_list->i_count == 0 )
+ || (i_spu < 0) || (i_spu > val_list.p_list->i_count) )
{
- libvlc_exception_raise( p_e, "Subtitle value out of range" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Subtitle number out of range" );
goto end;
}
i_ret = var_Set( p_input_thread, "spu-es", newval );
if( i_ret < 0 )
{
- libvlc_exception_raise( p_e, "Setting subtitle value failed" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Subtitle selection error" );
}
end:
- var_Change( p_input_thread, "spu-es", VLC_VAR_FREELIST, &val_list, NULL );
+ 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,
- 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 )
}
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,
}
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;
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 );
-}
-
-int libvlc_video_get_teletext( libvlc_media_player_t *p_mi,
- 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( !p_vout ) return i_ret;
-
- p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi",
- FIND_CHILD );
- if( p_vbi )
- {
- i_ret = var_GetInteger( p_vbi, "vbi-page" );
- vlc_object_release( p_vbi );
- }
- vlc_object_release( p_vout );
- return i_ret;
-}
-
-void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page,
- 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( !p_vout ) return;
-
- p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi",
- FIND_CHILD );
- if( p_vbi )
+ if( i_ret )
{
- 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" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Bad or unsupported cropping geometry" );
}
- vlc_object_release( p_vout );
}
-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;
- vlc_object_t *p_vbi;
- int i_ret;
- 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 )
return;
}
const bool b_selected = var_GetInteger( p_input_thread, "teletext-es" ) >= 0;
-
- 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 if( b_selected )
+ if( b_selected )
{
var_SetInteger( p_input_thread, "spu-es", -1 );
}
if( list.p_list->i_count > 0 )
var_SetInteger( p_input_thread, "spu-es", list.p_list->p_values[0].i_int );
- var_Change( p_input_thread, "teletext-es", VLC_VAR_FREELIST, &list, NULL );
+ var_FreeList( &list, NULL );
}
}
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 );
- vlc_value_t val_list;
+ input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
int i_track_count;
if( !p_input_thread )
return -1;
- var_Change( p_input_thread, "video-es", VLC_VAR_GETCHOICES, &val_list, NULL );
- i_track_count = val_list.p_list->i_count;
- var_Change( p_input_thread, "video-es", VLC_VAR_FREELIST, &val_list, NULL );
+ 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 )
+ 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 )
{
- 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;
i_ret = var_Get( p_input_thread, "video-es", &val );
if( i_ret < 0 )
{
- libvlc_exception_raise( p_e, "Getting Video track information failed" );
+ 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 );
break;
}
}
- var_Change( p_input_thread, "video-es", VLC_VAR_FREELIST, &val_list, NULL );
+ 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 );
+ input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
vlc_value_t val_list;
int i_ret = -1;
int i;
var_Change( p_input_thread, "video-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_track == val.i_int )
+ if( i_track == val_list.p_list->p_values[i].i_int )
{
- i_ret = var_Set( p_input_thread, "audio-es", val );
+ i_ret = var_SetInteger( p_input_thread, "video-es", i_track );
if( i_ret < 0 )
- libvlc_exception_raise( p_e, "Setting video track failed" );
+ break;
goto end;
}
}
- libvlc_exception_raise( p_e, "Video track out of range" );
-
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Video track number out of range" );
end:
- var_Change( p_input_thread, "video-es", VLC_VAR_FREELIST, &val_list, NULL );
+ var_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );
}
-int libvlc_video_destroy( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+/******************************************************************************
+ * 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")
+ || !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" );
+ }
+ }
+ else
+ {
+ /* disable deinterlace filter */
+ var_SetInteger( p_vout, "deinterlace", 0 );
+ }
+
vlc_object_release( p_vout );
+}
+
+
+/* ************** */
+/* module helpers */
+/* ************** */
+
+
+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, p_e );
+ 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;
+}
+
+
+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 )
+{
+ if( !opt ) return;
+
+ if( !opt->type ) /* the enabler */
+ {
+ vout_thread_t *vout = GetVout( p_mi, p_e );
+ libvlc_exception_clear( p_e );
+ if (vout)
+ {
+ vout_EnableFilter( vout, opt->name, value, false );
+ vlc_object_release( vout );
+ }
+ return;
+ }
+
+ vlc_object_t *object = get_object( p_mi, name, p_e );
+ if( !object ) return;
+
+ 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 );
+}
+
+
+static int
+get_int( libvlc_media_player_t *p_mi, const char *name,
+ const opt_t *opt, libvlc_exception_t *p_e )
+{
+ 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 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;
+}
+
- return 0;
+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 );
+}
+
+
+static char *
+get_string( libvlc_media_player_t *p_mi, const char *name,
+ const opt_t *opt, libvlc_exception_t *p_e )
+{
+ 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;
+}
+
+
+/*****************************************************************************
+ * 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)
+{
+ 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 )
+ {
+ 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 *);
+
+/*****************************************************************************
+ * 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 );
+}
+
+/*****************************************************************************
+ * 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 )
+{
+ 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 */
+
+
+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;
+}
+
+
+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 );
+}
+
+
+void libvlc_video_set_logo_int( libvlc_media_player_t *p_mi,
+ unsigned option, int value,
+ libvlc_exception_t *p_e )
+{
+ set_int( p_mi, "logo", logo_option_bynumber(option, p_e), value, p_e );
+}
+
+
+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 );
+}
+
+
projects / vlc / blobdiff