List player options before listing devices

This commit is contained in:
badaix 2021-02-02 21:09:23 +01:00
parent ed9a8c6462
commit 3b50f7a1ad
2 changed files with 10 additions and 10 deletions

View file

@ -332,15 +332,6 @@ int main(int argc, char** argv)
} }
#endif #endif
settings.player.pcm_device = getPcmDevice(settings.player.player_name, settings.player.parameter, pcm_device);
#if defined(HAS_ALSA)
if (settings.player.pcm_device.idx == -1)
{
cout << "PCM device \"" << pcm_device << "\" not found\n";
// exit(EXIT_FAILURE);
}
#endif
#ifdef HAS_SOXR #ifdef HAS_SOXR
if (sample_format->is_set()) if (sample_format->is_set())
{ {
@ -388,6 +379,15 @@ int main(int argc, char** argv)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
settings.player.pcm_device = getPcmDevice(settings.player.player_name, settings.player.parameter, pcm_device);
#if defined(HAS_ALSA)
if (settings.player.pcm_device.idx == -1)
{
cout << "PCM device \"" << pcm_device << "\" not found\n";
// exit(EXIT_FAILURE);
}
#endif
string mode = utils::string::split_left(mixer_mode->value(), ':', settings.player.mixer.parameter); string mode = utils::string::split_left(mixer_mode->value(), ':', settings.player.mixer.parameter);
if (mode == "software") if (mode == "software")
settings.player.mixer.mode = ClientSettings::Mixer::Mode::software; settings.player.mixer.mode = ClientSettings::Mixer::Mode::software;

2
debian/changelog vendored
View file

@ -11,7 +11,7 @@ snapcast (0.23.103-1) unstable; urgency=medium
-- Johannes Pohl <snapcast@badaix.de> Sun, 07 Mar 2021 00:13:37 +0200 -- Johannes Pohl <snapcast@badaix.de> Sun, 07 Mar 2021 00:13:37 +0200
snapcast (0.23.0-1) unstable; urgency=medium snapcast (0.23.0-1) unstable; urgency=medium
* Features * Features
-Client: Add PulseAudio player backend (Issue #722) -Client: Add PulseAudio player backend (Issue #722)