clockworkpi/LauncherGoDev
1
0
Fork 0
mirror of https://github.com/clockworkpi/LauncherGoDev.git synced 2026-03-19 10:22:41 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace wlan0 to sysgo.WifiDev

Browse Source 
move execCmd to UI.ExecCmd

add read app-local.ini in config.go for dev/ run launcher out of
GameShell
This commit is contained in:
cuu
2021-10-10 12:44:05 +08:00
parent d463dd10ec
commit d3f3a4350b
11 changed files with 94 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Menu/GameShell/10_Settings/Sound/volume_linux.go
View File

@@ -20,10 +20,6 @@ func init() {
}
}
func cmdEnv() []string {
return []string{"LANG=C", "LC_ALL=C"}
}
func getVolumeCmd() []string {
if useAmixer {
return []string{"amixer", "get", "Master"}

31
Menu/GameShell/10_Settings/Sound/volume_unix.go
View File

@@ -6,25 +6,16 @@ package Sound
import (
"errors"
"fmt"
"os"
"os/exec"
"strings"
//"fmt"
//"os"
//"os/exec"
//"strings"
"github.com/clockworkpi/LauncherGoDev/sysgo/UI"
)
func execCmd(cmdArgs []string) ([]byte, error) {
cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
cmd.Env = append(os.Environ(), cmdEnv()...)
out, err := cmd.Output()
if err != nil {
err = fmt.Errorf(`failed to execute "%v" (%+v)`, strings.Join(cmdArgs, " "), err)
}
return out, err
}
// GetVolume returns the current volume (0 to 100).
func GetVolume() (int, error) {
out, err := execCmd(getVolumeCmd())
out, err := UI.ExecCmd(getVolumeCmd())
if err != nil {
return 0, err
}
@@ -36,19 +27,19 @@ func SetVolume(volume int) error {
if volume < 0 || 100 < volume {
return errors.New("out of valid volume range")
}
_, err := execCmd(setVolumeCmd(volume))
_, err := UI.ExecCmd(setVolumeCmd(volume))
return err
}
// IncreaseVolume increases (or decreases) the audio volume by the specified value.
func IncreaseVolume(diff int) error {
_, err := execCmd(increaseVolumeCmd(diff))
_, err := UI.ExecCmd(increaseVolumeCmd(diff))
return err
}
// GetMuted returns the current muted status.
func GetMuted() (bool, error) {
out, err := execCmd(getMutedCmd())
out, err := UI.ExecCmd(getMutedCmd())
if err != nil {
return false, err
}
@@ -57,12 +48,12 @@ func GetMuted() (bool, error) {
// Mute mutes the audio.
func Mute() error {
_, err := execCmd(muteCmd())
_, err := UI.ExecCmd(muteCmd())
return err
}
// Unmute unmutes the audio.
func Unmute() error {
_, err := execCmd(unmuteCmd())
_, err := UI.ExecCmd(unmuteCmd())
return err
}