Ticket #2542: madagascar_fix_attempt_2.diff

libmythtv/DVDRingBuffer.cpp

@@ -43 +43 @@
       jumptotitle(true), repeatseek(false),
       seekpos(0), seekwhence(0), 
       dvdname(NULL), serialnumber(NULL),
+      titleMenuSupported(true),
       parent(0)
 {
     memset(&dvdMenuButton, 0, sizeof(AVSubtitle));
@@ -161 +162 @@
         dvdnav_get_serial_number(dvdnav, &serialnum);
         dvdname = QString(name);
         serialnumber = QString(serialnum);
+        if (dvdnav_menu_supported(dvdnav, DVD_MENU_Title) == DVDNAV_STATUS_ERR)
+            titleMenuSupported = false;
+            
         return true;
     }
 }
@@ -539 +543 @@
 {
     DVDMenuID_t menuid;
     if (str.compare("chapter") == 0)
-        menuid = DVD_MENU_Root;
+    {
+        if (titleMenuSupported)
+            menuid = DVD_MENU_Root;
+        else
+            menuid = DVD_MENU_Part;
+    }
     else if (str.compare("menu") == 0)
-        menuid = DVD_MENU_Title;
+    {
+        if (titleMenuSupported)
+            menuid = DVD_MENU_Title;
+        else
+            menuid = DVD_MENU_Root;
+    }
     else
         return;
 

libmythtv/DVDRingBuffer.h

@@ -156 +156 @@
     int            seekwhence;
     QString        dvdname;
     QString        serialnumber;
+    bool           titleMenuSupported;
+        
 
     NuppelVideoPlayer *parent;
 

libmythdvdnav/searching.c

@@ -416 +416 @@
   return DVDNAV_STATUS_OK;
 }
 
+dvdnav_status_t dvdnav_menu_supported(dvdnav_t *this, DVDMenuID_t menu)
+{
+  vm_t *try_vm;
+
+  if (!this) {
+    printerr("Passed a NULL pointer.");
+    return DVDNAV_STATUS_ERR;
+  }
+
+  pthread_mutex_lock(&this->vm_lock);
+  if(!this->vm->state.pgc) {
+    printerr("No current PGC");
+    pthread_mutex_unlock(&this->vm_lock);
+    return DVDNAV_STATUS_ERR;
+  }
+
+  /* make a copy of the current VM and try to navigate the copy to the menu */
+  try_vm = vm_new_copy(this->vm);
+  if ((menu == DVD_MENU_Escape) && (this->vm->state.domain != VTS_DOMAIN)) {
+    /* Try resume */
+    if (vm_jump_resume(try_vm) && !try_vm->stopped) {
+        vm_free_copy(try_vm);
+        pthread_mutex_unlock(&this->vm_lock);
+        return DVDNAV_STATUS_OK;
+    }
+  }
+
+  if (menu == DVD_MENU_Escape) menu = DVD_MENU_Root;
+
+  if (vm_jump_menu(try_vm, menu) && !try_vm->stopped) {
+    vm_get_next_cell(try_vm);
+    if (!try_vm->pgcN_invalid)
+    {
+      vm_free_copy(try_vm);
+      pthread_mutex_unlock(&this->vm_lock);
+      return DVDNAV_STATUS_OK;
+    }
+  }
+  
+  vm_free_copy(try_vm);
+  printerr("No such menu or menu not reachable.");
+  pthread_mutex_unlock(&this->vm_lock);
+  return DVDNAV_STATUS_ERR;
+}
+
 dvdnav_status_t dvdnav_menu_call(dvdnav_t *this, DVDMenuID_t menu) {
   vm_t *try_vm;
   

libmythdvdnav/vm.c

@@ -1636 +1636 @@
   pgcit = get_PGCIT(vm);
   assert(pgcit != NULL);  /* ?? Make this return -1 instead */
 
+  vm->pgcN_invalid = 0;
+
   if(pgcN < 1 || pgcN > pgcit->nr_of_pgci_srp) {
 #ifdef TRACE
     fprintf(MSG_OUT, "libdvdnav:  ** No such pgcN = %d\n", pgcN);
 #endif
+    vm->pgcN_invalid = 1;
     return 0;
   }
   

libmythdvdnav/dvdnav.h

@@ -299 +299 @@
 dvdnav_status_t dvdnav_time_play(dvdnav_t *self, int32_t title,
                                  uint64_t time);
 
+/* Check if the given menu is supported */
+dvdnav_status_t dvdnav_menu_supported(dvdnav_t *self, DVDMenuID_t menu);
+
 /*
  * Stop playing the current position and jump to the specified menu.
  *

libmythdvdnav/vm.h

@@ -91 +91 @@
   char          serial_number[19];
   remap_t      *map;
   int           stopped;
+  int           pgcN_invalid;
 } vm_t;
 
 /* magic number for seeking hops */