Ticket #7640: remove-m_autoselectaudio.patch

mythtv/libs/libmythtv/DVDRingBuffer.cpp

@@ -50 +50 @@
       m_buttonstreamid(0), m_runningCellStart(false),
       m_runSeekCellStart(false),
       m_menupktpts(0), m_curAudioTrack(0),
-      m_curSubtitleTrack(0), m_autoselectaudio(true),
+      m_curSubtitleTrack(0),
       m_autoselectsubtitle(true),
       m_jumptotitle(true),
       m_seekpos(0), m_seekwhence(0),
@@ -350 +350 @@
                 {
                     if (m_parent)
                         m_parent->HideDVDButton(true);
-                    m_autoselectaudio = true;
                     m_autoselectsubtitle = true;
                     GetMythUI()->RestoreScreensaver();
                 }
@@ -408 +407 @@
             break;
             case DVDNAV_AUDIO_STREAM_CHANGE:
             {
-                if (m_autoselectaudio)
                     m_curAudioTrack = dvdnav_get_active_audio_stream(m_dvdnav);
 
                 VERBOSE(VB_PLAYBACK,
@@ -1165 +1163 @@
     else if (type == kTrackTypeAudio)
     {
         m_curAudioTrack = trackNo;
-        m_autoselectaudio = false;
         dvdnav_set_active_audio_stream(m_dvdnav, trackNo);
     }
 }

mythtv/libs/libmythtv/DVDRingBuffer.h

@@ -158 +158 @@
     long long      m_menupktpts;
     int            m_curAudioTrack;
     int8_t         m_curSubtitleTrack;
-    bool           m_autoselectaudio;
     bool           m_autoselectsubtitle;
     bool           m_jumptotitle;
     long long      m_seekpos;