fix: small fixes in denon avr client

splattner · Oct 4, 2023 · 017f814 · 017f814
1 parent 95d61d5
commit 017f814
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/pkg/denonavr/attributes.go b/pkg/denonavr/attributes.go
@@ -45,15 +45,19 @@ func (d *DenonAVR) getMediaTitle() string {
 // Title of the Playing media or the current Input Function
 // Return true if the d.media_image_url has changed
 func (d *DenonAVR) getMediaImageURL() string {
-	var media_image_url string
+	media_image_url := ""
 
-	if slices.Contains(PLAYING_SOURCES, d.mainZoneData.InputFuncSelect) {
-		// This is a source that is playing audio
-		// fot the moment, also set this to the input func
+	if d.IsOn() {
+		if slices.Contains(PLAYING_SOURCES, d.mainZoneData.InputFuncSelect) {
+			// This is a source that is playing audio
+			// fot the moment, also set this to the input func
 
-		hash := fnv.New32a()
-		hash.Write([]byte(d.getMediaTitle()))
-		media_image_url = fmt.Sprintf("http://%s:%d/NetAudio/art.asp-jpg?%d", d.Host, 80, hash.Sum32())
+			hash := fnv.New32a()
+			hash.Write([]byte(d.getMediaTitle()))
+			media_image_url = fmt.Sprintf("http://%s:%d/NetAudio/art.asp-jpg?%d", d.Host, 80, hash.Sum32())
+		} else {
+			media_image_url = fmt.Sprintf("http://%s:%d/", d.Host, 80) + "img/album%20art_S.png"
+		}
 	}
 
 	d.SetAttribute("media_image_url", media_image_url)

diff --git a/pkg/denonavr/denonavr.go b/pkg/denonavr/denonavr.go
@@ -235,13 +235,13 @@ func (d *DenonAVR) updateAndNotify() {
 
 	// Surround Mode
 	if oldMainZoneStatus.SurrMode != d.mainZoneStatus.SurrMode {
-		d.callEntityChangeFunction("MainZoneSurroundMode", strings.TrimLeft(d.mainZoneStatus.SurrMode, ""))
+		d.callEntityChangeFunction("MainZoneSurroundMode", strings.TrimRight(d.mainZoneStatus.SurrMode, ""))
 	}
 	if oldZone2Status.SurrMode != d.zone2Status.SurrMode {
-		d.callEntityChangeFunction("Zone2SurroundMode", strings.TrimLeft(d.zone2Status.SurrMode, ""))
+		d.callEntityChangeFunction("Zone2SurroundMode", strings.TrimRight(d.zone2Status.SurrMode, ""))
 	}
 	if oldZone3Status.SurrMode != d.zone3Status.SurrMode {
-		d.callEntityChangeFunction("Zone3SurroundMode", strings.TrimLeft(d.zone3Status.SurrMode, ""))
+		d.callEntityChangeFunction("Zone3SurroundMode", strings.TrimRight(d.zone3Status.SurrMode, ""))
 	}
 
 }