Ticket #1959: dvd_menu_definition.diff

libs/libmythtv/DVDRingBuffer.cpp

@@ -59 +59 @@
     }            
 }
 
+bool DVDRingBufferPriv::IsInMenu(void) const
+{
+    return ((title == 0) || 
+            ((pgLength/90000) < 30) ||
+            (NumMenuButtons() > 0));
+}
+
 long long DVDRingBufferPriv::Seek(long long pos, int whence)
 {
     dvdnav_sector_search(this->dvdnav, pos / DVD_BLOCK_SIZE , whence);
@@ -833 +840 @@
     hl_width = hl_height = 0;
 }
 
-int DVDRingBufferPriv::NumMenuButtons(void)
+int DVDRingBufferPriv::NumMenuButtons(void) const
 {
     pci_t *pci = dvdnav_get_current_nav_pci(dvdnav);
     int numButtons = pci->hli.hl_gi.btn_ns;

libs/libmythtv/DVDRingBuffer.h

@@ -30 +30 @@
     // gets
     int  GetTitle(void) const { return title;        }
     int  GetPart(void)  const { return part;         }
-    bool IsInMenu(void) const { return (title == 0); }
+    bool IsInMenu(void) const; 
     bool IsOpen(void)   const { return dvdnav;       }
     long long GetReadPosition(void);
     long long GetTotalReadPosition(void) { return titleLength; }
@@ -80 +80 @@
     void MoveButtonUp(void);
     void MoveButtonDown(void);
     void ActivateButton(void);
-    int NumMenuButtons(void);
+    int NumMenuButtons(void) const;
     void IgnoreStillOrWait(bool skip) { skipstillorwait = skip; }
     uint GetCurrentTime(void);
     void  SetTrack(uint type, int trackNo);