*
* Authors: Cl�ent Stenac <zorglub@videolan.org>
* Filippo Carone <littlejohn@videolan.org>
+ * Jean-Paul Saman <jpsaman _at_ m2x _dot_ nl>
+ * Damien Fouilleul <damienf a_t videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <vlc_vout.h>
/*
- * Remember to release the returned vout_thread_t since it is locked at
+ * Remember to release the returned input_thread_t since it is locked at
* the end of this function.
*/
-static vout_thread_t *GetVout( libvlc_input_t *p_input,
+static input_thread_t *GetInputThread( libvlc_input_t *p_input,
libvlc_exception_t *p_exception )
{
input_thread_t *p_input_thread;
- vout_thread_t *p_vout;
if( !p_input )
{
return NULL;
}
- p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
- if( !p_vout )
+ return p_input_thread;;
+}
+
+/*
+ * Remember to release the returned vout_thread_t since it is locked at
+ * the end of this function.
+ */
+static vout_thread_t *GetVout( libvlc_input_t *p_input,
+ libvlc_exception_t *p_exception )
+{
+ input_thread_t *p_input_thread = GetInputThread(p_input, p_exception);
+ vout_thread_t *p_vout = NULL;
+
+ if( p_input_thread )
{
+ 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 );
- libvlc_exception_raise( p_exception, "No active video output" );
- return NULL;
}
- vlc_object_release( p_input_thread );
-
return p_vout;
}
+
/**********************************************************************
* Exported functions
**********************************************************************/
vout_thread_t *p_vout = GetVout( p_input, p_e );
input_thread_t *p_input_thread;
- char path[256];
-
/* GetVout will raise the exception for us */
if( !p_vout )
{
return;
}
+ if( !psz_filepath )
+ {
+ libvlc_exception_raise( p_e, "filepath is null" );
+ return;
+ }
+
+
p_input_thread = (input_thread_t*)vlc_object_get(
p_input->p_instance->p_libvlc_int,
p_input->i_input_id );
return;
}
- snprintf( path, 255, "%s", psz_filepath );
- var_SetString( p_vout, "snapshot-path", path );
+ var_SetString( p_vout, "snapshot-path", psz_filepath );
var_SetString( p_vout, "snapshot-format", "png" );
vout_Control( p_vout, VOUT_SNAPSHOT );
vlc_bool_t libvlc_input_has_vout( libvlc_input_t *p_input,
libvlc_exception_t *p_e )
{
- vout_thread_t *p_vout = GetVout( p_input, p_e );
- if ( NULL == p_vout )
+ input_thread_t *p_input_thread = GetInputThread(p_input, p_e);
+ vlc_bool_t has_vout = VLC_FALSE;
+
+ if( p_input_thread )
{
- if ( libvlc_exception_raised( p_e )
- && strcmp( "No active video output", libvlc_exception_get_message( p_e ) ) == 0 )
+ vout_thread_t *p_vout;
+
+ p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
+ if( p_vout )
{
- libvlc_exception_clear( p_e );
+ has_vout = VLC_TRUE;
+ vlc_object_release( p_vout );
}
- return VLC_FALSE;
+ vlc_object_release( p_input_thread );
}
-
- vlc_object_release( p_vout );
-
- return VLC_TRUE;
+ return has_vout;
}
int libvlc_video_reparent( libvlc_input_t *p_input, libvlc_drawable_t d,
{
vout_thread_t *p_vout = GetVout( p_input, p_e );
- if ( p_vout == NULL)
+ if( p_vout )
{
- /// \todo: set exception
- return 0;
+ vout_Control( p_vout , VOUT_REPARENT, d);
+ vlc_object_release( p_vout );
}
-
- vout_Control( p_vout , VOUT_REPARENT, d);
- vlc_object_release( p_vout );
-
return 0;
}
void libvlc_video_resize( libvlc_input_t *p_input, int width, int height, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_input, p_e );
- vout_Control( p_vout, VOUT_SET_SIZE, width, height );
- vlc_object_release( p_vout );
+ if( p_vout )
+ {
+ vout_Control( p_vout, VOUT_SET_SIZE, width, height );
+ vlc_object_release( p_vout );
+ }
+}
+
+void libvlc_video_redraw_rectangle( libvlc_input_t *p_input,
+ 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_input, 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 */
}
char *libvlc_video_get_aspect_ratio( libvlc_input_t *p_input,
- libvlc_exception_t *p_e )
+ libvlc_exception_t *p_e )
{
char *psz_aspect = 0;
vout_thread_t *p_vout = GetVout( p_input, p_e );
vlc_object_release( p_vout );
}
+int libvlc_video_get_spu( libvlc_input_t *p_input,
+ libvlc_exception_t *p_e )
+{
+ input_thread_t *p_input_thread = GetInputThread( p_input, p_e );
+ 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;
+
+ 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 );
+ 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 )
+ {
+ i_spu = i;
+ break;
+ }
+ }
+ vlc_object_release( p_input_thread );
+ return i_spu;
+}
+
+void libvlc_video_set_spu( libvlc_input_t *p_input, int i_spu,
+ libvlc_exception_t *p_e )
+{
+ input_thread_t *p_input_thread = GetInputThread( p_input, p_e );
+ vlc_value_t val_list;
+ 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++ )
+ {
+ vlc_value_t val = val_list.p_list->p_values[i];
+ if( i_spu == i )
+ {
+ 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;
+ }
+ }
+ libvlc_exception_raise( p_e, "Subtitle value out of range" );
+ vlc_object_release( p_input_thread );
+}
+
char *libvlc_video_get_crop_geometry( libvlc_input_t *p_input,
libvlc_exception_t *p_e )
{