Skip to content

feat: added runtime option for pulse backend #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pyrorhythm wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −7
Open

feat: added runtime option for pulse backend #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions output/driver-pulseaudio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ func newPulseAudioOutput(opts *NewOutputOptions) (*pulseAudioOutput, error) {
// The device name is shown by PulseAudio volume controls (usually built
// into a desktop environment), so we might want to use device_name here.
// We could also maybe change the application icon name by device_type.
client, err := pulse.NewClient(pulse.ClientApplicationName("go-librespot"), pulse.ClientApplicationIconName("speaker"))
clientopts := []pulse.ClientOption{pulse.ClientApplicationName("go-librespot"), pulse.ClientApplicationIconName("speaker")}

if opts.RuntimeSocket != "" {
clientopts = append(clientopts, pulse.ClientServerString(opts.RuntimeSocket))
}

client, err := pulse.NewClient(clientopts...)
if err != nil {
return nil, err
}
Expand All @@ -43,11 +49,12 @@ func newPulseAudioOutput(opts *NewOutputOptions) (*pulseAudioOutput, error) {

// Create a new playback.
var channelOpt pulse.PlaybackOption
if opts.ChannelCount == 1 {
switch opts.ChannelCount {
case 1:
channelOpt = pulse.PlaybackMono
} else if opts.ChannelCount == 2 {
case 2:
channelOpt = pulse.PlaybackStereo
} else {
default:
return nil, fmt.Errorf("cannot play %d channels, pulse only supports mono and stereo", opts.ChannelCount)
}
volumeUpdates := make(chan proto.ChannelVolumes, 1)
Expand Down
7 changes: 6 additions & 1 deletion output/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,13 @@ type NewOutputOptions struct {

// Device specifies the audio device name.
//
// This feature is support only for the alsa backend.
// This feature is support only for the alsa and pulseaudio backend.
Device string
// RuntimeSocket specifies a prefixed with protocol (e.g. `unix:` or `tcp:`) path
// to a runtime socket of audio backend.
//
// This feature is support only for pulseaudio backend.
RuntimeSocket string

// Mixer specifies the audio mixer name.
//
Expand Down
9 changes: 7 additions & 2 deletions player/player.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,14 @@ type Options struct {

// AudioBackend specifies the audio backend to use (alsa, pulseaudio, etc).
AudioBackend string
// AudioRuntimeSocket specifies a prefixed with protocol (e.g. `unix:` or `tcp:`) path
// to a runtime socket of audio backend.
//
// This feature is support only for the pulseaudio backend.
AudioBackendRuntimeSocket string
// AudioDevice specifies the audio device name.
//
// This feature is support only for the alsa backend.
// This feature is support only for the alsa and pulseaudio backend.
AudioDevice string
// MixerDevice specifies the audio mixer name.
//
Expand All @@ -126,7 +131,6 @@ type Options struct {
//
// This only works in combination with Mixer.
MixerControlName string

// AudioBufferTime is the buffer time in microseconds.
//
// This is only supported on the alsa backend.
Expand Down Expand Up @@ -178,6 +182,7 @@ func NewPlayer(opts *Options) (*Player, error) {
SampleRate: SampleRate,
ChannelCount: Channels,
Device: opts.AudioDevice,
RuntimeSocket: opts.AudioBackendRuntimeSocket,
Mixer: opts.MixerDevice,
Control: opts.MixerControlName,
InitialVolume: volume,
Expand Down