codemicro/bar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Detect default PulseAudio sink instead of assuming it

Browse source 
In the event where the default sink in use is not the first one
presented by `pacmd info`, the volume readout would be incorrect.

This commit fixes that by getting the current default sink from
`pactl info` before getting the sink volume.

Signed-off-by: AKP <tom@tdpain.net>
This commit is contained in:
akp 2022-11-02 09:17:50 +00:00
parent aa21b99d02
commit ff63987689
No known key found for this signature in database
GPG key ID: AA5726202C8879B7
1 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

31
internal/providers/pulseaudioVolume.go
View file

@ -30,6 +30,24 @@ func (g *PulseaudioVolume) getInfo() (string, error) {
return string(x), err
}
var (
pactlInfoDefaultSinkRegexp = regexp.MustCompile(`Default Sink: (.+)`)
)
func (g *PulseaudioVolume) getDefaultSink() (string, error) {
x, err := runCommand("pactl", "info")
if err != nil {
return "", err
}
submatches := pactlInfoDefaultSinkRegexp.FindSubmatch(x)
if len(submatches) == 0 {
return "", errors.New("unexpectedly formed `pactl info` output")
}
return string(submatches[1]), nil
}
var (
pulseaudioInfoParseRegexp = regexp.MustCompile(`(\d+ sink\(s\) available\.|\d+ source\(s\) available\.)`)
pulseaudioVolumeRegexp = regexp.MustCompile(`volume: front-left: \d+ \/ +(\d{1,3})% \/ (?:\d|.)+ dB, +front-right: \d+ \/ +(\d{1,3})% \/ (?:\d|.)+ dB`)
@ -46,6 +64,17 @@ type volumeInfo struct {
func (g *PulseaudioVolume) getVolume(info string) (*volumeInfo, error) {
x := pulseaudioInfoParseRegexp.Split(info, 5)
var targetSink string
if g.Sink == "" {
var err error
targetSink, err = g.getDefaultSink()
if err != nil {
return nil, err
}
} else {
targetSink = g.Sink
}
sinkInfoStrings := strings.Split(
strings.TrimLeft(x[1], "\n\t* "),
"index: ",
@ -54,7 +83,7 @@ func (g *PulseaudioVolume) getVolume(info string) (*volumeInfo, error) {
for _, sinkText := range sinkInfoStrings {
v := new(volumeInfo)
name := pulseaudioNameRegexp.FindStringSubmatch(sinkText)
if len(name) == 2 && (strings.EqualFold(name[1], g.Sink) || g.Sink == "") {
if len(name) == 2 && (strings.EqualFold(name[1], targetSink)) {
volumes := pulseaudioVolumeRegexp.FindStringSubmatch(sinkText)
muted := pulseaudioMutedRegexp.FindStringSubmatch(sinkText)[1]