~ubuntu-core-dev/pulseaudio/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/0093-backport-fixes-stable-queue-head.patch

  • Committer: Daniel T Chen
  • Date: 2010-02-22 05:24:31 UTC
  • Revision ID: crimsun@ubuntu.com-20100222052431-y9zmryl6x8amyvy2
* 0093-backport-fixes-stable-queue-head.patch: Backport the following
  changesets from the stable-queue branch:
  + dd682d (reset max_rewind/max_request in sink while suspending)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-mixer.c
2
2
===================================================================
3
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/alsa-mixer.c   2010-02-21 16:22:12.000000000 -0500
4
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-mixer.c        2010-02-21 22:36:10.000000000 -0500
 
3
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/alsa-mixer.c   2010-02-21 22:37:09.000000000 -0500
 
4
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-mixer.c        2010-02-22 00:20:24.000000000 -0500
5
5
@@ -1783,8 +1783,7 @@
6
6
         { "analog-output-headphones",   N_("Analog Headphones") },
7
7
         { "analog-output-lfe-on-mono",  N_("Analog Output (LFE)") },
14
14
     pa_alsa_element *e;
15
15
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common
16
16
===================================================================
17
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input.conf.common   2010-02-21 16:22:12.000000000 -0500
18
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common        2010-02-21 22:36:10.000000000 -0500
 
17
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input.conf.common   2010-02-21 22:37:09.000000000 -0500
 
18
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf.common        2010-02-22 00:20:24.000000000 -0500
19
19
@@ -277,6 +277,31 @@
20
20
 [Option Digital Input Source:Digital Mic 2]
21
21
 name = input-microphone
51
51
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
52
52
===================================================================
53
53
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
54
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf      2010-02-21 22:36:10.000000000 -0500
 
54
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf      2010-02-22 00:20:24.000000000 -0500
55
55
@@ -0,0 +1,99 @@
56
56
+# This file is part of PulseAudio.
57
57
+#
154
154
+.include analog-output.conf.common
155
155
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
156
156
===================================================================
157
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf    2010-02-21 22:36:10.000000000 -0500
158
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2010-02-21 22:36:10.000000000 -0500
 
157
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf    2010-02-22 00:20:24.000000000 -0500
 
158
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2010-02-22 00:20:24.000000000 -0500
159
159
@@ -20,6 +20,7 @@
160
160
 
161
161
 [General]
177
177
 volume = off
178
178
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf
179
179
===================================================================
180
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones.conf      2010-02-21 22:36:10.000000000 -0500
181
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf   2010-02-21 22:36:10.000000000 -0500
 
180
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-headphones.conf      2010-02-22 00:20:24.000000000 -0500
 
181
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-headphones.conf   2010-02-22 00:20:24.000000000 -0500
182
182
@@ -20,6 +20,7 @@
183
183
 
184
184
 [General]
200
200
 volume = off
201
201
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf
202
202
===================================================================
203
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf     2010-02-21 16:22:12.000000000 -0500
204
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf  2010-02-21 22:36:10.000000000 -0500
 
203
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf     2010-02-21 22:37:09.000000000 -0500
 
204
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf  2010-02-22 00:20:24.000000000 -0500
205
205
@@ -58,6 +58,10 @@
206
206
 override-map.1 = all
207
207
 override-map.2 = all-left,all-right
215
215
 volume = off
216
216
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-mono.conf
217
217
===================================================================
218
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-mono.conf    2010-02-21 22:36:10.000000000 -0500
219
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-mono.conf 2010-02-21 22:36:10.000000000 -0500
 
218
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-mono.conf    2010-02-22 00:20:24.000000000 -0500
 
219
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-mono.conf 2010-02-22 00:20:24.000000000 -0500
220
220
@@ -59,6 +59,10 @@
221
221
 override-map.1 = all
222
222
 override-map.2 = all-left,all-right
230
230
 volume = off
231
231
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-speaker.conf
232
232
===================================================================
233
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2010-02-21 22:36:10.000000000 -0500
234
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-speaker.conf      2010-02-21 22:36:10.000000000 -0500
 
233
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2010-02-22 00:20:24.000000000 -0500
 
234
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output-speaker.conf      2010-02-22 00:20:24.000000000 -0500
235
235
@@ -20,6 +20,7 @@
236
236
 
237
237
 [General]
253
253
 volume = merge
254
254
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf
255
255
===================================================================
256
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output.conf 2010-02-21 22:36:10.000000000 -0500
257
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf      2010-02-21 22:36:10.000000000 -0500
 
256
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-output.conf 2010-02-22 00:20:24.000000000 -0500
 
257
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-output.conf      2010-02-22 00:20:24.000000000 -0500
258
258
@@ -59,6 +59,10 @@
259
259
 switch = mute
260
260
 volume = off
268
268
 volume = merge
269
269
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/profile-sets/default.conf
270
270
===================================================================
271
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/profile-sets/default.conf        2010-02-21 16:22:12.000000000 -0500
272
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/profile-sets/default.conf     2010-02-21 22:36:10.000000000 -0500
 
271
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/profile-sets/default.conf        2010-02-21 22:37:09.000000000 -0500
 
272
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/profile-sets/default.conf     2010-02-22 00:20:24.000000000 -0500
273
273
@@ -62,42 +62,42 @@
274
274
 [Mapping analog-mono]
275
275
 device-strings = hw:%f
330
330
 
331
331
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/sink-input.c
332
332
===================================================================
333
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/sink-input.c      2010-02-21 16:22:11.000000000 -0500
334
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/sink-input.c   2010-02-21 22:36:10.000000000 -0500
 
333
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/sink-input.c      2010-02-21 22:37:09.000000000 -0500
 
334
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/sink-input.c   2010-02-22 00:20:24.000000000 -0500
335
335
@@ -1086,7 +1086,7 @@
336
336
     if (p)
337
337
         pa_proplist_update(i->proplist, mode, p);
343
343
     }
344
344
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-aux.conf
345
345
===================================================================
346
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-aux.conf      2010-02-21 16:22:12.000000000 -0500
347
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-aux.conf   2010-02-21 22:36:10.000000000 -0500
 
346
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-aux.conf      2010-02-21 22:37:09.000000000 -0500
 
347
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-aux.conf   2010-02-22 00:20:24.000000000 -0500
348
348
@@ -32,6 +32,10 @@
349
349
 switch = off
350
350
 volume = off
358
358
 volume = off
359
359
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-fm.conf
360
360
===================================================================
361
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-fm.conf       2010-02-21 16:22:12.000000000 -0500
362
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-fm.conf    2010-02-21 22:36:10.000000000 -0500
 
361
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-fm.conf       2010-02-21 22:37:09.000000000 -0500
 
362
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-fm.conf    2010-02-22 00:20:24.000000000 -0500
363
363
@@ -32,6 +32,10 @@
364
364
 switch = off
365
365
 volume = off
374
374
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
375
375
===================================================================
376
376
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
377
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf  2010-02-21 22:36:10.000000000 -0500
 
377
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf  2010-02-22 00:20:24.000000000 -0500
378
378
@@ -0,0 +1,67 @@
379
379
+# This file is part of PulseAudio.
380
380
+#
445
445
+.include analog-input-mic.conf.common
446
446
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-linein.conf
447
447
===================================================================
448
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-linein.conf   2010-02-21 16:22:12.000000000 -0500
449
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-linein.conf        2010-02-21 22:36:10.000000000 -0500
 
448
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-linein.conf   2010-02-21 22:37:09.000000000 -0500
 
449
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-linein.conf        2010-02-22 00:20:24.000000000 -0500
450
450
@@ -31,6 +31,10 @@
451
451
 switch = off
452
452
 volume = off
460
460
 switch = mute
461
461
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic-line.conf
462
462
===================================================================
463
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-mic-line.conf 2010-02-21 16:22:12.000000000 -0500
464
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic-line.conf      2010-02-21 22:36:10.000000000 -0500
 
463
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-mic-line.conf 2010-02-21 22:37:09.000000000 -0500
 
464
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic-line.conf      2010-02-22 00:20:24.000000000 -0500
465
465
@@ -32,6 +32,10 @@
466
466
 switch = off
467
467
 volume = off
475
475
 volume = off
476
476
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic.conf
477
477
===================================================================
478
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-mic.conf      2010-02-21 16:22:12.000000000 -0500
479
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic.conf   2010-02-21 22:36:10.000000000 -0500
 
478
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-mic.conf      2010-02-21 22:37:09.000000000 -0500
 
479
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-mic.conf   2010-02-22 00:20:24.000000000 -0500
480
480
@@ -35,6 +35,10 @@
481
481
 override-map.1 = all
482
482
 override-map.2 = all-left,all-right
490
490
 volume = off
491
491
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf
492
492
===================================================================
493
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf  2010-02-21 16:22:12.000000000 -0500
494
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf       2010-02-21 22:36:10.000000000 -0500
 
493
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf  2010-02-21 22:37:09.000000000 -0500
 
494
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf       2010-02-22 00:20:24.000000000 -0500
495
495
@@ -32,6 +32,10 @@
496
496
 switch = off
497
497
 volume = off
505
505
 volume = off
506
506
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-video.conf
507
507
===================================================================
508
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-video.conf    2010-02-21 16:22:12.000000000 -0500
509
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-video.conf 2010-02-21 22:36:10.000000000 -0500
 
508
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input-video.conf    2010-02-21 22:37:09.000000000 -0500
 
509
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input-video.conf 2010-02-22 00:20:24.000000000 -0500
510
510
@@ -31,6 +31,10 @@
511
511
 switch = off
512
512
 volume = off
520
520
 volume = off
521
521
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf
522
522
===================================================================
523
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input.conf  2010-02-21 16:22:12.000000000 -0500
524
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf       2010-02-21 22:36:10.000000000 -0500
 
523
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/mixer/paths/analog-input.conf  2010-02-21 22:37:09.000000000 -0500
 
524
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/mixer/paths/analog-input.conf       2010-02-22 00:20:24.000000000 -0500
525
525
@@ -32,6 +32,9 @@
526
526
 [Element Mic]
527
527
 required-absent = any
534
534
 
535
535
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/dbus-util.c
536
536
===================================================================
537
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/dbus-util.c       2010-02-21 16:22:11.000000000 -0500
538
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/dbus-util.c    2010-02-21 22:36:10.000000000 -0500
 
537
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/dbus-util.c       2010-02-21 22:37:09.000000000 -0500
 
538
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/dbus-util.c    2010-02-22 00:20:24.000000000 -0500
539
539
@@ -44,17 +44,16 @@
540
540
 };
541
541
 
610
610
 static void wakeup_main(void *userdata) {
611
611
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/fdsem.c
612
612
===================================================================
613
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/fdsem.c   2010-02-21 16:22:11.000000000 -0500
614
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/fdsem.c        2010-02-21 22:36:10.000000000 -0500
 
613
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/fdsem.c   2010-02-21 22:37:09.000000000 -0500
 
614
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/fdsem.c        2010-02-22 00:20:24.000000000 -0500
615
615
@@ -35,6 +35,7 @@
616
616
 #include <pulsecore/thread.h>
617
617
 #include <pulsecore/macro.h>
703
703
 
704
704
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/padsp.c
705
705
===================================================================
706
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/padsp.c       2010-02-21 16:22:12.000000000 -0500
707
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/padsp.c    2010-02-21 22:36:10.000000000 -0500
 
706
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/padsp.c       2010-02-21 22:37:09.000000000 -0500
 
707
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/padsp.c    2010-02-22 00:20:24.000000000 -0500
708
708
@@ -1458,11 +1458,11 @@
709
709
         return _open(filename, flags, mode);
710
710
     }
832
832
     }
833
833
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacat.c
834
834
===================================================================
835
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/pacat.c       2010-02-21 16:22:12.000000000 -0500
836
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacat.c    2010-02-21 22:36:10.000000000 -0500
 
835
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/pacat.c       2010-02-21 22:37:09.000000000 -0500
 
836
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacat.c    2010-02-22 00:20:24.000000000 -0500
837
837
@@ -195,28 +195,41 @@
838
838
 
839
839
         pa_assert(sndfile);
904
904
                 }
905
905
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacmd.c
906
906
===================================================================
907
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/pacmd.c       2010-02-21 16:22:12.000000000 -0500
908
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacmd.c    2010-02-21 22:36:10.000000000 -0500
 
907
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/utils/pacmd.c       2010-02-21 22:37:09.000000000 -0500
 
908
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/utils/pacmd.c    2010-02-22 00:20:24.000000000 -0500
909
909
@@ -45,13 +45,6 @@
910
910
 
911
911
 int main(int argc, char*argv[]) {
1148
1148
 
1149
1149
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/shm.c
1150
1150
===================================================================
1151
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/shm.c     2010-02-21 16:22:11.000000000 -0500
1152
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/shm.c  2010-02-21 22:36:10.000000000 -0500
 
1151
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/shm.c     2010-02-21 22:37:09.000000000 -0500
 
1152
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/shm.c  2010-02-22 00:20:24.000000000 -0500
1153
1153
@@ -286,7 +286,7 @@
1154
1154
     segment_name(fn, sizeof(fn), m->id = id);
1155
1155
 
1161
1161
     }
1162
1162
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/vala/libpulse.vapi
1163
1163
===================================================================
1164
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/vala/libpulse.vapi      2010-02-21 16:22:11.000000000 -0500
1165
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/vala/libpulse.vapi   2010-02-21 22:36:10.000000000 -0500
 
1164
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/vala/libpulse.vapi      2010-02-21 22:37:09.000000000 -0500
 
1165
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/vala/libpulse.vapi   2010-02-22 00:20:24.000000000 -0500
1166
1166
@@ -46,7 +46,7 @@
1167
1167
         [CCode (cname="PA_CHECK_VERSION")]
1168
1168
         public bool CHECK_VERSION(int major, int minor, int micro);
1206
1206
 
1207
1207
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-stream-restore.c
1208
1208
===================================================================
1209
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-stream-restore.c     2010-02-21 16:22:12.000000000 -0500
1210
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-stream-restore.c  2010-02-21 22:36:10.000000000 -0500
 
1209
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-stream-restore.c     2010-02-21 22:37:10.000000000 -0500
 
1210
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-stream-restore.c  2010-02-22 00:20:24.000000000 -0500
1211
1211
@@ -394,7 +394,7 @@
1212
1212
         return PA_HOOK_OK;
1213
1213
 
1219
1219
 
1220
1220
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/channelmap.c
1221
1221
===================================================================
1222
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulse/channelmap.c  2010-02-21 16:22:11.000000000 -0500
1223
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/channelmap.c       2010-02-21 22:36:10.000000000 -0500
 
1222
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulse/channelmap.c  2010-02-21 22:37:09.000000000 -0500
 
1223
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/channelmap.c       2010-02-22 00:20:24.000000000 -0500
1224
1224
@@ -112,7 +112,7 @@
1225
1225
     [PA_CHANNEL_POSITION_REAR_LEFT] = N_("Rear Left"),
1226
1226
     [PA_CHANNEL_POSITION_REAR_RIGHT] = N_("Rear Right"),
1232
1232
     [PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER] = N_("Front Right-of-center"),
1233
1233
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/proplist.h
1234
1234
===================================================================
1235
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulse/proplist.h    2010-02-21 16:22:11.000000000 -0500
1236
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/proplist.h 2010-02-21 22:36:10.000000000 -0500
 
1235
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulse/proplist.h    2010-02-21 22:37:09.000000000 -0500
 
1236
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulse/proplist.h 2010-02-22 00:20:24.000000000 -0500
1237
1237
@@ -59,7 +59,7 @@
1238
1238
 /** For streams: an XDG icon name for the media. e.g. "audio-x-mp3" */
1239
1239
 #define PA_PROP_MEDIA_ICON_NAME                "media.icon_name"
1245
1245
 /** For event sound streams: XDG event sound name. e.g. "message-new-email" (Event sound streams are those with media.role set to "event") */
1246
1246
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-scache.c
1247
1247
===================================================================
1248
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/core-scache.c     2010-02-21 16:22:11.000000000 -0500
1249
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-scache.c  2010-02-21 22:36:10.000000000 -0500
 
1248
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/core-scache.c     2010-02-21 22:37:09.000000000 -0500
 
1249
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/core-scache.c  2010-02-22 00:20:24.000000000 -0500
1250
1250
@@ -310,7 +310,8 @@
1251
1251
         return -1;
1252
1252
 
1273
1273
     pa_proplist_free(merged);
1274
1274
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.c
1275
1275
===================================================================
1276
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memblockq.c  2010-02-21 16:22:11.000000000 -0500
1277
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.c       2010-02-21 22:36:10.000000000 -0500
 
1276
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memblockq.c  2010-02-21 22:37:09.000000000 -0500
 
1277
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.c       2010-02-22 00:20:24.000000000 -0500
1278
1278
@@ -173,7 +173,8 @@
1279
1279
         const pa_channel_map *map,
1280
1280
         pa_memblockq *q,
1312
1312
     pa_sink_input_put(i);
1313
1313
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.h
1314
1314
===================================================================
1315
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memblockq.h  2010-02-21 16:22:12.000000000 -0500
1316
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.h       2010-02-21 22:36:10.000000000 -0500
 
1315
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memblockq.h  2010-02-21 22:37:09.000000000 -0500
 
1316
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memblockq.h       2010-02-22 00:20:24.000000000 -0500
1317
1317
@@ -31,17 +31,19 @@
1318
1318
         const pa_channel_map *map,
1319
1319
         pa_memblockq *q,
1344
1344
 #endif
1345
1345
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.c
1346
1346
===================================================================
1347
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memchunk.c   2010-02-21 16:22:12.000000000 -0500
1348
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.c        2010-02-21 22:36:10.000000000 -0500
 
1347
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memchunk.c   2010-02-21 22:37:09.000000000 -0500
 
1348
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.c        2010-02-22 00:20:24.000000000 -0500
1349
1349
@@ -43,6 +43,7 @@
1350
1350
         const pa_memchunk *chunk,
1351
1351
         pa_cvolume *volume,
1365
1365
     }
1366
1366
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.h
1367
1367
===================================================================
1368
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memchunk.h   2010-02-21 16:22:11.000000000 -0500
1369
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.h        2010-02-21 22:36:10.000000000 -0500
 
1368
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/play-memchunk.h   2010-02-21 22:37:09.000000000 -0500
 
1369
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/play-memchunk.h        2010-02-22 00:20:24.000000000 -0500
1370
1370
@@ -26,12 +26,13 @@
1371
1371
 #include <pulsecore/memchunk.h>
1372
1372
 
1390
1390
 #endif
1391
1391
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-suspend-on-idle.c
1392
1392
===================================================================
1393
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-suspend-on-idle.c    2010-02-21 22:36:42.000000000 -0500
1394
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-suspend-on-idle.c 2010-02-21 22:36:55.000000000 -0500
 
1393
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/module-suspend-on-idle.c    2010-02-21 22:37:09.000000000 -0500
 
1394
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/module-suspend-on-idle.c 2010-02-22 00:20:24.000000000 -0500
1395
1395
@@ -145,8 +145,9 @@
1396
1396
     pa_assert(data);
1397
1397
     pa_assert(u);
1416
1416
     else
1417
1417
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-native.c
1418
1418
===================================================================
1419
 
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/protocol-native.c 2010-02-21 22:36:42.000000000 -0500
1420
 
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-native.c      2010-02-21 22:36:55.000000000 -0500
 
1419
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/pulsecore/protocol-native.c 2010-02-21 22:37:09.000000000 -0500
 
1420
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/pulsecore/protocol-native.c      2010-02-22 00:20:24.000000000 -0500
1421
1421
@@ -858,6 +858,18 @@
1422
1422
 
1423
1423
     pa_assert(s);
1450
1450
 }
1451
1451
 
1452
1452
 /* Called from main context */
 
1453
Index: pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-sink.c
 
1454
===================================================================
 
1455
--- pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478.orig/src/modules/alsa/alsa-sink.c    2010-02-22 00:22:17.000000000 -0500
 
1456
+++ pulseaudio-0.9.22~0.9.21+stable-queue-32-g8478/src/modules/alsa/alsa-sink.c 2010-02-22 00:22:32.000000000 -0500
 
1457
@@ -79,7 +79,7 @@
 
1458
 #define TSCHED_MIN_WAKEUP_USEC (4*PA_USEC_PER_MSEC)                /* 4ms   -- Wakeup at least this long before the buffer runs empty*/
 
1459
 
 
1460
 #define SMOOTHER_MIN_INTERVAL (2*PA_USEC_PER_MSEC)                 /* 2ms   -- min smoother update interval */
 
1461
-#define SMOOTHER_MAX_INTERVAL (200*PA_USEC_PER_MSEC)               /* 200ms -- max smoother update inteval */
 
1462
+#define SMOOTHER_MAX_INTERVAL (200*PA_USEC_PER_MSEC)               /* 200ms -- max smoother update interval */
 
1463
 
 
1464
 #define VOLUME_ACCURACY (PA_VOLUME_NORM/100)  /* don't require volume adjustments to be perfectly correct. don't necessarily extend granularity in software unless the differences get greater than this level */
 
1465
 
 
1466
@@ -876,6 +876,14 @@
 
1467
         u->alsa_rtpoll_item = NULL;
 
1468
     }
 
1469
 
 
1470
+    /* We reset max_rewind/max_request here to make sure that while we
 
1471
+     * are suspended the old max_request/max_rewind values set before
 
1472
+     * the suspend can influence the per-stream buffer of newly
 
1473
+     * created streams, without their requirements having any
 
1474
+     * influence on them. */
 
1475
+    pa_sink_set_max_rewind_within_thread(u->sink, 0);
 
1476
+    pa_sink_set_max_request_within_thread(u->sink, 0);
 
1477
+
 
1478
     pa_log_info("Device suspended...");
 
1479
 
 
1480
     return 0;
 
1481
@@ -933,6 +941,7 @@
 
1482
     }
 
1483
 
 
1484
     pa_sink_set_max_request_within_thread(u->sink, u->hwbuf_size - u->hwbuf_unused);
 
1485
+    pa_sink_set_max_rewind_within_thread(u->sink, u->hwbuf_size);
 
1486
 
 
1487
     return 0;
 
1488
 }