diff nav_print.c @ 13:4e610984cc3f src

added dvdread_print_time() and removed the file-static print_time() in nav_print.c; based on a patch by Erik Hovland org
author nicodvb
date Thu, 24 Jul 2008 22:03:06 +0000
parents fdbae45c30fc
children 26068a8f3927
line wrap: on
line diff
--- a/nav_print.c	Wed Jul 16 07:46:33 2008 +0000
+++ b/nav_print.c	Thu Jul 24 22:03:06 2008 +0000
@@ -32,33 +32,6 @@
 #include "nav_print.h"
 #include "dvdread_internal.h"
 
-static void print_time(dvd_time_t *dtime) {
-  const char *rate;
-  CHECK_VALUE((dtime->hour>>4) < 0xa && (dtime->hour&0xf) < 0xa);
-  CHECK_VALUE((dtime->minute>>4) < 0x7 && (dtime->minute&0xf) < 0xa);
-  CHECK_VALUE((dtime->second>>4) < 0x7 && (dtime->second&0xf) < 0xa);
-  CHECK_VALUE((dtime->frame_u&0xf) < 0xa);
-  
-  printf("%02x:%02x:%02x.%02x", 
-	 dtime->hour,
-	 dtime->minute,
-	 dtime->second,
-	 dtime->frame_u & 0x3f);
-  switch((dtime->frame_u & 0xc0) >> 6) {
-  case 1:
-    rate = "25.00";
-    break;
-  case 3:
-    rate = "29.97";
-    break;
-  default:
-    rate = "(please send a bug report)";
-    break;
-  } 
-  printf(" @ %s fps", rate);
-}
-
-
 static void navPrint_PCI_GI(pci_gi_t *pci_gi) {
   int i;
 
@@ -70,7 +43,7 @@
   printf("vobu_e_ptm    0x%08x\n", pci_gi->vobu_e_ptm);
   printf("vobu_se_e_ptm 0x%08x\n", pci_gi->vobu_se_e_ptm);
   printf("e_eltm        ");
-  print_time(&pci_gi->e_eltm);
+  dvdread_print_time(&pci_gi->e_eltm);
   printf("\n");
   
   printf("vobu_isrc     \"");
@@ -201,7 +174,7 @@
   printf("vobu_vob_idn   0x%04x\n", dsi_gi->vobu_vob_idn);
   printf("vobu_c_idn     0x%02x\n", dsi_gi->vobu_c_idn);
   printf("c_eltm         ");
-  print_time(&dsi_gi->c_eltm);
+  dvdread_print_time(&dsi_gi->c_eltm);
   printf("\n");
 }