*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
*
- * $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
+ * $Id$
*
* 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 "libvlc_internal.h"
+
#include <vlc/libvlc.h>
#include <vlc_input.h>
#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_input_t *p_input,
+static vout_thread_t *GetVout( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_exception )
{
- input_thread_t *p_input_thread;
- vout_thread_t *p_vout;
-
- if( !p_input )
- {
- libvlc_exception_raise( p_exception, "Input is NULL" );
- return NULL;
- }
+ input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_exception );
+ vout_thread_t *p_vout = NULL;
- p_input_thread = (input_thread_t*)vlc_object_get(
- p_input->p_instance->p_libvlc_int,
- p_input->i_input_id );
- if( !p_input_thread )
- {
- libvlc_exception_raise( p_exception, "Input does not exist" );
- return NULL;
- }
-
- p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
- if( !p_vout )
+ 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
**********************************************************************/
-void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen,
+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_input, 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( b_fullscreen ) val.b_bool = VLC_TRUE;
- else val.b_bool = VLC_FALSE;
+ if( !p_vout ) return;
- i_ret = var_Set( p_vout1, "fullscreen", val );
- if( i_ret )
- libvlc_exception_raise( p_e,
- "Unexpected error while setting fullscreen value" );
+ var_SetBool( p_vout, "fullscreen", b_fullscreen );
- vlc_object_release( p_vout1 );
+ vlc_object_release( p_vout );
}
-int libvlc_get_fullscreen( libvlc_input_t *p_input,
+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_input, 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_input_t *p_input,
+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_input, 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;
-
- i_ret = var_Get( p_vout1, "fullscreen", &val );
- if( i_ret )
- libvlc_exception_raise( p_e,
- "Unexpected error while looking up fullscreen value" );
+ if( !p_vout ) return;
- 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
-libvlc_video_take_snapshot( libvlc_input_t *p_input, char *psz_filepath,
- libvlc_exception_t *p_e )
+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 )
{
- vout_thread_t *p_vout = GetVout( p_input, p_e );
+ vout_thread_t *p_vout = GetVout( p_mi, p_e );
input_thread_t *p_input_thread;
- char path[256];
-
/* GetVout will raise the exception for us */
- if( !p_vout )
+ 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 );
- if( !p_input_thread )
+ 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;
}
- 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_object_release( p_vout );
- vlc_object_release( p_input_thread );
}
-int libvlc_video_get_height( libvlc_input_t *p_input,
- libvlc_exception_t *p_e )
+int libvlc_video_get_height( libvlc_media_player_t *p_mi,
+ libvlc_exception_t *p_e )
{
- vout_thread_t *p_vout1 = GetVout( p_input, p_e );
- if( !p_vout1 )
- return 0;
+ int height;
+
+ 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_vout1 );
+ vlc_object_release( p_vout );
- return p_vout1->i_window_height;
+ return height;
}
-int libvlc_video_get_width( libvlc_input_t *p_input,
- libvlc_exception_t *p_e )
+int libvlc_video_get_width( libvlc_media_player_t *p_mi,
+ libvlc_exception_t *p_e )
{
- vout_thread_t *p_vout1 = GetVout( p_input, p_e );
- if( !p_vout1 )
- return 0;
+ int width;
+
+ vout_thread_t *p_vout = GetVout( p_mi, p_e );
+ if( !p_vout ) return 0;
- vlc_object_release( p_vout1 );
+ width = p_vout->i_window_width;
+
+ vlc_object_release( p_vout );
- return p_vout1->i_window_width;
+ return width;
}
-vlc_bool_t libvlc_input_has_vout( libvlc_input_t *p_input,
- libvlc_exception_t *p_e )
+int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
+ libvlc_exception_t *p_e )
{
- vout_thread_t *p_vout = GetVout( p_input, p_e );
- if ( libvlc_exception_raised( p_e ) )
+ input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi, p_e);
+ bool has_vout = false;
+
+ if( p_input_thread )
{
- if ( 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 = 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,
+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_input, p_e );
+ vout_thread_t *p_vout = GetVout( p_mi, 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 )
+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_input, p_e );
- vout_Control( p_vout, VOUT_SET_SIZE, width, height );
- vlc_object_release( p_vout );
+ 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,
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_input_t *p_input = libvlc_playlist_get_input(p_instance, p_e);
- if( p_input )
- {
- vout_thread_t *p_vout = GetVout( p_input, p_e );
- if( p_vout )
- {
- /* tell running vout to re-parent */
- vout_Control( p_vout , VOUT_REPARENT, d);
- vlc_object_release( p_vout );
- }
- libvlc_input_free(p_input);
- }
+ 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);
+
libvlc_drawable_t result;
-
+
result = var_GetInteger( p_instance->p_libvlc_int, "drawable" );
-
+
return result;
}
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_input_t *p_input = libvlc_playlist_get_input(p_instance, p_e);
- if( p_input )
+ vout_thread_t *p_vout = GetVout( p_mi, p_e );
+ if( p_vout )
{
- vout_thread_t *p_vout = GetVout( p_input, 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_input_free(p_input);
+ /* 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);
}
}
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 */
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_input_t *p_input = libvlc_playlist_get_input(p_instance, p_e);
- if( p_input )
+ vout_thread_t *p_vout = GetVout( p_mi, p_e );
+ if( p_vout )
{
- vout_thread_t *p_vout = GetVout( p_input, 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_input_free(p_input);
+ /* 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);
}
}
-char *libvlc_video_get_aspect_ratio( libvlc_input_t *p_input,
- 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;
- vout_thread_t *p_vout = GetVout( p_input, p_e );
+ vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( !p_vout )
- return 0;
+ if( !p_vout ) return 0;
- psz_aspect = var_GetString( p_vout, "aspect-ratio" );
+ psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" );
vlc_object_release( p_vout );
- return psz_aspect;
+ return psz_aspect ? psz_aspect : strdup("");
}
-void libvlc_video_set_aspect_ratio( libvlc_input_t *p_input,
+void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi,
char *psz_aspect, libvlc_exception_t *p_e )
{
- vout_thread_t *p_vout = GetVout( p_input, p_e );
+ 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 )
vlc_object_release( p_vout );
}
-char *libvlc_video_get_crop_geometry( libvlc_input_t *p_input,
+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 );
+ 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_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;
+ 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 == val.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;
+ }
+ }
+ libvlc_exception_raise( p_e, "Subtitle value out of range" );
+ 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_input, p_e );
+ vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( !p_vout )
- return 0;
+ if( !p_vout ) return 0;
- psz_geometry = var_GetString( p_vout, "crop" );
+ psz_geometry = var_GetNonEmptyString( p_vout, "crop" );
vlc_object_release( p_vout );
- return psz_geometry;
+ return psz_geometry ? psz_geometry : strdup("");
}
-void libvlc_video_set_crop_geometry( libvlc_input_t *p_input,
+void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
char *psz_geometry, libvlc_exception_t *p_e )
{
- vout_thread_t *p_vout = GetVout( p_input, p_e );
+ 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 )
vlc_object_release( p_vout );
}
-int libvlc_video_destroy( libvlc_input_t *p_input,
+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_ANYWHERE );
+ 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_ANYWHERE );
+ 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" );
+ vlc_object_release( p_vout );
+}
+
+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;
+
+ /* GetVout will raise the exception for us */
+ if( !p_vout ) 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" );
+
+ vlc_object_release( p_vout );
+}
+
+int libvlc_video_destroy( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
- vout_thread_t *p_vout = GetVout( p_input, p_e );
- vlc_object_detach( p_vout );
+ 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 );
- vout_Destroy( p_vout );
return 0;
}
projects / vlc / blobdiff