X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fvideo.c;h=3cec0029642087fcbc525eb067387fb15bc3a2fc;hb=e49d07aa5168d20550034383ab95d9fed15e0263;hp=e4720e9fbe9a1762bf39ca7afd6aecafc24212a9;hpb=72beea095e3e3f68357d342a5622785ebffeaab6;p=vlc diff --git a/src/control/video.c b/src/control/video.c index e4720e9fbe..3cec002964 100644 --- a/src/control/video.c +++ b/src/control/video.c @@ -1,7 +1,7 @@ /***************************************************************************** * video.c: libvlc new API video functions ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2010 the VideoLAN team * * $Id$ * @@ -25,6 +25,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -35,6 +39,7 @@ #include "media_player_internal.h" #include +#include /* * Remember to release the returned vout_thread_t. @@ -50,7 +55,8 @@ static vout_thread_t *GetVout( libvlc_media_player_t *p_mi, 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 ); } @@ -97,33 +103,38 @@ void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi, { /* 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 ); } +void libvlc_video_set_key_input( libvlc_media_player_t *p_mi, unsigned on ) +{ + p_mi->keyboard_events = !!on; +} + +void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned on ) +{ + p_mi->mouse_events = !!on; +} + void libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, const char *psz_filepath, unsigned int i_width, unsigned int i_height, libvlc_exception_t *p_e ) { 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; } @@ -222,10 +233,10 @@ void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale, 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 ); @@ -233,7 +244,7 @@ char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi, } 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; @@ -241,11 +252,12 @@ void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, 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, @@ -263,8 +275,9 @@ 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; } @@ -316,15 +329,11 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu, 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; } @@ -332,7 +341,8 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu, 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: @@ -341,7 +351,7 @@ 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 ); @@ -387,7 +397,7 @@ char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi, } 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; @@ -395,62 +405,19 @@ void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, 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 ); -} - -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_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; -} -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_CHILD ); - if( p_vbi ) + if( i_ret ) { - 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" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Bad or unsupported cropping geometry" ); } - vlc_object_release( p_vout ); } 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; @@ -461,32 +428,7 @@ void libvlc_toggle_teletext( libvlc_media_player_t *p_mi, return; } const bool b_selected = var_GetInteger( p_input_thread, "teletext-es" ) >= 0; - - 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 if( b_selected ) + if( b_selected ) { var_SetInteger( p_input_thread, "spu-es", -1 ); } @@ -542,7 +484,8 @@ int libvlc_video_get_track( libvlc_media_player_t *p_mi, 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; } @@ -575,17 +518,16 @@ void libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track, 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 ); @@ -601,206 +543,299 @@ void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi, int b_enable, 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 ) { /* be sure that the filter name given is supported */ if( !strcmp(psz_mode, "blend") || !strcmp(psz_mode, "bob") || !strcmp(psz_mode, "discard") || !strcmp(psz_mode, "linear") - || !strcmp(psz_mode, "mean") || !strcmp(psz_mode, "x") ) + || !strcmp(psz_mode, "mean") || !strcmp(psz_mode, "x") + || !strcmp(psz_mode, "yadif") || !strcmp(psz_mode, "yadif2x") ) { /* set deinterlace filter chosen */ - var_SetString( p_vout, "deinterlace", psz_mode ); + var_SetString( p_vout, "deinterlace-mode", psz_mode ); + var_SetInteger( p_vout, "deinterlace", 1 ); } else { - libvlc_exception_raise( p_e, "Unsuported or bad deinterlace filter name" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Bad or unsupported deinterlacing mode" ); } } else { /* disable deinterlace filter */ - var_SetString( p_vout, "deinterlace", "" ); + var_SetInteger( p_vout, "deinterlace", 0 ); } 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_option_as_int : get a marq option value - *****************************************************************************/ -int libvlc_video_get_marquee_option_as_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, "This option is not available" ); - 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_Enabled separately */ - if(option == libvlc_marquee_Enabled) + 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; } - - /* Generic case */ - if(!identifier) + vlc_object_release( object ); +} + + +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 ) { - libvlc_exception_raise( p_e, "Marquee is not enabled" ); - return 0; + 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( "Invalid argument for %s in %s", name, "get int" ); + ret = 0; + break; } - int ret = var_GetInteger(marquee, identifier); - vlc_object_release(marquee); + vlc_object_release( object ); return ret; } -/***************************************************************************** - * libvlc_video_get_marquee_option_as_string : get a marq option value - *****************************************************************************/ -char * libvlc_video_get_marquee_option_as_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 ) { - libvlc_exception_raise( p_e, "This option is not available" ); - return 0; + case VLC_VAR_STRING: + var_SetString( object, opt->name, psz_value ); + break; + default: + libvlc_exception_raise( p_e ); + libvlc_printerr( "Invalid argument for %s in %s", name, "set string" ); + break; } - - vlc_object_t * marquee = get_marquee_object(p_mi); - if(!marquee) + vlc_object_release( object ); +} + + +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 ) { - libvlc_exception_raise( p_e, "Marquee is not enabled" ); - return 0; + case VLC_VAR_STRING: + ret = var_GetString( object, opt->name ); + break; + default: + libvlc_exception_raise( p_e ); + 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_option_as_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_option_as_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, "This option is not available" ); - return; - } - /* Handle the libvlc_marquee_Enabled separately */ - if(option == libvlc_marquee_Enabled) - { - 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); - } - else - { - libvlc_exception_raise( p_e, "No 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, "Marquee is not enabled" ); - return; + libvlc_exception_raise( p_e ); + 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_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 ) +{ + 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 ); +} + +/***************************************************************************** + * 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 ); } /***************************************************************************** - * libvlc_video_set_marquee_option_as_string: set a string option + * libvlc_video_set_marquee_string: set a string option *****************************************************************************/ -void libvlc_video_set_marquee_option_as_string( libvlc_media_player_t *p_mi, - unsigned option, - const char * value, - libvlc_exception_t *p_e ) +void libvlc_video_set_marquee_string( libvlc_media_player_t *p_mi, + unsigned option, const char * value, libvlc_exception_t *p_e ) +{ + set_string( p_mi, "marq", marq_option_bynumber(option,p_e), value, p_e ); +} + + +/* logo module support */ + + +static opt_t * +logo_option_bynumber( unsigned option, libvlc_exception_t *p_e ) { - const char * identifier = get_marquee_string_option_identifier(option); - if(!identifier) + opt_t vlogo_optlist[] = /* depends on libvlc_video_logo_option_t */ { - libvlc_exception_raise( p_e, "This option is not available" ); - return; - } - vlc_object_t * marquee = get_marquee_object(p_mi); - if(!marquee) + { "logo", 0 }, + { "logo-file", VLC_VAR_STRING }, + { "logo-x", VLC_VAR_INTEGER }, + { "logo-y", VLC_VAR_INTEGER }, + { "logo-delay", VLC_VAR_INTEGER }, + { "logo-repeat", VLC_VAR_INTEGER }, + { "logo-opacity", VLC_VAR_INTEGER }, + { "logo-position", VLC_VAR_INTEGER }, + }; + enum { num_vlogo_opts = sizeof(vlogo_optlist) / sizeof(*vlogo_optlist) }; + + opt_t *r = option < num_vlogo_opts ? vlogo_optlist+option : NULL; + if( !r ) { - libvlc_exception_raise( p_e, "Marquee is not enabled" ); - return; + libvlc_exception_raise( p_e ); + libvlc_printerr( "Unknown logo option" ); } - var_SetString(marquee, identifier, value); - vlc_object_release(marquee); + return r; +} + + +void libvlc_video_set_logo_string( libvlc_media_player_t *p_mi, + unsigned option, const char *psz_value, + libvlc_exception_t *p_e ) +{ + set_string( p_mi,"logo",logo_option_bynumber(option,p_e),psz_value,p_e ); +} + + +void libvlc_video_set_logo_int( libvlc_media_player_t *p_mi, + unsigned option, int value, + libvlc_exception_t *p_e ) +{ + 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 ) +{ + return get_int( p_mi, "logo", logo_option_bynumber(option,p_e), p_e ); } + +