From 5d18559c1cf93e81c9c5e5cbbbd328212cc764a0 Mon Sep 17 00:00:00 2001 From: borine <32966433+borine@users.noreply.github.com> Date: Wed, 6 Mar 2019 19:37:19 +0000 Subject: [PATCH] input/plugins/AlsaInputPlugin: change default device to default and default format to 48000:16:2 using the device "default" brings this plugin into line with the AlsaOutputPlugin; and a sample rate of 48kHz is more widely used as a native default for modern hardware than 44.1kHz Also fixes an inconsistency between the docs and code. --- doc/plugins.rst | 2 +- src/input/plugins/AlsaInputPlugin.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/plugins.rst b/doc/plugins.rst index 55f79bc6a..e04ddb797 100644 --- a/doc/plugins.rst +++ b/doc/plugins.rst @@ -134,7 +134,7 @@ Allows :program:`MPD` on Linux to play audio directly from a soundcard using the .. code-block:: none - mpc add alsa:// plays audio from device hw:0,0 + mpc add alsa:// plays audio from device default .. code-block:: none diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx index 7956524ea..4151c920e 100644 --- a/src/input/plugins/AlsaInputPlugin.cxx +++ b/src/input/plugins/AlsaInputPlugin.cxx @@ -52,8 +52,8 @@ static constexpr Domain alsa_input_domain("alsa"); static constexpr auto ALSA_URI_PREFIX = "alsa://"; -static constexpr auto BUILTIN_DEFAULT_DEVICE = "hw:0,0"; -static constexpr auto BUILTIN_DEFAULT_FORMAT = "44100:16:2"; +static constexpr auto BUILTIN_DEFAULT_DEVICE = "default"; +static constexpr auto BUILTIN_DEFAULT_FORMAT = "48000:16:2"; static constexpr auto DEFAULT_BUFFER_TIME = std::chrono::milliseconds(1000); static constexpr auto DEFAULT_RESUME_TIME = DEFAULT_BUFFER_TIME / 2;