← Back to branch summary

~crimsun/pulseaudio/ubuntu.2a.maverick

« back to all changes in this revision

Viewing changes to debian/patches/0096-lp560178-handle-emu10k1-secondary-and-livedrive-controls.patch

  • Committer: Daniel T Chen
  • Date: 2010-04-11 00:54:53 UTC
  • Revision ID: crimsun@ubuntu.com-20100411005453-b2vezsmga9l0yc5d
https://launchpad.net/bugs/560178
0096-lp560178-handle-emu10k1-secondary-and-livedrive-controls.patch:
Make sure to handle the emu10k1's 'Wave*' controls, too.
(LP: #560178)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0096-lp560178-handle-emu10k1-secondary-and-livedrive-controls.patch
 
1
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf
 
2
===================================================================
 
3
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output.conf 2010-04-10 20:41:03.000000000 -0400
 
4
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf      2010-04-10 20:46:53.000000000 -0400
 
5
@@ -102,4 +102,28 @@
 
6
 override-map.1 = lfe
 
7
 override-map.2 = lfe,lfe
 
8
 
 
9
+[Element Wave]
 
10
+switch = mute
 
11
+volume = merge
 
12
+override-map.1 = all-front
 
13
+override-map.2 = front-left,front-right
 
14
+
 
15
+[Element Wave Surround]
 
16
+switch = mute
 
17
+volume = merge
 
18
+override-map.1 = all-rear
 
19
+override-map.2 = rear-left,rear-right
 
20
+
 
21
+[Element Wave Center]
 
22
+switch = mute
 
23
+volume = merge
 
24
+override-map.1 = all-center
 
25
+override-map.2 = all-center,all-center
 
26
+
 
27
+[Element Wave LFE]
 
28
+switch = mute
 
29
+volume = merge
 
30
+override-map.1 = lfe
 
31
+override-map.2 = lfe,lfe
 
32
+
 
33
 .include analog-output.conf.common
 
34
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
 
35
===================================================================
 
36
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf 2010-04-10 20:48:57.000000000 -0400
 
37
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf      2010-04-10 20:49:42.000000000 -0400
 
38
@@ -96,4 +96,28 @@
 
39
 override-map.1 = lfe
 
40
 override-map.2 = lfe,lfe
 
41
 
 
42
+[Element Wave]
 
43
+switch = mute
 
44
+volume = merge
 
45
+override-map.1 = all-front
 
46
+override-map.2 = front-left,front-right
 
47
+
 
48
+[Element Wave Surround]
 
49
+switch = mute
 
50
+volume = merge
 
51
+override-map.1 = all-rear
 
52
+override-map.2 = rear-left,rear-right
 
53
+
 
54
+[Element Wave Center]
 
55
+switch = mute
 
56
+volume = merge
 
57
+override-map.1 = all-center
 
58
+override-map.2 = all-center,all-center
 
59
+
 
60
+[Element Wave LFE]
 
61
+switch = mute
 
62
+volume = merge
 
63
+override-map.1 = lfe
 
64
+override-map.2 = lfe,lfe
 
65
+
 
66
 .include analog-output.conf.common
 
67
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-speaker.conf
 
68
===================================================================
 
69
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2010-04-10 20:48:57.000000000 -0400
 
70
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-speaker.conf      2010-04-10 20:50:12.000000000 -0400
 
71
@@ -102,4 +102,28 @@
 
72
 override-map.1 = lfe
 
73
 override-map.2 = lfe,lfe
 
74
 
 
75
+[Element Wave]
 
76
+switch = mute
 
77
+volume = merge
 
78
+override-map.1 = all-front
 
79
+override-map.2 = front-left,front-right
 
80
+
 
81
+[Element Wave Surround]
 
82
+switch = mute
 
83
+volume = merge
 
84
+override-map.1 = all-rear
 
85
+override-map.2 = rear-left,rear-right
 
86
+
 
87
+[Element Wave Center]
 
88
+switch = mute
 
89
+volume = merge
 
90
+override-map.1 = all-center
 
91
+override-map.2 = all-center,all-center
 
92
+
 
93
+[Element Wave LFE]
 
94
+switch = mute
 
95
+volume = merge
 
96
+override-map.1 = lfe
 
97
+override-map.2 = lfe,lfe
 
98
+
 
99
 .include analog-output.conf.common
 
100
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf
 
101
===================================================================
 
102
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones.conf      2010-04-10 20:48:57.000000000 -0400
 
103
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf   2010-04-10 20:51:44.000000000 -0400
 
104
@@ -93,4 +93,20 @@
 
105
 switch = off
 
106
 volume = off
 
107
 
 
108
+[Element Wave]
 
109
+switch = off
 
110
+volume = off
 
111
+
 
112
+[Element Wave Surround]
 
113
+switch = off
 
114
+volume = off
 
115
+
 
116
+[Element Wave Center]
 
117
+switch = off
 
118
+volume = off
 
119
+
 
120
+[Element Wave LFE]
 
121
+switch = off
 
122
+volume = off
 
123
+
 
124
 .include analog-output.conf.common
 
125
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
 
126
===================================================================
 
127
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf    2010-04-10 20:48:57.000000000 -0400
 
128
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2010-04-10 20:51:58.000000000 -0400
 
129
@@ -90,4 +90,20 @@
 
130
 switch = off
 
131
 volume = off
 
132
 
 
133
+[Element Wave]
 
134
+switch = off
 
135
+volume = off
 
136
+
 
137
+[Element Wave Surround]
 
138
+switch = off
 
139
+volume = off
 
140
+
 
141
+[Element Wave Center]
 
142
+switch = off
 
143
+volume = off
 
144
+
 
145
+[Element Wave LFE]
 
146
+switch = off
 
147
+volume = off
 
148
+
 
149
 .include analog-output.conf.common
 
150
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf
 
151
===================================================================
 
152
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf     2010-04-10 20:48:57.000000000 -0400
 
153
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf  2010-04-10 20:52:18.000000000 -0400
 
154
@@ -86,4 +86,20 @@
 
155
 switch = off
 
156
 volume = off
 
157
 
 
158
+[Element Wave]
 
159
+switch = off
 
160
+volume = off
 
161
+
 
162
+[Element Wave Surround]
 
163
+switch = off
 
164
+volume = off
 
165
+
 
166
+[Element Wave Center]
 
167
+switch = off
 
168
+volume = off
 
169
+
 
170
+[Element Wave LFE]
 
171
+switch = off
 
172
+volume = off
 
173
+
 
174
 .include analog-output.conf.common
 
175
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-mono.conf
 
176
===================================================================
 
177
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-mono.conf    2010-04-10 20:48:57.000000000 -0400
 
178
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-mono.conf 2010-04-10 20:52:37.000000000 -0400
 
179
@@ -87,4 +87,20 @@
 
180
 switch = off
 
181
 volume = off
 
182
 
 
183
+[Element Wave]
 
184
+switch = off
 
185
+volume = off
 
186
+
 
187
+[Element Wave Surround]
 
188
+switch = off
 
189
+volume = off
 
190
+
 
191
+[Element Wave Center]
 
192
+switch = off
 
193
+volume = off
 
194
+
 
195
+[Element Wave LFE]
 
196
+switch = off
 
197
+volume = off
 
198
+
 
199
 .include analog-output.conf.common