Mercurial > mplayer.hg

changeset 15789:32d9c8a0a02b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
author gpoirier
date Mon, 20 Jun 2005 23:07:35 +0000
parents 76d4857b91d0
children 3d77e868023d
files libaf/af.c libao2/audio_out.c libmpcodecs/dec_audio.c libmpcodecs/dec_video.c libmpdemux/demuxer.c libvo/video_out.c libvo/x11_common.c m_option.c mplayer.c
diffstat 9 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libaf/af.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/libaf/af.c	Mon Jun 20 23:07:35 2005 +0000
@@ -690,6 +690,8 @@
 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);
--- a/libao2/audio_out.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/libao2/audio_out.c	Mon Jun 20 23:07:35 2005 +0000
@@ -129,6 +129,8 @@
 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);
--- a/libmpcodecs/dec_audio.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/libmpcodecs/dec_audio.c	Mon Jun 20 23:07:35 2005 +0000
@@ -32,6 +32,8 @@
 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])
--- a/libmpcodecs/dec_video.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/libmpcodecs/dec_video.c	Mon Jun 20 23:07:35 2005 +0000
@@ -152,6 +152,8 @@
 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",
--- a/libmpdemux/demuxer.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/libmpdemux/demuxer.c	Mon Jun 20 23:07:35 2005 +0000
@@ -1603,7 +1603,11 @@
 
     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;
 }
--- a/libvo/video_out.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/libvo/video_out.c	Mon Jun 20 23:07:35 2005 +0000
@@ -260,6 +260,8 @@
 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);
--- a/libvo/x11_common.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/libvo/x11_common.c	Mon Jun 20 23:07:35 2005 +0000
@@ -220,6 +220,8 @@
 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");
--- a/m_option.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/m_option.c	Mon Jun 20 23:07:35 2005 +0000
@@ -1539,6 +1539,8 @@
   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),
--- a/mplayer.c	Mon Jun 20 20:46:46 2005 +0000
+++ b/mplayer.c	Mon Jun 20 23:07:35 2005 +0000
@@ -1224,12 +1224,16 @@
 #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 @@
     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