Ticket #12144: 0001-Save-volume-only-on-TV-Player-exit.patch

mythtv/libs/libmyth/audio/volumebase.cpp

@@ -38 +38 @@
 {
     volume = max(min(value, 100), 0);
     UpdateVolume();
+}
 
+void VolumeBase::SaveCurrentVolume(void)
+{
     QString controlLabel = gCoreContext->GetSetting("MixerControl", "PCM");
     controlLabel += "MixerVolume";
-    gCoreContext->SaveSetting(controlLabel, volume);    
+    gCoreContext->SaveSetting(controlLabel, GetCurrentVolume());
 }
 
 void VolumeBase::AdjustCurrentVolume(int change)
@@ -93 +96 @@
 void VolumeBase::UpdateVolume(void)
 {
     int new_volume = volume;
-    bool save = true;
+    bool save = false;
     if (current_mute_state == kMuteAll)
     {
         new_volume = 0;

mythtv/libs/libmyth/audio/volumebase.h

@@ -20 +20 @@
     bool SWVolume(void) const;
     virtual uint GetCurrentVolume(void) const;
     virtual void SetCurrentVolume(int value);
+    virtual void SaveCurrentVolume(void);
     virtual void AdjustCurrentVolume(int change);
     virtual void ToggleMute(void);
 

mythtv/libs/libmythtv/audioplayer.cpp

@@ -343 +343 @@
     return GetVolume();
 }
 
+void AudioPlayer::SaveVolume(void)
+{
+    if (!m_audioOutput || m_no_audio_out)
+        return;
+    QMutexLocker lock(&m_lock);
+    m_audioOutput->SaveCurrentVolume();
+}
+
 int64_t AudioPlayer::GetAudioTime(void)
 {
     if (!m_audioOutput || m_no_audio_out)

mythtv/libs/libmythtv/audioplayer.h

@@ -54 +54 @@
     uint  GetVolume(void);
     uint  AdjustVolume(int change);
     uint  SetVolume(int newvolume);
+    void  SaveVolume(void);
     float GetStretchFactor(void) const { return m_stretchfactor; }
     void  SetStretchFactor(float factor);
     bool  IsUpmixing(void);

mythtv/libs/libmythtv/mythplayer.h

@@ -389 +389 @@
     // Audio Sets
     uint AdjustVolume(int change)           { return audio.AdjustVolume(change); }
     uint SetVolume(int newvolume)           { return audio.SetVolume(newvolume); }
+    void SaveVolume(void)                   { return audio.SaveVolume(); }
     bool SetMuted(bool mute)                { return audio.SetMuted(mute);       }
     MuteState SetMuteState(MuteState state) { return audio.SetMuteState(state);  }
     MuteState IncrMuteState(void)           { return audio.IncrMuteState();      }

mythtv/libs/libmythtv/tv_play.cpp

@@ -3298 +3298 @@
         }
         if (db_auto_set_watched)
             ctx->player->SetWatched();
+
+        if (ctx->player->GetAudio()->ControlsVolume())
+        {
+            ctx->player->SaveVolume();
+        }
+
     }
     ctx->UnlockDeletePlayer(__FILE__, line);
 }