Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 4 insertions, 7 deletions

diff --git a/libmpdemux/vcd_read_fbsd.h b/libmpdemux/vcd_read_fbsd.h
index f4cbf2888c..c416555137 100644
--- a/libmpdemux/vcd_read_fbsd.h
+++ b/libmpdemux/vcd_read_fbsd.h
@@ -65,11 +65,8 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
     mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
     return NULL;
   }
-  if (identify)
-  {
-    mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.starting_track);
-    mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.ending_track);
-  }
+  mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_START_TRACK=%d\n", tochdr.starting_track);
+  mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_END_TRACK=%d\n", tochdr.ending_track);
   for (i=tochdr.starting_track ; i<=tochdr.ending_track + 1; i++){
       struct ioc_read_toc_single_entry tocentry;
 
@@ -92,7 +89,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
           (int)tocentry.entry.addr.msf.frame
       );
 
-      if (identify)
+      if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
       {
         if (i > tochdr.starting_track)
         {
@@ -109,7 +106,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
             sec += 60;
             min --;
           }
-          mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
+          mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
         }
         min = tocentry.entry.addr.msf.minute;
         sec = tocentry.entry.addr.msf.second;