Ticket #2915: chapter_menu_missing.diff

NuppelVideoPlayer.cpp

@@ -6557 +6557 @@
         return;
 
     textDisplayMode = kDisplayNone;
-    ringBuffer->DVD()->GoToMenu(str);
+    bool ret = ringBuffer->DVD()->GoToMenu(str);
+    if (!ret && osd)
+        osd->SetSettingsText(QObject::tr("%1 DVD Menu Not Available").arg(str), 1);
 }
 
 /** \fn NuppelVideoPlayer::GoToDVDProgram(bool direction)

DVDRingBuffer.cpp

@@ -594 +594 @@
     dvdWaiting = false;
 }
 
-void DVDRingBufferPriv::GoToMenu(const QString str)
+bool DVDRingBufferPriv::GoToMenu(const QString str)
 {
     DVDMenuID_t menuid;
     if (str.compare("chapter") == 0)
@@ -604 +604 @@
         if (partMenuSupported == DVDNAV_STATUS_OK)
             menuid = DVD_MENU_Part;
         else
-            menuid = DVD_MENU_Root;
+            return false;
     }
     else if (str.compare("menu") == 0)
     {
@@ -616 +616 @@
             menuid = DVD_MENU_Root;
     }
     else
-        return;
+        return false;
 
-    dvdnav_menu_call(dvdnav, menuid);
+    dvdnav_status_t ret = dvdnav_menu_call(dvdnav, menuid);
+    if (ret == DVDNAV_STATUS_OK)
+        return true;
+    return false;
 }
 
 void DVDRingBufferPriv::GoToNextProgram(void)

DVDRingBuffer.h

@@ -82 +82 @@
     long long NormalSeek(long long time);
     void SkipStillFrame(void);
     void WaitSkip(void);
-    void GoToMenu(const QString str);
+    bool GoToMenu(const QString str);
     void GoToNextProgram(void);
     void GoToPreviousProgram(void);
     void MoveButtonLeft(void);