~ubuntu-core-dev/pulseaudio/ubuntu.2a.natty

« back to all changes in this revision

Viewing changes to debian/patches/0090-use-volume-ignore-for-analog-output.patch

  • Committer: Luke Yelavich
  • Date: 2010-10-14 05:22:08 UTC
  • Revision ID: luke.yelavich@canonical.com-20101014052208-3ukud2d47hrykk0w
* New upstream snapshot, based on the stable-queue branch
  (Fixes lp: #445849)
* debian/patches: Drop the following patches as they are applied upstream,
  or were created to regenerate autotools files/package version
  - 0090-use-volume-ignore-for-analog-output.patch
  - 0093-backport-fixes-stable-queue-head.patch
  - 0094-add-missing-mixer-paths-and-rerun-automake.patch
  - 0095-cve-2009-1299.patch
  - 0097-regenerate-configure.patch
  - 0098-tarball-version.patch
  - 0192-stream-restore-Clear-the-save_sink-save_source-flags.patch
  - 0193-augment-properties-Search-for-.desktop-files-in-subf.patch
  - 0194-device-manager-Ensure-that-sinks-sources-populate-th.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: pulseaudio-0.9.16~test7-14-g7ca81/src/modules/alsa/mixer/paths/analog-output.conf.common
2
 
===================================================================
3
 
--- pulseaudio-0.9.16~test7-14-g7ca81.orig/src/modules/alsa/mixer/paths/analog-output.conf.common       2009-09-08 23:31:52.000000000 -0400
4
 
+++ pulseaudio-0.9.16~test7-14-g7ca81/src/modules/alsa/mixer/paths/analog-output.conf.common    2009-09-08 23:32:29.000000000 -0400
5
 
@@ -95,7 +95,7 @@
6
 
 
7
 
 [Element PCM]
8
 
 switch = mute
9
 
-volume = merge
10
 
+volume = ignore
11
 
 override-map.1 = all
12
 
 override-map.2 = all-left,all-right
13