Ticket #1043: dvdmenu_code_cleanup1.patch

libs/libmythtv/DVDRingBuffer.h

@@ -55 +55 @@
     uint GetAudioLanguage(int id);
     uint GetSubtitleLanguage(int id);
     long long MenuSpuPts(void) { return menuspupts; }
-    int CellChange(void) { return cellChange; }
 
     // commands
     bool OpenFile(const QString &filename);
@@ -119 +118 @@
     bool           buttonSelected;
     bool           buttonExists;
     long long      menuspupts;
-    int            cellChange;
 
     NuppelVideoPlayer *parent;
 

libs/libmythtv/avformatdecoder.cpp

@@ -275 +275 @@
       // language preference
       languagePreference(iso639_get_language_key_list()),
       // DVD
-      lastdvdtitle(0), lastdvdpart(0),
-      lastdvdcellchange(0)
+      lastdvdtitle(0)
 {
     bzero(&params, sizeof(AVFormatParameters));
     bzero(prvpkt, 3 * sizeof(char));
@@ -2273 +2272 @@
             int dvdtitle  = 0;
             int dvdpart = 0;
             ringBuffer->DVD()->GetPartAndTitle(dvdtitle,dvdpart);
-            int dvdcellchange = ringBuffer->DVD()->CellChange();
-            if ((dvdtitle != lastdvdtitle || dvdpart != lastdvdpart || 
-                        dvdcellchange != lastdvdcellchange))
-            {
-                GetNVP()->GetOSD()->HideSet("subtitles");
-                GetNVP()->GetOSD()->ClearAll("subtitles");
-            }
             if (dvdtitle != lastdvdtitle)
             {
                 posmapStarted = false;
@@ -2292 +2284 @@
                             .arg(framesPlayed));
             }
             lastdvdtitle = dvdtitle;
-            lastdvdpart = dvdpart;
-            lastdvdcellchange = dvdcellchange;
             
             if (storedPackets.count() < 2 && !dvdvideopause)
                 storevideoframes = true;

libs/libmythtv/DVDRingBuffer.cpp

@@ -34 +34 @@
       skipstillorwait(true), spuStreamLetterbox(false),
       cellstartPos(0), buttonSelected(false), 
       buttonExists(false), menuspupts(0),
-      cellChange(0), parent(0)
+      parent(0)
 {
     dvdMenuButton = (AVSubtitleRect*)av_mallocz(sizeof(AVSubtitleRect));
 }
@@ -223 +223 @@
                 titleLength = length *DVD_BLOCK_SIZE;
                 cellstartPos = GetReadPosition();
                 buttonSelected = false; 
-                if (cellChange == 100)
-                    cellChange = 0;
-                else
-                    cellChange++;
 
+                if (parent)
+                {
+                    parent->GetOSD()->HideSet("subtitles");
+                    parent->GetOSD()->ClearAll("subtitles");
+                }
+
                 if (blockBuf != dvdBlockWriteBuf)
                 {
                     dvdnav_free_cache_block(dvdnav, blockBuf);

libs/libmythtv/avformatdecoder.h

@@ -257 +257 @@
 
     // DVD
     int lastdvdtitle;
-    int lastdvdpart;
-    int lastdvdcellchange;
 };
 
 #endif