fixed bug in volume level display

zrdimetc · Jan 13, 2022 · 7e3daa5 · 7e3daa5
1 parent 330dcdc
commit 7e3daa5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/commandkeys.go b/commandkeys.go
@@ -179,18 +179,19 @@ func (b *Talkkonnect) cmdCurrentVolume() {
 }
 
 func (b *Talkkonnect) cmdVolumeUp() {
+	log.Println("debug: F5 pressed Volume UP (+)")
 	origVolume, err := volume.GetVolume(Config.Global.Software.Settings.OutputVolControlDevice)
 	if err != nil {
-		log.Printf("warn: unable to get original volume: %+v\n", err)
+		log.Printf("warn: unable to get original volume: %+v volume control will not work!\n", err)
+		return
 	}
 
 	if origVolume < 100 {
 		err := volume.IncreaseVolume(Config.Global.Hardware.IO.VolumeButtonStep.VolUpStep, Config.Global.Software.Settings.OutputVolControlDevice)
 		if err != nil {
 			log.Println("warn: F5 Increase Volume Failed! ", err)
 		}
-
-		log.Println("debug: F5 pressed Volume UP (+)")
+		origVolume, _ := volume.GetVolume(Config.Global.Software.Settings.OutputVolControlDevice)
 		log.Println("info: Volume UP (+) Now At ", origVolume, "%")
 		if Config.Global.Hardware.TargetBoard == "rpi" {
 			if LCDEnabled {
@@ -214,24 +215,23 @@ func (b *Talkkonnect) cmdVolumeUp() {
 			}
 		}
 	}
-
 	TTSEvent("digitalvolumeup")
 }
 
 func (b *Talkkonnect) cmdVolumeDown() {
+	log.Println("info: F6 pressed Volume Down (-)")
 	origVolume, err := volume.GetVolume(Config.Global.Software.Settings.OutputVolControlDevice)
 	if err != nil {
-		log.Printf("error: unable to get original volume: %+v\n", err)
+		log.Printf("warn: unable to get original volume: %+v volume control will not work!\n", err)
+		return
 	}
 
 	if origVolume > 0 {
-		origVolume--
 		err := volume.IncreaseVolume(Config.Global.Hardware.IO.VolumeButtonStep.VolDownStep, Config.Global.Software.Settings.OutputVolControlDevice)
 		if err != nil {
 			log.Println("error: F6 Decrease Volume Failed! ", err)
 		}
-
-		log.Println("info: F6 pressed Volume Down (-)")
+		origVolume, _ := volume.GetVolume(Config.Global.Software.Settings.OutputVolControlDevice)
 		log.Println("info: Volume Down (-) Now At ", origVolume, "%")
 		if Config.Global.Hardware.TargetBoard == "rpi" {
 			if LCDEnabled {

diff --git a/version.go b/version.go
@@ -31,10 +31,10 @@
 package talkkonnect
 
 const (
-	talkkonnectVersion  string = "2.07.23"
+	talkkonnectVersion  string = "2.07.24"
 	talkkonnectReleased string = "Jan 13 2022"
 )
 
 /* Release Notes
-1. Fixed not working cancellable stream bug in stream.go
+1. Fixed bug in volume displayed
 */