← Back to branch summary

~ubuntu-branches/ubuntu/karmic/pulseaudio/karmic-updates

« back to all changes in this revision

Viewing changes to src/modules/alsa/mixer/paths/analog-input.conf.common

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Daniel T Chen, Luke Yelavich
  • Date: 2009-09-11 09:24:39 UTC
  • mfrom: (1.14.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090911092439-7dixbvy6r30alrv8
Tags: 1:0.9.16-0ubuntu1
https://launchpad.net/bugs/426210
[ Daniel T Chen ]
* debian/patches/0090-use-volume-ignore-for-analog-output.patch:
  + Realign volume control behaviour with existing Ubuntu releases,
    i.e., disable volume = merge and use volume = ignore for
    analog output

[ Luke Yelavich ]
* New upstream release
* debian/patches/0057-introspect-version-fixes.patch (LP: #426210),
  debian/patches/0056-alsa-rework.patch,
  debian/patches/0055-llvm-clang-analyzer-fixes.patch,
  0054-volume-libpulse-backported-fixes.patch,
  0053-add-input-sources.patch,
  debian/patches/0052-disable-cpu-limit.patch: Dropped, all applied upstream
* debian/patches/0051-reduce-lib-linking.patch: Drop, since we are not going
  to be doing bi-arch pulseaudio packages for karmic

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/alsa/mixer/paths/analog-input.conf.common
78
78
name = input-microphone
79
79
priority = 19
80
80
 
 
81
[Option Input Source:Internal Mic]
 
82
name = input-microphone
 
83
priority = 19
 
84
 
81
85
[Option Input Source:Line]
82
86
name = input-linein
83
87
priority = 18
90
94
name = input-linein
91
95
priority = 18
92
96
 
 
97
[Option Input Source:Docking-Station]
 
98
name = input-docking
 
99
priority = 17
 
100
 
93
101
;;; ' Capture Source'
94
102
 
95
103
[Element Capture Source]