From aa5c7fc159b0f5175ede96d46b8d2a2669a176a4 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 28 Dec 2022 13:27:05 +0100 Subject: llog: use variable argument list Mirror more closely the fmt interface and reduce the verbosity of the log call sites. Additionally the log message is only created if we are actually going to log it. --- player.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'player.go') diff --git a/player.go b/player.go index 35eee9f..9b523fe 100644 --- a/player.go +++ b/player.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "io" "os/exec" "syscall" @@ -31,11 +30,11 @@ func NewPlayer(wrms *Wrms, backends []string) Player { case "local": b = NewLocalBackend(wrms.Config.localMusicDir) default: - llog.Error(fmt.Sprintf("Not supported backend %s", backend)) + llog.Error("Not supported backend %s", backend) } if err != nil { - llog.Error(fmt.Sprintf("Error during initialization of the %s backend: %s", backend, err.Error())) + llog.Error("Error during initialization of the %s backend: %s", backend, err.Error()) } else { available_backends[backend] = b } @@ -51,7 +50,7 @@ func (player *Player) Play(song *Song) { return } - llog.Info(fmt.Sprintf("Start playing %v", song)) + llog.Info("Start playing %v", song) player.Backends[song.Source].Play(song, player) } @@ -69,7 +68,7 @@ func (player *Player) runMpv() { } func (player *Player) PlayUri(uri string) { - llog.Info(fmt.Sprintf("Start mpv with %s", uri)) + llog.Info("Start mpv with %s", uri) player.mpv = exec.Command("mpv", "--no-video", uri) go player.runMpv() } @@ -89,7 +88,7 @@ func (player *Player) PlayData(data io.Reader) { defer stdin.Close() if _, err := io.Copy(stdin, data); err != nil { - llog.Fatal(fmt.Sprintf("Failed to write song data to mpv (%v)", err)) + llog.Fatal("Failed to write song data to mpv (%v)", err) } }() -- cgit v1.2.3