Re: [alsa-devel] [PATCH] pulse: Install a PulseAudio config snippet into alsa.conf.d

At Tue, 13 Sep 2011 22:31:23 +0100, gmane@colin.guthr.ie wrote:

From: Colin Guthrie colin@mageia.org

Better with a sign-off please (although it's not mandatory for user-space trees).

Also, isn't it better to name *.conf files with number prefix like udev, et al? Otherwise the loading order isn't deterministic.

thanks,

Takashi

---

configure.in | 19 ++++++++++++++++++- pulse/Makefile.am | 2 ++ pulse/pulseaudio-default.conf.example | 13 +++++++++++++ pulse/pulseaudio.conf | 13 +++++++++++++ 4 files changed, 46 insertions(+), 1 deletions(-) create mode 100644 pulse/pulseaudio-default.conf.example create mode 100644 pulse/pulseaudio.conf

diff --git a/configure.in b/configure.in index ccf59ba..3839dd5 100644 --- a/configure.in +++ b/configure.in @@ -131,10 +131,10 @@ fi AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib") AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib")

-dnl ALSA plugin directory test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix

+dnl ALSA plugin directory AC_ARG_WITH(plugindir, AS_HELP_STRING([--with-plugindir=dir], [path where ALSA plugin files are stored]), @@ -151,6 +151,23 @@ AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "$plugindir", [directory containing ALSA add ALSA_PLUGIN_DIR="$plugindir" AC_SUBST(ALSA_PLUGIN_DIR)

+dnl ALSA data directory +AC_ARG_WITH(alsadatadir,

• AS_HELP_STRING([--with-alsadatadir=dir],
• [path where ALSA data files are stored]),
• alsadatadir="$withval", alsadatadir="")

+if test -z "$alsadatadir"; then

• eval dir="$datadir"
• case "$dir" in
• /*) ;;
• *) dir="$dir"
• esac
• alsadatadir="$dir/alsa"

+fi +AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA data files]) +ALSA_DATA_DIR="$alsadatadir" +AC_SUBST(ALSA_DATA_DIR)

SAVE_PLUGINS_VERSION

AC_OUTPUT([ diff --git a/pulse/Makefile.am b/pulse/Makefile.am index e89e8ee..cca49ac 100644 --- a/pulse/Makefile.am +++ b/pulse/Makefile.am @@ -1,10 +1,12 @@ asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la asound_module_conf_LTLIBRARIES = libasound_module_conf_pulse.la +asound_module_data_DATA = pulseaudio.conf pulseaudio-default.conf.example

asound_module_pcmdir = @ALSA_PLUGIN_DIR@ asound_module_ctldir = @ALSA_PLUGIN_DIR@ asound_module_confdir = @ALSA_PLUGIN_DIR@ +asound_module_datadir = @ALSA_DATA_DIR@/alsa.conf.d

AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) diff --git a/pulse/pulseaudio-default.conf.example b/pulse/pulseaudio-default.conf.example new file mode 100644 index 0000000..4f58858 --- /dev/null +++ b/pulse/pulseaudio-default.conf.example @@ -0,0 +1,13 @@ +# Default to PulseAudio

+pcm.!default {

• type pulse
• hint {

•    show on
  

•    description "Default ALSA Output (currently PulseAudio Sound Server)"
  

• }

+}

+ctl.!default {

• type pulse

+} diff --git a/pulse/pulseaudio.conf b/pulse/pulseaudio.conf new file mode 100644 index 0000000..dd85dab --- /dev/null +++ b/pulse/pulseaudio.conf @@ -0,0 +1,13 @@ +# Add a specific named PulseAudio pcm and ctl (typically useful for testing)

+pcm.pulse {

• type pulse
• hint {

•    show on
  

•    description "PulseAudio Sound Server"
  

• }

+}

+ctl.pulse {

• type pulse

+}

1.7.6

---

Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel