# HG changeset patch
# User jcdutton
# Date 1025833350 0
# Node ID cea44c0d638ad01eab3c64da78ac1c494149c7d0
# Parent  39bd4e386cbbe9e717c6f837a9ff75d6542da69f
Add more debug info for Menu language selection.
Only do vm_start when we have to.

diff -r 39bd4e386cbb -r cea44c0d638a decoder.h
--- a/decoder.h	Thu Jul 04 00:38:51 2002 +0000
+++ b/decoder.h	Fri Jul 05 01:42:30 2002 +0000
@@ -31,7 +31,7 @@
 #include <dvdread/ifo_types.h> /*  vm_cmd_t */
 
 /* Uncomment for tracing */
-/* #define TRACE  */
+#define TRACE
 
 typedef enum {
   LinkNoLink  = 0,
diff -r 39bd4e386cbb -r cea44c0d638a dvdnav.c
--- a/dvdnav.c	Thu Jul 04 00:38:51 2002 +0000
+++ b/dvdnav.c	Fri Jul 05 01:42:30 2002 +0000
@@ -198,11 +198,11 @@
   if (this->file) DVDCloseFile(this->file);
   this->file = NULL;
     
-  if(!this->started) {
-    /* Start the VM */
-    vm_start(this->vm);
-    this->started = 1;
-  }
+  //if(!this->started) {
+  //  /* Start the VM */
+  //  vm_start(this->vm);
+  //  this->started = 1;
+  //}
 
   /* Start the read-ahead cache. */
   this->cache = dvdnav_read_cache_new(this);
@@ -282,11 +282,11 @@
 #ifdef LOG_DEBUG
   printf("starting vm\n");
 #endif
-  if(!this->started) {
-    /* Start the VM */
-    vm_start(this->vm);
-    this->started = 1;
-  }
+//  if(!this->started) {
+//    /* Start the VM */
+//    vm_start(this->vm);
+//    this->started = 1;
+//  }
 #ifdef LOG_DEBUG
   printf("unlocking\n");
 #endif
@@ -942,6 +942,10 @@
 
 /*
  * $Log$
+ * Revision 1.24  2002/07/05 01:42:30  jcdutton
+ * Add more debug info for Menu language selection.
+ * Only do vm_start when we have to.
+ *
  * Revision 1.23  2002/07/02 22:57:09  jcdutton
  * Rename some of the functions in vm.c to help readability.
  * Hopefully fix __FUNCTION__ problem. Use __func_ as recommended in C99.
diff -r 39bd4e386cbb -r cea44c0d638a vm.c
--- a/vm.c	Thu Jul 04 00:38:51 2002 +0000
+++ b/vm.c	Fri Jul 05 01:42:30 2002 +0000
@@ -1576,6 +1576,7 @@
   /* Relies on state to get the correct pgcit. */
   pgcit = get_PGCIT(vm);
   assert(pgcit != NULL);
+  fprintf(stderr, "** Searching for menu (0x%x) entry PGC\n", id);
   
   /* Get menu/title */
   for(i = 0; i < pgcit->nr_of_pgci_srp; i++) {
@@ -1586,7 +1587,11 @@
     }
   }
   fprintf(stderr, "** No such id/menu (%d) entry PGC\n", id);
-  assert(0);
+  for(i = 0; i < pgcit->nr_of_pgci_srp; i++) {
+    fprintf(stderr, "Available menus: 0x%x\n",
+                     pgcit->pgci_srp[i].entry_id);
+  }
+  assert(0); /* Use assert for now, until the error is handled. */
   return -1; /*  error */
 }
 
@@ -1763,6 +1768,10 @@
 
 /*
  * $Log$
+ * Revision 1.23  2002/07/05 01:42:30  jcdutton
+ * Add more debug info for Menu language selection.
+ * Only do vm_start when we have to.
+ *
  * Revision 1.22  2002/07/04 00:38:51  jcdutton
  * Add some menu language printf's.
  *