int i_ret;
/* GetVout will raise the exception for us */
- if( !p_vout )
- return 0;
+ if( !p_vout ) return 0;
i_ret = var_GetBool( p_vout, "fullscreen" );
input_thread_t *p_input_thread;
/* GetVout will raise the exception for us */
- if( !p_vout )
- {
- return;
- }
+ if( !p_vout ) return;
if( !psz_filepath )
{
int libvlc_video_get_height( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
+ int height;
+
vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( !p_vout )
- return 0;
+ if( !p_vout ) return 0;
+
+ height = p_vout->i_window_height;
vlc_object_release( p_vout );
- return p_vout->i_window_height;
+ return height;
}
int libvlc_video_get_width( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
+ int width;
+
vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( !p_vout )
- return 0;
+ if( !p_vout ) return 0;
+
+ width = p_vout->i_window_width;
vlc_object_release( p_vout );
- return p_vout->i_window_width;
+ return width;
}
int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
/* 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_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);
- }
+ 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);
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_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 )
{
- 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);
+ /* 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_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 )
{
- 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);
+ /* 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 *psz_aspect = 0;
vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( !p_vout )
- return 0;
+ if( !p_vout ) return 0;
psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" );
vlc_object_release( p_vout );
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 )
int i_ret = -1;
int i;
- 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 )
int i_ret = -1;
int i;
- if( !p_input_thread )
- return;
+ 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 )
+ if( i_spu == val.i_int )
{
vlc_value_t new_val;
char *psz_geometry = 0;
vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( !p_vout )
- return 0;
+ if( !p_vout ) return 0;
psz_geometry = var_GetNonEmptyString( p_vout, "crop" );
vlc_object_release( p_vout );
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_t *p_vbi;
int i_ret = -1;
- if( !p_vout )
- return i_ret;
+ if( !p_vout ) return i_ret;
p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi",
FIND_ANYWHERE );
vlc_object_t *p_vbi;
int i_ret = -1;
- if( !p_vout )
- return;
+ if( !p_vout ) return;
p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi",
FIND_ANYWHERE );
{
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 );
}
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 );
- vlc_value_t val; int i_ret;
+ input_thread_t *p_input_thread;
+ vlc_object_t *p_vbi;
+ int i_ret;
- /* 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;
- i_ret = var_Get( p_vout, "vbi-opaque", &val );
- if( i_ret )
- libvlc_exception_raise( p_e,
- "Unexpected error while looking up teletext value" );
+ p_vbi = (vlc_object_t *) vlc_object_find_name( p_input_thread, "zvbi",
+ FIND_ANYWHERE );
+ if( p_vbi )
+ {
+ const int i_teletext_es = var_GetInteger( p_input_thread, "teletext-es" );
+ const int i_spu_es = var_GetInteger( p_input_thread, "spu-es" );
- val.b_bool = !val.b_bool;
- i_ret = var_Set( p_vout, "vbi-opaque", val );
- if( i_ret )
- libvlc_exception_raise( p_e,
- "Unexpected error while setting teletext value" );
+ if( (i_teletext_es >= 0) && (i_teletext_es == i_spu_es) )
+ {
+ int i_page = 100;
- vlc_object_release( p_vout );
+ i_page = var_GetInteger( p_vbi, "vbi-page" );
+ i_page = (i_teletext_es >= 0) ? i_page : 0;
+
+ i_ret = var_SetInteger( p_vbi, "vbi-page", i_page );
+ if( i_ret )
+ libvlc_exception_raise( p_e,
+ "Unexpected error while setting teletext page" );
+ }
+ else if( i_teletext_es >= 0 )
+ {
+ bool opaque = true;
+
+ opaque = var_GetBool( p_vbi, "vbi-opaque" );
+ i_ret = var_SetBool( p_vbi, "vbi-opaque", !opaque );
+ if( i_ret )
+ libvlc_exception_raise( p_e,
+ "Unexpected error while setting teletext transparency" );
+ }
+ vlc_object_release( p_vbi );
+ }
+ else
+ {
+ /* Teletext is not enabled yet, so enable it.
+ * Only after it is enable it is possible to view teletext pages
+ */
+ const int i_teletext_es = var_GetInteger( p_input_thread, "teletext-es" );
+
+ if( i_teletext_es >= 0 )
+ {
+ const int i_spu_es = var_GetInteger( p_input_thread, "spu-es" );
+
+ if( i_teletext_es == i_spu_es )
+ var_SetInteger( p_input_thread, "spu-es", -1 );
+ else
+ var_SetInteger( p_input_thread, "spu-es", i_teletext_es );
+ }
+ }
+ vlc_object_release( p_input_thread );
}
int libvlc_video_destroy( libvlc_media_player_t *p_mi,
projects / vlc / blobdiff