[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, stable-queue, updated. v0.9.21-48-g047e16f

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The stable-queue branch has been updated
      from  6bbdd200e89bdbf180071e5281c0feb9617de81d (commit)

- Log -----------------------------------------------------------------
047e16f Add missing profile and alsa-mixer/paths to src/Makefile.am
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------

commit 047e16f2d18c20ea8d9dbb8a24175e1c4bb34d5e
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Fri Feb 19 00:23:17 2010 -0500

    Add missing profile and alsa-mixer/paths to src/Makefile.am
    
    Commits e8cb96c and 0c836aa created mixer paths but did not update
    src/Makefile.am.  Building a snapshot containing these two commits
    therefore results in the user being unable to adjust the volume or
    (un)mute through PA.  Fix this by adding the two new mixer paths
    files to src/Makefile.am.
    
    Likewise, commit 66e1a2d created a profile for the M-Audio FastTrack
    Pro USB but did not update src/Makefile.am.  Fix this by adding the
    profile to src/Makefile.am.

diff --git a/src/Makefile.am b/src/Makefile.am
index 598e77f..ffe7558 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,6 +109,7 @@ MODULE_LDFLAGS = -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED)
 
 ALSA_PROFILES = \
 		modules/alsa/mixer/profile-sets/default.conf \
+		modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
 		modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
 		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
 
@@ -117,6 +118,7 @@ ALSA_PATHS = \
 		modules/alsa/mixer/paths/analog-input.conf \
 		modules/alsa/mixer/paths/analog-input.conf.common \
 		modules/alsa/mixer/paths/analog-input-fm.conf \
+		modules/alsa/mixer/paths/analog-input-internal-mic.conf \
 		modules/alsa/mixer/paths/analog-input-linein.conf \
 		modules/alsa/mixer/paths/analog-input-mic.conf \
 		modules/alsa/mixer/paths/analog-input-mic.conf.common \
@@ -126,6 +128,7 @@ ALSA_PATHS = \
 		modules/alsa/mixer/paths/analog-output.conf \
 		modules/alsa/mixer/paths/analog-output-speaker.conf \
 		modules/alsa/mixer/paths/analog-output.conf.common \
+		modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \
 		modules/alsa/mixer/paths/analog-output-headphones.conf \
 		modules/alsa/mixer/paths/analog-output-headphones-2.conf \
 		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \

-- 
hooks/post-receive
PulseAudio Sound Server