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 )
}
vlc_object_release( p_input );
}
+ else
+ {
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "No active input" );
+ }
return p_vout;
}
void libvlc_video_set_key_input( libvlc_media_player_t *p_mi, unsigned on )
{
- p_mi->keyboard_events = !!on;
+ var_SetBool (p_mi, "keyboard-events", !!on);
}
void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned on )
{
- p_mi->mouse_events = !!on;
+ var_SetBool (p_mi, "mouse-events", !!on);
}
void
int libvlc_media_player_has_vout( 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);
bool has_vout = false;
if( p_input_thread )
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 )
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 );
+ 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;
+ }
i_spu_count = var_CountChoices( p_input_thread, "spu-es" );
libvlc_video_get_spu_description( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
- 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;
+ if( !p_input_thread )
+ {
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "No active input" );
+ return;
+ }
var_Change( p_input_thread, "spu-es", VLC_VAR_GETCHOICES, &val_list, NULL );
const char *psz_subtitle,
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 );
bool b_ret = false;
if( p_input_thread )
libvlc_video_get_title_description( libvlc_media_player_t *p_mi,
libvlc_exception_t * p_e )
{
- return libvlc_get_track_description( p_mi, "title", p_e);
+ return libvlc_get_track_description( p_mi, "title" );
}
libvlc_track_description_t *
{
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,
}
}
-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;
-
- 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;
-#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;
-
- if( !p_vout ) return;
-
- p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi",
- FIND_CHILD );
- 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 );
-#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;
- 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;
-#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 )
- {
- 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
-#endif
if( b_selected )
{
var_SetInteger( p_input_thread, "spu-es", -1 );
int libvlc_video_get_track_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 );
+ input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
int i_track_count;
if( !p_input_thread )
libvlc_video_get_track_description( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
- 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;
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 );
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;
vlc_object_release( p_vout );
}
-/*****************************************************************************
- * Marquee: FIXME: That implementation has no persistent state and requires
- * a vout
- *****************************************************************************/
-static const char *get_marquee_int_option_identifier(unsigned option)
-{
- static const char tab[][16] =
- {
- "marq",
- "marq-color",
- "marq-opacity",
- "marq-position",
- "marq-refresh",
- "marq-size",
- "marq-timeout",
- "marq-x",
- "marq-y",
- };
- if( option >= sizeof( tab ) / sizeof( tab[0] ) )
- return NULL;
- return tab[option];
-}
+/* ************** */
+/* module helpers */
+/* ************** */
+
-static const char *get_marquee_string_option_identifier(unsigned option)
+static vlc_object_t *get_object( libvlc_media_player_t * p_mi,
+ const char *name, libvlc_exception_t *p_e )
{
- static const char tab[][16] =
+ vlc_object_t *object = NULL;
+ vout_thread_t *vout = GetVout( p_mi, p_e );
+ libvlc_exception_clear( p_e );
+ if( vout )
{
- "marq-marquee",
- };
- if( option >= sizeof( tab ) / sizeof( tab[0] ) )
- return NULL;
- return tab[option];
+ 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;
}
-static vlc_object_t *get_marquee_object( libvlc_media_player_t * p_mi )
-{
- libvlc_exception_t e;
- libvlc_exception_init(&e);
- vout_thread_t * vout = GetVout( p_mi, &e );
- libvlc_exception_clear(&e);
- if( !vout )
- return NULL;
- vlc_object_t * object = vlc_object_find_name( vout, "marq", FIND_CHILD );
- vlc_object_release(vout);
- return object;
-}
+typedef const struct {
+ const char name[20]; /* probably will become a const char * sometime */
+ unsigned type;
+} opt_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 )
+
+static void
+set_int( libvlc_media_player_t *p_mi, const char *name,
+ const opt_t *opt, int value, libvlc_exception_t *p_e )
{
- const char * identifier = get_marquee_int_option_identifier(option);
- if(!identifier)
+ if( !opt ) return;
+
+ if( !opt->type ) /* the enabler */
{
- libvlc_exception_raise( p_e );
- libvlc_printerr( "Unknown marquee option" );
- return 0;
+ 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 * marquee = get_marquee_object(p_mi);
- /* Handle the libvlc_marquee_Enable separately */
- if(option == libvlc_marquee_Enable)
+ vlc_object_t *object = get_object( p_mi, name, p_e );
+ if( !object ) return;
+
+ switch( opt->type )
{
- bool isEnabled = marquee != NULL;
- vlc_object_release(marquee);
- return isEnabled;
+ 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 );
+}
+
- /* Generic case */
- if(!identifier)
+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( "Marquee not enabled" );
- return 0;
+ libvlc_printerr( "Invalid argument for %s in %s", name, "get int" );
+ ret = 0;
+ break;
}
-#warning This and the next function may crash due to type checking!
- int ret = var_GetInteger(marquee, identifier);
- vlc_object_release(marquee);
+ vlc_object_release( object );
return ret;
}
-/*****************************************************************************
- * 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 )
+
+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 )
{
- const char * identifier = get_marquee_string_option_identifier(option);
- if(!identifier)
+ 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( "Unknown marquee option" );
- return NULL;
+ libvlc_printerr( "Invalid argument for %s in %s", name, "set string" );
+ break;
}
+ vlc_object_release( object );
+}
- vlc_object_t * marquee = get_marquee_object(p_mi);
- if(!marquee)
+
+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( "Marquee not enabled" );
- return NULL;
+ libvlc_printerr( "Invalid argument for %s in %s", name, "get string" );
+ ret = NULL;
+ break;
}
- char *ret = var_GetString(marquee, identifier);
- vlc_object_release(marquee);
+ vlc_object_release( object );
return ret;
}
+
/*****************************************************************************
- * libvlc_video_set_marquee_int: enable, disable or set an int option
+ * Marquee: FIXME: That implementation has no persistent state and requires
+ * a vout
*****************************************************************************/
-void libvlc_video_set_marquee_int( libvlc_media_player_t *p_mi,
- unsigned option, int value, libvlc_exception_t *p_e )
-{
- const char * identifier = get_marquee_int_option_identifier(option);
- if(!identifier)
- {
- libvlc_exception_raise( p_e );
- libvlc_printerr( "Unknown marquee option" );
- return;
- }
- /* Handle the libvlc_marquee_Enable separately */
- if(option == libvlc_marquee_Enable)
- {
- libvlc_exception_t e;
- libvlc_exception_init(&e);
- vout_thread_t * vout = GetVout( p_mi, &e );
- libvlc_exception_clear(&e);
- if (vout)
- {
- vout_EnableFilter(vout, identifier, value, false);
- vlc_object_release(vout);
- }
- return;
- }
+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) };
- vlc_object_t * marquee = get_marquee_object(p_mi);
- if(!marquee)
+ opt_t *r = option < num_opts ? optlist+option : NULL;
+ if( !r )
{
libvlc_exception_raise( p_e );
- libvlc_printerr( "Marquee not enabled" );
- return;
+ libvlc_printerr( "Unknown marquee option" );
}
- var_SetInteger(marquee, identifier, value);
- vlc_object_release(marquee);
+ return r;
}
+static vlc_object_t *get_object( libvlc_media_player_t *,
+ const char *, libvlc_exception_t *);
+
/*****************************************************************************
- * libvlc_video_set_marquee_string: set a string option
+ * libvlc_video_get_marquee_int : get a marq option value
*****************************************************************************/
-void libvlc_video_set_marquee_string( libvlc_media_player_t *p_mi,
- unsigned option, const char * value, libvlc_exception_t *p_e )
+int libvlc_video_get_marquee_int( libvlc_media_player_t *p_mi,
+ unsigned option, libvlc_exception_t *p_e )
{
- const char * identifier = get_marquee_string_option_identifier(option);
- if(!identifier)
- {
- 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 );
- libvlc_printerr( "Marquee not enabled" );
- return;
- }
- var_SetString(marquee, identifier, value);
- vlc_object_release(marquee);
+ 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 );
+}
-/* logo module support */
+/*****************************************************************************
+ * 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 );
+}
-static vlc_object_t *get_logo_object( libvlc_media_player_t * p_mi,
- libvlc_exception_t *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 )
{
- 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, "logo", FIND_CHILD );
- vlc_object_release(vout);
- }
- if( !object )
- {
- libvlc_exception_raise( p_e );
- libvlc_printerr( "Logo not enabled" );
- }
- return object;
+ set_string( p_mi, "marq", marq_option_bynumber(option,p_e), value, p_e );
}
-typedef const struct vlogo_opt {
- const char name[16];
- unsigned type;
-} vlogo_opt_t;
+/* logo module support */
-static vlogo_opt_t *
+static opt_t *
logo_option_bynumber( unsigned option, libvlc_exception_t *p_e )
{
-# define CFG_PREFIX "logo-"
- vlogo_opt_t vlogo_optlist[] = /* depends on libvlc_video_logo_option_t */
+ opt_t vlogo_optlist[] = /* depends on libvlc_video_logo_option_t */
{
{ "logo", 0 },
{ "logo-file", VLC_VAR_STRING },
{ "logo-opacity", VLC_VAR_INTEGER },
{ "logo-position", VLC_VAR_INTEGER },
};
-# undef CFG_PREFIX
enum { num_vlogo_opts = sizeof(vlogo_optlist) / sizeof(*vlogo_optlist) };
- vlogo_opt_t *r = option < num_vlogo_opts ? vlogo_optlist+option : NULL;
+ opt_t *r = option < num_vlogo_opts ? vlogo_optlist+option : NULL;
if( !r )
{
libvlc_exception_raise( p_e );
- libvlc_printerr( "Unknown marquee option" );
+ libvlc_printerr( "Unknown logo option" );
}
return r;
}
unsigned option, const char *psz_value,
libvlc_exception_t *p_e )
{
- vlogo_opt_t *opt = logo_option_bynumber( option, p_e );
- printf("logo set string (%u)%s = %s.\n", option,
- (opt?(opt->name):"<unkn>"),(psz_value?psz_value:"<null>"));
- if( !opt ) return;
- vlc_object_t *logo = get_logo_object( p_mi, p_e );
- if( !logo ) return;
-
- switch( opt->type )
- {
- case VLC_VAR_STRING:
- var_SetString( logo, opt->name, psz_value );
- break;
- default:
- libvlc_exception_raise( p_e );
- libvlc_printerr( "Invalid argument" );
- break;
- }
- vlc_object_release(logo);
+ set_string( p_mi,"logo",logo_option_bynumber(option,p_e),psz_value,p_e );
}
unsigned option, int value,
libvlc_exception_t *p_e )
{
- vlogo_opt_t *opt = logo_option_bynumber( option, p_e );
- printf("logo set integer (%u)%s = %i.\n",
- option, (opt?(opt->name):"<unkn>"),value);
- if( !opt ) return;
-
- if( !opt->type ) /* libvlc_logo_enable */
- {
- 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 *logo = get_logo_object( p_mi, p_e );
- if( !logo ) return;
-
- switch( opt->type )
- {
- case VLC_VAR_INTEGER:
- var_SetInteger(logo, opt->name, value);
- break;
- default:
- libvlc_exception_raise( p_e );
- libvlc_printerr( "Invalid argument" );
- break;
- }
- vlc_object_release(logo);
+ 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 )
{
- vlogo_opt_t *opt = logo_option_bynumber( option, p_e );
- printf("logo get integer (%u)%s.\n", option, opt?opt->name:"<unkn>");
- if( !opt ) return 0;
+ return get_int( p_mi, "logo", logo_option_bynumber(option,p_e), p_e );
+}
- vlc_object_t *logo = get_logo_object( p_mi, p_e );
- if( !logo ) return 0;
- int ret;
- switch( opt->type )
- {
- case 0: /* libvlc_logo_enable */
- ret = NULL != logo;
- break;
- case VLC_VAR_INTEGER:
- ret = var_GetInteger(logo, opt->name);
- break;
- default:
- libvlc_exception_raise( p_e );
- libvlc_printerr( "Invalid argument" );
- ret = 0;
- break;
- }
- vlc_object_release(logo);
- return ret;
-}
projects / vlc / blobdiff