fix volume/mute bug for listen.moe backend

zhiayang · Feb 6, 2022 · ec44c4e · ec44c4e
1 parent af038fb
commit ec44c4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/MoeStreamer.xcodeproj/project.pbxproj b/MoeStreamer.xcodeproj/project.pbxproj
@@ -653,7 +653,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.17.3;
+				MARKETING_VERSION = 0.17.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.zhiayang.MoeStreamer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -688,7 +688,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.17.3;
+				MARKETING_VERSION = 0.17.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.zhiayang.MoeStreamer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";

diff --git a/MoeStreamer/src/audio/StreamAudioController.swift b/MoeStreamer/src/audio/StreamAudioController.swift
@@ -67,18 +67,16 @@ class StreamAudioController : NSObject, AudioController, VLCMediaPlayerDelegate
 
 	func mute()
 	{
-		self.vlcMP.audio.volume = 0
 		self.muted = true
+		self.vlcMP.audio.volume = 0
 
 		Settings.set(.audioMuted(), value: true)
 	}
 
 	func unmute()
 	{
-		let vol: Int = Settings.get(.audioVolume())
-
-		self.vlcMP.audio.volume = Int32(vol)
 		self.muted = false
+		self.setVolume(volume: self.volume)
 
 		Settings.set(.audioMuted(), value: false)
 	}