libdvdnav merge:

* remove some unused files
* dvdnav_internal.h uses the WORDS_BIGENDIAN define from xine-lib's global config.h
* menu command filtering to avoid double commands in the same menu
* message beautification by Jeff Smith

CVS patchset: 4861
CVS date: 2003/05/16 09:56:49

9 files changed, 33 insertions, 1429 deletions

diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am
index 5704fc854..1641151e4 100644
--- a/src/input/libdvdnav/Makefile.am
+++ b/src/input/libdvdnav/Makefile.am
@@ -18,7 +18,6 @@ libdvdnav_la_SOURCES = \
 	settings.c \
 	vm.c \
 	vmcmd.c \
-	ifo_print.c \
 	ifo_read.c \
 	md5.c \
 	nav_print.c \
@@ -40,7 +39,6 @@ noinst_HEADERS = \
 	vmcmd.h \
 	read_cache.h \
 	dvd_types.h \
-	ifo_print.h \
 	ifo_read.h \
 	ifo_types.h \
 	md5.h \
diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c
index ee701ee3a..7268bd79e 100644
--- a/src/input/libdvdnav/decoder.c
+++ b/src/input/libdvdnav/decoder.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: decoder.c,v 1.10 2003/05/11 13:44:04 jcdutton Exp $
+ * $Id: decoder.c,v 1.11 2003/05/16 09:56:50 mroi Exp $
  *
  */
 
@@ -102,7 +102,7 @@ static void set_GPRM(registers_t* registers, uint8_t reg, uint16_t value) {
 static uint16_t eval_reg(command_t* command, uint8_t reg) {
   if(reg & 0x80) {
     if ((reg & 0x1f) == 20) {
-      fprintf(MSG_OUT, "libdvdnav: Suspected RCE Region Protection!!!");
+      fprintf(MSG_OUT, "libdvdnav: Suspected RCE Region Protection!!!\n");
     }
     return command->registers->SPRM[reg & 0x1f]; /*  FIXME max 24 not 32 */
   } else {
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch
index ebe45df57..c9c704f32 100644
--- a/src/input/libdvdnav/diff_against_cvs.patch
+++ b/src/input/libdvdnav/diff_against_cvs.patch
@@ -1,6 +1,6 @@
 --- src/input/libdvdnav/dvdnav.c
 +++ src/input/libdvdnav/dvdnav.c
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
    struct timeval time;
    
    /* Create a new structure */
@@ -11,11 +11,15 @@
    this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
 --- src/input/libdvdnav/dvdnav_internal.h
 +++ src/input/libdvdnav/dvdnav_internal.h
-@@ -1,3 +1,4 @@
-+/* !! DO NO EDIT THIS FILE, it is automatically generated */
- /* 
-  * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
-  * 
+@@ -35,8 +35,6 @@
+ #include <string.h>
+ #include <pthread.h>
+ 
+-#undef WORDS_BIGENDIAN
+-
+ #include "dvd_reader.h"
+ #include "ifo_read.h"
+ #include "ifo_types.h"
 --- src/input/libdvdnav/dvd_reader.c
 +++ src/input/libdvdnav/dvd_reader.c
 @@ -44,6 +44,7 @@
@@ -26,7 +30,7 @@
  #include "dvd_udf.h"
  #include "dvd_input.h"
  #include "dvd_reader.h"
-@@ -373,7 +374,7 @@
+@@ -389,7 +390,7 @@
  	    
  	    if( cdir >= 0 ) {
  		chdir( path_copy );
@@ -35,7 +39,7 @@
  		fchdir( cdir );
  		close( cdir );
  		if( new_path ) {
-@@ -538,7 +539,7 @@
+@@ -569,7 +570,7 @@
  
  static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
  {
@@ -44,7 +48,7 @@
      const char *nodirfile;
      int ret;
  
-@@ -572,7 +573,7 @@
+@@ -603,7 +604,7 @@
   */
  static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
  {
@@ -53,7 +57,7 @@
      dvd_file_t *dvd_file;
      struct stat fileinfo;
      dvd_input_t dev;
-@@ -656,7 +657,7 @@
+@@ -687,7 +688,7 @@
  static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
  {
      char filename[ MAX_UDF_FILE_NAME_LEN ];
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 90930bcdd..63076ac97 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -44,6 +44,7 @@
 #include <mntent.h>
 #endif
 
+#include "compat.h"
 #include "dvd_udf.h"
 #include "dvd_input.h"
 #include "dvd_reader.h"
@@ -389,7 +390,7 @@ dvd_reader_t *DVDOpen( const char *ppath )
 	    
 	    if( cdir >= 0 ) {
 		chdir( path_copy );
-		new_path = getcwd( NULL, PATH_MAX );
+		new_path = getcwd( NULL, XINE_PATH_MAX );
 		fchdir( cdir );
 		close( cdir );
 		if( new_path ) {
@@ -569,7 +570,7 @@ static int findDirFile( const char *path, const char *file, char *filename )
 
 static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
 {
-    char video_path[ PATH_MAX + 1 ];
+    char video_path[ XINE_PATH_MAX + 1 ];
     const char *nodirfile;
     int ret;
 
@@ -603,7 +604,7 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
  */
 static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
 {
-    char full_path[ PATH_MAX + 1 ];
+    char full_path[ XINE_PATH_MAX + 1 ];
     dvd_file_t *dvd_file;
     struct stat fileinfo;
     dvd_input_t dev;
@@ -687,7 +688,7 @@ static dvd_file_t *DVDOpenVOBUDF( dvd_reader_t *dvd, int title, int menu )
 static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
 {
     char filename[ MAX_UDF_FILE_NAME_LEN ];
-    char full_path[ PATH_MAX + 1 ];
+    char full_path[ XINE_PATH_MAX + 1 ];
     struct stat fileinfo;
     dvd_file_t *dvd_file;
     int i;
diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c
index 0b5fc59c8..2c01fd625 100644
--- a/src/input/libdvdnav/dvdnav.c
+++ b/src/input/libdvdnav/dvdnav.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: dvdnav.c,v 1.28 2003/05/11 13:44:05 jcdutton Exp $
+ * $Id: dvdnav.c,v 1.29 2003/05/16 09:56:50 mroi Exp $
  *
  */
 
@@ -51,7 +51,7 @@ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
 
   memset(&this->pci,0,sizeof(this->pci));
   memset(&this->dsi,0,sizeof(this->dsi));
-  this->last_cmd_nav_lbn = 0;
+  this->last_cmd_nav_lbn = SRI_END_OF_CELL;
 
   /* Set initial values of flags */
   this->position_current.still = 0;
@@ -782,7 +782,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf,
     
     /* release NAV menu filter, when we reach the same NAV packet again */
     if (this->last_cmd_nav_lbn == this->pci.pci_gi.nv_pck_lbn)
-      this->last_cmd_nav_lbn = 0;
+      this->last_cmd_nav_lbn = SRI_END_OF_CELL;
     
     /* Successfully got a NAV packet */
     (*event) = DVDNAV_NAV_PACKET;
diff --git a/src/input/libdvdnav/dvdnav_internal.h.in b/src/input/libdvdnav/dvdnav_internal.h.in
deleted file mode 100644
index 9ba3082fa..000000000
--- a/src/input/libdvdnav/dvdnav_internal.h.in
+++ /dev/null
@@ -1,177 +0,0 @@
-/* 
- * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
- * 
- * This file is part of libdvdnav, a DVD navigation library.
- * 
- * libdvdnav is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * libdvdnav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * $Id: dvdnav_internal.h.in,v 1.2 2003/05/11 13:44:05 jcdutton Exp $
- *
- */
-
-#ifndef DVDNAV_INTERNAL_H_INCLUDED
-#define DVDNAV_INTERNAL_H_INCLUDED
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <limits.h>
-#include <string.h>
-#include <pthread.h>
-
-@BIGENDIAN@
-
-#include "dvd_reader.h"
-#include "ifo_read.h"
-#include "ifo_types.h"
-
-/* Uncomment for VM command tracing */
-/* #define TRACE */
-
-#include "decoder.h"
-#include "dvdnav.h"
-#include "vm.h"
-#include "vmcmd.h"
-
-/* where should libdvdnav write its messages (stdout/stderr) */
-#define MSG_OUT stdout
-
-/* Maximum length of an error string */
-#define MAX_ERR_LEN 255
-
-/* Use the POSIX PATH_MAX if available */
-#ifdef PATH_MAX
-#define MAX_PATH_LEN PATH_MAX
-#else
-#define MAX_PATH_LEN 255 /* Arbitrary */
-#endif
-
-#ifndef DVD_VIDEO_LB_LEN
-#define DVD_VIDEO_LB_LEN 2048
-#endif
-
-typedef struct read_cache_s read_cache_t;
-
-/*
- * These are defined here because they are
- * not in ifo_types.h, they maybe one day 
- */
-
-#ifndef audio_status_t
-typedef struct {
-#ifdef WORDS_BIGENDIAN
-  unsigned int available     : 1;
-  unsigned int zero1         : 4;
-  unsigned int stream_number : 3;
-  uint8_t zero2;
-#else
-  uint8_t zero2;
-  unsigned int stream_number : 3;
-  unsigned int zero1         : 4;  
-  unsigned int available     : 1;
-#endif
-} ATTRIBUTE_PACKED audio_status_t;
-#endif
-
-#ifndef spu_status_t
-typedef struct {
-#ifdef WORDS_BIGENDIAN
-  unsigned int available               : 1;
-  unsigned int zero1                   : 2;
-  unsigned int stream_number_4_3       : 5;
-  unsigned int zero2                   : 3;
-  unsigned int stream_number_wide      : 5;
-  unsigned int zero3                   : 3;
-  unsigned int stream_number_letterbox : 5;
-  unsigned int zero4                   : 3;
-  unsigned int stream_number_pan_scan  : 5;
-#else
-  unsigned int stream_number_pan_scan  : 5;
-  unsigned int zero4                   : 3;
-  unsigned int stream_number_letterbox : 5;
-  unsigned int zero3                   : 3;
-  unsigned int stream_number_wide      : 5;
-  unsigned int zero2                   : 3;
-  unsigned int stream_number_4_3       : 5;
-  unsigned int zero1                   : 2;
-  unsigned int available               : 1;
-#endif
-} ATTRIBUTE_PACKED spu_status_t;
-#endif
-
-typedef struct dvdnav_vobu_s {
-  int32_t vobu_start;  /* Logical Absolute. MAX needed is 0x300000 */
-  int32_t vobu_length;
-  int32_t blockN;      /* Relative offset */
-  int32_t vobu_next;   /* Relative offset */
-} dvdnav_vobu_t;  
-   
-/** The main DVDNAV type **/
-
-struct dvdnav_s {
-  /* General data */
-  char        path[MAX_PATH_LEN]; /* Path to DVD device/dir */
-  dvd_file_t *file;               /* Currently opened file */
-  int         open_vtsN;          /* The domain and number of the... */
-  int         open_domain;        /* ..currently opened VOB */
- 
-  /* Position data */
-  vm_position_t position_next;
-  vm_position_t position_current;
-  dvdnav_vobu_t vobu;  
-
-  /* NAV data */
-  pci_t pci;
-  dsi_t dsi;
-  uint32_t last_cmd_nav_lbn;      /* detects when a command is issued on an already left NAV */
-  
-  /* Flags */
-  int skip_still;                 /* Set when skipping a still */
-  int sync_wait;                  /* applications should wait till they are in sync with us */
-  int sync_wait_skip;             /* Set when skipping wait state */
-  int spu_clut_changed;           /* The SPU CLUT changed */ 
-  int started;                    /* vm_start has been called? */
-  int use_read_ahead;             /* 1 - use read-ahead cache, 0 - don't */
-  int pgc_based;                  /* positioning works PGC based instead of PG based */
-  
-  /* VM */
-  vm_t *vm;
-  pthread_mutex_t vm_lock;
-
-  /* Read-ahead cache */
-  read_cache_t *cache;
-
-  /* Errors */
-  char err_str[MAX_ERR_LEN];
-};
-
-/** USEFUL MACROS **/
-
-#ifdef __GNUC__
-#define printerrf(format, args...) snprintf(this->err_str, MAX_ERR_LEN, format, ## args);
-#else
-#ifdef _MSC_VER
-#define printerrf(str) snprintf(this->err_str, MAX_ERR_LEN, str);
-#else
-#define printerrf(...) snprintf(this->err_str, MAX_ERR_LEN, __VA_ARGS__);
-#endif /* WIN32 */
-#endif
-#define printerr(str) strncpy(this->err_str, str, MAX_ERR_LEN);
-
-#endif /* DVDNAV_INTERNAL_H_INCLUDED */
diff --git a/src/input/libdvdnav/highlight.c b/src/input/libdvdnav/highlight.c
index 47de16097..c85f59e2c 100644
--- a/src/input/libdvdnav/highlight.c
+++ b/src/input/libdvdnav/highlight.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: highlight.c,v 1.14 2003/05/11 13:44:05 jcdutton Exp $
+ * $Id: highlight.c,v 1.15 2003/05/16 09:56:50 mroi Exp $
  *
  */
 
@@ -223,18 +223,16 @@ static btni_t *get_current_button(dvdnav_t *this, pci_t *pci) {
 
   if(!this || !pci) {
     printerr("Passed a NULL pointer.");
-    return DVDNAV_STATUS_ERR;
+    return NULL;
   }
   if(!pci->hli.hl_gi.hli_ss) {
     printerr("Not in a menu.");
-    return DVDNAV_STATUS_ERR;
+    return NULL;
   }
-#if 0  /* This causes some DVDs to fail to activate buttons. */
   if(this->last_cmd_nav_lbn == pci->pci_gi.nv_pck_lbn) {
     printerr("This NAV has already been left.");
-    return DVDNAV_STATUS_ERR;
+    return NULL;
   }
-#endif
 
   button = this->vm->state.HL_BTNN_REG >> 10;
 #ifdef BUTTON_TESTING
@@ -247,6 +245,7 @@ static btni_t *get_current_button(dvdnav_t *this, pci_t *pci) {
 static dvdnav_status_t button_auto_action(dvdnav_t *this, pci_t *pci) {
   if (get_current_button(this, pci)->auto_action_mode)
     return dvdnav_button_activate(this, pci);
+  return DVDNAV_STATUS_OK;
 }
 
 dvdnav_status_t dvdnav_upper_button_select(dvdnav_t *this, pci_t *pci) {
@@ -256,9 +255,7 @@ dvdnav_status_t dvdnav_upper_button_select(dvdnav_t *this, pci_t *pci) {
     return DVDNAV_STATUS_ERR;
 
   dvdnav_button_select(this, pci, button_ptr->up);
-  button_auto_action(this, pci);
- 
-  return DVDNAV_STATUS_OK;
+  return button_auto_action(this, pci);
 }
 
 dvdnav_status_t dvdnav_lower_button_select(dvdnav_t *this, pci_t *pci) {
@@ -268,9 +265,7 @@ dvdnav_status_t dvdnav_lower_button_select(dvdnav_t *this, pci_t *pci) {
     return DVDNAV_STATUS_ERR;
 
   dvdnav_button_select(this, pci, button_ptr->down);
-  button_auto_action(this, pci);
-  
-  return DVDNAV_STATUS_OK;
+  return button_auto_action(this, pci);
 }
 
 dvdnav_status_t dvdnav_right_button_select(dvdnav_t *this, pci_t *pci) {
@@ -280,9 +275,7 @@ dvdnav_status_t dvdnav_right_button_select(dvdnav_t *this, pci_t *pci) {
     return DVDNAV_STATUS_ERR;
 
   dvdnav_button_select(this, pci, button_ptr->right);
-  button_auto_action(this, pci);
-  
-  return DVDNAV_STATUS_OK;
+  return button_auto_action(this, pci);
 }
 
 dvdnav_status_t dvdnav_left_button_select(dvdnav_t *this, pci_t *pci) {
@@ -292,9 +285,7 @@ dvdnav_status_t dvdnav_left_button_select(dvdnav_t *this, pci_t *pci) {
     return DVDNAV_STATUS_ERR;
 
   dvdnav_button_select(this, pci, button_ptr->left);
-  button_auto_action(this, pci);
-  
-  return DVDNAV_STATUS_OK;
+  return button_auto_action(this, pci);
 }
 
 dvdnav_status_t dvdnav_get_highlight_area(pci_t *nav_pci , int32_t button, int32_t mode, 
@@ -347,12 +338,10 @@ dvdnav_status_t dvdnav_button_activate(dvdnav_t *this, pci_t *pci) {
     printerr("Not in a menu.");
     return DVDNAV_STATUS_ERR;
   }
-#if 0  /* This causes some DVDs to fail to activate buttons. */
   if(this->last_cmd_nav_lbn == pci->pci_gi.nv_pck_lbn) {
     printerr("This NAV has already been left.");
     return DVDNAV_STATUS_ERR;
   }
-#endif
   pthread_mutex_lock(&this->vm_lock); 
 
   button = this->vm->state.HL_BTNN_REG >> 10;
@@ -436,12 +425,10 @@ dvdnav_status_t dvdnav_button_select(dvdnav_t *this, pci_t *pci, int32_t button)
     printerr("Not in a menu.");
     return DVDNAV_STATUS_ERR;
   }
-#if 0  /* This causes some DVDs to fail to activate buttons. */
   if(this->last_cmd_nav_lbn == pci->pci_gi.nv_pck_lbn) {
     printerr("This NAV has already been left.");
     return DVDNAV_STATUS_ERR;
   }
-#endif
  
 #ifdef BUTTON_TESTING
   fprintf(MSG_OUT, "libdvdnav: Button select %i\n", button); 
@@ -479,12 +466,10 @@ dvdnav_status_t dvdnav_mouse_select(dvdnav_t *this, pci_t *pci, int32_t x, int32
     printerr("Not in a menu.");
     return DVDNAV_STATUS_ERR;
   }
-#if 0  /* This causes some DVDs to fail to activate buttons. */
   if(this->last_cmd_nav_lbn == pci->pci_gi.nv_pck_lbn) {
     printerr("This NAV has already been left.");
     return DVDNAV_STATUS_ERR;
   }
-#endif
 
   cur_button = this->vm->state.HL_BTNN_REG >> 10;
 
diff --git a/src/input/libdvdnav/ifo_print.c b/src/input/libdvdnav/ifo_print.c
deleted file mode 100644
index 50aeacd17..000000000
--- a/src/input/libdvdnav/ifo_print.c
+++ /dev/null
@@ -1,1148 +0,0 @@
-/* 
- * Copyright (C) 2000, 2001, 2002, 2003
- *               Björn Englund <d4bjorn@dtek.chalmers.se>, 
- *               Håkan Hjort <d95hjort@dtek.chalmers.se>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "ifo_types.h"
-#include "ifo_read.h"
-#include "ifo_print.h"
-#include "dvdread_internal.h"
-
-/* Put this in some other file / package?  It's used in nav_print too. */
-static void ifoPrint_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:
-    if(dtime->hour == 0 && dtime->minute == 0 
-       && dtime->second == 0 && dtime->frame_u == 0)
-      rate = "no";
-    else
-      rate = "(please send a bug report)";
-    break;
-  } 
-  printf(" @ %s fps", rate);
-}
-
-/* Put this in some other file / package?  It's used in nav_print too.
-   Possibly also by the vm / navigator. */
-static void ifoPrint_CMD(int row, vm_cmd_t *command) {
-  int i;
-
-  printf("(%03d) ", row + 1);
-  for(i=0;i<8;i++)
-    printf("%02x ", command->bytes[i]);
-  printf("| ");
-
-  /* vmcmd(command); */
-  printf("\n");
-}
-
-static void ifoPrint_video_attributes(video_attr_t *attr) {
-  
-  /* The following test is shorter but not correct ISO C,
-     memcmp(attr,my_friendly_zeros, sizeof(video_attr_t)) */
-  if(attr->mpeg_version == 0 
-     && attr->video_format == 0 
-     && attr->display_aspect_ratio == 0 
-     && attr->permitted_df == 0 
-     && attr->unknown1 == 0 
-     && attr->line21_cc_1 == 0 
-     && attr->line21_cc_2 == 0 
-     && attr->bit_rate == 0 
-     && attr->video_format == 0 
-     && attr->letterboxed == 0 
-     && attr->film_mode == 0) {
-    printf("-- Unspecified --");
-    return;
-  }
-  
-  switch(attr->mpeg_version) {
-  case 0:
-    printf("mpeg1 ");
-    break;
-  case 1:
-    printf("mpeg2 ");
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }
-  
-  switch(attr->video_format) {
-  case 0:
-    printf("ntsc ");
-    break;
-  case 1:
-    printf("pal ");
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }
-  
-  switch(attr->display_aspect_ratio) {
-  case 0:
-    printf("4:3 ");
-    break;
-  case 3:
-    printf("16:9 ");
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }
-  
-  /*  Wide is allways allowed..!!! */
-  switch(attr->permitted_df) {
-  case 0:
-    printf("pan&scan+letterboxed ");
-    break;
-  case 1:
-    printf("only pan&scan "); /* ?? */
-    break;
-  case 2:
-    printf("only letterboxed ");
-    break;
-  case 3:
-    /* not specified */
-    break;
-  default:
-    printf("(please send a bug report)");
-  }
-  
-  printf("U%x ", attr->unknown1);
-  CHECK_VALUE(!attr->unknown1);
-  
-  if(attr->line21_cc_1 || attr->line21_cc_2) {
-    printf("NTSC CC ");
-    if(attr->line21_cc_1)
-      printf("1 ");
-    if(attr->line21_cc_2)
-      printf("2 ");
-  }
-
-  switch(attr->bit_rate) {
-    case 0:
-      printf("Variable Bit Rate ");
-      break;
-    case 1:
-      printf("Constant Bit Rate ");
-      break;
-    default:
-      printf("(please send a bug report)");
-  }
-  
-  {
-    int height = 480;
-    if(attr->video_format != 0) 
-      height = 576;
-    switch(attr->picture_size) {
-    case 0:
-      printf("720x%d ", height);
-      break;
-    case 1:
-      printf("704x%d ", height);
-      break;
-    case 2:
-      printf("352x%d ", height);
-      break;
-    case 3:
-      printf("352x%d ", height/2);
-      break;      
-    default:
-      printf("(please send a bug report) ");
-    }
-  }
-
-  if(attr->letterboxed) {
-    printf("source letterboxed ");
-  }
-  
-  if(attr->film_mode) {
-    printf("film");
-  } else {
-    printf("video"); /* camera */
-  }
-}
-
-static void ifoPrint_audio_attributes(audio_attr_t *attr) {
-  
-  if(attr->audio_format == 0
-     && attr->multichannel_extension == 0
-     && attr->lang_type == 0
-     && attr->application_mode == 0
-     && attr->quantization == 0
-     && attr->sample_frequency == 0
-     && attr->channels == 0
-     && attr->lang_code == 0
-     && attr->lang_extension == 0
-     && attr->code_extension == 0
-     && attr->unknown3 == 0
-     && attr->unknown1 == 0) {
-    printf("-- Unspecified --");
-    return;
-  }
-  
-  switch(attr->audio_format) {
-  case 0:
-    printf("ac3 ");
-    break;
-  case 1:
-    printf("(please send a bug report) ");
-    break;
-  case 2:
-    printf("mpeg1 ");
-    break;
-  case 3:
-    printf("mpeg2ext ");
-    break;
-  case 4:
-    printf("lpcm ");
-    break;
-  case 5:
-    printf("(please send a bug report) ");
-    break;
-  case 6:
-    printf("dts ");
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }
-  
-  if(attr->multichannel_extension)
-    printf("multichannel_extension ");
-  
-  switch(attr->lang_type) {
-  case 0:
-    /* not specified */
-    CHECK_VALUE(attr->lang_code == 0 || attr->lang_code == 0xffff);
-    break;
-  case 1:
-    printf("%c%c (%c) ", attr->lang_code>>8, attr->lang_code & 0xff,
-           attr->lang_extension ? attr->lang_extension : ' ');
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }
-
-  switch(attr->application_mode) {
-  case 0:
-    /* not specified */
-    break;
-  case 1:
-    printf("karaoke mode ");
-    break;
-  case 2:
-    printf("surround sound mode ");
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }
-  
-  switch(attr->quantization) {
-  case 0:
-    printf("16bit ");
-    break;
-  case 1:
-    printf("20bit ");
-    break;
-  case 2:
-    printf("24bit ");
-    break;
-  case 3:
-    printf("drc ");
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }
-  
-  switch(attr->sample_frequency) {
-  case 0:
-    printf("48kHz ");
-    break;
-  case 1:
-    printf("??kHz ");
-    break;
-  default:
-    printf("sample_frequency %i (please send a bug report) ", 
-	   attr->sample_frequency);
-  }
-  
-  printf("%dCh ", attr->channels + 1);
-  
-  switch(attr->code_extension) {
-  case 0:
-    printf("Not specified ");
-    break;
-  case 1: /* Normal audio */
-    printf("Normal Caption ");
-    break;
-  case 2: /* visually imparied */
-    printf("Audio for visually impaired ");
-    break;
-  case 3: /* Directors 1 */
-    printf("Director's comments 1 ");
-    break;
-  case 4: /* Directors 2 */
-    printf("Director's comments 2 ");
-    break;
-    /* case 4: Music score ? */
-  default:
-    printf("(please send a bug report) ");
-  }
-    
-  printf("%d ", attr->unknown3);
-  if(attr->application_mode == 1) {
-    printf("ca=%d ", attr->app_info.karaoke.channel_assignment);
-    printf("%d ", attr->app_info.karaoke.version);
-    if(attr->app_info.karaoke.mc_intro) 
-      printf("mc intro ");
-    printf("%s ", attr->app_info.karaoke.mode ? "duet" : "solo");
-    printf("%d ", attr->app_info.karaoke.unknown4);
-  }
-  if(attr->application_mode == 2) {
-    if(attr->app_info.surround.dolby_encoded) {
-      printf("dolby surround ");
-    }
-    printf("%d ", attr->app_info.surround.unknown5);
-    printf("%d ", attr->app_info.surround.unknown6);
-  }    
-}
-
-static void ifoPrint_subp_attributes(subp_attr_t *attr) {
-  
-  if(attr->type == 0
-     && attr->code_mode == 0
-     && attr->lang_code == 0
-     && attr->lang_extension == 0
-     && attr->zero1 == 0
-     && attr->zero2 == 0
-     && attr->code_extension == 0) {
-    printf("-- Unspecified --");
-    return;
-  }
-  
-  switch(attr->code_mode) {
-  case 0:
-    printf("Coding Mode RLE ");
-    break;
-  case 1:
-    printf("Coding Mode Extended ");
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }    
- 
-  if(attr->type == 1) {
-    if(isalpha((int)(attr->lang_code >> 8))
-       && isalpha((int)(attr->lang_code & 0xff))) {
-      printf("%c%c ", attr->lang_code >> 8, attr->lang_code & 0xff);
-    } else {
-      printf("%02x%02x ", attr->lang_code >> 8, attr->lang_code & 0xff);
-    }
-  } else {
-      printf("lang not specified ");
-  }
-  
-  printf("%d ", attr->zero1);
-  printf("%d ", attr->zero2);
-  printf("%d ", attr->code_extension);
-  
-  /* Is this correct?  should it not be subp_code_ext here instead? */
-  switch(attr->lang_extension) {
-  case 0:
-    printf("Not specified ");
-    break;
-  case 1:
-    printf("Caption with normal size character ");
-    break;
-  case 2:
-    printf("Caption with bigger size character ");
-    break;
-  case 3: 
-    printf("Caption for children ");
-    break;
-  case 4:
-    printf("reserved ");
-    break;
-  case 5:
-    printf("Closed Caption with normal size character ");
-    break;
-  case 6:
-    printf("Closed Caption with bigger size character ");
-    break;
-  case 7:
-    printf("Closed Caption for children ");
-    break;
-  case 8:
-    printf("reserved ");
-    break;
-  case 9:
-    printf("Forced Caption");
-    break;
-  case 10:
-    printf("reserved ");
-    break;
-  case 11:
-    printf("reserved ");
-    break;
-  case 12:
-    printf("reserved ");
-    break;
-  case 13:
-    printf("Director's comments with normal size character ");
-    break;
-  case 14:
-    printf("Director's comments with bigger size character ");
-    break;
-  case 15:
-    printf("Director's comments for children ");
-    break;
-  default:
-    printf("(please send a bug report) ");
-  }
-
-}
-
-
-static void ifoPrint_USER_OPS(user_ops_t *user_ops) {
-  uint32_t uops;
-  unsigned char *ptr = (unsigned char *)user_ops;
-  
-  uops  = (*ptr++ << 24);
-  uops |= (*ptr++ << 16);
-  uops |= (*ptr++ << 8);
-  uops |= (*ptr++);
-  
-  if(uops == 0) {
-    printf("None\n");
-  } else if(uops == 0x01ffffff) {
-    printf("All\n");
-  } else {
-    if(user_ops->title_or_time_play)
-      printf("Title or Time Play, ");
-    if(user_ops->chapter_search_or_play)
-      printf("Chapter Search or Play, ");
-    if(user_ops->title_play)
-      printf("Title Play, ");
-    if(user_ops->stop)
-      printf("Stop, ");
-    if(user_ops->go_up)
-      printf("Go Up, ");
-    if(user_ops->time_or_chapter_search)
-      printf("Time or Chapter Search, ");
-    if(user_ops->prev_or_top_pg_search)
-      printf("Prev or Top PG Search, ");
-    if(user_ops->next_pg_search)
-      printf("Next PG Search, ");
-    if(user_ops->forward_scan)
-      printf("Forward Scan, ");
-    if(user_ops->backward_scan)
-      printf("Backward Scan, ");
-    if(user_ops->title_menu_call)
-      printf("Title Menu Call, ");
-    if(user_ops->root_menu_call)
-      printf("Root Menu Call, ");
-    if(user_ops->subpic_menu_call)
-      printf("SubPic Menu Call, ");
-    if(user_ops->audio_menu_call)
-      printf("Audio Menu Call, ");
-    if(user_ops->angle_menu_call)
-      printf("Angle Menu Call, ");
-    if(user_ops->chapter_menu_call)
-      printf("Chapter Menu Call, ");
-    if(user_ops->resume)
-      printf("Resume, ");
-    if(user_ops->button_select_or_activate)
-      printf("Button Select or Activate, ");
-    if(user_ops->still_off)
-      printf("Still Off, ");
-    if(user_ops->pause_on)
-      printf("Pause On, ");
-    if(user_ops->audio_stream_change)
-      printf("Audio Stream Change, ");
-    if(user_ops->subpic_stream_change)
-      printf("SubPic Stream Change, ");
-    if(user_ops->angle_change)
-      printf("Angle Change, ");
-    if(user_ops->karaoke_audio_pres_mode_change)
-      printf("Karaoke Audio Pres Mode Change, ");
-    if(user_ops->video_pres_mode_change)
-      printf("Video Pres Mode Change, ");
-    printf("\n");
-  }
-}
-
-
-void ifoPrint_VMGI_MAT(vmgi_mat_t *vmgi_mat) {
-  
-  printf("VMG Identifier: %.12s\n", vmgi_mat->vmg_identifier);
-  printf("Last Sector of VMG: %08x\n", vmgi_mat->vmg_last_sector);
-  printf("Last Sector of VMGI: %08x\n", vmgi_mat->vmgi_last_sector);
-  printf("Specification version number: %01x.%01x\n", 
-	 vmgi_mat->specification_version >> 4, 
-	 vmgi_mat->specification_version & 0xf);
-  /* Byte 2 of 'VMG Category' (00xx0000) is the Region Code */
-  printf("VMG Category: %08x\n", vmgi_mat->vmg_category);
-  printf("VMG Number of Volumes: %i\n", vmgi_mat->vmg_nr_of_volumes);
-  printf("VMG This Volume: %i\n", vmgi_mat->vmg_this_volume_nr);
-  printf("Disc side %i\n", vmgi_mat->disc_side);
-  printf("VMG Number of Title Sets %i\n", vmgi_mat->vmg_nr_of_title_sets);
-  printf("Provider ID: %.32s\n", vmgi_mat->provider_identifier);
-  printf("VMG POS Code: %08x", (uint32_t)(vmgi_mat->vmg_pos_code >> 32));
-  printf("%08x\n", (uint32_t)vmgi_mat->vmg_pos_code);
-  printf("End byte of VMGI_MAT: %08x\n", vmgi_mat->vmgi_last_byte);
-  printf("Start byte of First Play PGC FP PGC: %08x\n", 
-	 vmgi_mat->first_play_pgc);
-  printf("Start sector of VMGM_VOBS: %08x\n", vmgi_mat->vmgm_vobs);
-  printf("Start sector of TT_SRPT: %08x\n", vmgi_mat->tt_srpt);
-  printf("Start sector of VMGM_PGCI_UT: %08x\n", vmgi_mat->vmgm_pgci_ut);
-  printf("Start sector of PTL_MAIT: %08x\n", vmgi_mat->ptl_mait);
-  printf("Start sector of VTS_ATRT: %08x\n", vmgi_mat->vts_atrt);
-  printf("Start sector of TXTDT_MG: %08x\n", vmgi_mat->txtdt_mgi);
-  printf("Start sector of VMGM_C_ADT: %08x\n", vmgi_mat->vmgm_c_adt);
-  printf("Start sector of VMGM_VOBU_ADMAP: %08x\n", 
-	 vmgi_mat->vmgm_vobu_admap);
-  printf("Video attributes of VMGM_VOBS: ");
-  ifoPrint_video_attributes(&vmgi_mat->vmgm_video_attr);
-  printf("\n");
-  printf("VMGM Number of Audio attributes: %i\n", 
-	 vmgi_mat->nr_of_vmgm_audio_streams);
-  if(vmgi_mat->nr_of_vmgm_audio_streams > 0) {
-    printf("\tstream %i status: ", 1);
-    ifoPrint_audio_attributes(&vmgi_mat->vmgm_audio_attr);
-    printf("\n");
-  }
-  printf("VMGM Number of Sub-picture attributes: %i\n", 
-	 vmgi_mat->nr_of_vmgm_subp_streams);
-  if(vmgi_mat->nr_of_vmgm_subp_streams > 0) {
-    printf("\tstream %2i status: ", 1);
-    ifoPrint_subp_attributes(&vmgi_mat->vmgm_subp_attr);
-    printf("\n");
-  }
-}
-
-
-void ifoPrint_VTSI_MAT(vtsi_mat_t *vtsi_mat) {
-  int i;
-
-  printf("VTS Identifier: %.12s\n", vtsi_mat->vts_identifier);
-  printf("Last Sector of VTS: %08x\n", vtsi_mat->vts_last_sector);
-  printf("Last Sector of VTSI: %08x\n", vtsi_mat->vtsi_last_sector);
-  printf("Specification version number: %01x.%01x\n", 
-	 vtsi_mat->specification_version>>4, 
-	 vtsi_mat->specification_version&0xf);
-  printf("VTS Category: %08x\n", vtsi_mat->vts_category);
-  printf("End byte of VTSI_MAT: %08x\n", vtsi_mat->vtsi_last_byte);
-  printf("Start sector of VTSM_VOBS:  %08x\n", vtsi_mat->vtsm_vobs);
-  printf("Start sector of VTSTT_VOBS: %08x\n", vtsi_mat->vtstt_vobs);
-  printf("Start sector of VTS_PTT_SRPT: %08x\n", vtsi_mat->vts_ptt_srpt);
-  printf("Start sector of VTS_PGCIT:    %08x\n", vtsi_mat->vts_pgcit);
-  printf("Start sector of VTSM_PGCI_UT: %08x\n", vtsi_mat->vtsm_pgci_ut);
-  printf("Start sector of VTS_TMAPT:    %08x\n", vtsi_mat->vts_tmapt);
-  printf("Start sector of VTSM_C_ADT:      %08x\n", vtsi_mat->vtsm_c_adt);
-  printf("Start sector of VTSM_VOBU_ADMAP: %08x\n",vtsi_mat->vtsm_vobu_admap);
-  printf("Start sector of VTS_C_ADT:       %08x\n", vtsi_mat->vts_c_adt);
-  printf("Start sector of VTS_VOBU_ADMAP:  %08x\n", vtsi_mat->vts_vobu_admap);
-
-  printf("Video attributes of VTSM_VOBS: ");
-  ifoPrint_video_attributes(&vtsi_mat->vtsm_video_attr);
-  printf("\n");
-  
-  printf("VTSM Number of Audio attributes: %i\n", 
-	 vtsi_mat->nr_of_vtsm_audio_streams);
-  if(vtsi_mat->nr_of_vtsm_audio_streams > 0) {
-    printf("\tstream %i status: ", 1);
-    ifoPrint_audio_attributes(&vtsi_mat->vtsm_audio_attr);
-    printf("\n");
-  }
-  
-  printf("VTSM Number of Sub-picture attributes: %i\n", 
-	 vtsi_mat->nr_of_vtsm_subp_streams);
-  if(vtsi_mat->nr_of_vtsm_subp_streams > 0) {
-    printf("\tstream %2i status: ", 1);
-    ifoPrint_subp_attributes(&vtsi_mat->vtsm_subp_attr);
-    printf("\n");
-  }
-  
-  printf("Video attributes of VTS_VOBS: ");
-  ifoPrint_video_attributes(&vtsi_mat->vts_video_attr);
-  printf("\n");
-  
-  printf("VTS Number of Audio attributes: %i\n", 
-	 vtsi_mat->nr_of_vts_audio_streams);
-  for(i = 0; i < vtsi_mat->nr_of_vts_audio_streams; i++) {
-    printf("\tstream %i status: ", i);
-    ifoPrint_audio_attributes(&vtsi_mat->vts_audio_attr[i]);
-    printf("\n");
-  }
-  
-  printf("VTS Number of Subpicture attributes: %i\n", 
-	 vtsi_mat->nr_of_vts_subp_streams);
-  for(i = 0; i < vtsi_mat->nr_of_vts_subp_streams; i++) {
-    printf("\tstream %2i status: ", i);
-    ifoPrint_subp_attributes(&vtsi_mat->vts_subp_attr[i]);
-    printf("\n");
-  }
-  
-  /* FIXME:  Add printing of MultiChannel Extension */
-}
-
-
-static void ifoPrint_PGC_COMMAND_TBL(pgc_command_tbl_t *cmd_tbl) {
-  int i;
-  
-  if(cmd_tbl == NULL) {
-    printf("No Command table present\n");
-    return;
-  }
-  
-  printf("Number of Pre commands: %i\n", cmd_tbl->nr_of_pre);
-  for(i = 0; i < cmd_tbl->nr_of_pre; i++) {
-    ifoPrint_CMD(i, &cmd_tbl->pre_cmds[i]);
-  }
-
-  printf("Number of Post commands: %i\n", cmd_tbl->nr_of_post);
-  for(i = 0; i < cmd_tbl->nr_of_post; i++) {
-    ifoPrint_CMD(i, &cmd_tbl->post_cmds[i]);
-  }
-
-  printf("Number of Cell commands: %i\n", cmd_tbl->nr_of_cell);
-  for(i = 0; i < cmd_tbl->nr_of_cell; i++) {
-    ifoPrint_CMD(i, &cmd_tbl->cell_cmds[i]);
-  }
-}
-
-
-static void ifoPrint_PGC_PROGRAM_MAP(pgc_program_map_t *program_map, int nr) {
-  int i;
-  
-  if(program_map == NULL) {
-    printf("No Program map present\n");
-    return;
-  }
-  
-  for(i = 0; i < nr; i++) {
-    printf("Program %3i Entry Cell: %3i\n", i + 1, program_map[i]);
-  }
-}
-
-
-static void ifoPrint_CELL_PLAYBACK(cell_playback_t *cell_playback, int nr) {
-  int i;
-  
-  if(cell_playback == NULL) {
-    printf("No Cell Playback info present\n");
-    return;
-  }
-  
-  for(i=0;i<nr;i++) {
-    printf("Cell: %3i ", i + 1);
-
-    ifoPrint_time(&cell_playback[i].playback_time);
-    printf("\t");
-
-    if(cell_playback[i].block_mode || cell_playback[i].block_type) {
-      const char *s;
-      switch(cell_playback[i].block_mode) {
-      case 0:
-	s = "not a"; break;
-      case 1:
-	s = "the first"; break;
-      case 2:
-      default:
-	s = ""; break;
-      case 3:
-	s = "last"; break;
-      }
-      printf("%s cell in the block ", s);
-      
-      switch(cell_playback[i].block_type) {
-      case 0:
-	printf("not part of the block ");
-	break;
-      case 1:
-	printf("angle block ");
-	break;
-      case 2:
-      case 3:
-	printf("(send bug repport) ");
-	break;
-      }
-    }
-    if(cell_playback[i].seamless_play)
-      printf("presented seamlessly ");
-    if(cell_playback[i].interleaved)
-      printf("cell is interleaved ");
-    if(cell_playback[i].stc_discontinuity)
-      printf("STC_discontinuty ");
-    if(cell_playback[i].seamless_angle)
-      printf("only seamless angle ");
-    if(cell_playback[i].restricted)
-      printf("restricted cell ");
-    
-    if(cell_playback[i].still_time)
-      printf("still time %d ", cell_playback[i].still_time);
-    if(cell_playback[i].cell_cmd_nr)
-      printf("cell command %d", cell_playback[i].cell_cmd_nr);
-    
-    printf("\n\tStart sector: %08x\tFirst ILVU end  sector: %08x\n", 
-	   cell_playback[i].first_sector, 
-	   cell_playback[i].first_ilvu_end_sector);
-    printf("\tEnd   sector: %08x\tLast VOBU start sector: %08x\n", 
-	   cell_playback[i].last_sector, 
-	   cell_playback[i].last_vobu_start_sector);
-  }
-}
-
-static void ifoPrint_CELL_POSITION(cell_position_t *cell_position, int nr) {
-  int i;
-  
-  if(cell_position == NULL) {
-    printf("No Cell Position info present\n");
-    return;
-  }
-  
-  for(i=0;i<nr;i++) {
-    printf("Cell: %3i has VOB ID: %3i, Cell ID: %3i\n", i + 1, 
-	   cell_position[i].vob_id_nr, cell_position[i].cell_nr);
-  }
-}
-
-
-void ifoPrint_PGC(pgc_t *pgc) {
-  int i;
-  
-  printf("Number of Programs: %i\n", pgc->nr_of_programs);
-  printf("Number of Cells: %i\n", pgc->nr_of_cells);
-  /* Check that time is 0:0:0:0 also if nr_of_programs==0 */
-  printf("Playback time: ");
-  ifoPrint_time(&pgc->playback_time); printf("\n");
-
-  /* If no programs/no time then does this mean anything? */
-  printf("Prohibited user operations: ");
-  ifoPrint_USER_OPS(&pgc->prohibited_ops);
-  
-    for(i = 0; i < 8; i++) {
-      if(pgc->audio_control[i] & 0x8000) { /* The 'is present' bit */
-	printf("Audio stream %i control: %04x\n", 
-	       i, pgc->audio_control[i]);
-      }
-    }
-  
-  for(i = 0; i < 32; i++) {
-    if(pgc->subp_control[i] & 0x80000000) { /* The 'is present' bit */
-      printf("Subpicture stream %2i control: %08x\n", 
-	     i, pgc->subp_control[i]);
-    }
-  }
-  
-  printf("Next PGC number: %i\n", pgc->next_pgc_nr);
-  printf("Prev PGC number: %i\n", pgc->prev_pgc_nr);
-  printf("GoUp PGC number: %i\n", pgc->goup_pgc_nr);
-  if(pgc->nr_of_programs != 0) {
-    printf("Still time: %i seconds (255=inf)\n", pgc->still_time);
-    if(pgc->pg_playback_mode == 0)
-      printf("PG Playback mode: Sequential\n");
-    else if(!(pgc->pg_playback_mode & 0x80))
-      printf("PG Playback mode: Random %i\n", pgc->pg_playback_mode);
-    else
-      printf("PG Playback mode: Shuffle %i\n", pgc->pg_playback_mode & 0x7f );
-  }
-  
-  if(pgc->nr_of_programs != 0) {
-    for(i = 0; i < 16; i++) {
-      printf("Color %2i: %08x\n", i, pgc->palette[i]);
-    }
-  }
-  
-  /* Memmory offsets to div. tables. */
-  ifoPrint_PGC_COMMAND_TBL(pgc->command_tbl);
-  ifoPrint_PGC_PROGRAM_MAP(pgc->program_map, pgc->nr_of_programs);
-  ifoPrint_CELL_PLAYBACK(pgc->cell_playback, pgc->nr_of_cells);
-  ifoPrint_CELL_POSITION(pgc->cell_position, pgc->nr_of_cells);
-}
-
-
-void ifoPrint_TT_SRPT(tt_srpt_t *tt_srpt) {
-  int i;
-  
-  printf("Number of TitleTrack search pointers: %i\n",
-	 tt_srpt->nr_of_srpts);
-  for(i=0;i<tt_srpt->nr_of_srpts;i++) {
-    printf("Title Track index %i\n", i + 1);
-    printf("\tTitle set number (VTS): %i", 
-	   tt_srpt->title[i].title_set_nr);
-    printf("\tVTS_TTN: %i\n", tt_srpt->title[i].vts_ttn);
-    printf("\tNumber of PTTs: %i\n", tt_srpt->title[i].nr_of_ptts);
-    printf("\tNumber of angles: %i\n", 
-	   tt_srpt->title[i].nr_of_angles);
-    printf("\tTitle playback type: %s%s%s%s%s%s%s\n",
-	   tt_srpt->title[i].pb_ty.multi_or_random_pgc_title ? 
-	   " One Random PGC Title or Multi PGC Title" : 
-	   " One Sequential PGC Title",
-	   tt_srpt->title[i].pb_ty.jlc_exists_in_cell_cmd ?
-	   "" : ", No Link/Jump/Call exists in Cell command",
-	   tt_srpt->title[i].pb_ty.jlc_exists_in_prepost_cmd ?
-	   "" : ", No Link/Jump/Call exists in Pre- and/or Post-command",
-	   tt_srpt->title[i].pb_ty.jlc_exists_in_button_cmd ?
-	   "" : ", No Link/Jump/Call exists in Button command",
-	   tt_srpt->title[i].pb_ty.jlc_exists_in_tt_dom ?
-	   "" : ", No Link/Jump/Call exists in TT_DOM",
-	   tt_srpt->title[i].pb_ty.chapter_search_or_play ?
-	   ", UOP1 (TT_Play and PTT_Search) prohibited" : "",
-	   tt_srpt->title[i].pb_ty.title_or_time_play ?
-	   ", UOP0 (Time_Play and Time_Search) prohibited" : ""
-	   );    
-    printf("\tParental ID field: %04x\n",
-	   tt_srpt->title[i].parental_id);
-    printf("\tTitle set starting sector %08x\n", 
-	   tt_srpt->title[i].title_set_sector);
-  }
-}
-
-
-void ifoPrint_VTS_PTT_SRPT(vts_ptt_srpt_t *vts_ptt_srpt) {
-  int i, j;
-  printf(" nr_of_srpts %i last byte %i\n", 
-	 vts_ptt_srpt->nr_of_srpts, 
-	 vts_ptt_srpt->last_byte);
-  for(i=0;i<vts_ptt_srpt->nr_of_srpts;i++) {
-    printf("\nVTS_PTT number %d has a offset %d relative to VTS_PTT_SRPT\n", 
-				i + 1, vts_ptt_srpt->ttu_offset[i]);
-    for(j=0;j<vts_ptt_srpt->title[i].nr_of_ptts;j++) {
-      printf("VTS_PTT_SRPT - Title %3i part %3i: PGC: %3i PG: %3i\n",
-	     i + 1, j + 1, 
-	     vts_ptt_srpt->title[i].ptt[j].pgcn,
-	     vts_ptt_srpt->title[i].ptt[j].pgn );
-    }
-  }
-}
-
-
-void ifoPrint_PTL_MAIT(ptl_mait_t *ptl_mait) {
-  int i, level, vts;
-  
-  printf("Number of Countries: %i\n", ptl_mait->nr_of_countries);
-  printf("Number of VTSs: %i\n", ptl_mait->nr_of_vtss);
-  printf("Last byte: %i\n", ptl_mait->last_byte);
-  
-  for(i = 0; i < ptl_mait->nr_of_countries; i++) {
-    
-    printf("Start byte: %i\n", ptl_mait->countries[i].pf_ptl_mai_start_byte);
-    printf("Parental Masks for country: %c%c\n",
-	   ptl_mait->countries[i].country_code >> 8,
-	   ptl_mait->countries[i].country_code & 0xff);
-    
-    for(vts = 0; vts <= ptl_mait->nr_of_vtss; vts++) {
-      if( vts == 0 ) {
-	printf("VMG    "); 
-      } else {
-	printf("VTS %2d ", vts);
-      }
-      for(level = 0; level < 8; level++) {
-	printf("%d: %04x  ", level,
-	       ptl_mait->countries[i].pf_ptl_mai[vts][level] );
-      }
-      printf("\n");
-    }
-  }
-}
-
-void ifoPrint_VTS_TMAPT(vts_tmapt_t *vts_tmapt) {
-  unsigned int timeunit;
-  int i, j;
-  
-  printf("Number of VTS_TMAPS: %i\n", vts_tmapt->nr_of_tmaps);
-  printf("Last byte: %i\n", vts_tmapt->last_byte);
-
-  for(i = 0; i < vts_tmapt->nr_of_tmaps; i++) {
-    printf("TMAP %i\n", i + 1);
-    printf("  offset %d relative to VTS_TMAPTI\n", vts_tmapt->tmap_offset[i]);
-    printf("  Time unit (seconds): %i\n", vts_tmapt->tmap[i].tmu);
-    printf("  Number of entries: %i\n", vts_tmapt->tmap[i].nr_of_entries);
-    timeunit = vts_tmapt->tmap[i].tmu;
-    for(j = 0; j < vts_tmapt->tmap[i].nr_of_entries; j++) {
-      unsigned int ac_time = timeunit * (j + 1);
-      printf("Time: %2i:%02i:%02i  VOBU Sector: 0x%08x %s\n", 
-	     ac_time / (60 * 60), (ac_time / 60) % 60, ac_time % 60,
-	     vts_tmapt->tmap[i].map_ent[j] & 0x7fffffff,
-	     (vts_tmapt->tmap[i].map_ent[j] >> 31) ? "discontinuity" : "");
-    }
-  }
-}
-
-void ifoPrint_C_ADT(c_adt_t *c_adt) {
-  int i, entries;
-  
-  printf("Number of VOBs in this VOBS: %i\n", c_adt->nr_of_vobs);
-  /* entries = c_adt->nr_of_vobs; */
-  entries = (c_adt->last_byte + 1 - C_ADT_SIZE)/sizeof(c_adt_t);
-  
-  for(i = 0; i < entries; i++) {
-    printf("VOB ID: %3i, Cell ID: %3i   ", 
-	   c_adt->cell_adr_table[i].vob_id, c_adt->cell_adr_table[i].cell_id);
-    printf("Sector (first): 0x%08x   (last): 0x%08x\n",
-	   c_adt->cell_adr_table[i].start_sector, 
-	   c_adt->cell_adr_table[i].last_sector);
-  }
-}
-
-
-void ifoPrint_VOBU_ADMAP(vobu_admap_t *vobu_admap) {
-  int i, entries;
-  
-  entries = (vobu_admap->last_byte + 1 - VOBU_ADMAP_SIZE)/4;
-  for(i = 0; i < entries; i++) {
-    printf("VOBU %5i  First sector: 0x%08x\n", i + 1,
-	   vobu_admap->vobu_start_sectors[i]);
-  }
-}
-
-
-void ifoPrint_PGCIT(pgcit_t *pgcit) {
-  int i;
-  
-  for(i = 0; i < pgcit->nr_of_pgci_srp; i++) {
-    printf("\nProgram (PGC): %3i\t", i + 1);
-    printf("PGC Category: Entry id 0x%02x, ", pgcit->pgci_srp[i].entry_id);
-    printf("Parental ID mask 0x%04x\n", pgcit->pgci_srp[i].ptl_id_mask);
-    ifoPrint_PGC(pgcit->pgci_srp[i].pgc);
-  }
-}
-
-
-void ifoPrint_PGCI_UT(pgci_ut_t *pgci_ut) {
-  int i;
-  
-  printf("Number of Menu Language Units (PGCI_LU): %3i\n", pgci_ut->nr_of_lus);
-  for(i = 0; i < pgci_ut->nr_of_lus; i++) {
-    printf("\nMenu Language Code: %c%c (%c)\n",
-	   pgci_ut->lu[i].lang_code >> 8,
-	   pgci_ut->lu[i].lang_code & 0xff,
-	   pgci_ut->lu[i].lang_extension ? pgci_ut->lu[i].lang_extension :' ');
-    printf("Menu Existence: %02x\n", pgci_ut->lu[i].exists);
-    ifoPrint_PGCIT(pgci_ut->lu[i].pgcit);
-  }
-}
-
-
-static void ifoPrint_VTS_ATTRIBUTES(vts_attributes_t *vts_attributes) {
-  int i;
-  
-  printf("VTS_CAT Application type: %08x\n", vts_attributes->vts_cat);
- 
-  printf("Video attributes of VTSM_VOBS: ");
-  ifoPrint_video_attributes(&vts_attributes->vtsm_vobs_attr);
-  printf("\n");
-  printf("Number of Audio streams: %i\n", 
-	 vts_attributes->nr_of_vtsm_audio_streams);
-  if(vts_attributes->nr_of_vtsm_audio_streams > 0) {
-    printf("\tstream %i attributes: ", 1);
-    ifoPrint_audio_attributes(&vts_attributes->vtsm_audio_attr);
-    printf("\n");
-  }
-  printf("Number of Subpicture streams: %i\n", 
-	 vts_attributes->nr_of_vtsm_subp_streams);
-  if(vts_attributes->nr_of_vtsm_subp_streams > 0) {
-    printf("\tstream %2i attributes: ", 1);
-    ifoPrint_subp_attributes(&vts_attributes->vtsm_subp_attr);
-    printf("\n");
-  }
-   
-  printf("Video attributes of VTSTT_VOBS: ");
-  ifoPrint_video_attributes(&vts_attributes->vtstt_vobs_video_attr);
-  printf("\n");
-  printf("Number of Audio streams: %i\n", 
-	 vts_attributes->nr_of_vtstt_audio_streams);
-  for(i = 0; i < vts_attributes->nr_of_vtstt_audio_streams; i++) {
-    printf("\tstream %i attributes: ", i);
-    ifoPrint_audio_attributes(&vts_attributes->vtstt_audio_attr[i]);
-    printf("\n");
-  }
-  
-  printf("Number of Subpicture streams: %i\n", 
-	 vts_attributes->nr_of_vtstt_subp_streams);
-  for(i = 0; i < vts_attributes->nr_of_vtstt_subp_streams; i++) {
-    printf("\tstream %2i attributes: ", i);    
-    ifoPrint_subp_attributes(&vts_attributes->vtstt_subp_attr[i]);
-    printf("\n");
-  }
-}
-
-
-void ifoPrint_VTS_ATRT(vts_atrt_t *vts_atrt) {
-  int i;
-  
-  printf("Number of Video Title Sets: %3i\n", vts_atrt->nr_of_vtss);
-  for(i = 0; i < vts_atrt->nr_of_vtss; i++) {
-    printf("\nVideo Title Set %i\n", i + 1);
-    printf("  offset %d relative to VMG_VTS_ATRT\n", 
-	   vts_atrt->vts_atrt_offsets[i]);
-    ifoPrint_VTS_ATTRIBUTES(&vts_atrt->vts[i]);
-  }
-}
-
-
-void ifoPrint(dvd_reader_t *dvd, int title) {
-  ifo_handle_t *ifohandle;
-
-  ifohandle = ifoOpen(dvd, title);
-  if(!ifohandle) {
-    fprintf(stderr, "Can't open info file for title %d\n", title);
-    return;
-  }
-  
-  
-  if(ifohandle->vmgi_mat) {
-
-    printf("VMG top level\n-------------\n");
-    ifoPrint_VMGI_MAT(ifohandle->vmgi_mat);
-
-    printf("\nFirst Play PGC\n--------------\n");
-    ifoPrint_PGC(ifohandle->first_play_pgc);
-
-    printf("\nTitle Track search pointer table\n");
-    printf(  "------------------------------------------------\n");
-    ifoPrint_TT_SRPT(ifohandle->tt_srpt);
-
-    printf("\nMenu PGCI Unit table\n");
-    printf(  "--------------------\n");
-    if(ifohandle->pgci_ut) {
-      ifoPrint_PGCI_UT(ifohandle->pgci_ut);
-    } else {
-      printf("No PGCI Unit table present\n");
-    }
-
-    printf("\nParental Manegment Information table\n");
-    printf(  "------------------------------------\n");
-    if(ifohandle->ptl_mait) {
-      ifoPrint_PTL_MAIT(ifohandle->ptl_mait);
-    } else {
-      printf("No Parental Management Information present\n");
-    }
-
-    printf("\nVideo Title Set Attribute Table\n");
-    printf(  "-------------------------------\n");
-    ifoPrint_VTS_ATRT(ifohandle->vts_atrt);
-    
-    printf("\nText Data Manager Information\n");
-    printf(  "-----------------------------\n");
-    if(ifohandle->txtdt_mgi) {
-      /* ifoPrint_TXTDT_MGI(&(vmgi->txtdt_mgi)); */
-    } else {
-      printf("No Text Data Manager Information present\n");
-    }
-
-    printf("\nMenu Cell Adress table\n");
-    printf(  "-----------------\n");
-    if(ifohandle->menu_c_adt) {
-      ifoPrint_C_ADT(ifohandle->menu_c_adt);
-    } else {
-      printf("No Menu Cell Adress table present\n");
-    }
-
-    printf("\nVideo Manager Menu VOBU address map\n");
-    printf(  "-----------------\n");
-    if(ifohandle->menu_vobu_admap) {
-      ifoPrint_VOBU_ADMAP(ifohandle->menu_vobu_admap);
-    } else {
-      printf("No Menu VOBU address map present\n");   
-    }
-  }
-
-
-  if(ifohandle->vtsi_mat) {
-
-    printf("VTS top level\n-------------\n");
-    ifoPrint_VTSI_MAT(ifohandle->vtsi_mat);
-
-    printf("\nPart of Title Track search pointer table\n");
-    printf(  "----------------------------------------------\n");
-    ifoPrint_VTS_PTT_SRPT(ifohandle->vts_ptt_srpt);
-
-    printf("\nPGCI Unit table\n");
-    printf(  "--------------------\n");
-    ifoPrint_PGCIT(ifohandle->vts_pgcit);
-
-    printf("\nMenu PGCI Unit table\n");
-    printf(  "--------------------\n");
-    if(ifohandle->pgci_ut) {
-      ifoPrint_PGCI_UT(ifohandle->pgci_ut);
-    } else {
-      printf("No Menu PGCI Unit table present\n");
-    }
-    
-    printf("\nTime Search table\n");
-    printf(  "-----------------\n");
-    if(ifohandle->vts_tmapt) {
-      ifoPrint_VTS_TMAPT(ifohandle->vts_tmapt);
-    } else {
-      printf("No Time Search table present\n");
-    }
-
-    printf("\nMenu Cell Adress table\n");
-    printf(  "-----------------\n");
-    if(ifohandle->menu_c_adt) {
-      ifoPrint_C_ADT(ifohandle->menu_c_adt);
-    } else {
-      printf("No Cell Adress table present\n");
-    }
-
-    printf("\nVideo Title Set Menu VOBU address map\n");
-    printf(  "-----------------\n");
-    if(ifohandle->menu_vobu_admap) {
-      ifoPrint_VOBU_ADMAP(ifohandle->menu_vobu_admap);
-    } else {
-      printf("No Menu VOBU address map present\n");
-    }
-
-    printf("\nCell Adress table\n");
-    printf(  "-----------------\n");
-    ifoPrint_C_ADT(ifohandle->vts_c_adt);
-
-    printf("\nVideo Title Set VOBU address map\n");
-    printf(  "-----------------\n");
-    ifoPrint_VOBU_ADMAP(ifohandle->vts_vobu_admap);
-  } 
-
-  ifoClose(ifohandle);
-}
-
diff --git a/src/input/libdvdnav/ifo_print.h b/src/input/libdvdnav/ifo_print.h
deleted file mode 100644
index fa69e1511..000000000
--- a/src/input/libdvdnav/ifo_print.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef IFO_PRINT_H_INCLUDED
-#define IFO_PRINT_H_INCLUDED
-
-/*
- * Copyright (C) 2000, 2001 Björn Englund <d4bjorn@dtek.chalmers.se>,
- *                          Håkan Hjort <d95hjort@dtek.chalmers.se>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "ifo_types.h"
-#include "dvd_reader.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * This file provides example functions for printing information about the IFO
- * file to stdout.
- */
-
-/**
- * Print the complete parsing information for the given file.
- */
-
-/* ifoPrint(dvd, title); */
-void ifoPrint(dvd_reader_t *, int);
-
-void ifoPrint_VMGI_MAT(vmgi_mat_t *);
-void ifoPrint_VTSI_MAT(vtsi_mat_t *);
-
-void ifoPrint_PTL_MAIT(ptl_mait_t *);
-void ifoPrint_VTS_ATRT(vts_atrt_t *);
-void ifoPrint_TT_SRPT(tt_srpt_t *);
-void ifoPrint_VTS_PTT_SRPT(vts_ptt_srpt_t *);
-void ifoPrint_PGC(pgc_t *);
-void ifoPrint_PGCIT(pgcit_t *);
-void ifoPrint_PGCI_UT(pgci_ut_t *);
-void ifoPrint_VTS_TMAPT(vts_tmapt_t *);
-void ifoPrint_C_ADT(c_adt_t *);
-void ifoPrint_VOBU_ADMAP(vobu_admap_t *);
-
-#ifdef __cplusplus
-};
-#endif
-#endif /* IFO_PRINT_H_INCLUDED */