* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/libvlc.h>
#include <vlc/libvlc_media.h>
#include <vlc/libvlc_media_player.h>
#include "media_player_internal.h"
#include <vlc_osd.h>
+#include <assert.h>
/*
* Remember to release the returned vout_thread_t.
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 );
}
{
/* 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 );
}
{
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;
}
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,
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 );
- if( val_list.p_list->i_count == 0 )
- {
- libvlc_exception_raise( p_e, "Subtitle value out of range" );
- goto end;
- }
-
- if( (i_spu < 0) && (i_spu > val_list.p_list->i_count) )
+ 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:
}
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 );
}
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 );
+
+ 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;
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;
"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 )
{
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);
if( !p_input_thread ) return;
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 )
}
vlc_object_release( p_vbi );
}
- else if( b_selected )
+ else
+#endif
+ if( b_selected )
{
var_SetInteger( p_input_thread, "spu-es", -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;
}
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, "video-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_FreeList( &val_list, NULL );
vlc_object_release( p_input_thread );
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( !p_vout )
- {
- libvlc_exception_raise( p_e, "Unable to get video output" );
return;
- }
if( b_enable )
{
|| !strcmp(psz_mode, "mean") || !strcmp(psz_mode, "x") )
{
/* set deinterlace filter chosen */
- var_SetString( p_vout, "deinterlace", psz_mode );
+ var_SetString( p_vout, "deinterlace-mode", psz_mode );
}
else
{
- libvlc_exception_raise( p_e, "Unsuported or bad deinterlace filter name" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Bad or unsuported deinterlacing mode" );
}
}
else
{
/* disable deinterlace filter */
- var_SetString( p_vout, "deinterlace", "" );
+ var_SetString( p_vout, "deinterlace-mode", "" );
}
vlc_object_release( p_vout );
* a vout
*****************************************************************************/
-static inline const char * get_marquee_int_option_identifier(unsigned option)
+static const char *get_marquee_int_option_identifier(unsigned option)
{
- static const char * marquee_table[] =
+ static const char tab[][16] =
{
"marq",
"marq-color",
"marq-size",
"marq-timeout",
"marq-x",
- "marq-y"
+ "marq-y",
};
- static const unsigned marquee_table_size = sizeof(marquee_table)/sizeof(*marquee_table);
- if( option >= marquee_table_size )
+ if( option >= sizeof( tab ) / sizeof( tab[0] ) )
return NULL;
- return marquee_table[option];
+ return tab[option];
}
-static inline const char * get_marquee_string_option_identifier(unsigned option)
+static const char *get_marquee_string_option_identifier(unsigned option)
{
- static const char * marquee_table[] =
+ static const char tab[][16] =
{
- "marq-marquee"
+ "marq-marquee",
};
- static const unsigned marquee_table_size = sizeof(marquee_table)/sizeof(*marquee_table);
- if( option >= marquee_table_size )
+ if( option >= sizeof( tab ) / sizeof( tab[0] ) )
return NULL;
- return marquee_table[option];
+ return tab[option];
}
-static inline vlc_object_t * get_marquee_object( libvlc_media_player_t * p_mi )
+static vlc_object_t *get_marquee_object( libvlc_media_player_t * p_mi )
{
libvlc_exception_t e;
libvlc_exception_init(&e);
const char * identifier = get_marquee_int_option_identifier(option);
if(!identifier)
{
- libvlc_exception_raise( p_e, "This option is not available" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Unknown marquee option" );
return 0;
}
vlc_object_t * marquee = get_marquee_object(p_mi);
vlc_object_release(marquee);
return isEnabled;
}
-
+
/* Generic case */
if(!identifier)
{
- libvlc_exception_raise( p_e, "Marquee is not enabled" );
+ 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;
const char * identifier = get_marquee_string_option_identifier(option);
if(!identifier)
{
- libvlc_exception_raise( p_e, "This option is not available" );
- return 0;
+ 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, "Marquee is not enabled" );
- return 0;
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Marquee not enabled" );
+ return NULL;
}
char *ret = var_GetString(marquee, identifier);
vlc_object_release(marquee);
const char * identifier = get_marquee_int_option_identifier(option);
if(!identifier)
{
- libvlc_exception_raise( p_e, "This option is not available" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Unknown marquee option" );
return;
}
vout_thread_t * vout = GetVout( p_mi, &e );
libvlc_exception_clear(&e);
if (vout)
+ {
vout_EnableFilter(vout, identifier, value, false);
- else
- libvlc_exception_raise( p_e, "No Vout" );
- vlc_object_release(vout);
+ vlc_object_release(vout);
+ }
return;
}
-
+
vlc_object_t * marquee = get_marquee_object(p_mi);
if(!marquee)
{
- libvlc_exception_raise( p_e, "Marquee is not enabled" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Marquee not enabled" );
return;
}
var_SetInteger(marquee, identifier, value);
const char * identifier = get_marquee_string_option_identifier(option);
if(!identifier)
{
- libvlc_exception_raise( p_e, "This option is not available" );
+ 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, "Marquee is not enabled" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Marquee not enabled" );
return;
}
var_SetString(marquee, identifier, value);
projects / vlc / blobdiff