Ticket #2542: dvd_osd_menu_fix.diff

libs/libmythtv/DVDRingBuffer.cpp

@@ -527 +527 @@
 void DVDRingBufferPriv::GoToMenu(const QString str)
 {
     DVDMenuID_t menuid;
-    if (str.compare("part") == 0)
-        menuid = DVD_MENU_Part;
-    else if (str.compare("menu") == 0)
+    if (str.compare("chapter") == 0)
         menuid = DVD_MENU_Root;
+    else if (str.compare("menu") == 0)
+        menuid = DVD_MENU_Title;
     else
         return;
 
-    if ((dvdnav_menu_call(dvdnav, menuid) == DVDNAV_STATUS_ERR) &&
-        (str == "menu"))
-    {
-        dvdnav_menu_call(dvdnav, DVD_MENU_Title);
-    }
+    dvdnav_menu_call(dvdnav, menuid);
 }
 
 void DVDRingBufferPriv::GoToNextProgram(void)

libs/libmythtv/tv_play.cpp

@@ -6090 +6336 @@
     {
         if (action == "JUMPTODVDROOTMENU")
             activenvp->GoToDVDMenu("menu");
+        else if (action == "JUMPTODVDCHAPTERMENU")
+            activenvp->GoToDVDMenu("chapter");
         else if (action == "TOGGLEEDIT")
             StartProgramEditMode();
         else if (action == "TOGGLEAUTOEXPIRE")
@@ -6273 +6519 @@
     }
     else if (StateIsPlaying(internalState) && activerbuffer->isDVD())
     {
-        item = new OSDGenericTree(treeMenu,tr("DVD Root Menu"), "JUMPTODVDROOTMENU");
+        item = new OSDGenericTree(treeMenu,tr("DVD Root Menu"), 
+                "JUMPTODVDROOTMENU");
+        item = new OSDGenericTree(treeMenu, tr("DVD Chapter Menu"), 
+                "JUMPTODVDCHAPTERMENU");
     }
     else if (StateIsPlaying(internalState))
     {