From 3b664e19968033786b4eaeb1d4529311e1730808 Mon Sep 17 00:00:00 2001 From: Greg Gauthier Date: Sat, 20 Mar 2021 19:41:58 +0000 Subject: [PATCH] no need to make the menu handle the player --- commander.go | 7 ++++--- radiomenu.go | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commander.go b/commander.go index 9ecc190..012dbc1 100644 --- a/commander.go +++ b/commander.go @@ -14,14 +14,15 @@ func isInstalled(name string) bool { return true } -func subExecute(program string, args ...string) ([]byte, error) { +func subExecute(program string, args ...string) { cmd := exec.Command(program, args...) cmd.Stdin = os.Stdin cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr + cmd.Stderr = os.Stdout err := cmd.Run() if err != nil { fmt.Printf("%v\n", err) } - return cmd.CombinedOutput() + outp, _ := cmd.CombinedOutput() + fmt.Println(outp) } diff --git a/radiomenu.go b/radiomenu.go index 57656f2..b53cd8d 100644 --- a/radiomenu.go +++ b/radiomenu.go @@ -29,8 +29,7 @@ func RadioMenu(stations []stationRecord) *wmenu.Menu { if opts[0].Text == "Quit"{Quit()} val := fmt.Sprintf("%s",opts[0].Value) fmt.Printf("Streaming: " + opts[0].Text + "\n") - stdout, _ := subExecute(player(), options(), val) - fmt.Println(stdout) + subExecute(player(), options(), val) err := menu.Run() if err != nil { log.Fatal("Oops! " + err.Error())