service/oss: handle mute state

Author: charlesrocket

src/services/oss/oss.cpp

@@ -102,17 +102,30 @@ bool OSSMixerControl::updateValue() {
 	}
 
 	auto value = 0;
+	auto changed = false;
 
 	if (ioctl(fd, MIXER_READ(this->mMixerId), &value) < 0) { // NOLINT
 		close(fd);
+		qCWarning(logOSS) << "Failed to read mixer";
 		return false;
 	}
 
-	close(fd);
-
 	auto newLeft = value & 0xFF;
 	auto newRight = (value >> 8) & 0xFF;
-	auto changed = false;
+	auto muteValue = 0;
+	bool newMuted = false;
+
+	if (ioctl(fd, SOUND_MIXER_READ_MUTE, &muteValue) >= 0) { // NOLINT
+		newMuted = (muteValue & (1 << this->mMixerId)) != 0;
+	}
+
+	close(fd);
+
+	if (this->mMuted != newMuted) {
+		this->mMuted = newMuted;
+		emit this->mutedChanged();
+		changed = true;
+	}
 
 	if (this->mLeft != newLeft) {
 		this->mLeft = newLeft;
@@ -141,8 +154,8 @@ bool OSSMixerControl::writeValue() {
 		return false;
 	}
 
-	auto left = this->mMuted ? 0 : this->mLeft;
-	auto right = this->mMuted ? 0 : (this->mStereo ? this->mRight : this->mLeft);
+	auto left = this->mLeft;
+	auto right = this->mStereo ? this->mRight : this->mLeft;
 	auto value = (right << 8) | left;
 
 	if (ioctl(fd, MIXER_WRITE(this->mMixerId), &value) < 0) { // NOLINT
@@ -151,6 +164,20 @@ bool OSSMixerControl::writeValue() {
 		return false;
 	}
 
+	auto muteValue = 0;
+
+	if (ioctl(fd, SOUND_MIXER_READ_MUTE, &muteValue) >= 0) { // NOLINT
+		if (this->mMuted) {
+			muteValue |= (1 << this->mMixerId);
+		} else {
+			muteValue &= ~(1 << this->mMixerId);
+		}
+
+		if (ioctl(fd, SOUND_MIXER_WRITE_MUTE, &muteValue) < 0) {
+			qCWarning(logOSS) << "Failed to write mute state for control:" << this->mName;
+		}
+	}
+
 	close(fd);
 	return true;
 }