From 9dd8f241ac2e7b8f35227ab2bbafa27da2978e7d Mon Sep 17 00:00:00 2001 From: gpoirier Date: Mon, 20 Jun 2005 23:07:35 +0000 Subject: adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15790 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af.c | 2 ++ libao2/audio_out.c | 2 ++ libmpcodecs/dec_audio.c | 2 ++ libmpcodecs/dec_video.c | 2 ++ libmpdemux/demuxer.c | 4 ++++ libvo/video_out.c | 2 ++ libvo/x11_common.c | 2 ++ m_option.c | 2 ++ mplayer.c | 6 ++++++ 9 files changed, 24 insertions(+) diff --git a/libaf/af.c b/libaf/af.c index 33542a3c57..1a7039bd7e 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -690,6 +690,8 @@ void af_frac_mul(frac_t *out, const frac_t *in) { void af_help (void) { int i = 0; af_msg(AF_MSG_INFO, "Available audio filters:\n"); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_FILTERS\n"); while (filter_list[i]) { if (filter_list[i]->comment && filter_list[i]->comment[0]) af_msg(AF_MSG_INFO, " %-15s: %s (%s)\n", filter_list[i]->name, filter_list[i]->info, filter_list[i]->comment); diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 38c9f27a5d..48fa799a6a 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -129,6 +129,8 @@ ao_functions_t* audio_out_drivers[] = void list_audio_out(){ int i=0; mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_OUTPUTS\n"); while (audio_out_drivers[i]) { const ao_info_t *info = audio_out_drivers[i++]->info; printf("\t%s\t%s\n", info->short_name, info->name); diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index fa7bb71307..f3a7c86fee 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -32,6 +32,8 @@ af_cfg_t af_cfg; // Configuration for audio filters void afm_help(){ int i; mp_msg(MSGT_DECAUDIO,MSGL_INFO,MSGTR_AvailableAudioFm); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_DRIVERS\n"); mp_msg(MSGT_DECAUDIO,MSGL_INFO," afm: info: (comment)\n"); for (i=0; mpcodecs_ad_drivers[i] != NULL; i++) if(mpcodecs_ad_drivers[i]->info->comment && mpcodecs_ad_drivers[i]->info->comment[0]) diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index c9185a6170..3e56a622f7 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -152,6 +152,8 @@ void uninit_video(sh_video_t *sh_video){ void vfm_help(){ int i; mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_AvailableVideoFm); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_DRIVERS\n"); mp_msg(MSGT_DECVIDEO,MSGL_INFO," vfm: info: (comment)\n"); for (i=0; mpcodecs_vd_drivers[i] != NULL; i++) mp_msg(MSGT_DECVIDEO,MSGL_INFO,"%8s %s (%s)\n", diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 7007949e90..7cea15ccd2 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1603,7 +1603,11 @@ int demux_info_print(demuxer_t *demuxer) mp_msg(MSGT_DEMUX, MSGL_INFO,MSGTR_ClipInfo); for(n = 0; info[2*n] != NULL ; n++) + { mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_%s=%s\n", info[2*n], info[2*n+1]); + } return 0; } diff --git a/libvo/video_out.c b/libvo/video_out.c index 8f72095460..da86342f06 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -260,6 +260,8 @@ vo_functions_t* video_out_drivers[] = void list_video_out(){ int i=0; mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_OUTPUTS\n"); while (video_out_drivers[i]) { const vo_info_t *info = video_out_drivers[i++]->info; printf("\t%s\t%s\n", info->short_name, info->name); diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 66e1694f6a..50034c2e1e 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -220,6 +220,8 @@ static int x11_errorhandler(Display * display, XErrorEvent * event) void fstype_help(void) { mp_msg(MSGT_VO, MSGL_INFO, MSGTR_AvailableFsType); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FULL_SCREEN_TYPES\n"); mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "none", "don't set fullscreen window layer"); diff --git a/m_option.c b/m_option.c index 0609def384..2980c0adbb 100644 --- a/m_option.c +++ b/m_option.c @@ -1539,6 +1539,8 @@ static int parse_obj_settings_list(m_option_t* opt,char *name, if(!strcmp(param,"help")) { m_obj_list_t* ol = opt->priv; mp_msg(MSGT_VFILTER,MSGL_INFO,"Available video filters:\n"); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_FILTERS\n"); for(n = 0 ; ol->list[n] ; n++) mp_msg(MSGT_VFILTER,MSGL_INFO," %-15s: %s\n", M_ST_MB(char*,ol->list[n],ol->name_off), diff --git a/mplayer.c b/mplayer.c index aea2df7da2..5bdcd853a8 100644 --- a/mplayer.c +++ b/mplayer.c @@ -1224,12 +1224,16 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ #endif if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){ mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_CODECS\n"); list_codecs(1); mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); exit_player_with_rc(NULL, 0); } if(video_codec_list && strcmp(video_codec_list[0],"help")==0){ mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_CODECS\n"); list_codecs(0); mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); exit_player_with_rc(NULL, 0); @@ -2654,6 +2658,8 @@ if(auto_quality>0){ mp_cmd_t* cmd; if(!quiet) { mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused); + if (identify) + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_PAUSED\n"); fflush(stdout); } #ifdef HAVE_NEW_GUI -- cgit v1.2.3