[VolumeControl]

* improve mute
openatv · Sep 13, 2024 · 5ff7f22 · 5ff7f22
1 parent 2c1deed
commit 5ff7f22
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/dvb/volume.cpp b/lib/dvb/volume.cpp
@@ -256,10 +256,11 @@ void eDVBVolumecontrol::volumeUnMute()
 #endif
 }
 
-void eDVBVolumecontrol::volumeToggleMute()
+bool eDVBVolumecontrol::volumeToggleMute()
 {
 	if (isMuted())
 		volumeUnMute();
 	else
 		volumeMute();
+	return muted;
 }
diff --git a/lib/dvb/volume.h b/lib/dvb/volume.h
@@ -46,7 +46,7 @@ class eDVBVolumecontrol
 
 	void volumeMute();
 	void volumeUnMute();
-	void volumeToggleMute();
+	bool volumeToggleMute();
 
 	int getVolume() { return leftVol; }
 	int getVolumeLeft() { return leftVol; }

diff --git a/lib/python/Components/VolumeControl.py b/lib/python/Components/VolumeControl.py
@@ -66,14 +66,15 @@ def keyVolumeStop(self):
 		self.dvbVolumeControl.setVolumeSteps(config.volumeControl.pressStep.value)
 
 	def keyVolumeMute(self):  # This will toggle the current mute status.
-		self.dvbVolumeControl.volumeToggleMute()
-		if self.dvbVolumeControl.isMuted():
+		isMuted = self.dvbVolumeControl.volumeToggleMute()
+		if isMuted:
 			self.muteDialog.show()
 			self.volumeDialog.hide()
 		else:
 			self.muteDialog.hide()
 			self.volumeDialog.setValue(self.dvbVolumeControl.getVolume())
 			self.volumeDialog.show()
+		config.volumeControl.mute.value = isMuted
 		self.hideTimer.start(config.volumeControl.hideTimer.value * 1000, True)
 
 	def keyVolumeMuteLong(self):  # Long press MUTE will keep the mute icon on-screen without a timeout.
@@ -93,7 +94,6 @@ def hideVolume(self):
 		self.volumeDialog.hide()
 
 	def saveVolumeState(self):
-		config.volumeControl.mute.value = self.dvbVolumeControl.isMuted()
 		config.volumeControl.volume.setValue(self.dvbVolumeControl.getVolume())
 		config.volumeControl.save()