From adelia.mendes at tce.am.gov.br  Sat Nov  1 00:36:49 2014
From: adelia.mendes at tce.am.gov.br (Ruth Horwitz)
Date: Fri, 31 Oct 2014 20:36:49 -0400 (AMT)
Subject: Congratulations
In-Reply-To: <122489460.1548308.1414802195407.JavaMail.root@tce.am.gov.br>
Message-ID: <1425557035.1548324.1414802209203.JavaMail.root@tce.am.gov.br>



Dear E-mail Account User,

After a random automated selection of email addresses over the Internet, 
your email emerged as one of our special winners to receive ?3,252,590.00 
and is attached to the following details: 
FILE CATEGORY - LOTTTO-ENGLAND/01/2014 
Ticket No: 13/299 
Reference Number: 89,DW,83/LOTTO-LUCKY5 
To confirm the authenticity and validity of your winnings as well as to 
commence receipts of your entitlement, you MUST FORWARD a copy of this announcement as well as your

FULL NAMES - 
VALID MOBILE/CELL NO. - 
COUNTRY OF RESIDENCE - 
to our Winnings Director via contact information below:

Mr.Michael Thompson, 
Winnings Director, 
Automated Winnings Department, 
Email: michael_wd at foxmail.com

Yours faithfully, 
Ruth Horwitz, 
Automated Winnings Coordinator, 
Automated Winnings Department 
Email: rhorwitz984 at gmail.com


From jbernon at free.fr  Sat Nov  1 21:54:27 2014
From: jbernon at free.fr (jbernon at free.fr)
Date: Sat, 1 Nov 2014 22:54:27 +0100 (CET)
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <CAAfdZj9KLPHsEo0rGcRuy-=dgSbzEWPq4077t5qmWK0nyomxLA@mail.gmail.com>
Message-ID: <2114656671.273862717.1414878867365.JavaMail.root@zimbra63-e11.priv.proxad.net>

Hi Felipe, 

I tried your pactl command. The result is the same than through pavucontrol graphical tool. There is another puzzling feature : the decibel measure is negative. Below my pavucontrol screen. 
Thank you for your attention. Excuse my late answer, I was far from any computer this week. 

Jean 





----- Mail original -----

De: "Felipe Sateler" <fsateler at debian.org> 
?: "JEBE" <jbernon at free.fr>, 766781 at bugs.debian.org 
Envoy?: Lundi 27 Octobre 2014 13:51:57 
Objet: Re: Bug#766781: pavucontrol: Input volume cannot be more than 39% 

Hi, 

On Sat, Oct 25, 2014 at 3:13 PM, JEBE <jbernon at free.fr> wrote: 
> Package: pavucontrol 
> Version: 2.0-2 
> Severity: normal 
> 
> Dear Maintainer, 
> 
> When using my laptop microphone (built-in or through a jack) the sound was very 
> low. 
> 
> I tried to tune it through pavucontrol and couldn't. I tried to fix it through 
> alsamixer without success. At last there was no more sound. I purged and 
> reinstalled pulseaudio, gnome and pavucontrol without more success. 
> 
> I found that muting mic and mic boost through alsamixer brought back low input 
> sound. I tried again to increase it through pavucontrol and found at last that 
> it can be increased up to 39 %. Over 39 % there is no more input signal and no 
> more capture. 
> 
> 39 % is just enough for normal use. But it is misleading and could be better. 
> 
> Thank you very much for your attention. 
> 
> Note - In order to be complete, maybe the jack microphone is not detected. I am 
> not sure, but I think it is not a linked issue and it is sure that increasing 
> the pavucontrol input volume mute any microphone. 
> 
> Gnome release : 1:3.8+8 
> Pulseaudio : 5.0-13 
> Pavucontrol : 2.0-2 


Can you change the volume using pactl? 

pactl set-source-volume <source> 50% 

You can discover the source name with pactl list sources. 


-- 

Saludos, 
Felipe Sateler 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141101/8252000d/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 36.png
Type: image/png
Size: 46721 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141101/8252000d/attachment-0001.png>

From fsateler at debian.org  Mon Nov  3 13:05:09 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Mon, 3 Nov 2014 10:05:09 -0300
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <2114656671.273862717.1414878867365.JavaMail.root@zimbra63-e11.priv.proxad.net>
References: <CAAfdZj9KLPHsEo0rGcRuy-=dgSbzEWPq4077t5qmWK0nyomxLA@mail.gmail.com>
 <2114656671.273862717.1414878867365.JavaMail.root@zimbra63-e11.priv.proxad.net>
Message-ID: <CAAfdZj-NR00d+fO-6bvVY1Zq-15SxFwXOz-piqnpAd6KLws+=g@mail.gmail.com>

Control: reassign -1 pulseaudio

On Sat, Nov 1, 2014 at 6:54 PM, <jbernon at free.fr> wrote:
>
> Hi Felipe,
>
> I tried your pactl command. The result is the same than through pavucontrol graphical tool.
> There is another puzzling feature : the decibel measure is negative. Below my pavucontrol screen.
> Thank you for your attention. Excuse my late answer, I was far from any computer this week.
>

This looks like either a pulse or alsa issue, not for pavucontrol.
Could you please run the following command:

$ /usr/share/bug/pulseaudio 3>&1

And attach the resulting file? If the file mentions attachments
(between headers -- BEGIN ATTACHMENTS --) please attach those files
too.


-- 

Saludos,
Felipe Sateler


From owner at bugs.debian.org  Mon Nov  3 13:09:13 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Mon, 03 Nov 2014 13:09:13 +0000
Subject: Processed: Re: Bug#766781: pavucontrol: Input volume cannot be
 more than 39%
References: <CAAfdZj-NR00d+fO-6bvVY1Zq-15SxFwXOz-piqnpAd6KLws+=g@mail.gmail.com>
 <20141025181357.4318.67580.reportbug@pc-jean-debian.jebe.org>
Message-ID: <handler.s.B766781.141501995513249.transcript@bugs.debian.org>

Processing control commands:

> reassign -1 pulseaudio
Bug #766781 [pavucontrol] pavucontrol: Input volume cannot be more than 39%
Bug reassigned from package 'pavucontrol' to 'pulseaudio'.
No longer marked as found in versions pavucontrol/2.0-2.
Ignoring request to alter fixed versions of bug #766781 to the same values previously set

-- 
766781: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766781
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From jbernon at free.fr  Mon Nov  3 22:32:46 2014
From: jbernon at free.fr (jbernon at free.fr)
Date: Mon, 3 Nov 2014 23:32:46 +0100 (CET)
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <CAAfdZj-NR00d+fO-6bvVY1Zq-15SxFwXOz-piqnpAd6KLws+=g@mail.gmail.com>
Message-ID: <1044564882.279778388.1415053966883.JavaMail.root@zimbra63-e11.priv.proxad.net>

Here are the files. The first one is the console output, I don't know if there is a specific output file. 


----- Mail original -----

De: "Felipe Sateler" <fsateler at debian.org> 
?: "Jean Bernon" <jbernon at free.fr> 
Cc: 766781 at bugs.debian.org 
Envoy?: Lundi 3 Novembre 2014 14:05:09 
Objet: Re: Bug#766781: pavucontrol: Input volume cannot be more than 39% 

Control: reassign -1 pulseaudio 

On Sat, Nov 1, 2014 at 6:54 PM, <jbernon at free.fr> wrote: 
> 
> Hi Felipe, 
> 
> I tried your pactl command. The result is the same than through pavucontrol graphical tool. 
> There is another puzzling feature : the decibel measure is negative. Below my pavucontrol screen. 
> Thank you for your attention. Excuse my late answer, I was far from any computer this week. 
> 

This looks like either a pulse or alsa issue, not for pavucontrol. 
Could you please run the following command: 

$ /usr/share/bug/pulseaudio 3>&1 

And attach the resulting file? If the file mentions attachments 
(between headers -- BEGIN ATTACHMENTS --) please attach those files 
too. 


-- 

Saludos, 
Felipe Sateler 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OutputUsrShareBugPulseaudio
Type: application/octet-stream
Size: 906 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0009.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: daemon.conf
Type: application/octet-stream
Size: 2422 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0010.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: default.pa
Type: application/octet-stream
Size: 5718 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0011.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: system.pa
Type: application/octet-stream
Size: 2112 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0012.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-pulseaudio-pactl_info.ZW8JhP
Type: application/octet-stream
Size: 464 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0013.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-pulseaudio-pactl_list_modules.pIqZ03
Type: application/octet-stream
Size: 6071 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0014.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-pulseaudio-pactl_list_sources.J13VCX
Type: application/octet-stream
Size: 4386 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0015.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-pulseaudio-pactl_list_sinks.BoQwJm
Type: application/octet-stream
Size: 3930 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0016.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-pulseaudio-pactl_list_cards.o4sUiw
Type: application/octet-stream
Size: 4401 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141103/699fa16f/attachment-0017.obj>

From fsateler at debian.org  Mon Nov  3 22:46:58 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Mon, 3 Nov 2014 19:46:58 -0300
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <1044564882.279778388.1415053966883.JavaMail.root@zimbra63-e11.priv.proxad.net>
References: <CAAfdZj-NR00d+fO-6bvVY1Zq-15SxFwXOz-piqnpAd6KLws+=g@mail.gmail.com>
 <1044564882.279778388.1415053966883.JavaMail.root@zimbra63-e11.priv.proxad.net>
Message-ID: <CAAfdZj-ZTxn5nbMax+a7CBzvoaOHX+VZXjDHpFSSCtHffS7_bg@mail.gmail.com>

On Mon, Nov 3, 2014 at 7:32 PM,  <jbernon at free.fr> wrote:
> Here are the files. The first one is the console output, I don't know if
> there is a specific output file.

Thanks. I don't see anything weird on these files.

Something I don't have clear is: using alsamixer, can you set the
volume to arbitrary levels?

On alsamixer, press F6 to select the sound card, and then F4 to go to
the capture controls.

If you cannot set the volume there, then this is not a bug in
pulseaudio but rather in the audio driver :(


-- 

Saludos,
Felipe Sateler


From jbernon at free.fr  Tue Nov  4 07:47:31 2014
From: jbernon at free.fr (jbernon at free.fr)
Date: Tue, 4 Nov 2014 08:47:31 +0100 (CET)
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <CAAfdZj-ZTxn5nbMax+a7CBzvoaOHX+VZXjDHpFSSCtHffS7_bg@mail.gmail.com>
Message-ID: <1818124388.280484862.1415087251451.JavaMail.root@zimbra63-e11.priv.proxad.net>

Hello, 
There are two bars in alsamixer capture display : mic boost and capture. Capture bar level is 100. When Mic boost bar level is 0, the microphone is working. As soon as this level is >0, the microphone doesn't work anymore, I wrote it quickly in the first bug description. When using pavucontrol level, the alsamixer mic boost bar remains 0 while I increase from 0 to 39%. Mic boost bar goes up to 20 when I increase pavucontrol from 39% to 40% and the microphone becomes mute. 
I hope to be clear. 
Best regards 
----- Mail original -----

De: "Felipe Sateler" <fsateler at debian.org> 
?: "Jean Bernon" <jbernon at free.fr> 
Cc: 766781 at bugs.debian.org 
Envoy?: Lundi 3 Novembre 2014 23:46:58 
Objet: Re: Bug#766781: pavucontrol: Input volume cannot be more than 39% 

On Mon, Nov 3, 2014 at 7:32 PM, <jbernon at free.fr> wrote: 
> Here are the files. The first one is the console output, I don't know if 
> there is a specific output file. 

Thanks. I don't see anything weird on these files. 

Something I don't have clear is: using alsamixer, can you set the 
volume to arbitrary levels? 

On alsamixer, press F6 to select the sound card, and then F4 to go to 
the capture controls. 

If you cannot set the volume there, then this is not a bug in 
pulseaudio but rather in the audio driver :( 


-- 

Saludos, 
Felipe Sateler 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141104/bc4bd7fa/attachment.html>

From jbernon at free.fr  Tue Nov  4 12:02:13 2014
From: jbernon at free.fr (jbernon at free.fr)
Date: Tue, 4 Nov 2014 13:02:13 +0100 (CET)
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <1818124388.280484862.1415087251451.JavaMail.root@zimbra63-e11.priv.proxad.net>
Message-ID: <1380251790.281382244.1415102533851.JavaMail.root@zimbra63-e11.priv.proxad.net>

New thing. My jessie installation was a standard one with very few contrib and non free packets. Following your idea about alsa, I installed alsa-firmware. It fixed one point (both the jack microphone and the built-in one are working now) but not the weird thing between alsa mic boost bar and pavucontrol volume level. 

----- Mail original -----

De: jbernon at free.fr 
?: "Felipe Sateler" <fsateler at debian.org> 
Cc: 766781 at bugs.debian.org 
Envoy?: Mardi 4 Novembre 2014 08:47:31 
Objet: Re: Bug#766781: pavucontrol: Input volume cannot be more than 39% 


Hello, 
There are two bars in alsamixer capture display : mic boost and capture. Capture bar level is 100. When Mic boost bar level is 0, the microphone is working. As soon as this level is >0, the microphone doesn't work anymore, I wrote it quickly in the first bug description. When using pavucontrol level, the alsamixer mic boost bar remains 0 while I increase from 0 to 39%. Mic boost bar goes up to 20 when I increase pavucontrol from 39% to 40% and the microphone becomes mute. 
I hope to be clear. 
Best regards 
----- Mail original -----

De: "Felipe Sateler" <fsateler at debian.org> 
?: "Jean Bernon" <jbernon at free.fr> 
Cc: 766781 at bugs.debian.org 
Envoy?: Lundi 3 Novembre 2014 23:46:58 
Objet: Re: Bug#766781: pavucontrol: Input volume cannot be more than 39% 

On Mon, Nov 3, 2014 at 7:32 PM, <jbernon at free.fr> wrote: 
> Here are the files. The first one is the console output, I don't know if 
> there is a specific output file. 

Thanks. I don't see anything weird on these files. 

Something I don't have clear is: using alsamixer, can you set the 
volume to arbitrary levels? 

On alsamixer, press F6 to select the sound card, and then F4 to go to 
the capture controls. 

If you cannot set the volume there, then this is not a bug in 
pulseaudio but rather in the audio driver :( 


-- 

Saludos, 
Felipe Sateler 


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141104/54285fc6/attachment.html>

From philominajesse031 at gmail.com  Wed Nov  5 04:51:16 2014
From: philominajesse031 at gmail.com (miss philomina jesse)
Date: Wed, 5 Nov 2014 04:51:16 +0000 (UTC)
Subject: Treat this message with utmost confidential ok
Message-ID: <274362738.386929.1415163076721.JavaMail.yahoo@jws10769.mail.gq1.yahoo.com>




?Dearest,
 
Treat this message with utmost confidential ok.
As you may know, this is my 6th day in this Hospital bed, and I am constrained to sit up and write this message to you purposely because the doctor has announced that I will be undergoing the surgery as soon as the specialist returns from Canada next tomorrow. and ever since this information occurred to me, my mind never found rest, my heart is still filled with fear and trembling even at this
moment, i lost the courage of living again, and so improvised and can?t even
afford to speak with people right now because of fear.
But I believe and pray God to spare my life.
Meanwhile, I want to inform you that my late husband left a contracted sum of $14.3m USD in the Bank of Burkina Faso. As childless couple; we?ve long planned to use the money to aid the poor by Building Orphanage homes. But we never succeeded in embracing such project until my husband died as the payment was delayed.
Now that I am not sure of my life here, and & no existing biological child to inherit
our properties, I want to entrust this project in your hand because I don?t
know if I will ever survive this sickness.
I wouldn?t want to go into many details here because I have not enough strength for long emails. But I wished to briefly inform you that due to lack of Biological son,after my husband died, his relatives came up with troubles and confiscated all
my husband properties and even call me a witch.
But God knows that am innocent of all the accusations. And now, am happy they didn?t discover about the fact that my husband handled some contract with the
government of Burkina Faso which the payment was delayed before he died.
So after mourning my husband as the custom permits, I took the paper to the bank but they asked me to waiting for more weeks, which I waited until Two months ago when the management of African Bank call to inform me that the fund is due to be claimed but I couldn?t visit them anymore due to my health condition.

Now that you are the lucky person in my contact list, I want you to reply this message as fast as you can and set me up in hope and I will give you my late husband financial reference code and direct you to the account manager in that bank who will release the money to you on my command and you ought to use it to help the needy.
You must give me your solemn promise to handle this project in good manner and fear of God. You must use at least 60% of this money to build orphanage homes and help the poor while 40% goes to your purse for your Job well-done.
So, I will want you to reply this message today so that I will give you the bank contact information even before the operation takes place because my heart is still panting and I fear surviving the sickness.

I believe you will not betray this trust because if you use this money to help the poor on our name, I, and my Husband will find peace wherever our souls maybe. And you will also find happiness in life.

Please pray that the surgery will be a successful one, and that I could survive this
sickness so we can run this project together.
May the living God bless and keep you
 Mrs. Philomena Jesse
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141105/e6cb146e/attachment.html>

From owner at bugs.debian.org  Fri Nov  7 12:07:13 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Fri, 07 Nov 2014 12:07:13 +0000
Subject: Processed (with 1 errors): notfound 319319 in 4.24-4, notfound
 304847 in 6.14.00-3, fixed 440483 in 20071116-1 ...
References: <1415361877-3829-bts-anbe@debian.org>
Message-ID: <handler.s.C.14153618816527.transcript@bugs.debian.org>

Processing commands for control at bugs.debian.org:

> # bts housekeeping:
> # fixup versioning of fixed bugs that the bts considers to be not fixed
> # reassign+affects bugs fixed in other packages
> # unreproducible-or-not-a-bug must not be closed with a version, especially not the reported one (or a fake one)
> # bts does not understand fixed-in-binNMU
> # drop superfluous release tags if found versions are sufficient
> #
> # maybe this could have been reopened 8 years ago
> notfound 319319 4.24-4
Bug #319319 {Done: Ralf Hildebrandt <ralf.hildebrandt at charite.de>} [xscreensaver] xscreensaver: does not start: 'couldn't setgroups ... not permitted'
Bug #302791 {Done: Ralf Hildebrandt <ralf.hildebrandt at charite.de>} [xscreensaver] xscreensaver will not launch, reports "couldn't setgroups to..."
No longer marked as found in versions xscreensaver/4.24-4.
Ignoring request to alter found versions of bug #302791 to the same values previously set
> notfound 304847 6.14.00-3
Bug #304847 {Done: Franz Pletz <fpletz at franz-pletz.org>} [tcsh] tcsh: causes applications to linger on amd64
Bug #298253 {Done: Franz Pletz <fpletz at franz-pletz.org>} [tcsh] tcsh under SIGHUP/WM_DELETE does not exit immediately if a sub process is running.
No longer marked as found in versions tcsh/6.14.00-3.
Ignoring request to alter found versions of bug #298253 to the same values previously set
> fixed 440483 20071116-1
Bug #440483 {Done: Martin Michlmayr <tbm at cyrius.com>} [gcc-snapshot] gcc-snapshot: ambiguous operator==
Marked as fixed in versions gcc-snapshot/20071116-1.
> notfixed 450122 20071116-1
Bug #450122 {Done: Matthias Klose <doko at cs.tu-berlin.de>} [gcc-snapshot] gcc-snapshot: debian/watch fails to report upstream's version
No longer marked as fixed in versions 20071116-1.
> notfixed 336263 2.10.7-1
Bug #336263 {Done: Mark Purcell <msp at debian.org>} [hplip] hplip-data: Please don't depend on hplip
Bug #373916 {Done: Mark Purcell <msp at debian.org>} [hplip] hplip: Please remove dependency on python-qt3
There is no source info for the package 'hplip' at version '2.10.7-1' with architecture ''
Unable to make a source version for version '2.10.7-1'
No longer marked as fixed in versions 2.10.7-1.
No longer marked as fixed in versions 2.10.7-1.
> notfound 373916 2.8.4-1
Bug #373916 {Done: Mark Purcell <msp at debian.org>} [hplip] hplip: Please remove dependency on python-qt3
Bug #336263 {Done: Mark Purcell <msp at debian.org>} [hplip] hplip-data: Please don't depend on hplip
No longer marked as found in versions hplip/2.8.4-1.
Ignoring request to alter found versions of bug #336263 to the same values previously set
> notfound 391700 1:2.1.9-5
Bug #391700 {Done: "Thijs Kinkhorst" <thijs at debian.org>} [mailman] Mailman: Catch charset decoding errors
Bug #313225 {Done: "Thijs Kinkhorst" <thijs at debian.org>} [mailman] mailman: Changing E-Mail-Address does not work
Bug #349957 {Done: "Thijs Kinkhorst" <thijs at debian.org>} [mailman] non-ascii bytes cause shunting of some replied cmd messages (attached)
No longer marked as found in versions mailman/1:2.1.9-5.
Ignoring request to alter found versions of bug #313225 to the same values previously set
Ignoring request to alter found versions of bug #349957 to the same values previously set
> notfound 491841 2:1.0.0~beta3-1
Bug #491841 {Done: Mark Purcell <msp at debian.org>} [digikam] Digikam doens't show images
Bug #491458 {Done: Mark Purcell <msp at debian.org>} [digikam] digikam: Digikam (experimental) doesn't work at all
No longer marked as found in versions digikam/2:1.0.0~beta3-1.
Ignoring request to alter found versions of bug #491458 to the same values previously set
> fixed 482146 2.50-1
Bug #482146 {Done: godisch at debian.org (Martin A. Godisch)} [sleuthkit] sleuthkit: license issues in older versions
Marked as fixed in versions sleuthkit/2.50-1.
> fixed 440378 20071116-1
Bug #440378 {Done: Martin Michlmayr <tbm at cyrius.com>} [gcc-snapshot] [hppa] ICE: unrecognizable insn: in extract_insn, at recog.c:1990
Marked as fixed in versions gcc-snapshot/20071116-1.
> notfound 501363 3.0.5-1
Bug #501363 {Done: Mike Hommey <mh at glandium.org>} [iceweasel] firefox refuses to start when there already is a firefox instance running
Bug #501304 {Done: Mike Hommey <mh at glandium.org>} [iceweasel] iceweasel: fix for #428836 causes --remote to fail
Bug #501394 {Done: Mike Hommey <mh at glandium.org>} [iceweasel] iceweasel: Cannot open links with running /usr/bin/firefox
Bug #501445 {Done: Mike Hommey <mh at glandium.org>} [iceweasel] iceweasel 'openurl(foo)' -> "Iceweasel is already running, but not responding. To open ..."
Bug #501539 {Done: Mike Hommey <mh at glandium.org>} [iceweasel] iceweasel: firefox "$url" is broken
Bug #501544 {Done: Mike Hommey <mh at glandium.org>} [iceweasel] iceweasel: Iceweasel is already running, but is not responding.
Bug #501571 {Done: Mike Hommey <mh at glandium.org>} [iceweasel] iceweasel already running but not responding
Bug #501583 {Done: Mike Hommey <mh at glandium.org>} [iceweasel] Fails to open links when requested by other applications
No longer marked as found in versions iceweasel/3.0.5-1.
Ignoring request to alter found versions of bug #501304 to the same values previously set
Ignoring request to alter found versions of bug #501394 to the same values previously set
Ignoring request to alter found versions of bug #501445 to the same values previously set
Ignoring request to alter found versions of bug #501539 to the same values previously set
Ignoring request to alter found versions of bug #501544 to the same values previously set
Ignoring request to alter found versions of bug #501571 to the same values previously set
Ignoring request to alter found versions of bug #501583 to the same values previously set
> fixed 584454 20100702-1
Bug #584454 {Done: Matthias Klose <doko at debian.org>} [gcc-snapshot] gcc-snapshot: FTBFS on hurd-i386 due to long-term difference in Debian
Marked as fixed in versions gcc-snapshot/20100702-1.
> fixed 585202 20100702-1
Bug #585202 {Done: Matthias Klose <doko at debian.org>} [gcc-snapshot] gcc-snapshot: Python string exceptions no more allowed in Python 2.6
Marked as fixed in versions gcc-snapshot/20100702-1.
> notfixed 272652 1.0.5
Bug #272652 {Done: Ralf Treinen <treinen at free.fr>} [texmacs] texmacs: Help for multifile documents wrong
There is no source info for the package 'texmacs' at version '1.0.5' with architecture ''
Unable to make a source version for version '1.0.5'
No longer marked as fixed in versions texmacs/1.0.5.
> fixed 272652 1:1.0.5-1
Bug #272652 {Done: Ralf Treinen <treinen at free.fr>} [texmacs] texmacs: Help for multifile documents wrong
Marked as fixed in versions texmacs/1:1.0.5-1.
> # discontiguous history
> notfound 616634 20120407-1
Bug #616634 {Done: Jonathan Nieder <jrnieder at gmail.com>} [gcc-snapshot] gcc-4.6: errors from -pedantic -Werror say "[-Werror=edantic]"
No longer marked as found in versions gcc-snapshot/20120407-1.
> notfound 670164 20120407-1
Bug #670164 {Done: Vincent Lefevre <vincent at vinc17.net>} [gcc-snapshot] ICE: Segmentation fault when compiling MPFR's set_f.c
No longer marked as found in versions gcc-snapshot/20120407-1.
> # security support for squeeze has ended, kfreebsd is not in squeeze-lts
> fixed 629952 1.6.12dfsg-7
Bug #629952 {Done: Ond?ej Sur? <ondrej at debian.org>} [subversion] subversion fails to build for stable(-security) on kfreebsd
Marked as fixed in versions subversion/1.6.12dfsg-7.
> notfound 605791 1.2.3-2
Bug #605791 {Done: Lionel Le Folgoc <mrpouit at gmail.com>} [thunar] Problem on paste on xfdesktop4
Bug #578293 {Done: Lionel Le Folgoc <mrpouit at gmail.com>} [thunar] thunar: copy and paste with CTRL-c CTRL-v doesn't always work
No longer marked as found in versions thunar/1.2.3-2.
Ignoring request to alter found versions of bug #578293 to the same values previously set
> reassign 588205 src:libnotify
Bug #588205 {Done: Laurent Bigonville <bigon at debian.org>} [libnotify1] client throws exception with libnotify 0.5.0
Bug #588276 {Done: Laurent Bigonville <bigon at debian.org>} [libnotify1] libnotify doesn't support notification specs 1.0, breaks some notification daemons
Bug reassigned from package 'libnotify1' to 'src:libnotify'.
Bug reassigned from package 'libnotify1' to 'src:libnotify'.
Ignoring request to alter found versions of bug #588205 to the same values previously set
Ignoring request to alter found versions of bug #588276 to the same values previously set
No longer marked as fixed in versions 0.7.0-2.
No longer marked as fixed in versions 0.7.0-2.
> fixed 588205 0.7.0-2
Bug #588205 {Done: Laurent Bigonville <bigon at debian.org>} [src:libnotify] client throws exception with libnotify 0.5.0
Bug #588276 {Done: Laurent Bigonville <bigon at debian.org>} [src:libnotify] libnotify doesn't support notification specs 1.0, breaks some notification daemons
Marked as fixed in versions libnotify/0.7.0-2.
Marked as fixed in versions libnotify/0.7.0-2.
> tags 588205 - squeeze jessie sid wheezy
Bug #588205 {Done: Laurent Bigonville <bigon at debian.org>} [src:libnotify] client throws exception with libnotify 0.5.0
Bug #588276 {Done: Laurent Bigonville <bigon at debian.org>} [src:libnotify] libnotify doesn't support notification specs 1.0, breaks some notification daemons
Removed tag(s) sid, squeeze, wheezy, and jessie.
Removed tag(s) sid, squeeze, wheezy, and jessie.
> found 588205 0.5.0-1
Bug #588205 {Done: Laurent Bigonville <bigon at debian.org>} [src:libnotify] client throws exception with libnotify 0.5.0
Bug #588276 {Done: Laurent Bigonville <bigon at debian.org>} [src:libnotify] libnotify doesn't support notification specs 1.0, breaks some notification daemons
Marked as found in versions libnotify/0.5.0-1.
Marked as found in versions libnotify/0.5.0-1.
> reassign 768270 librubberband-dev,rubberband-ladspa,rubberband-vamp
Bug #768270 [librubberband-dev] librubberband-dev: unhandled symlink to directory conversion: /usr/share/doc/PACKAGE
Bug reassigned from package 'librubberband-dev' to 'librubberband-dev,rubberband-ladspa,rubberband-vamp'.
No longer marked as found in versions rubberband/1.8.1-5.
Ignoring request to alter fixed versions of bug #768270 to the same values previously set
> found 768270 1.8.1-5
Bug #768270 [librubberband-dev,rubberband-ladspa,rubberband-vamp] librubberband-dev: unhandled symlink to directory conversion: /usr/share/doc/PACKAGE
Marked as found in versions rubberband/1.8.1-5.
> tags 590810 - jessie sid squeeze
Bug #590810 {Done: Camm Maguire <camm at debian.org>} [xmpi] xmpi: Maintainer address seems to bounce
Removed tag(s) squeeze, sid, and jessie.
> tags 709183 + jessie sid
Bug #709183 {Done: gregor herrmann <gregoa at debian.org>} [librep] librep: FTBFS on kfreebsd-amd64
Added tag(s) sid and jessie.
> reassign 711700 src:scilab
Bug #711700 {Done: Sylvestre Ledru <sylvestre at debian.org>} [libscilab2-java] libscilab2-java: circular dependency hell
Bug reassigned from package 'libscilab2-java' to 'src:scilab'.
No longer marked as found in versions scilab/5.4.1-3 and scilab/5.4.1-1.
No longer marked as fixed in versions scilab/5.4.1-2 and scilab/5.4.1-4.
> fixed 711700 5.4.1-4
Bug #711700 {Done: Sylvestre Ledru <sylvestre at debian.org>} [src:scilab] libscilab2-java: circular dependency hell
Marked as fixed in versions scilab/5.4.1-4.
> found 711700 5.4.1-1
Bug #711700 {Done: Sylvestre Ledru <sylvestre at debian.org>} [src:scilab] libscilab2-java: circular dependency hell
Marked as found in versions scilab/5.4.1-1.
> reassign 723980 src:osgearth
Bug #723980 {Done: Aron Xu <aron at debian.org>} [libosgearth1] libosgearth1: transitional package for shared library
Bug reassigned from package 'libosgearth1' to 'src:osgearth'.
No longer marked as found in versions osgearth/2.4.0+dfsg-4.
No longer marked as fixed in versions osgearth/2.4.0+dfsg-5.
> fixed 723980 2.4.0+dfsg-5
Bug #723980 {Done: Aron Xu <aron at debian.org>} [src:osgearth] libosgearth1: transitional package for shared library
Marked as fixed in versions osgearth/2.4.0+dfsg-5.
> found 723980 2.4.0+dfsg-4
Bug #723980 {Done: Aron Xu <aron at debian.org>} [src:osgearth] libosgearth1: transitional package for shared library
Marked as found in versions osgearth/2.4.0+dfsg-4.
> notfixed 56542 21.4.22-4+rm
Failed to remove fixed on 56542: Bug 56542 mergedwith differs from bug 133607: (133607: '56542 153040 160973 182971 303103 363246 369165 382701') vs. ('153040 160973 182971 303103 363246 369165 382701 56542') (133607 153040 160973 182971 303103 363246 369165 382701 56542).

> reassign 455688 libvte9
Bug #455688 {Done: Josselin Mouette <joss at debian.org>} [gnome-terminal] Black boxes sometimes displayed instead of spaces
Bug #457483 {Done: Josselin Mouette <joss at debian.org>} [gnome-terminal] gnome-terminal: emacs sometimes leaves blobs on the screen instead of white space
Bug reassigned from package 'gnome-terminal' to 'libvte9'.
Bug reassigned from package 'gnome-terminal' to 'libvte9'.
Ignoring request to alter found versions of bug #455688 to the same values previously set
No longer marked as found in versions gnome-terminal/2.18.4-1.
No longer marked as fixed in versions 1:0.20.1-1.
No longer marked as fixed in versions 1:0.20.1-1.
> fixed 455688 1:0.20.1-1
Bug #455688 {Done: Josselin Mouette <joss at debian.org>} [libvte9] Black boxes sometimes displayed instead of spaces
Bug #457483 {Done: Josselin Mouette <joss at debian.org>} [libvte9] gnome-terminal: emacs sometimes leaves blobs on the screen instead of white space
Marked as fixed in versions vte/1:0.20.1-1.
Marked as fixed in versions vte/1:0.20.1-1.
> found 455688 1:0.16.10-1
Bug #455688 {Done: Josselin Mouette <joss at debian.org>} [libvte9] Black boxes sometimes displayed instead of spaces
Bug #457483 {Done: Josselin Mouette <joss at debian.org>} [libvte9] gnome-terminal: emacs sometimes leaves blobs on the screen instead of white space
Marked as found in versions vte/1:0.16.10-1.
Marked as found in versions vte/1:0.16.10-1.
> affects 455688 + gnome-terminal
Bug #455688 {Done: Josselin Mouette <joss at debian.org>} [libvte9] Black boxes sometimes displayed instead of spaces
Bug #457483 {Done: Josselin Mouette <joss at debian.org>} [libvte9] gnome-terminal: emacs sometimes leaves blobs on the screen instead of white space
Added indication that 455688 affects gnome-terminal
Added indication that 457483 affects gnome-terminal
> tags 639201 - jessie sid wheezy
Bug #639201 {Done: A Mennucc1 <mennucc1 at debian.org>} [src:waili] waili: FTBFS(kfreebsd): patch included
Removed tag(s) sid, wheezy, and jessie.
> tags 666655 - jessie sid wheezy
Bug #666655 {Done: Pietro Battiston <me at pietrobattiston.it>} [src:python-shapely] python-shapely: FTBFS: tests failed
Removed tag(s) sid, wheezy, and jessie.
> reassign 734344 src:opendnssec
Bug #734344 {Done: Ond?ej Sur? <ondrej at debian.org>} [opendnssec-auditor] opendnssec-auditor: Please migrate to Ruby 1.9/2.0
Bug reassigned from package 'opendnssec-auditor' to 'src:opendnssec'.
No longer marked as found in versions opendnssec/1:1.3.16-2.
No longer marked as fixed in versions opendnssec/1:1.4.3-3.
> fixed 734344 1:1.4.3-3
Bug #734344 {Done: Ond?ej Sur? <ondrej at debian.org>} [src:opendnssec] opendnssec-auditor: Please migrate to Ruby 1.9/2.0
Marked as fixed in versions opendnssec/1:1.4.3-3.
> found 734344 1:1.3.16-2
Bug #734344 {Done: Ond?ej Sur? <ondrej at debian.org>} [src:opendnssec] opendnssec-auditor: Please migrate to Ruby 1.9/2.0
Marked as found in versions opendnssec/1:1.3.16-2.
> tags 650684 - jessie sid wheezy
Bug #650684 {Done: Steven Chamberlain <steven at pyro.eu.org>} [src:freebsd-quota] freebsd-quota: FTBFS: Makefile:12: *** missing separator.  Stop.
Removed tag(s) sid, wheezy, and jessie.
> tags 736616 - jessie sid
Bug #736616 {Done: Alessandro Ghedini <ghedo at debian.org>} [libecasoundc1] libecasoundc1: eci_init() fails on mips
Removed tag(s) sid and jessie.
> # not a bug in icedove
> notfixed 731538 17.0.10-1
Bug #731538 {Done: Carsten Schoenert <c.schoenert at t-online.de>} [icedove] [icedove] Keeps indexing forever
No longer marked as fixed in versions 17.0.10-1.
> tags 628413 - jessie sid wheezy
Bug #628413 {Done: Francesco Paolo Lovergine <frankie at debian.org>} [src:ossim] ossim: FTBFS: configure misses case for kfreebsd
Removed tag(s) sid, wheezy, and jessie.
> tags 597415 - jessie sid wheezy squeeze
Bug #597415 {Done: Stephen Kitt <skitt at debian.org>} [heroes-common] heroes-common: install-info installed leads to /usr/share/info/dir.gz in built package
Removed tag(s) squeeze, sid, wheezy, and jessie.
> tags 575408 - squeeze
Bug #575408 {Done: B?lint R?czey <balint at balintreczey.hu>} [pulseaudio] pulseaudio: [SigmaTel STAC9228] Recording problem - integrated microphone no longer available on Dell XPS 1330/Dell Inspiron 1420
Bug #610886 {Done: B?lint R?czey <balint at balintreczey.hu>} [pulseaudio] alsa-utils: [SigmaTel STAC9228] Recording problem
Removed tag(s) squeeze.
Removed tag(s) squeeze.
> tags 652130 - jessie sid wheezy
Bug #652130 {Done: Eugeniy Meshcheryakov <eugen at debian.org>} [src:swi-prolog] swi-prolog-java: add support for other architectures
Removed tag(s) sid, wheezy, and jessie.
> tags 714264 - experimental jessie sid wheezy
Bug #714264 {Done: Michael Biebl <biebl at debian.org>} [libclutter-1.0-0] CVE-2013-2190: screen unlocked after resuming due to crash
Removed tag(s) sid, wheezy, jessie, and experimental.
> tags 643187 - jessie sid wheezy
Bug #643187 {Done: Christian Kastner <debian at kvr.at>} [src:libfann] libfann: FTBFS: dpkg-buildpackage: error: dpkg-source -b libfann-2.1.0~beta~dfsg gave error exit status 2
Removed tag(s) sid, wheezy, and jessie.
> tags 643254 - jessie sid wheezy
Bug #643254 {Done: Debian FTP Masters <ftpmaster at ftp-master.debian.org>} [src:premake] premake: FTBFS: dpkg-buildpackage: error: dpkg-source -b premake-3.7 gave error exit status 2
Removed tag(s) sid, wheezy, and jessie.
> tags 556331 - jessie sid wheezy
Bug #556331 {Done: Debian FTP Masters <ftpmaster at ftp-master.debian.org>} [src:rubrica] FTBFS with binutils-gold
Removed tag(s) sid, wheezy, and jessie.
> tags 643214 - jessie sid wheezy
Bug #643214 {Done: Andrew Shadura <andrew at shadura.me>} [src:mcu8051ide] mcu8051ide: FTBFS: dpkg-buildpackage: error: dpkg-source -b mcu8051ide-1.3.7 gave error exit status 2
Removed tag(s) sid, wheezy, and jessie.
> found 729073 17.0.8-1
Bug #729073 {Done: Christoph Goehre <chris at sigxcpu.org>} [icedove] icedove won't start
Marked as found in versions icedove/17.0.8-1.
> tags 643082 - jessie sid wheezy
Bug #643082 {Done: Dariusz Dwornikowski <dariusz.dwornikowski at cs.put.poznan.pl>} [src:connectagram] connectagram: FTBFS: dpkg-buildpackage: error: dpkg-source -b connectagram-1.0.1 gave error exit status 2
Removed tag(s) sid, wheezy, and jessie.
> tags 674541 - jessie sid wheezy
Bug #674541 {Done: Antonio Terceiro <terceiro at debian.org>} [src:ruby1.8] ruby1.8: segfaults when compiled with gcc-4.7
Removed tag(s) sid, wheezy, and jessie.
> tags 643269 - jessie sid wheezy
Bug #643269 {Done: Adam Majer <adamm at zombino.com>} [src:sc] sc: FTBFS: dpkg-buildpackage: error: dpkg-source -b sc-7.16 gave error exit status 2
Removed tag(s) sid, wheezy, and jessie.
> tags 750343 - jessie sid
Bug #750343 {Done: Martin Pitt <mpitt at debian.org>} [src:autopkgtest] autopkgtest: FTBFS: Tests failures
Removed tag(s) sid and jessie.
> tags 643166 - jessie sid wheezy
Bug #643166 {Done: Debian FTP Masters <ftpmaster at ftp-master.debian.org>} [src:imsniff] imsniff: FTBFS: dpkg-buildpackage: error: dpkg-source -b imsniff-0.04 gave error exit status 2
Removed tag(s) sid, wheezy, and jessie.
> reassign 751069 src:rtaudio
Bug #751069 {Done: Felipe Sateler <fsateler at debian.org>} [librtaudio4] rtaudio: breaks ABI without SONAME bump
Bug reassigned from package 'librtaudio4' to 'src:rtaudio'.
No longer marked as found in versions rtaudio/4.1.1~ds0-1.
No longer marked as fixed in versions rtaudio/4.1.1~ds0-2.
> fixed 751069 4.1.1~ds0-2
Bug #751069 {Done: Felipe Sateler <fsateler at debian.org>} [src:rtaudio] rtaudio: breaks ABI without SONAME bump
Marked as fixed in versions rtaudio/4.1.1~ds0-2.
> found 751069 4.1.1~ds0-1
Bug #751069 {Done: Felipe Sateler <fsateler at debian.org>} [src:rtaudio] rtaudio: breaks ABI without SONAME bump
Marked as found in versions rtaudio/4.1.1~ds0-1.
> notfound 492700 0.63-2
Bug #492700 {Done: Ond?ej Sur? <ondrej at sury.org>} [libnet-dns-perl] appears to be vulnerable to cache poisoning attack CVE-2008-1447
No longer marked as found in versions libnet-dns-perl/0.63-2.
> tags 616259 - jessie sid wheezy
Bug #616259 {Done: Debian FTP Masters <ftpmaster at ftp-master.debian.org>} [src:libnl] libnl: replace doxygen and texlive-* build dependencies with doxygen-latex
Removed tag(s) sid, wheezy, and jessie.
> tags 746341 - jessie sid
Bug #746341 {Done: Youhei SASAKI <uwabami at gfd-dennou.org>} [ruby-pgplot] build-depend on gfortran instead of gfortran-4.6
Removed tag(s) sid and jessie.
> tags 306914 - jessie sid wheezy squeeze
Bug #306914 {Done: gregor herrmann <gregoa at debian.org>} [libnet-http-perl] debmirror does not take IPv6 addresses
Bug #471067 {Done: gregor herrmann <gregoa at debian.org>} [libnet-http-perl] libwww-perl: no IPv6 support
Removed tag(s) squeeze, sid, wheezy, and jessie.
Removed tag(s) squeeze, sid, wheezy, and jessie.
> tags 292621 - jessie sid wheezy squeeze
Bug #292621 {Done: Jerome Benoit <calculus at rezozer.net>} [firehol] firehol: Please support IPv6
Removed tag(s) squeeze, sid, wheezy, and jessie.
> tags 539409 + jessie sid wheezy squeeze
Bug #539409 {Done: Philipp Huebner <debalance at debian.org>} [ejabberd] ejabberd: ipv6 nameservers in resolv.conf breaks SRV lookups
Ignoring request to alter tags of bug #539409 to the same tags previously set
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
272652: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=272652
292621: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=292621
298253: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=298253
302791: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=302791
304847: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=304847
306914: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=306914
313225: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=313225
319319: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=319319
336263: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=336263
349957: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=349957
373916: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=373916
391700: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=391700
440378: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440378
440483: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440483
450122: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=450122
455688: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=455688
457483: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=457483
471067: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471067
482146: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=482146
491458: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491458
491841: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491841
492700: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=492700
501304: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501304
501363: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501363
501394: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501394
501445: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501445
501539: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501539
501544: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501544
501571: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501571
501583: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501583
539409: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539409
556331: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556331
575408: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=575408
578293: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578293
584454: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584454
585202: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585202
588205: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588205
588276: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588276
590810: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590810
597415: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597415
605791: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605791
610886: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=610886
616259: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=616259
616634: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=616634
628413: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628413
629952: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629952
639201: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=639201
643082: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643082
643166: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643166
643187: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643187
643214: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643214
643254: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643254
643269: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643269
650684: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=650684
652130: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652130
666655: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666655
670164: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670164
674541: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674541
709183: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709183
711700: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711700
714264: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714264
723980: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=723980
729073: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729073
731538: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731538
734344: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734344
736616: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736616
746341: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746341
750343: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750343
751069: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751069
768270: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768270
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From fsateler at debian.org  Fri Nov  7 20:10:43 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Fri, 7 Nov 2014 17:10:43 -0300
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <1380251790.281382244.1415102533851.JavaMail.root@zimbra63-e11.priv.proxad.net>
References: <1818124388.280484862.1415087251451.JavaMail.root@zimbra63-e11.priv.proxad.net>
 <1380251790.281382244.1415102533851.JavaMail.root@zimbra63-e11.priv.proxad.net>
Message-ID: <CAAfdZj9b16Hf--EnoCpT9+ZGGR3bczAoAqgmhfN65NAN0hCwoA@mail.gmail.com>

Hi Jean,

On Tue, Nov 4, 2014 at 9:02 AM,  <jbernon at free.fr> wrote:
> New thing. My jessie installation was a standard one with very few contrib
> and non free packets. Following your idea about alsa, I installed
> alsa-firmware. It fixed one point (both the jack microphone and the built-in
> one are working now) but not the weird thing between alsa mic boost bar and
> pavucontrol volume level.

OK I just confirmed that this is desired behavior is pulseaudio, and
that this is probably a bug in your driver.

Pulseaudio by default "merges" the mic and mic boost controls into a
single volume control. What is happening to you is that the boost
control seems to be broken.

Please try upgrading your kernel (your kernel was a few versions
behind when you reported the bug). If that doesn't work out, we should
reassign this bug to the kernel.

As a workaround, you can try editing
/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf and
inside the element [Element Front Mic Boost], set  "volume = zero".
That should disable merging of the two controls.

-- 

Saludos,
Felipe Sateler


From adamm at zombino.com  Fri Nov  7 20:45:31 2014
From: adamm at zombino.com (Adam Majer)
Date: Fri, 07 Nov 2014 14:45:31 -0600
Subject: Bug#768500: Forever expanding window
Message-ID: <20141107204531.14983.62865.reportbug@mira.lan.galacticasoftware.com>

Package: pavucontrol
Version: 2.0-3
Severity: normal

Some of the programs name their streams with somewhat long names. The
same applies to some device names. This results in excessively long
labels/buttons that prevent window from being resized down to some
sane width.

Possible solutions,

 1. elide long strings that do not fit in stream names or device
 names.
 2. wrap long names

Attached is just one example of a long line.

- Adam



-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (50, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pavucontrol depends on:
ii  libatk1.0-0              2.14.0-1
ii  libatkmm-1.6-1           2.22.7-2.1
ii  libc6                    2.19-11
ii  libcairo-gobject2        1.12.16-5
ii  libcairo2                1.12.16-5
ii  libcairomm-1.0-1         1.10.0-1.1
ii  libcanberra-gtk3-0       0.30-2.1
ii  libcanberra0             0.30-2.1
ii  libgcc1                  1:4.9.1-16
ii  libgdk-pixbuf2.0-0       2.30.8-1+b1
ii  libglib2.0-0             2.42.0-2
ii  libglibmm-2.4-1c2a       2.42.0-1
ii  libgtk-3-0               3.14.1-1
ii  libgtkmm-3.0-1           3.14.0-1
ii  libpango-1.0-0           1.36.8-2
ii  libpangocairo-1.0-0      1.36.8-2
ii  libpangomm-1.4-1         2.34.0-1.1
ii  libpulse-mainloop-glib0  5.0-13
ii  libpulse0                5.0-13
ii  libsigc++-2.0-0c2a       2.2.11-4
ii  libstdc++6               4.9.1-16
ii  libx11-6                 2:1.6.2-3

Versions of packages pavucontrol recommends:
ii  pulseaudio  5.0-13

pavucontrol suggests no packages.

-- no debconf information
-------------- next part --------------
A non-text attachment was scrubbed...
Name: long.png
Type: image/png
Size: 76464 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141107/ec5f8c34/attachment-0001.png>

From owner at bugs.debian.org  Fri Nov  7 21:21:07 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Fri, 07 Nov 2014 21:21:07 +0000
Subject: Processed: Re: Bug#768500: Forever expanding window
References: <CAAfdZj8CgaWSf8mn=XS4XCTcXdsaJa1xJXXyuqfx_OWYa=qnAQ@mail.gmail.com>
 <20141107204531.14983.62865.reportbug@mira.lan.galacticasoftware.com>
Message-ID: <handler.s.B768500.141539513613951.transcript@bugs.debian.org>

Processing control commands:

> tags -1 confirmed upstream fixed-upstream
Bug #768500 [pavucontrol] Forever expanding window
Added tag(s) upstream, confirmed, and fixed-upstream.
> forwarded -1 https://bugs.freedesktop.org/show_bug.cgi?id=70964
Bug #768500 [pavucontrol] Forever expanding window
Set Bug forwarded-to-address to 'https://bugs.freedesktop.org/show_bug.cgi?id=70964'.

-- 
768500: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768500
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From fsateler at debian.org  Fri Nov  7 21:18:09 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Fri, 7 Nov 2014 18:18:09 -0300
Subject: Bug#768500: Forever expanding window
In-Reply-To: <20141107204531.14983.62865.reportbug@mira.lan.galacticasoftware.com>
References: <20141107204531.14983.62865.reportbug@mira.lan.galacticasoftware.com>
Message-ID: <CAAfdZj8CgaWSf8mn=XS4XCTcXdsaJa1xJXXyuqfx_OWYa=qnAQ@mail.gmail.com>

Control: tags -1 confirmed upstream fixed-upstream
Control: forwarded -1 https://bugs.freedesktop.org/show_bug.cgi?id=70964

Hi Adam,

On Fri, Nov 7, 2014 at 5:45 PM, Adam Majer <adamm at zombino.com> wrote:
> Package: pavucontrol
> Version: 2.0-3
> Severity: normal
>
> Some of the programs name their streams with somewhat long names. The
> same applies to some device names. This results in excessively long
> labels/buttons that prevent window from being resized down to some
> sane width.
>
> Possible solutions,
>
>  1. elide long strings that do not fit in stream names or device
>  names.
>  2. wrap long names


This has been reported and fixed upstream but a new release has not
been done :(.
 The relevant commit is:
http://cgit.freedesktop.org/pulseaudio/pavucontrol/commit/?id=35e844d2b2cf35f5a4cb29b1e32f4f1fa95dda7b

Unfortunately it is now too late to fix this for jessie.

-- 

Saludos,
Felipe Sateler


From adamm at zombino.com  Fri Nov  7 21:26:24 2014
From: adamm at zombino.com (Adam Majer)
Date: Fri, 7 Nov 2014 15:26:24 -0600
Subject: Bug#768500: Forever expanding window
In-Reply-To: <CAAfdZj8CgaWSf8mn=XS4XCTcXdsaJa1xJXXyuqfx_OWYa=qnAQ@mail.gmail.com>
References: <20141107204531.14983.62865.reportbug@mira.lan.galacticasoftware.com>
 <CAAfdZj8CgaWSf8mn=XS4XCTcXdsaJa1xJXXyuqfx_OWYa=qnAQ@mail.gmail.com>
Message-ID: <20141107212622.GA15958@mira.lan.galacticasoftware.com>

On Fri, Nov 07, 2014 at 06:18:09PM -0300, Felipe Sateler wrote:
> This has been reported and fixed upstream but a new release has not
> been done :(.
>  The relevant commit is:
> http://cgit.freedesktop.org/pulseaudio/pavucontrol/commit/?id=35e844d2b2cf35f5a4cb29b1e32f4f1fa95dda7b
> 
> Unfortunately it is now too late to fix this for jessie.

Yikes, that is almost a year old! Regardless, I'm looking forward to
this getting fixed for next-next release :)

Thank you for quick reply.

- Adam


From alkayata2001 at gmail.com  Sun Nov  9 14:22:53 2014
From: alkayata2001 at gmail.com (Juan =?UTF-8?Q?D=C3=ADaz?= Porras)
Date: Sun, 09 Nov 2014 15:22:53 +0100
Subject: Bug#768824: pulseaudio: DISALLOW_MODULE_LOADING which is set in
 /etc/default/pulseaudio is overriden in /etc/init.d/pulseaudio
Message-ID: <20141109142253.20183.4330.reportbug@debian>

Package: pulseaudio
Version: 2.0-6.1
Severity: important
Tags: d-i

Dear Maintainer,
*** Please consider answering these questions, where appropriate ***

   * What led up to the situation?
 On a two user machine with two soundcards - onboard and usb - sound sometimes
stops working after user switching. Also pulseaudio doesn't yield usb card
control to jackd server when I try to start it. It seems that if
DISALLOW_MODULE_LOADING is set to 1, then module-udev-detect and module-
jackdbus-detect won't load causing that behaviour.
   * What exactly did you do (or not do) that was effective (or
     ineffective)?
 Once I realized DISALLOW_MODULE_LOADING was set twice, one in
/etc/default/pulseaudio and other in /etc/init.d/pulseaudio I tried firts
'dpkg-reconfigure pulseaudio' but it did'nt nothing. Then I change by hand the
value of DISALLOW_MODULE_LOADING in the two files to 0.
   * What was the outcome of this action?
 When I tried 'dpkg-reconfigure pulseaudio' It only warned me that pulseaudio
was configured as per user session.
 Changing both DISALLOW_MODULE_LOADING assignementsto 0 seemed to work fine by
now.
   * What outcome did you expect instead?
 I expected that 'dpkg-reconfigure pulseaudio' had done that work for me, I
find the warning message "Pulseaudio is configured as per user session"
annoying and useless. It warns me also each time pulseaudio starts, but I don't
understand why, since according to website is the right way to configure, and
it is what I want.
 I expected also to have only one assignement of DISALLOW_MODULE_LOADING in
/etc/default/pulseaudio. I find confusing having the overriding one in
/etc/init.d/pulseaudio.



-- System Information:
Debian Release: 7.7
  APT prefers stable
  APT policy: (800, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pulseaudio depends on:
ii  adduser                       3.113+nmu3
ii  consolekit                    0.4.5-3.1
ii  libasound2                    1.0.25-4
ii  libasound2-plugins            1.0.25-2
ii  libc6                         2.13-38+deb7u6
ii  libcap2                       1:2.22-1.2
ii  libdbus-1-3                   1.6.8-1+deb7u4
ii  libfftw3-3                    3.3.2-3.1
ii  libgcc1                       1:4.7.2-5
ii  libice6                       2:1.0.8-2
ii  libltdl7                      2.4.2-1.1
ii  liborc-0.4-0                  1:0.4.16-2
ii  libpulse0                     2.0-6.1
ii  libsamplerate0                0.1.8-5
ii  libsm6                        2:1.2.1-2
ii  libsndfile1                   1.0.25-5
ii  libspeexdsp1                  1.2~rc1-7
ii  libstdc++6                    4.7.2-5
ii  libsystemd-daemon0            44-11+deb7u4
ii  libsystemd-login0             44-11+deb7u4
ii  libtdb1                       1.2.10-2
ii  libudev0                      175-7.2
ii  libwebrtc-audio-processing-0  0.1-2
ii  libx11-6                      2:1.5.0-1+deb7u1
ii  libx11-xcb1                   2:1.5.0-1+deb7u1
ii  libxcb1                       1.8.1-2+deb7u1
ii  libxtst6                      2:1.2.1-1+deb7u1
ii  lsb-base                      4.1+Debian8+deb7u1
ii  udev                          175-7.2

Versions of packages pulseaudio recommends:
ii  gstreamer0.10-pulseaudio  0.10.31-3+nmu1
ii  pulseaudio-module-x11     2.0-6.1
ii  rtkit                     0.10-2+wheezy1

Versions of packages pulseaudio suggests:
ii  paman             0.9.4-1
ii  paprefs           0.9.10-1
ii  pavucontrol       1.0-1
ii  pavumeter         0.9.3-4
ii  pulseaudio-utils  2.0-6.1

-- Configuration Files:
/etc/default/pulseaudio changed:
PULSEAUDIO_SYSTEM_START=0
DISALLOW_MODULE_LOADING=0

/etc/init.d/pulseaudio changed:
DAEMON=/usr/bin/pulseaudio
PIDDIR=/var/run/pulse
PIDFILE=$PIDDIR/pid
DAEMONUSER=pulse
PATH=/sbin:/bin:/usr/sbin:/usr/bin
test -x $DAEMON || exit 0
.. /lib/lsb/init-functions
PULSEAUDIO_SYSTEM_START=0
DISALLOW_MODULE_LOADING=0
test -f /etc/default/pulseaudio && . /etc/default/pulseaudio
if [ "$PULSEAUDIO_SYSTEM_START" != "1" ]; then
	log_warning_msg "PulseAudio configured for per-user sessions"
	exit 0
fi
pulseaudio_start () {
	log_daemon_msg "Starting system PulseAudio Daemon"
	if [ ! -d $PIDDIR ]; then
		mkdir -p $PIDDIR
		chown $DAEMONUSER:$DAEMONUSER $PIDDIR
	fi
	start-stop-daemon -x $DAEMON -p $PIDFILE --start -- --system --disallow-exit --disallow-module-loading=$DISALLOW_MODULE_LOADING --daemonize --log-target=syslog --high-priority
	status=$?
	if [ -e /var/run/pulse/.esd_auth ]; then
		chown pulse:pulse-access /var/run/pulse/.esd_auth
		chmod 640 /var/run/pulse/.esd_auth
	fi
	if [ -e /var/run/pulse/.pulse-cookie ]; then
		chown pulse:pulse-access /var/run/pulse/.pulse-cookie
		chmod 640 /var/run/pulse/.pulse-cookie
	fi
	log_end_msg ${status}
}
pulseaudio_stop () {
	log_daemon_msg "Stopping system PulseAudio Daemon"
	start-stop-daemon -p $PIDFILE --stop --retry 5 || echo -n "...which is not running"
	log_end_msg $?
}
case "$1" in
	start|stop)
		pulseaudio_${1}
		;;
	restart|reload|force-reload)
		if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
			pulseaudio_stop
			pulseaudio_start
		fi
		;;
	force-stop)
		pulseaudio_stop
		killall pulseaudio || true
		sleep 2
		killall -9 pulseaudio || true
		;;
	status)
		status_of_proc -p $PIDFILE "$DAEMON" "system-wide PulseAudio" && exit 0 || exit $?
		;;
	*)
		echo "Usage: /etc/init.d/pulseaudio {start|stop|force-stop|restart|reload|force-reload|status}"
		exit 1
		;;
esac
exit 0

/etc/pulse/default.pa changed:
..nofail
..fail
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore
load-module module-augment-properties
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
load-module module-detect
..endif
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect
..fail
..endif
..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif
load-module module-default-device-restore
load-module module-rescue-streams
load-module module-always-sink
load-module module-intended-roles
load-module module-suspend-on-idle
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif
load-module module-position-event-sounds
load-module module-role-cork
load-module module-filter-heuristics
load-module module-filter-apply
..ifexists module-dbus-protocol.so
load-module module-dbus-protocol
..endif
load-module module-switch-on-port-available
set-default-sink UA-25EX
set-default-source UA-25EX


-- no debconf information


From owner at bugs.debian.org  Mon Nov 10 00:42:07 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Mon, 10 Nov 2014 00:42:07 +0000
Subject: Processed: Re: Bug#768824: pulseaudio: DISALLOW_MODULE_LOADING
 which is set in /etc/default/pulseaudio is overriden in /etc/init.d/pulseaudio
References: <CAAfdZj8u0UXqMCQO8DgM1X31TMk0rvegmdnDLi_Cff31yfE7jg@mail.gmail.com>
 <20141109142253.20183.4330.reportbug@debian>
Message-ID: <handler.s.B768824.141557994821231.transcript@bugs.debian.org>

Processing control commands:

> tags -1 moreinfo
Bug #768824 [pulseaudio] pulseaudio: DISALLOW_MODULE_LOADING which is set in /etc/default/pulseaudio is overriden in /etc/init.d/pulseaudio
Added tag(s) moreinfo.
> severity -1 normal
Bug #768824 [pulseaudio] pulseaudio: DISALLOW_MODULE_LOADING which is set in /etc/default/pulseaudio is overriden in /etc/init.d/pulseaudio
Severity set to 'normal' from 'important'

-- 
768824: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768824
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From fsateler at debian.org  Mon Nov 10 00:38:21 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Sun, 9 Nov 2014 21:38:21 -0300
Subject: Bug#768824: pulseaudio: DISALLOW_MODULE_LOADING which is set in
 /etc/default/pulseaudio is overriden in /etc/init.d/pulseaudio
In-Reply-To: <20141109142253.20183.4330.reportbug@debian>
References: <20141109142253.20183.4330.reportbug@debian>
Message-ID: <CAAfdZj8u0UXqMCQO8DgM1X31TMk0rvegmdnDLi_Cff31yfE7jg@mail.gmail.com>

Control: tags -1 moreinfo
Control: severity -1 normal

On Sun, Nov 9, 2014 at 11:22 AM, Juan D?az Porras
<alkayata2001 at gmail.com> wrote:
> Package: pulseaudio
> Version: 2.0-6.1
> Severity: important
> Tags: d-i
>
> Dear Maintainer,
> *** Please consider answering these questions, where appropriate ***
>
>    * What led up to the situation?
>  On a two user machine with two soundcards - onboard and usb - sound sometimes
> stops working after user switching. Also pulseaudio doesn't yield usb card
> control to jackd server when I try to start it. It seems that if
> DISALLOW_MODULE_LOADING is set to 1, then module-udev-detect and module-
> jackdbus-detect won't load causing that behaviour.
>    * What exactly did you do (or not do) that was ffective (or
>      ineffective)?
>  Once I realized DISALLOW_MODULE_LOADING was set twice, one in
> /etc/default/pulseaudio and other in /etc/init.d/pulseaudio I tried firts
> 'dpkg-reconfigure pulseaudio' but it did'nt nothing. Then I change by hand the
> value of DISALLOW_MODULE_LOADING in the two files to 0.
>    * What was the outcome of this action?
>  When I tried 'dpkg-reconfigure pulseaudio' It only warned me that pulseaudio
> was configured as per user session.
>  Changing both DISALLOW_MODULE_LOADING assignementsto 0 seemed to work fine by
> now.
>    * What outcome did you expect instead?
>  I expected that 'dpkg-reconfigure pulseaudio' had done that work for me, I
> find the warning message "Pulseaudio is configured as per user session"
> annoying and useless. It warns me also each time pulseaudio starts, but I don't
> understand why, since according to website is the right way to configure, and
> it is what I want.
>  I expected also to have only one assignement of DISALLOW_MODULE_LOADING in
> /etc/default/pulseaudio. I find confusing having the overriding one in
> /etc/init.d/pulseaudio.

I am unclear as to what the bug actually is.

The files show you do not have systemwide pulseaudio enabled, so
whatever you do on /etc/default/pulseaudio will not affect your
running pulseaudio instance, as that will be started by your user
processes, and will not actually be started by /etc/init.d/pulseaudio

Reducing severity since system instances are discouraged (and indeed
in jessie it is not supported by default).

-- 

Saludos,
Felipe Sateler


From forrest.cahoon at gmail.com  Mon Nov 10 07:16:29 2014
From: forrest.cahoon at gmail.com (Forrest Cahoon)
Date: Mon, 10 Nov 2014 01:16:29 -0600
Subject: Bug#768918: pulseaudio: Streams do not switch to correct sink when
 USB speakers are removed
Message-ID: <20141110071629.3286.27881.reportbug@makemake.3096>

Package: pulseaudio
Version: 5.0-13
Severity: normal

I have added these lines to my /etc/pulse/default.pa:

# fc-added
set-default-sink alsa_output.pci-0000_00_1b.0.analog-stereo
set-default-source alsa_input.pci-0000_00_1b.0.analog-stereo

load-module module-switch-on-connect

These define a default sink (and source), and loads module-switch-on-connect,
which correctly causes pulseaudio to switch any playing streams to my external
USB speakers when I plug them in. I expect that when i unplug the USB speakers,
playing streams will return to the default sink which I have defined in my
config. This does not happen. What happens is that pulseaudio switches the
stream to its sink #0, which is an HDMI audio device that is not connected to
any output.

When I check the default sink again after having unplugged the USB device by
checking the output of "pacmd list-sinks" and looking for the asterisk, it is
correctly set back to the default I've defined in my config.

My suspicion is that the module module-rescue-streams, which is responsible for
switching streams once a sink becomes unavailable, is being called _before_ the
default sink is set back from the USB device to the config-defined default
device, and it is choosing the first available sink it finds, which is #0. (The
function find_evacuation_source in module-rescue-streams.c looks like it would
do that, although I haven't been able run it in the debugger and set a
breakpoint to check.)



-- Package-specific info:
File '/etc/default/pulseaudio' does not exist


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16-3-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pulseaudio depends on:
ii  adduser                       3.113+nmu3
ii  libasound2                    1.0.28-1
ii  libasound2-plugins            1.0.28-1+b1
ii  libc6                         2.19-13
ii  libcap2                       1:2.24-6
ii  libdbus-1-3                   1.8.8-2
ii  libfftw3-single3              3.3.4-1.1
ii  libgcc1                       1:4.9.2-1
ii  libice6                       2:1.0.9-1
ii  libltdl7                      2.4.2-1.11
ii  liborc-0.4-0                  1:0.4.22-1
ii  libpulse0                     5.0-13
ii  libsamplerate0                0.1.8-8
ii  libsm6                        2:1.2.2-1
ii  libsndfile1                   1.0.25-9+b1
ii  libspeexdsp1                  1.2~rc1.2-1
ii  libstdc++6                    4.9.2-1
ii  libsystemd0                   215-5+b1
ii  libtdb1                       1.3.1-1
ii  libudev1                      215-5+b1
ii  libwebrtc-audio-processing-0  0.1-3
ii  libx11-6                      2:1.6.2-3
ii  libx11-xcb1                   2:1.6.2-3
ii  libxcb1                       1.10-3+b1
ii  libxtst6                      2:1.2.2-1+b1
ii  lsb-base                      4.1+Debian13+nmu1
ii  pulseaudio-utils              5.0-13
ii  udev                          215-5+b1

Versions of packages pulseaudio recommends:
ii  pulseaudio-module-x11  5.0-13
ii  rtkit                  0.11-1

Versions of packages pulseaudio suggests:
pn  paman        <none>
pn  paprefs      <none>
ii  pavucontrol  2.0-3
pn  pavumeter    <none>

-- Configuration Files:
/etc/pulse/default.pa changed:
..nofail
..fail
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore
load-module module-augment-properties
load-module module-switch-on-port-available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
load-module module-detect
..endif
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif
..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif
load-module module-default-device-restore
load-module module-rescue-streams
load-module module-always-sink
load-module module-intended-roles
load-module module-suspend-on-idle
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif
load-module module-position-event-sounds
load-module module-role-cork
load-module module-filter-heuristics
load-module module-filter-apply
set-default-sink alsa_output.pci-0000_00_1b.0.analog-stereo
set-default-source alsa_input.pci-0000_00_1b.0.analog-stereo
load-module module-switch-on-connect


-- no debconf information
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; default-sink =
; default-source =
; default-server =
; default-dbus-server =

autospawn = no
; daemon-binary = /usr/bin/pulseaudio
; extra-arguments = --log-target=syslog

; cookie-file =

; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB

; auto-connect-localhost = no
; auto-connect-display = no
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; daemonize = no
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
; system-instance = no
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no

; high-priority = yes
; nice-level = -11

; realtime-scheduling = yes
; realtime-priority = 5

; exit-idle-time = 20
; scache-idle-time = 20

; dl-search-path = (depends on architecture)

; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa

; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0

# resample-method defaults to  speex-float-1 on most architectures,
# speex-fixed-1 on ARM
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no

; flat-volumes = yes

; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000

; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right

; default-fragments = 4
; default-fragment-size-msec = 25

; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)

..nofail

### Load something into the sample cache
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav

..fail

### Automatically restore the volume of streams and devices
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore

### Automatically augment property information from .desktop files
### stored in /usr/share/application
load-module module-augment-properties

### Should be after module-*-restore but before module-*-detect
load-module module-switch-on-port-available

### Load audio drivers statically
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#load-module module-null-sink
#load-module module-pipe-sink

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
### Use the static hardware detection module (for systems that lack udev support)
load-module module-detect
..endif

### Automatically connect sink and source if JACK server is present
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif

### Automatically load driver modules for Bluetooth hardware
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif

..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish

### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv

### Load the RTP sender module (also configured via paprefs, see above)
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor

### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Honour intended role device property
load-module module-intended-roles

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif

### Enable positioned event sounds
load-module module-position-event-sounds

### Cork music/video streams when a phone stream is active
load-module module-role-cork

### Modules to allow autoloading of filters (such as echo cancellation)
### on demand. module-filter-heuristics tries to determine what filters
### make sense, and module-filter-apply does the heavy-lifting of
### loading modules and rerouting streams.
load-module module-filter-heuristics
load-module module-filter-apply

# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.

### Load X11 bell module
#load-module module-x11-bell sample=bell-windowing-system

### Register ourselves in the X11 session manager
#load-module module-x11-xsmp

### Publish connection data in the X11 root window
#.ifexists module-x11-publish.so
#.nofail
#load-module module-x11-publish
#.fail
#.endif

### Make some devices default
#set-default-sink output
#set-default-source input

# fc-added
set-default-sink alsa_output.pci-0000_00_1b.0.analog-stereo
set-default-source alsa_input.pci-0000_00_1b.0.analog-stereo

load-module module-switch-on-connect
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started in system
# mode.

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Automatically restore the volume of streams and devices
load-module module-stream-restore
load-module module-device-restore

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### Enable positioned event sounds
load-module module-position-event-sounds
-------------- next part --------------
null
    Discard all samples (playback) or generate zero samples (capture)
pulse
    PulseAudio Sound Server
default:CARD=PCH
    HDA Intel PCH, 92HD93BXX Analog
    Default Audio Device
sysdefault:CARD=PCH
    HDA Intel PCH, 92HD93BXX Analog
    Default Audio Device
front:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    Front speakers
surround21:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    2.1 Surround output to Front and Subwoofer speakers
surround40:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    4.0 Surround output to Front and Rear speakers
surround41:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    4.1 Surround output to Front, Rear and Subwoofer speakers
surround50:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    5.0 Surround output to Front, Center and Rear speakers
surround51:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    5.1 Surround output to Front, Center, Rear and Subwoofer speakers
surround71:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    7.1 Surround output to Front, Center, Side, Rear and Woofer speakers
dmix:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    Direct sample mixing device
dsnoop:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    Direct sample snooping device
hw:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    Direct hardware device without any conversions
plughw:CARD=PCH,DEV=0
    HDA Intel PCH, 92HD93BXX Analog
    Hardware device with all software conversions
hdmi:CARD=NVidia,DEV=0
    HDA NVidia, HDMI 0
    HDMI Audio Output
hdmi:CARD=NVidia,DEV=1
    HDA NVidia, HDMI 1
    HDMI Audio Output
dmix:CARD=NVidia,DEV=3
    HDA NVidia, HDMI 0
    Direct sample mixing device
dmix:CARD=NVidia,DEV=7
    HDA NVidia, HDMI 1
    Direct sample mixing device
dsnoop:CARD=NVidia,DEV=3
    HDA NVidia, HDMI 0
    Direct sample snooping device
dsnoop:CARD=NVidia,DEV=7
    HDA NVidia, HDMI 1
    Direct sample snooping device
hw:CARD=NVidia,DEV=3
    HDA NVidia, HDMI 0
    Direct hardware device without any conversions
hw:CARD=NVidia,DEV=7
    HDA NVidia, HDMI 1
    Direct hardware device without any conversions
plughw:CARD=NVidia,DEV=3
    HDA NVidia, HDMI 0
    Hardware device with all software conversions
plughw:CARD=NVidia,DEV=7
    HDA NVidia, HDMI 1
    Hardware device with all software conversions
-------------- next part --------------
Connection failure: Connection refused
pa_context_connect() failed: Connection refused
-------------- next part --------------
Connection failure: Connection refused
pa_context_connect() failed: Connection refused
-------------- next part --------------
Connection failure: Connection refused
pa_context_connect() failed: Connection refused
-------------- next part --------------
Connection failure: Connection refused
pa_context_connect() failed: Connection refused
-------------- next part --------------
Connection failure: Connection refused
pa_context_connect() failed: Connection refused

From fsateler at debian.org  Mon Nov 10 13:02:33 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Mon, 10 Nov 2014 10:02:33 -0300
Subject: Bug#768918: pulseaudio: Streams do not switch to correct sink when
 USB speakers are removed
In-Reply-To: <20141110071629.3286.27881.reportbug@makemake.3096>
References: <20141110071629.3286.27881.reportbug@makemake.3096>
Message-ID: <CAAfdZj8Cy+sY05nuhAmVZbT=E7cnWDjqNa-aPWAoO5pg4d-Rgw@mail.gmail.com>

Control: tags -1 confirmed upstream
Control: forwarded -1 https://bugs.freedesktop.org/show_bug.cgi?id=85488

Hi Forrest

On Mon, Nov 10, 2014 at 4:16 AM, Forrest Cahoon
<forrest.cahoon at gmail.com> wrote:
> Package: pulseaudio
> Version: 5.0-13
> Severity: normal
>
> I have added these lines to my /etc/pulse/default.pa:
>
> # fc-added
> set-default-sink alsa_output.pci-0000_00_1b.0.analog-stereo
> set-default-source alsa_input.pci-0000_00_1b.0.analog-stereo
>
> load-module module-switch-on-connect
>
> These define a default sink (and source), and loads module-switch-on-connect,
> which correctly causes pulseaudio to switch any playing streams to my external
> USB speakers when I plug them in. I expect that when i unplug the USB speakers,
> playing streams will return to the default sink which I have defined in my
> config. This does not happen. What happens is that pulseaudio switches the
> stream to its sink #0, which is an HDMI audio device that is not connected to
> any output.
>
> When I check the default sink again after having unplugged the USB device by
> checking the output of "pacmd list-sinks" and looking for the asterisk, it is
> correctly set back to the default I've defined in my config.
>
> My suspicion is that the module module-rescue-streams, which is responsible for
> switching streams once a sink becomes unavailable, is being called _before_ the
> default sink is set back from the USB device to the config-defined default
> device, and it is choosing the first available sink it finds, which is #0. (The
> function find_evacuation_source in module-rescue-streams.c looks like it would
> do that, although I haven't been able run it in the debugger and set a
> breakpoint to check.)

This is a known problem. Unfortunately, it is unlikely to be fixed in
the short term. Please see upstream's comment on another user
reporting this problem:

http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/21612/focus=21663

The workaround is to set the hdmi profile to off.

-- 

Saludos,
Felipe Sateler


From owner at bugs.debian.org  Mon Nov 10 13:06:07 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Mon, 10 Nov 2014 13:06:07 +0000
Subject: Processed: Re: Bug#768918: pulseaudio: Streams do not switch to
 correct sink when USB speakers are removed
References: <CAAfdZj8Cy+sY05nuhAmVZbT=E7cnWDjqNa-aPWAoO5pg4d-Rgw@mail.gmail.com>
 <20141110071629.3286.27881.reportbug@makemake.3096>
Message-ID: <handler.s.B768918.14156246003350.transcript@bugs.debian.org>

Processing control commands:

> tags -1 confirmed upstream
Bug #768918 [pulseaudio] pulseaudio: Streams do not switch to correct sink when USB speakers are removed
Added tag(s) upstream and confirmed.
> forwarded -1 https://bugs.freedesktop.org/show_bug.cgi?id=85488
Bug #768918 [pulseaudio] pulseaudio: Streams do not switch to correct sink when USB speakers are removed
Set Bug forwarded-to-address to 'https://bugs.freedesktop.org/show_bug.cgi?id=85488'.

-- 
768918: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768918
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From jbernon at free.fr  Wed Nov 12 09:32:25 2014
From: jbernon at free.fr (jbernon at free.fr)
Date: Wed, 12 Nov 2014 10:32:25 +0100 (CET)
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <CAAfdZj9b16Hf--EnoCpT9+ZGGR3bczAoAqgmhfN65NAN0hCwoA@mail.gmail.com>
Message-ID: <1072450826.308074248.1415784745934.JavaMail.root@zimbra63-e11.priv.proxad.net>

Hi Felipe, 

My kernel has been updated since the first mail I sent. 
root at pc-jean-debian:/home/jean# uname -a 
Linux pc-jean-debian 3.16-3-amd64 #1 SMP Debian 3.16.5-1 (2014-10-10) x86_64 GNU/Linux 

The volume issue remains. 

"Element Front Mic Boost" "volume" is already "off". I tried to set "Element Mic Boost" "volume" from "merge" to "0". But it muted everything. 


***THE CONF FILE 

[General] 
priority = 87 
description-key = analog-input-microphone 

[Jack Mic] 
required-any = any 

[Jack Mic Phantom] 
required-any = any 
state.plugged = unknown 
state.unplugged = unknown 

[Element Capture] 
switch = mute 
volume = merge 
override-map.1 = all 
override-map.2 = all-left,all-right 

[Element Mic Boost] 
required-any = any 
switch = select 
volume = merge 
override-map.1 = all 
override-map.2 = all-left,all-right 

[Option Mic Boost:on] 
name = input-boost-on 

[Option Mic Boost:off] 
name = input-boost-off 

[Element Mic] 
required-any = any 
switch = mute 
volume = merge 
override-map.1 = all 
override-map.2 = all-left,all-right 

[Element Input Source] 
enumeration = select 

[Option Input Source:Mic] 
name = analog-input-microphone 
required-any = any 

[Element Capture Source] 
enumeration = select 

[Option Capture Source:Mic] 
name = analog-input-microphone 
required-any = any 

;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)" 

[Element Mic Select] 
enumeration = select 

[Option Mic Select:Mic1] 
name = input-microphone 
priority = 20 

[Option Mic Select:Mic2] 
name = input-microphone 
priority = 19 

[Element Mic Boost (+20dB)] 
switch = select 
volume = merge 

[Option Mic Boost (+20dB):on] 
name = input-boost-on 

[Option Mic Boost (+20dB):off] 
name = input-boost-off 

[Element Front Mic] 
switch = off 
volume = off 

[Element Internal Mic] 
switch = off 
volume = off 

[Element Rear Mic] 
switch = off 
volume = off 

[Element Dock Mic] 
switch = off 

volume = off 

[Element Dock Mic Boost] 
switch = off 
volume = off 

[Element Internal Mic Boost] 
switch = off 
volume = off 

[Element Front Mic Boost] 
switch = off 
volume = off 

[Element Rear Mic Boost] 
switch = off 
volume = off 

.include analog-input-mic.conf.common 


Best regards 
Jean 


----- Mail original -----

De: "Felipe Sateler" <fsateler at debian.org> 
?: "Jean Bernon" <jbernon at free.fr> 
Cc: 766781 at bugs.debian.org 
Envoy?: Vendredi 7 Novembre 2014 21:10:43 
Objet: Re: Bug#766781: pavucontrol: Input volume cannot be more than 39% 

Hi Jean, 

On Tue, Nov 4, 2014 at 9:02 AM, <jbernon at free.fr> wrote: 
> New thing. My jessie installation was a standard one with very few contrib 
> and non free packets. Following your idea about alsa, I installed 
> alsa-firmware. It fixed one point (both the jack microphone and the built-in 
> one are working now) but not the weird thing between alsa mic boost bar and 
> pavucontrol volume level. 

OK I just confirmed that this is desired behavior is pulseaudio, and 
that this is probably a bug in your driver. 

Pulseaudio by default "merges" the mic and mic boost controls into a 
single volume control. What is happening to you is that the boost 
control seems to be broken. 

Please try upgrading your kernel (your kernel was a few versions 
behind when you reported the bug). If that doesn't work out, we should 
reassign this bug to the kernel. 

As a workaround, you can try editing 
/usr/share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf and 
inside the element [Element Front Mic Boost], set "volume = zero". 
That should disable merging of the two controls. 

-- 

Saludos, 
Felipe Sateler 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141112/f8ddf50a/attachment.html>

From fsateler at debian.org  Wed Nov 12 13:24:17 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Wed, 12 Nov 2014 10:24:17 -0300
Subject: Bug#766781: pavucontrol: Input volume cannot be more than 39%
In-Reply-To: <1072450826.308074248.1415784745934.JavaMail.root@zimbra63-e11.priv.proxad.net>
References: <CAAfdZj9b16Hf--EnoCpT9+ZGGR3bczAoAqgmhfN65NAN0hCwoA@mail.gmail.com>
 <1072450826.308074248.1415784745934.JavaMail.root@zimbra63-e11.priv.proxad.net>
Message-ID: <CAAfdZj-brqiijjs5dHKgpNh4o1JYfaJFYnaWhJTFB-DZCr+rsg@mail.gmail.com>

Control: reassign -1 linux-image-3.16.0-4-amd64
Control: retitle -1 Mic boost control introduces distortion


On Wed, Nov 12, 2014 at 6:32 AM,  <jbernon at free.fr> wrote:
> Hi Felipe,
>
> My kernel has been updated since the first mail I sent.
> root at pc-jean-debian:/home/jean# uname -a
> Linux pc-jean-debian 3.16-3-amd64 #1 SMP Debian 3.16.5-1 (2014-10-10) x86_64
> GNU/Linux
>
> The volume issue remains.

OK, we can report this as a kernel bug then.

>
> "Element Front Mic Boost" "volume" is already "off". I tried to set "Element
> Mic Boost" "volume" from "merge" to "0". But it muted everything.

Did you try setting zero instead of 0 (that is, putting the word
'zero', not the number)? That is what i saw elsewhere as a workaround
for this. Also try setting it to 'off' and 'ignore'. Note that these
are workarounds, so hopefully this can be fixed in the kernel.


Dear kernel maintainers, I'm forwarding this bug to you: Jean reports
that when the Mic Boost control is set to a value > 0, it introduces
distortions.

Jean, please run the alsa-info.sh script as documented here[1]. The
kernel maintainers will probably need this.

[1] https://wiki.ubuntu.com/Audio/AlsaInfo

-- 

Saludos,
Felipe Sateler


From owner at bugs.debian.org  Wed Nov 12 13:27:12 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Wed, 12 Nov 2014 13:27:12 +0000
Subject: Processed: Re: Bug#766781: pavucontrol: Input volume cannot be
 more than 39%
References: <CAAfdZj-brqiijjs5dHKgpNh4o1JYfaJFYnaWhJTFB-DZCr+rsg@mail.gmail.com>
 <20141025181357.4318.67580.reportbug@pc-jean-debian.jebe.org>
Message-ID: <handler.s.B766781.141579870410905.transcript@bugs.debian.org>

Processing control commands:

> reassign -1 linux-image-3.16.0-4-amd64
Bug #766781 [pulseaudio] pavucontrol: Input volume cannot be more than 39%
Bug reassigned from package 'pulseaudio' to 'linux-image-3.16.0-4-amd64'.
Ignoring request to alter found versions of bug #766781 to the same values previously set
Ignoring request to alter fixed versions of bug #766781 to the same values previously set
> retitle -1 Mic boost control introduces distortion
Bug #766781 [linux-image-3.16.0-4-amd64] pavucontrol: Input volume cannot be more than 39%
Changed Bug title to 'Mic boost control introduces distortion' from 'pavucontrol: Input volume cannot be more than 39%'

-- 
766781: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766781
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From andersonmissmary23 at gmail.com  Thu Nov 13 08:53:56 2014
From: andersonmissmary23 at gmail.com (Miss.Mary Anderson)
Date: Thu, 13 Nov 2014 08:53:56 +0000 (UTC)
Subject: Please I need your help
Message-ID: <775106594.313319.1415868836847.JavaMail.yahoo@jws11122.mail.ir2.yahoo.com>

?Hello Dear,

Compliments of the day. I came across your contact address while searching
for someone to? help me, I lost my parents and want you to stand as my
foreign trustee to retrive and? invest USD$6.5 Million which I inherited
from my late parent. I tried to get this money out? from the bank , but the
management refused because of my age. I am ready to give you 25% of? the
whole money at the completion of the transaction, write me back for more
details.

Regards, Miss.Mary Anderson.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141113/a8d449e0/attachment.html>

From bts-link-upstream at lists.alioth.debian.org  Thu Nov 13 16:31:13 2014
From: bts-link-upstream at lists.alioth.debian.org (bts-link-upstream at lists.alioth.debian.org)
Date: Thu, 13 Nov 2014 16:31:13 -0000
Subject: [bts-link] source package pulseaudio
Message-ID: <20141113163047.22154.92173.btslink@sonntag.debian.org>

#
# bts-link upstream status pull for source package pulseaudio
# see http://lists.debian.org/debian-devel-announce/2006/05/msg00001.html
#

user bts-link-upstream at lists.alioth.debian.org

# remote status report for #768918 (http://bugs.debian.org/768918)
# Bug title: pulseaudio: Streams do not switch to correct sink when USB speakers are removed
#  * https://bugs.freedesktop.org/show_bug.cgi?id=85488
#  * remote status changed: (?) -> NEW
usertags 768918 + status-NEW

thanks


From marketing at multech-pcb.com  Fri Nov 14 01:54:02 2014
From: marketing at multech-pcb.com (sales)
Date: Fri, 14 Nov 2014 09:54:02 +0800
Subject: The best supplier-Multech PCB Technologies Co.,Limited
Message-ID: <201411140954020624493@szdigital.pw>

DearSir/Madam ThisisIvanfromMultechPCBTechnologiesCo.,LtdinChina,=I'mgladtocontactyouandappreacitedforyourtimetoreadmye-mai=l.Sorrytointerruptyou,ifyouneedPCBs(Printedcircuitboard=)supplier,Multechmaybetherightoneforyou. Multechfoundedon1997andaleadingofPCBmanufacturerin=China,weareproudofourreliablequalityandhi-Techcapabilitysin=ce2000,thefactoryarecertifiedISO9001,TS16949andAS910=0,ULnumberisE320829.Multechisareliable,professionalcomp=anywithmorethan80%ofsalestrun-overexportPCBstooverseacusto=mersinUSA/EuropesuchasGermany,FranceandUK,Scandinavia.= LetmeshowyouMultech'sadvantagesforyou:Weoffer=highMultilayerPCB,HDIupto40-layerboard,flexandFlex-Rigidbo=ardarepreferredforus.Wehavetwoproductionline,oneisf=orquick-turn,theotheroneisforstandardline.Sowecould=supplyhighqualityPCBsatverycompetitvepriceaspercustomerture=requirement. Formoredetails,pleasefreetocontactmedirectly.Youwill=receiveourpromptreplytoyourRFQsandanyemails.Wishyouh=aveanicedayandlookingforwardtogettingyourresponse! Thanks&amp;BestregardsIvanMultechPCB=TechnologiesCo.,LtdSalesAccountManagerTel:86-0755-6=6828019-815Fax:86-0755-61828970Cellphone:86-138243694=58Skype:ivan-multechE-mail:overseasales at Multech-pcb.comHomepage:=www.multech-pcb.com 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141114/c9132c06/attachment.html>

From fnatter at gmx.net  Sat Nov 15 11:16:25 2014
From: fnatter at gmx.net (Felix Natter)
Date: Sat, 15 Nov 2014 12:16:25 +0100
Subject: Bug#769658: pavucontrol displays some (svg?) application icons in
 huge size
Message-ID: <87egt4sohi.fsf@bitburger.home.felix>


Package: pavucontrol
Version: 2.0-3
Severity: important

Dear Maintainer,

there is a problem with GTK 3.14 in jessie which results in some [1] (svg?)
application icons in pavucontrol being displayed in huge size which also
affects pavucontrol, see:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765069#49
(tested with jessie from 2014-11-08)

[1] i.e. scummvm

debian-gtk-gnome at lists.debian.org told me to file a bug against each
application that shows this issue:

> Apparently this was an intentional change in GTK+ 3.14, see
> 
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765069#49
> 
> I haven't looked at the impact of it and whether it's reasonable and
> feasible to revert it for Jessie. For now, it's probably best to file bugs
> for the applications that broke.
>
> Emilio

Thanks and Best Regards,
Felix

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pavucontrol depends on:
ii  libatk1.0-0              2.14.0-1
ii  libatkmm-1.6-1           2.22.7-2.1
ii  libc6                    2.19-12
ii  libcairo-gobject2        1.14.0-2.1
ii  libcairo2                1.14.0-2.1
ii  libcairomm-1.0-1         1.10.0-1.1
ii  libcanberra-gtk3-0       0.30-2.1
ii  libcanberra0             0.30-2.1
ii  libgcc1                  1:4.9.1-19
ii  libgdk-pixbuf2.0-0       2.31.1-2+b1
ii  libglib2.0-0             2.42.0-2
ii  libglibmm-2.4-1c2a       2.42.0-1
ii  libgtk-3-0               3.14.4-1
ii  libgtkmm-3.0-1           3.14.0-1
ii  libpango-1.0-0           1.36.8-2
ii  libpangocairo-1.0-0      1.36.8-2
ii  libpangomm-1.4-1         2.34.0-1.1
ii  libpulse-mainloop-glib0  5.0-13
ii  libpulse0                5.0-13
ii  libsigc++-2.0-0c2a       2.4.0-1
ii  libstdc++6               4.9.1-19
ii  libx11-6                 2:1.6.2-3

Versions of packages pavucontrol recommends:
ii  pulseaudio  5.0-13

pavucontrol suggests no packages.

-- no debconf information

-- 
Felix Natter


From fsateler at debian.org  Mon Nov 17 14:50:15 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Mon, 17 Nov 2014 11:50:15 -0300
Subject: Bug#769658: pavucontrol displays some (svg?) application icons in
 huge size
In-Reply-To: <87egt4sohi.fsf@bitburger.home.felix>
References: <87egt4sohi.fsf@bitburger.home.felix>
Message-ID: <CAAfdZj-E3ohUXbp9C+4MAcvUQ-kCsqq+8N86HGGy0xuLJcCg8g@mail.gmail.com>

Control: forwarded -1 https://bugs.freedesktop.org/show_bug.cgi?id=86398
Control: tags -1 confirmed upstream

Hi Felix,

On Sat, Nov 15, 2014 at 8:16 AM, Felix Natter <fnatter at gmx.net> wrote:
>
> Package: pavucontrol
> Version: 2.0-3
> Severity: important
>
> Dear Maintainer,
>
> there is a problem with GTK 3.14 in jessie which results in some [1] (svg?)
> application icons in pavucontrol being displayed in huge size which also
> affects pavucontrol, see:
>   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765069#49
> (tested with jessie from 2014-11-08)

Thanks for reporting this. I confirm this is present in both debian
and upstream git. I have forwarded the bug to the above url.

-- 

Saludos,
Felipe Sateler


From owner at bugs.debian.org  Mon Nov 17 14:54:07 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Mon, 17 Nov 2014 14:54:07 +0000
Subject: Processed: Re: Bug#769658: pavucontrol displays some (svg?)
 application icons in huge size
References: <CAAfdZj-E3ohUXbp9C+4MAcvUQ-kCsqq+8N86HGGy0xuLJcCg8g@mail.gmail.com>
 <87egt4sohi.fsf@bitburger.home.felix>
Message-ID: <handler.s.B769658.14162358654978.transcript@bugs.debian.org>

Processing control commands:

> forwarded -1 https://bugs.freedesktop.org/show_bug.cgi?id=86398
Bug #769658 [pavucontrol] pavucontrol displays some (svg?) application icons in huge size
Set Bug forwarded-to-address to 'https://bugs.freedesktop.org/show_bug.cgi?id=86398'.
> tags -1 confirmed upstream
Bug #769658 [pavucontrol] pavucontrol displays some (svg?) application icons in huge size
Added tag(s) upstream and confirmed.

-- 
769658: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769658
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From samuelbernardo.mail at gmail.com  Tue Nov 18 03:52:49 2014
From: samuelbernardo.mail at gmail.com (Samuel Bernardo)
Date: Tue, 18 Nov 2014 03:52:49 +0000
Subject: Bug#521675: pulseaudio: Failed to create secure directory
 (/run/user/1000/pulse): Permission denied
Message-ID: <20141118035249.7447.15639.reportbug@atomn550.casa.local>

Package: pulseaudio
Version: 5.0-13
Followup-For: Bug #521675

Dear Maintainer,

*** Reporter, please consider answering these questions, where appropriate ***

   * What led up to the situation?
Trying to use pulseaudio.
I follow the next guides to try to configure it out:
http://en.wikibooks.org/wiki/Configuring_Sound_on_Linux/Pulse_Audio/Testing
https://wiki.debian.org/PulseAudio
https://wiki.archlinux.org/index.php/Advanced_Linux_Sound_Architecture

   * What exactly did you do (or not do) that was effective (or
     ineffective)?
before changing owner of /run/user/1000/pulse from root to user it gives when running pacat
Failed to create secure directory (/run/user/1000/pulse): Permission denied
Connection failure: Connection refused
pa_context_connect() failed: Connection refused

When I manually change owner to local user I continue to reveive the following message:
Connection failure: Connection refused

Using pacmd it returns:
Daemon not responding.

When using xfreerdp with audio, microphone and multimedia options it returns the following messages:
Loading Dynamic Virtual Channel audin
Warning rdpsnd_pulse_connect (115): bad context state (6)
Warning freerdp_rdpsnd_client_subsystem_entry (619): rdpsnd_pulse_connect failed
Warning rdpsnd_load_device_plugin (548): pulse entry returns error.
Warning audin_pulse_connect (117): bad context state (6)
Warning audin_load_device_plugin (461): pulse entry returns error.
Loading Dynamic Virtual Channel tsmf

With alsa I can ear sound and it seems to be working everything ok.

In debian systemd I didn't found pulseaudio service, so I started daemon manually and finished it as mentioned in the guides I pointed above.

I realise that is missing updated documentation for pulse audio configuration for debian.

*** End of the template - remove these template lines ***


-- Package-specific info:

-- System Information:
Debian Release: Kali Linux 1.0.9
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pulseaudio depends on:
ii  adduser                       3.113+nmu3
ii  libasound2                    1.0.28-1
ii  libasound2-plugins            1.0.28-1+b1
ii  libc6                         2.19-13
ii  libcap2                       1:2.24-6
ii  libdbus-1-3                   1.8.10-1
ii  libfftw3-single3              3.3.4-1.1
ii  libgcc1                       1:4.9.2-1
ii  libice6                       2:1.0.9-1
ii  libltdl7                      2.4.2-1.11
ii  liborc-0.4-0                  1:0.4.22-1
ii  libpulse0                     5.0-13
ii  libsamplerate0                0.1.8-8
ii  libsm6                        2:1.2.2-1
ii  libsndfile1                   1.0.25-9+b1
ii  libspeexdsp1                  1.2~rc1.2-1
ii  libstdc++6                    4.9.2-1
ii  libsystemd0                   215-5+b1
ii  libtdb1                       1.3.1-1
ii  libudev1                      215-5+b1
ii  libwebrtc-audio-processing-0  0.1-3
ii  libx11-6                      2:1.6.2-3
ii  libx11-xcb1                   2:1.6.2-3
ii  libxcb1                       1.10-3+b1
ii  libxtst6                      2:1.2.2-1+b1
ii  lsb-base                      4.1+Debian13+nmu1
ii  pulseaudio-utils              5.0-13
ii  udev                          215-5+b1

Versions of packages pulseaudio recommends:
ii  pulseaudio-module-x11  5.0-13
ii  rtkit                  0.11-2

Versions of packages pulseaudio suggests:
ii  paman        0.9.4-1
ii  paprefs      0.9.10-1
ii  pavucontrol  2.0-3
ii  pavumeter    0.9.3-4

-- Configuration Files:
/etc/pulse/daemon.conf changed:
daemonize = yes
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
system-instance = yes
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no
; high-priority = yes
; nice-level = -11
; realtime-scheduling = yes
; realtime-priority = 5
; exit-idle-time = 20
; scache-idle-time = 20
; dl-search-path = (depends on architecture)
; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa
; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no
; flat-volumes = yes
; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000
; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right
; default-fragments = 4
; default-fragment-size-msec = 25
; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0

/etc/pulse/default.pa changed:
..nofail
..fail
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore
load-module module-augment-properties
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
load-module module-detect
..endif
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif
..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif
load-module module-default-device-restore
load-module module-rescue-streams
load-module module-always-sink
load-module module-intended-roles
load-module module-suspend-on-idle
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif
load-module module-position-event-sounds
load-module module-role-cork
load-module module-filter-heuristics
load-module module-filter-apply


-- no debconf information
-------------- next part --------------
PULSEAUDIO_SYSTEM_START=1
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; default-sink =
; default-source =
; default-server =
; default-dbus-server =

; autospawn = yes
; daemon-binary = /usr/bin/pulseaudio
; extra-arguments = --log-target=syslog

; cookie-file =

; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB

; auto-connect-localhost = no
; auto-connect-display = no
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

daemonize = yes
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
system-instance = yes
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no

; high-priority = yes
; nice-level = -11

; realtime-scheduling = yes
; realtime-priority = 5

; exit-idle-time = 20
; scache-idle-time = 20

; dl-search-path = (depends on architecture)

; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa

; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0

# resample-method defaults to  speex-float-1 on most architectures,
# speex-fixed-1 on ARM
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no

; flat-volumes = yes

; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000

; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right

; default-fragments = 4
; default-fragment-size-msec = 25

; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)

..nofail

### Load something into the sample cache
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav

..fail

### Automatically restore the volume of streams and devices
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore

### Automatically augment property information from .desktop files
### stored in /usr/share/application
load-module module-augment-properties

### Should be after module-*-restore but before module-*-detect
#load-module module-switch-on-port-available

### Load audio drivers statically
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#load-module module-null-sink
#load-module module-pipe-sink

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
### Use the static hardware detection module (for systems that lack udev support)
load-module module-detect
..endif

### Automatically connect sink and source if JACK server is present
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif

### Automatically load driver modules for Bluetooth hardware
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif

..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish

### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv

### Load the RTP sender module (also configured via paprefs, see above)
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor

### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Honour intended role device property
load-module module-intended-roles

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif

### Enable positioned event sounds
load-module module-position-event-sounds

### Cork music/video streams when a phone stream is active
load-module module-role-cork

### Modules to allow autoloading of filters (such as echo cancellation)
### on demand. module-filter-heuristics tries to determine what filters
### make sense, and module-filter-apply does the heavy-lifting of
### loading modules and rerouting streams.
load-module module-filter-heuristics
load-module module-filter-apply

# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.

### Load X11 bell module
#load-module module-x11-bell sample=bell-windowing-system

### Register ourselves in the X11 session manager
#load-module module-x11-xsmp

### Publish connection data in the X11 root window
#.ifexists module-x11-publish.so
#.nofail
#load-module module-x11-publish
#.fail
#.endif

### Make some devices default
#set-default-sink output
#set-default-source input
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started in system
# mode.

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Automatically restore the volume of streams and devices
load-module module-stream-restore
load-module module-device-restore

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### Enable positioned event sounds
load-module module-position-event-sounds

From fsateler at debian.org  Tue Nov 18 14:10:03 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Tue, 18 Nov 2014 11:10:03 -0300
Subject: Bug#521675: pulseaudio: Failed to create secure directory
 (/run/user/1000/pulse): Permission denied
In-Reply-To: <20141118035249.7447.15639.reportbug@atomn550.casa.local>
References: <20141118035249.7447.15639.reportbug@atomn550.casa.local>
Message-ID: <CAAfdZj8G3tm0=91t__11JOwBFBHQ+tzncQa1qSnvVRae6iJCaA@mail.gmail.com>

Hi Samuel,

On Tue, Nov 18, 2014 at 12:52 AM, Samuel Bernardo
<samuelbernardo.mail at gmail.com> wrote:
> Package: pulseaudio
> Version: 5.0-13
> Followup-For: Bug #521675
>
> Dear Maintainer,
>
> *** Reporter, please consider answering these questions, where appropriate ***
>
>    * What led up to the situation?
> Trying to use pulseaudio.
> I follow the next guides to try to configure it out:
> http://en.wikibooks.org/wiki/Configuring_Sound_on_Linux/Pulse_Audio/Testing
> https://wiki.debian.org/PulseAudio
> https://wiki.archlinux.org/index.php/Advanced_Linux_Sound_Architecture
>
>    * What exactly did you do (or not do) that was effective (or
>      ineffective)?
> before changing owner of /run/user/1000/pulse from root to user it gives when running pacat
> Failed to create secure directory (/run/user/1000/pulse): Permission denied
> Connection failure: Connection refused
> pa_context_connect() failed: Connection refused
>
> When I manually change owner to local user I continue to reveive the following message:
> Connection failure: Connection refused
>
> Using pacmd it returns:
> Daemon not responding.
>
> When using xfreerdp with audio, microphone and multimedia options it returns the following messages:
> Loading Dynamic Virtual Channel audin
> Warning rdpsnd_pulse_connect (115): bad context state (6)
> Warning freerdp_rdpsnd_client_subsystem_entry (619): rdpsnd_pulse_connect failed
> Warning rdpsnd_load_device_plugin (548): pulse entry returns error.
> Warning audin_pulse_connect (117): bad context state (6)
> Warning audin_load_device_plugin (461): pulse entry returns error.
> Loading Dynamic Virtual Channel tsmf
>
> With alsa I can ear sound and it seems to be working everything ok.

Please open a new bug, as this is unrelated to this one. And please
disable system mode (remove /etc/init.d/pulseaudio and
/etc/default/pulseaudio), as pulseaudio is better run as user before
doing so. Pulseaudio should work without configuration.

>
> In debian systemd I didn't found pulseaudio service, so I started daemon manually and finished it as mentioned in the guides I pointed above.

There is no systemd pulseaudio service because it should run as a user
service not a system one.

>
> I realise that is missing updated documentation for pulse audio configuration for debian.

Maybe. But pulseaudio should work by just installing it and not
touching anything.

-- 

Saludos,
Felipe Sateler


From samuelbernardo.mail at gmail.com  Tue Nov 18 20:50:08 2014
From: samuelbernardo.mail at gmail.com (Samuel Bernardo)
Date: Tue, 18 Nov 2014 20:50:08 +0000
Subject: Bug#770093: pulseaudio: Failed to create secure directory
 (/run/user/1000/pulse): Permission denied
Message-ID: <20141118205008.11342.30441.reportbug@atomn550.casa.local>

Package: pulseaudio
Version: 5.0-13
Severity: important

Dear Maintainer,

*** Reporter, please consider answering these questions, where appropriate ***

   * What led up to the situation?
Trying to use pulseaudio.
I follow the next guides for understand and configure it:
http://en.wikibooks.org/wiki/Configuring_Sound_on_Linux/Pulse_Audio/Testing
https://wiki.debian.org/PulseAudio
https://wiki.archlinux.org/index.php/Advanced_Linux_Sound_Architecture

   * What exactly did you do (or not do) that was effective (or
     ineffective)?
before changing owner of /run/user/1000/pulse from root to user, when running pacat, it gives
Failed to create secure directory (/run/user/1000/pulse): Permission denied
Connection failure: Connection refused
pa_context_connect() failed: Connection refused

When I manually change owner to local user I continue to receive the following message:
Connection failure: Connection refused

Using pacmd it returns:
Daemon not responding.

When using xfreerdp with audio, microphone and multimedia options it returns the following messages:
Loading Dynamic Virtual Channel audin
Warning rdpsnd_pulse_connect (115): bad context state (6)
Warning freerdp_rdpsnd_client_subsystem_entry (619): rdpsnd_pulse_connect failed
Warning rdpsnd_load_device_plugin (548): pulse entry returns error.
Warning audin_pulse_connect (117): bad context state (6)
Warning audin_load_device_plugin (461): pulse entry returns error.
Loading Dynamic Virtual Channel tsmf

With alsa I can ear sound and it seems to be everything working ok.

Following Felipe Sateler I removed /etc/default/pulseaudio, but problem remains.


*** End of the template - remove these template lines ***


-- Package-specific info:
File '/etc/default/pulseaudio' does not exist


-- System Information:
Debian Release: Kali Linux 1.0.9
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pulseaudio depends on:
ii  adduser                       3.113+nmu3
ii  libasound2                    1.0.28-1
ii  libasound2-plugins            1.0.28-1+b1
ii  libc6                         2.19-13
ii  libcap2                       1:2.24-6
ii  libdbus-1-3                   1.8.10-1
ii  libfftw3-single3              3.3.4-1.1
ii  libgcc1                       1:4.9.2-1
ii  libice6                       2:1.0.9-1
ii  libltdl7                      2.4.2-1.11
ii  liborc-0.4-0                  1:0.4.22-1
ii  libpulse0                     5.0-13
ii  libsamplerate0                0.1.8-8
ii  libsm6                        2:1.2.2-1
ii  libsndfile1                   1.0.25-9+b1
ii  libspeexdsp1                  1.2~rc1.2-1
ii  libstdc++6                    4.9.2-1
ii  libsystemd0                   215-5+b1
ii  libtdb1                       1.3.1-1
ii  libudev1                      215-5+b1
ii  libwebrtc-audio-processing-0  0.1-3
ii  libx11-6                      2:1.6.2-3
ii  libx11-xcb1                   2:1.6.2-3
ii  libxcb1                       1.10-3+b1
ii  libxtst6                      2:1.2.2-1+b1
ii  lsb-base                      4.1+Debian13+nmu1
ii  pulseaudio-utils              5.0-13
ii  udev                          215-5+b1

Versions of packages pulseaudio recommends:
ii  pulseaudio-module-x11  5.0-13
ii  rtkit                  0.11-2

Versions of packages pulseaudio suggests:
ii  paman        0.9.4-1
ii  paprefs      0.9.10-1
ii  pavucontrol  2.0-3
ii  pavumeter    0.9.3-4

-- Configuration Files:
/etc/pulse/daemon.conf changed:
daemonize = yes
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
system-instance = yes
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no
; high-priority = yes
; nice-level = -11
; realtime-scheduling = yes
; realtime-priority = 5
; exit-idle-time = 20
; scache-idle-time = 20
; dl-search-path = (depends on architecture)
; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa
; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no
; flat-volumes = yes
; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000
; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right
; default-fragments = 4
; default-fragment-size-msec = 25
; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0

/etc/pulse/default.pa changed:
..nofail
..fail
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore
load-module module-augment-properties
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
load-module module-detect
..endif
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif
..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif
load-module module-default-device-restore
load-module module-rescue-streams
load-module module-always-sink
load-module module-intended-roles
load-module module-suspend-on-idle
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif
load-module module-position-event-sounds
load-module module-role-cork
load-module module-filter-heuristics
load-module module-filter-apply


-- no debconf information
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; default-sink =
; default-source =
; default-server =
; default-dbus-server =

; autospawn = yes
; daemon-binary = /usr/bin/pulseaudio
; extra-arguments = --log-target=syslog

; cookie-file =

; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB

; auto-connect-localhost = no
; auto-connect-display = no
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

daemonize = yes
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
system-instance = yes
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no

; high-priority = yes
; nice-level = -11

; realtime-scheduling = yes
; realtime-priority = 5

; exit-idle-time = 20
; scache-idle-time = 20

; dl-search-path = (depends on architecture)

; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa

; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0

# resample-method defaults to  speex-float-1 on most architectures,
# speex-fixed-1 on ARM
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no

; flat-volumes = yes

; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000

; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right

; default-fragments = 4
; default-fragment-size-msec = 25

; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)

..nofail

### Load something into the sample cache
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav

..fail

### Automatically restore the volume of streams and devices
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore

### Automatically augment property information from .desktop files
### stored in /usr/share/application
load-module module-augment-properties

### Should be after module-*-restore but before module-*-detect
#load-module module-switch-on-port-available

### Load audio drivers statically
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#load-module module-null-sink
#load-module module-pipe-sink

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
### Use the static hardware detection module (for systems that lack udev support)
load-module module-detect
..endif

### Automatically connect sink and source if JACK server is present
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif

### Automatically load driver modules for Bluetooth hardware
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif

..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish

### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv

### Load the RTP sender module (also configured via paprefs, see above)
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor

### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Honour intended role device property
load-module module-intended-roles

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif

### Enable positioned event sounds
load-module module-position-event-sounds

### Cork music/video streams when a phone stream is active
load-module module-role-cork

### Modules to allow autoloading of filters (such as echo cancellation)
### on demand. module-filter-heuristics tries to determine what filters
### make sense, and module-filter-apply does the heavy-lifting of
### loading modules and rerouting streams.
load-module module-filter-heuristics
load-module module-filter-apply

# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.

### Load X11 bell module
#load-module module-x11-bell sample=bell-windowing-system

### Register ourselves in the X11 session manager
#load-module module-x11-xsmp

### Publish connection data in the X11 root window
#.ifexists module-x11-publish.so
#.nofail
#load-module module-x11-publish
#.fail
#.endif

### Make some devices default
#set-default-sink output
#set-default-source input
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started in system
# mode.

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Automatically restore the volume of streams and devices
load-module module-stream-restore
load-module module-device-restore

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### Enable positioned event sounds
load-module module-position-event-sounds

From owner at bugs.debian.org  Tue Nov 18 21:21:10 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Tue, 18 Nov 2014 21:21:10 +0000
Subject: Processed: Re: Bug#770093: pulseaudio: Failed to create secure
 directory (/run/user/1000/pulse): Permission denied
References: <CAAfdZj_5hJeRKLyW_hp65YuC67zffqe7CCQd42un3W3ObknUng@mail.gmail.com>
 <20141118205008.11342.30441.reportbug@atomn550.casa.local>
Message-ID: <handler.s.B770093.141634554512047.transcript@bugs.debian.org>

Processing control commands:

> tag -1 moreinfo
Bug #770093 [pulseaudio] pulseaudio: Failed to create secure directory (/run/user/1000/pulse): Permission denied
Added tag(s) moreinfo.

-- 
770093: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770093
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From fsateler at debian.org  Tue Nov 18 21:18:17 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Tue, 18 Nov 2014 18:18:17 -0300
Subject: Bug#770093: pulseaudio: Failed to create secure directory
 (/run/user/1000/pulse): Permission denied
In-Reply-To: <20141118205008.11342.30441.reportbug@atomn550.casa.local>
References: <20141118205008.11342.30441.reportbug@atomn550.casa.local>
Message-ID: <CAAfdZj_5hJeRKLyW_hp65YuC67zffqe7CCQd42un3W3ObknUng@mail.gmail.com>

Control: tag -1 moreinfo

Hi,

On Tue, Nov 18, 2014 at 5:50 PM, Samuel Bernardo
<samuelbernardo.mail at gmail.com> wrote:
> Package: pulseaudio
> Version: 5.0-13
> Severity: important
>
> Dear Maintainer,
>
> *** Reporter, please consider answering these questions, where appropriate ***
>
>    * What led up to the situation?
> Trying to use pulseaudio.
> I follow the next guides for understand and configure it:
> http://en.wikibooks.org/wiki/Configuring_Sound_on_Linux/Pulse_Audio/Testing
> https://wiki.debian.org/PulseAudio

Did you do the dpkg-divert section of this page? If so, please undo
that (hmm, that part should probably be removed or at least warn
against doing that...).

> https://wiki.archlinux.org/index.php/Advanced_Linux_Sound_Architecture
>
>    * What exactly did you do (or not do) that was effective (or
>      ineffective)?
> before changing owner of /run/user/1000/pulse from root to user, when running pacat, it gives
> Failed to create secure directory (/run/user/1000/pulse): Permission denied
> Connection failure: Connection refused
> pa_context_connect() failed: Connection refused
>
> When I manually change owner to local user I continue to receive the following message:
> Connection failure: Connection refused
>
> Using pacmd it returns:
> Daemon not responding.
>
> When using xfreerdp with audio, microphone and multimedia options it returns the following messages:
> Loading Dynamic Virtual Channel audin
> Warning rdpsnd_pulse_connect (115): bad context state (6)
> Warning freerdp_rdpsnd_client_subsystem_entry (619): rdpsnd_pulse_connect failed
> Warning rdpsnd_load_device_plugin (548): pulse entry returns error.
> Warning audin_pulse_connect (117): bad context state (6)
> Warning audin_load_device_plugin (461): pulse entry returns error.
> Loading Dynamic Virtual Channel tsmf
>
> With alsa I can ear sound and it seems to be everything working ok.
>
> Following Felipe Sateler I removed /etc/default/pulseaudio, but problem remains.

Thanks for opening a new bug. I see something more:

> -- Configuration Files:
> /etc/pulse/daemon.conf changed:
> daemonize = yes
> ; fail = yes
> ; allow-module-loading = yes
> ; allow-exit = yes
> ; use-pid-file = yes
> system-instance = yes

Please set this to no. Then please kill all pulseaudio instances, and
try running pulseaudio:

$ pulseaudio -vvvv

And if it doesn't work please attach the output of pulseaudio here.


-- 

Saludos,
Felipe Sateler


From samuelbernardo.mail at gmail.com  Wed Nov 19 00:44:15 2014
From: samuelbernardo.mail at gmail.com (Samuel Bernardo)
Date: Wed, 19 Nov 2014 00:44:15 +0000
Subject: Bug#770093: pulseaudio: Failed to create secure directory
 (/run/user/1000/pulse): Permission denied
In-Reply-To: <CAAfdZj_5hJeRKLyW_hp65YuC67zffqe7CCQd42un3W3ObknUng@mail.gmail.com>
References: <20141118205008.11342.30441.reportbug@atomn550.casa.local>
 <CAAfdZj_5hJeRKLyW_hp65YuC67zffqe7CCQd42un3W3ObknUng@mail.gmail.com>
Message-ID: <546BE7DF.7090800@gmail.com>

On 18-11-2014 21:18, Felipe Sateler wrote:
> Hi,

Hi,

> 
>>
>> Following Felipe Sateler I removed /etc/default/pulseaudio, but problem remains.
> 
> Thanks for opening a new bug. I see something more:
> 
>> -- Configuration Files:
>> /etc/pulse/daemon.conf changed:
>> daemonize = yes
>> ; fail = yes
>> ; allow-module-loading = yes
>> ; allow-exit = yes
>> ; use-pid-file = yes
>> system-instance = yes
> 
> Please set this to no. Then please kill all pulseaudio instances, and
> try running pulseaudio:
> 
> $ pulseaudio -vvvv
> 
> And if it doesn't work please attach the output of pulseaudio here.
> 

Thank you for your help in debugging Felipe Sateler.
I've changed that options and now everything seems to be working fine.

pulseaudio -vvvv was very usefull in debugging.
I found another problem that is modules not being loaded for my eeepc
1015pn.

I don't understand why having the necessary modules in /etc/modules it
didn't load them as expected:
/etc/modules
loop
snd-hda-intel
snd-pcm-oss
snd-mixer-oss

I read that snd- is ommited in loaded modules, but I didn't read nothing
about removing snd- when adding to modules file.
I'll open another bug report about this if I continue not to find a
solution.

Thanks,
Samuel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141119/31bfaeac/attachment.sig>

From owner at bugs.debian.org  Wed Nov 19 01:45:10 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Wed, 19 Nov 2014 01:45:10 +0000
Subject: Bug#770093: marked as done (pulseaudio: Failed to create secure
 directory (/run/user/1000/pulse): Permission denied)
References: <CAAfdZj-O8TE992fDSJ52fiM3YLFW7E8JPonebkRDvSfpaE4UBA@mail.gmail.com>
 <20141118205008.11342.30441.reportbug@atomn550.casa.local>
Message-ID: <handler.770093.D770093.141636127318590.ackdone@bugs.debian.org>

Your message dated Tue, 18 Nov 2014 22:40:26 -0300
with message-id <CAAfdZj-O8TE992fDSJ52fiM3YLFW7E8JPonebkRDvSfpaE4UBA at mail.gmail.com>
and subject line Re: Bug#770093: pulseaudio: Failed to create secure directory (/run/user/1000/pulse): Permission denied
has caused the Debian Bug report #770093,
regarding pulseaudio: Failed to create secure directory (/run/user/1000/pulse): Permission denied
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner at bugs.debian.org
immediately.)


-- 
770093: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770093
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems
-------------- next part --------------
An embedded message was scrubbed...
From: Samuel Bernardo <samuelbernardo.mail at gmail.com>
Subject: pulseaudio: Failed to create secure directory (/run/user/1000/pulse): Permission denied
Date: Tue, 18 Nov 2014 20:50:08 +0000
Size: 20535
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141119/9110259f/attachment-0002.mht>
-------------- next part --------------
An embedded message was scrubbed...
From: Felipe Sateler <fsateler at debian.org>
Subject: Re: Bug#770093: pulseaudio: Failed to create secure directory (/run/user/1000/pulse): Permission denied
Date: Tue, 18 Nov 2014 22:40:26 -0300
Size: 4147
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141119/9110259f/attachment-0003.mht>

From norman at optimalbliss.de  Wed Nov 19 10:38:08 2014
From: norman at optimalbliss.de (Norman)
Date: Wed, 19 Nov 2014 11:38:08 +0100
Subject: Bug#770167: Pulseaudio/Alsa-sink crashes Thinkpad T400 when plugged
 into Thinkdoch
In-Reply-To: <546C7187.1080809@optimalbliss.de>
References: <546C7187.1080809@optimalbliss.de>
Message-ID: <546C7310.4020000@optimalbliss.de>

Package: pulseaudio

Seemingly randomly, when I play music and then plug my Thinkpad T400
into a ThinkDock, the system stucks and repeats the last second again
and again, also, nothing is usable anymore. The mouse cannot move, the
keyboard does not accept anything anymore and the only solution is to
restart the whole pc. With that, something data loss occured.

Today, the first time, the system recovered from this bug after a few
minutes and I had the chance to look into the logs. The suspicious lines
are shown here:

> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> snd_pcm_delay() gibt einen Wert zur?ck, der ausserordentlich gross
> ist: -3521584 bytes (-19963 ms). Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c: Dies ist wahrscheinlich
> ein Fehler im ALSA-Treiber 'snd_hda_intel'. Bitte melden Sie dieses
> Problem den ALSA-Entwicklern. Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c: snd_pcm_dump(): Nov 19
> 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: Soft
> volume PCM Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink]
> alsa-util.c: Control: PCM Playback Volume Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c: min_dB: -51 Nov 19
> 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: max_dB:
> 0 Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> resolution: 256 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c: Its setup is: Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   stream       :
> PLAYBACK Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink]
> alsa-util.c:   access       : MMAP_INTERLEAVED Nov 19 10:49:52
> norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   format       :
> S16_LE Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink]
> alsa-util.c:   subformat    : STD Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   channels     : 2 Nov
> 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> rate         : 44100 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   exact rate   : 44100 (44100/1) Nov 19
> 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   msbits
> : 16 Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink]
> alsa-util.c:   buffer_size  : 16384 Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_size  : 8192
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> period_time  : 185759 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   tstamp_mode  : ENABLE Nov 19 10:49:52
> norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_step  :
> 1 Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> avail_min    : 15503 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   period_event : 0 Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   start_threshold  : -1
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> stop_threshold   : 4611686018427387904 Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   silence_threshold: 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> silence_size : 0 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   boundary     : 4611686018427387904 Nov
> 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> Slave: Hardware PCM card 0 'HDA Intel' device 0 subdevice 0 Nov 19
> 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: Its
> setup is: Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink]
> alsa-util.c:   stream       : PLAYBACK Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   access       :
> MMAP_INTERLEAVED Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   format       : S16_LE Nov 19 10:49:52
> norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   subformat    :
> STD Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink]
> alsa-util.c:   channels     : 2 Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   rate         : 44100
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> exact rate   : 44100 (44100/1) Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   msbits       : 16 Nov
> 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> buffer_size  : 16384 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   period_size  : 8192 Nov 19 10:49:52
> norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_time  :
> 185759 Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink]
> alsa-util.c:   tstamp_mode  : ENABLE Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_step  : 1 Nov
> 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> avail_min    : 15503 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   period_event : 0 Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   start_threshold  : -1
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> stop_threshold   : 4611686018427387904 Nov 19 10:49:52 norman
> pulseaudio[3897]: [alsa-sink] alsa-util.c:   silence_threshold: 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> silence_size : 0 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   boundary     : 4611686018427387904 Nov
> 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:
> appl_ptr     : 745172 Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-util.c:   hw_ptr       : 1625568 Nov 19 10:49:52
> norman pulseaudio[3897]: [alsa-sink] alsa-sink.c: ALSA weckte uns
> auf, um neue Daten auf das Ger?t zu schreiben, doch es gab nichts
> zum Schreiben! Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink]
> alsa-sink.c: Dies ist h?chstwahrscheinlich ein Fehler im
> ALSA-Treiber 'snd_hda_intel'. Bitte melden Sie diesen Fehler den
> ALSA-Entwicklern. Nov 19 10:49:52 norman pulseaudio[3897]:
> [alsa-sink] alsa-sink.c: Wir wurden durch das POLLOUT-Set geweckt,
> allerdings lieferte ein anschliessender snd_pcm_avail() den Wert 0
> oder einen anderen Wert < min_avail.


Though I cannot state for sure that this is what occurs when the system
totally crashes, it seems likely to me (but then again I have no clue
why it recovered from that this time).

I am using Debian 7, which has all updates installed installed and I
have a Thinkpad T400, using the amd64-Version of Debian 7.

> ii  alsa-base
> 1.0.25+3~deb7u1                    all          ALSA driver
> configuration files ii  alsa-utils
> 1.0.25-4                           amd64        Utilities for
> configuring and using ALSA ii  bluez-alsa:amd64
> 4.99-2                             amd64        Bluetooth ALSA
> support ii  libsox-fmt-alsa
> 14.4.0-3                           amd64        SoX alsa format I/O
> library ii  libwine-alsa:i386
> 1.4.1-4                            i386         Windows API
> implementation - ALSA sound module ii
> gstreamer0.10-pulseaudio:amd64
> 0.10.31-3+nmu1                     amd64        GStreamer plugin
> for PulseAudio ii  libcanberra-pulse:amd64
> 0.28-6                             amd64        PulseAudio backend
> for libcanberra ii  libpulse-mainloop-glib0:amd64
> 2.0-6.1                            amd64        PulseAudio client
> libraries (glib support) ii  libpulse0:amd64
> 2.0-6.1                            amd64        PulseAudio client
> libraries ii  libpulse0:i386
> 2.0-6.1                            i386         PulseAudio client
> libraries ii  pulseaudio
> 2.0-6.1                            amd64        PulseAudio sound
> server ii  pulseaudio-module-x11
> 2.0-6.1                            amd64        X11 module for
> PulseAudio sound server ii  pulseaudio-utils
> 2.0-6.1                            amd64        Command line tools
> for the PulseAudio sound server ii  vlc-plugin-pulse
> 2.0.3-5+deb7u1                     amd64        PulseAudio plugin
> for VLC

I am not sure which of these packages are responsible, so I post
everything which is somehow related to alsa or pulseaudio.

And: usually I play the music with Iceweasel,

> ii  iceweasel
> 31.2.0esr-3~deb7u1                 amd64        Web browser based
> on Firefox ii  iceweasel-l10n-de
> 1:31.2.0esr-3~deb7u1               all          German language
> package for Iceweasel

as mp4-file with the html5-video-tag, but the same occurs when it's
played with flash-player
> ii  flashplugin-nonfree
> 1:3.2+wheezy1                      amd64        Adobe Flash Player
> - browser plugin


From norman at optimalbliss.de  Wed Nov 19 10:45:14 2014
From: norman at optimalbliss.de (Norman)
Date: Wed, 19 Nov 2014 11:45:14 +0100
Subject: Bug#770167: Fwd: Pulseaudio/Alsa-sink crashes Thinkpad T400 when
 plugged into Thinkdoch
In-Reply-To: <546C6EB8.7060400@optimalbliss.de>
References: <546C6EB8.7060400@optimalbliss.de>
Message-ID: <546C74BA.6030500@optimalbliss.de>

I am sorry for the ugly wrapped lines. Thunderbird did that just before
sending. For that, I am trying to send it again with mail.wrap_long_lines
disabled in thunderbird.

> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: snd_pcm_delay() gibt einen Wert zur?ck, der ausserordentlich gross ist: -3521584 bytes (-19963 ms).
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: Dies ist wahrscheinlich ein Fehler im ALSA-Treiber 'snd_hda_intel'. Bitte melden Sie dieses Problem den ALSA-Entwicklern.
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: snd_pcm_dump():
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: Soft volume PCM
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: Control: PCM Playback Volume
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: min_dB: -51
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: max_dB: 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: resolution: 256
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: Its setup is:
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   stream       : PLAYBACK
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   access       : MMAP_INTERLEAVED
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   format       : S16_LE
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   subformat    : STD
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   channels     : 2
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   rate         : 44100
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   exact rate   : 44100 (44100/1)
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   msbits       : 16
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   buffer_size  : 16384
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_size  : 8192
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_time  : 185759
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   tstamp_mode  : ENABLE
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_step  : 1
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   avail_min    : 15503
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_event : 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   start_threshold  : -1
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   stop_threshold   : 4611686018427387904
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   silence_threshold: 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   silence_size : 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   boundary     : 4611686018427387904
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: Slave: Hardware PCM card 0 'HDA Intel' device 0 subdevice 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c: Its setup is:
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   stream       : PLAYBACK
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   access       : MMAP_INTERLEAVED
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   format       : S16_LE
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   subformat    : STD
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   channels     : 2
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   rate         : 44100
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   exact rate   : 44100 (44100/1)
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   msbits       : 16
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   buffer_size  : 16384
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_size  : 8192
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_time  : 185759
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   tstamp_mode  : ENABLE
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_step  : 1
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   avail_min    : 15503
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   period_event : 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   start_threshold  : -1
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   stop_threshold   : 4611686018427387904
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   silence_threshold: 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   silence_size : 0
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   boundary     : 4611686018427387904
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   appl_ptr     : 745172
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-util.c:   hw_ptr       : 1625568
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-sink.c: ALSA weckte uns auf, um neue Daten auf das Ger?t zu schreiben, doch es gab nichts zum Schreiben!
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-sink.c: Dies ist h?chstwahrscheinlich ein Fehler im ALSA-Treiber 'snd_hda_intel'. Bitte melden Sie diesen Fehler den ALSA-Entwicklern.
> Nov 19 10:49:52 norman pulseaudio[3897]: [alsa-sink] alsa-sink.c: Wir wurden durch das POLLOUT-Set geweckt, allerdings lieferte ein anschliessender snd_pcm_avail() den Wert 0 oder einen anderen Wert < min_avail.


Though I cannot state for sure that this is what occurs when the system
totally crashes, it seems likely to me (but then again I have no clue
why it recovered from that this time).

I am using Debian 7, which has all updates installed installed and I
have a Thinkpad T400, using the amd64-Version of Debian 7.

> ii  alsa-base                                                   1.0.25+3~deb7u1                    all          ALSA driver configuration files
> ii  alsa-utils                                                  1.0.25-4                           amd64        Utilities for configuring and using ALSA
> ii  bluez-alsa:amd64                                            4.99-2                             amd64        Bluetooth ALSA support
> ii  libsox-fmt-alsa                                             14.4.0-3                           amd64        SoX alsa format I/O library
> ii  libwine-alsa:i386                                           1.4.1-4                            i386         Windows API implementation - ALSA sound module
> ii  gstreamer0.10-pulseaudio:amd64                              0.10.31-3+nmu1                     amd64        GStreamer plugin for PulseAudio
> ii  libcanberra-pulse:amd64                                     0.28-6                             amd64        PulseAudio backend for libcanberra
> ii  libpulse-mainloop-glib0:amd64                               2.0-6.1                            amd64        PulseAudio client libraries (glib support)
> ii  libpulse0:amd64                                             2.0-6.1                            amd64        PulseAudio client libraries
> ii  libpulse0:i386                                              2.0-6.1                            i386         PulseAudio client libraries
> ii  pulseaudio                                                  2.0-6.1                            amd64        PulseAudio sound server
> ii  pulseaudio-module-x11                                       2.0-6.1                            amd64        X11 module for PulseAudio sound server
> ii  pulseaudio-utils                                            2.0-6.1                            amd64        Command line tools for the PulseAudio sound server
> ii  vlc-plugin-pulse                                            2.0.3-5+deb7u1                     amd64        PulseAudio plugin for VLC

I am not sure which of these packages are responsible, so I post
everything which is somehow related to alsa or pulseaudio.

And: usually I play the music with Iceweasel,

> ii  iceweasel                                                   31.2.0esr-3~deb7u1                 amd64        Web browser based on Firefox
> ii  iceweasel-l10n-de                                           1:31.2.0esr-3~deb7u1               all          German language package for Iceweasel

as mp4-file with the html5-video-tag, but the same occurs when it's
played with flash-player
> ii  flashplugin-nonfree                                         1:3.2+wheezy1                      amd64        Adobe Flash Player - browser plugin


From owner at bugs.debian.org  Wed Nov 19 18:27:09 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Wed, 19 Nov 2014 18:27:09 +0000
Subject: Bug#770167: marked as done (Pulseaudio/Alsa-sink crashes Thinkpad
 T400 when plugged into Thinkdoch)
References: <CAAfdZj8tSOibpwFcXmd7ZtZEHJ8BbE2+yK9+8_+k2pXv0P=s3A@mail.gmail.com>
 <546C7310.4020000@optimalbliss.de>
Message-ID: <handler.770167.D770167.14164213248503.ackdone@bugs.debian.org>

Your message dated Wed, 19 Nov 2014 15:21:17 -0300
with message-id <CAAfdZj8tSOibpwFcXmd7ZtZEHJ8BbE2+yK9+8_+k2pXv0P=s3A at mail.gmail.com>
and subject line Re: Bug#770167: Pulseaudio/Alsa-sink crashes Thinkpad T400 when plugged into Thinkdoch
has caused the Debian Bug report #770167,
regarding Pulseaudio/Alsa-sink crashes Thinkpad T400 when plugged into Thinkdoch
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner at bugs.debian.org
immediately.)


-- 
770167: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770167
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems
-------------- next part --------------
An embedded message was scrubbed...
From: Norman <norman at optimalbliss.de>
Subject: Pulseaudio/Alsa-sink crashes Thinkpad T400 when plugged into Thinkdoch
Date: Wed, 19 Nov 2014 11:38:08 +0100
Size: 10287
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141119/b8244184/attachment-0002.mht>
-------------- next part --------------
An embedded message was scrubbed...
From: Felipe Sateler <fsateler at debian.org>
Subject: Re: Bug#770167: Pulseaudio/Alsa-sink crashes Thinkpad T400 when plugged into Thinkdoch
Date: Wed, 19 Nov 2014 15:21:17 -0300
Size: 12311
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141119/b8244184/attachment-0003.mht>

From wilson_willa at yahoo.in  Wed Nov 19 22:03:53 2014
From: wilson_willa at yahoo.in (Mr Wilson Willa)
Date: Thu, 20 Nov 2014 04:03:53 +0600 (BDT)
Subject: THE FIRST $5000.00 WAS SENT TODAY
Message-ID: <4819.196.46.245.135.1416434633.squirrel@mail.promotex-bd.com>

Attn: Good day

Your fund of $2.500, 000.00 has been released and the transfer began today
through western union money transfer. So, contact Western Union Director
Dr Kevin Anthony, with your full information to enable them give you
Sender Name, Question and Answer to pick up your First Payment MTCN=
8845-115-202 and ask him what you need to do to enable them activate your
account and renew of your file so that you will be able to pick up your
first payment $5000 per day until total funds 2.5millions is finish.

Your Receiver name--------------
You?re Country--------------------
You?re City-----------------------
Your Tell-----------------------
You?re Id-------------------------
you're Age-----------------------

Forward the information here ( union.western at barid.com ) Or Call Dr Kevin
Anthony
On tel phone: +229-67377275

Thanks
Mr Wilson Willa



From david.henningsson at canonical.com  Thu Nov 20 07:35:56 2014
From: david.henningsson at canonical.com (David Henningsson)
Date: Thu, 20 Nov 2014 08:35:56 +0100
Subject: [Ubuntu-audio-dev] Preferred resampler method on armhf.
In-Reply-To: <20141117232554.GA22660@acapella>
References: <20141117232554.GA22660@acapella>
Message-ID: <546D99DC.2010604@canonical.com>

Crossposting to Debian and upstream lists.

Apparently Debian has a patch that uses fixed point by default on armhf, 
so I'm just echoing Luke's question here: Has anybody performed any 
testing or benchmarks across armhf hardware, w r t fixed point vs 
floating point resampling with speex and PulseAudio?

Reference:
http://anonscm.debian.org/cgit/pkg-pulseaudio/pulseaudio.git/tree/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch

On 2014-11-18 00:25, Luke Yelavich wrote:
> Hey folks.
> I'm starting to work on merging Ubuntu and Debian packaging for pulseaudio. One of the patches Debian currently has is to use fixed point on all arm flavours they support. The argument given is that float resampling doesn't necessarily perform better than fixed point resampling, even on hard float capable hardware, and sometimes it is worse. here is the blurb taken from the patch:
>
> Switch to use the speex fixed point resampler method by default on ARM.
> Traditionately there wasn't any standard floating point hardware, so for
> those machines it's an obvious choise. On machine using the hardfloat
> ABI floating point still isn't an obvious win over integer performance,
> it's of equal performance on some machines, but slower on others.
>
> Has anybody performed any testing or benchmarks on the hardware we support? Should we just drop this and continue to use floating point resampler code?
>
> Luke
>
> _______________________________________________
> Mailing list: https://launchpad.net/~ubuntu-audio-dev
> Post to     : ubuntu-audio-dev at lists.launchpad.net
> Unsubscribe : https://launchpad.net/~ubuntu-audio-dev
> More help   : https://help.launchpad.net/ListHelp
>

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic


From patrakov at gmail.com  Thu Nov 20 07:40:00 2014
From: patrakov at gmail.com (Alexander E. Patrakov)
Date: Thu, 20 Nov 2014 12:40:00 +0500
Subject: [pulseaudio-discuss] [Ubuntu-audio-dev] Preferred resampler method
 on armhf.
In-Reply-To: <546D99DC.2010604@canonical.com>
References: <20141117232554.GA22660@acapella> <546D99DC.2010604@canonical.com>
Message-ID: <546D9AD0.9000203@gmail.com>

20.11.2014 12:35, David Henningsson wrote:
> Crossposting to Debian and upstream lists.
>
> Apparently Debian has a patch that uses fixed point by default on armhf,
> so I'm just echoing Luke's question here: Has anybody performed any
> testing or benchmarks across armhf hardware, w r t fixed point vs
> floating point resampling with speex and PulseAudio?

That patch has been superseded by this commit:

http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=ac984f59d36ef555bc5b0df9af1cd48193d0d14f

So, if you prefer a fixed-point resampler on armhf (or, for that matter, 
on any other architecture), just compile speex with --enable-fixed-point 
there.

The benchmarking question is still open.

>
> Reference:
> http://anonscm.debian.org/cgit/pkg-pulseaudio/pulseaudio.git/tree/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
>
>
> On 2014-11-18 00:25, Luke Yelavich wrote:
>> Hey folks.
>> I'm starting to work on merging Ubuntu and Debian packaging for
>> pulseaudio. One of the patches Debian currently has is to use fixed
>> point on all arm flavours they support. The argument given is that
>> float resampling doesn't necessarily perform better than fixed point
>> resampling, even on hard float capable hardware, and sometimes it is
>> worse. here is the blurb taken from the patch:
>>
>> Switch to use the speex fixed point resampler method by default on ARM.
>> Traditionately there wasn't any standard floating point hardware, so for
>> those machines it's an obvious choise. On machine using the hardfloat
>> ABI floating point still isn't an obvious win over integer performance,
>> it's of equal performance on some machines, but slower on others.
>>
>> Has anybody performed any testing or benchmarks on the hardware we
>> support? Should we just drop this and continue to use floating point
>> resampler code?
>>
>> Luke
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~ubuntu-audio-dev
>> Post to     : ubuntu-audio-dev at lists.launchpad.net
>> Unsubscribe : https://launchpad.net/~ubuntu-audio-dev
>> More help   : https://help.launchpad.net/ListHelp
>>
>


-- 
Alexander E. Patrakov


From sjoerd at debian.org  Thu Nov 20 08:32:37 2014
From: sjoerd at debian.org (Sjoerd Simons)
Date: Thu, 20 Nov 2014 09:32:37 +0100
Subject: [Ubuntu-audio-dev] Preferred resampler method on armhf.
In-Reply-To: <546D99DC.2010604@canonical.com>
References: <20141117232554.GA22660@acapella> <546D99DC.2010604@canonical.com>
Message-ID: <1416472357.598.1.camel@debian.org>

On Thu, 2014-11-20 at 08:35 +0100, David Henningsson wrote:
> Crossposting to Debian and upstream lists.
> 
> Apparently Debian has a patch that uss16 speex-fixed-3 587738 604034 874023 421630 543090
es fixed point by default on armhf, 
> so I'm just echoing Luke's question here: Has anybody performed any 
> testing or benchmarks across armhf hardware, w r t fixed point vs 
> floating point resampling with speex and PulseAudio?

Yes, obviously i did at the time I made that patch otherwise i would
have been pulling facts out of thin air :p. I do remember discussion it
with Arun on various occasions, probably on IRC.

Unfortunately i can no longer find my numbers, i do remember testing it
on a Feroceon 88FR131 (QNAP TS-119, softfloat), Cortex A8 (i.mx53,
hardfloat) and Cortex A9 (i.mx6, hardfloat). The softfloat results
should be obvious, for hardfloat on one of them the numbers were about
equal while on the other integer was quite a bit faster (but i really
don't remember the way round, it's been a while).

If you're looking at this now i would suggest to redoing the test on
currentish boards (Some tests on cortex A15 and cortex A7 machines would
be great). In case you're happy to rig together a small benchmark i'm
more then happy to run it on my small collection of boards here?

Oh as a side-note, there are NEON patches for speex around but i'm not
sure if those have been merged upstream. I can't see any signs of NEON
support in the Debain speex package on a quick skim at least.

> On 2014-11-18 00:25, Luke Yelavich wrote:
> > Hey folks.
> > I'm starting to work on merging Ubuntu and Debian packaging for pulseaudio. One of the patches Debian currently has is to use fixed point on all arm flavours they support. The argument given is that float resampling doesn't necessarily perform better than fixed point resampling, even on hard float capable hardware, and sometimes it is worse. here is the blurb taken from the patch:
> >
> > Switch to use the speex fixed point resampler method by default on ARM.
> > Traditionately there wasn't any standard floating point hardware, so for
> > those machines it's an obvious choise. On machine using the hardfloat
> > ABI floating point still isn't an obvious win over integer performance,
> > it's of equal performance on some machines, but slower on others.
> >
> > Has anybody performed any testing or benchmarks on the hardware we support? Should we just drop this and continue to use floating point resampler code?
> >
> > Luke
> >
> > _______________________________________________
> > Mailing list: https://launchpad.net/~ubuntu-audio-dev
> > Post to     : ubuntu-audio-dev at lists.launchpad.net
> > Unsubscribe : https://launchpad.net/~ubuntu-audio-dev
> > More help   : https://help.launchpad.net/ListHelp
> >
> 





From david.henningsson at canonical.com  Thu Nov 20 10:58:35 2014
From: david.henningsson at canonical.com (David Henningsson)
Date: Thu, 20 Nov 2014 11:58:35 +0100
Subject: [pulseaudio-discuss] [Ubuntu-audio-dev] Preferred resampler method
 on armhf.
In-Reply-To: <546D9AD0.9000203@gmail.com>
References: <20141117232554.GA22660@acapella> <546D99DC.2010604@canonical.com>
 <546D9AD0.9000203@gmail.com>
Message-ID: <546DC95B.4050503@canonical.com>



On 2014-11-20 08:40, Alexander E. Patrakov wrote:
> 20.11.2014 12:35, David Henningsson wrote:
>> Crossposting to Debian and upstream lists.
>>
>> Apparently Debian has a patch that uses fixed point by default on armhf,
>> so I'm just echoing Luke's question here: Has anybody performed any
>> testing or benchmarks across armhf hardware, w r t fixed point vs
>> floating point resampling with speex and PulseAudio?
>
> That patch has been superseded by this commit:
>
> http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=ac984f59d36ef555bc5b0df9af1cd48193d0d14f
>
>
> So, if you prefer a fixed-point resampler on armhf (or, for that matter,
> on any other architecture), just compile speex with --enable-fixed-point
> there.

Well, this is a more of an "upstream default" question rather than a 
"why don't you recompile speex" question, and one where it might make 
sense to come up with something reasonable across the board; either by 
upstreaming "fixed point by default for armhf", or by Debian to drop its 
patch.

It does not look likely to me that PulseAudio upstream and Debian would 
correspond to so different machine/user scenarios so that a Debian 
specific patch would make sense here.


-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic


From patrakov at gmail.com  Thu Nov 20 11:28:24 2014
From: patrakov at gmail.com (Alexander E. Patrakov)
Date: Thu, 20 Nov 2014 16:28:24 +0500
Subject: [pulseaudio-discuss] [Ubuntu-audio-dev] Preferred resampler method
 on armhf.
In-Reply-To: <546DC95B.4050503@canonical.com>
References: <20141117232554.GA22660@acapella> <546D99DC.2010604@canonical.com>
 <546D9AD0.9000203@gmail.com> <546DC95B.4050503@canonical.com>
Message-ID: <546DD058.30309@gmail.com>

20.11.2014 15:58, David Henningsson wrote:
>
>
> On 2014-11-20 08:40, Alexander E. Patrakov wrote:
>> 20.11.2014 12:35, David Henningsson wrote:
>>> Crossposting to Debian and upstream lists.
>>>
>>> Apparently Debian has a patch that uses fixed point by default on armhf,
>>> so I'm just echoing Luke's question here: Has anybody performed any
>>> testing or benchmarks across armhf hardware, w r t fixed point vs
>>> floating point resampling with speex and PulseAudio?
>>
>> That patch has been superseded by this commit:
>>
>> http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=ac984f59d36ef555bc5b0df9af1cd48193d0d14f
>>
>>
>>
>> So, if you prefer a fixed-point resampler on armhf (or, for that matter,
>> on any other architecture), just compile speex with --enable-fixed-point
>> there.
>
> Well, this is a more of an "upstream default" question rather than a
> "why don't you recompile speex" question, and one where it might make
> sense to come up with something reasonable across the board; either by
> upstreaming "fixed point by default for armhf", or by Debian to drop its
> patch.
>
> It does not look likely to me that PulseAudio upstream and Debian would
> correspond to so different machine/user scenarios so that a Debian
> specific patch would make sense here.

Indeed, a Debian-specific patch does not make sense.

But, even before my patch, and assuming that someone wrote a different 
solution to the bug that led to it, why would they want to default to 
speex-float-X on a fixed-point speex, or to speex-fixed-X on a 
floating-point speex library? Look, the first thing this resampler does 
is to convert the samples into its preferred representation, possibly 
undoing the conversion done by PulseAudio.

Ideally, the distinction between speex-float-X and speex-fixed-X 
resamplers should be completely killed in PulseAudio, exactly because 
PulseAudio converts between these forms faster than speex does internally.

-- 
Alexander E. Patrakov


From sjoerd at luon.net  Thu Nov 20 11:30:04 2014
From: sjoerd at luon.net (Sjoerd Simons)
Date: Thu, 20 Nov 2014 12:30:04 +0100
Subject: [pulseaudio-discuss] [Ubuntu-audio-dev] Preferred resampler
 method  on armhf.
In-Reply-To: <546DC95B.4050503@canonical.com>
References: <20141117232554.GA22660@acapella>
 <546D99DC.2010604@canonical.com> <546D9AD0.9000203@gmail.com>
 <546DC95B.4050503@canonical.com>
Message-ID: <1416483004.598.7.camel@luon.net>

On Thu, 2014-11-20 at 11:58 +0100, David Henningsson wrote:
> 
> On 2014-11-20 08:40, Alexander E. Patrakov wrote:
> > 20.11.2014 12:35, David Henningsson wrote:
> >> Crossposting to Debian and upstream lists.
> >>
> >> Apparently Debian has a patch that uses fixed point by default on armhf,
> >> so I'm just echoing Luke's question here: Has anybody performed any
> >> testing or benchmarks across armhf hardware, w r t fixed point vs
> >> floating point resampling with speex and PulseAudio?
> >
> > That patch has been superseded by this commit:
> >
> > http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=ac984f59d36ef555bc5b0df9af1cd48193d0d14f
> >
> >
> > So, if you prefer a fixed-point resampler on armhf (or, for that matter,
> > on any other architecture), just compile speex with --enable-fixed-point
> > there.
> 
> Well, this is a more of an "upstream default" question rather than a 
> "why don't you recompile speex" question, and one where it might make 
> sense to come up with something reasonable across the board; either by 
> upstreaming "fixed point by default for armhf", or by Debian to drop its 
> patch.
> 
> It does not look likely to me that PulseAudio upstream and Debian would 
> correspond to so different machine/user scenarios so that a Debian 
> specific patch would make sense here.

Well with the patch mentioned here, i would probably drop that patch
from Debian in any case as pulse would just follow speex (which is the
right thing anyway).. Which makes the upstream choice in pulse a bit
moot?

That said i'd still be interesting on seeing speex resampling benchmark
numbers on a wider set of recentish boards.

-- 
Sjoerd Simons <sjoerd at luon.net>


From fsateler at debian.org  Thu Nov 20 12:55:31 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Thu, 20 Nov 2014 09:55:31 -0300
Subject: [pulseaudio-discuss] [Ubuntu-audio-dev] Preferred resampler
 method on armhf.
In-Reply-To: <1416483004.598.7.camel@luon.net>
References: <20141117232554.GA22660@acapella> <546D99DC.2010604@canonical.com>
 <546D9AD0.9000203@gmail.com> <546DC95B.4050503@canonical.com>
 <1416483004.598.7.camel@luon.net>
Message-ID: <CAAfdZj8Las-NE5zLuMB5D3xtybr_n_=GtfJP4M8Hy2ptyOhYRQ@mail.gmail.com>

On Thu, Nov 20, 2014 at 8:30 AM, Sjoerd Simons <sjoerd at luon.net> wrote:
> On Thu, 2014-11-20 at 11:58 +0100, David Henningsson wrote:
>>
>> On 2014-11-20 08:40, Alexander E. Patrakov wrote:
>> > 20.11.2014 12:35, David Henningsson wrote:
>> >> Crossposting to Debian and upstream lists.
>> >>
>> >> Apparently Debian has a patch that uses fixed point by default on armhf,
>> >> so I'm just echoing Luke's question here: Has anybody performed any
>> >> testing or benchmarks across armhf hardware, w r t fixed point vs
>> >> floating point resampling with speex and PulseAudio?
>> >
>> > That patch has been superseded by this commit:
>> >
>> > http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=ac984f59d36ef555bc5b0df9af1cd48193d0d14f
>> >
>> >
>> > So, if you prefer a fixed-point resampler on armhf (or, for that matter,
>> > on any other architecture), just compile speex with --enable-fixed-point
>> > there.
>>
>> Well, this is a more of an "upstream default" question rather than a
>> "why don't you recompile speex" question, and one where it might make
>> sense to come up with something reasonable across the board; either by
>> upstreaming "fixed point by default for armhf", or by Debian to drop its
>> patch.
>>
>> It does not look likely to me that PulseAudio upstream and Debian would
>> correspond to so different machine/user scenarios so that a Debian
>> specific patch would make sense here.
>
> Well with the patch mentioned here, i would probably drop that patch
> from Debian in any case as pulse would just follow speex (which is the
> right thing anyway).. Which makes the upstream choice in pulse a bit
> moot?
>
> That said i'd still be interesting on seeing speex resampling benchmark
> numbers on a wider set of recentish boards.

In debian the speex maintainer has refused to enable floating point on
armhf [1][2], claiming benchmarks show that fixed point is better even
on armhf. I have not seen those benchmarks, so if it is possible to
corroborate or dispel this information it would be great. On ubuntu I
understand speex is built with floating point.

I only have a raspberry pi to try things on, but I'd be glad to run a
benchmark there if that is of any use.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736752
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700602

-- 

Saludos,
Felipe Sateler


From david.henningsson at canonical.com  Thu Nov 20 13:41:55 2014
From: david.henningsson at canonical.com (David Henningsson)
Date: Thu, 20 Nov 2014 14:41:55 +0100
Subject: [pulseaudio-discuss] [Ubuntu-audio-dev] Preferred resampler method
 on armhf.
In-Reply-To: <CAAfdZj8Las-NE5zLuMB5D3xtybr_n_=GtfJP4M8Hy2ptyOhYRQ@mail.gmail.com>
References: <20141117232554.GA22660@acapella> <546D99DC.2010604@canonical.com>
 <546D9AD0.9000203@gmail.com> <546DC95B.4050503@canonical.com>
 <1416483004.598.7.camel@luon.net>
 <CAAfdZj8Las-NE5zLuMB5D3xtybr_n_=GtfJP4M8Hy2ptyOhYRQ@mail.gmail.com>
Message-ID: <546DEFA3.8050107@canonical.com>



On 2014-11-20 13:55, Felipe Sateler wrote:
> On Thu, Nov 20, 2014 at 8:30 AM, Sjoerd Simons <sjoerd at luon.net> wrote:
>> On Thu, 2014-11-20 at 11:58 +0100, David Henningsson wrote:
>>>
>>> On 2014-11-20 08:40, Alexander E. Patrakov wrote:
>>>> 20.11.2014 12:35, David Henningsson wrote:
>>>>> Crossposting to Debian and upstream lists.
>>>>>
>>>>> Apparently Debian has a patch that uses fixed point by default on armhf,
>>>>> so I'm just echoing Luke's question here: Has anybody performed any
>>>>> testing or benchmarks across armhf hardware, w r t fixed point vs
>>>>> floating point resampling with speex and PulseAudio?
>>>>
>>>> That patch has been superseded by this commit:
>>>>
>>>> http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=ac984f59d36ef555bc5b0df9af1cd48193d0d14f
>>>>
>>>>
>>>> So, if you prefer a fixed-point resampler on armhf (or, for that matter,
>>>> on any other architecture), just compile speex with --enable-fixed-point
>>>> there.
>>>
>>> Well, this is a more of an "upstream default" question rather than a
>>> "why don't you recompile speex" question, and one where it might make
>>> sense to come up with something reasonable across the board; either by
>>> upstreaming "fixed point by default for armhf", or by Debian to drop its
>>> patch.
>>>
>>> It does not look likely to me that PulseAudio upstream and Debian would
>>> correspond to so different machine/user scenarios so that a Debian
>>> specific patch would make sense here.
>>
>> Well with the patch mentioned here, i would probably drop that patch
>> from Debian in any case as pulse would just follow speex (which is the
>> right thing anyway).. Which makes the upstream choice in pulse a bit
>> moot?
>>
>> That said i'd still be interesting on seeing speex resampling benchmark
>> numbers on a wider set of recentish boards.
>
> In debian the speex maintainer has refused to enable floating point on
> armhf [1][2], claiming benchmarks show that fixed point is better even
> on armhf. I have not seen those benchmarks, so if it is possible to
> corroborate or dispel this information it would be great. On ubuntu I
> understand speex is built with floating point.
>
> I only have a raspberry pi to try things on, but I'd be glad to run a
> benchmark there if that is of any use.
>
> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736752
> [2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700602

Right, thanks for the reminder.

So, speex should be compiled with floating point, not because of 
performance, but because AGC is broken (or not even implemented!) when 
compiled with fixed point. So that's what we do on Ubuntu.

So maybe we could stick with status quo then, for simplicity? If 
somebody cares enough it would be up to that person to provide benchmarks.

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic


From fsateler at debian.org  Sat Nov 22 13:14:35 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Sat, 22 Nov 2014 10:14:35 -0300
Subject: Debian/Ubuntu Pulseaudio packaging
Message-ID: <CAAfdZj9d_BtNyVpV_SmFO4Kv7VHvaZZ-Q-Ouhtm9oK2W8-4paQ@mail.gmail.com>

Trimming CC list to ubuntu and debian lists only.

> On 2014-11-18 00:25, Luke Yelavich wrote:
>>
>> Hey folks.
>> I'm starting to work on merging Ubuntu and Debian packaging for
>> pulseaudio.

Excellent! If there is anything I can do to help, please let me know.
Are you using a clone of the pkg-pulseaudio git repo or are you doing
the merging somewhere else?

FWIW, with the 6.0rc release, I think most patches we carry can be
straightforwardly dropped. The following have not been merged
upstream:

0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
  already discussed, so it can be dropped

0003-exit-with-X-session.patch
 Already discussed with the systemd changes, so it can be dropped,
  because s-p-x11 no longer starts pulseaudio ;)

0004-dont-start-when-already-running.patch
 same as above

gnu-kfreebsd.patch
 This still has some unmerged changes, it appears
 I didn't submit it :(

only-autostart-kde-version.patch
  start-pulseaudio-kde no longer exists so it can be dropped


So, TLDR: only gnu-kfreebsd.patch doesn't need to be dropped.

-- 

Saludos,
Felipe Sateler


From selecao.recrutamento at literatus.edu.br  Sat Nov 22 09:51:57 2014
From: selecao.recrutamento at literatus.edu.br (KRAUSE Arno)
Date: Sat, 22 Nov 2014 04:51:57 -0500
Subject: Darlehen angebot
Message-ID: <ec872c6b598d45dfd7d82b90a7e05fb4@literatus.edu.br>



-- 
Hallo,
Haben Sie Interesse an einer finanziellen Darlehen zu 3%?
kontaktieren Sie mich f?r Details und Bedingungen.
meine mail: krause.arno at att.net
danke


From luke.yelavich at canonical.com  Sun Nov 23 21:27:08 2014
From: luke.yelavich at canonical.com (Luke Yelavich)
Date: Mon, 24 Nov 2014 08:27:08 +1100
Subject: Debian/Ubuntu Pulseaudio packaging
In-Reply-To: <CAAfdZj9d_BtNyVpV_SmFO4Kv7VHvaZZ-Q-Ouhtm9oK2W8-4paQ@mail.gmail.com>
References: <CAAfdZj9d_BtNyVpV_SmFO4Kv7VHvaZZ-Q-Ouhtm9oK2W8-4paQ@mail.gmail.com>
Message-ID: <20141123212708.GA4639@acapella>

On Sun, Nov 23, 2014 at 12:14:35AM AEDT, Felipe Sateler wrote:
> Trimming CC list to ubuntu and debian lists only.
> 
> > On 2014-11-18 00:25, Luke Yelavich wrote:
> >>
> >> Hey folks.
> >> I'm starting to work on merging Ubuntu and Debian packaging for
> >> pulseaudio.
> 
> Excellent! If there is anything I can do to help, please let me know.
> Are you using a clone of the pkg-pulseaudio git repo or are you doing
> the merging somewhere else?

I used a clone of the pkg-pulse git tree and have a local branch for the Ubuntu packaging. I am a member of the pkg-pulse team, so I do have commit access, but I am not sure everybody else who touches pulseaudio packaging in Ubuntu is a member of that team yet, and we still need to discuss where and how we want to manage the Ubuntu packaging going forward, but that is for another mail.

Thanks for the heads up on the patches and their upstream status.

Luke


From lukas at mnt.mn  Mon Nov 24 13:55:01 2014
From: lukas at mnt.mn (Lukas F. Hartmann)
Date: Mon, 24 Nov 2014 14:55:01 +0100
Subject: Bug#770834: pulseaudio: MacBook 13"/2013: Only silence in microphone
 input (not muted)
Message-ID: <20141124135501.3927.91658.reportbug@irata-debian.home.mntmn.com>

Package: pulseaudio
Version: 5.0-13
Severity: normal

Dear Maintainer,

I am running Debian Jessie on a MacBook Pro Retina 13" from 2103. Audio works fine except for microphone input, which always stays silent, regardless of mu
ting/unmuting or volume settings or fiddling with alsamixer.
The pavucontrol vumeter for Input Devices > Built-in Audio Analog Stereo > Port:Internal Microphone stays in a zero state. 

Alsamixer shows two Microphone capture devices ("Internal Microphone" and "Internal Microphone 1") while pavucontrol shows one stereo device. When I press 
space on "Internal microphone 1", the input in pavucontrol appears muted. When I unmute it, the volume meter is at 100% for a fraction of a second and then
 goes down to zero. If I record directly after switching to "Internal Microphone 1", only a single "plop" noise is recorded and then silence. This does not
 happen for "Internal Microphone" where only silence is recorded.

I would expect to see a working volume meter when enabling the microphone in pavucontrol and to have working audio recording in client tools such as audaci
ty.

Thanks for looking into this or pointing to a more appropriate bug reporting place,
Cheers,
Lukas F. Hartmann (mntmn)

-- relevant lspci line

00:1b.0 Audio device: Intel Corporation 7 Series/C210 Series Chipset Family High Definition Audio Controller (rev 04)

-- relevant output of pacmd list-sources

  * index: 2
        name: <alsa_input.pci-0000_00_1b.0.analog-stereo>
        driver: <module-alsa-card.c>
        flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY DYNAMIC_LATENCY
        state: RUNNING
        suspend cause: 
        priority: 9959
        volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
                balance 0.00
        base volume: 19193 /  29% / -32.00 dB
        volume steps: 65537
        muted: no
        current latency: 0.00 ms
        max rewind: 0 KiB
        sample spec: s16le 2ch 44100Hz
        channel map: front-left,front-right
                     Stereo
        used by: 1
        linked by: 1
        configured latency: 20.00 ms; range is 0.50 .. 371.52 ms
        card: 0 <alsa_card.pci-0000_00_1b.0>
        module: 6
        properties:
                alsa.resolution_bits = "16"
                device.api = "alsa"
                device.class = "sound"
                alsa.class = "generic"
                alsa.subclass = "generic-mix"
                alsa.name = "CS4206 Analog"
                alsa.id = "CS4206 Analog"
                alsa.subdevice = "0"
                alsa.subdevice_name = "subdevice #0"
                alsa.device = "0"
                alsa.card = "0"
                alsa.card_name = "HDA Intel PCH"
                alsa.long_card_name = "HDA Intel PCH at 0xa0610000 irq 47"
                alsa.driver_name = "snd_hda_intel"
                device.bus_path = "pci-0000:00:1b.0"
                sysfs.path = "/devices/pci0000:00/0000:00:1b.0/sound/card0"
                device.bus = "pci"
                device.vendor.id = "8086"
                device.vendor.name = "Intel Corporation"
                device.product.id = "1e20"
                device.product.name = "7 Series/C210 Series Chipset Family High Definition Audio Controller"
                device.form_factor = "internal"
                device.string = "front:0"
                device.buffering.buffer_size = "65536"
                device.buffering.fragment_size = "32768"
                device.access_mode = "mmap+timer"
                device.profile.name = "analog-stereo"
                device.profile.description = "Analog Stereo"
                device.description = "Built-in Audio Analog Stereo"
                alsa.mixer_name = "Intel PantherPoint HDMI"
                alsa.components = "HDA:10134206,106b3b00,00100302 HDA:80862806,80860101,00100000"
                module-udev-detect.discovered = "1"
                device.icon_name = "audio-card-pci"
        ports:
                analog-input-internal-mic: Internal Microphone (priority 8900, latency offset 0 usec, available: unknown)
                        properties:
                                device.icon_name = "audio-input-microphone"
        active port: <analog-input-internal-mic>

-- Package-specific info:
File '/etc/default/pulseaudio' does not exist


-- System Information:
Debian Release: jessie/sid
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pulseaudio depends on:
ii  adduser                       3.113+nmu3
ii  libasound2                    1.0.28-1
ii  libasound2-plugins            1.0.28-1+b1
ii  libc6                         2.19-13
ii  libcap2                       1:2.24-6
ii  libdbus-1-3                   1.8.10-1
ii  libfftw3-single3              3.3.4-1.1
ii  libgcc1                       1:4.9.1-19
ii  libice6                       2:1.0.9-1
ii  libltdl7                      2.4.2-1.11
ii  liborc-0.4-0                  1:0.4.22-1
ii  libpulse0                     5.0-13
ii  libsamplerate0                0.1.8-8
ii  libsm6                        2:1.2.2-1
ii  libsndfile1                   1.0.25-9+b1
ii  libspeexdsp1                  1.2~rc1.2-1
ii  libstdc++6                    4.9.1-19
ii  libsystemd0                   215-5+b1
ii  libtdb1                       1.3.1-1
ii  libudev1                      215-5+b1
ii  libwebrtc-audio-processing-0  0.1-3
ii  libx11-6                      2:1.6.2-3
ii  libx11-xcb1                   2:1.6.2-3
ii  libxcb1                       1.10-3+b1
ii  libxtst6                      2:1.2.2-1+b1
ii  lsb-base                      4.1+Debian13+nmu1
ii  pulseaudio-utils              5.0-13
ii  udev                          215-5+b1

Versions of packages pulseaudio recommends:
ii  pulseaudio-module-x11  5.0-13
ii  rtkit                  0.11-2

Versions of packages pulseaudio suggests:
pn  paman        <none>
pn  paprefs      <none>
ii  pavucontrol  2.0-3
pn  pavumeter    <none>

-- Configuration Files:
/etc/pulse/daemon.conf changed:
; daemonize = no
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
; system-instance = no
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no
; high-priority = yes
; nice-level = -11
; realtime-scheduling = yes
; realtime-priority = 5
; exit-idle-time = 20
; scache-idle-time = 20
; dl-search-path = (depends on architecture)
; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa
; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no
flat-volumes = no
; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000
; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right
; default-fragments = 4
; default-fragment-size-msec = 25
; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0


-- no debconf information
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; default-sink =
; default-source =
; default-server =
; default-dbus-server =

; autospawn = yes
; daemon-binary = /usr/bin/pulseaudio
; extra-arguments = --log-target=syslog

; cookie-file =

; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB

; auto-connect-localhost = no
; auto-connect-display = no
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; daemonize = no
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
; system-instance = no
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no

; high-priority = yes
; nice-level = -11

; realtime-scheduling = yes
; realtime-priority = 5

; exit-idle-time = 20
; scache-idle-time = 20

; dl-search-path = (depends on architecture)

; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa

; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0

# resample-method defaults to  speex-float-1 on most architectures,
# speex-fixed-1 on ARM
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no

flat-volumes = no

; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000

; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right

; default-fragments = 4
; default-fragment-size-msec = 25

; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)

.nofail

### Load something into the sample cache
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav

.fail

### Automatically restore the volume of streams and devices
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore

### Automatically augment property information from .desktop files
### stored in /usr/share/application
load-module module-augment-properties

### Should be after module-*-restore but before module-*-detect
load-module module-switch-on-port-available

### Load audio drivers statically
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#load-module module-null-sink
#load-module module-pipe-sink

### Automatically load driver modules depending on the hardware available
.ifexists module-udev-detect.so
load-module module-udev-detect
.else
### Use the static hardware detection module (for systems that lack udev support)
load-module module-detect
.endif

### Automatically connect sink and source if JACK server is present
.ifexists module-jackdbus-detect.so
.nofail
load-module module-jackdbus-detect channels=2
.fail
.endif

### Automatically load driver modules for Bluetooth hardware
.ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
.endif

.ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
.endif

### Load several protocols
.ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
.endif
load-module module-native-protocol-unix

### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish

### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv

### Load the RTP sender module (also configured via paprefs, see above)
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor

### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
.ifexists module-gconf.so
.nofail
load-module module-gconf
.fail
.endif

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Honour intended role device property
load-module module-intended-roles

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
.ifexists module-console-kit.so
load-module module-console-kit
.endif
.ifexists module-systemd-login.so
load-module module-systemd-login
.endif

### Enable positioned event sounds
load-module module-position-event-sounds

### Cork music/video streams when a phone stream is active
load-module module-role-cork

### Modules to allow autoloading of filters (such as echo cancellation)
### on demand. module-filter-heuristics tries to determine what filters
### make sense, and module-filter-apply does the heavy-lifting of
### loading modules and rerouting streams.
load-module module-filter-heuristics
load-module module-filter-apply

# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.

### Load X11 bell module
#load-module module-x11-bell sample=bell-windowing-system

### Register ourselves in the X11 session manager
#load-module module-x11-xsmp

### Publish connection data in the X11 root window
#.ifexists module-x11-publish.so
#.nofail
#load-module module-x11-publish
#.fail
#.endif

### Make some devices default
#set-default-sink output
#set-default-source input
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started in system
# mode.

### Automatically load driver modules depending on the hardware available
.ifexists module-udev-detect.so
load-module module-udev-detect
.else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
.endif

### Load several protocols
.ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
.endif
load-module module-native-protocol-unix

### Automatically restore the volume of streams and devices
load-module module-stream-restore
load-module module-device-restore

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### Enable positioned event sounds
load-module module-position-event-sounds
-------------- next part --------------
default
    Playback/recording through the PulseAudio sound server
null
    Discard all samples (playback) or generate zero samples (capture)
pulse
    PulseAudio Sound Server
sysdefault:CARD=PCH
    HDA Intel PCH, CS4206 Analog
    Default Audio Device
front:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    Front speakers
surround21:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    2.1 Surround output to Front and Subwoofer speakers
surround40:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    4.0 Surround output to Front and Rear speakers
surround41:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    4.1 Surround output to Front, Rear and Subwoofer speakers
surround50:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    5.0 Surround output to Front, Center and Rear speakers
surround51:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    5.1 Surround output to Front, Center, Rear and Subwoofer speakers
surround71:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    7.1 Surround output to Front, Center, Side, Rear and Woofer speakers
iec958:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Digital
    IEC958 (S/PDIF) Digital Audio Output
hdmi:CARD=PCH,DEV=0
    HDA Intel PCH, HDMI 0
    HDMI Audio Output
hdmi:CARD=PCH,DEV=1
    HDA Intel PCH, HDMI 1
    HDMI Audio Output
hdmi:CARD=PCH,DEV=2
    HDA Intel PCH, HDMI 2
    HDMI Audio Output
dmix:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    Direct sample mixing device
dmix:CARD=PCH,DEV=1
    HDA Intel PCH, CS4206 Digital
    Direct sample mixing device
dmix:CARD=PCH,DEV=3
    HDA Intel PCH, HDMI 0
    Direct sample mixing device
dmix:CARD=PCH,DEV=7
    HDA Intel PCH, HDMI 1
    Direct sample mixing device
dmix:CARD=PCH,DEV=8
    HDA Intel PCH, HDMI 2
    Direct sample mixing device
dsnoop:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    Direct sample snooping device
dsnoop:CARD=PCH,DEV=1
    HDA Intel PCH, CS4206 Digital
    Direct sample snooping device
dsnoop:CARD=PCH,DEV=3
    HDA Intel PCH, HDMI 0
    Direct sample snooping device
dsnoop:CARD=PCH,DEV=7
    HDA Intel PCH, HDMI 1
    Direct sample snooping device
dsnoop:CARD=PCH,DEV=8
    HDA Intel PCH, HDMI 2
    Direct sample snooping device
hw:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    Direct hardware device without any conversions
hw:CARD=PCH,DEV=1
    HDA Intel PCH, CS4206 Digital
    Direct hardware device without any conversions
hw:CARD=PCH,DEV=3
    HDA Intel PCH, HDMI 0
    Direct hardware device without any conversions
hw:CARD=PCH,DEV=7
    HDA Intel PCH, HDMI 1
    Direct hardware device without any conversions
hw:CARD=PCH,DEV=8
    HDA Intel PCH, HDMI 2
    Direct hardware device without any conversions
plughw:CARD=PCH,DEV=0
    HDA Intel PCH, CS4206 Analog
    Hardware device with all software conversions
plughw:CARD=PCH,DEV=1
    HDA Intel PCH, CS4206 Digital
    Hardware device with all software conversions
plughw:CARD=PCH,DEV=3
    HDA Intel PCH, HDMI 0
    Hardware device with all software conversions
plughw:CARD=PCH,DEV=7
    HDA Intel PCH, HDMI 1
    Hardware device with all software conversions
plughw:CARD=PCH,DEV=8
    HDA Intel PCH, HDMI 2
    Hardware device with all software conversions
-------------- next part --------------
Card #0
	Name: alsa_card.pci-0000_00_1b.0
	Driver: module-alsa-card.c
	Owner Module: 6
	Properties:
		alsa.card = "0"
		alsa.card_name = "HDA Intel PCH"
		alsa.long_card_name = "HDA Intel PCH at 0xa0610000 irq 47"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:1b.0"
		sysfs.path = "/devices/pci0000:00/0000:00:1b.0/sound/card0"
		device.bus = "pci"
		device.vendor.id = "8086"
		device.vendor.name = "Intel Corporation"
		device.product.id = "1e20"
		device.product.name = "7 Series/C210 Series Chipset Family High Definition Audio Controller"
		device.form_factor = "internal"
		device.string = "0"
		device.description = "Built-in Audio"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Profiles:
		input:analog-stereo: Analog Stereo Input (sinks: 0, sources: 1, priority: 60, available: yes)
		output:analog-stereo: Analog Stereo Output (sinks: 1, sources: 0, priority: 6000, available: yes)
		output:analog-stereo+input:analog-stereo: Analog Stereo Duplex (sinks: 1, sources: 1, priority: 6060, available: yes)
		output:analog-surround-40: Analog Surround 4.0 Output (sinks: 1, sources: 0, priority: 700, available: yes)
		output:analog-surround-40+input:analog-stereo: Analog Surround 4.0 Output + Analog Stereo Input (sinks: 1, sources: 1, priority: 760, available: yes)
		output:iec958-stereo: Digital Stereo (IEC958) Output (sinks: 1, sources: 0, priority: 5500, available: yes)
		output:iec958-stereo+input:analog-stereo: Digital Stereo (IEC958) Output + Analog Stereo Input (sinks: 1, sources: 1, priority: 5560, available: yes)
		output:hdmi-stereo: Digital Stereo (HDMI) Output (sinks: 1, sources: 0, priority: 5400, available: yes)
		output:hdmi-stereo+input:analog-stereo: Digital Stereo (HDMI) Output + Analog Stereo Input (sinks: 1, sources: 1, priority: 5460, available: yes)
		output:hdmi-surround: Digital Surround 5.1 (HDMI) Output (sinks: 1, sources: 0, priority: 300, available: yes)
		output:hdmi-surround+input:analog-stereo: Digital Surround 5.1 (HDMI) Output + Analog Stereo Input (sinks: 1, sources: 1, priority: 360, available: yes)
		output:hdmi-stereo-extra1: Digital Stereo (HDMI) Output (sinks: 1, sources: 0, priority: 5200, available: yes)
		output:hdmi-stereo-extra1+input:analog-stereo: Digital Stereo (HDMI) Output + Analog Stereo Input (sinks: 1, sources: 1, priority: 5260, available: yes)
		output:hdmi-surround-extra1: Digital Surround 5.1 (HDMI) Output (sinks: 1, sources: 0, priority: 100, available: yes)
		output:hdmi-surround-extra1+input:analog-stereo: Digital Surround 5.1 (HDMI) Output + Analog Stereo Input (sinks: 1, sources: 1, priority: 160, available: yes)
		output:hdmi-stereo-extra2: Digital Stereo (HDMI) Output (sinks: 1, sources: 0, priority: 5200, available: yes)
		output:hdmi-stereo-extra2+input:analog-stereo: Digital Stereo (HDMI) Output + Analog Stereo Input (sinks: 1, sources: 1, priority: 5260, available: yes)
		output:hdmi-surround-extra2: Digital Surround 5.1 (HDMI) Output (sinks: 1, sources: 0, priority: 100, available: yes)
		output:hdmi-surround-extra2+input:analog-stereo: Digital Surround 5.1 (HDMI) Output + Analog Stereo Input (sinks: 1, sources: 1, priority: 160, available: yes)
		off: Off (sinks: 0, sources: 0, priority: 0, available: yes)
	Active Profile: output:analog-stereo+input:analog-stereo
	Ports:
		analog-input-internal-mic: Internal Microphone (priority: 8900, latency offset: 0 usec)
			Properties:
				device.icon_name = "audio-input-microphone"
			Part of profile(s): input:analog-stereo, output:analog-stereo+input:analog-stereo, output:analog-surround-40+input:analog-stereo, output:iec958-stereo+input:analog-stereo, output:hdmi-stereo+input:analog-stereo, output:hdmi-surround+input:analog-stereo, output:hdmi-stereo-extra1+input:analog-stereo, output:hdmi-surround-extra1+input:analog-stereo, output:hdmi-stereo-extra2+input:analog-stereo, output:hdmi-surround-extra2+input:analog-stereo
		analog-output: Analog Output (priority: 9900, latency offset: 0 usec)
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo, output:analog-surround-40, output:analog-surround-40+input:analog-stereo
		analog-output-speaker: Speakers (priority: 10000, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "audio-speakers"
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo, output:analog-surround-40, output:analog-surround-40+input:analog-stereo
		analog-output-headphones: Headphones (priority: 9000, latency offset: 0 usec, available)
			Properties:
				device.icon_name = "audio-headphones"
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo
		iec958-stereo-output: Digital Output (S/PDIF) (priority: 0, latency offset: 0 usec)
			Part of profile(s): output:iec958-stereo, output:iec958-stereo+input:analog-stereo
		hdmi-output-0: HDMI / DisplayPort (priority: 5900, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "video-display"
			Part of profile(s): output:hdmi-stereo, output:hdmi-stereo+input:analog-stereo, output:hdmi-surround, output:hdmi-surround+input:analog-stereo
		hdmi-output-1: HDMI / DisplayPort 2 (priority: 5800, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "video-display"
			Part of profile(s): output:hdmi-stereo-extra1, output:hdmi-stereo-extra1+input:analog-stereo, output:hdmi-surround-extra1, output:hdmi-surround-extra1+input:analog-stereo
		hdmi-output-2: HDMI / DisplayPort 3 (priority: 5700, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "video-display"
			Part of profile(s): output:hdmi-stereo-extra2, output:hdmi-stereo-extra2+input:analog-stereo, output:hdmi-surround-extra2, output:hdmi-surround-extra2+input:analog-stereo
-------------- next part --------------
Sink #0
	State: SUSPENDED
	Name: alsa_output.pci-0000_00_1b.0.analog-stereo
	Description: Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 6
	Mute: no
	Volume: front-left: 20724 /  32% / -30.00 dB,   front-right: 20724 /  32% / -30.00 dB
	        balance 0.00
	Base Volume: 52057 /  79% / -6.00 dB
	Monitor Source: alsa_output.pci-0000_00_1b.0.analog-stereo.monitor
	Latency: 0 usec, configured 0 usec
	Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY 
	Properties:
		alsa.resolution_bits = "16"
		device.api = "alsa"
		device.class = "sound"
		alsa.class = "generic"
		alsa.subclass = "generic-mix"
		alsa.name = "CS4206 Analog"
		alsa.id = "CS4206 Analog"
		alsa.subdevice = "0"
		alsa.subdevice_name = "subdevice #0"
		alsa.device = "0"
		alsa.card = "0"
		alsa.card_name = "HDA Intel PCH"
		alsa.long_card_name = "HDA Intel PCH at 0xa0610000 irq 47"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:1b.0"
		sysfs.path = "/devices/pci0000:00/0000:00:1b.0/sound/card0"
		device.bus = "pci"
		device.vendor.id = "8086"
		device.vendor.name = "Intel Corporation"
		device.product.id = "1e20"
		device.product.name = "7 Series/C210 Series Chipset Family High Definition Audio Controller"
		device.form_factor = "internal"
		device.string = "front:0"
		device.buffering.buffer_size = "65536"
		device.buffering.fragment_size = "32768"
		device.access_mode = "mmap+timer"
		device.profile.name = "analog-stereo"
		device.profile.description = "Analog Stereo"
		device.description = "Built-in Audio Analog Stereo"
		alsa.mixer_name = "Intel PantherPoint HDMI"
		alsa.components = "HDA:10134206,106b3b00,00100302 HDA:80862806,80860101,00100000"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Ports:
		analog-output: Analog Output (priority: 9900)
		analog-output-speaker: Speakers (priority: 10000, not available)
		analog-output-headphones: Headphones (priority: 9000, available)
	Active Port: analog-output-headphones
	Formats:
		pcm
-------------- next part --------------
Source #0
	State: SUSPENDED
	Name: alsa_output.pci-0000_00_1b.0.analog-stereo.monitor
	Description: Monitor of Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 6
	Mute: no
	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor of Sink: alsa_output.pci-0000_00_1b.0.analog-stereo
	Latency: 0 usec, configured 0 usec
	Flags: DECIBEL_VOLUME LATENCY 
	Properties:
		device.description = "Monitor of Built-in Audio Analog Stereo"
		device.class = "monitor"
		alsa.card = "0"
		alsa.card_name = "HDA Intel PCH"
		alsa.long_card_name = "HDA Intel PCH at 0xa0610000 irq 47"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:1b.0"
		sysfs.path = "/devices/pci0000:00/0000:00:1b.0/sound/card0"
		device.bus = "pci"
		device.vendor.id = "8086"
		device.vendor.name = "Intel Corporation"
		device.product.id = "1e20"
		device.product.name = "7 Series/C210 Series Chipset Family High Definition Audio Controller"
		device.form_factor = "internal"
		device.string = "0"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Formats:
		pcm

Source #2
	State: SUSPENDED
	Name: alsa_input.pci-0000_00_1b.0.analog-stereo
	Description: Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 6
	Mute: no
	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
	        balance 0.00
	Base Volume: 19193 /  29% / -32.00 dB
	Monitor of Sink: n/a
	Latency: 0 usec, configured 0 usec
	Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY 
	Properties:
		alsa.resolution_bits = "16"
		device.api = "alsa"
		device.class = "sound"
		alsa.class = "generic"
		alsa.subclass = "generic-mix"
		alsa.name = "CS4206 Analog"
		alsa.id = "CS4206 Analog"
		alsa.subdevice = "0"
		alsa.subdevice_name = "subdevice #0"
		alsa.device = "0"
		alsa.card = "0"
		alsa.card_name = "HDA Intel PCH"
		alsa.long_card_name = "HDA Intel PCH at 0xa0610000 irq 47"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:1b.0"
		sysfs.path = "/devices/pci0000:00/0000:00:1b.0/sound/card0"
		device.bus = "pci"
		device.vendor.id = "8086"
		device.vendor.name = "Intel Corporation"
		device.product.id = "1e20"
		device.product.name = "7 Series/C210 Series Chipset Family High Definition Audio Controller"
		device.form_factor = "internal"
		device.string = "front:0"
		device.buffering.buffer_size = "65536"
		device.buffering.fragment_size = "32768"
		device.access_mode = "mmap+timer"
		device.profile.name = "analog-stereo"
		device.profile.description = "Analog Stereo"
		device.description = "Built-in Audio Analog Stereo"
		alsa.mixer_name = "Intel PantherPoint HDMI"
		alsa.components = "HDA:10134206,106b3b00,00100302 HDA:80862806,80860101,00100000"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Ports:
		analog-input-internal-mic: Internal Microphone (priority: 8900)
	Active Port: analog-input-internal-mic
	Formats:
		pcm
-------------- next part --------------
Module #0
	Name: module-device-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the volume/mute state of devices"
		module.version = "5.0"

Module #1
	Name: module-stream-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the volume/mute/device state of streams"
		module.version = "5.0"

Module #2
	Name: module-card-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore profile of cards"
		module.version = "5.0"

Module #3
	Name: module-augment-properties
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Augment the property sets of streams with additional static information"
		module.version = "5.0"

Module #4
	Name: module-switch-on-port-available
	Argument: 
	Usage counter: n/a
	Properties:
		

Module #5
	Name: module-udev-detect
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Detect available audio hardware and load matching drivers"
		module.version = "5.0"

Module #6
	Name: module-alsa-card
	Argument: device_id="0" name="pci-0000_00_1b.0" card_name="alsa_card.pci-0000_00_1b.0" namereg_fail=false tsched=yes fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"
	Usage counter: 0
	Properties:
		module.author = "Lennart Poettering"
		module.description = "ALSA Card"
		module.version = "5.0"

Module #7
	Name: module-jackdbus-detect
	Argument: channels=2
	Usage counter: n/a
	Properties:
		module.author = "David Henningsson"
		module.description = "Adds JACK sink/source ports when JACK is started"
		module.version = "5.0"

Module #8
	Name: module-native-protocol-unix
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Native protocol (UNIX sockets)"
		module.version = "5.0"

Module #9
	Name: module-default-device-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the default sink and source"
		module.version = "5.0"

Module #10
	Name: module-rescue-streams
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "When a sink/source is removed, try to move its streams to the default sink/source"
		module.version = "5.0"

Module #11
	Name: module-always-sink
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Always keeps at least one sink loaded even if it's a null one"
		module.version = "5.0"

Module #12
	Name: module-intended-roles
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically set device of streams based on intended roles of devices"
		module.version = "5.0"

Module #13
	Name: module-suspend-on-idle
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "When a sink/source is idle for too long, suspend it"
		module.version = "5.0"

Module #14
	Name: module-console-kit
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Create a client for each ConsoleKit session of this user"
		module.version = "5.0"

Module #15
	Name: module-systemd-login
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Create a client for each login session of this user"
		module.version = "5.0"

Module #16
	Name: module-position-event-sounds
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Position event sounds between L and R depending on the position on screen of the widget triggering them."
		module.version = "5.0"

Module #17
	Name: module-role-cork
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Mute & cork streams with certain roles while others exist"
		module.version = "5.0"

Module #18
	Name: module-filter-heuristics
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Detect when various filters are desirable"
		module.version = "5.0"

Module #19
	Name: module-filter-apply
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Load filter sinks automatically when needed"
		module.version = "5.0"

Module #20
	Name: module-x11-publish
	Argument: display=:0.0
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "X11 credential publisher"
		module.version = "5.0"

Module #21
	Name: module-x11-cork-request
	Argument: display=:0.0
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Synthesize X11 media key events when cork/uncork is requested"
		module.version = "5.0"

Module #22
	Name: module-x11-xsmp
	Argument: display=:0.0 session_manager=local/irata-debian:@/tmp/.ICE-unix/1228,unix/irata-debian:/tmp/.ICE-unix/1228
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "X11 session management"
		module.version = "5.0"

Module #23
	Name: module-cli-protocol-unix
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Command line interface protocol (UNIX sockets)"
		module.version = "5.0"
-------------- next part --------------
Server String: unix:/run/user/1000/pulse/native
Library Protocol Version: 29
Server Protocol Version: 29
Is Local: yes
Client Index: 138
Tile Size: 65472
User Name: mntmn
Host Name: irata-debian
Server Name: pulseaudio
Server Version: 5.0
Default Sample Specification: s16le 2ch 44100Hz
Default Channel Map: front-left,front-right
Default Sink: alsa_output.pci-0000_00_1b.0.analog-stereo
Default Source: alsa_input.pci-0000_00_1b.0.analog-stereo
Cookie: 6b60:0663

From birojs at gmg.lv  Tue Nov 25 10:19:09 2014
From: birojs at gmg.lv (1&1 De-Mail-Kundenservice)
Date: Tue, 25 Nov 2014 12:19:09 +0200 (EET)
Subject: Ihre 1&1 Rechnung
Message-ID: <20141125101909.4E25961E2D@butthead.furors.lv>

An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141125/5d224393/attachment.html>

From bgsblc.kianersi at gmail.com  Wed Nov 26 16:58:41 2014
From: bgsblc.kianersi at gmail.com (Ezzatollah Kianersi)
Date: Wed, 26 Nov 2014 16:58:41 +0000 (UTC)
Subject: Bank Instrument for Lease
References: <20140829125455.8F7FAB32049@azteca.fmed.uba.ar>
Message-ID: <loom.20141126T175745-432@post.gmane.org>

Dear Sir/Ma

I am direct to a project Funder who is also known as private Lender they
specialized in Bank Instrument Lease and sales their funds is purely earned
from private and Corporate investment portfolios without criminal
origin.With the group capital fund which are specifically for lease/sale in
form of bank instrument. The Financial institution can finance your
signatory projects such as Real Estate Development, Aviation Service,
Agriculture Finance, Petroleum Importation, Telecommunication, construction
of Dams or Bridges and all kind of projects.

The bank instrument can be use for purchase of goods from any manufacturer
irrespective of their location. It can also serve as collateral with any
bank in the world to secure loan for your project or to establish line of
credit with your bank. We offer Bank Guarantee , all are issue from AAA
Rated bank such as Deutsche Bank, HSBC Bank, UBS Zurich, Barclay's Bank ,
Standard Chartered Bank E.T.C. For more information, Endeavour to contact me
as your convenient time.

 DESCRIPTION OF INSTRUMENTS:
1. Instrument: Bank Guarantee (BG/SBLC)
2. Total Face Value: Min of 1M Euro/USD (One Million Euro/USD) to Max of 5B 
Euro/USD (Five Billion Euro/USD).
3. Issuing Bank: HSBC, London or Deutsche Bank Frankfurt or any Top 25 WEB
4. Age: One Year, One Day
5. Leasing Price:3 .5% of Face Value plus (0.5+X)% commission fees to 
brokers.
6. Delivery: Bank to Bank SWIFT.
7. Payment: MT-103.
8. Hard Copy: Bonded Courier within 7 banking days.

All relevant business information will be provided upon request.  If
Interested kindly contact me via Email:~ Mr. Ezzatollah Kianersi....
Email:(bgsblc.kianersi at gmail.com) My Skype ID is ..................:
bgsblc.kianersi

Regards,
Ezzatollah Kianersi  



From david.lynam at redbrick.dcu.ie  Wed Nov 26 19:44:09 2014
From: david.lynam at redbrick.dcu.ie (David =?UTF-8?Q?=C3=93_?= =?UTF-8?Q?Laighean=C3=A1in?=)
Date: Wed, 26 Nov 2014 19:44:09 +0000
Subject: Bug#765848: pulseaudio: selects wrong output after unplugging
 headphone or similar (regression from wheezy)
Message-ID: <20141126194409.5581.27853.reportbug@fuileach>

Package: pulseaudio
Version: 5.0-13
Followup-For: Bug #765848

I am experiencing the same problem. Sometimes, disconnecting the headphones doesn't route sound via the speakers. If I do connect my headphones, I will often have to open pavucontrol and select 'Speakers' instead of 'Analog Output'. The reverse sometimes happens when I connect my headphones.

The only change I have made to my default.pa is adding 'tsched=0' after 'load-module module-udev-detect'.

-- Package-specific info:
File '/etc/default/pulseaudio' does not exist


-- System Information:
Debian Release: jessie/sid
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=ga_IE.UTF-8, LC_CTYPE=ga_IE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pulseaudio depends on:
ii  adduser                       3.113+nmu3
ii  libasound2                    1.0.28-1
ii  libasound2-plugins            1.0.28-1+b1
ii  libc6                         2.19-13
ii  libcap2                       1:2.24-6
ii  libdbus-1-3                   1.8.10-1
ii  libfftw3-single3              3.3.4-1.1
ii  libgcc1                       1:4.9.1-19
ii  libice6                       2:1.0.9-1
ii  libltdl7                      2.4.2-1.11
ii  liborc-0.4-0                  1:0.4.22-1
ii  libpulse0                     5.0-13
ii  libsamplerate0                0.1.8-8
ii  libsm6                        2:1.2.2-1
ii  libsndfile1                   1.0.25-9+b1
ii  libspeexdsp1                  1.2~rc1.2-1
ii  libstdc++6                    4.9.1-19
ii  libsystemd0                   215-5+b1
ii  libtdb1                       1.3.1-1
ii  libudev1                      215-5+b1
ii  libwebrtc-audio-processing-0  0.1-3
ii  libx11-6                      2:1.6.2-3
ii  libx11-xcb1                   2:1.6.2-3
ii  libxcb1                       1.10-3+b1
ii  libxtst6                      2:1.2.2-1+b1
ii  lsb-base                      4.1+Debian13+nmu1
ii  pulseaudio-utils              5.0-13
ii  udev                          215-5+b1

Versions of packages pulseaudio recommends:
ii  pulseaudio-module-x11  5.0-13
ii  rtkit                  0.11-2

Versions of packages pulseaudio suggests:
pn  paman        <none>
pn  paprefs      <none>
ii  pavucontrol  2.0-3
pn  pavumeter    <none>

-- Configuration Files:
/etc/pulse/default.pa changed [not included]

-- no debconf information
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; default-sink =
; default-source =
; default-server =
; default-dbus-server =

; autospawn = yes
; daemon-binary = /usr/bin/pulseaudio
; extra-arguments = --log-target=syslog

; cookie-file =

; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB

; auto-connect-localhost = no
; auto-connect-display = no
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; daemonize = no
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
; system-instance = no
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no

; high-priority = yes
; nice-level = -11

; realtime-scheduling = yes
; realtime-priority = 5

; exit-idle-time = 20
; scache-idle-time = 20

; dl-search-path = (depends on architecture)

; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa

; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0

# resample-method defaults to  speex-float-1 on most architectures,
# speex-fixed-1 on ARM
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no

; flat-volumes = yes

; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000

; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right

; default-fragments = 4
; default-fragment-size-msec = 25

; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)

..nofail

### Load something into the sample cache
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav

..fail

### Automatically restore the volume of streams and devices
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore

### Automatically augment property information from .desktop files
### stored in /usr/share/application
load-module module-augment-properties

### Should be after module-*-restore but before module-*-detect
load-module module-switch-on-port-available

### Load audio drivers statically
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#load-module module-null-sink
#load-module module-pipe-sink

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect tsched=0
..else
### Use the static hardware detection module (for systems that lack udev support)
load-module module-detect tsched=0
..endif

### Automatically connect sink and source if JACK server is present
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif

### Automatically load driver modules for Bluetooth hardware
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif

..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish

### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv

### Load the RTP sender module (also configured via paprefs, see above)
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor

### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Honour intended role device property
load-module module-intended-roles

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif

### Enable positioned event sounds
load-module module-position-event-sounds

### Cork music/video streams when a phone stream is active
load-module module-role-cork

### Modules to allow autoloading of filters (such as echo cancellation)
### on demand. module-filter-heuristics tries to determine what filters
### make sense, and module-filter-apply does the heavy-lifting of
### loading modules and rerouting streams.
load-module module-filter-heuristics
load-module module-filter-apply

# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.

### Load X11 bell module
#load-module module-x11-bell sample=bell-windowing-system

### Register ourselves in the X11 session manager
#load-module module-x11-xsmp

### Publish connection data in the X11 root window
#.ifexists module-x11-publish.so
#.nofail
#load-module module-x11-publish
#.fail
#.endif

### Make some devices default
#set-default-sink output
#set-default-source input
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started in system
# mode.

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Automatically restore the volume of streams and devices
load-module module-stream-restore
load-module module-device-restore

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### Enable positioned event sounds
load-module module-position-event-sounds
-------------- next part --------------
default
    Playback/recording through the PulseAudio sound server
null
    Discard all samples (playback) or generate zero samples (capture)
pulse
    PulseAudio Sound Server
hdmi:CARD=Generic,DEV=0
    HD-Audio Generic, HDMI 0
    HDMI Audio Output
dmix:CARD=Generic,DEV=3
    HD-Audio Generic, HDMI 0
    Direct sample mixing device
dsnoop:CARD=Generic,DEV=3
    HD-Audio Generic, HDMI 0
    Direct sample snooping device
hw:CARD=Generic,DEV=3
    HD-Audio Generic, HDMI 0
    Direct hardware device without any conversions
plughw:CARD=Generic,DEV=3
    HD-Audio Generic, HDMI 0
    Hardware device with all software conversions
sysdefault:CARD=Generic_1
    HD-Audio Generic, CX20756 Analog
    Default Audio Device
front:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Front speakers
surround21:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    2.1 Surround output to Front and Subwoofer speakers
surround40:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    4.0 Surround output to Front and Rear speakers
surround41:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    4.1 Surround output to Front, Rear and Subwoofer speakers
surround50:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    5.0 Surround output to Front, Center and Rear speakers
surround51:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    5.1 Surround output to Front, Center, Rear and Subwoofer speakers
surround71:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    7.1 Surround output to Front, Center, Side, Rear and Woofer speakers
dmix:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Direct sample mixing device
dsnoop:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Direct sample snooping device
hw:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Direct hardware device without any conversions
plughw:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Hardware device with all software conversions
-------------- next part --------------
Card #0
	Name: alsa_card.pci-0000_00_01.1
	Driver: module-alsa-card.c
	Owner Module: 6
	Properties:
		alsa.card = "0"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1560000 irq 85"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:01.1"
		sysfs.path = "/devices/pci0000:00/0000:00:01.1/sound/card0"
		device.bus = "pci"
		device.vendor.id = "1002"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD/ATI]"
		device.product.id = "9840"
		device.product.name = "Kabini HDMI/DP Audio"
		device.form_factor = "internal"
		device.string = "0"
		device.description = "Built-in Audio"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Profiles:
		output:hdmi-stereo: Digital Stereo (HDMI) Output (sinks: 1, sources: 0, priority: 5400, available: yes)
		off: Off (sinks: 0, sources: 0, priority: 0, available: yes)
	Active Profile: output:hdmi-stereo
	Ports:
		hdmi-output-0: HDMI / DisplayPort (priority: 5900, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "video-display"
			Part of profile(s): output:hdmi-stereo

Card #1
	Name: alsa_card.pci-0000_00_14.2
	Driver: module-alsa-card.c
	Owner Module: 7
	Properties:
		alsa.card = "1"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:14.2"
		sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
		device.bus = "pci"
		device.vendor.id = "1022"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
		device.product.id = "780d"
		device.product.name = "FCH Azalia Controller"
		device.form_factor = "internal"
		device.string = "1"
		device.description = "Built-in Audio"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Profiles:
		input:analog-stereo: Analog Stereo Input (sinks: 0, sources: 1, priority: 60, available: yes)
		output:analog-stereo: Analog Stereo Output (sinks: 1, sources: 0, priority: 6000, available: yes)
		output:analog-stereo+input:analog-stereo: Analog Stereo Duplex (sinks: 1, sources: 1, priority: 6060, available: yes)
		off: Off (sinks: 0, sources: 0, priority: 0, available: yes)
	Active Profile: output:analog-stereo+input:analog-stereo
	Ports:
		analog-input-internal-mic: Internal Microphone (priority: 8900, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "audio-input-microphone"
			Part of profile(s): input:analog-stereo, output:analog-stereo+input:analog-stereo
		analog-input-mic: Microphone (priority: 8700, latency offset: 0 usec, available)
			Properties:
				device.icon_name = "audio-input-microphone"
			Part of profile(s): input:analog-stereo, output:analog-stereo+input:analog-stereo
		analog-output: Analog Output (priority: 9900, latency offset: 0 usec)
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo
		analog-output-speaker: Speakers (priority: 10000, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "audio-speakers"
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo
		analog-output-headphones: Headphones (priority: 9000, latency offset: 0 usec, available)
			Properties:
				device.icon_name = "audio-headphones"
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo
-------------- next part --------------
Sink #0
	State: SUSPENDED
	Name: alsa_output.pci-0000_00_01.1.hdmi-stereo
	Description: Built-in Audio Digital Stereo (HDMI)
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 6
	Mute: no
	Volume: front-left: 64071 /  98% / -0.59 dB,   front-right: 64071 /  98% / -0.59 dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor Source: alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor
	Latency: 0 usec, configured 0 usec
	Flags: HARDWARE DECIBEL_VOLUME LATENCY SET_FORMATS 
	Properties:
		alsa.resolution_bits = "16"
		device.api = "alsa"
		device.class = "sound"
		alsa.class = "generic"
		alsa.subclass = "generic-mix"
		alsa.name = "HDMI 0"
		alsa.id = "HDMI 0"
		alsa.subdevice = "0"
		alsa.subdevice_name = "subdevice #0"
		alsa.device = "3"
		alsa.card = "0"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1560000 irq 85"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:01.1"
		sysfs.path = "/devices/pci0000:00/0000:00:01.1/sound/card0"
		device.bus = "pci"
		device.vendor.id = "1002"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD/ATI]"
		device.product.id = "9840"
		device.product.name = "Kabini HDMI/DP Audio"
		device.form_factor = "internal"
		device.string = "hdmi:0"
		device.buffering.buffer_size = "17664"
		device.buffering.fragment_size = "2944"
		device.access_mode = "mmap"
		device.profile.name = "hdmi-stereo"
		device.profile.description = "Digital Stereo (HDMI)"
		device.description = "Built-in Audio Digital Stereo (HDMI)"
		alsa.mixer_name = "ATI R6xx HDMI"
		alsa.components = "HDA:1002aa01,00aa0100,00100500"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Ports:
		hdmi-output-0: HDMI / DisplayPort (priority: 5900, not available)
	Active Port: hdmi-output-0
	Formats:
		pcm

Sink #1
	State: RUNNING
	Name: alsa_output.pci-0000_00_14.2.analog-stereo
	Description: Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 7
	Mute: yes
	Volume: front-left: 16096 /  25% / -36.59 dB,   front-right: 16096 /  25% / -36.59 dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor Source: alsa_output.pci-0000_00_14.2.analog-stereo.monitor
	Latency: 0 usec, configured 100136 usec
	Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY 
	Properties:
		alsa.resolution_bits = "16"
		device.api = "alsa"
		device.class = "sound"
		alsa.class = "generic"
		alsa.subclass = "generic-mix"
		alsa.name = "CX20756 Analog"
		alsa.id = "CX20756 Analog"
		alsa.subdevice = "0"
		alsa.subdevice_name = "subdevice #0"
		alsa.device = "0"
		alsa.card = "1"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:14.2"
		sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
		device.bus = "pci"
		device.vendor.id = "1022"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
		device.product.id = "780d"
		device.product.name = "FCH Azalia Controller"
		device.form_factor = "internal"
		device.string = "front:1"
		device.buffering.buffer_size = "17664"
		device.buffering.fragment_size = "2944"
		device.access_mode = "mmap"
		device.profile.name = "analog-stereo"
		device.profile.description = "Analog Stereo"
		device.description = "Built-in Audio Analog Stereo"
		alsa.mixer_name = "Conexant CX20756"
		alsa.components = "HDA:14f15114,1179f920,00100100"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Ports:
		analog-output: Analog Output (priority: 9900)
		analog-output-speaker: Speakers (priority: 10000, not available)
		analog-output-headphones: Headphones (priority: 9000, available)
	Active Port: analog-output-headphones
	Formats:
		pcm
-------------- next part --------------
Source #0
	State: SUSPENDED
	Name: alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor
	Description: Monitor of Built-in Audio Digital Stereo (HDMI)
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 6
	Mute: no
	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor of Sink: alsa_output.pci-0000_00_01.1.hdmi-stereo
	Latency: 0 usec, configured 0 usec
	Flags: DECIBEL_VOLUME LATENCY 
	Properties:
		device.description = "Monitor of Built-in Audio Digital Stereo (HDMI)"
		device.class = "monitor"
		alsa.card = "0"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1560000 irq 85"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:01.1"
		sysfs.path = "/devices/pci0000:00/0000:00:01.1/sound/card0"
		device.bus = "pci"
		device.vendor.id = "1002"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD/ATI]"
		device.product.id = "9840"
		device.product.name = "Kabini HDMI/DP Audio"
		device.form_factor = "internal"
		device.string = "0"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Formats:
		pcm

Source #1
	State: IDLE
	Name: alsa_output.pci-0000_00_14.2.analog-stereo.monitor
	Description: Monitor of Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 7
	Mute: no
	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor of Sink: alsa_output.pci-0000_00_14.2.analog-stereo
	Latency: 0 usec, configured 100136 usec
	Flags: DECIBEL_VOLUME LATENCY 
	Properties:
		device.description = "Monitor of Built-in Audio Analog Stereo"
		device.class = "monitor"
		alsa.card = "1"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:14.2"
		sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
		device.bus = "pci"
		device.vendor.id = "1022"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
		device.product.id = "780d"
		device.product.name = "FCH Azalia Controller"
		device.form_factor = "internal"
		device.string = "1"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Formats:
		pcm

Source #2
	State: SUSPENDED
	Name: alsa_input.pci-0000_00_14.2.analog-stereo
	Description: Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 7
	Mute: no
	Volume: front-left: 16462 /  25% / -36.00 dB,   front-right: 16462 /  25% / -36.00 dB
	        balance 0.00
	Base Volume: 13076 /  20% / -42.00 dB
	Monitor of Sink: n/a
	Latency: 0 usec, configured 0 usec
	Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY 
	Properties:
		alsa.resolution_bits = "16"
		device.api = "alsa"
		device.class = "sound"
		alsa.class = "generic"
		alsa.subclass = "generic-mix"
		alsa.name = "CX20756 Analog"
		alsa.id = "CX20756 Analog"
		alsa.subdevice = "0"
		alsa.subdevice_name = "subdevice #0"
		alsa.device = "0"
		alsa.card = "1"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:14.2"
		sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
		device.bus = "pci"
		device.vendor.id = "1022"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
		device.product.id = "780d"
		device.product.name = "FCH Azalia Controller"
		device.form_factor = "internal"
		device.string = "front:1"
		device.buffering.buffer_size = "17664"
		device.buffering.fragment_size = "2944"
		device.access_mode = "mmap"
		device.profile.name = "analog-stereo"
		device.profile.description = "Analog Stereo"
		device.description = "Built-in Audio Analog Stereo"
		alsa.mixer_name = "Conexant CX20756"
		alsa.components = "HDA:14f15114,1179f920,00100100"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Ports:
		analog-input-internal-mic: Internal Microphone (priority: 8900, not available)
		analog-input-mic: Microphone (priority: 8700, available)
	Active Port: analog-input-mic
	Formats:
		pcm
-------------- next part --------------
Module #0
	Name: module-device-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the volume/mute state of devices"
		module.version = "5.0"

Module #1
	Name: module-stream-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the volume/mute/device state of streams"
		module.version = "5.0"

Module #2
	Name: module-card-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore profile of cards"
		module.version = "5.0"

Module #3
	Name: module-augment-properties
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Augment the property sets of streams with additional static information"
		module.version = "5.0"

Module #4
	Name: module-switch-on-port-available
	Argument: 
	Usage counter: n/a
	Properties:
		

Module #5
	Name: module-udev-detect
	Argument: tsched=0
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Detect available audio hardware and load matching drivers"
		module.version = "5.0"

Module #6
	Name: module-alsa-card
	Argument: device_id="0" name="pci-0000_00_01.1" card_name="alsa_card.pci-0000_00_01.1" namereg_fail=false tsched=no fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"
	Usage counter: 0
	Properties:
		module.author = "Lennart Poettering"
		module.description = "ALSA Card"
		module.version = "5.0"

Module #7
	Name: module-alsa-card
	Argument: device_id="1" name="pci-0000_00_14.2" card_name="alsa_card.pci-0000_00_14.2" namereg_fail=false tsched=no fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"
	Usage counter: 3
	Properties:
		module.author = "Lennart Poettering"
		module.description = "ALSA Card"
		module.version = "5.0"

Module #8
	Name: module-native-protocol-unix
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Native protocol (UNIX sockets)"
		module.version = "5.0"

Module #9
	Name: module-default-device-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the default sink and source"
		module.version = "5.0"

Module #10
	Name: module-rescue-streams
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "When a sink/source is removed, try to move its streams to the default sink/source"
		module.version = "5.0"

Module #11
	Name: module-always-sink
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Always keeps at least one sink loaded even if it's a null one"
		module.version = "5.0"

Module #12
	Name: module-intended-roles
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically set device of streams based on intended roles of devices"
		module.version = "5.0"

Module #13
	Name: module-suspend-on-idle
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "When a sink/source is idle for too long, suspend it"
		module.version = "5.0"

Module #14
	Name: module-console-kit
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Create a client for each ConsoleKit session of this user"
		module.version = "5.0"

Module #15
	Name: module-systemd-login
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Create a client for each login session of this user"
		module.version = "5.0"

Module #16
	Name: module-position-event-sounds
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Position event sounds between L and R depending on the position on screen of the widget triggering them."
		module.version = "5.0"

Module #17
	Name: module-role-cork
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Mute & cork streams with certain roles while others exist"
		module.version = "5.0"

Module #18
	Name: module-filter-heuristics
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Detect when various filters are desirable"
		module.version = "5.0"

Module #19
	Name: module-filter-apply
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Load filter sinks automatically when needed"
		module.version = "5.0"
-------------- next part --------------
Server String: /run/user/1000/pulse/native
Library Protocol Version: 29
Server Protocol Version: 29
Is Local: yes
Client Index: 11
Tile Size: 65472
User Name: david
Host Name: fuileach
Server Name: pulseaudio
Server Version: 5.0
Default Sample Specification: s16le 2ch 44100Hz
Default Channel Map: front-left,front-right
Default Sink: alsa_output.pci-0000_00_14.2.analog-stereo
Default Source: alsa_input.pci-0000_00_14.2.analog-stereo
Cookie: 21a7:9489

From david.lynam at redbrick.dcu.ie  Wed Nov 26 19:54:56 2014
From: david.lynam at redbrick.dcu.ie (David =?UTF-8?Q?=C3=93_?= =?UTF-8?Q?Laighean=C3=A1in?=)
Date: Wed, 26 Nov 2014 19:54:56 +0000
Subject: Bug#771105: pulseaudio: Loops on daemon respawn
Message-ID: <20141126195456.8527.61243.reportbug@fuileach>

Package: pulseaudio
Version: 5.0-13
Severity: important

Dear Maintainer,

If playing a sound (may or may not be a prerequisite) when the Pulseaudio daemon is killed and respawned, it will become unusable. Any sounds thereafter experience an extreme latency and small snippets (< 1 second) are looped over and over rapidly. Changing volume becomes difficult as I assume the PA daemon is choked and is struggling to keep up with requests.

My reproduction steps:
- Run Clementine (output via PulseAudio).
- Play song.
- Run 'pulseaudio --kill && pulseaudio --start' as user.
- Clementine will fail to play anything else and get stuck at around 0:00 or 0:01, with a tiny snippet of the music being played over and over.
- Attempt to change volume. The 'volume change' sound in GNOME will loop over and over rapidly and the volume bar and hotkeys will become unresponsive.
- Restart PA again. The problem doesn't go away.
- Reboot and the problem is fixed, until the next time.

This shouldn't happen. Ideally, you should be able to restart PA as many times as you want at whatever speed and never have it become unusable.

Snippet from syslog is attached.

Thank you,
David.

-- Package-specific info:
File '/etc/default/pulseaudio' does not exist


-- System Information:
Debian Release: jessie/sid
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=ga_IE.UTF-8, LC_CTYPE=ga_IE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pulseaudio depends on:
ii  adduser                       3.113+nmu3
ii  libasound2                    1.0.28-1
ii  libasound2-plugins            1.0.28-1+b1
ii  libc6                         2.19-13
ii  libcap2                       1:2.24-6
ii  libdbus-1-3                   1.8.10-1
ii  libfftw3-single3              3.3.4-1.1
ii  libgcc1                       1:4.9.1-19
ii  libice6                       2:1.0.9-1
ii  libltdl7                      2.4.2-1.11
ii  liborc-0.4-0                  1:0.4.22-1
ii  libpulse0                     5.0-13
ii  libsamplerate0                0.1.8-8
ii  libsm6                        2:1.2.2-1
ii  libsndfile1                   1.0.25-9+b1
ii  libspeexdsp1                  1.2~rc1.2-1
ii  libstdc++6                    4.9.1-19
ii  libsystemd0                   215-5+b1
ii  libtdb1                       1.3.1-1
ii  libudev1                      215-5+b1
ii  libwebrtc-audio-processing-0  0.1-3
ii  libx11-6                      2:1.6.2-3
ii  libx11-xcb1                   2:1.6.2-3
ii  libxcb1                       1.10-3+b1
ii  libxtst6                      2:1.2.2-1+b1
ii  lsb-base                      4.1+Debian13+nmu1
ii  pulseaudio-utils              5.0-13
ii  udev                          215-5+b1

Versions of packages pulseaudio recommends:
ii  pulseaudio-module-x11  5.0-13
ii  rtkit                  0.11-2

Versions of packages pulseaudio suggests:
pn  paman        <none>
pn  paprefs      <none>
ii  pavucontrol  2.0-3
pn  pavumeter    <none>

-- Configuration Files:
/etc/pulse/default.pa changed:
..nofail
..fail
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore
load-module module-augment-properties
load-module module-switch-on-port-available
..ifexists module-udev-detect.so
load-module module-udev-detect tsched=0
..else
load-module module-detect tsched=0
..endif
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif
..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif
load-module module-default-device-restore
load-module module-rescue-streams
load-module module-always-sink
load-module module-intended-roles
load-module module-suspend-on-idle
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif
load-module module-position-event-sounds
load-module module-role-cork
load-module module-filter-heuristics
load-module module-filter-apply


-- no debconf information
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; default-sink =
; default-source =
; default-server =
; default-dbus-server =

; autospawn = yes
; daemon-binary = /usr/bin/pulseaudio
; extra-arguments = --log-target=syslog

; cookie-file =

; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB

; auto-connect-localhost = no
; auto-connect-display = no
-------------- next part --------------
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.

## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
## more information. Default values are commented out.  Use either ; or # for
## commenting.

; daemonize = no
; fail = yes
; allow-module-loading = yes
; allow-exit = yes
; use-pid-file = yes
; system-instance = no
; local-server-type = user
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no

; high-priority = yes
; nice-level = -11

; realtime-scheduling = yes
; realtime-priority = 5

; exit-idle-time = 20
; scache-idle-time = 20

; dl-search-path = (depends on architecture)

; load-default-script-file = yes
; default-script-file = /etc/pulse/default.pa

; log-target = auto
; log-level = notice
; log-meta = no
; log-time = no
; log-backtrace = 0

# resample-method defaults to  speex-float-1 on most architectures,
# speex-fixed-1 on ARM
; resample-method = speex-float-1
; enable-remixing = yes
; enable-lfe-remixing = no

; flat-volumes = yes

; rlimit-fsize = -1
; rlimit-data = -1
; rlimit-stack = -1
; rlimit-core = -1
; rlimit-as = -1
; rlimit-rss = -1
; rlimit-nproc = -1
; rlimit-nofile = 256
; rlimit-memlock = -1
; rlimit-locks = -1
; rlimit-sigpending = -1
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
; rlimit-rttime = 1000000

; default-sample-format = s16le
; default-sample-rate = 44100
; alternate-sample-rate = 48000
; default-sample-channels = 2
; default-channel-map = front-left,front-right

; default-fragments = 4
; default-fragment-size-msec = 25

; enable-deferred-volume = yes
; deferred-volume-safety-margin-usec = 8000
; deferred-volume-extra-delay-usec = 0
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)

..nofail

### Load something into the sample cache
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav

..fail

### Automatically restore the volume of streams and devices
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore

### Automatically augment property information from .desktop files
### stored in /usr/share/application
load-module module-augment-properties

### Should be after module-*-restore but before module-*-detect
load-module module-switch-on-port-available

### Load audio drivers statically
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
#load-module module-null-sink
#load-module module-pipe-sink

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect tsched=0
..else
### Use the static hardware detection module (for systems that lack udev support)
load-module module-detect tsched=0
..endif

### Automatically connect sink and source if JACK server is present
..ifexists module-jackdbus-detect.so
..nofail
load-module module-jackdbus-detect channels=2
..fail
..endif

### Automatically load driver modules for Bluetooth hardware
..ifexists module-bluetooth-policy.so
load-module module-bluetooth-policy
..endif

..ifexists module-bluetooth-discover.so
load-module module-bluetooth-discover
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish

### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv

### Load the RTP sender module (also configured via paprefs, see above)
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor

### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
..ifexists module-gconf.so
..nofail
load-module module-gconf
..fail
..endif

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Honour intended role device property
load-module module-intended-roles

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
..ifexists module-console-kit.so
load-module module-console-kit
..endif
..ifexists module-systemd-login.so
load-module module-systemd-login
..endif

### Enable positioned event sounds
load-module module-position-event-sounds

### Cork music/video streams when a phone stream is active
load-module module-role-cork

### Modules to allow autoloading of filters (such as echo cancellation)
### on demand. module-filter-heuristics tries to determine what filters
### make sense, and module-filter-apply does the heavy-lifting of
### loading modules and rerouting streams.
load-module module-filter-heuristics
load-module module-filter-apply

# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.

### Load X11 bell module
#load-module module-x11-bell sample=bell-windowing-system

### Register ourselves in the X11 session manager
#load-module module-x11-xsmp

### Publish connection data in the X11 root window
#.ifexists module-x11-publish.so
#.nofail
#load-module module-x11-publish
#.fail
#.endif

### Make some devices default
#set-default-sink output
#set-default-source input
-------------- next part --------------
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.

# This startup script is used only if PulseAudio is started in system
# mode.

### Automatically load driver modules depending on the hardware available
..ifexists module-udev-detect.so
load-module module-udev-detect
..else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
..endif

### Load several protocols
..ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
..endif
load-module module-native-protocol-unix

### Automatically restore the volume of streams and devices
load-module module-stream-restore
load-module module-device-restore

### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore

### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams

### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink

### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle

### Enable positioned event sounds
load-module module-position-event-sounds
-------------- next part --------------
default
    Playback/recording through the PulseAudio sound server
null
    Discard all samples (playback) or generate zero samples (capture)
pulse
    PulseAudio Sound Server
hdmi:CARD=Generic,DEV=0
    HD-Audio Generic, HDMI 0
    HDMI Audio Output
dmix:CARD=Generic,DEV=3
    HD-Audio Generic, HDMI 0
    Direct sample mixing device
dsnoop:CARD=Generic,DEV=3
    HD-Audio Generic, HDMI 0
    Direct sample snooping device
hw:CARD=Generic,DEV=3
    HD-Audio Generic, HDMI 0
    Direct hardware device without any conversions
plughw:CARD=Generic,DEV=3
    HD-Audio Generic, HDMI 0
    Hardware device with all software conversions
sysdefault:CARD=Generic_1
    HD-Audio Generic, CX20756 Analog
    Default Audio Device
front:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Front speakers
surround21:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    2.1 Surround output to Front and Subwoofer speakers
surround40:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    4.0 Surround output to Front and Rear speakers
surround41:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    4.1 Surround output to Front, Rear and Subwoofer speakers
surround50:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    5.0 Surround output to Front, Center and Rear speakers
surround51:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    5.1 Surround output to Front, Center, Rear and Subwoofer speakers
surround71:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    7.1 Surround output to Front, Center, Side, Rear and Woofer speakers
dmix:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Direct sample mixing device
dsnoop:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Direct sample snooping device
hw:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Direct hardware device without any conversions
plughw:CARD=Generic_1,DEV=0
    HD-Audio Generic, CX20756 Analog
    Hardware device with all software conversions
-------------- next part --------------
Card #0
	Name: alsa_card.pci-0000_00_01.1
	Driver: module-alsa-card.c
	Owner Module: 6
	Properties:
		alsa.card = "0"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1560000 irq 85"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:01.1"
		sysfs.path = "/devices/pci0000:00/0000:00:01.1/sound/card0"
		device.bus = "pci"
		device.vendor.id = "1002"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD/ATI]"
		device.product.id = "9840"
		device.product.name = "Kabini HDMI/DP Audio"
		device.form_factor = "internal"
		device.string = "0"
		device.description = "Built-in Audio"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Profiles:
		output:hdmi-stereo: Digital Stereo (HDMI) Output (sinks: 1, sources: 0, priority: 5400, available: yes)
		off: Off (sinks: 0, sources: 0, priority: 0, available: yes)
	Active Profile: output:hdmi-stereo
	Ports:
		hdmi-output-0: HDMI / DisplayPort (priority: 5900, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "video-display"
			Part of profile(s): output:hdmi-stereo

Card #1
	Name: alsa_card.pci-0000_00_14.2
	Driver: module-alsa-card.c
	Owner Module: 7
	Properties:
		alsa.card = "1"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:14.2"
		sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
		device.bus = "pci"
		device.vendor.id = "1022"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
		device.product.id = "780d"
		device.product.name = "FCH Azalia Controller"
		device.form_factor = "internal"
		device.string = "1"
		device.description = "Built-in Audio"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Profiles:
		input:analog-stereo: Analog Stereo Input (sinks: 0, sources: 1, priority: 60, available: yes)
		output:analog-stereo: Analog Stereo Output (sinks: 1, sources: 0, priority: 6000, available: yes)
		output:analog-stereo+input:analog-stereo: Analog Stereo Duplex (sinks: 1, sources: 1, priority: 6060, available: yes)
		off: Off (sinks: 0, sources: 0, priority: 0, available: yes)
	Active Profile: output:analog-stereo+input:analog-stereo
	Ports:
		analog-input-internal-mic: Internal Microphone (priority: 8900, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "audio-input-microphone"
			Part of profile(s): input:analog-stereo, output:analog-stereo+input:analog-stereo
		analog-input-mic: Microphone (priority: 8700, latency offset: 0 usec, available)
			Properties:
				device.icon_name = "audio-input-microphone"
			Part of profile(s): input:analog-stereo, output:analog-stereo+input:analog-stereo
		analog-output: Analog Output (priority: 9900, latency offset: 0 usec)
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo
		analog-output-speaker: Speakers (priority: 10000, latency offset: 0 usec, not available)
			Properties:
				device.icon_name = "audio-speakers"
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo
		analog-output-headphones: Headphones (priority: 9000, latency offset: 0 usec, available)
			Properties:
				device.icon_name = "audio-headphones"
			Part of profile(s): output:analog-stereo, output:analog-stereo+input:analog-stereo
-------------- next part --------------
Sink #0
	State: IDLE
	Name: alsa_output.pci-0000_00_01.1.hdmi-stereo
	Description: Built-in Audio Digital Stereo (HDMI)
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 6
	Mute: no
	Volume: front-left: 64071 /  98% / -0.59 dB,   front-right: 64071 /  98% / -0.59 dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor Source: alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor
	Latency: 100112 usec, configured 100136 usec
	Flags: HARDWARE DECIBEL_VOLUME LATENCY SET_FORMATS 
	Properties:
		alsa.resolution_bits = "16"
		device.api = "alsa"
		device.class = "sound"
		alsa.class = "generic"
		alsa.subclass = "generic-mix"
		alsa.name = "HDMI 0"
		alsa.id = "HDMI 0"
		alsa.subdevice = "0"
		alsa.subdevice_name = "subdevice #0"
		alsa.device = "3"
		alsa.card = "0"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1560000 irq 85"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:01.1"
		sysfs.path = "/devices/pci0000:00/0000:00:01.1/sound/card0"
		device.bus = "pci"
		device.vendor.id = "1002"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD/ATI]"
		device.product.id = "9840"
		device.product.name = "Kabini HDMI/DP Audio"
		device.form_factor = "internal"
		device.string = "hdmi:0"
		device.buffering.buffer_size = "17664"
		device.buffering.fragment_size = "2944"
		device.access_mode = "mmap"
		device.profile.name = "hdmi-stereo"
		device.profile.description = "Digital Stereo (HDMI)"
		device.description = "Built-in Audio Digital Stereo (HDMI)"
		alsa.mixer_name = "ATI R6xx HDMI"
		alsa.components = "HDA:1002aa01,00aa0100,00100500"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Ports:
		hdmi-output-0: HDMI / DisplayPort (priority: 5900, not available)
	Active Port: hdmi-output-0
	Formats:
		pcm

Sink #1
	State: RUNNING
	Name: alsa_output.pci-0000_00_14.2.analog-stereo
	Description: Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 7
	Mute: yes
	Volume: front-left: 0 /   0% / -inf dB,   front-right: 0 /   0% / -inf dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor Source: alsa_output.pci-0000_00_14.2.analog-stereo.monitor
	Latency: 0 usec, configured 100136 usec
	Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY 
	Properties:
		alsa.resolution_bits = "16"
		device.api = "alsa"
		device.class = "sound"
		alsa.class = "generic"
		alsa.subclass = "generic-mix"
		alsa.name = "CX20756 Analog"
		alsa.id = "CX20756 Analog"
		alsa.subdevice = "0"
		alsa.subdevice_name = "subdevice #0"
		alsa.device = "0"
		alsa.card = "1"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:14.2"
		sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
		device.bus = "pci"
		device.vendor.id = "1022"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
		device.product.id = "780d"
		device.product.name = "FCH Azalia Controller"
		device.form_factor = "internal"
		device.string = "front:1"
		device.buffering.buffer_size = "17664"
		device.buffering.fragment_size = "2944"
		device.access_mode = "mmap"
		device.profile.name = "analog-stereo"
		device.profile.description = "Analog Stereo"
		device.description = "Built-in Audio Analog Stereo"
		alsa.mixer_name = "Conexant CX20756"
		alsa.components = "HDA:14f15114,1179f920,00100100"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Ports:
		analog-output: Analog Output (priority: 9900)
		analog-output-speaker: Speakers (priority: 10000, not available)
		analog-output-headphones: Headphones (priority: 9000, available)
	Active Port: analog-output-headphones
	Formats:
		pcm
-------------- next part --------------
Source #0
	State: RUNNING
	Name: alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor
	Description: Monitor of Built-in Audio Digital Stereo (HDMI)
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 6
	Mute: no
	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor of Sink: alsa_output.pci-0000_00_01.1.hdmi-stereo
	Latency: 0 usec, configured 100136 usec
	Flags: DECIBEL_VOLUME LATENCY 
	Properties:
		device.description = "Monitor of Built-in Audio Digital Stereo (HDMI)"
		device.class = "monitor"
		alsa.card = "0"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1560000 irq 85"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:01.1"
		sysfs.path = "/devices/pci0000:00/0000:00:01.1/sound/card0"
		device.bus = "pci"
		device.vendor.id = "1002"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD/ATI]"
		device.product.id = "9840"
		device.product.name = "Kabini HDMI/DP Audio"
		device.form_factor = "internal"
		device.string = "0"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Formats:
		pcm

Source #1
	State: RUNNING
	Name: alsa_output.pci-0000_00_14.2.analog-stereo.monitor
	Description: Monitor of Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 7
	Mute: no
	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
	        balance 0.00
	Base Volume: 65536 / 100% / 0.00 dB
	Monitor of Sink: alsa_output.pci-0000_00_14.2.analog-stereo
	Latency: 0 usec, configured 100136 usec
	Flags: DECIBEL_VOLUME LATENCY 
	Properties:
		device.description = "Monitor of Built-in Audio Analog Stereo"
		device.class = "monitor"
		alsa.card = "1"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:14.2"
		sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
		device.bus = "pci"
		device.vendor.id = "1022"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
		device.product.id = "780d"
		device.product.name = "FCH Azalia Controller"
		device.form_factor = "internal"
		device.string = "1"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Formats:
		pcm

Source #2
	State: RUNNING
	Name: alsa_input.pci-0000_00_14.2.analog-stereo
	Description: Built-in Audio Analog Stereo
	Driver: module-alsa-card.c
	Sample Specification: s16le 2ch 44100Hz
	Channel Map: front-left,front-right
	Owner Module: 7
	Mute: no
	Volume: front-left: 16462 /  25% / -36.00 dB,   front-right: 16462 /  25% / -36.00 dB
	        balance 0.00
	Base Volume: 13076 /  20% / -42.00 dB
	Monitor of Sink: n/a
	Latency: 1696258 usec, configured 100136 usec
	Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY 
	Properties:
		alsa.resolution_bits = "16"
		device.api = "alsa"
		device.class = "sound"
		alsa.class = "generic"
		alsa.subclass = "generic-mix"
		alsa.name = "CX20756 Analog"
		alsa.id = "CX20756 Analog"
		alsa.subdevice = "0"
		alsa.subdevice_name = "subdevice #0"
		alsa.device = "0"
		alsa.card = "1"
		alsa.card_name = "HD-Audio Generic"
		alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
		alsa.driver_name = "snd_hda_intel"
		device.bus_path = "pci-0000:00:14.2"
		sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
		device.bus = "pci"
		device.vendor.id = "1022"
		device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
		device.product.id = "780d"
		device.product.name = "FCH Azalia Controller"
		device.form_factor = "internal"
		device.string = "front:1"
		device.buffering.buffer_size = "17664"
		device.buffering.fragment_size = "2944"
		device.access_mode = "mmap"
		device.profile.name = "analog-stereo"
		device.profile.description = "Analog Stereo"
		device.description = "Built-in Audio Analog Stereo"
		alsa.mixer_name = "Conexant CX20756"
		alsa.components = "HDA:14f15114,1179f920,00100100"
		module-udev-detect.discovered = "1"
		device.icon_name = "audio-card-pci"
	Ports:
		analog-input-internal-mic: Internal Microphone (priority: 8900, not available)
		analog-input-mic: Microphone (priority: 8700, available)
	Active Port: analog-input-mic
	Formats:
		pcm
-------------- next part --------------
Module #0
	Name: module-device-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the volume/mute state of devices"
		module.version = "5.0"

Module #1
	Name: module-stream-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the volume/mute/device state of streams"
		module.version = "5.0"

Module #2
	Name: module-card-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore profile of cards"
		module.version = "5.0"

Module #3
	Name: module-augment-properties
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Augment the property sets of streams with additional static information"
		module.version = "5.0"

Module #4
	Name: module-switch-on-port-available
	Argument: 
	Usage counter: n/a
	Properties:
		

Module #5
	Name: module-udev-detect
	Argument: tsched=0
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Detect available audio hardware and load matching drivers"
		module.version = "5.0"

Module #6
	Name: module-alsa-card
	Argument: device_id="0" name="pci-0000_00_01.1" card_name="alsa_card.pci-0000_00_01.1" namereg_fail=false tsched=no fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"
	Usage counter: 2
	Properties:
		module.author = "Lennart Poettering"
		module.description = "ALSA Card"
		module.version = "5.0"

Module #7
	Name: module-alsa-card
	Argument: device_id="1" name="pci-0000_00_14.2" card_name="alsa_card.pci-0000_00_14.2" namereg_fail=false tsched=no fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"
	Usage counter: 4
	Properties:
		module.author = "Lennart Poettering"
		module.description = "ALSA Card"
		module.version = "5.0"

Module #8
	Name: module-native-protocol-unix
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Native protocol (UNIX sockets)"
		module.version = "5.0"

Module #9
	Name: module-default-device-restore
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically restore the default sink and source"
		module.version = "5.0"

Module #10
	Name: module-rescue-streams
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "When a sink/source is removed, try to move its streams to the default sink/source"
		module.version = "5.0"

Module #11
	Name: module-always-sink
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Always keeps at least one sink loaded even if it's a null one"
		module.version = "5.0"

Module #12
	Name: module-intended-roles
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Automatically set device of streams based on intended roles of devices"
		module.version = "5.0"

Module #13
	Name: module-suspend-on-idle
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "When a sink/source is idle for too long, suspend it"
		module.version = "5.0"

Module #14
	Name: module-console-kit
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Create a client for each ConsoleKit session of this user"
		module.version = "5.0"

Module #15
	Name: module-systemd-login
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Create a client for each login session of this user"
		module.version = "5.0"

Module #16
	Name: module-position-event-sounds
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Position event sounds between L and R depending on the position on screen of the widget triggering them."
		module.version = "5.0"

Module #17
	Name: module-role-cork
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Lennart Poettering"
		module.description = "Mute & cork streams with certain roles while others exist"
		module.version = "5.0"

Module #18
	Name: module-filter-heuristics
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Detect when various filters are desirable"
		module.version = "5.0"

Module #19
	Name: module-filter-apply
	Argument: 
	Usage counter: n/a
	Properties:
		module.author = "Colin Guthrie"
		module.description = "Load filter sinks automatically when needed"
		module.version = "5.0"
-------------- next part --------------
Server String: /run/user/1000/pulse/native
Library Protocol Version: 29
Server Protocol Version: 29
Is Local: yes
Client Index: 20
Tile Size: 65472
User Name: david
Host Name: fuileach
Server Name: pulseaudio
Server Version: 5.0
Default Sample Specification: s16le 2ch 44100Hz
Default Channel Map: front-left,front-right
Default Sink: alsa_output.pci-0000_00_14.2.analog-stereo
Default Source: alsa_input.pci-0000_00_14.2.analog-stereo
Cookie: 21a7:9489
-------------- next part --------------
Nov 26 19:37:38 fuileach pulseaudio[4226]: Requested to rewind 17664 bytes.
Nov 26 19:37:38 fuileach pulseaudio[4226]: Limited to 17112 bytes.
Nov 26 19:37:38 fuileach pulseaudio[4226]: before: 4278
Nov 26 19:37:38 fuileach pulseaudio[4226]: after: 4278
Nov 26 19:37:38 fuileach pulseaudio[4226]: Rewound 17112 bytes.
Nov 26 19:37:38 fuileach pulseaudio[4226]: Processing rewind...
Nov 26 19:37:38 fuileach pulseaudio[4226]: latency = 0
Nov 26 19:37:38 fuileach pulseaudio[4226]: Volume change to 15618 at 254052604 was written 8001 usec late
Nov 26 19:37:38 fuileach pulseaudio[4226]: Processing rewind...
Nov 26 19:37:38 fuileach pulseaudio[4226]: Dropped redundant event due to change event.
Nov 26 19:37:44 fuileach pulseaudio[4226]: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
Nov 26 19:37:44 fuileach pulseaudio[4226]: Requested volume: front-left: 23086 /  35% / -27.19 dB,   front-right: 23086 /  35% / -27.19 dB
Nov 26 19:37:44 fuileach pulseaudio[4226]: Got hardware volume: front-left: 23253 /  35% / -27.00 dB,   front-right: 23253 /  35% / -27.00 dB
Nov 26 19:37:44 fuileach pulseaudio[4226]: Calculated software volume: front-left: 65065 /  99% / -0.19 dB,   front-right: 65065 /  99% / -0.19 dB (accurate-enough=yes)
Nov 26 19:37:44 fuileach pulseaudio[4226]: Volume going up to 23086 at 259907120
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7975 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7929 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output-headphones.
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7559 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7478 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7456 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7409 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7339 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7300 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 7279 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 6994 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Next volume change in 6677 usec
Nov 26 19:37:44 fuileach pulseaudio[4226]: Volume change to 23086 at 259907120 was written 45 usec late
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 364 bytes ago (17300 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Requested volume: front-left: 23496 /  36% / -26.73 dB,   front-right: 23496 /  36% / -26.73 dB
Nov 26 19:37:46 fuileach pulseaudio[4226]: Got hardware volume: front-left: 23613 /  36% / -26.60 dB,   front-right: 23613 /  36% / -26.60 dB
Nov 26 19:37:46 fuileach pulseaudio[4226]: Calculated software volume: front-left: 65211 / 100% / -0.13 dB,   front-right: 65211 / 100% / -0.13 dB (accurate-enough=yes)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Volume going up to 23496 at 261920446
Nov 26 19:37:46 fuileach pulseaudio[4226]: Requested to rewind 17664 bytes.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Limited to 17364 bytes.
Nov 26 19:37:46 fuileach pulseaudio[4226]: before: 4341
Nov 26 19:37:46 fuileach pulseaudio[4226]: after: 4341
Nov 26 19:37:46 fuileach pulseaudio[4226]: Rewound 17364 bytes.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Processing rewind...
Nov 26 19:37:46 fuileach pulseaudio[4226]: latency = 0
Nov 26 19:37:46 fuileach pulseaudio[4226]: Processing rewind...
Nov 26 19:37:46 fuileach pulseaudio[4226]: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Hmm, no streams around, trying to vacuum.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Freeing input 0 "bell-window-system"
Nov 26 19:37:46 fuileach pulseaudio[4226]: Restoring device for stream sink-input-by-media-role:event.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Not setting device for stream audio-volume-change, because already set.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Negotiated format: pcm, format.sample_format = "\"s16le\""  format.rate = "44100"  format.channels = "2"  format.channel_map = "\"front-left,front-right\""
Nov 26 19:37:46 fuileach pulseaudio[4226]: Restoring volume for sink input sink-input-by-media-role:event.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Restoring mute state for sink input sink-input-by-media-role:event.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
Nov 26 19:37:46 fuileach pulseaudio[4226]: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
Nov 26 19:37:46 fuileach pulseaudio[4226]: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
Nov 26 19:37:46 fuileach pulseaudio[4226]: Created input 1 "audio-volume-change" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
Nov 26 19:37:46 fuileach pulseaudio[4226]:     event.mouse.button = "1"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     event.mouse.y = "61"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     event.mouse.x = "1171"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     event.description = "Athra?odh an airde"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     event.id = "audio-volume-change"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     media.role = "event"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     media.name = "audio-volume-change"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     media.filename = "/usr/share//sounds/freedesktop/stereo/audio-volume-change.oga"
Nov 26 19:37:46 fuileach pulseaudio[4226]: Volume change to 23496 at 261920446 was written 31 usec late
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.name = "GNOME Shell"
Nov 26 19:37:46 fuileach pulseaudio[4226]: Written HW volume did not match with the request: front-left: 23496 /  36% / -26.73 dB,   front-right: 23496 /  36% / -26.73 dB (request) != front-left: 23253 /  35% / -27.00 dB,   front-right: 23253 /  35% / -27.00 dB
Nov 26 19:37:46 fuileach pulseaudio[4226]:     native-protocol.peer = "UNIX socket client"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     native-protocol.version = "29"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.id = "org.gnome.Shell"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.icon_name = "start-here"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.language = "ga_IE.UTF-8"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     window.x11.screen = "0"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     window.x11.display = ":0"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.process.id = "2224"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.process.user = "david"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.process.host = "fuileach"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.process.binary = "gnome-shell"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     application.process.session_id = "1"
Nov 26 19:37:46 fuileach pulseaudio[4226]:     module-stream-restore.id = "sink-input-by-media-role:event"
Nov 26 19:37:46 fuileach pulseaudio[4226]: Requested tlength=2000.00 ms, minreq=20.00 ms
Nov 26 19:37:46 fuileach pulseaudio[4226]: Traditional mode enabled, modifying sink usec only for compat with minreq.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Requested latency=1960.00 ms, Received latency=100.14 ms
Nov 26 19:37:46 fuileach pulseaudio[4226]: memblockq requested: maxlength=4194304, tlength=352800, base=4, prebuf=349276, minreq=3528 maxrewind=0
Nov 26 19:37:46 fuileach pulseaudio[4226]: memblockq sanitized: maxlength=4194304, tlength=352800, base=4, prebuf=349276, minreq=3528 maxrewind=0
Nov 26 19:37:46 fuileach pulseaudio[4226]: Final latency 2100.14 ms = 1960.00 ms + 2*20.00 ms + 100.14 ms
Nov 26 19:37:46 fuileach pulseaudio[4226]: Requested volume: front-left: 23086 /  35% / -27.19 dB,   front-right: 23086 /  35% / -27.19 dB
Nov 26 19:37:46 fuileach pulseaudio[4226]: Got hardware volume: front-left: 23253 /  35% / -27.00 dB,   front-right: 23253 /  35% / -27.00 dB
Nov 26 19:37:46 fuileach pulseaudio[4226]: Calculated software volume: front-left: 65065 /  99% / -0.19 dB,   front-right: 65065 /  99% / -0.19 dB (accurate-enough=yes)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Volume going down to 23086 at 261922724
Nov 26 19:37:46 fuileach pulseaudio[4226]: Volume change to 23086 at 261922724 was written 8344 usec late
Nov 26 19:37:46 fuileach pulseaudio[4226]: Requesting rewind due to end of underrun.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Requested to rewind 17664 bytes.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Limited to 17396 bytes.
Nov 26 19:37:46 fuileach pulseaudio[4226]: before: 4349
Nov 26 19:37:46 fuileach pulseaudio[4226]: after: 4349
Nov 26 19:37:46 fuileach pulseaudio[4226]: Rewound 17396 bytes.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Processing rewind...
Nov 26 19:37:46 fuileach pulseaudio[4226]: latency = 0
Nov 26 19:37:46 fuileach pulseaudio[4226]: Have to rewind 17396 bytes on render memblockq.
Nov 26 19:37:46 fuileach pulseaudio[4226]: Processing rewind...
Nov 26 19:37:46 fuileach pulseaudio[4226]: Implicit drain of 'audio-volume-change'
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 5952 bytes ago (11712 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9192 bytes ago (8472 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9220 bytes ago (8444 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9236 bytes ago (8428 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9252 bytes ago (8412 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9304 bytes ago (8360 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9320 bytes ago (8344 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9340 bytes ago (8324 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9352 bytes ago (8312 bytes ahead in playback buffer)
Nov 26 19:37:46 fuileach pulseaudio[4226]: Found underrun 9368 bytes ago (8296 bytes ahead in playback buffer)


From fsateler at debian.org  Wed Nov 26 20:19:06 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Wed, 26 Nov 2014 17:19:06 -0300
Subject: Bug#771105: pulseaudio: Loops on daemon respawn
In-Reply-To: <20141126195456.8527.61243.reportbug@fuileach>
References: <20141126195456.8527.61243.reportbug@fuileach>
Message-ID: <CAAfdZj9dtXx=qcKyfrC0KjXQneG+Q214Y9UicFm=GFSF9PjDjQ@mail.gmail.com>

On Wed, Nov 26, 2014 at 4:54 PM, David ? Laighean?in
<david.lynam at redbrick.dcu.ie> wrote:
> Package: pulseaudio
> Version: 5.0-13
> Severity: important
>
> Dear Maintainer,
>
> If playing a sound (may or may not be a prerequisite) when the Pulseaudio daemon is killed and respawned, it will become unusable. Any sounds thereafter experience an extreme latency and small snippets (< 1 second) are looped over and over rapidly. Changing volume becomes difficult as I assume the PA daemon is choked and is struggling to keep up with requests.
>
> My reproduction steps:
> - Run Clementine (output via PulseAudio).
> - Play song.
> - Run 'pulseaudio --kill && pulseaudio --start' as user.
> - Clementine will fail to play anything else and get stuck at around 0:00 or 0:01, with a tiny snippet of the music being played over and over.
> - Attempt to change volume. The 'volume change' sound in GNOME will loop over and over rapidly and the volume bar and hotkeys will become unresponsive.
> - Restart PA again. The problem doesn't go away.
> - Reboot and the problem is fixed, until the next time.
>
> This shouldn't happen. Ideally, you should be able to restart PA as many times as you want at whatever speed and never have it become unusable.

What happens if you restart clementine? I think the problem is with
the client that doesn't handle a dying server.



-- 

Saludos,
Felipe Sateler


From david.lynam at redbrick.dcu.ie  Wed Nov 26 20:26:45 2014
From: david.lynam at redbrick.dcu.ie (David Lynam)
Date: Wed, 26 Nov 2014 20:26:45 +0000
Subject: Bug#771105: pulseaudio: Loops on daemon respawn
In-Reply-To: <CAAfdZj9dtXx=qcKyfrC0KjXQneG+Q214Y9UicFm=GFSF9PjDjQ@mail.gmail.com>
References: <20141126195456.8527.61243.reportbug@fuileach>
 <CAAfdZj9dtXx=qcKyfrC0KjXQneG+Q214Y9UicFm=GFSF9PjDjQ@mail.gmail.com>
Message-ID: <20141126202644.GA29873@pygmalion>

Killing/restarting Clementine doesn't make a difference.

I actually just rebooted a few minutes ago. As soon as GNOME loaded,
before doing anything else, I adjusted my volume (it was muted). The
problem appeared immediately. Is PA trying to restore some kind of
broken state?

I have attached a syslog snippet from a couple of minutes ago.

Thanks for the reply, Felipe.

On Wed, Nov 26, 2014 at 05:19:06PM -0300, Felipe Sateler wrote:
> On Wed, Nov 26, 2014 at 4:54 PM, David ? Laighean?in
> <david.lynam at redbrick.dcu.ie> wrote:
> > Package: pulseaudio
> > Version: 5.0-13
> > Severity: important
> >
> > Dear Maintainer,
> >
> > If playing a sound (may or may not be a prerequisite) when the Pulseaudio daemon is killed and respawned, it will become unusable. Any sounds thereafter experience an extreme latency and small snippets (< 1 second) are looped over and over rapidly. Changing volume becomes difficult as I assume the PA daemon is choked and is struggling to keep up with requests.
> >
> > My reproduction steps:
> > - Run Clementine (output via PulseAudio).
> > - Play song.
> > - Run 'pulseaudio --kill && pulseaudio --start' as user.
> > - Clementine will fail to play anything else and get stuck at around 0:00 or 0:01, with a tiny snippet of the music being played over and over.
> > - Attempt to change volume. The 'volume change' sound in GNOME will loop over and over rapidly and the volume bar and hotkeys will become unresponsive.
> > - Restart PA again. The problem doesn't go away.
> > - Reboot and the problem is fixed, until the next time.
> >
> > This shouldn't happen. Ideally, you should be able to restart PA as many times as you want at whatever speed and never have it become unusable.
> 
> What happens if you restart clementine? I think the problem is with
> the client that doesn't handle a dying server.
> 
> 
> 
> -- 
> 
> Saludos,
> Felipe Sateler
> 

-- 
Please consider using PGP to encrypt/sign your e-mails so that nobody other than
the intended recipient can read them. Privacy is important.

My public PGP key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xDA2E99B41C39C7D2
-------------- next part --------------
Nov 26 20:24:31 fuileach pulseaudio[5728]: [pulseaudio] pid.c: Daemon already running.
Nov 26 20:24:31 fuileach pulseaudio[5720]: Created 1 "Native client (UNIX socket client)"
Nov 26 20:24:31 fuileach pulseaudio[5720]: Protocol version: remote 29, local 29
Nov 26 20:24:31 fuileach pulseaudio[5720]: Got credentials: uid=1000 gid=1000 success=1
Nov 26 20:24:31 fuileach pulseaudio[5720]: SHM possible: yes
Nov 26 20:24:31 fuileach pulseaudio[5720]: Negotiated SHM: yes
Nov 26 20:24:31 fuileach pulseaudio[5720]: Looking for .desktop file for gnome-shell
Nov 26 20:24:31 fuileach pulseaudio[5720]: Found /usr/share/applications/gnome-shell.desktop.
Nov 26 20:24:33 fuileach gnome-session[2200]: (gnome-settings-daemon:2261): media-keys-plugin-WARNING **: Unable to get default sink
Nov 26 20:24:33 fuileach pulseaudio[5720]: Created 2 "Native client (UNIX socket client)"
Nov 26 20:24:33 fuileach pulseaudio[5720]: Protocol version: remote 29, local 29
Nov 26 20:24:33 fuileach pulseaudio[5720]: Got credentials: uid=1000 gid=1000 success=1
Nov 26 20:24:33 fuileach pulseaudio[5720]: SHM possible: yes
Nov 26 20:24:33 fuileach pulseaudio[5720]: Negotiated SHM: yes
Nov 26 20:24:33 fuileach pulseaudio[5720]: Looking for .desktop file for gnome-settings-daemon
Nov 26 20:24:33 fuileach gnome-session[2200]: (gnome-settings-daemon:2261): media-keys-plugin-WARNING **: Unable to get default source
Nov 26 20:24:33 fuileach pulseaudio[5720]: Created 3 "Native client (UNIX socket client)"
Nov 26 20:24:33 fuileach pulseaudio[5720]: Protocol version: remote 29, local 29
Nov 26 20:24:33 fuileach pulseaudio[5720]: Got credentials: uid=1000 gid=1000 success=1
Nov 26 20:24:33 fuileach pulseaudio[5720]: SHM possible: yes
Nov 26 20:24:33 fuileach pulseaudio[5720]: Negotiated SHM: yes
Nov 26 20:24:33 fuileach pulseaudio[5720]: Looking for .desktop file for gnome-shell
Nov 26 20:24:36 fuileach pulseaudio[5720]: Source alsa_input.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
Nov 26 20:24:36 fuileach pulseaudio[5720]: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
Nov 26 20:24:36 fuileach pulseaudio[5720]: Device suspended...
Nov 26 20:24:36 fuileach pulseaudio[5720]: Hmm, no streams around, trying to vacuum.
Nov 26 20:24:36 fuileach pulseaudio[5720]: Sink alsa_output.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
Nov 26 20:24:36 fuileach pulseaudio[5720]: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
Nov 26 20:24:36 fuileach pulseaudio[5720]: Device suspended...
Nov 26 20:24:36 fuileach pulseaudio[5720]: Hmm, no streams around, trying to vacuum.
Nov 26 20:24:36 fuileach pulseaudio[5720]: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo idle for too long, suspending ...
Nov 26 20:24:36 fuileach pulseaudio[5720]: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0004, suspending
Nov 26 20:24:36 fuileach pulseaudio[5720]: Device suspended...
Nov 26 20:24:36 fuileach pulseaudio[5720]: Hmm, no streams around, trying to vacuum.
Nov 26 20:24:36 fuileach pulseaudio[5720]: /dev/snd/controlC0 is accessible: yes
Nov 26 20:24:36 fuileach pulseaudio[5720]: Resuming all sinks and sources of card alsa_card.pci-0000_00_01.1.
Nov 26 20:24:36 fuileach pulseaudio[5720]: /dev/snd/controlC1 is accessible: yes
Nov 26 20:24:36 fuileach pulseaudio[5720]: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
Nov 26 20:24:41 fuileach pulseaudio[5720]: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
Nov 26 20:24:41 fuileach pulseaudio[5720]: Requested volume: front-left: 26739 /  41% / -23.36 dB,   front-right: 26739 /  41% / -23.36 dB
Nov 26 20:24:41 fuileach pulseaudio[5720]: Got hardware volume: front-left: 26904 /  41% / -23.20 dB,   front-right: 26904 /  41% / -23.20 dB
Nov 26 20:24:41 fuileach pulseaudio[5720]: Calculated software volume: front-left: 65134 /  99% / -0.16 dB,   front-right: 65134 /  99% / -0.16 dB (accurate-enough=yes)
Nov 26 20:24:41 fuileach pulseaudio[5720]: Volume going down to 26739 at 424200778
Nov 26 20:24:41 fuileach pulseaudio[5720]: Volume change to 26739 at 424200778 was written 8050 usec late
Nov 26 20:24:41 fuileach pulseaudio[5720]: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output-headphones.
Nov 26 20:24:41 fuileach pulseaudio[5720]: Restoring device for stream sink-input-by-media-role:event.
Nov 26 20:24:41 fuileach pulseaudio[5720]: Not setting device for stream audio-volume-change, because already set.
Nov 26 20:24:41 fuileach pulseaudio[5720]: Negotiated format: pcm, format.sample_format = "\"s16le\""  format.rate = "44100"  format.channels = "2"  format.channel_map = "\"front-left,front-right\""
Nov 26 20:24:41 fuileach pulseaudio[5720]: Restoring volume for sink input sink-input-by-media-role:event.
Nov 26 20:24:41 fuileach pulseaudio[5720]: Restoring mute state for sink input sink-input-by-media-role:event.
Nov 26 20:24:41 fuileach pulseaudio[5720]: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
Nov 26 20:24:41 fuileach pulseaudio[5720]: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
Nov 26 20:24:43 fuileach pulseaudio[5720]: Successfully acquired reservation lock on device 'Audio1'
Nov 26 20:24:43 fuileach pulseaudio[5720]: Trying resume...
Nov 26 20:24:43 fuileach pulseaudio[5720]: Maximum hw buffer size is 371 ms
Nov 26 20:24:43 fuileach pulseaudio[5720]: Set buffer size first (to 4416 samples), period size second (to 736 samples).
Nov 26 20:24:43 fuileach pulseaudio[5720]: hwbuf_unused=0
Nov 26 20:24:43 fuileach pulseaudio[5720]: setting avail_min=1
Nov 26 20:24:43 fuileach pulseaudio[5720]: Resumed successfully...
Nov 26 20:24:43 fuileach pulseaudio[5720]: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
Nov 26 20:24:43 fuileach pulseaudio[5720]: Starting playback.
Nov 26 20:24:43 fuileach pulseaudio[5720]: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
Nov 26 20:24:43 fuileach pulseaudio[5720]: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
Nov 26 20:24:43 fuileach pulseaudio[5720]: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
Nov 26 20:24:43 fuileach pulseaudio[5720]: Created input 0 "audio-volume-change" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
Nov 26 20:24:43 fuileach pulseaudio[5720]:     event.mouse.button = "1"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     event.mouse.y = "70"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     event.mouse.x = "1183"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     event.description = "Athra?odh an airde"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     event.id = "audio-volume-change"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     media.role = "event"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     media.name = "audio-volume-change"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     media.filename = "/usr/share//sounds/freedesktop/stereo/audio-volume-change.oga"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.name = "GNOME Shell"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     native-protocol.peer = "UNIX socket client"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     native-protocol.version = "29"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.id = "org.gnome.Shell"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.icon_name = "start-here"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.language = "ga_IE.UTF-8"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     window.x11.screen = "0"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     window.x11.display = ":0"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.process.id = "2314"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.process.user = "david"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.process.host = "fuileach"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.process.binary = "gnome-shell"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     application.process.session_id = "1"
Nov 26 20:24:43 fuileach pulseaudio[5720]:     module-stream-restore.id = "sink-input-by-media-role:event"
Nov 26 20:24:43 fuileach pulseaudio[5720]: Requested tlength=2000.00 ms, minreq=20.00 ms
Nov 26 20:24:43 fuileach pulseaudio[5720]: Traditional mode enabled, modifying sink usec only for compat with minreq.
Nov 26 20:24:43 fuileach pulseaudio[5720]: Requested latency=1960.00 ms, Received latency=100.14 ms
Nov 26 20:24:43 fuileach pulseaudio[5720]: memblockq requested: maxlength=4194304, tlength=352800, base=4, prebuf=349276, minreq=3528 maxrewind=0
Nov 26 20:24:43 fuileach pulseaudio[5720]: memblockq sanitized: maxlength=4194304, tlength=352800, base=4, prebuf=349276, minreq=3528 maxrewind=0
Nov 26 20:24:43 fuileach pulseaudio[5720]: Final latency 2100.14 ms = 1960.00 ms + 2*20.00 ms + 100.14 ms
Nov 26 20:24:43 fuileach pulseaudio[5720]: Requested volume: front-left: 26272 /  40% / -23.82 dB,   front-right: 26272 /  40% / -23.82 dB
Nov 26 20:24:43 fuileach pulseaudio[5720]: Got hardware volume: front-left: 26291 /  40% / -23.80 dB,   front-right: 26291 /  40% / -23.80 dB
Nov 26 20:24:43 fuileach pulseaudio[5720]: Calculated software volume: front-left: 65489 / 100% / -0.02 dB,   front-right: 65489 / 100% / -0.02 dB (accurate-enough=yes)
Nov 26 20:24:43 fuileach pulseaudio[5720]: Volume going down to 26272 at 426329062
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 90708 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 90304 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 89938 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Dropped redundant event due to change event.
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 89547 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 88804 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 88402 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 88037 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 87636 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 87261 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 86442 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Next volume change in 86004 usec
Nov 26 20:24:43 fuileach pulseaudio[5720]: Requesting rewind due to end of underrun.
Nov 26 20:24:43 fuileach pulseaudio[5720]: Requested to rewind 17664 bytes.
Nov 26 20:24:43 fuileach pulseaudio[5720]: Limited to 17268 bytes.
Nov 26 20:24:43 fuileach pulseaudio[5720]: before: 4317
Nov 26 20:24:43 fuileach pulseaudio[5720]: after: 4317
Nov 26 20:24:43 fuileach pulseaudio[5720]: Rewound 17268 bytes.
Nov 26 20:24:43 fuileach pulseaudio[5720]: Processing rewind...
Nov 26 20:24:43 fuileach pulseaudio[5720]: latency = 0
Nov 26 20:24:43 fuileach pulseaudio[5720]: Volume change to 26272 at 426238963 was written 8003 usec late
Nov 26 20:24:45 fuileach pulseaudio[5720]: Have to rewind 17268 bytes on render memblockq.
Nov 26 20:24:45 fuileach pulseaudio[5720]: Processing rewind...
Nov 26 20:24:45 fuileach pulseaudio[5720]: Implicit drain of 'audio-volume-change'
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7240 bytes ago (10424 bytes ahead in playback buffer)
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7268 bytes ago (10396 bytes ahead in playback buffer)
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7284 bytes ago (10380 bytes ahead in playback buffer)
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7300 bytes ago (10364 bytes ahead in playback buffer)
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7328 bytes ago (10336 bytes ahead in playback buffer)
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7356 bytes ago (10308 bytes ahead in playback buffer)
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7376 bytes ago (10288 bytes ahead in playback buffer)
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7396 bytes ago (10268 bytes ahead in playback buffer)
Nov 26 20:24:45 fuileach pulseaudio[5720]: Found underrun 7420 bytes ago (10244 bytes ahead in playback buffer)
Nov 26 20:24:51 fuileach pulseaudio[5720]: Synced.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141126/485794a2/attachment.sig>

From fsateler at debian.org  Wed Nov 26 20:32:54 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Wed, 26 Nov 2014 17:32:54 -0300
Subject: Bug#771105: pulseaudio: Loops on daemon respawn
In-Reply-To: <20141126202644.GA29873@pygmalion>
References: <20141126195456.8527.61243.reportbug@fuileach>
 <CAAfdZj9dtXx=qcKyfrC0KjXQneG+Q214Y9UicFm=GFSF9PjDjQ@mail.gmail.com>
 <20141126202644.GA29873@pygmalion>
Message-ID: <CAAfdZj8URs+a3ZnuWQ5uy_34uGQgB8ZimAiPDZMwDpnxFpGrDg@mail.gmail.com>

On Wed, Nov 26, 2014 at 5:26 PM, David Lynam
<david.lynam at redbrick.dcu.ie> wrote:
> Killing/restarting Clementine doesn't make a difference.
>
> I actually just rebooted a few minutes ago. As soon as GNOME loaded,
> before doing anything else, I adjusted my volume (it was muted). The
> problem appeared immediately. Is PA trying to restore some kind of
> broken state?
>
> I have attached a syslog snippet from a couple of minutes ago.

Is the cpu usage high when this happens? If so, is pulseaudio or the
client using the cpu?

Please run pulseaudio in verbose mode and attach that log[1].

BTW, why did you add tsched=0 ? The default is to disable timer based
scheduling as well.

[1] https://wiki.ubuntu.com/PulseAudio/Log

-- 

Saludos,
Felipe Sateler


From owner at bugs.debian.org  Wed Nov 26 20:36:26 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Wed, 26 Nov 2014 20:36:26 +0000
Subject: Processed: Re: Bug#765848: pulseaudio: selects wrong output after
 unplugging headphone or similar (regression from wheezy)
References: <CAAfdZj8us2mos6pSr9tFDVtWSoXhbL16VhmHVCyqoaeosSH4XQ@mail.gmail.com>
 <20141018194537.GA16879@debian.org>
Message-ID: <handler.s.B765848.14170341433094.transcript@bugs.debian.org>

Processing control commands:

> forwarded -1 https://bugs.freedesktop.org/show_bug.cgi?id=85488
Bug #765848 [pulseaudio] pulseaudio: selects wrong output after unplugging headphone or similar (regression from wheezy)
Set Bug forwarded-to-address to 'https://bugs.freedesktop.org/show_bug.cgi?id=85488'.
> tags -1 = upstream
Bug #765848 [pulseaudio] pulseaudio: selects wrong output after unplugging headphone or similar (regression from wheezy)
Added tag(s) upstream; removed tag(s) moreinfo.

-- 
765848: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765848
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From fsateler at debian.org  Wed Nov 26 20:34:56 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Wed, 26 Nov 2014 17:34:56 -0300
Subject: Bug#765848: pulseaudio: selects wrong output after unplugging
 headphone or similar (regression from wheezy)
In-Reply-To: <20141126194409.5581.27853.reportbug@fuileach>
References: <20141126194409.5581.27853.reportbug@fuileach>
Message-ID: <CAAfdZj8us2mos6pSr9tFDVtWSoXhbL16VhmHVCyqoaeosSH4XQ@mail.gmail.com>

Control: forwarded -1 https://bugs.freedesktop.org/show_bug.cgi?id=85488
Control: tags -1 = upstream

On Wed, Nov 26, 2014 at 4:44 PM, David ? Laighean?in
<david.lynam at redbrick.dcu.ie> wrote:
> Package: pulseaudio
> Version: 5.0-13
> Followup-For: Bug #765848
>
> I am experiencing the same problem. Sometimes, disconnecting the headphones doesn't route
> sound via the speakers. If I do connect my headphones, I will often have to open pavucontrol
> and select 'Speakers' instead of 'Analog Output'. The reverse sometimes happens when I
> connect my headphones.

This seems to be the same bug as linked above. Unfortunately, this
needs further work upstream and it was not fixed for the next 6.0
release :(


-- 

Saludos,
Felipe Sateler


From david.lynam at redbrick.dcu.ie  Wed Nov 26 20:06:38 2014
From: david.lynam at redbrick.dcu.ie (David Lynam)
Date: Wed, 26 Nov 2014 20:06:38 +0000
Subject: Bug#771105: Acknowledgement (pulseaudio: Loops on daemon respawn)
In-Reply-To: <handler.771105.B.141703170219306.ack@bugs.debian.org>
References: <20141126195456.8527.61243.reportbug@fuileach>
 <handler.771105.B.141703170219306.ack@bugs.debian.org>
Message-ID: <20141126200638.GA27105@pygmalion>

Oh, if you try to change the volume while this is happening, as it
loops, GNOME locks up (although the mouse still moves) for a few
seconds.

On Wed, Nov 26, 2014 at 07:57:12PM +0000, Debian Bug Tracking System wrote:
> Thank you for filing a new Bug report with Debian.
> 
> This is an automatically generated reply to let you know your message
> has been received.
> 
> Your message is being forwarded to the package maintainers and other
> interested parties for their attention; they will reply in due course.
> 
> As you requested using X-Debbugs-CC, your message was also forwarded to
>   david.lynam at redbrick.dcu.ie
> (after having been given a Bug report number, if it did not have one).
> 
> Your message has been sent to the package maintainer(s):
>  Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
> 
> If you wish to submit further information on this problem, please
> send it to 771105 at bugs.debian.org.
> 
> Please do not send mail to owner at bugs.debian.org unless you wish
> to report a problem with the Bug-tracking system.
> 
> -- 
> 771105: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771105
> Debian Bug Tracking System
> Contact owner at bugs.debian.org with problems
> 

-- 
Please consider using PGP to encrypt/sign your e-mails so that nobody other than
the intended recipient can read them. Privacy is important.

My public PGP key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xDA2E99B41C39C7D2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141126/58c08638/attachment.sig>

From owner at bugs.debian.org  Wed Nov 26 20:51:05 2014
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Wed, 26 Nov 2014 20:51:05 +0000
Subject: Bug#764862: marked as done (pulseaudio: global config files not
 updated on upgrade - result no sound on default output)
References: <CAAfdZj9f964awhppASCfPF8439gHFPB8XEVimJAC9cuDpUTsCw@mail.gmail.com>
 <20141011165913.12142.9032.reportbug@sid.lan>
Message-ID: <handler.764862.D764862.14170347786943.ackdone@bugs.debian.org>

Your message dated Wed, 26 Nov 2014 17:45:31 -0300
with message-id <CAAfdZj9f964awhppASCfPF8439gHFPB8XEVimJAC9cuDpUTsCw at mail.gmail.com>
and subject line Re: Bug#764862: pulseaudio: global config files not updated on upgrade - result no sound on default output
has caused the Debian Bug report #764862,
regarding pulseaudio: global config files not updated on upgrade - result no sound on default output
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner at bugs.debian.org
immediately.)


-- 
764862: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764862
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems
-------------- next part --------------
An embedded message was scrubbed...
From: Lukasz Miller <lukanusm at gmail.com>
Subject: pulseaudio: global config files not updated on upgrade - result no sound on default output
Date: Sat, 11 Oct 2014 18:59:13 +0200
Size: 40944
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141126/143553ab/attachment-0002.mht>
-------------- next part --------------
An embedded message was scrubbed...
From: Felipe Sateler <fsateler at debian.org>
Subject: Re: Bug#764862: pulseaudio: global config files not updated on upgrade - result no sound on default output
Date: Wed, 26 Nov 2014 17:45:31 -0300
Size: 3308
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141126/143553ab/attachment-0003.mht>

From david.lynam at redbrick.dcu.ie  Wed Nov 26 21:41:29 2014
From: david.lynam at redbrick.dcu.ie (David Lynam)
Date: Wed, 26 Nov 2014 21:41:29 +0000
Subject: Bug#771105: pulseaudio: Loops on daemon respawn
In-Reply-To: <CAAfdZj8URs+a3ZnuWQ5uy_34uGQgB8ZimAiPDZMwDpnxFpGrDg@mail.gmail.com>
References: <20141126195456.8527.61243.reportbug@fuileach>
 <CAAfdZj9dtXx=qcKyfrC0KjXQneG+Q214Y9UicFm=GFSF9PjDjQ@mail.gmail.com>
 <20141126202644.GA29873@pygmalion>
 <CAAfdZj8URs+a3ZnuWQ5uy_34uGQgB8ZimAiPDZMwDpnxFpGrDg@mail.gmail.com>
Message-ID: <20141126214128.GA5842@pygmalion>

If I have Clementine open and it's trying to play something while stuck, it will get to about 10% CPU.
If GNOME Shell is the cause (for example, if I hold down the volume
change key combination), this reaches about 5% CPU.

During YouTube playback, Iceweasel gets to 13-15% CPU.

For a few seconds during the start of the loop, two Pulseaudio processes
will reach 3-5% CPU each, then die down a bit.

However, if I trigger this with a volume change, a few seconds later I
can still hear the looping and GNOME Shell is a bit unresponsive, but
none of the processes in question register >0.0% CPU usage.

I added tsched=0 because I was getting horrific distortion and echoing
from the likes of Google Hangouts. I thought timer-based scheduling was
on by default and tsched=0 enables the older, interrupt-based
scheduling.

Log is attached. The problem is present from the very start of the
process. In it, I:

- change volume via GNOME shell
- play a song in Clementine (and kill Clementine)
- play a sound in Iceweasel
- play a YouTube video in Iceweasel (uses non-free Flash)

Regards,
David


On Wed, Nov 26, 2014 at 05:32:54PM -0300, Felipe Sateler wrote:
> On Wed, Nov 26, 2014 at 5:26 PM, David Lynam
> <david.lynam at redbrick.dcu.ie> wrote:
> > Killing/restarting Clementine doesn't make a difference.
> >
> > I actually just rebooted a few minutes ago. As soon as GNOME loaded,
> > before doing anything else, I adjusted my volume (it was muted). The
> > problem appeared immediately. Is PA trying to restore some kind of
> > broken state?
> >
> > I have attached a syslog snippet from a couple of minutes ago.
> 
> Is the cpu usage high when this happens? If so, is pulseaudio or the
> client using the cpu?
> 
> Please run pulseaudio in verbose mode and attach that log[1].
> 
> BTW, why did you add tsched=0 ? The default is to disable timer based
> scheduling as well.
> 
> [1] https://wiki.ubuntu.com/PulseAudio/Log
> 
> -- 
> 
> Saludos,
> Felipe Sateler
> 

-- 
Please consider using PGP to encrypt/sign your e-mails so that nobody other than
the intended recipient can read them. Privacy is important.

My public PGP key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xDA2E99B41C39C7D2
-------------- next part --------------
(   0.000|   0.000) I: [pulseaudio] main.c: setrlimit(RLIMIT_NICE, (31, 31)) failed: Operation not permitted
(   0.000|   0.000) I: [pulseaudio] main.c: setrlimit(RLIMIT_RTPRIO, (9, 9)) failed: Operation not permitted
(   0.000|   0.000) D: [pulseaudio] core-rtclock.c: Timer slack is set to 50 us.
(   0.008|   0.007) D: [pulseaudio] core-util.c: RealtimeKit worked.
(   0.008|   0.000) I: [pulseaudio] core-util.c: Successfully gained nice level -11.
(   0.008|   0.000) I: [pulseaudio] main.c: This is PulseAudio 5.0
(   0.008|   0.000) D: [pulseaudio] main.c: Compilation host: x86_64-pc-linux-gnu
(   0.008|   0.000) D: [pulseaudio] main.c: Compilation CFLAGS: -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -fno-common -fdiagnostics-show-option
(   0.008|   0.000) D: [pulseaudio] main.c: Running on host: Linux x86_64 3.16.0-4-amd64 #1 SMP Debian 3.16.7-2 (2014-11-06)
(   0.008|   0.000) D: [pulseaudio] main.c: Found 4 CPUs.
(   0.008|   0.000) I: [pulseaudio] main.c: Page size is 4096 bytes
(   0.008|   0.000) D: [pulseaudio] main.c: Compiled with Valgrind support: no
(   0.008|   0.000) D: [pulseaudio] main.c: Running in valgrind mode: no
(   0.008|   0.000) D: [pulseaudio] main.c: Running in VM: no
(   0.008|   0.000) D: [pulseaudio] main.c: Optimized build: yes
(   0.008|   0.000) D: [pulseaudio] main.c: FASTPATH defined, only fast path asserts disabled.
(   0.008|   0.000) I: [pulseaudio] main.c: Machine ID is fb75a029cab0d31b5676ade754660933.
(   0.008|   0.000) I: [pulseaudio] main.c: Session ID is 1.
(   0.008|   0.000) I: [pulseaudio] main.c: Using runtime directory /run/user/1000/pulse.
(   0.008|   0.000) I: [pulseaudio] main.c: Using state directory /home/david/.pulse.
(   0.008|   0.000) I: [pulseaudio] main.c: Using modules directory /usr/lib/pulse-5.0/modules.
(   0.008|   0.000) I: [pulseaudio] main.c: Running in system mode: no
(   0.008|   0.000) I: [pulseaudio] main.c: Fresh high-resolution timers available! Bon appetit!
(   0.009|   0.000) D: [pulseaudio] memblock.c: Using shared memory pool with 1024 slots of size 64.0 KiB each, total size is 64.0 MiB, maximum usable slot size is 65472
(   0.009|   0.000) I: [pulseaudio] cpu-x86.c: CPU flags: CMOV MMX SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 MMXEXT 
(   0.009|   0.000) I: [pulseaudio] svolume_mmx.c: Initialising MMX optimized volume functions.
(   0.009|   0.000) I: [pulseaudio] remap_mmx.c: Initialising MMX optimized remappers.
(   0.009|   0.000) I: [pulseaudio] svolume_sse.c: Initialising SSE2 optimized volume functions.
(   0.009|   0.000) I: [pulseaudio] remap_sse.c: Initialising SSE2 optimized remappers.
(   0.009|   0.000) I: [pulseaudio] sconv_sse.c: Initialising SSE2 optimized conversions.
(   0.009|   0.000) I: [pulseaudio] svolume_orc.c: Initialising ORC optimized volume functions.
(   0.010|   0.001) D: [pulseaudio] database-tdb.c: Opened TDB database '/home/david/.pulse/fb75a029cab0d31b5676ade754660933-device-volumes.tdb'
(   0.010|   0.000) I: [pulseaudio] module-device-restore.c: Successfully opened database file '/home/david/.pulse/fb75a029cab0d31b5676ade754660933-device-volumes'.
(   0.010|   0.000) I: [pulseaudio] module.c: Loaded "module-device-restore" (index: #0; argument: "").
(   0.011|   0.000) D: [pulseaudio] database-tdb.c: Opened TDB database '/home/david/.pulse/fb75a029cab0d31b5676ade754660933-stream-volumes.tdb'
(   0.011|   0.000) I: [pulseaudio] module-stream-restore.c: Successfully opened database file '/home/david/.pulse/fb75a029cab0d31b5676ade754660933-stream-volumes'.
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1 added for object /org/pulseaudio/stream_restore1
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry0
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry1
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry2
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry3
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry4
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry5
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry6
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry7
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry8
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry9
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry10
(   0.012|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry11
(   0.013|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry12
(   0.013|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry13
(   0.013|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry14
(   0.013|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry15
(   0.013|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry16
(   0.013|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry17
(   0.013|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry18
(   0.013|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry added for object /org/pulseaudio/stream_restore1/entry19
(   0.013|   0.000) I: [pulseaudio] module.c: Loaded "module-stream-restore" (index: #1; argument: "").
(   0.014|   0.000) D: [pulseaudio] database-tdb.c: Opened TDB database '/home/david/.pulse/fb75a029cab0d31b5676ade754660933-card-database.tdb'
(   0.014|   0.000) I: [pulseaudio] module-card-restore.c: Successfully opened database file '/home/david/.pulse/fb75a029cab0d31b5676ade754660933-card-database'.
(   0.014|   0.000) I: [pulseaudio] module.c: Loaded "module-card-restore" (index: #2; argument: "").
(   0.015|   0.000) I: [pulseaudio] module.c: Loaded "module-augment-properties" (index: #3; argument: "").
(   0.015|   0.000) I: [pulseaudio] module.c: Loaded "module-switch-on-port-available" (index: #4; argument: "").
(   0.015|   0.000) D: [pulseaudio] module.c: Checking for existence of '/usr/lib/pulse-5.0/modules/module-udev-detect.so': success
(   0.018|   0.002) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC0 is accessible: yes
(   0.018|   0.000) D: [pulseaudio] module-udev-detect.c: /devices/pci0000:00/0000:00:01.1/sound/card0 is busy: no
(   0.018|   0.000) D: [pulseaudio] module-udev-detect.c: Loading module-alsa-card with arguments 'device_id="0" name="pci-0000_00_01.1" card_name="alsa_card.pci-0000_00_01.1" namereg_fail=false tsched=no fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"'
(   0.025|   0.007) D: [pulseaudio] dbus-util.c: Successfully connected to D-Bus session bus 70b5672007b845f70d0dfe0f54763862 as :1.93
(   0.026|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio0'
(   0.026|   0.000) I: [pulseaudio] (alsa-lib)utils.c: could not open configuration file /usr/share/alsa/ucm/HD-Audio Generic/HD-Audio Generic.conf
(   0.026|   0.000) I: [pulseaudio] (alsa-lib)parser.c: error: could not parse configuration for card HD-Audio Generic
(   0.026|   0.000) I: [pulseaudio] (alsa-lib)main.c: error: failed to import HD-Audio Generic use case configuration -2
(   0.026|   0.000) I: [pulseaudio] alsa-ucm.c: UCM not available for card HD-Audio Generic
(   0.028|   0.001) D: [pulseaudio] alsa-mixer.c: Looking at profile input:analog-mono
(   0.028|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Analog Mono (analog-mono)
(   0.028|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.031|   0.003) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0c' failed (-2)
(   0.031|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device hw:0: No such file or directory
(   0.031|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open input:analog-mono
(   0.031|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile input:analog-stereo
(   0.031|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Analog Stereo (analog-stereo)
(   0.031|   0.000) D: [pulseaudio] alsa-util.c: Trying front:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.037|   0.005) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0c' failed (-2)
(   0.037|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device front:0: No such file or directory
(   0.037|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.037|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0c' failed (-2)
(   0.037|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device hw:0: No such file or directory
(   0.037|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open input:analog-stereo
(   0.037|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile input:analog-4-channel-input
(   0.037|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Analog 4-channel Input (analog-4-channel-input)
(   0.037|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.037|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0c' failed (-2)
(   0.037|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device hw:0: No such file or directory
(   0.037|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open input:analog-4-channel-input
(   0.037|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile input:iec958-stereo
(   0.037|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Digital Stereo (IEC958) (iec958-stereo)
(   0.037|   0.000) D: [pulseaudio] alsa-util.c: Trying iec958:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.038|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D1c' failed (-2)
(   0.038|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device iec958:0: No such file or directory
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open input:iec958-stereo
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-mono
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Mono (analog-mono)
(   0.038|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.038|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0p' failed (-2)
(   0.038|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device hw:0: No such file or directory
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-mono
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-mono+input:analog-mono - will not be able to open output:analog-mono
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-mono+input:analog-stereo - will not be able to open output:analog-mono
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-mono+input:analog-4-channel-input - will not be able to open output:analog-mono
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-mono+input:iec958-stereo - will not be able to open output:analog-mono
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-stereo
(   0.038|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Stereo (analog-stereo)
(   0.038|   0.000) D: [pulseaudio] alsa-util.c: Trying front:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.038|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0p' failed (-2)
(   0.039|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device front:0: No such file or directory
(   0.039|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.039|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0p' failed (-2)
(   0.039|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device hw:0: No such file or directory
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-stereo
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-stereo+input:analog-mono - will not be able to open output:analog-stereo
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-stereo+input:analog-stereo - will not be able to open output:analog-stereo
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-stereo+input:analog-4-channel-input - will not be able to open output:analog-stereo
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-stereo+input:iec958-stereo - will not be able to open output:analog-stereo
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-40
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 4.0 (analog-surround-40)
(   0.039|   0.000) D: [pulseaudio] alsa-util.c: Trying surround40:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.039|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0p' failed (-2)
(   0.039|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device surround40:0: No such file or directory
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-40
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-40+input:analog-mono - will not be able to open output:analog-surround-40
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-40+input:analog-stereo - will not be able to open output:analog-surround-40
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-40+input:analog-4-channel-input - will not be able to open output:analog-surround-40
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-40+input:iec958-stereo - will not be able to open output:analog-surround-40
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-41
(   0.039|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 4.1 (analog-surround-41)
(   0.039|   0.000) D: [pulseaudio] alsa-util.c: Trying surround41:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.040|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0p' failed (-2)
(   0.040|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device surround41:0: No such file or directory
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-41
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-41+input:analog-mono - will not be able to open output:analog-surround-41
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-41+input:analog-stereo - will not be able to open output:analog-surround-41
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-41+input:analog-4-channel-input - will not be able to open output:analog-surround-41
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-41+input:iec958-stereo - will not be able to open output:analog-surround-41
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-50
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 5.0 (analog-surround-50)
(   0.040|   0.000) D: [pulseaudio] alsa-util.c: Trying surround50:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.040|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0p' failed (-2)
(   0.040|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device surround50:0: No such file or directory
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-50
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-50+input:analog-mono - will not be able to open output:analog-surround-50
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-50+input:analog-stereo - will not be able to open output:analog-surround-50
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-50+input:analog-4-channel-input - will not be able to open output:analog-surround-50
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-50+input:iec958-stereo - will not be able to open output:analog-surround-50
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-51
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 5.1 (analog-surround-51)
(   0.040|   0.000) D: [pulseaudio] alsa-util.c: Trying surround51:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.040|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0p' failed (-2)
(   0.040|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device surround51:0: No such file or directory
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-51
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-51+input:analog-mono - will not be able to open output:analog-surround-51
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-51+input:analog-stereo - will not be able to open output:analog-surround-51
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-51+input:analog-4-channel-input - will not be able to open output:analog-surround-51
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-51+input:iec958-stereo - will not be able to open output:analog-surround-51
(   0.040|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-71
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 7.1 (analog-surround-71)
(   0.041|   0.000) D: [pulseaudio] alsa-util.c: Trying surround71:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.041|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D0p' failed (-2)
(   0.041|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device surround71:0: No such file or directory
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-71
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-71+input:analog-mono - will not be able to open output:analog-surround-71
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-71+input:analog-stereo - will not be able to open output:analog-surround-71
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-71+input:analog-4-channel-input - will not be able to open output:analog-surround-71
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-71+input:iec958-stereo - will not be able to open output:analog-surround-71
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:iec958-stereo
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Stereo (IEC958) (iec958-stereo)
(   0.041|   0.000) D: [pulseaudio] alsa-util.c: Trying iec958:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.041|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC0D1p' failed (-2)
(   0.041|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device iec958:0: No such file or directory
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:iec958-stereo
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-stereo+input:analog-mono - will not be able to open output:iec958-stereo
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-stereo+input:analog-stereo - will not be able to open output:iec958-stereo
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-stereo+input:analog-4-channel-input - will not be able to open output:iec958-stereo
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-stereo+input:iec958-stereo - will not be able to open output:iec958-stereo
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:iec958-ac3-surround-40
(   0.041|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Surround 4.0 (IEC958/AC3) (iec958-ac3-surround-40)
(   0.041|   0.000) D: [pulseaudio] alsa-util.c: Trying a52:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.041|   0.000) I: [pulseaudio] (alsa-lib)pcm.c: Unknown PCM a52:0
(   0.042|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device a52:0: No such file or directory
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:iec958-ac3-surround-40
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-40+input:analog-mono - will not be able to open output:iec958-ac3-surround-40
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-40+input:analog-stereo - will not be able to open output:iec958-ac3-surround-40
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-40+input:analog-4-channel-input - will not be able to open output:iec958-ac3-surround-40
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-40+input:iec958-stereo - will not be able to open output:iec958-ac3-surround-40
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:iec958-ac3-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Surround 5.1 (IEC958/AC3) (iec958-ac3-surround-51)
(   0.042|   0.000) D: [pulseaudio] alsa-util.c: Trying a52:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.042|   0.000) I: [pulseaudio] (alsa-lib)pcm.c: Unknown PCM a52:0
(   0.042|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device a52:0: No such file or directory
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:iec958-ac3-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-51+input:analog-mono - will not be able to open output:iec958-ac3-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-51+input:analog-stereo - will not be able to open output:iec958-ac3-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-51+input:analog-4-channel-input - will not be able to open output:iec958-ac3-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-51+input:iec958-stereo - will not be able to open output:iec958-ac3-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:iec958-dts-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Surround 5.1 (IEC958/DTS) (iec958-dts-surround-51)
(   0.042|   0.000) D: [pulseaudio] alsa-util.c: Trying dca:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.042|   0.000) I: [pulseaudio] (alsa-lib)pcm.c: Unknown PCM dca:0
(   0.042|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device dca:0: No such file or directory
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:iec958-dts-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-dts-surround-51+input:analog-mono - will not be able to open output:iec958-dts-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-dts-surround-51+input:analog-stereo - will not be able to open output:iec958-dts-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-dts-surround-51+input:analog-4-channel-input - will not be able to open output:iec958-dts-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-dts-surround-51+input:iec958-stereo - will not be able to open output:iec958-dts-surround-51
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:hdmi-stereo
(   0.042|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Stereo (HDMI) (hdmi-stereo)
(   0.042|   0.000) D: [pulseaudio] alsa-util.c: Trying hdmi:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.043|   0.000) D: [pulseaudio] alsa-util.c: Managed to open hdmi:0
(   0.043|   0.000) D: [pulseaudio] alsa-util.c: Maximum hw buffer size is 371 ms
(   0.043|   0.000) D: [pulseaudio] alsa-util.c: Set buffer size first (to 4408 samples), period size second (to 1102 samples).
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Profile output:hdmi-stereo supported.
(   0.043|   0.000) I: [pulseaudio] (alsa-lib)control.c: Invalid CTL hdmi:0
(   0.043|   0.000) I: [pulseaudio] alsa-util.c: Unable to attach to mixer hdmi:0: No such file or directory
(   0.043|   0.000) I: [pulseaudio] alsa-util.c: Successfully attached to mixer 'hw:0'
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'hdmi-output-0'
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'HDMI/DP,pcm=3 Jack' succeeded (found!)
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Available mixer paths (after tidying):
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Path Set 0x1cf9580, direction=1
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Path hdmi-output-0 (HDMI / DisplayPort), direction=1, priority=59, probed=yes, supported=yes, has_mute=no, has_volume=no, has_dB=no, min_volume=0, max_volume=0, min_dB=inf, max_dB=-inf
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Jack HDMI/DP,pcm=3, alsa_name='HDMI/DP,pcm=3 Jack', detection possible
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:hdmi-stereo+input:analog-mono - will not be able to open input:analog-mono
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:hdmi-stereo+input:analog-stereo - will not be able to open input:analog-stereo
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:hdmi-stereo+input:analog-4-channel-input - will not be able to open input:analog-4-channel-input
(   0.043|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:hdmi-stereo+input:iec958-stereo - will not be able to open input:iec958-stereo
(   0.044|   0.000) D: [pulseaudio] alsa-mixer.c: Profile set 0x1cad790, auto_profiles=yes, probed=yes, n_mappings=1, n_profiles=1, n_decibel_fixes=0
(   0.044|   0.000) D: [pulseaudio] alsa-mixer.c: Mapping hdmi-stereo (Digital Stereo (HDMI)), priority=54, channel_map=front-left,front-right, supported=yes, direction=1
(   0.044|   0.000) D: [pulseaudio] alsa-mixer.c: Profile output:hdmi-stereo (Digital Stereo (HDMI) Output), priority=5400, supported=yes n_input_mappings=0, n_output_mappings=1
(   0.044|   0.000) D: [pulseaudio] alsa-mixer.c: Output hdmi-stereo
(   0.044|   0.000) I: [pulseaudio] module-card-restore.c: Restoring port latency offsets for card alsa_card.pci-0000_00_01.1.
(   0.044|   0.000) I: [pulseaudio] card.c: Created 0 "alsa_card.pci-0000_00_01.1"
(   0.044|   0.000) D: [pulseaudio] module-alsa-card.c: Found 1 jacks.
(   0.044|   0.000) I: [pulseaudio] alsa-util.c: Successfully attached to mixer 'hw:0'
(   0.044|   0.000) D: [pulseaudio] module-alsa-card.c: Jack 'HDMI/DP,pcm=3 Jack' is now unplugged
(   0.044|   0.000) D: [pulseaudio] device-port.c: Setting port hdmi-output-0 to status no
(   0.044|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.044|   0.000) D: [pulseaudio] module-switch-on-port-available.c: finding port hdmi-output-0
(   0.045|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully create reservation lock monitor for device 'Audio0'
(   0.045|   0.000) D: [pulseaudio] alsa-util.c: Trying hdmi:0 with SND_PCM_NO_AUTO_FORMAT ...
(   0.045|   0.000) D: [pulseaudio] alsa-util.c: Managed to open hdmi:0
(   0.045|   0.000) D: [pulseaudio] alsa-util.c: Maximum hw buffer size is 371 ms
(   0.046|   0.000) D: [pulseaudio] alsa-util.c: Set buffer size first (to 4408 samples), period size second (to 1102 samples).
(   0.046|   0.000) I: [pulseaudio] alsa-sink.c: Successfully opened device hdmi:0.
(   0.046|   0.000) I: [pulseaudio] alsa-sink.c: Selected mapping 'Digital Stereo (HDMI)' (hdmi-stereo).
(   0.046|   0.000) I: [pulseaudio] alsa-sink.c: Successfully enabled mmap() mode.
(   0.046|   0.000) I: [pulseaudio] (alsa-lib)control.c: Invalid CTL hdmi:0
(   0.046|   0.000) I: [pulseaudio] alsa-util.c: Unable to attach to mixer hdmi:0: No such file or directory
(   0.046|   0.000) I: [pulseaudio] alsa-util.c: Successfully attached to mixer 'hw:0'
(   0.046|   0.000) D: [pulseaudio] alsa-mixer.c: Added 1 ports
(   0.046|   0.000) I: [pulseaudio] module-device-restore.c: Restoring port for sink sink:alsa_output.pci-0000_00_01.1.hdmi-stereo.
(   0.046|   0.000) D: [pulseaudio] module-switch-on-port-available.c: Switching initial port for sink 'alsa_output.pci-0000_00_01.1.hdmi-stereo' to 'hdmi-output-0'
(   0.046|   0.000) I: [pulseaudio] module-device-restore.c: Restoring volume for sink alsa_output.pci-0000_00_01.1.hdmi-stereo: front-left: 64071 /  98%,   front-right: 64071 /  98%
(   0.046|   0.000) I: [pulseaudio] sink.c: Created sink 0 "alsa_output.pci-0000_00_01.1.hdmi-stereo" with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.resolution_bits = "16"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.api = "alsa"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.class = "sound"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.class = "generic"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.subclass = "generic-mix"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.name = "HDMI 0"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.id = "HDMI 0"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.subdevice = "0"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.subdevice_name = "subdevice #0"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.device = "3"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.card = "0"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.card_name = "HD-Audio Generic"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.long_card_name = "HD-Audio Generic at 0xf1560000 irq 85"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.driver_name = "snd_hda_intel"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.bus_path = "pci-0000:00:01.1"
(   0.046|   0.000) I: [pulseaudio] sink.c:     sysfs.path = "/devices/pci0000:00/0000:00:01.1/sound/card0"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.bus = "pci"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.vendor.id = "1002"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.vendor.name = "Advanced Micro Devices, Inc. [AMD/ATI]"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.product.id = "9840"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.product.name = "Kabini HDMI/DP Audio"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.form_factor = "internal"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.string = "hdmi:0"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.buffering.buffer_size = "17664"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.buffering.fragment_size = "2944"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.access_mode = "mmap"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.profile.name = "hdmi-stereo"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.profile.description = "Digital Stereo (HDMI)"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.description = "Built-in Audio Digital Stereo (HDMI)"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.mixer_name = "ATI R6xx HDMI"
(   0.046|   0.000) I: [pulseaudio] sink.c:     alsa.components = "HDA:1002aa01,00aa0100,00100500"
(   0.046|   0.000) I: [pulseaudio] sink.c:     module-udev-detect.discovered = "1"
(   0.046|   0.000) I: [pulseaudio] sink.c:     device.icon_name = "audio-card-pci"
(   0.047|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.047|   0.000) I: [pulseaudio] source.c: Created source 0 "alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor" with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
(   0.047|   0.000) I: [pulseaudio] source.c:     device.description = "Monitor of Built-in Audio Digital Stereo (HDMI)"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.class = "monitor"
(   0.047|   0.000) I: [pulseaudio] source.c:     alsa.card = "0"
(   0.047|   0.000) I: [pulseaudio] source.c:     alsa.card_name = "HD-Audio Generic"
(   0.047|   0.000) I: [pulseaudio] source.c:     alsa.long_card_name = "HD-Audio Generic at 0xf1560000 irq 85"
(   0.047|   0.000) I: [pulseaudio] source.c:     alsa.driver_name = "snd_hda_intel"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.bus_path = "pci-0000:00:01.1"
(   0.047|   0.000) I: [pulseaudio] source.c:     sysfs.path = "/devices/pci0000:00/0000:00:01.1/sound/card0"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.bus = "pci"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.vendor.id = "1002"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.vendor.name = "Advanced Micro Devices, Inc. [AMD/ATI]"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.product.id = "9840"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.product.name = "Kabini HDMI/DP Audio"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.form_factor = "internal"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.string = "0"
(   0.047|   0.000) I: [pulseaudio] source.c:     module-udev-detect.discovered = "1"
(   0.047|   0.000) I: [pulseaudio] source.c:     device.icon_name = "audio-card-pci"
(   0.047|   0.000) I: [pulseaudio] alsa-sink.c: Using 6.0 fragments of size 2944 bytes (16.69ms), buffer size is 17664 bytes (100.14ms)
(   0.047|   0.000) D: [pulseaudio] alsa-sink.c: hwbuf_unused=0
(   0.047|   0.000) D: [pulseaudio] alsa-sink.c: setting avail_min=1
(   0.047|   0.000) D: [pulseaudio] alsa-mixer.c: Activating path hdmi-output-0
(   0.047|   0.000) D: [pulseaudio] alsa-mixer.c: Path hdmi-output-0 (HDMI / DisplayPort), direction=1, priority=59, probed=yes, supported=yes, has_mute=no, has_volume=no, has_dB=no, min_volume=0, max_volume=0, min_dB=inf, max_dB=-inf
(   0.047|   0.000) D: [pulseaudio] alsa-mixer.c: Jack HDMI/DP,pcm=3, alsa_name='HDMI/DP,pcm=3 Jack', detection possible
(   0.047|   0.000) I: [pulseaudio] alsa-sink.c: Driver does not support hardware volume control, falling back to software volume control.
(   0.047|   0.000) I: [pulseaudio] alsa-sink.c: Driver does not support hardware mute control, falling back to software mute control.
(   0.047|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_dump():
(   0.047|   0.000) D: [pulseaudio] alsa-util.c: Hooks PCM
(   0.047|   0.000) D: [pulseaudio] alsa-util.c: Its setup is:
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   stream       : PLAYBACK
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   access       : MMAP_INTERLEAVED
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   format       : S16_LE
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   subformat    : STD
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   channels     : 2
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   rate         : 44100
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   exact rate   : 44100 (44100/1)
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   msbits       : 16
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   buffer_size  : 4416
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   period_size  : 736
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   period_time  : 16689
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   tstamp_mode  : ENABLE
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   period_step  : 1
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   avail_min    : 736
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   period_event : 1
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   start_threshold  : -1
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   stop_threshold   : 4971973988617027584
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   silence_threshold: 0
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   silence_size : 0
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   boundary     : 4971973988617027584
(   0.047|   0.000) D: [pulseaudio] alsa-util.c: Slave: Hardware PCM card 0 'HD-Audio Generic' device 3 subdevice 0
(   0.047|   0.000) D: [pulseaudio] alsa-util.c: Its setup is:
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   stream       : PLAYBACK
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   access       : MMAP_INTERLEAVED
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   format       : S16_LE
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   subformat    : STD
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   channels     : 2
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   rate         : 44100
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   exact rate   : 44100 (44100/1)
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   msbits       : 16
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   buffer_size  : 4416
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   period_size  : 736
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   period_time  : 16689
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   tstamp_mode  : ENABLE
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   period_step  : 1
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   avail_min    : 736
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   period_event : 1
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   start_threshold  : -1
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   stop_threshold   : 4971973988617027584
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   silence_threshold: 0
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   silence_size : 0
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   boundary     : 4971973988617027584
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   appl_ptr     : 0
(   0.047|   0.000) D: [pulseaudio] alsa-util.c:   hw_ptr       : 0
(   0.048|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: Thread starting up
(   0.051|   0.002) I: [alsa-sink-HDMI 0] core-util.c: Clamping rlimit-rttime to 200000 for RealtimeKit
(   0.056|   0.005) D: [alsa-sink-HDMI 0] core-util.c: RealtimeKit worked.
(   0.056|   0.000) I: [alsa-sink-HDMI 0] core-util.c: Successfully enabled SCHED_RR scheduling for thread, with priority 5.
(   0.056|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Starting playback.
(   0.056|   0.000) D: [pulseaudio] alsa-util.c: ELD info empty (for device=3)
(   0.056|   0.000) I: [pulseaudio] module.c: Loaded "module-alsa-card" (index: #6; argument: "device_id="0" name="pci-0000_00_01.1" card_name="alsa_card.pci-0000_00_01.1" namereg_fail=false tsched=no fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"").
(   0.056|   0.000) I: [pulseaudio] module-udev-detect.c: Card /devices/pci0000:00/0000:00:01.1/sound/card0 (alsa_card.pci-0000_00_01.1) module loaded.
(   0.056|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
(   0.057|   0.000) D: [pulseaudio] module-udev-detect.c: /devices/pci0000:00/0000:00:14.2/sound/card1 is busy: no
(   0.057|   0.000) D: [pulseaudio] module-udev-detect.c: Loading module-alsa-card with arguments 'device_id="1" name="pci-0000_00_14.2" card_name="alsa_card.pci-0000_00_14.2" namereg_fail=false tsched=no fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"'
(   0.058|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
(   0.058|   0.000) I: [pulseaudio] (alsa-lib)utils.c: could not open configuration file /usr/share/alsa/ucm/HD-Audio Generic/HD-Audio Generic.conf
(   0.058|   0.000) I: [pulseaudio] (alsa-lib)parser.c: error: could not parse configuration for card HD-Audio Generic
(   0.058|   0.000) I: [pulseaudio] (alsa-lib)main.c: error: failed to import HD-Audio Generic use case configuration -2
(   0.058|   0.000) I: [pulseaudio] alsa-ucm.c: UCM not available for card HD-Audio Generic
(   0.060|   0.001) D: [pulseaudio] alsa-mixer.c: Looking at profile input:analog-mono
(   0.060|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Analog Mono (analog-mono)
(   0.060|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.060|   0.000) D: [pulseaudio] alsa-util.c: Managed to open hw:1
(   0.060|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid argument
(   0.061|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.061|   0.000) D: [pulseaudio] alsa-util.c: Managed to open hw:1
(   0.061|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid argument
(   0.061|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:hw:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.061|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:hw:1
(   0.062|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid argument
(   0.062|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:hw:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.062|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:hw:1
(   0.062|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid argument
(   0.062|   0.000) I: [pulseaudio] alsa-util.c: Failed to set hardware parameters on plug:hw:1: Invalid argument
(   0.062|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open input:analog-mono
(   0.062|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile input:analog-stereo
(   0.062|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Analog Stereo (analog-stereo)
(   0.063|   0.000) D: [pulseaudio] alsa-util.c: Trying front:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.063|   0.000) D: [pulseaudio] alsa-util.c: Managed to open front:1
(   0.063|   0.000) D: [pulseaudio] alsa-util.c: Maximum hw buffer size is 371 ms
(   0.063|   0.000) D: [pulseaudio] alsa-util.c: Set buffer size first (to 4408 samples), period size second (to 1102 samples).
(   0.063|   0.000) D: [pulseaudio] alsa-mixer.c: Profile input:analog-stereo supported.
(   0.071|   0.007) I: [pulseaudio] (alsa-lib)control.c: Invalid CTL front:1
(   0.071|   0.000) I: [pulseaudio] alsa-util.c: Unable to attach to mixer front:1: No such file or directory
(   0.071|   0.000) I: [pulseaudio] alsa-util.c: Successfully attached to mixer 'hw:1'
(   0.071|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-front-mic'
(   0.071|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Front Mic Jack' succeeded (not found)
(   0.071|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Front Mic Phantom Jack' succeeded (not found)
(   0.071|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.071|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.071|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.071|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Input Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.071|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Inverted Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Jack Mode' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping path 'analog-input-front-mic', none of required-any elements preset.
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-rear-mic'
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Rear Mic Jack' succeeded (not found)
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Rear Mic Phantom Jack' succeeded (not found)
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Input Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.072|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Inverted Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Jack Mode' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping path 'analog-input-rear-mic', none of required-any elements preset.
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-internal-mic'
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Mic Jack' succeeded (found!)
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Dock Mic Jack' succeeded (not found)
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Front Mic Jack' succeeded (not found)
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Rear Mic Jack' succeeded (not found)
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Internal Mic Phantom Jack' succeeded (found!)
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' succeeded (volume=1, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Int Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Int Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Input Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Inverted Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Jack Mode' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-dock-mic'
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Dock Mic Jack' succeeded (not found)
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Dock Mic Phantom Jack' succeeded (not found)
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Input Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.073|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Inverted Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Jack Mode' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping path 'analog-input-dock-mic', none of required-any elements preset.
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input'
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Int Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Int Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' failed.
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-mic'
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Mic Jack' succeeded (found!)
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Mic Phantom Jack' succeeded (not found)
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Boost' succeeded (volume=1, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Input Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Select' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Boost (+20dB)' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Inverted Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Jack Mode' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-linein'
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Jack' succeeded (not found)
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Phantom Jack' succeeded (not found)
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Input Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.074|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Jack Mode' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping path 'analog-input-linein', none of required-any elements preset.
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-aux'
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' failed.
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-video'
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' failed.
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-tvtuner'
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' failed.
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-fm'
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' failed.
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-mic-line'
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' failed.
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-headphone-mic'
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headphone Mic Jack' succeeded (not found)
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Input Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Auto-Mute Mode' succeeded (volume=0, switch=0, enumeration=1).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.075|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Inverted Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Jack Mode' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping path 'analog-input-headphone-mic', none of required-any elements preset.
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-input-headset-mic'
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headset Mic Jack' succeeded (not found)
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headset Mic Phantom Jack' succeeded (not found)
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headphone Jack' succeeded (found!)
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headphone Mic Jack' succeeded (not found)
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture' succeeded (volume=1, switch=1, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headset Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headset Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headset' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Input Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Capture Source' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Dock Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Internal Mic Boost' succeeded (volume=2, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear Mic Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Aux' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Video' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic/Line' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'TV Tuner' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'FM' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Inverted Internal Mic' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Mic Jack Mode' succeeded (volume=0, switch=0, enumeration=0).
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping path 'analog-input-headset-mic', none of required-any elements preset.
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Available mixer paths (after tidying):
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Path Set 0x1cedb90, direction=2
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Path analog-input-internal-mic (Internal Microphone), direction=2, priority=89, probed=yes, supported=yes, has_mute=yes, has_volume=yes, has_dB=yes, min_volume=0, max_volume=80, min_dB=-74, max_dB=42
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Element Capture, direction=2, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Element Internal Mic Boost, direction=2, switch=0, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=4, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Element Mic Boost, direction=2, switch=0, volume=2, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Mic, alsa_name='Mic Jack', detection possible
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Dock Mic, alsa_name='Dock Mic Jack', detection unavailable
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Front Mic, alsa_name='Front Mic Jack', detection unavailable
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Rear Mic, alsa_name='Rear Mic Jack', detection unavailable
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Internal Mic Phantom, alsa_name='Internal Mic Phantom Jack', detection possible
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Path analog-input-mic (Microphone), direction=2, priority=87, probed=yes, supported=yes, has_mute=yes, has_volume=yes, has_dB=yes, min_volume=0, max_volume=80, min_dB=-74, max_dB=42
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Element Capture, direction=2, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Element Mic Boost, direction=2, switch=0, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=4, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Element Internal Mic Boost, direction=2, switch=0, volume=2, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.076|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Mic, alsa_name='Mic Jack', detection possible
(   0.077|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Mic Phantom, alsa_name='Mic Phantom Jack', detection unavailable
(   0.077|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile input:analog-4-channel-input
(   0.077|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Analog 4-channel Input (analog-4-channel-input)
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: Managed to open hw:1
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(4) failed: Invalid argument
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: Managed to open hw:1
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(4) failed: Invalid argument
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:hw:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:hw:1
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(4) failed: Invalid argument
(   0.077|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:hw:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.078|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:hw:1
(   0.078|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(4) failed: Invalid argument
(   0.078|   0.000) I: [pulseaudio] alsa-util.c: Failed to set hardware parameters on plug:hw:1: Invalid argument
(   0.078|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open input:analog-4-channel-input
(   0.078|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile input:iec958-stereo
(   0.078|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Digital Stereo (IEC958) (iec958-stereo)
(   0.078|   0.000) D: [pulseaudio] alsa-util.c: Trying iec958:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.078|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC1D1c' failed (-2)
(   0.078|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device iec958:1: No such file or directory
(   0.078|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open input:iec958-stereo
(   0.078|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-mono
(   0.078|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Mono (analog-mono)
(   0.078|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.078|   0.000) D: [pulseaudio] alsa-util.c: Managed to open hw:1
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid argument
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: Trying hw:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: Managed to open hw:1
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid argument
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:hw:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:hw:1
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid argument
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:hw:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:hw:1
(   0.079|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid argument
(   0.079|   0.000) I: [pulseaudio] alsa-util.c: Failed to set hardware parameters on plug:hw:1: Invalid argument
(   0.079|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-mono
(   0.079|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-mono+input:analog-mono - will not be able to open output:analog-mono
(   0.079|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-mono+input:analog-stereo - will not be able to open output:analog-mono
(   0.079|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-mono+input:analog-4-channel-input - will not be able to open output:analog-mono
(   0.079|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-mono+input:iec958-stereo - will not be able to open output:analog-mono
(   0.079|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-stereo
(   0.080|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Stereo (analog-stereo)
(   0.080|   0.000) D: [pulseaudio] alsa-util.c: Trying front:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.080|   0.000) D: [pulseaudio] alsa-util.c: Managed to open front:1
(   0.080|   0.000) D: [pulseaudio] alsa-util.c: Maximum hw buffer size is 371 ms
(   0.080|   0.000) D: [pulseaudio] alsa-util.c: Set buffer size first (to 4408 samples), period size second (to 1102 samples).
(   0.080|   0.000) D: [pulseaudio] alsa-mixer.c: Profile output:analog-stereo supported.
(   0.082|   0.001) I: [pulseaudio] (alsa-lib)control.c: Invalid CTL front:1
(   0.082|   0.000) I: [pulseaudio] alsa-util.c: Unable to attach to mixer front:1: No such file or directory
(   0.082|   0.000) I: [pulseaudio] alsa-util.c: Successfully attached to mixer 'hw:1'
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-output'
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Jack' succeeded (not found)
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Phantom Jack' succeeded (not found)
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Hardware Master' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master' succeeded (volume=1, switch=1, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master Mono' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line HP Swap' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone' succeeded (volume=3, switch=1, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone2' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker' succeeded (volume=2, switch=1, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Desktop Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Surround' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Side' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Center' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'LFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'CLFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'PCM' succeeded (volume=1, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'External Amplifier' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Bass Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'IEC958' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'IEC958 Optical Raw' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Analog Output' succeeded (volume=0, switch=0, enumeration=0).
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-output-lineout'
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Jack' succeeded (not found)
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Phantom Jack' succeeded (not found)
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Front Jack' succeeded (not found)
(   0.082|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Front Phantom Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out CLFE Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out CLFE Phantom Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Surround Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Surround Phantom Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Side Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Line Out Side Phantom Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Hardware Master' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master' succeeded (volume=1, switch=1, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master Mono' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line HP Swap' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone' succeeded (volume=3, switch=1, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone2' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker' succeeded (volume=2, switch=1, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Desktop Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Surround' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Side' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Center' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'LFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'CLFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Bass Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Front' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Surround' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Side' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker CLFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'PCM' succeeded (volume=1, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'External Amplifier' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Bass Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'IEC958' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'IEC958 Optical Raw' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Analog Output' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping path 'analog-output-lineout', none of required-any elements preset.
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-output-speaker'
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headphone Jack' succeeded (found!)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Front Headphone Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Speaker Phantom Jack' succeeded (found!)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Speaker Front Phantom Jack' succeeded (not found)
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Hardware Master' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master' succeeded (volume=1, switch=1, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master Mono' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone' succeeded (volume=2, switch=2, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone2' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker' succeeded (volume=1, switch=1, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Desktop Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Front' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Surround' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Surround Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Surround' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Side' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Side' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Center' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Center Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'LFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'LFE Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Bass Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.083|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'CLFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker CLFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'PCM' succeeded (volume=1, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'External Amplifier' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Bass Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'IEC958' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'IEC958 Optical Raw' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Analog Output' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-output-desktop-speaker'
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Hardware Master' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master' succeeded (volume=1, switch=1, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master Mono' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone' succeeded (volume=3, switch=1, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone2' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker' succeeded (volume=2, switch=2, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Desktop Speaker' failed.
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-output-headphones'
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Front Headphone Jack' succeeded (not found)
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Front Headphone Phantom Jack' succeeded (not found)
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headphone Jack' succeeded (found!)
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headphone Phantom Jack' succeeded (not found)
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of jack 'Headphone Mic Jack' succeeded (not found)
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Hardware Master' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master' succeeded (volume=1, switch=1, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master Mono' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone' succeeded (volume=1, switch=1, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headset' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Line HP Swap' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone2' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker' succeeded (volume=2, switch=2, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Desktop Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Front' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Rear' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Surround' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Side' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Center' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'LFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Bass Speaker' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Front' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Surround' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker Side' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Speaker CLFE' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'PCM' succeeded (volume=1, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'External Amplifier' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Bass Boost' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'IEC958' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'IEC958 Optical Raw' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Analog Output' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probing path 'analog-output-headphones-2'
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Hardware Master' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master' succeeded (volume=1, switch=1, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Master Mono' succeeded (volume=0, switch=0, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone' succeeded (volume=3, switch=1, enumeration=0).
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Probe of element 'Headphone2' failed.
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Available mixer paths (after tidying):
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Path Set 0x1d654e0, direction=1
(   0.084|   0.000) D: [pulseaudio] alsa-mixer.c: Path analog-output (Analog Output), direction=1, priority=99, probed=yes, supported=yes, has_mute=yes, has_volume=yes, has_dB=yes, min_volume=0, max_volume=74, min_dB=-125, max_dB=0
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Master, direction=1, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x7ffffffffffff, n_channels=1, override_map=yes
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Headphone, direction=1, switch=1, volume=3, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Speaker, direction=1, switch=1, volume=2, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element PCM, direction=1, switch=0, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Line Out, alsa_name='Line Out Jack', detection unavailable
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Line Out Phantom, alsa_name='Line Out Phantom Jack', detection unavailable
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Path analog-output-speaker (Speakers), direction=1, priority=100, probed=yes, supported=yes, has_mute=yes, has_volume=yes, has_dB=yes, min_volume=0, max_volume=74, min_dB=-199, max_dB=0
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Master, direction=1, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x7ffffffffffff, n_channels=1, override_map=yes
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Headphone, direction=1, switch=2, volume=2, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Speaker, direction=1, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=4, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element PCM, direction=1, switch=0, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Headphone, alsa_name='Headphone Jack', detection possible
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Front Headphone, alsa_name='Front Headphone Jack', detection unavailable
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Speaker Phantom, alsa_name='Speaker Phantom Jack', detection possible
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Speaker Front Phantom, alsa_name='Speaker Front Phantom Jack', detection unavailable
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Path analog-output-headphones (Headphones), direction=1, priority=90, probed=yes, supported=yes, has_mute=yes, has_volume=yes, has_dB=yes, min_volume=0, max_volume=74, min_dB=-199, max_dB=0
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Master, direction=1, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x7ffffffffffff, n_channels=1, override_map=yes
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Headphone, direction=1, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=4, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element Speaker, direction=1, switch=2, volume=2, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Element PCM, direction=1, switch=0, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Front Headphone, alsa_name='Front Headphone Jack', detection unavailable
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Front Headphone Phantom, alsa_name='Front Headphone Phantom Jack', detection unavailable
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Headphone, alsa_name='Headphone Jack', detection possible
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Headphone Phantom, alsa_name='Headphone Phantom Jack', detection unavailable
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Headphone Mic, alsa_name='Headphone Mic Jack', detection unavailable
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-stereo+input:analog-mono - will not be able to open input:analog-mono
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-stereo+input:analog-stereo
(   0.085|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for recording on Analog Stereo (analog-stereo)
(   0.085|   0.000) D: [pulseaudio] alsa-util.c: Trying front:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.085|   0.000) D: [pulseaudio] alsa-util.c: Managed to open front:1
(   0.085|   0.000) D: [pulseaudio] alsa-util.c: Maximum hw buffer size is 371 ms
(   0.085|   0.000) D: [pulseaudio] alsa-util.c: Set buffer size first (to 4408 samples), period size second (to 1102 samples).
(   0.086|   0.000) D: [pulseaudio] alsa-mixer.c: Profile output:analog-stereo+input:analog-stereo supported.
(   0.086|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-stereo+input:analog-4-channel-input - will not be able to open input:analog-4-channel-input
(   0.086|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-stereo+input:iec958-stereo - will not be able to open input:iec958-stereo
(   0.086|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-40
(   0.086|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 4.0 (analog-surround-40)
(   0.086|   0.000) D: [pulseaudio] alsa-util.c: Trying surround40:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.086|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround40:1
(   0.086|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(4) failed: Invalid argument
(   0.086|   0.000) D: [pulseaudio] alsa-util.c: Trying surround40:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.086|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround40:1
(   0.087|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(4) failed: Invalid argument
(   0.087|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround40:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.087|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround40:1
(   0.087|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(4) failed: Invalid argument
(   0.087|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround40:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.087|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround40:1
(   0.088|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(4) failed: Invalid argument
(   0.088|   0.000) I: [pulseaudio] alsa-util.c: Failed to set hardware parameters on plug:surround40:1: Invalid argument
(   0.088|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-40
(   0.088|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-40+input:analog-mono - will not be able to open output:analog-surround-40
(   0.088|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-40+input:analog-stereo - will not be able to open output:analog-surround-40
(   0.088|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-40+input:analog-4-channel-input - will not be able to open output:analog-surround-40
(   0.088|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-40+input:iec958-stereo - will not be able to open output:analog-surround-40
(   0.088|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-41
(   0.088|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 4.1 (analog-surround-41)
(   0.088|   0.000) D: [pulseaudio] alsa-util.c: Trying surround41:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.088|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround41:1
(   0.088|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_any() failed: Invalid argument
(   0.088|   0.000) D: [pulseaudio] alsa-util.c: Trying surround41:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.089|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround41:1
(   0.089|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_any() failed: Invalid argument
(   0.089|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround41:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.089|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround41:1
(   0.089|   0.000) I: [pulseaudio] (alsa-lib)pcm_params.c: Slave PCM not usable
(   0.089|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_any() failed: Invalid argument
(   0.089|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround41:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.090|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround41:1
(   0.090|   0.000) I: [pulseaudio] (alsa-lib)pcm_params.c: Slave PCM not usable
(   0.090|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_any() failed: Invalid argument
(   0.090|   0.000) I: [pulseaudio] alsa-util.c: Failed to set hardware parameters on plug:surround41:1: Invalid argument
(   0.090|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-41
(   0.090|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-41+input:analog-mono - will not be able to open output:analog-surround-41
(   0.090|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-41+input:analog-stereo - will not be able to open output:analog-surround-41
(   0.090|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-41+input:analog-4-channel-input - will not be able to open output:analog-surround-41
(   0.090|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-41+input:iec958-stereo - will not be able to open output:analog-surround-41
(   0.090|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-50
(   0.090|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 5.0 (analog-surround-50)
(   0.090|   0.000) D: [pulseaudio] alsa-util.c: Trying surround50:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.090|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround50:1
(   0.090|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_any() failed: Invalid argument
(   0.090|   0.000) D: [pulseaudio] alsa-util.c: Trying surround50:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.090|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround50:1
(   0.091|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_any() failed: Invalid argument
(   0.091|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround50:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.091|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround50:1
(   0.091|   0.000) I: [pulseaudio] (alsa-lib)pcm_params.c: Slave PCM not usable
(   0.091|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_any() failed: Invalid argument
(   0.091|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround50:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.091|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround50:1
(   0.091|   0.000) I: [pulseaudio] (alsa-lib)pcm_params.c: Slave PCM not usable
(   0.091|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_any() failed: Invalid argument
(   0.091|   0.000) I: [pulseaudio] alsa-util.c: Failed to set hardware parameters on plug:surround50:1: Invalid argument
(   0.091|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-50
(   0.091|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-50+input:analog-mono - will not be able to open output:analog-surround-50
(   0.091|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-50+input:analog-stereo - will not be able to open output:analog-surround-50
(   0.091|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-50+input:analog-4-channel-input - will not be able to open output:analog-surround-50
(   0.092|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-50+input:iec958-stereo - will not be able to open output:analog-surround-50
(   0.092|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-51
(   0.092|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 5.1 (analog-surround-51)
(   0.092|   0.000) D: [pulseaudio] alsa-util.c: Trying surround51:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.092|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround51:1
(   0.092|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(6) failed: Invalid argument
(   0.092|   0.000) D: [pulseaudio] alsa-util.c: Trying surround51:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.092|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround51:1
(   0.092|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(6) failed: Invalid argument
(   0.092|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround51:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.093|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround51:1
(   0.093|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(6) failed: Invalid argument
(   0.093|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround51:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.093|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround51:1
(   0.094|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(6) failed: Invalid argument
(   0.094|   0.000) I: [pulseaudio] alsa-util.c: Failed to set hardware parameters on plug:surround51:1: Invalid argument
(   0.094|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-51
(   0.094|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-51+input:analog-mono - will not be able to open output:analog-surround-51
(   0.094|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-51+input:analog-stereo - will not be able to open output:analog-surround-51
(   0.094|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-51+input:analog-4-channel-input - will not be able to open output:analog-surround-51
(   0.094|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-51+input:iec958-stereo - will not be able to open output:analog-surround-51
(   0.094|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:analog-surround-71
(   0.094|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Analog Surround 7.1 (analog-surround-71)
(   0.094|   0.000) D: [pulseaudio] alsa-util.c: Trying surround71:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.094|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround71:1
(   0.094|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(8) failed: Invalid argument
(   0.094|   0.000) D: [pulseaudio] alsa-util.c: Trying surround71:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.095|   0.000) D: [pulseaudio] alsa-util.c: Managed to open surround71:1
(   0.095|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(8) failed: Invalid argument
(   0.095|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround71:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.095|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround71:1
(   0.095|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(8) failed: Invalid argument
(   0.095|   0.000) D: [pulseaudio] alsa-util.c: Trying plug:surround71:1 without SND_PCM_NO_AUTO_FORMAT ...
(   0.096|   0.000) D: [pulseaudio] alsa-util.c: Managed to open plug:surround71:1
(   0.096|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_hw_params_set_channels(8) failed: Invalid argument
(   0.096|   0.000) I: [pulseaudio] alsa-util.c: Failed to set hardware parameters on plug:surround71:1: Invalid argument
(   0.096|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:analog-surround-71
(   0.096|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-71+input:analog-mono - will not be able to open output:analog-surround-71
(   0.096|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-71+input:analog-stereo - will not be able to open output:analog-surround-71
(   0.096|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-71+input:analog-4-channel-input - will not be able to open output:analog-surround-71
(   0.096|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:analog-surround-71+input:iec958-stereo - will not be able to open output:analog-surround-71
(   0.096|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:iec958-stereo
(   0.096|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Stereo (IEC958) (iec958-stereo)
(   0.096|   0.000) D: [pulseaudio] alsa-util.c: Trying iec958:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.097|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC1D1p' failed (-2)
(   0.097|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device iec958:1: No such file or directory
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:iec958-stereo
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-stereo+input:analog-mono - will not be able to open output:iec958-stereo
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-stereo+input:analog-stereo - will not be able to open output:iec958-stereo
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-stereo+input:analog-4-channel-input - will not be able to open output:iec958-stereo
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-stereo+input:iec958-stereo - will not be able to open output:iec958-stereo
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:iec958-ac3-surround-40
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Surround 4.0 (IEC958/AC3) (iec958-ac3-surround-40)
(   0.097|   0.000) D: [pulseaudio] alsa-util.c: Trying a52:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.097|   0.000) I: [pulseaudio] (alsa-lib)pcm.c: Unknown PCM a52:1
(   0.097|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device a52:1: No such file or directory
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:iec958-ac3-surround-40
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-40+input:analog-mono - will not be able to open output:iec958-ac3-surround-40
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-40+input:analog-stereo - will not be able to open output:iec958-ac3-surround-40
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-40+input:analog-4-channel-input - will not be able to open output:iec958-ac3-surround-40
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-40+input:iec958-stereo - will not be able to open output:iec958-ac3-surround-40
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:iec958-ac3-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Surround 5.1 (IEC958/AC3) (iec958-ac3-surround-51)
(   0.097|   0.000) D: [pulseaudio] alsa-util.c: Trying a52:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.097|   0.000) I: [pulseaudio] (alsa-lib)pcm.c: Unknown PCM a52:1
(   0.097|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device a52:1: No such file or directory
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:iec958-ac3-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-51+input:analog-mono - will not be able to open output:iec958-ac3-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-51+input:analog-stereo - will not be able to open output:iec958-ac3-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-51+input:analog-4-channel-input - will not be able to open output:iec958-ac3-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-ac3-surround-51+input:iec958-stereo - will not be able to open output:iec958-ac3-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:iec958-dts-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Surround 5.1 (IEC958/DTS) (iec958-dts-surround-51)
(   0.097|   0.000) D: [pulseaudio] alsa-util.c: Trying dca:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.097|   0.000) I: [pulseaudio] (alsa-lib)pcm.c: Unknown PCM dca:1
(   0.097|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device dca:1: No such file or directory
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:iec958-dts-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-dts-surround-51+input:analog-mono - will not be able to open output:iec958-dts-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-dts-surround-51+input:analog-stereo - will not be able to open output:iec958-dts-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-dts-surround-51+input:analog-4-channel-input - will not be able to open output:iec958-dts-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:iec958-dts-surround-51+input:iec958-stereo - will not be able to open output:iec958-dts-surround-51
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Looking at profile output:hdmi-stereo
(   0.097|   0.000) D: [pulseaudio] alsa-mixer.c: Checking for playback on Digital Stereo (HDMI) (hdmi-stereo)
(   0.097|   0.000) D: [pulseaudio] alsa-util.c: Trying hdmi:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.098|   0.000) I: [pulseaudio] (alsa-lib)pcm_hw.c: open '/dev/snd/pcmC1D3p' failed (-2)
(   0.098|   0.000) I: [pulseaudio] alsa-util.c: Error opening PCM device hdmi:1: No such file or directory
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Caching failure to open output:hdmi-stereo
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:hdmi-stereo+input:analog-mono - will not be able to open output:hdmi-stereo
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:hdmi-stereo+input:analog-stereo - will not be able to open output:hdmi-stereo
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:hdmi-stereo+input:analog-4-channel-input - will not be able to open output:hdmi-stereo
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Skipping profile output:hdmi-stereo+input:iec958-stereo - will not be able to open output:hdmi-stereo
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Profile set 0x1cde7c0, auto_profiles=yes, probed=yes, n_mappings=1, n_profiles=3, n_decibel_fixes=0
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Mapping analog-stereo (Analog Stereo), priority=60, channel_map=front-left,front-right, supported=yes, direction=0
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Profile input:analog-stereo (Analog Stereo Input), priority=60, supported=yes n_input_mappings=1, n_output_mappings=0
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Input analog-stereo
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Profile output:analog-stereo (Analog Stereo Output), priority=6000, supported=yes n_input_mappings=0, n_output_mappings=1
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Output analog-stereo
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Profile output:analog-stereo+input:analog-stereo (Analog Stereo Duplex), priority=6060, supported=yes n_input_mappings=1, n_output_mappings=1
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Input analog-stereo
(   0.098|   0.000) D: [pulseaudio] alsa-mixer.c: Output analog-stereo
(   0.099|   0.000) I: [pulseaudio] module-card-restore.c: Restoring port latency offsets for card alsa_card.pci-0000_00_14.2.
(   0.099|   0.000) I: [pulseaudio] card.c: Created 1 "alsa_card.pci-0000_00_14.2"
(   0.099|   0.000) D: [pulseaudio] module-alsa-card.c: Found 6 jacks.
(   0.099|   0.000) I: [pulseaudio] alsa-util.c: Successfully attached to mixer 'hw:1'
(   0.099|   0.000) D: [pulseaudio] module-alsa-card.c: Jack 'Headphone Jack' is now plugged in
(   0.099|   0.000) D: [pulseaudio] device-port.c: Setting port analog-output-speaker to status no
(   0.099|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.099|   0.000) D: [pulseaudio] module-switch-on-port-available.c: finding port analog-output-speaker
(   0.099|   0.000) D: [pulseaudio] module-alsa-card.c: Jack 'Speaker Phantom Jack' is now plugged in
(   0.099|   0.000) D: [pulseaudio] module-alsa-card.c: Jack 'Headphone Jack' is now plugged in
(   0.099|   0.000) D: [pulseaudio] device-port.c: Setting port analog-output-headphones to status yes
(   0.099|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.099|   0.000) D: [pulseaudio] module-switch-on-port-available.c: finding port analog-output-headphones
(   0.099|   0.000) D: [pulseaudio] module-alsa-card.c: Jack 'Mic Jack' is now unplugged
(   0.099|   0.000) D: [pulseaudio] module-alsa-card.c: Jack 'Internal Mic Phantom Jack' is now plugged in
(   0.099|   0.000) D: [pulseaudio] module-alsa-card.c: Jack 'Mic Jack' is now unplugged
(   0.099|   0.000) D: [pulseaudio] device-port.c: Setting port analog-input-mic to status no
(   0.099|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.099|   0.000) D: [pulseaudio] module-switch-on-port-available.c: finding port analog-input-mic
(   0.100|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully create reservation lock monitor for device 'Audio1'
(   0.100|   0.000) D: [pulseaudio] alsa-util.c: Trying front:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.100|   0.000) D: [pulseaudio] alsa-util.c: Managed to open front:1
(   0.101|   0.000) D: [pulseaudio] alsa-util.c: Maximum hw buffer size is 371 ms
(   0.101|   0.000) D: [pulseaudio] alsa-util.c: Set buffer size first (to 4408 samples), period size second (to 1102 samples).
(   0.101|   0.000) I: [pulseaudio] alsa-sink.c: Successfully opened device front:1.
(   0.101|   0.000) I: [pulseaudio] alsa-sink.c: Selected mapping 'Analog Stereo' (analog-stereo).
(   0.101|   0.000) I: [pulseaudio] alsa-sink.c: Successfully enabled mmap() mode.
(   0.101|   0.000) I: [pulseaudio] (alsa-lib)control.c: Invalid CTL front:1
(   0.101|   0.000) I: [pulseaudio] alsa-util.c: Unable to attach to mixer front:1: No such file or directory
(   0.101|   0.000) I: [pulseaudio] alsa-util.c: Successfully attached to mixer 'hw:1'
(   0.101|   0.000) D: [pulseaudio] alsa-mixer.c: Added 3 ports
(   0.101|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.101|   0.000) I: [pulseaudio] module-device-restore.c: Restoring port for sink sink:alsa_output.pci-0000_00_14.2.analog-stereo.
(   0.102|   0.000) I: [pulseaudio] module-device-restore.c: Restoring volume for sink alsa_output.pci-0000_00_14.2.analog-stereo: front-left: 14920 /  23%,   front-right: 14920 /  23%
(   0.102|   0.000) I: [pulseaudio] module-device-restore.c: Restoring mute state for sink alsa_output.pci-0000_00_14.2.analog-stereo.
(   0.102|   0.000) I: [pulseaudio] sink.c: Created sink 1 "alsa_output.pci-0000_00_14.2.analog-stereo" with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.resolution_bits = "16"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.api = "alsa"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.class = "sound"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.class = "generic"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.subclass = "generic-mix"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.name = "CX20756 Analog"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.id = "CX20756 Analog"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.subdevice = "0"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.subdevice_name = "subdevice #0"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.device = "0"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.card = "1"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.card_name = "HD-Audio Generic"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.driver_name = "snd_hda_intel"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.bus_path = "pci-0000:00:14.2"
(   0.102|   0.000) I: [pulseaudio] sink.c:     sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.bus = "pci"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.vendor.id = "1022"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.product.id = "780d"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.product.name = "FCH Azalia Controller"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.form_factor = "internal"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.string = "front:1"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.buffering.buffer_size = "17664"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.buffering.fragment_size = "2944"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.access_mode = "mmap"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.profile.name = "analog-stereo"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.profile.description = "Analog Stereo"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.description = "Built-in Audio Analog Stereo"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.mixer_name = "Conexant CX20756"
(   0.102|   0.000) I: [pulseaudio] sink.c:     alsa.components = "HDA:14f15114,1179f920,00100100"
(   0.102|   0.000) I: [pulseaudio] sink.c:     module-udev-detect.discovered = "1"
(   0.102|   0.000) I: [pulseaudio] sink.c:     device.icon_name = "audio-card-pci"
(   0.102|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.102|   0.000) I: [pulseaudio] source.c: Created source 1 "alsa_output.pci-0000_00_14.2.analog-stereo.monitor" with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
(   0.102|   0.000) I: [pulseaudio] source.c:     device.description = "Monitor of Built-in Audio Analog Stereo"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.class = "monitor"
(   0.102|   0.000) I: [pulseaudio] source.c:     alsa.card = "1"
(   0.102|   0.000) I: [pulseaudio] source.c:     alsa.card_name = "HD-Audio Generic"
(   0.102|   0.000) I: [pulseaudio] source.c:     alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
(   0.102|   0.000) I: [pulseaudio] source.c:     alsa.driver_name = "snd_hda_intel"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.bus_path = "pci-0000:00:14.2"
(   0.102|   0.000) I: [pulseaudio] source.c:     sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.bus = "pci"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.vendor.id = "1022"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.product.id = "780d"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.product.name = "FCH Azalia Controller"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.form_factor = "internal"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.string = "1"
(   0.102|   0.000) I: [pulseaudio] source.c:     module-udev-detect.discovered = "1"
(   0.102|   0.000) I: [pulseaudio] source.c:     device.icon_name = "audio-card-pci"
(   0.102|   0.000) I: [pulseaudio] alsa-sink.c: Using 6.0 fragments of size 2944 bytes (16.69ms), buffer size is 17664 bytes (100.14ms)
(   0.102|   0.000) D: [pulseaudio] alsa-sink.c: hwbuf_unused=0
(   0.102|   0.000) D: [pulseaudio] alsa-sink.c: setting avail_min=1
(   0.102|   0.000) D: [pulseaudio] alsa-mixer.c: Activating path analog-output
(   0.102|   0.000) D: [pulseaudio] alsa-mixer.c: Path analog-output (Analog Output), direction=1, priority=99, probed=yes, supported=yes, has_mute=yes, has_volume=yes, has_dB=yes, min_volume=0, max_volume=74, min_dB=-125, max_dB=0
(   0.103|   0.000) D: [pulseaudio] alsa-mixer.c: Element Master, direction=1, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x7ffffffffffff, n_channels=1, override_map=yes
(   0.103|   0.000) D: [pulseaudio] alsa-mixer.c: Element Headphone, direction=1, switch=1, volume=3, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.103|   0.000) D: [pulseaudio] alsa-mixer.c: Element Speaker, direction=1, switch=1, volume=2, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.103|   0.000) D: [pulseaudio] alsa-mixer.c: Element PCM, direction=1, switch=0, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.103|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Line Out, alsa_name='Line Out Jack', detection unavailable
(   0.103|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Line Out Phantom, alsa_name='Line Out Phantom Jack', detection unavailable
(   0.103|   0.000) I: [pulseaudio] alsa-sink.c: Successfully enabled deferred volume.
(   0.103|   0.000) I: [pulseaudio] alsa-sink.c: Hardware volume ranges from -125.00 dB to 0.00 dB.
(   0.103|   0.000) I: [pulseaudio] alsa-sink.c: Fixing base volume to 0.00 dB
(   0.103|   0.000) I: [pulseaudio] alsa-sink.c: Using hardware volume control. Hardware dB scale supported.
(   0.103|   0.000) I: [pulseaudio] alsa-sink.c: Using hardware mute control.
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_dump():
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: Soft volume PCM
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: Control: PCM Playback Volume
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: min_dB: -51
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: max_dB: 0
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: resolution: 256
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: Its setup is:
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   stream       : PLAYBACK
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   access       : MMAP_INTERLEAVED
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   format       : S16_LE
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   subformat    : STD
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   channels     : 2
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   rate         : 44100
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   exact rate   : 44100 (44100/1)
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   msbits       : 16
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   buffer_size  : 4416
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   period_size  : 736
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   period_time  : 16689
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   tstamp_mode  : ENABLE
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   period_step  : 1
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   avail_min    : 736
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   period_event : 1
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   start_threshold  : -1
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   stop_threshold   : 4971973988617027584
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   silence_threshold: 0
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   silence_size : 0
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   boundary     : 4971973988617027584
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: Slave: Hardware PCM card 1 'HD-Audio Generic' device 0 subdevice 0
(   0.103|   0.000) D: [pulseaudio] alsa-util.c: Its setup is:
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   stream       : PLAYBACK
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   access       : MMAP_INTERLEAVED
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   format       : S16_LE
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   subformat    : STD
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   channels     : 2
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   rate         : 44100
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   exact rate   : 44100 (44100/1)
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   msbits       : 16
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   buffer_size  : 4416
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   period_size  : 736
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   period_time  : 16689
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   tstamp_mode  : ENABLE
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   period_step  : 1
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   avail_min    : 736
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   period_event : 1
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   start_threshold  : -1
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   stop_threshold   : 4971973988617027584
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   silence_threshold: 0
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   silence_size : 0
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   boundary     : 4971973988617027584
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   appl_ptr     : 0
(   0.103|   0.000) D: [pulseaudio] alsa-util.c:   hw_ptr       : 0
(   0.103|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Thread starting up
(   0.103|   0.000) D: [pulseaudio] alsa-sink.c: Requested volume: front-left: 14920 /  23% / -38.56 dB,   front-right: 14920 /  23% / -38.56 dB
(   0.103|   0.000) D: [pulseaudio] alsa-sink.c: Got hardware volume: front-left: 15014 /  23% / -38.40 dB,   front-right: 15014 /  23% / -38.40 dB
(   0.104|   0.000) D: [pulseaudio] alsa-sink.c: Calculated software volume: front-left: 65126 /  99% / -0.16 dB,   front-right: 65126 /  99% / -0.16 dB (accurate-enough=yes)
(   0.104|   0.000) D: [pulseaudio] alsa-sink.c: Written HW volume did not match with the request: front-left: 14920 /  23% / -38.56 dB,   front-right: 14920 /  23% / -38.56 dB (request) != front-left: 14672 /  22% / -39.00 dB,   front-right: 14672 /  22% / -39.00 dB
(   0.113|   0.009) D: [alsa-sink-CX20756 Analog] core-util.c: RealtimeKit worked.
(   0.113|   0.000) I: [alsa-sink-CX20756 Analog] core-util.c: Successfully enabled SCHED_RR scheduling for thread, with priority 5.
(   0.114|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
(   0.114|   0.000) D: [pulseaudio] module-device-restore.c: Could not set format on sink alsa_output.pci-0000_00_14.2.analog-stereo
(   0.114|   0.000) D: [pulseaudio] alsa-util.c: Trying front:1 with SND_PCM_NO_AUTO_FORMAT ...
(   0.115|   0.000) D: [pulseaudio] alsa-util.c: Managed to open front:1
(   0.115|   0.000) D: [pulseaudio] alsa-util.c: Maximum hw buffer size is 371 ms
(   0.115|   0.000) D: [pulseaudio] alsa-util.c: Set buffer size first (to 4408 samples), period size second (to 1102 samples).
(   0.115|   0.000) I: [pulseaudio] alsa-source.c: Successfully opened device front:1.
(   0.115|   0.000) I: [pulseaudio] alsa-source.c: Selected mapping 'Analog Stereo' (analog-stereo).
(   0.115|   0.000) I: [pulseaudio] alsa-source.c: Successfully enabled mmap() mode.
(   0.115|   0.000) I: [pulseaudio] (alsa-lib)control.c: Invalid CTL front:1
(   0.115|   0.000) I: [pulseaudio] alsa-util.c: Unable to attach to mixer front:1: No such file or directory
(   0.116|   0.000) I: [pulseaudio] alsa-util.c: Successfully attached to mixer 'hw:1'
(   0.116|   0.000) D: [pulseaudio] alsa-mixer.c: Added 2 ports
(   0.116|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.116|   0.000) I: [pulseaudio] module-device-restore.c: Restoring port for source source:alsa_input.pci-0000_00_14.2.analog-stereo.
(   0.116|   0.000) I: [pulseaudio] module-device-restore.c: Restoring volume for source alsa_input.pci-0000_00_14.2.analog-stereo: front-left: 44205 /  67%,   front-right: 44205 /  67%
(   0.116|   0.000) I: [pulseaudio] module-device-restore.c: Restoring mute state for source alsa_input.pci-0000_00_14.2.analog-stereo.
(   0.117|   0.000) I: [pulseaudio] source.c: Created source 2 "alsa_input.pci-0000_00_14.2.analog-stereo" with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.resolution_bits = "16"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.api = "alsa"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.class = "sound"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.class = "generic"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.subclass = "generic-mix"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.name = "CX20756 Analog"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.id = "CX20756 Analog"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.subdevice = "0"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.subdevice_name = "subdevice #0"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.device = "0"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.card = "1"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.card_name = "HD-Audio Generic"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.long_card_name = "HD-Audio Generic at 0xf1564000 irq 86"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.driver_name = "snd_hda_intel"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.bus_path = "pci-0000:00:14.2"
(   0.117|   0.000) I: [pulseaudio] source.c:     sysfs.path = "/devices/pci0000:00/0000:00:14.2/sound/card1"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.bus = "pci"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.vendor.id = "1022"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.vendor.name = "Advanced Micro Devices, Inc. [AMD]"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.product.id = "780d"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.product.name = "FCH Azalia Controller"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.form_factor = "internal"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.string = "front:1"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.buffering.buffer_size = "17664"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.buffering.fragment_size = "2944"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.access_mode = "mmap"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.profile.name = "analog-stereo"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.profile.description = "Analog Stereo"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.description = "Built-in Audio Analog Stereo"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.mixer_name = "Conexant CX20756"
(   0.117|   0.000) I: [pulseaudio] source.c:     alsa.components = "HDA:14f15114,1179f920,00100100"
(   0.117|   0.000) I: [pulseaudio] source.c:     module-udev-detect.discovered = "1"
(   0.117|   0.000) I: [pulseaudio] source.c:     device.icon_name = "audio-card-pci"
(   0.117|   0.000) I: [pulseaudio] alsa-source.c: Using 6.0 fragments of size 2944 bytes (16.69ms), buffer size is 17664 bytes (100.14ms)
(   0.117|   0.000) D: [pulseaudio] alsa-source.c: hwbuf_unused=0
(   0.117|   0.000) D: [pulseaudio] alsa-source.c: setting avail_min=1
(   0.117|   0.000) D: [pulseaudio] alsa-mixer.c: Activating path analog-input-internal-mic
(   0.117|   0.000) D: [pulseaudio] alsa-mixer.c: Path analog-input-internal-mic (Internal Microphone), direction=2, priority=89, probed=yes, supported=yes, has_mute=yes, has_volume=yes, has_dB=yes, min_volume=0, max_volume=80, min_dB=-74, max_dB=42
(   0.118|   0.000) D: [pulseaudio] alsa-mixer.c: Element Capture, direction=2, switch=1, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.118|   0.000) D: [pulseaudio] alsa-mixer.c: Element Internal Mic Boost, direction=2, switch=0, volume=1, volume_limit=-1, enumeration=0, required=0, required_any=4, required_absent=0, mask=0x3600000000f66, n_channels=2, override_map=yes
(   0.118|   0.000) D: [pulseaudio] alsa-mixer.c: Element Mic Boost, direction=2, switch=0, volume=2, volume_limit=-1, enumeration=0, required=0, required_any=0, required_absent=0, mask=0x6, n_channels=2, override_map=no
(   0.118|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Mic, alsa_name='Mic Jack', detection possible
(   0.118|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Dock Mic, alsa_name='Dock Mic Jack', detection unavailable
(   0.118|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Front Mic, alsa_name='Front Mic Jack', detection unavailable
(   0.118|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Rear Mic, alsa_name='Rear Mic Jack', detection unavailable
(   0.118|   0.000) D: [pulseaudio] alsa-mixer.c: Jack Internal Mic Phantom, alsa_name='Internal Mic Phantom Jack', detection possible
(   0.118|   0.000) I: [pulseaudio] alsa-source.c: Successfully enabled deferred volume.
(   0.118|   0.000) I: [pulseaudio] alsa-source.c: Hardware volume ranges from -74.00 dB to 42.00 dB.
(   0.118|   0.000) I: [pulseaudio] alsa-source.c: Fixing base volume to -42.00 dB
(   0.118|   0.000) I: [pulseaudio] alsa-source.c: Using hardware volume control. Hardware dB scale supported.
(   0.118|   0.000) I: [pulseaudio] alsa-source.c: Using hardware mute control.
(   0.118|   0.000) D: [pulseaudio] alsa-util.c: snd_pcm_dump():
(   0.118|   0.000) D: [pulseaudio] alsa-util.c: Hardware PCM card 1 'HD-Audio Generic' device 0 subdevice 0
(   0.118|   0.000) D: [pulseaudio] alsa-util.c: Its setup is:
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   stream       : CAPTURE
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   access       : MMAP_INTERLEAVED
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   format       : S16_LE
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   subformat    : STD
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   channels     : 2
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   rate         : 44100
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   exact rate   : 44100 (44100/1)
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   msbits       : 16
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   buffer_size  : 4416
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   period_size  : 736
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   period_time  : 16689
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   tstamp_mode  : ENABLE
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   period_step  : 1
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   avail_min    : 736
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   period_event : 1
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   start_threshold  : -1
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   stop_threshold   : 4971973988617027584
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   silence_threshold: 0
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   silence_size : 0
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   boundary     : 4971973988617027584
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   appl_ptr     : 0
(   0.118|   0.000) D: [pulseaudio] alsa-util.c:   hw_ptr       : 0
(   0.119|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Thread starting up
(   0.119|   0.000) D: [pulseaudio] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
(   0.119|   0.000) D: [pulseaudio] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(   0.119|   0.000) D: [pulseaudio] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
(   0.119|   0.000) D: [pulseaudio] alsa-source.c: Written HW volume did not match with the request: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB (request) != front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(   0.127|   0.008) D: [alsa-source-CX20756 Analog] core-util.c: RealtimeKit worked.
(   0.127|   0.000) I: [alsa-source-CX20756 Analog] core-util.c: Successfully enabled SCHED_RR scheduling for thread, with priority 5.
(   0.127|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Starting capture.
(   0.127|   0.000) I: [pulseaudio] module.c: Loaded "module-alsa-card" (index: #7; argument: "device_id="1" name="pci-0000_00_14.2" card_name="alsa_card.pci-0000_00_14.2" namereg_fail=false tsched=no fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"").
(   0.127|   0.000) I: [pulseaudio] module-udev-detect.c: Card /devices/pci0000:00/0000:00:14.2/sound/card1 (alsa_card.pci-0000_00_14.2) module loaded.
(   0.127|   0.000) I: [pulseaudio] module-udev-detect.c: Found 2 cards.
(   0.127|   0.000) I: [pulseaudio] module.c: Loaded "module-udev-detect" (index: #5; argument: "tsched=0").
(   0.128|   0.000) D: [pulseaudio] module.c: Checking for existence of '/usr/lib/pulse-5.0/modules/module-jackdbus-detect.so': failure
(   0.128|   0.000) D: [pulseaudio] module.c: Checking for existence of '/usr/lib/pulse-5.0/modules/module-bluetooth-policy.so': failure
(   0.128|   0.000) D: [pulseaudio] module.c: Checking for existence of '/usr/lib/pulse-5.0/modules/module-bluetooth-discover.so': failure
(   0.128|   0.000) D: [pulseaudio] module.c: Checking for existence of '/usr/lib/pulse-5.0/modules/module-esound-protocol-unix.so': failure
(   0.129|   0.001) I: [pulseaudio] module.c: Loaded "module-native-protocol-unix" (index: #8; argument: "").
(   0.129|   0.000) D: [pulseaudio] module.c: Checking for existence of '/usr/lib/pulse-5.0/modules/module-gconf.so': failure
(   0.130|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.130|   0.000) I: [pulseaudio] module-default-device-restore.c: Restored default sink 'alsa_output.pci-0000_00_14.2.analog-stereo'.
(   0.130|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(   0.130|   0.000) I: [pulseaudio] module-default-device-restore.c: Restored default source 'alsa_input.pci-0000_00_14.2.analog-stereo'.
(   0.130|   0.000) I: [pulseaudio] module.c: Loaded "module-default-device-restore" (index: #9; argument: "").
(   0.131|   0.000) I: [pulseaudio] module.c: Loaded "module-rescue-streams" (index: #10; argument: "").
(   0.131|   0.000) I: [pulseaudio] module.c: Loaded "module-always-sink" (index: #11; argument: "").
(   0.132|   0.000) I: [pulseaudio] module.c: Loaded "module-intended-roles" (index: #12; argument: "").
(   0.133|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
(   0.133|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(   0.133|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(   0.133|   0.000) I: [pulseaudio] module.c: Loaded "module-suspend-on-idle" (index: #13; argument: "").
(   0.133|   0.000) D: [pulseaudio] module.c: Checking for existence of '/usr/lib/pulse-5.0/modules/module-console-kit.so': success
(   0.134|   0.000) I: [pulseaudio] module.c: Loaded "module-console-kit" (index: #14; argument: "").
(   0.134|   0.000) D: [pulseaudio] module.c: Checking for existence of '/usr/lib/pulse-5.0/modules/module-systemd-login.so': success
(   0.135|   0.000) I: [pulseaudio] client.c: Created 0 "Login Session 6"
(   0.135|   0.000) D: [pulseaudio] module-systemd-login.c: Added new session 6
(   0.135|   0.000) I: [pulseaudio] client.c: Created 1 "Login Session 1"
(   0.135|   0.000) D: [pulseaudio] module-systemd-login.c: Added new session 1
(   0.135|   0.000) I: [pulseaudio] module.c: Loaded "module-systemd-login" (index: #15; argument: "").
(   0.136|   0.000) I: [pulseaudio] module.c: Loaded "module-position-event-sounds" (index: #16; argument: "").
(   0.137|   0.000) D: [pulseaudio] module-role-cork.c: Using role 'phone' as trigger role.
(   0.137|   0.000) D: [pulseaudio] module-role-cork.c: Using roles 'music' and 'video' as cork roles.
(   0.137|   0.000) I: [pulseaudio] module.c: Loaded "module-role-cork" (index: #17; argument: "").
(   0.138|   0.000) I: [pulseaudio] module.c: Loaded "module-filter-heuristics" (index: #18; argument: "").
(   0.138|   0.000) I: [pulseaudio] module.c: Loaded "module-filter-apply" (index: #19; argument: "").
(   0.139|   0.000) D: [pulseaudio] main.c: Got org.PulseAudio1!
(   0.140|   0.000) D: [pulseaudio] main.c: Got org.pulseaudio.Server!
(   0.140|   0.000) I: [pulseaudio] main.c: Daemon startup complete.
(   0.141|   0.000) I: [pulseaudio] client.c: Created 2 "Native client (UNIX socket client)"
(   0.141|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC0 is accessible: yes
(   0.141|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_01.1.
(   0.141|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
(   0.141|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
(   0.141|   0.000) I: [pulseaudio] client.c: Created 3 "Native client (UNIX socket client)"
(   0.141|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
(   0.141|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
(   0.141|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
(   0.141|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
(   0.141|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
(   0.141|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
(   0.142|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
(   0.142|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
(   0.142|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for gnome-settings-daemon
(   0.142|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for gnome-shell
(   0.142|   0.000) D: [pulseaudio] module-augment-properties.c: Found /usr/share/applications/gnome-shell.desktop.
(   5.136|   4.993) I: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
(   5.136|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
(   5.137|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Device suspended...
(   5.137|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
(   5.137|   0.000) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
(   5.137|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
(   5.139|   0.001) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
(   5.139|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
(   5.139|   0.000) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo idle for too long, suspending ...
(   5.139|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0004, suspending
(   5.140|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Device suspended...
(   5.140|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
(   5.140|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC0 is accessible: yes
(   5.140|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_01.1.
(   5.140|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
(   5.140|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
(   9.152|   4.011) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(   9.152|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 24033 /  37% / -26.14 dB,   front-right: 24033 /  37% / -26.14 dB
(   9.152|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 24163 /  37% / -26.00 dB,   front-right: 24163 /  37% / -26.00 dB
(   9.152|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65183 /  99% / -0.14 dB,   front-right: 65183 /  99% / -0.14 dB (accurate-enough=yes)
(   9.152|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 24033 at 3786596100
(   9.152|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7969 usec
(   9.152|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7947 usec
(   9.152|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(   9.160|   0.007) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 24033 at 3786596100 was written 53 usec late
(   9.602|   0.442) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.172|   1.570) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36611 /  56% / -15.17 dB,   front-right: 36611 /  56% / -15.17 dB
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 36854 /  56% / -15.00 dB,   front-right: 36854 /  56% / -15.00 dB
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65104 /  99% / -0.17 dB,   front-right: 65104 /  99% / -0.17 dB (accurate-enough=yes)
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36611 at 3788616626
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7939 usec
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7892 usec
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7837 usec
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7797 usec
(  11.173|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.173|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7429 usec
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7364 usec
(  11.173|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36885 /  56% / -14.98 dB,   front-right: 36885 /  56% / -14.98 dB
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 37137 /  57% / -14.80 dB,   front-right: 37137 /  57% / -14.80 dB
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65091 /  99% / -0.18 dB,   front-right: 65091 /  99% / -0.18 dB (accurate-enough=yes)
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36885 at 3788617555
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7018 usec
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6973 usec
(  11.174|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.174|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6533 usec
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40440 /  62% / -12.58 dB,   front-right: 40440 /  62% / -12.58 dB
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 40720 /  62% / -12.40 dB,   front-right: 40720 /  62% / -12.40 dB
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65085 /  99% / -0.18 dB,   front-right: 65085 /  99% / -0.18 dB (accurate-enough=yes)
(  11.174|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40440 at 3788618401
(  11.175|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.175|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.175|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40713 /  62% / -12.40 dB,   front-right: 40713 /  62% / -12.40 dB
(  11.175|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 40720 /  62% / -12.40 dB,   front-right: 40720 /  62% / -12.40 dB
(  11.175|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65525 / 100% / -0.00 dB,   front-right: 65525 / 100% / -0.00 dB (accurate-enough=yes)
(  11.175|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40713 at 3788619169
(  11.175|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.176|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.176|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41260 /  63% / -12.06 dB,   front-right: 41260 /  63% / -12.06 dB
(  11.176|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(  11.176|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65393 / 100% / -0.06 dB,   front-right: 65393 / 100% / -0.06 dB (accurate-enough=yes)
(  11.176|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 41260 at 3788619929
(  11.176|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.176|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 39072 /  60% / -13.48 dB,   front-right: 39072 /  60% / -13.48 dB
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 39188 /  60% / -13.40 dB,   front-right: 39188 /  60% / -13.40 dB
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65342 / 100% / -0.08 dB,   front-right: 65342 / 100% / -0.08 dB (accurate-enough=yes)
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 39072 at 3788620689
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40440 at 3788618401 was dropped
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40713 at 3788619169 was dropped
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41260 at 3788619929 was dropped
(  11.177|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.177|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 38526 /  59% / -13.84 dB,   front-right: 38526 /  59% / -13.84 dB
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 38591 /  59% / -13.80 dB,   front-right: 38591 /  59% / -13.80 dB
(  11.177|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65426 / 100% / -0.04 dB,   front-right: 65426 / 100% / -0.04 dB (accurate-enough=yes)
(  11.178|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 38526 at 3788621439
(  11.178|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 39072 at 3788620689 was dropped
(  11.178|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.178|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.178|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 37705 /  58% / -14.40 dB,   front-right: 37705 /  58% / -14.40 dB
(  11.178|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 37712 /  58% / -14.40 dB,   front-right: 37712 /  58% / -14.40 dB
(  11.178|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65524 / 100% / -0.00 dB,   front-right: 65524 / 100% / -0.00 dB (accurate-enough=yes)
(  11.178|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 37705 at 3788622188
(  11.178|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 38526 at 3788621439 was dropped
(  11.178|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.179|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.179|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 37158 /  57% / -14.79 dB,   front-right: 37158 /  57% / -14.79 dB
(  11.179|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 37423 /  57% / -14.60 dB,   front-right: 37423 /  57% / -14.60 dB
(  11.179|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65072 /  99% / -0.19 dB,   front-right: 65072 /  99% / -0.19 dB (accurate-enough=yes)
(  11.179|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 37158 at 3788622984
(  11.179|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 37705 at 3788622188 was dropped
(  11.179|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.179|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.180|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36338 /  55% / -15.37 dB,   front-right: 36338 /  55% / -15.37 dB
(  11.180|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 36572 /  56% / -15.20 dB,   front-right: 36572 /  56% / -15.20 dB
(  11.180|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65117 /  99% / -0.17 dB,   front-right: 65117 /  99% / -0.17 dB (accurate-enough=yes)
(  11.180|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36338 at 3788623742
(  11.180|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36611 at 3788616626 was dropped
(  11.180|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36885 at 3788617555 was dropped
(  11.180|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 37158 at 3788622984 was dropped
(  11.180|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.180|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.181|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 34971 /  53% / -16.37 dB,   front-right: 34971 /  53% / -16.37 dB
(  11.181|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 35195 /  54% / -16.20 dB,   front-right: 35195 /  54% / -16.20 dB
(  11.181|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65119 /  99% / -0.17 dB,   front-right: 65119 /  99% / -0.17 dB (accurate-enough=yes)
(  11.181|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 34971 at 3788624655
(  11.181|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36338 at 3788623742 was dropped
(  11.181|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.181|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.181|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 33057 /  50% / -17.83 dB,   front-right: 33057 /  50% / -17.83 dB
(  11.181|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 33099 /  51% / -17.80 dB,   front-right: 33099 /  51% / -17.80 dB
(  11.182|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65453 / 100% / -0.03 dB,   front-right: 65453 / 100% / -0.03 dB (accurate-enough=yes)
(  11.182|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 33057 at 3788625503
(  11.182|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 34971 at 3788624655 was dropped
(  11.182|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.182|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.182|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30328 /  46% / -20.08 dB,   front-right: 30328 /  46% / -20.08 dB
(  11.182|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
(  11.182|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65340 / 100% / -0.08 dB,   front-right: 65340 / 100% / -0.08 dB (accurate-enough=yes)
(  11.182|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 30328 at 3788626185
(  11.182|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 33057 at 3788625503 was dropped
(  11.183|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.183|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.183|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 28219 /  43% / -21.96 dB,   front-right: 28219 /  43% / -21.96 dB
(  11.183|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 28389 /  43% / -21.80 dB,   front-right: 28389 /  43% / -21.80 dB
(  11.183|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65144 /  99% / -0.16 dB,   front-right: 65144 /  99% / -0.16 dB (accurate-enough=yes)
(  11.183|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 28219 at 3788627045
(  11.183|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30328 at 3788626185 was dropped
(  11.183|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.184|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 27235 /  42% / -22.88 dB,   front-right: 27235 /  42% / -22.88 dB
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 27320 /  42% / -22.80 dB,   front-right: 27320 /  42% / -22.80 dB
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65332 / 100% / -0.08 dB,   front-right: 65332 / 100% / -0.08 dB (accurate-enough=yes)
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 27235 at 3788627840
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 28219 at 3788627045 was dropped
(  11.184|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.184|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 26961 /  41% / -23.14 dB,   front-right: 26961 /  41% / -23.14 dB
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 27111 /  41% / -23.00 dB,   front-right: 27111 /  41% / -23.00 dB
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65173 /  99% / -0.14 dB,   front-right: 65173 /  99% / -0.14 dB (accurate-enough=yes)
(  11.184|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 26961 at 3788628399
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 27235 at 3788627840 was dropped
(  11.185|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.185|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 26688 /  41% / -23.41 dB,   front-right: 26688 /  41% / -23.41 dB
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 26698 /  41% / -23.40 dB,   front-right: 26698 /  41% / -23.40 dB
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65511 / 100% / -0.01 dB,   front-right: 65511 / 100% / -0.01 dB (accurate-enough=yes)
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 26688 at 3788628855
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 26961 at 3788628399 was dropped
(  11.185|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.185|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 24774 /  38% / -25.35 dB,   front-right: 24774 /  38% / -25.35 dB
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 24916 /  38% / -25.20 dB,   front-right: 24916 /  38% / -25.20 dB
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65163 /  99% / -0.15 dB,   front-right: 65163 /  99% / -0.15 dB (accurate-enough=yes)
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 24774 at 3788629293
(  11.185|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 26688 at 3788628855 was dropped
(  11.185|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.186|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 24774 /  38% / -25.35 dB,   front-right: 24774 /  38% / -25.35 dB
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 24916 /  38% / -25.20 dB,   front-right: 24916 /  38% / -25.20 dB
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65163 /  99% / -0.15 dB,   front-right: 65163 /  99% / -0.15 dB (accurate-enough=yes)
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 24774 at 3788629725
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 24774 at 3788629293 was dropped
(  11.186|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 24774 /  38% / -25.35 dB,   front-right: 24774 /  38% / -25.35 dB
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 24916 /  38% / -25.20 dB,   front-right: 24916 /  38% / -25.20 dB
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65163 /  99% / -0.15 dB,   front-right: 65163 /  99% / -0.15 dB (accurate-enough=yes)
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 24774 at 3788630012
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 24774 at 3788629725 was dropped
(  11.186|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15959 /  24% / -36.81 dB,   front-right: 15959 /  24% / -36.81 dB
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15964 /  24% / -36.80 dB,   front-right: 15964 /  24% / -36.80 dB
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65515 / 100% / -0.01 dB,   front-right: 65515 / 100% / -0.01 dB (accurate-enough=yes)
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15959 at 3788614376
(  11.186|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 24774 at 3788630012 was dropped
(  11.187|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15959 at 3788614376 was written 8054 usec late
(  11.187|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  11.187|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  13.196|   2.009) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15412 /  24% / -37.72 dB,   front-right: 15412 /  24% / -37.72 dB
(  13.197|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15481 /  24% / -37.60 dB,   front-right: 15481 /  24% / -37.60 dB
(  13.197|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65244 / 100% / -0.12 dB,   front-right: 65244 / 100% / -0.12 dB (accurate-enough=yes)
(  13.197|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15412 at 3790624573
(  13.197|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15412 at 3790624573 was written 8056 usec late
(  13.197|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  15.204|   2.007) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 15412 /  24% / -37.72 dB,   front-right: 15412 /  24% / -37.72 dB (request) != front-left: 15246 /  23% / -38.00 dB,   front-right: 15246 /  23% / -38.00 dB
(  15.205|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15138 /  23% / -38.18 dB,   front-right: 15138 /  23% / -38.18 dB
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15246 /  23% / -38.00 dB,   front-right: 15246 /  23% / -38.00 dB
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65072 /  99% / -0.19 dB,   front-right: 65072 /  99% / -0.19 dB (accurate-enough=yes)
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15138 at 3792632602
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15138 at 3792632602 was written 8028 usec late
(  15.205|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  15.205|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 12677 /  19% / -42.81 dB,   front-right: 12677 /  19% / -42.81 dB
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 12681 /  19% / -42.80 dB,   front-right: 12681 /  19% / -42.80 dB
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65515 / 100% / -0.01 dB,   front-right: 65515 / 100% / -0.01 dB (accurate-enough=yes)
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 12677 at 3792633019
(  15.205|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 12677 at 3792633019 was written 8023 usec late
(  15.205|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  15.205|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.212|   2.007) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 35294 /  54% / -16.13 dB,   front-right: 35294 /  54% / -16.13 dB
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 35466 /  54% / -16.00 dB,   front-right: 35466 /  54% / -16.00 dB
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65218 / 100% / -0.13 dB,   front-right: 65218 / 100% / -0.13 dB (accurate-enough=yes)
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 35294 at 3794656490
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] ratelimit.c: 73 events suppressed
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7968 usec
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7925 usec
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7896 usec
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7874 usec
(  17.213|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.213|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7609 usec
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7582 usec
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 35567 /  54% / -15.93 dB,   front-right: 35567 /  54% / -15.93 dB
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 35740 /  55% / -15.80 dB,   front-right: 35740 /  55% / -15.80 dB
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65219 / 100% / -0.13 dB,   front-right: 65219 / 100% / -0.13 dB (accurate-enough=yes)
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 35567 at 3794657045
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7419 usec
(  17.213|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7396 usec
(  17.213|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.215|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 5960 usec
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 5930 usec
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 35841 /  55% / -15.73 dB,   front-right: 35841 /  55% / -15.73 dB
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 36015 /  55% / -15.60 dB,   front-right: 36015 /  55% / -15.60 dB
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65219 / 100% / -0.13 dB,   front-right: 65219 / 100% / -0.13 dB (accurate-enough=yes)
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 35841 at 3794658702
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 5764 usec
(  17.215|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.215|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36935 /  56% / -14.94 dB,   front-right: 36935 /  56% / -14.94 dB
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 37137 /  57% / -14.80 dB,   front-right: 37137 /  57% / -14.80 dB
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65180 /  99% / -0.14 dB,   front-right: 65180 /  99% / -0.14 dB (accurate-enough=yes)
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36935 at 3794659037
(  17.215|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.215|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 38302 /  58% / -14.00 dB,   front-right: 38302 /  58% / -14.00 dB
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 38591 /  59% / -13.80 dB,   front-right: 38591 /  59% / -13.80 dB
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65045 /  99% / -0.20 dB,   front-right: 65045 /  99% / -0.20 dB (accurate-enough=yes)
(  17.215|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 38302 at 3794659369
(  17.216|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.216|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40216 /  61% / -12.72 dB,   front-right: 40216 /  61% / -12.72 dB
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 40409 /  62% / -12.60 dB,   front-right: 40409 /  62% / -12.60 dB
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65223 / 100% / -0.12 dB,   front-right: 65223 / 100% / -0.12 dB (accurate-enough=yes)
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40216 at 3794659694
(  17.216|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.216|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40763 /  62% / -12.37 dB,   front-right: 40763 /  62% / -12.37 dB
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41034 /  63% / -12.20 dB,   front-right: 41034 /  63% / -12.20 dB
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65103 /  99% / -0.17 dB,   front-right: 65103 /  99% / -0.17 dB (accurate-enough=yes)
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40763 at 3794660032
(  17.216|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.216|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41036 /  63% / -12.20 dB,   front-right: 41036 /  63% / -12.20 dB
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65038 /  99% / -0.20 dB,   front-right: 65038 /  99% / -0.20 dB (accurate-enough=yes)
(  17.216|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 41036 at 3794660354
(  17.217|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.217|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41310 /  63% / -12.03 dB,   front-right: 41310 /  63% / -12.03 dB
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65473 / 100% / -0.03 dB,   front-right: 65473 / 100% / -0.03 dB (accurate-enough=yes)
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 41310 at 3794660687
(  17.217|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.217|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41857 /  64% / -11.68 dB,   front-right: 41857 /  64% / -11.68 dB
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41990 /  64% / -11.60 dB,   front-right: 41990 /  64% / -11.60 dB
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65328 / 100% / -0.08 dB,   front-right: 65328 / 100% / -0.08 dB (accurate-enough=yes)
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 41857 at 3794661009
(  17.217|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.217|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 42404 /  65% / -11.34 dB,   front-right: 42404 /  65% / -11.34 dB
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 42640 /  65% / -11.20 dB,   front-right: 42640 /  65% / -11.20 dB
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65173 /  99% / -0.14 dB,   front-right: 65173 /  99% / -0.14 dB (accurate-enough=yes)
(  17.217|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 42404 at 3794661331
(  17.217|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.218|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 42950 /  66% / -11.01 dB,   front-right: 42950 /  66% / -11.01 dB
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 42968 /  66% / -11.00 dB,   front-right: 42968 /  66% / -11.00 dB
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65509 / 100% / -0.01 dB,   front-right: 65509 / 100% / -0.01 dB (accurate-enough=yes)
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 42950 at 3794661651
(  17.218|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.218|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 43224 /  66% / -10.85 dB,   front-right: 43224 /  66% / -10.85 dB
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 43299 /  66% / -10.80 dB,   front-right: 43299 /  66% / -10.80 dB
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65422 / 100% / -0.05 dB,   front-right: 65422 / 100% / -0.05 dB (accurate-enough=yes)
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 43224 at 3794661984
(  17.218|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.218|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 43224 /  66% / -10.85 dB,   front-right: 43224 /  66% / -10.85 dB
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 43299 /  66% / -10.80 dB,   front-right: 43299 /  66% / -10.80 dB
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65422 / 100% / -0.05 dB,   front-right: 65422 / 100% / -0.05 dB (accurate-enough=yes)
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 43224 at 3794662302
(  17.218|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 43224 at 3794661984 was dropped
(  17.218|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 42950 /  66% / -11.01 dB,   front-right: 42950 /  66% / -11.01 dB
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 42968 /  66% / -11.00 dB,   front-right: 42968 /  66% / -11.00 dB
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65509 / 100% / -0.01 dB,   front-right: 65509 / 100% / -0.01 dB (accurate-enough=yes)
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 42950 at 3794662574
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 42950 at 3794661651 was dropped
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 43224 at 3794662302 was dropped
(  17.219|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.219|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 42677 /  65% / -11.18 dB,   front-right: 42677 /  65% / -11.18 dB
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 42968 /  66% / -11.00 dB,   front-right: 42968 /  66% / -11.00 dB
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65092 /  99% / -0.18 dB,   front-right: 65092 /  99% / -0.18 dB (accurate-enough=yes)
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 42677 at 3794662951
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 42950 at 3794662574 was dropped
(  17.219|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.219|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41857 /  64% / -11.68 dB,   front-right: 41857 /  64% / -11.68 dB
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41990 /  64% / -11.60 dB,   front-right: 41990 /  64% / -11.60 dB
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65328 / 100% / -0.08 dB,   front-right: 65328 / 100% / -0.08 dB (accurate-enough=yes)
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 41857 at 3794663308
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41857 at 3794661009 was dropped
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 42404 at 3794661331 was dropped
(  17.219|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 42677 at 3794662951 was dropped
(  17.220|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.220|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40216 /  61% / -12.72 dB,   front-right: 40216 /  61% / -12.72 dB
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 40409 /  62% / -12.60 dB,   front-right: 40409 /  62% / -12.60 dB
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65223 / 100% / -0.12 dB,   front-right: 65223 / 100% / -0.12 dB (accurate-enough=yes)
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40216 at 3794663703
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40216 at 3794659694 was dropped
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40763 at 3794660032 was dropped
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41036 at 3794660354 was dropped
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41310 at 3794660687 was dropped
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41857 at 3794663308 was dropped
(  17.220|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.220|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 38575 /  59% / -13.81 dB,   front-right: 38575 /  59% / -13.81 dB
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 38591 /  59% / -13.80 dB,   front-right: 38591 /  59% / -13.80 dB
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65509 / 100% / -0.01 dB,   front-right: 65509 / 100% / -0.01 dB (accurate-enough=yes)
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 38575 at 3794664157
(  17.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40216 at 3794663703 was dropped
(  17.220|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.220|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 35372 /  54% / -16.07 dB,   front-right: 35372 /  54% / -16.07 dB
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 35466 /  54% / -16.00 dB,   front-right: 35466 /  54% / -16.00 dB
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65362 / 100% / -0.07 dB,   front-right: 65362 / 100% / -0.07 dB (accurate-enough=yes)
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 35372 at 3794664514
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 35567 at 3794657045 was dropped
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 35841 at 3794658702 was dropped
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36935 at 3794659037 was dropped
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 38302 at 3794659369 was dropped
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 38575 at 3794664157 was dropped
(  17.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 35294 at 3794656490 was written 178 usec late
(  17.224|   0.003) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  17.224|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  19.228|   2.003) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 35372 at 3794664514 was written 1999630 usec late
(  19.228|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 31162 /  48% / -19.37 dB,   front-right: 31162 /  48% / -19.37 dB
(  19.228|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 31367 /  48% / -19.20 dB,   front-right: 31367 /  48% / -19.20 dB
(  19.228|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65108 /  99% / -0.17 dB,   front-right: 65108 /  99% / -0.17 dB (accurate-enough=yes)
(  19.229|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 31162 at 3796656438
(  19.229|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 31162 at 3796656438 was written 8035 usec late
(  19.229|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  19.229|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
(  21.237|   2.007) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  21.237|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 26909 /  41% / -23.19 dB,   front-right: 26909 /  41% / -23.19 dB
(  21.237|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 27111 /  41% / -23.00 dB,   front-right: 27111 /  41% / -23.00 dB
(  21.237|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65048 /  99% / -0.19 dB,   front-right: 65048 /  99% / -0.19 dB (accurate-enough=yes)
(  21.237|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 26909 at 3798665018
(  21.237|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 26909 at 3798665018 was written 8060 usec late
(  21.237|   0.000) I: [pulseaudio] client.c: Created 4 "Native client (UNIX socket client)"
(  21.237|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  21.238|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  23.248|   2.010) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 23209 /  35% / -27.05 dB,   front-right: 23209 /  35% / -27.05 dB
(  23.249|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 23253 /  35% / -27.00 dB,   front-right: 23253 /  35% / -27.00 dB
(  23.249|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65412 / 100% / -0.05 dB,   front-right: 65412 / 100% / -0.05 dB (accurate-enough=yes)
(  23.249|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 23209 at 3800676654
(  23.249|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 23209 at 3800676654 was written 8063 usec late
(  23.249|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
(  23.249|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
(  23.249|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
(  23.249|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
(  23.249|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  25.257|   2.007) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  25.257|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 19130 /  29% / -32.09 dB,   front-right: 19130 /  29% / -32.09 dB
(  25.257|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 19193 /  29% / -32.00 dB,   front-right: 19193 /  29% / -32.00 dB
(  25.257|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65321 / 100% / -0.09 dB,   front-right: 65321 / 100% / -0.09 dB (accurate-enough=yes)
(  25.257|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 19130 at 3802685038
(  25.257|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 19130 at 3802685038 was written 8059 usec late
(  25.257|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  25.258|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for iceweasel
(  25.258|   0.000) D: [pulseaudio] module-augment-properties.c: Found /usr/share/applications/iceweasel.desktop.
(  25.258|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  27.264|   2.006) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 13895 /  21% / -40.42 dB,   front-right: 13895 /  21% / -40.42 dB
(  27.265|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 13904 /  21% / -40.40 dB,   front-right: 13904 /  21% / -40.40 dB
(  27.265|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65494 / 100% / -0.02 dB,   front-right: 65494 / 100% / -0.02 dB (accurate-enough=yes)
(  27.265|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 13895 at 3804692583
(  27.265|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 13895 at 3804692583 was written 8033 usec late
(  27.265|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  29.277|   2.011) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:AudioStream.
(  29.277|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream AudioStream, because already set.
(  29.277|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "48000"  format.channels = "1"  format.channel_map = "\"mono\""
(  29.277|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
(  29.277|   0.000) D: [pulseaudio] sink.c: Suspending sink alsa_output.pci-0000_00_14.2.analog-stereo due to changing the sample rate.
(  29.277|   0.000) I: [pulseaudio] alsa-sink.c: Updating rate for device front:1, new rate is 48000
(  29.277|   0.000) D: [pulseaudio] source.c: Suspending source alsa_output.pci-0000_00_14.2.analog-stereo.monitor due to changing the sample rate.
(  29.277|   0.000) I: [pulseaudio] source.c: Changed sampling rate successfully
(  29.277|   0.000) I: [pulseaudio] sink.c: Changed sampling rate successfully
(  29.277|   0.000) I: [pulseaudio] sink-input.c: Rate changed to 48000 Hz
(  29.277|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:AudioStream.
(  29.277|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:AudioStream.
(  29.277|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  29.277|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
(  29.279|   0.001) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
(  29.279|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Trying resume...
(  29.280|   0.001) D: [alsa-sink-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 341 ms
(  33.312|   4.032) D: [alsa-sink-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
(  33.312|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: hwbuf_unused=0
(  33.313|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: setting avail_min=1
(  33.313|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Resumed successfully...
(  33.313|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  33.313|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
(  33.313|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  33.313|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
(  33.313|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
(  33.313|   0.000) D: [pulseaudio] resampler.c:        I00 
(  33.313|   0.000) D: [pulseaudio] resampler.c:     +------
(  33.313|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
(  33.313|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
(  33.313|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
(  33.313|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  33.313|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 48000 (method copy)
(  33.313|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
(  33.313|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
(  33.314|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  33.314|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  33.314|   0.000) I: [pulseaudio] sink-input.c: Created input 0 "AudioStream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 48000Hz and channel map mono
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     media.name = "AudioStream"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.name = "AudioStream"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "4321"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "iceweasel"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "iceweasel"
(  33.314|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:AudioStream"
(  33.314|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=100.00 ms, minreq=25.00 ms
(  33.314|   0.000) D: [pulseaudio] protocol-native.c: Traditional mode enabled, modifying sink usec only for compat with minreq.
(  33.314|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=50.00 ms, Received latency=100.14 ms
(  33.314|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
(  33.314|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
(  33.314|   0.000) I: [pulseaudio] protocol-native.c: Final latency 250.28 ms = 100.14 ms + 2*25.00 ms + 100.14 ms
(  33.315|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 13895 /  21% / -40.42 dB,   front-right: 13895 /  21% / -40.42 dB
(  33.315|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 13904 /  21% / -40.40 dB,   front-right: 13904 /  21% / -40.40 dB
(  33.315|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65494 / 100% / -0.02 dB,   front-right: 65494 / 100% / -0.02 dB (accurate-enough=yes)
(  33.315|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
(  33.315|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  33.315|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  33.315|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  33.316|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 12504 /  19% / -43.17 dB,   front-right: 12504 /  19% / -43.17 dB
(  33.316|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 12584 /  19% / -43.00 dB,   front-right: 12584 /  19% / -43.00 dB
(  33.316|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65119 /  99% / -0.17 dB,   front-right: 65119 /  99% / -0.17 dB (accurate-enough=yes)
(  33.316|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 12504 at 3810835413
(  33.316|   0.000) D: [alsa-sink-CX20756 Analog] ratelimit.c: 68 events suppressed
(  33.316|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 83745 usec
(  33.316|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 83593 usec
(  33.316|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  33.316|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
(  33.316|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 83037 usec
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 82891 usec
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 82735 usec
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 82599 usec
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 82540 usec
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 82350 usec
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 82291 usec
(  33.317|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 82122 usec
(  33.317|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 11957 /  18% / -44.33 dB,   front-right: 11957 /  18% / -44.33 dB
(  33.318|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 12017 /  18% / -44.20 dB,   front-right: 12017 /  18% / -44.20 dB
(  33.318|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65209 / 100% / -0.13 dB,   front-right: 65209 / 100% / -0.13 dB (accurate-enough=yes)
(  33.318|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 11957 at 3810837287
(  33.318|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 81778 usec
(  33.318|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  33.318|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  33.319|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 11684 /  18% / -44.93 dB,   front-right: 11684 /  18% / -44.93 dB
(  33.319|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 11744 /  18% / -44.80 dB,   front-right: 11744 /  18% / -44.80 dB
(  33.319|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65201 /  99% / -0.13 dB,   front-right: 65201 /  99% / -0.13 dB (accurate-enough=yes)
(  33.319|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 11684 at 3810838558
(  33.319|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  33.320|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  33.320|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 12231 /  19% / -43.74 dB,   front-right: 12231 /  19% / -43.74 dB
(  33.320|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 12298 /  19% / -43.60 dB,   front-right: 12298 /  19% / -43.60 dB
(  33.320|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65179 /  99% / -0.14 dB,   front-right: 65179 /  99% / -0.14 dB (accurate-enough=yes)
(  33.320|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 12231 at 3810855726
(  33.320|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  33.321|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  33.321|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15467 /  24% / -37.62 dB,   front-right: 15467 /  24% / -37.62 dB
(  33.321|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15481 /  24% / -37.60 dB,   front-right: 15481 /  24% / -37.60 dB
(  33.321|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65477 / 100% / -0.02 dB,   front-right: 65477 / 100% / -0.02 dB (accurate-enough=yes)
(  33.321|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 15467 at 3810857101
(  33.322|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  33.322|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  33.323|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 20278 /  31% / -30.57 dB,   front-right: 20278 /  31% / -30.57 dB
(  33.323|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 20408 /  31% / -30.40 dB,   front-right: 20408 /  31% / -30.40 dB
(  33.323|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65119 /  99% / -0.17 dB,   front-right: 65119 /  99% / -0.17 dB (accurate-enough=yes)
(  33.323|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 20278 at 3810858434
(  33.323|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  33.324|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  33.324|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 26578 /  41% / -23.52 dB,   front-right: 26578 /  41% / -23.52 dB
(  33.324|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 26698 /  41% / -23.40 dB,   front-right: 26698 /  41% / -23.40 dB
(  33.324|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65241 / 100% / -0.12 dB,   front-right: 65241 / 100% / -0.12 dB (accurate-enough=yes)
(  33.324|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 26578 at 3810859768
(  33.324|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  33.325|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  33.325|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40743 /  62% / -12.39 dB,   front-right: 40743 /  62% / -12.39 dB
(  33.325|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41034 /  63% / -12.20 dB,   front-right: 41034 /  63% / -12.20 dB
(  33.325|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65071 /  99% / -0.19 dB,   front-right: 65071 /  99% / -0.19 dB (accurate-enough=yes)
(  33.325|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40743 at 3810860808
(  33.325|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  33.325|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40743 /  62% / -12.39 dB,   front-right: 40743 /  62% / -12.39 dB
(  33.325|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41034 /  63% / -12.20 dB,   front-right: 41034 /  63% / -12.20 dB
(  33.325|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65071 /  99% / -0.19 dB,   front-right: 65071 /  99% / -0.19 dB (accurate-enough=yes)
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40743 at 3810861268
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40743 at 3810860808 was dropped
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  33.326|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17360 bytes.
(  33.326|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4340
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4340
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17360 bytes.
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 1211
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 12504 at 3810754869 was written 6791 usec late
(  33.326|   0.000) I: [pulseaudio] sink-input.c: Freeing input 0 "AudioStream"
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 11957 at 3810754869 was written 6791 usec late
(  33.326|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 11684 at 3810754869 was written 6791 usec late
(  35.332|   2.006) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  35.333|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 12231 at 3810770869 was written 1997700 usec late
(  35.333|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15467 at 3810770869 was written 1997700 usec late
(  35.333|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 20278 at 3810770869 was written 1997700 usec late
(  35.333|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 26578 at 3810770869 was written 1997700 usec late
(  35.333|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40743 at 3810770869 was written 1997700 usec late
(  37.341|   2.007) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  37.341|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 47217 /  72% / -8.54 dB,   front-right: 47217 /  72% / -8.54 dB
(  37.341|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 47477 /  72% / -8.40 dB,   front-right: 47477 /  72% / -8.40 dB
(  37.341|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65177 /  99% / -0.14 dB,   front-right: 65177 /  99% / -0.14 dB (accurate-enough=yes)
(  37.341|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 47217 at 3814784897
(  37.341|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  37.341|   0.000) I: [pulseaudio] client.c: Created 5 "Native client (UNIX socket client)"
(  37.342|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:AudioStream.
(  37.342|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream AudioStream, because already set.
(  37.342|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "48000"  format.channels = "1"  format.channel_map = "\"mono\""
(  37.342|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
(  37.342|   0.000) I: [pulseaudio] sink-input.c: Rate changed to 48000 Hz
(  37.342|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:AudioStream.
(  37.342|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:AudioStream.
(  37.342|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  37.342|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  37.342|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
(  37.342|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
(  37.342|   0.000) D: [pulseaudio] resampler.c:        I00 
(  37.342|   0.000) D: [pulseaudio] resampler.c:     +------
(  37.342|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
(  37.342|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
(  37.342|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
(  37.342|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  37.342|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 48000 (method copy)
(  37.342|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
(  37.342|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
(  37.343|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  37.343|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  37.343|   0.000) I: [pulseaudio] sink-input.c: Created input 1 "AudioStream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 48000Hz and channel map mono
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     media.name = "AudioStream"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.name = "AudioStream"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "4321"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "iceweasel"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "iceweasel"
(  37.343|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:AudioStream"
(  37.343|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=100.00 ms, minreq=25.00 ms
(  37.343|   0.000) D: [pulseaudio] protocol-native.c: Traditional mode enabled, modifying sink usec only for compat with minreq.
(  37.343|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=50.00 ms, Received latency=100.14 ms
(  37.343|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
(  37.344|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
(  37.344|   0.000) I: [pulseaudio] protocol-native.c: Final latency 250.28 ms = 100.14 ms + 2*25.00 ms + 100.14 ms
(  37.344|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 47217 /  72% / -8.54 dB,   front-right: 47217 /  72% / -8.54 dB
(  37.344|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 47477 /  72% / -8.40 dB,   front-right: 47477 /  72% / -8.40 dB
(  37.344|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65177 /  99% / -0.14 dB,   front-right: 65177 /  99% / -0.14 dB (accurate-enough=yes)
(  37.344|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 47217 at 3814787807
(  37.344|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 47217 at 3814784897 was dropped
(  37.344|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  37.344|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  37.345|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 50208 /  77% / -6.94 dB,   front-right: 50208 /  77% / -6.94 dB
(  37.345|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 50483 /  77% / -6.80 dB,   front-right: 50483 /  77% / -6.80 dB
(  37.345|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65179 /  99% / -0.14 dB,   front-right: 65179 /  99% / -0.14 dB (accurate-enough=yes)
(  37.345|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 50208 at 3814788615
(  37.345|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  37.345|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
(  37.345|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
(  37.345|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
(  37.345|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
(  37.345|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  37.346|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  37.346|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 49935 /  76% / -7.08 dB,   front-right: 49935 /  76% / -7.08 dB
(  37.346|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 50097 /  76% / -7.00 dB,   front-right: 50097 /  76% / -7.00 dB
(  37.346|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65324 / 100% / -0.08 dB,   front-right: 65324 / 100% / -0.08 dB (accurate-enough=yes)
(  37.346|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 49935 at 3814790055
(  37.346|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 50208 at 3814788615 was dropped
(  37.346|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  37.347|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for clementine
(  37.347|   0.000) D: [pulseaudio] module-augment-properties.c: Found /usr/share/applications/clementine.desktop.
(  37.347|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  37.348|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 45320 /  69% / -9.61 dB,   front-right: 45320 /  69% / -9.61 dB
(  37.348|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 45340 /  69% / -9.60 dB,   front-right: 45340 /  69% / -9.60 dB
(  37.348|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65507 / 100% / -0.01 dB,   front-right: 65507 / 100% / -0.01 dB (accurate-enough=yes)
(  37.348|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 45320 at 3814791545
(  37.348|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 47217 at 3814787807 was dropped
(  37.348|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 49935 at 3814790055 was dropped
(  37.348|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  37.348|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  37.349|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 37870 /  58% / -14.29 dB,   front-right: 37870 /  58% / -14.29 dB
(  37.349|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 38002 /  58% / -14.20 dB,   front-right: 38002 /  58% / -14.20 dB
(  37.349|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65308 / 100% / -0.09 dB,   front-right: 65308 / 100% / -0.09 dB (accurate-enough=yes)
(  37.349|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 37870 at 3814776818
(  37.349|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 45320 at 3814791545 was dropped
(  37.349|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 37870 at 3814776818 was written 8057 usec late
(  37.352|   0.003) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  39.357|   2.004) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  39.357|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 18729 /  29% / -32.64 dB,   front-right: 18729 /  29% / -32.64 dB
(  39.358|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 18756 /  29% / -32.60 dB,   front-right: 18756 /  29% / -32.60 dB
(  39.358|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65442 / 100% / -0.04 dB,   front-right: 65442 / 100% / -0.04 dB (accurate-enough=yes)
(  39.358|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 18729 at 3816785565
(  39.358|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 18729 at 3816785565 was written 8058 usec late
(  39.358|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  41.368|   2.010) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 18729 /  29% / -32.64 dB,   front-right: 18729 /  29% / -32.64 dB (request) != front-left: 18471 /  28% / -33.00 dB,   front-right: 18471 /  28% / -33.00 dB
(  41.369|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
(  41.369|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream pulsesink probe, because already set.
(  41.369|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
(  41.369|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
(  41.369|   0.000) D: [pulseaudio] sink.c: Suspending sink alsa_output.pci-0000_00_14.2.analog-stereo due to changing the sample rate.
(  41.369|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0020, suspending
(  41.371|   0.002) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
(  41.372|   0.000) I: [pulseaudio] alsa-sink.c: Updating rate for device front:1, new rate is 44100
(  41.372|   0.000) D: [pulseaudio] source.c: Suspending source alsa_output.pci-0000_00_14.2.analog-stereo.monitor due to changing the sample rate.
(  41.372|   0.000) I: [pulseaudio] source.c: Changed sampling rate successfully
(  41.372|   0.000) I: [pulseaudio] sink.c: Changed sampling rate successfully
(  41.372|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
(  41.372|   0.000) D: [pulseaudio] resampler.c:        I00 
(  41.372|   0.000) D: [pulseaudio] resampler.c:     +------
(  41.372|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
(  41.372|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
(  41.372|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
(  41.372|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  41.372|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 44100 (method speex-float-1)
(  41.372|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
(  41.372|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
(  41.372|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
(  41.372|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  41.372|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  41.372|   0.000) D: [pulseaudio] sink-input.c: Updated resampler for sink input 1
(  41.372|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
(  41.374|   0.001) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
(  41.374|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Trying resume...
(  41.375|   0.001) D: [alsa-sink-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
(  45.404|   4.029) D: [alsa-sink-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
(  45.405|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: hwbuf_unused=0
(  45.405|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: setting avail_min=1
(  45.405|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Resumed successfully...
(  45.405|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
(  45.405|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  45.405|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  45.405|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  45.405|   0.000) I: [pulseaudio] sink-input.c: Rate changed to 44100 Hz
(  45.405|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
(  45.405|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
(  45.405|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  45.405|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  45.405|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
(  45.405|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  45.405|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 44100 (method copy)
(  45.405|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
(  45.405|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
(  45.405|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  45.405|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  45.405|   0.000) I: [pulseaudio] sink-input.c: Created input 2 "pulsesink probe" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     media.name = "pulsesink probe"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "2839"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
(  45.405|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
(  45.406|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=136.05 ms, minreq=20.00 ms
(  45.406|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
(  45.406|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=48.03 ms, Received latency=100.14 ms
(  45.406|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
(  45.406|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
(  45.406|   0.000) I: [pulseaudio] protocol-native.c: Final latency 240.27 ms = 100.14 ms + 2*20.00 ms + 100.14 ms
(  45.406|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 18729 /  29% / -32.64 dB,   front-right: 18729 /  29% / -32.64 dB
(  45.406|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 18756 /  29% / -32.60 dB,   front-right: 18756 /  29% / -32.60 dB
(  45.406|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65442 / 100% / -0.04 dB,   front-right: 65442 / 100% / -0.04 dB (accurate-enough=yes)
(  45.406|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
(  45.407|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  45.407|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  45.407|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  45.407|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 6754 /  10% / -59.22 dB,   front-right: 6754 /  10% / -59.22 dB
(  45.407|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 6758 /  10% / -59.20 dB,   front-right: 6758 /  10% / -59.20 dB
(  45.407|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
(  45.407|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 6754 at 3822935132
(  45.407|   0.000) D: [alsa-sink-CX20756 Analog] ratelimit.c: 153 events suppressed
(  45.407|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 92006 usec
(  45.407|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91953 usec
(  45.412|   0.005) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  45.413|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
(  45.413|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
(  45.413|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 86304 usec
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 86192 usec
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 86155 usec
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 86113 usec
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 86086 usec
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 86038 usec
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 86011 usec
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 85972 usec
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 85945 usec
(  45.413|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 6318 /  10% / -60.95 dB,   front-right: 6318 /  10% / -60.95 dB
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 6356 /  10% / -60.80 dB,   front-right: 6356 /  10% / -60.80 dB
(  45.413|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65144 /  99% / -0.16 dB,   front-right: 65144 /  99% / -0.16 dB (accurate-enough=yes)
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 6318 at 3822941413
(  45.414|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 6318 /  10% / -60.95 dB,   front-right: 6318 /  10% / -60.95 dB
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 6356 /  10% / -60.80 dB,   front-right: 6356 /  10% / -60.80 dB
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65144 /  99% / -0.16 dB,   front-right: 65144 /  99% / -0.16 dB (accurate-enough=yes)
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 6318 at 3822941821
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  45.414|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17376 bytes.
(  45.414|   0.000) I: [pulseaudio] sink-input.c: Freeing input 2 "pulsesink probe"
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4344
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4344
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17376 bytes.
(  45.414|   0.000) D: [pulseaudio] sink.c: Suspending sink alsa_output.pci-0000_00_14.2.analog-stereo due to changing the sample rate.
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  45.414|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0020, suspending
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 1306
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 6754 at 3822843337 was written 6695 usec late
(  45.414|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 6318 at 3822843337 was written 6695 usec late
(  47.424|   2.010) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17376 bytes on render memblockq.
(  47.424|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  47.425|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 6318 at 3822859337 was written 2001233 usec late
(  47.425|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
(  47.425|   0.000) I: [pulseaudio] alsa-sink.c: Updating rate for device front:1, new rate is 48000
(  47.425|   0.000) D: [pulseaudio] source.c: Suspending source alsa_output.pci-0000_00_14.2.analog-stereo.monitor due to changing the sample rate.
(  47.425|   0.000) I: [pulseaudio] source.c: Changed sampling rate successfully
(  47.425|   0.000) I: [pulseaudio] sink.c: Changed sampling rate successfully
(  47.425|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
(  47.425|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
(  47.425|   0.000) D: [pulseaudio] resampler.c:        I00 
(  47.425|   0.000) D: [pulseaudio] resampler.c:     +------
(  47.425|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
(  47.425|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
(  47.425|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
(  47.425|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  47.426|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 48000 (method copy)
(  47.426|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
(  47.426|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
(  47.426|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  47.426|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  47.426|   0.000) D: [pulseaudio] sink-input.c: Updated resampler for sink input 1
(  47.426|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
(  47.427|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
(  47.427|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Trying resume...
(  47.428|   0.001) D: [alsa-sink-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 341 ms
(  51.468|   4.040) D: [alsa-sink-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
(  51.468|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: hwbuf_unused=0
(  51.468|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: setting avail_min=1
(  51.469|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Resumed successfully...
(  51.469|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  51.469|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
(  51.469|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  51.469|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  51.469|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  51.469|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to uncorking
(  51.469|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  51.469|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  51.469|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17372 bytes.
(  51.469|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4343
(  51.469|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4343
(  51.470|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17372 bytes.
(  51.470|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  51.470|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 1091
(  51.470|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  51.470|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  51.472|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  51.472|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  51.472|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  51.473|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 7436 /  11% / -56.71 dB,   front-right: 7436 /  11% / -56.71 dB
(  51.473|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 7467 /  11% / -56.60 dB,   front-right: 7467 /  11% / -56.60 dB
(  51.473|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65264 / 100% / -0.11 dB,   front-right: 65264 / 100% / -0.11 dB (accurate-enough=yes)
(  51.473|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 7436 at 3829008316
(  51.473|   0.000) D: [alsa-sink-CX20756 Analog] ratelimit.c: 9 events suppressed
(  51.473|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 99594 usec
(  51.473|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 99038 usec
(  51.475|   0.001) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  51.476|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
(  51.476|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
(  51.476|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
(  51.476|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream pulsesink probe, because already set.
(  51.476|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
(  51.476|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
(  51.476|   0.000) I: [pulseaudio] sink.c: Cannot update rate, SINK_IS_RUNNING, will keep using 48000 Hz
(  51.476|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
(  51.476|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
(  51.477|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  51.477|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  51.477|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 48000 (method speex-float-1)
(  51.477|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
(  51.477|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
(  51.477|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
(  51.477|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  51.477|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  51.477|   0.000) I: [pulseaudio] sink-input.c: Created input 3 "pulsesink probe" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     media.name = "pulsesink probe"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "2839"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
(  51.477|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
(  51.478|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=136.05 ms, minreq=20.00 ms
(  51.478|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
(  51.478|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 94550 usec
(  51.478|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 93968 usec
(  51.479|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 93900 usec
(  51.479|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 93414 usec
(  51.479|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 93348 usec
(  51.479|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=48.03 ms, Received latency=100.14 ms
(  51.479|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
(  51.479|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
(  51.479|   0.000) I: [pulseaudio] protocol-native.c: Final latency 240.27 ms = 100.14 ms + 2*20.00 ms + 100.14 ms
(  51.480|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 92877 usec
(  51.480|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 7436 /  11% / -56.71 dB,   front-right: 7436 /  11% / -56.71 dB
(  51.480|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 7467 /  11% / -56.60 dB,   front-right: 7467 /  11% / -56.60 dB
(  51.480|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65264 / 100% / -0.11 dB,   front-right: 65264 / 100% / -0.11 dB (accurate-enough=yes)
(  51.480|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 7436 at 3829015379
(  51.480|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 7436 at 3829008316 was dropped
(  51.480|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 99521 usec
(  51.481|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 98964 usec
(  51.481|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 98899 usec
(  51.481|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  51.481|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  51.482|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 16274 /  25% / -36.30 dB,   front-right: 16274 /  25% / -36.30 dB
(  51.482|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 16336 /  25% / -36.20 dB,   front-right: 16336 /  25% / -36.20 dB
(  51.482|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65287 / 100% / -0.10 dB,   front-right: 65287 / 100% / -0.10 dB (accurate-enough=yes)
(  51.482|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 16274 at 3829017586
(  51.482|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  51.483|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  51.483|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 27212 /  42% / -22.90 dB,   front-right: 27212 /  42% / -22.90 dB
(  51.483|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 27320 /  42% / -22.80 dB,   front-right: 27320 /  42% / -22.80 dB
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65277 / 100% / -0.10 dB,   front-right: 65277 / 100% / -0.10 dB (accurate-enough=yes)
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 27212 at 3829019273
(  51.484|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 27212 /  42% / -22.90 dB,   front-right: 27212 /  42% / -22.90 dB
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 27320 /  42% / -22.80 dB,   front-right: 27320 /  42% / -22.80 dB
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65277 / 100% / -0.10 dB,   front-right: 65277 / 100% / -0.10 dB (accurate-enough=yes)
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 27212 at 3829019774
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 27212 at 3829019273 was dropped
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17348 bytes.
(  51.484|   0.000) I: [pulseaudio] sink-input.c: Freeing input 3 "pulsesink probe"
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4337
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4337
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17348 bytes.
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 1191
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17348 bytes on render memblockq.
(  51.484|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  51.486|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  51.486|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 43619 /  67% / -10.61 dB,   front-right: 43619 /  67% / -10.61 dB
(  51.486|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 43633 /  67% / -10.60 dB,   front-right: 43633 /  67% / -10.60 dB
(  51.486|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65515 / 100% / -0.01 dB,   front-right: 65515 / 100% / -0.01 dB (accurate-enough=yes)
(  51.486|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 43619 at 3829022003
(  51.486|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  51.488|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  51.488|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 46038 /  70% / -9.20 dB,   front-right: 46038 /  70% / -9.20 dB
(  51.488|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 46041 /  70% / -9.20 dB,   front-right: 46041 /  70% / -9.20 dB
(  51.488|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65532 / 100% / -0.00 dB,   front-right: 65532 / 100% / -0.00 dB (accurate-enough=yes)
(  51.488|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 46038 at 3829023629
(  51.488|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  51.488|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
(  51.488|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Playback Stream, because already set.
(  51.489|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
(  51.489|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
(  51.489|   0.000) I: [pulseaudio] sink.c: Cannot update rate, SINK_IS_RUNNING, will keep using 48000 Hz
(  51.489|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
(  51.489|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
(  51.489|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  51.489|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  51.489|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 48000 (method speex-float-1)
(  51.489|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
(  51.489|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
(  51.489|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
(  51.489|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  51.489|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  51.489|   0.000) I: [pulseaudio] sink-input.c: Created input 4 "Playback Stream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     media.name = "Playback Stream"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "2839"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
(  51.489|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
(  51.489|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=200.00 ms, minreq=10.00 ms
(  51.489|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
(  51.490|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=90.00 ms, Received latency=100.14 ms
(  51.490|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=42384, base=8, prebuf=0, minreq=3528 maxrewind=0
(  51.490|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=42384, base=8, prebuf=0, minreq=3528 maxrewind=0
(  51.490|   0.000) I: [pulseaudio] protocol-native.c: Final latency 220.27 ms = 100.14 ms + 2*10.00 ms + 100.14 ms
(  51.490|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 46038 /  70% / -9.20 dB,   front-right: 46038 /  70% / -9.20 dB
(  51.490|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 46041 /  70% / -9.20 dB,   front-right: 46041 /  70% / -9.20 dB
(  51.490|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65532 / 100% / -0.00 dB,   front-right: 65532 / 100% / -0.00 dB (accurate-enough=yes)
(  51.490|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 46038 at 3829026108
(  51.490|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 46038 at 3829023629 was dropped
(  51.491|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  51.491|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  51.491|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 42096 /  64% / -11.53 dB,   front-right: 42096 /  64% / -11.53 dB
(  51.491|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 42314 /  65% / -11.40 dB,   front-right: 42314 /  65% / -11.40 dB
(  51.491|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65198 /  99% / -0.13 dB,   front-right: 65198 /  99% / -0.13 dB (accurate-enough=yes)
(  51.491|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 42096 at 3829026857
(  51.491|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 43619 at 3829022003 was dropped
(  51.491|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 46038 at 3829026108 was dropped
(  51.491|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  51.492|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  51.493|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 24678 /  38% / -25.45 dB,   front-right: 24678 /  38% / -25.45 dB
(  51.493|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 24726 /  38% / -25.40 dB,   front-right: 24726 /  38% / -25.40 dB
(  51.493|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65409 / 100% / -0.05 dB,   front-right: 65409 / 100% / -0.05 dB (accurate-enough=yes)
(  51.493|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 24678 at 3829012439
(  51.493|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 42096 at 3829026857 was dropped
(  51.493|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  51.493|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  51.493|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  51.494|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 7436 at 3828929437 was written 89 usec late
(  51.494|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 16274 at 3828929437 was written 89 usec late
(  51.494|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 27212 at 3828929437 was written 89 usec late
(  53.500|   2.006) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 19251 /  29% / -31.92 dB,   front-right: 19251 /  29% / -31.92 dB
(  53.501|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 19341 /  30% / -31.80 dB,   front-right: 19341 /  30% / -31.80 dB
(  53.501|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65231 / 100% / -0.12 dB,   front-right: 65231 / 100% / -0.12 dB (accurate-enough=yes)
(  53.501|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 19251 at 3830928576
(  53.501|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 24678 at 3829012439 was written 1924197 usec late
(  53.501|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 19251 at 3830928576 was written 8060 usec late
(  53.501|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  55.512|   2.011) I: [pulseaudio] client.c: Created 6 "Native client (UNIX socket client)"
(  55.512|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Implicit underrun of 'AudioStream'
(  55.513|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
(  55.513|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5388 bytes ago (12272 bytes ahead in playback buffer)
(  55.513|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5468 bytes ago (12192 bytes ahead in playback buffer)
(  55.514|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5552 bytes ago (12104 bytes ahead in playback buffer)
(  55.514|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  55.514|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  55.514|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5668 bytes ago (11988 bytes ahead in playback buffer)
(  55.515|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 23843 /  36% / -26.35 dB,   front-right: 23843 /  36% / -26.35 dB
(  55.515|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 23978 /  37% / -26.20 dB,   front-right: 23978 /  37% / -26.20 dB
(  55.515|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65167 /  99% / -0.15 dB,   front-right: 65167 /  99% / -0.15 dB (accurate-enough=yes)
(  55.515|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 23843 at 3832958682
(  55.515|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  55.515|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5820 bytes ago (11840 bytes ahead in playback buffer)
(  55.515|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
(  55.516|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
(  55.516|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
(  55.516|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
(  55.516|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5924 bytes ago (11736 bytes ahead in playback buffer)
(  55.516|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6016 bytes ago (11644 bytes ahead in playback buffer)
(  55.517|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  55.517|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  55.517|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6096 bytes ago (11564 bytes ahead in playback buffer)
(  55.517|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40750 /  62% / -12.38 dB,   front-right: 40750 /  62% / -12.38 dB
(  55.517|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41034 /  63% / -12.20 dB,   front-right: 41034 /  63% / -12.20 dB
(  55.517|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65082 /  99% / -0.18 dB,   front-right: 65082 /  99% / -0.18 dB (accurate-enough=yes)
(  55.517|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40750 at 3832960856
(  55.517|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  55.517|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6236 bytes ago (11420 bytes ahead in playback buffer)
(  55.517|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for pavucontrol
(  55.518|   0.000) D: [pulseaudio] module-augment-properties.c: Found /usr/share/applications/pavucontrol.desktop.
(  55.519|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6452 bytes ago (11204 bytes ahead in playback buffer)
(  55.519|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6540 bytes ago (11120 bytes ahead in playback buffer)
(  55.519|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6620 bytes ago (11040 bytes ahead in playback buffer)
(  55.520|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  55.520|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  55.520|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6696 bytes ago (10960 bytes ahead in playback buffer)
(  55.520|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41269 /  63% / -12.05 dB,   front-right: 41269 /  63% / -12.05 dB
(  55.520|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(  55.520|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65408 / 100% / -0.05 dB,   front-right: 65408 / 100% / -0.05 dB (accurate-enough=yes)
(  55.520|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 41269 at 3832963977
(  55.520|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  55.520|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6832 bytes ago (10824 bytes ahead in playback buffer)
(  55.521|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6916 bytes ago (10744 bytes ahead in playback buffer)
(  55.521|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  55.521|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6992 bytes ago (10664 bytes ahead in playback buffer)
(  55.521|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  55.521|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 6992 bytes.
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 6992 bytes.
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 1748
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 1748
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 6992 bytes.
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 6992 bytes on render memblockq.
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 6992 bytes on render memblockq.
(  55.522|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  55.523|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 23843 at 3832958682 was written 160 usec late
(  57.528|   2.005) D: [alsa-sink-CX20756 Analog] ratelimit.c: 243 events suppressed
(  57.529|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 2014 usec
(  57.529|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36122 /  55% / -15.52 dB,   front-right: 36122 /  55% / -15.52 dB
(  57.529|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 36293 /  55% / -15.40 dB,   front-right: 36293 /  55% / -15.40 dB
(  57.529|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65227 / 100% / -0.12 dB,   front-right: 65227 / 100% / -0.12 dB (accurate-enough=yes)
(  57.529|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 36122 at 3834956835
(  57.529|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40750 at 3832960856 was written 2004047 usec late
(  57.529|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41269 at 3832963977 was written 2000926 usec late
(  57.529|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36122 at 3834956835 was written 8068 usec late
(  57.529|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  59.536|   2.007) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 36122 /  55% / -15.52 dB,   front-right: 36122 /  55% / -15.52 dB (request) != front-left: 35466 /  54% / -16.00 dB,   front-right: 35466 /  54% / -16.00 dB
(  59.538|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  59.539|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 26552 /  41% / -23.54 dB,   front-right: 26552 /  41% / -23.54 dB
(  59.539|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 26698 /  41% / -23.40 dB,   front-right: 26698 /  41% / -23.40 dB
(  59.539|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65178 /  99% / -0.14 dB,   front-right: 65178 /  99% / -0.14 dB (accurate-enough=yes)
(  59.539|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 26552 at 3836966676
(  59.539|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 26552 at 3836966676 was written 8063 usec late
(  59.539|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  61.544|   2.005) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 26552 /  41% / -23.54 dB,   front-right: 26552 /  41% / -23.54 dB (request) != front-left: 26090 /  40% / -24.00 dB,   front-right: 26090 /  40% / -24.00 dB
(  61.545|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Implicit underrun of 'AudioStream'
(  61.545|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4260 bytes ago (13404 bytes ahead in playback buffer)
(  61.545|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4276 bytes ago (13388 bytes ahead in playback buffer)
(  61.545|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4288 bytes ago (13376 bytes ahead in playback buffer)
(  61.545|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4304 bytes ago (13360 bytes ahead in playback buffer)
(  61.545|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  61.546|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4336 bytes ago (13328 bytes ahead in playback buffer)
(  61.546|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15887 /  24% / -36.93 dB,   front-right: 15887 /  24% / -36.93 dB
(  61.546|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15964 /  24% / -36.80 dB,   front-right: 15964 /  24% / -36.80 dB
(  61.546|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65220 / 100% / -0.13 dB,   front-right: 65220 / 100% / -0.13 dB (accurate-enough=yes)
(  61.546|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15887 at 3838973680
(  61.546|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15887 at 3838973680 was written 8026 usec late
(  61.546|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  63.557|   2.010) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  63.558|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  63.559|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 8715 /  13% / -52.57 dB,   front-right: 8715 /  13% / -52.57 dB
(  63.559|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 8773 /  13% / -52.40 dB,   front-right: 8773 /  13% / -52.40 dB
(  63.559|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65103 /  99% / -0.17 dB,   front-right: 65103 /  99% / -0.17 dB (accurate-enough=yes)
(  63.559|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 8715 at 3840986725
(  63.559|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 8715 at 3840986725 was written 8057 usec late
(  63.559|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  65.568|   2.009) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 8715 /  13% / -52.57 dB,   front-right: 8715 /  13% / -52.57 dB (request) != front-left: 8573 /  13% / -53.00 dB,   front-right: 8573 /  13% / -53.00 dB
(  65.569|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  65.569|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 9658 /  15% / -49.90 dB,   front-right: 9658 /  15% / -49.90 dB
(  65.569|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 9694 /  15% / -49.80 dB,   front-right: 9694 /  15% / -49.80 dB
(  65.570|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65293 / 100% / -0.10 dB,   front-right: 65293 / 100% / -0.10 dB (accurate-enough=yes)
(  65.570|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 9658 at 3843013517
(  65.570|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7942 usec
(  65.570|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  65.570|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7654 usec
(  65.570|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7587 usec
(  65.570|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
(  65.570|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7304 usec
(  65.570|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7243 usec
(  65.571|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6955 usec
(  65.571|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6790 usec
(  65.571|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6498 usec
(  65.571|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6437 usec
(  65.571|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6158 usec
(  65.572|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  65.573|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15050 /  23% / -38.34 dB,   front-right: 15050 /  23% / -38.34 dB
(  65.573|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15129 /  23% / -38.20 dB,   front-right: 15129 /  23% / -38.20 dB
(  65.573|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65194 /  99% / -0.14 dB,   front-right: 65194 /  99% / -0.14 dB (accurate-enough=yes)
(  65.573|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 15050 at 3843016689
(  65.573|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  65.574|   0.001) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  65.575|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  65.575|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 20318 /  31% / -30.52 dB,   front-right: 20318 /  31% / -30.52 dB
(  65.575|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 20408 /  31% / -30.40 dB,   front-right: 20408 /  31% / -30.40 dB
(  65.575|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65247 / 100% / -0.12 dB,   front-right: 65247 / 100% / -0.12 dB (accurate-enough=yes)
(  65.575|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 20318 at 3843018816
(  65.575|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  65.576|   0.001) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  65.577|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  65.577|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 20785 /  32% / -29.92 dB,   front-right: 20785 /  32% / -29.92 dB
(  65.577|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 20884 /  32% / -29.80 dB,   front-right: 20884 /  32% / -29.80 dB
(  65.577|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65225 / 100% / -0.12 dB,   front-right: 65225 / 100% / -0.12 dB (accurate-enough=yes)
(  65.577|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 20785 at 3843021410
(  65.578|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  65.578|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 9658 at 3843013517 was written 193 usec late
(  67.588|   2.010) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15050 at 3843016689 was written 2007614 usec late
(  67.589|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 20318 at 3843018816 was written 2005487 usec late
(  67.589|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  67.589|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 20785 at 3843021410 was written 2002893 usec late
(  69.601|   2.011) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17368 bytes.
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4342
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4342
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17368 bytes.
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17368 bytes on render memblockq.
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17368 bytes on render memblockq.
(  69.601|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  69.602|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 20210 /  31% / -30.65 dB,   front-right: 20210 /  31% / -30.65 dB
(  69.602|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 20252 /  31% / -30.60 dB,   front-right: 20252 /  31% / -30.60 dB
(  69.602|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65400 / 100% / -0.05 dB,   front-right: 65400 / 100% / -0.05 dB (accurate-enough=yes)
(  69.602|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 20210 at 3847029597
(  69.602|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 20210 at 3847029597 was written 8052 usec late
(  69.602|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  71.612|   2.010) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 20210 /  31% / -30.65 dB,   front-right: 20210 /  31% / -30.65 dB (request) != front-left: 19944 /  30% / -31.00 dB,   front-right: 19944 /  30% / -31.00 dB
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Implicit underrun of 'AudioStream'
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4000 bytes ago (13660 bytes ahead in playback buffer)
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to uncorking
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  71.613|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17364 bytes.
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4341
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4341
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17364 bytes.
(  71.613|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  71.614|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
(  71.614|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17364 bytes on render memblockq.
(  71.614|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  71.616|   0.002) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4584 bytes ago (13064 bytes ahead in playback buffer)
(  71.617|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4700 bytes ago (12956 bytes ahead in playback buffer)
(  71.617|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4808 bytes ago (12848 bytes ahead in playback buffer)
(  71.617|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  71.618|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  71.618|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 4912 bytes ago (12744 bytes ahead in playback buffer)
(  71.618|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 19663 /  30% / -31.37 dB,   front-right: 19663 /  30% / -31.37 dB
(  71.618|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 19792 /  30% / -31.20 dB,   front-right: 19792 /  30% / -31.20 dB
(  71.618|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65109 /  99% / -0.17 dB,   front-right: 65109 /  99% / -0.17 dB (accurate-enough=yes)
(  71.618|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 19663 at 3849046076
(  71.618|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 19663 at 3849046076 was written 8054 usec late
(  71.618|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  71.619|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5100 bytes ago (12556 bytes ahead in playback buffer)
(  71.619|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5200 bytes ago (12456 bytes ahead in playback buffer)
(  71.620|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5304 bytes ago (12348 bytes ahead in playback buffer)
(  71.620|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5416 bytes ago (12240 bytes ahead in playback buffer)
(  71.621|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5516 bytes ago (12140 bytes ahead in playback buffer)
(  71.621|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5616 bytes ago (12040 bytes ahead in playback buffer)
(  71.622|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5720 bytes ago (11936 bytes ahead in playback buffer)
(  71.623|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5816 bytes ago (11840 bytes ahead in playback buffer)
(  71.623|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 5916 bytes ago (11740 bytes ahead in playback buffer)
(  71.624|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6032 bytes ago (11624 bytes ahead in playback buffer)
(  71.624|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6136 bytes ago (11520 bytes ahead in playback buffer)
(  71.624|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
(  71.624|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  71.624|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17364 bytes.
(  71.624|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4341
(  71.624|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4341
(  71.625|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17364 bytes.
(  71.625|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  71.625|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
(  71.625|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17364 bytes on render memblockq.
(  71.625|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17364 bytes on render memblockq.
(  71.625|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 31920 bytes on implementor.
(  71.625|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  71.626|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17624 bytes ago (36 bytes ahead in playback buffer)
(  71.626|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6452 bytes ago (11208 bytes ahead in playback buffer)
(  71.626|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6516 bytes ago (11144 bytes ahead in playback buffer)
(  71.626|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6572 bytes ago (11088 bytes ahead in playback buffer)
(  71.627|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6628 bytes ago (11028 bytes ahead in playback buffer)
(  71.627|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6688 bytes ago (10972 bytes ahead in playback buffer)
(  71.627|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6740 bytes ago (10924 bytes ahead in playback buffer)
(  71.627|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6768 bytes ago (10896 bytes ahead in playback buffer)
(  71.628|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6796 bytes ago (10868 bytes ahead in playback buffer)
(  71.628|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6816 bytes ago (10848 bytes ahead in playback buffer)
(  71.628|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6884 bytes ago (10780 bytes ahead in playback buffer)
(  71.628|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6908 bytes ago (10756 bytes ahead in playback buffer)
(  71.628|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6924 bytes ago (10740 bytes ahead in playback buffer)
(  71.628|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6936 bytes ago (10728 bytes ahead in playback buffer)
(  71.628|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6968 bytes ago (10696 bytes ahead in playback buffer)
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 6984 bytes ago (10680 bytes ahead in playback buffer)
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 7024 bytes ago (10640 bytes ahead in playback buffer)
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 7024 bytes.
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 7024 bytes.
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 1756
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 1756
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 7024 bytes.
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 7024 bytes on render memblockq.
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 7024 bytes on render memblockq.
(  71.629|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  71.659|   0.029) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 19663 /  30% / -31.37 dB,   front-right: 19663 /  30% / -31.37 dB
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 19792 /  30% / -31.20 dB,   front-right: 19792 /  30% / -31.20 dB
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65109 /  99% / -0.17 dB,   front-right: 65109 /  99% / -0.17 dB (accurate-enough=yes)
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17340 bytes.
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4335
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4335
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17340 bytes.
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17340 bytes on render memblockq.
(  71.659|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  71.663|   0.003) I: [pulseaudio] sink-input.c: Freeing input 4 "'180db_' by 'Aphex Twin'"
(  71.663|   0.000) I: [pulseaudio] client.c: Freed 5 "Clementine"
(  71.663|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
(  71.665|   0.002) D: [alsa-sink-CX20756 Analog] ratelimit.c: 38 events suppressed
(  71.665|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.665|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.665|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.665|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.665|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.665|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.665|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.665|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.666|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.666|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.666|   0.000) D: [alsa-sink-CX20756 Analog] memblock.c: Pool full
(  71.677|   0.010) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
(  71.677|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
(  71.677|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
(  71.677|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
(  71.677|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
(  71.677|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes busy, resuming.
(  71.677|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0000, resuming
(  71.678|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio0'
(  71.678|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Trying resume...
(  71.679|   0.000) D: [alsa-sink-HDMI 0] alsa-util.c: Maximum hw buffer size is 371 ms
(  71.679|   0.000) D: [alsa-sink-HDMI 0] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
(  71.679|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: hwbuf_unused=0
(  71.679|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: setting avail_min=1
(  71.679|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Resumed successfully...
(  71.679|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Starting playback.
(  71.679|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
(  71.680|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
(  71.680|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
(  71.680|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
(  71.680|   0.000) D: [pulseaudio] resampler.c:     +------------
(  71.680|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
(  71.680|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
(  71.680|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  71.680|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
(  71.680|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
(  71.680|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
(  71.680|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  71.680|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  71.680|   0.000) I: [pulseaudio] source-output.c: Created output 0 "Peak detect" on alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
(  71.680|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3216"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
(  71.680|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
(  71.680|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
(  71.680|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
(  71.681|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
(  71.681|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  71.682|   0.001) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
(  71.682|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
(  71.682|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
(  71.682|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
(  71.682|   0.000) I: [pulseaudio] source.c: Cannot update rate, this is a monitor source and the sink is running.
(  71.682|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
(  71.682|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  71.682|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
(  71.682|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
(  71.682|   0.000) D: [pulseaudio] resampler.c:     +------------
(  71.682|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
(  71.682|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
(  71.682|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  71.682|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 25 (method peaks)
(  71.682|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
(  71.682|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
(  71.683|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  71.683|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  71.683|   0.000) I: [pulseaudio] source-output.c: Created output 1 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
(  71.683|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3216"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
(  71.683|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
(  71.684|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
(  71.684|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
(  71.684|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
(  71.685|   0.001) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
(  71.686|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
(  71.686|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
(  71.686|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
(  71.686|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
(  71.686|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  71.686|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
(  71.686|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Trying resume...
(  71.687|   0.000) D: [alsa-source-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
(  71.687|   0.000) D: [alsa-source-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
(  71.687|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: hwbuf_unused=0
(  71.687|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: setting avail_min=1
(  71.687|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Resumed successfully...
(  71.687|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Starting capture.
(  71.687|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  71.687|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
(  71.687|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
(  71.687|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
(  71.687|   0.000) D: [pulseaudio] resampler.c:     +------------
(  71.687|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
(  71.687|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
(  71.687|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  71.687|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
(  71.687|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
(  71.687|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
(  71.687|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  71.687|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  71.687|   0.000) I: [pulseaudio] source-output.c: Created output 2 "Peak detect" on alsa_input.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 25Hz and channel map mono
(  71.687|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3216"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
(  71.687|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
(  71.688|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
(  71.688|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
(  71.688|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
(  71.688|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
(  71.688|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(  71.688|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
(  71.688|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume going down to 41350 at 3849116516
(  71.688|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume change to 41350 at 3849116516 was written 7788 usec late
(  71.689|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
(  71.692|   0.003) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  71.692|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 34506 /  53% / -16.72 dB,   front-right: 34506 /  53% / -16.72 dB
(  71.693|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 34659 /  53% / -16.60 dB,   front-right: 34659 /  53% / -16.60 dB
(  71.693|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65247 / 100% / -0.12 dB,   front-right: 65247 / 100% / -0.12 dB (accurate-enough=yes)
(  71.693|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 34506 at 3849136502
(  71.693|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  71.694|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  71.694|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 34779 /  53% / -16.51 dB,   front-right: 34779 /  53% / -16.51 dB
(  71.694|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 34926 /  53% / -16.40 dB,   front-right: 34926 /  53% / -16.40 dB
(  71.694|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65260 / 100% / -0.11 dB,   front-right: 65260 / 100% / -0.11 dB (accurate-enough=yes)
(  71.694|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 34779 at 3849137972
(  71.694|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  71.694|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
(  71.694|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
(  71.695|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
(  71.695|   0.000) I: [pulseaudio] source.c: Cannot update rate, SOURCE_IS_RUNNING, will keep using 48000 Hz
(  71.695|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
(  71.695|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
(  71.695|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
(  71.695|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
(  71.695|   0.000) D: [pulseaudio] resampler.c:     +------------
(  71.695|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
(  71.695|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
(  71.695|   0.000) D: [pulseaudio] resampler.c: Resampler:
(  71.695|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 25 (method peaks)
(  71.695|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
(  71.695|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
(  71.695|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
(  71.695|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
(  71.695|   0.000) I: [pulseaudio] source-output.c: Created output 3 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
(  71.695|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3216"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
(  71.695|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
(  71.696|   0.001) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
(  71.696|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
(  71.696|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
(  71.697|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  71.697|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 35053 /  53% / -16.31 dB,   front-right: 35053 /  53% / -16.31 dB
(  71.697|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 35195 /  54% / -16.20 dB,   front-right: 35195 /  54% / -16.20 dB
(  71.697|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65272 / 100% / -0.11 dB,   front-right: 65272 / 100% / -0.11 dB (accurate-enough=yes)
(  71.697|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 35053 at 3849141355
(  71.698|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  71.698|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  71.698|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 35053 /  53% / -16.31 dB,   front-right: 35053 /  53% / -16.31 dB
(  71.699|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 35195 /  54% / -16.20 dB,   front-right: 35195 /  54% / -16.20 dB
(  71.699|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65272 / 100% / -0.11 dB,   front-right: 65272 / 100% / -0.11 dB (accurate-enough=yes)
(  71.699|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 35053 at 3849142512
(  71.699|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 35053 at 3849141355 was dropped
(  71.700|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  71.700|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 35326 /  54% / -16.10 dB,   front-right: 35326 /  54% / -16.10 dB
(  71.700|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 35466 /  54% / -16.00 dB,   front-right: 35466 /  54% / -16.00 dB
(  71.700|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65277 / 100% / -0.10 dB,   front-right: 65277 / 100% / -0.10 dB (accurate-enough=yes)
(  71.701|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 35326 at 3849144450
(  71.701|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  71.701|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 34506 at 3849136502 was written 336 usec late
(  73.708|   2.007) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 34506 /  53% / -16.72 dB,   front-right: 34506 /  53% / -16.72 dB (request) != front-left: 34131 /  52% / -17.00 dB,   front-right: 34131 /  52% / -17.00 dB
(  73.709|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 34779 at 3849137972 was written 2006449 usec late
(  73.709|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 35053 at 3849142512 was written 2001909 usec late
(  73.709|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 35326 at 3849144450 was written 1999971 usec late
(  75.724|   2.015) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  75.724|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36147 /  55% / -15.50 dB,   front-right: 36147 /  55% / -15.50 dB
(  75.725|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 36293 /  55% / -15.40 dB,   front-right: 36293 /  55% / -15.40 dB
(  75.725|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65272 / 100% / -0.11 dB,   front-right: 65272 / 100% / -0.11 dB (accurate-enough=yes)
(  75.725|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36147 at 3853168600
(  75.725|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  75.725|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
(  75.729|   0.003) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  75.729|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36420 /  56% / -15.31 dB,   front-right: 36420 /  56% / -15.31 dB
(  75.729|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 36572 /  56% / -15.20 dB,   front-right: 36572 /  56% / -15.20 dB
(  75.729|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65264 / 100% / -0.11 dB,   front-right: 65264 / 100% / -0.11 dB (accurate-enough=yes)
(  75.729|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36420 at 3853173231
(  75.730|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  75.732|   0.002) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  75.732|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36694 /  56% / -15.11 dB,   front-right: 36694 /  56% / -15.11 dB
(  75.732|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 36854 /  56% / -15.00 dB,   front-right: 36854 /  56% / -15.00 dB
(  75.732|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65251 / 100% / -0.11 dB,   front-right: 65251 / 100% / -0.11 dB (accurate-enough=yes)
(  75.732|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36694 at 3853176354
(  75.733|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  75.733|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36147 at 3853168600 was written 401 usec late
(  75.733|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 36147 /  55% / -15.50 dB,   front-right: 36147 /  55% / -15.50 dB (request) != front-left: 35466 /  54% / -16.00 dB,   front-right: 35466 /  54% / -16.00 dB
(  75.733|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  75.734|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36967 /  56% / -14.92 dB,   front-right: 36967 /  56% / -14.92 dB
(  75.734|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 37137 /  57% / -14.80 dB,   front-right: 37137 /  57% / -14.80 dB
(  75.734|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65236 / 100% / -0.12 dB,   front-right: 65236 / 100% / -0.12 dB (accurate-enough=yes)
(  75.734|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36967 at 3853178077
(  75.734|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  75.735|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  75.735|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 37514 /  57% / -14.54 dB,   front-right: 37514 /  57% / -14.54 dB
(  75.735|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 37712 /  58% / -14.40 dB,   front-right: 37712 /  58% / -14.40 dB
(  75.735|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65192 /  99% / -0.14 dB,   front-right: 65192 /  99% / -0.14 dB (accurate-enough=yes)
(  75.735|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 37514 at 3853178911
(  75.735|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  75.736|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  75.737|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 38061 /  58% / -14.16 dB,   front-right: 38061 /  58% / -14.16 dB
(  75.737|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 38295 /  58% / -14.00 dB,   front-right: 38295 /  58% / -14.00 dB
(  75.737|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65136 /  99% / -0.16 dB,   front-right: 65136 /  99% / -0.16 dB (accurate-enough=yes)
(  75.737|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 38061 at 3853180640
(  75.737|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  75.738|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36420 at 3853173231 was written 268 usec late
(  77.744|   2.006) D: [alsa-sink-CX20756 Analog] ratelimit.c: 2965 events suppressed
(  77.745|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 2855 usec
(  77.745|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36694 at 3853176354 was written 2004155 usec late
(  77.745|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36967 at 3853178077 was written 2002432 usec late
(  77.745|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 37514 at 3853178911 was written 2001598 usec late
(  77.745|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 38061 at 3853180640 was written 1999869 usec late
(  79.753|   2.007) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.753|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  79.755|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  79.755|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 38334 /  58% / -13.97 dB,   front-right: 38334 /  58% / -13.97 dB
(  79.755|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 38591 /  59% / -13.80 dB,   front-right: 38591 /  59% / -13.80 dB
(  79.755|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65100 /  99% / -0.17 dB,   front-right: 65100 /  99% / -0.17 dB (accurate-enough=yes)
(  79.755|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 38334 at 3857199119
(  79.755|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  79.759|   0.003) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  79.759|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 39155 /  60% / -13.42 dB,   front-right: 39155 /  60% / -13.42 dB
(  79.759|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 39188 /  60% / -13.40 dB,   front-right: 39188 /  60% / -13.40 dB
(  79.759|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65481 / 100% / -0.02 dB,   front-right: 65481 / 100% / -0.02 dB (accurate-enough=yes)
(  79.759|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 39155 at 3857203211
(  79.760|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  79.761|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  79.762|   0.001) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 40522 /  62% / -12.53 dB,   front-right: 40522 /  62% / -12.53 dB
(  79.762|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 40720 /  62% / -12.40 dB,   front-right: 40720 /  62% / -12.40 dB
(  79.762|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65217 / 100% / -0.13 dB,   front-right: 65217 / 100% / -0.13 dB (accurate-enough=yes)
(  79.762|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 40522 at 3857205831
(  79.762|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  79.763|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  79.764|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 38334 at 3857199119 was written 422 usec late
(  79.764|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41069 /  63% / -12.18 dB,   front-right: 41069 /  63% / -12.18 dB
(  79.764|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(  79.764|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65091 /  99% / -0.18 dB,   front-right: 65091 /  99% / -0.18 dB (accurate-enough=yes)
(  79.764|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 41069 at 3857207940
(  79.764|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  79.765|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  79.765|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41616 /  64% / -11.83 dB,   front-right: 41616 /  64% / -11.83 dB
(  79.765|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41669 /  64% / -11.80 dB,   front-right: 41669 /  64% / -11.80 dB
(  79.765|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65453 / 100% / -0.03 dB,   front-right: 65453 / 100% / -0.03 dB (accurate-enough=yes)
(  79.765|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 41616 at 3857208811
(  79.765|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  79.765|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  79.766|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 42163 /  64% / -11.49 dB,   front-right: 42163 /  64% / -11.49 dB
(  79.766|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 42314 /  65% / -11.40 dB,   front-right: 42314 /  65% / -11.40 dB
(  79.766|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65302 / 100% / -0.09 dB,   front-right: 65302 / 100% / -0.09 dB (accurate-enough=yes)
(  79.766|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 42163 at 3857209583
(  79.766|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  79.766|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  79.767|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 42436 /  65% / -11.32 dB,   front-right: 42436 /  65% / -11.32 dB
(  79.767|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 42640 /  65% / -11.20 dB,   front-right: 42640 /  65% / -11.20 dB
(  79.767|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65222 / 100% / -0.13 dB,   front-right: 65222 / 100% / -0.13 dB (accurate-enough=yes)
(  79.767|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 42436 at 3857210684
(  79.767|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  79.767|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 39155 at 3857203211 was written 139 usec late
(  79.767|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  81.780|   2.012) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 42983 /  66% / -10.99 dB,   front-right: 42983 /  66% / -10.99 dB
(  81.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 43299 /  66% / -10.80 dB,   front-right: 43299 /  66% / -10.80 dB
(  81.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65058 /  99% / -0.19 dB,   front-right: 65058 /  99% / -0.19 dB (accurate-enough=yes)
(  81.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 42983 at 3859224544
(  81.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 40522 at 3857205831 was written 2010806 usec late
(  81.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41069 at 3857207940 was written 2008697 usec late
(  81.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41616 at 3857208811 was written 2007826 usec late
(  81.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 42163 at 3857209583 was written 2007054 usec late
(  81.781|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  81.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 42436 at 3857210684 was written 2005953 usec late
(  83.788|   2.007) D: [alsa-sink-CX20756 Analog] ratelimit.c: 251 events suppressed
(  83.789|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7907 usec
(  83.790|   0.001) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 42983 at 3859224544 was written 2001501 usec late
(  83.792|   0.002) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.792|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.792|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.793|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.793|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.793|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.793|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.793|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.793|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.793|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  83.794|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  83.795|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 43256 /  66% / -10.83 dB,   front-right: 43256 /  66% / -10.83 dB
(  83.795|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 43299 /  66% / -10.80 dB,   front-right: 43299 /  66% / -10.80 dB
(  83.795|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65471 / 100% / -0.03 dB,   front-right: 65471 / 100% / -0.03 dB (accurate-enough=yes)
(  83.795|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 43256 at 3861239305
(  83.796|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  83.796|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  83.797|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 48999 /  75% / -7.58 dB,   front-right: 48999 /  75% / -7.58 dB
(  83.797|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 49334 /  75% / -7.40 dB,   front-right: 49334 /  75% / -7.40 dB
(  83.797|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65091 /  99% / -0.18 dB,   front-right: 65091 /  99% / -0.18 dB (accurate-enough=yes)
(  83.797|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 48999 at 3861240948
(  83.797|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  83.798|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  83.799|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 49546 /  76% / -7.29 dB,   front-right: 49546 /  76% / -7.29 dB
(  83.799|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 49714 /  76% / -7.20 dB,   front-right: 49714 /  76% / -7.20 dB
(  83.799|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65315 / 100% / -0.09 dB,   front-right: 65315 / 100% / -0.09 dB (accurate-enough=yes)
(  83.799|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 49546 at 3861242700
(  83.799|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  83.800|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  83.800|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 49546 /  76% / -7.29 dB,   front-right: 49546 /  76% / -7.29 dB
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 49714 /  76% / -7.20 dB,   front-right: 49714 /  76% / -7.20 dB
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65315 / 100% / -0.09 dB,   front-right: 65315 / 100% / -0.09 dB (accurate-enough=yes)
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 49546 at 3861244506
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 49546 at 3861242700 was dropped
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17384 bytes.
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4346
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4346
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17384 bytes.
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17384 bytes on render memblockq.
(  83.801|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17384 bytes on implementor.
(  83.802|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  83.804|   0.001) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 43256 at 3861239305 was written 131 usec late
(  83.804|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  83.804|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 49546 /  76% / -7.29 dB,   front-right: 49546 /  76% / -7.29 dB
(  83.804|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 49714 /  76% / -7.20 dB,   front-right: 49714 /  76% / -7.20 dB
(  83.805|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65315 / 100% / -0.09 dB,   front-right: 65315 / 100% / -0.09 dB (accurate-enough=yes)
(  83.805|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 49546 at 3861248480
(  83.805|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 49546 at 3861244506 was dropped
(  83.805|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 48999 at 3861240948 was written 83 usec late
(  85.812|   2.007) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 48999 /  75% / -7.58 dB,   front-right: 48999 /  75% / -7.58 dB (request) != front-left: 48211 /  74% / -8.00 dB,   front-right: 48211 /  74% / -8.00 dB
(  85.813|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 49546 at 3861248480 was written 1999949 usec late
(  85.813|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  87.821|   2.008) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 49819 /  76% / -7.15 dB,   front-right: 49819 /  76% / -7.15 dB
(  87.821|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 50097 /  76% / -7.00 dB,   front-right: 50097 /  76% / -7.00 dB
(  87.821|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65172 /  99% / -0.15 dB,   front-right: 65172 /  99% / -0.15 dB (accurate-enough=yes)
(  87.821|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 49819 at 3865265377
(  87.822|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  87.822|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
(  87.822|   0.000) I: [pulseaudio] source-output.c: Freeing output 3 "Peak detect"
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 49819 /  76% / -7.15 dB,   front-right: 49819 /  76% / -7.15 dB
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 50097 /  76% / -7.00 dB,   front-right: 50097 /  76% / -7.00 dB
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65172 /  99% / -0.15 dB,   front-right: 65172 /  99% / -0.15 dB (accurate-enough=yes)
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 49819 at 3865266787
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 49819 at 3865265377 was dropped
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
(  87.823|   0.000) I: [pulseaudio] sink-input.c: Freeing input 1 "AudioStream"
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17324 bytes.
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4331
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4331
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17324 bytes.
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
(  87.823|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
(  87.825|   0.002) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  87.826|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 49546 /  76% / -7.29 dB,   front-right: 49546 /  76% / -7.29 dB
(  87.826|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 49714 /  76% / -7.20 dB,   front-right: 49714 /  76% / -7.20 dB
(  87.826|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65315 / 100% / -0.09 dB,   front-right: 65315 / 100% / -0.09 dB (accurate-enough=yes)
(  87.826|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 49546 at 3865253969
(  87.826|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 49819 at 3865266787 was dropped
(  87.826|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 49546 at 3865253969 was written 8105 usec late
(  87.826|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  87.827|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  87.827|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 48178 /  74% / -8.02 dB,   front-right: 48178 /  74% / -8.02 dB
(  87.827|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 48211 /  74% / -8.00 dB,   front-right: 48211 /  74% / -8.00 dB
(  87.828|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65491 / 100% / -0.02 dB,   front-right: 65491 / 100% / -0.02 dB (accurate-enough=yes)
(  87.828|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 48178 at 3865255517
(  87.828|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 48178 at 3865255517 was written 8055 usec late
(  87.828|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  87.828|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  89.837|   2.008) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 46478 /  71% / -8.95 dB,   front-right: 46478 /  71% / -8.95 dB
(  89.837|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 46754 /  71% / -8.80 dB,   front-right: 46754 /  71% / -8.80 dB
(  89.837|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65149 /  99% / -0.15 dB,   front-right: 65149 /  99% / -0.15 dB (accurate-enough=yes)
(  89.837|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 46478 at 3867265070
(  89.837|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 46478 at 3867265070 was written 8065 usec late
(  91.849|   2.011) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  91.851|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  91.852|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 44564 /  68% / -10.05 dB,   front-right: 44564 /  68% / -10.05 dB
(  91.852|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 44649 /  68% / -10.00 dB,   front-right: 44649 /  68% / -10.00 dB
(  91.852|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65411 / 100% / -0.05 dB,   front-right: 65411 / 100% / -0.05 dB (accurate-enough=yes)
(  91.852|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 44564 at 3869279626
(  91.852|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 44564 at 3869279626 was written 8053 usec late
(  91.852|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  93.861|   2.009) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  93.862|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 41309 /  63% / -12.03 dB,   front-right: 41309 /  63% / -12.03 dB
(  93.862|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
(  93.862|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65471 / 100% / -0.03 dB,   front-right: 65471 / 100% / -0.03 dB (accurate-enough=yes)
(  93.862|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 41309 at 3871289676
(  93.862|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 41309 at 3871289676 was written 8057 usec late
(  93.862|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  93.876|   0.013) D: [alsa-sink-HDMI 0] ratelimit.c: 311 events suppressed
(  93.876|   0.000) D: [alsa-sink-HDMI 0] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  93.876|   0.000) D: [alsa-sink-HDMI 0] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  95.094|   1.218) D: [alsa-sink-HDMI 0] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
(  95.875|   0.780) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  95.875|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 34565 /  53% / -16.67 dB,   front-right: 34565 /  53% / -16.67 dB
(  95.875|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 34659 /  53% / -16.60 dB,   front-right: 34659 /  53% / -16.60 dB
(  95.875|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65358 / 100% / -0.07 dB,   front-right: 65358 / 100% / -0.07 dB (accurate-enough=yes)
(  95.875|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 34565 at 3873303275
(  95.875|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 34565 at 3873303275 was written 8056 usec late
(  95.876|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  95.876|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  97.884|   2.008) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 34565 /  53% / -16.67 dB,   front-right: 34565 /  53% / -16.67 dB (request) != front-left: 34131 /  52% / -17.00 dB,   front-right: 34131 /  52% / -17.00 dB
(  97.885|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 33136 /  51% / -17.77 dB,   front-right: 33136 /  51% / -17.77 dB
(  97.885|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 33354 /  51% / -17.60 dB,   front-right: 33354 /  51% / -17.60 dB
(  97.885|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65108 /  99% / -0.17 dB,   front-right: 65108 /  99% / -0.17 dB (accurate-enough=yes)
(  97.885|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 33136 at 3875313166
(  97.885|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 33136 at 3875313166 was written 8062 usec late
(  97.886|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  97.886|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
(  99.893|   2.007) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  99.893|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 32589 /  50% / -18.20 dB,   front-right: 32589 /  50% / -18.20 dB
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 32595 /  50% / -18.20 dB,   front-right: 32595 /  50% / -18.20 dB
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65524 / 100% / -0.00 dB,   front-right: 65524 / 100% / -0.00 dB (accurate-enough=yes)
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 32589 at 3877321474
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 32589 at 3877321474 was written 8025 usec late
(  99.894|   0.000) I: [pulseaudio] client.c: Created 7 "Native client (UNIX socket client)"
(  99.894|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  99.894|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30675 /  47% / -19.78 dB,   front-right: 30675 /  47% / -19.78 dB
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30889 /  47% / -19.60 dB,   front-right: 30889 /  47% / -19.60 dB
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65082 /  99% / -0.18 dB,   front-right: 65082 /  99% / -0.18 dB (accurate-enough=yes)
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 30675 at 3877322139
(  99.894|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30675 at 3877322139 was written 8029 usec late
(  99.894|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
(  99.894|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
(  99.894|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
(  99.894|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
(  99.894|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
(  99.895|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 101.904|   2.009) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 101.904|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 101.905|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 101.905|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 30401 at 3879332463
( 101.905|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30401 at 3879332463 was written 8028 usec late
( 101.905|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 101.906|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for clementine
( 101.958|   0.052) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
( 101.958|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream pulsesink probe, because already set.
( 101.959|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
( 101.959|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 101.959|   0.000) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 101.959|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
( 101.959|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
( 101.959|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 101.959|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 101.959|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 48000 (method speex-float-1)
( 101.959|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
( 101.959|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
( 101.959|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
( 101.959|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 101.959|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 101.959|   0.000) I: [pulseaudio] sink-input.c: Created input 5 "pulsesink probe" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     media.name = "pulsesink probe"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "3555"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
( 101.959|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
( 101.959|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=136.05 ms, minreq=20.00 ms
( 101.959|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
( 101.960|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=48.03 ms, Received latency=100.14 ms
( 101.960|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
( 101.960|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
( 101.960|   0.000) I: [pulseaudio] protocol-native.c: Final latency 240.27 ms = 100.14 ms + 2*20.00 ms + 100.14 ms
( 101.960|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB
( 101.960|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15481 /  24% / -37.60 dB,   front-right: 15481 /  24% / -37.60 dB
( 101.960|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65295 / 100% / -0.10 dB,   front-right: 65295 / 100% / -0.10 dB (accurate-enough=yes)
( 101.960|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15424 at 3879387863
( 101.960|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15424 at 3879387863 was written 8025 usec late
( 103.968|   2.008) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB (request) != front-left: 15246 /  23% / -38.00 dB,   front-right: 15246 /  23% / -38.00 dB
( 103.970|   0.001) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 30401 at 3881413991
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7973 usec
( 103.970|   0.000) I: [pulseaudio] sink-input.c: Freeing input 5 "pulsesink probe"
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17344 bytes.
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4336
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4336
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17344 bytes.
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7756 usec
( 103.970|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 103.970|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
( 103.970|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream pulsesink probe, because already set.
( 103.970|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
( 103.970|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 103.970|   0.000) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 103.971|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
( 103.971|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
( 103.971|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 103.971|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7507 usec
( 103.971|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 103.971|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 48000 (method speex-float-1)
( 103.971|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
( 103.971|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
( 103.971|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
( 103.971|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 103.971|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 103.971|   0.000) I: [pulseaudio] sink-input.c: Created input 6 "pulsesink probe" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     media.name = "pulsesink probe"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "3555"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
( 103.971|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
( 103.971|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=136.05 ms, minreq=20.00 ms
( 103.971|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
( 103.971|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6938 usec
( 103.971|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6862 usec
( 103.971|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6825 usec
( 103.971|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6758 usec
( 103.971|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6731 usec
( 103.971|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=48.03 ms, Received latency=100.14 ms
( 103.971|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
( 103.971|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6687 usec
( 103.971|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
( 103.971|   0.000) I: [pulseaudio] protocol-native.c: Final latency 240.27 ms = 100.14 ms + 2*20.00 ms + 100.14 ms
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6573 usec
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6506 usec
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15481 /  24% / -37.60 dB,   front-right: 15481 /  24% / -37.60 dB
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65295 / 100% / -0.10 dB,   front-right: 65295 / 100% / -0.10 dB (accurate-enough=yes)
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15424 at 3881399637
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30401 at 3881413991 was dropped
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15424 at 3881399637 was written 8045 usec late
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB (request) != front-left: 15246 /  23% / -38.00 dB,   front-right: 15246 /  23% / -38.00 dB
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 30401 at 3881416364
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 103.972|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17372 bytes.
( 103.973|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4343
( 103.973|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4343
( 103.973|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17372 bytes.
( 103.973|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 103.973|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 103.973|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 103.973|   0.000) I: [pulseaudio] sink-input.c: Freeing input 6 "pulsesink probe"
( 103.973|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
( 103.973|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Playback Stream, because already set.
( 103.973|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
( 103.973|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 103.973|   0.000) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 103.973|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
( 103.973|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
( 103.973|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 103.973|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 103.973|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 48000 (method speex-float-1)
( 103.973|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
( 103.973|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
( 103.973|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
( 103.973|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 103.973|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 103.974|   0.000) I: [pulseaudio] sink-input.c: Created input 7 "Playback Stream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     media.name = "Playback Stream"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "3555"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
( 103.974|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
( 103.974|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=200.00 ms, minreq=10.00 ms
( 103.974|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
( 103.974|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=90.00 ms, Received latency=100.14 ms
( 103.974|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=42384, base=8, prebuf=0, minreq=3528 maxrewind=0
( 103.974|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=42384, base=8, prebuf=0, minreq=3528 maxrewind=0
( 103.974|   0.000) I: [pulseaudio] protocol-native.c: Final latency 220.27 ms = 100.14 ms + 2*10.00 ms + 100.14 ms
( 103.974|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB
( 103.974|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15481 /  24% / -37.60 dB,   front-right: 15481 /  24% / -37.60 dB
( 103.974|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65295 / 100% / -0.10 dB,   front-right: 65295 / 100% / -0.10 dB (accurate-enough=yes)
( 103.974|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15424 at 3881402153
( 103.974|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30401 at 3881416364 was dropped
( 103.974|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15424 at 3881402153 was written 8052 usec late
( 103.974|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB (request) != front-left: 15246 /  23% / -38.00 dB,   front-right: 15246 /  23% / -38.00 dB
( 103.976|   0.001) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 103.976|   0.000) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 103.976|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 103.976|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to uncorking
( 103.976|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 103.976|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 103.976|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17392 bytes.
( 103.976|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4348
( 103.976|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4348
( 103.977|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17392 bytes.
( 103.977|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 103.977|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 103.977|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 107.308|   3.331) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17372 bytes.
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4343
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4343
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17372 bytes.
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17372 bytes on render memblockq.
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 31936 bytes on implementor.
( 107.308|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 107.309|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17520 bytes ago (144 bytes ahead in playback buffer)
( 107.309|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17532 bytes ago (132 bytes ahead in playback buffer)
( 107.309|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17588 bytes ago (76 bytes ahead in playback buffer)
( 107.309|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17620 bytes ago (44 bytes ahead in playback buffer)
( 107.312|   0.002) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 30401 at 3884755755
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17344 bytes.
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4336
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4336
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17344 bytes.
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 107.312|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 107.313|   0.000) I: [pulseaudio] sink-input.c: Freeing input 7 "'CIRCLONT6A (Syrobonkus Mix)' by 'Aphex Twin'"
( 107.314|   0.001) I: [pulseaudio] client.c: Freed 7 "Clementine"
( 107.314|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 107.320|   0.006) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30401 at 3884755755 was written 45 usec late
( 109.894|   2.574) I: [pulseaudio] module-device-restore.c: Synced.
( 111.301|   1.407) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 111.301|   0.000) I: [pulseaudio] source-output.c: Freeing output 0 "Peak detect"
( 111.301|   0.000) D: [pulseaudio] ratelimit.c: 49 events suppressed
( 111.301|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.301|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.301|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 111.302|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 111.302|   0.000) I: [pulseaudio] source-output.c: Freeing output 1 "Peak detect"
( 111.302|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 111.302|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 111.302|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 111.302|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 111.302|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 111.303|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 111.303|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 111.313|   0.009) I: [pulseaudio] source-output.c: Freeing output 2 "Peak detect"
( 111.313|   0.000) I: [pulseaudio] client.c: Freed 6 "PulseAudio Volume Control"
( 111.313|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 116.306|   4.993) I: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 116.306|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 116.306|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Device suspended...
( 116.307|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 116.312|   0.005) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 116.312|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 116.313|   0.001) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
( 116.313|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 116.316|   0.002) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo idle for too long, suspending ...
( 116.316|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0004, suspending
( 116.317|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Device suspended...
( 116.317|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 116.321|   0.003) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC0 is accessible: yes
( 116.321|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_01.1.
( 116.321|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
( 116.321|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
( 127.856|  11.535) I: [pulseaudio] client.c: Created 8 "Native client (UNIX socket client)"
( 127.924|   0.067) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
( 127.924|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
( 127.924|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
( 127.924|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
( 127.925|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for pavucontrol
( 128.075|   0.150) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 128.076|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 128.076|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 128.076|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 128.076|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 128.076|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes busy, resuming.
( 128.076|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0000, resuming
( 128.076|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio0'
( 128.076|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Trying resume...
( 128.077|   0.000) D: [alsa-sink-HDMI 0] alsa-util.c: Maximum hw buffer size is 371 ms
( 128.078|   0.000) D: [alsa-sink-HDMI 0] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 128.078|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: hwbuf_unused=0
( 128.078|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: setting avail_min=1
( 128.078|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Resumed successfully...
( 128.078|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Starting playback.
( 128.078|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 128.078|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 128.078|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 128.078|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 128.078|   0.000) D: [pulseaudio] resampler.c:     +------------
( 128.078|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 128.078|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 128.078|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 128.078|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 128.079|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 128.079|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 128.079|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 128.079|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 128.079|   0.000) I: [pulseaudio] source-output.c: Created output 4 "Peak detect" on alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 128.079|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3910"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 128.079|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 128.079|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 128.079|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 128.079|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 128.079|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 128.080|   0.000) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 128.080|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 128.080|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 128.080|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 128.080|   0.000) D: [pulseaudio] source.c: Suspending source alsa_output.pci-0000_00_14.2.analog-stereo.monitor due to changing the sample rate.
( 128.080|   0.000) D: [pulseaudio] sink.c: Suspending sink alsa_output.pci-0000_00_14.2.analog-stereo due to changing the sample rate.
( 128.080|   0.000) I: [pulseaudio] alsa-sink.c: Updating rate for device front:1, new rate is 44100
( 128.080|   0.000) I: [pulseaudio] sink.c: Changed sampling rate successfully
( 128.080|   0.000) I: [pulseaudio] source.c: Changed sampling rate successfully
( 128.080|   0.000) I: [pulseaudio] source-output.c: Rate changed to 44100 Hz
( 128.080|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 128.080|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 128.080|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
( 128.081|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
( 128.081|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Trying resume...
( 128.082|   0.000) D: [alsa-sink-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
( 132.120|   4.038) D: [alsa-sink-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 132.120|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: hwbuf_unused=0
( 132.120|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: setting avail_min=1
( 132.121|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Resumed successfully...
( 132.121|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 132.121|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
( 132.121|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 132.121|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 132.121|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 132.121|   0.000) D: [pulseaudio] resampler.c:     +------------
( 132.121|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 132.121|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 132.121|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 132.121|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 132.121|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 132.121|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 132.121|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 132.121|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 132.121|   0.000) I: [pulseaudio] source-output.c: Created output 5 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 132.121|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3910"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 132.121|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 132.122|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 132.122|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 132.122|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 132.122|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 132.123|   0.001) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 132.123|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 132.123|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 132.123|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 132.123|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 132.123|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 132.123|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
( 132.124|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Trying resume...
( 132.124|   0.000) D: [alsa-source-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
( 132.124|   0.000) D: [alsa-source-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 132.124|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: hwbuf_unused=0
( 132.124|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: setting avail_min=1
( 132.125|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Resumed successfully...
( 132.125|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Starting capture.
( 132.125|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 132.125|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 132.125|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 132.125|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 132.125|   0.000) D: [pulseaudio] resampler.c:     +------------
( 132.125|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 132.125|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 132.125|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 132.125|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 132.125|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 132.125|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 132.125|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 132.125|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 132.125|   0.000) I: [pulseaudio] source-output.c: Created output 6 "Peak detect" on alsa_input.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 25Hz and channel map mono
( 132.125|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3910"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 132.125|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 132.126|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 132.126|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 132.126|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 132.126|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 132.126|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 132.126|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 132.126|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 132.126|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 133.616|   1.490) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:AudioStream.
( 133.616|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream AudioStream, because already set.
( 133.616|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "48000"  format.channels = "1"  format.channel_map = "\"mono\""
( 133.616|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 133.616|   0.000) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 133.616|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:AudioStream.
( 133.616|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:AudioStream.
( 133.617|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 133.617|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 133.617|   0.000) D: [pulseaudio] resampler.c:        I00 
( 133.617|   0.000) D: [pulseaudio] resampler.c:     +------
( 133.617|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
( 133.617|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
( 133.617|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
( 133.617|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 133.617|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 44100 (method speex-float-1)
( 133.617|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
( 133.617|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
( 133.617|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
( 133.617|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 133.617|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 133.617|   0.000) I: [pulseaudio] sink-input.c: Created input 8 "AudioStream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 48000Hz and channel map mono
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     media.name = "AudioStream"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.name = "AudioStream"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "4321"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "iceweasel"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "iceweasel"
( 133.617|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:AudioStream"
( 133.617|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=100.00 ms, minreq=25.00 ms
( 133.617|   0.000) D: [pulseaudio] protocol-native.c: Traditional mode enabled, modifying sink usec only for compat with minreq.
( 133.618|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=50.00 ms, Received latency=100.14 ms
( 133.618|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 133.618|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 133.618|   0.000) I: [pulseaudio] protocol-native.c: Final latency 250.28 ms = 100.14 ms + 2*25.00 ms + 100.14 ms
( 133.618|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 133.618|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 133.618|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 133.618|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 133.618|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 133.625|   0.007) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to uncorking
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17372 bytes.
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4343
( 133.626|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4343
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17372 bytes.
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 133.626|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 133.643|   0.016) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 133.643|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 133.643|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 133.643|   0.000) I: [pulseaudio] source.c: Cannot update rate, SOURCE_IS_RUNNING, will keep using 44100 Hz
( 133.643|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 133.643|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 133.643|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 133.643|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 133.643|   0.000) D: [pulseaudio] resampler.c:     +------------
( 133.643|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 133.643|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 133.643|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 133.643|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 133.643|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 133.643|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 133.643|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 133.643|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 133.643|   0.000) I: [pulseaudio] source-output.c: Created output 7 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 133.643|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3910"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 133.643|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 133.644|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 133.644|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 133.644|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 140.701|   7.056) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17364 bytes.
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4341
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4341
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17364 bytes.
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17364 bytes on render memblockq.
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 18904 bytes on implementor.
( 140.701|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 140.702|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17592 bytes ago (72 bytes ahead in playback buffer)
( 140.702|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17648 bytes ago (12 bytes ahead in playback buffer)
( 140.704|   0.001) I: [pulseaudio] source-output.c: Freeing output 7 "Peak detect"
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 140.704|   0.000) I: [pulseaudio] sink-input.c: Freeing input 8 "AudioStream"
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17348 bytes.
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4337
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4337
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17348 bytes.
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 140.704|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 142.669|   1.964) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:AudioStream.
( 142.669|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream AudioStream, because already set.
( 142.669|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "48000"  format.channels = "1"  format.channel_map = "\"mono\""
( 142.669|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 142.669|   0.000) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 142.669|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:AudioStream.
( 142.669|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:AudioStream.
( 142.669|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 142.669|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 142.669|   0.000) D: [pulseaudio] resampler.c:        I00 
( 142.669|   0.000) D: [pulseaudio] resampler.c:     +------
( 142.669|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
( 142.669|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
( 142.669|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
( 142.669|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 142.669|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 44100 (method speex-float-1)
( 142.669|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
( 142.669|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
( 142.670|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
( 142.670|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 142.670|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 142.670|   0.000) I: [pulseaudio] sink-input.c: Created input 9 "AudioStream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 48000Hz and channel map mono
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     media.name = "AudioStream"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.name = "AudioStream"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "4321"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "iceweasel"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "iceweasel"
( 142.670|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:AudioStream"
( 142.670|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=100.00 ms, minreq=25.00 ms
( 142.670|   0.000) D: [pulseaudio] protocol-native.c: Traditional mode enabled, modifying sink usec only for compat with minreq.
( 142.670|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=50.00 ms, Received latency=100.14 ms
( 142.670|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 142.671|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 142.671|   0.000) I: [pulseaudio] protocol-native.c: Final latency 250.28 ms = 100.14 ms + 2*25.00 ms + 100.14 ms
( 142.671|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 142.671|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 142.671|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 142.671|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 142.671|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 142.683|   0.011) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to uncorking
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 142.683|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17384 bytes.
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4346
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4346
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17384 bytes.
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 142.683|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 142.690|   0.007) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 142.690|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 142.690|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 142.690|   0.000) I: [pulseaudio] source.c: Cannot update rate, SOURCE_IS_RUNNING, will keep using 44100 Hz
( 142.690|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 142.690|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 142.690|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 142.690|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 142.690|   0.000) D: [pulseaudio] resampler.c:     +------------
( 142.690|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 142.690|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 142.690|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 142.690|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 142.690|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 142.690|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 142.690|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 142.690|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 142.690|   0.000) I: [pulseaudio] source-output.c: Created output 8 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 142.690|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "3910"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 142.690|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 142.691|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 142.691|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 142.691|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 151.554|   8.863) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
( 151.554|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17356 bytes.
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4339
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4339
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17356 bytes.
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17356 bytes on render memblockq.
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 18896 bytes on implementor.
( 151.555|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 151.558|   0.002) I: [pulseaudio] source-output.c: Freeing output 8 "Peak detect"
( 151.558|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 151.558|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 151.558|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 151.559|   0.000) I: [pulseaudio] sink-input.c: Freeing input 9 "AudioStream"
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17328 bytes.
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4332
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4332
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17328 bytes.
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 151.559|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 160.858|   9.299) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 160.858|   0.000) I: [pulseaudio] source-output.c: Freeing output 4 "Peak detect"
( 160.859|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 160.859|   0.000) I: [pulseaudio] source-output.c: Freeing output 5 "Peak detect"
( 160.859|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 160.859|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 160.859|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 160.859|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 160.859|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 160.859|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 160.859|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 160.867|   0.007) I: [pulseaudio] source-output.c: Freeing output 6 "Peak detect"
( 160.867|   0.000) I: [pulseaudio] client.c: Freed 8 "PulseAudio Volume Control"
( 160.867|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 165.859|   4.991) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 165.859|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 165.860|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
( 165.860|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 165.871|   0.011) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo idle for too long, suspending ...
( 165.871|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0004, suspending
( 165.873|   0.001) I: [alsa-sink-HDMI 0] alsa-sink.c: Device suspended...
( 165.873|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 165.880|   0.007) I: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 165.881|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 165.882|   0.001) I: [alsa-source-CX20756 Analog] alsa-source.c: Device suspended...
( 165.882|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 165.890|   0.007) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC0 is accessible: yes
( 165.890|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_01.1.
( 165.890|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
( 165.890|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
( 169.917|   4.027) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:AudioStream.
( 169.917|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream AudioStream, because already set.
( 169.917|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "48000"  format.channels = "1"  format.channel_map = "\"mono\""
( 169.917|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 169.917|   0.000) D: [pulseaudio] sink.c: Suspending sink alsa_output.pci-0000_00_14.2.analog-stereo due to changing the sample rate.
( 169.917|   0.000) I: [pulseaudio] alsa-sink.c: Updating rate for device front:1, new rate is 48000
( 169.917|   0.000) D: [pulseaudio] source.c: Suspending source alsa_output.pci-0000_00_14.2.analog-stereo.monitor due to changing the sample rate.
( 169.917|   0.000) I: [pulseaudio] source.c: Changed sampling rate successfully
( 169.918|   0.000) I: [pulseaudio] sink.c: Changed sampling rate successfully
( 169.918|   0.000) I: [pulseaudio] sink-input.c: Rate changed to 48000 Hz
( 169.918|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:AudioStream.
( 169.918|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:AudioStream.
( 169.918|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 169.918|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
( 169.919|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
( 169.919|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Trying resume...
( 169.920|   0.001) D: [alsa-sink-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 341 ms
( 173.952|   4.032) D: [alsa-sink-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 173.952|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: hwbuf_unused=0
( 173.953|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: setting avail_min=1
( 173.953|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Resumed successfully...
( 173.953|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 173.953|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
( 173.953|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 173.953|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
( 173.953|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 173.953|   0.000) D: [pulseaudio] resampler.c:        I00 
( 173.953|   0.000) D: [pulseaudio] resampler.c:     +------
( 173.953|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
( 173.953|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
( 173.953|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
( 173.953|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 173.953|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 48000 (method copy)
( 173.953|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
( 173.953|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
( 173.953|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 173.953|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 173.953|   0.000) I: [pulseaudio] sink-input.c: Created input 10 "AudioStream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 48000Hz and channel map mono
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     media.name = "AudioStream"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.name = "AudioStream"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "4321"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "iceweasel"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "iceweasel"
( 173.953|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:AudioStream"
( 173.953|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=100.00 ms, minreq=25.00 ms
( 173.953|   0.000) D: [pulseaudio] protocol-native.c: Traditional mode enabled, modifying sink usec only for compat with minreq.
( 173.954|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=50.00 ms, Received latency=100.14 ms
( 173.954|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 173.954|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 173.954|   0.000) I: [pulseaudio] protocol-native.c: Final latency 250.28 ms = 100.14 ms + 2*25.00 ms + 100.14 ms
( 173.954|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 173.954|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 173.954|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 173.954|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 173.954|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 173.956|   0.001) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 173.956|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17364 bytes.
( 173.956|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4341
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4341
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17364 bytes.
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 1182
( 173.956|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 173.960|   0.003) I: [pulseaudio] sink-input.c: Freeing input 10 "AudioStream"
( 173.982|   0.022) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:AudioStream.
( 173.982|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream AudioStream, because already set.
( 173.982|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "48000"  format.channels = "1"  format.channel_map = "\"mono\""
( 173.982|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 173.982|   0.000) I: [pulseaudio] sink-input.c: Rate changed to 48000 Hz
( 173.982|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:AudioStream.
( 173.982|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:AudioStream.
( 173.982|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 173.982|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 173.982|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
( 173.983|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 173.983|   0.000) D: [pulseaudio] resampler.c:        I00 
( 173.983|   0.000) D: [pulseaudio] resampler.c:     +------
( 173.983|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
( 173.983|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
( 173.983|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
( 173.983|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 173.983|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 48000 (method copy)
( 173.983|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
( 173.983|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
( 173.983|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 173.983|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 173.983|   0.000) I: [pulseaudio] sink-input.c: Created input 11 "AudioStream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 48000Hz and channel map mono
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     media.name = "AudioStream"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.name = "AudioStream"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "4321"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "iceweasel"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "iceweasel"
( 173.983|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:AudioStream"
( 173.984|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=100.00 ms, minreq=25.00 ms
( 173.984|   0.000) D: [pulseaudio] protocol-native.c: Traditional mode enabled, modifying sink usec only for compat with minreq.
( 173.984|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=50.00 ms, Received latency=100.14 ms
( 173.984|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 173.984|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 173.984|   0.000) I: [pulseaudio] protocol-native.c: Final latency 250.28 ms = 100.14 ms + 2*25.00 ms + 100.14 ms
( 173.984|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 173.984|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 173.984|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 173.984|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 173.987|   0.002) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 173.989|   0.002) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to uncorking
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17380 bytes.
( 173.989|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4345
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4345
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17380 bytes.
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 1160
( 173.989|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 190.066|  16.076) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
( 190.113|   0.047) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 190.113|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 8252 bytes.
( 190.113|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 2063
( 190.113|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 2063
( 190.113|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 8252 bytes.
( 190.113|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 190.113|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 30428
( 190.113|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 8252 bytes on render memblockq.
( 190.113|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 8252 bytes on implementor.
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17488 bytes ago (176 bytes ahead in playback buffer)
( 190.114|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17500 bytes ago (164 bytes ahead in playback buffer)
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17548 bytes ago (116 bytes ahead in playback buffer)
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17560 bytes ago (104 bytes ahead in playback buffer)
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17576 bytes ago (88 bytes ahead in playback buffer)
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17588 bytes ago (76 bytes ahead in playback buffer)
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17596 bytes ago (68 bytes ahead in playback buffer)
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17604 bytes ago (60 bytes ahead in playback buffer)
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17616 bytes ago (48 bytes ahead in playback buffer)
( 190.114|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17628 bytes ago (36 bytes ahead in playback buffer)
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17660 bytes ago (4 bytes ahead in playback buffer)
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17364 bytes.
( 190.115|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4341
( 190.115|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4341
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17364 bytes.
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 32366
( 190.115|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 190.121|   0.006) I: [pulseaudio] sink-input.c: Freeing input 11 "AudioStream"
( 195.117|   4.995) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 195.117|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 195.120|   0.002) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
( 195.120|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 195.123|   0.003) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
( 195.124|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
( 286.928|  91.804) I: [pulseaudio] client.c: Created 9 "Native client (UNIX socket client)"
( 286.995|   0.066) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
( 286.995|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
( 286.995|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
( 286.995|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
( 286.997|   0.002) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for pavucontrol
( 287.143|   0.145) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 287.143|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 287.143|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 287.143|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 287.143|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 287.143|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes busy, resuming.
( 287.143|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0000, resuming
( 287.144|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio0'
( 287.144|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Trying resume...
( 287.144|   0.000) D: [alsa-sink-HDMI 0] alsa-util.c: Maximum hw buffer size is 371 ms
( 287.145|   0.000) D: [alsa-sink-HDMI 0] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 287.145|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: hwbuf_unused=0
( 287.145|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: setting avail_min=1
( 287.145|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Resumed successfully...
( 287.145|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 287.145|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Starting playback.
( 287.145|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 287.145|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 287.145|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 287.145|   0.000) D: [pulseaudio] resampler.c:     +------------
( 287.145|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 287.145|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 287.145|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 287.145|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 287.145|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 287.145|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 287.145|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 287.145|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 287.145|   0.000) I: [pulseaudio] source-output.c: Created output 9 "Peak detect" on alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 287.145|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5368"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 287.145|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 287.146|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 287.146|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 287.146|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 287.146|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 287.146|   0.000) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 287.146|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 287.146|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 287.146|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 287.146|   0.000) D: [pulseaudio] source.c: Suspending source alsa_output.pci-0000_00_14.2.analog-stereo.monitor due to changing the sample rate.
( 287.147|   0.000) D: [pulseaudio] sink.c: Suspending sink alsa_output.pci-0000_00_14.2.analog-stereo due to changing the sample rate.
( 287.147|   0.000) I: [pulseaudio] alsa-sink.c: Updating rate for device front:1, new rate is 44100
( 287.147|   0.000) I: [pulseaudio] sink.c: Changed sampling rate successfully
( 287.147|   0.000) I: [pulseaudio] source.c: Changed sampling rate successfully
( 287.147|   0.000) I: [pulseaudio] source-output.c: Rate changed to 44100 Hz
( 287.147|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 287.147|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 287.147|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
( 287.147|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
( 287.147|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Trying resume...
( 287.148|   0.000) D: [alsa-sink-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
( 291.188|   4.040) D: [alsa-sink-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 291.188|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: hwbuf_unused=0
( 291.189|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: setting avail_min=1
( 291.189|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Resumed successfully...
( 291.189|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 291.189|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
( 291.190|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 291.190|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 291.190|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 291.190|   0.000) D: [pulseaudio] resampler.c:     +------------
( 291.190|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 291.190|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 291.190|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 291.190|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 291.190|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 291.190|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 291.190|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 291.190|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 291.190|   0.000) I: [pulseaudio] source-output.c: Created output 10 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 291.190|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5368"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 291.190|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 291.191|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 291.191|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 291.191|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 291.191|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 291.194|   0.002) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 291.194|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 291.194|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 291.194|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 291.194|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 291.194|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 291.194|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
( 291.195|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Trying resume...
( 291.195|   0.000) D: [alsa-source-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
( 291.195|   0.000) D: [alsa-source-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 291.195|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: hwbuf_unused=0
( 291.195|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: setting avail_min=1
( 291.195|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Resumed successfully...
( 291.195|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Starting capture.
( 291.195|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 291.196|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 291.196|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 291.196|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 291.196|   0.000) D: [pulseaudio] resampler.c:     +------------
( 291.196|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 291.196|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 291.196|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 291.196|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 291.196|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 291.196|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 291.196|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 291.196|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 291.196|   0.000) I: [pulseaudio] source-output.c: Created output 11 "Peak detect" on alsa_input.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 25Hz and channel map mono
( 291.196|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5368"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 291.196|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 291.196|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 291.196|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 291.196|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 291.197|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 291.197|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 291.197|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 291.197|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 291.197|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 291.334|   0.137) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:AudioStream.
( 291.368|   0.033) D: [pulseaudio] module-intended-roles.c: Not setting device for stream AudioStream, because already set.
( 291.368|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "48000"  format.channels = "1"  format.channel_map = "\"mono\""
( 291.368|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 291.368|   0.000) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 291.369|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:AudioStream.
( 291.369|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:AudioStream.
( 291.369|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 291.369|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 291.369|   0.000) D: [pulseaudio] resampler.c:        I00 
( 291.369|   0.000) D: [pulseaudio] resampler.c:     +------
( 291.369|   0.000) D: [pulseaudio] resampler.c: O00 | 1.000
( 291.369|   0.000) D: [pulseaudio] resampler.c: O01 | 1.000
( 291.369|   0.000) I: [pulseaudio] remap_sse.c: Using SSE2 mono to stereo remapping
( 291.369|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 291.369|   0.000) D: [pulseaudio] resampler.c:   rate 48000 -> 44100 (method speex-float-1)
( 291.369|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate float32le)
( 291.369|   0.000) D: [pulseaudio] resampler.c:   channels 1 -> 2 (resampling 1)
( 291.369|   0.000) I: [pulseaudio] resampler.c: Choosing speex quality setting 1.
( 291.369|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 291.369|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 291.369|   0.000) I: [pulseaudio] sink-input.c: Created input 12 "AudioStream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 48000Hz and channel map mono
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     media.name = "AudioStream"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.name = "AudioStream"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "4321"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "iceweasel"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "iceweasel"
( 291.369|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:AudioStream"
( 291.370|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=100.00 ms, minreq=25.00 ms
( 291.370|   0.000) D: [pulseaudio] protocol-native.c: Traditional mode enabled, modifying sink usec only for compat with minreq.
( 291.371|   0.001) D: [pulseaudio] protocol-native.c: Requested latency=50.00 ms, Received latency=100.14 ms
( 291.371|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 291.371|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=28828, base=4, prebuf=24032, minreq=4800 maxrewind=0
( 291.371|   0.000) I: [pulseaudio] protocol-native.c: Final latency 250.28 ms = 100.14 ms + 2*25.00 ms + 100.14 ms
( 291.372|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 291.372|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 291.372|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 291.372|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 291.373|   0.001) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 291.377|   0.003) I: [pulseaudio] sink.c: Cannot update rate, monitor source is RUNNING
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to uncorking
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 291.377|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17376 bytes.
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4344
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4344
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17376 bytes.
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 291.377|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 291.391|   0.013) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 291.391|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 291.391|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 291.391|   0.000) I: [pulseaudio] source.c: Cannot update rate, SOURCE_IS_RUNNING, will keep using 44100 Hz
( 291.391|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 291.391|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 291.391|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 291.391|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 291.391|   0.000) D: [pulseaudio] resampler.c:     +------------
( 291.391|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 291.391|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 291.391|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 291.391|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 291.391|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 291.391|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 291.391|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 291.391|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 291.391|   0.000) I: [pulseaudio] source-output.c: Created output 12 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 291.391|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5368"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 291.391|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 291.392|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 291.392|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 291.392|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 297.523|   6.130) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 297.523|   0.000) I: [pulseaudio] source-output.c: Freeing output 9 "Peak detect"
( 297.524|   0.001) I: [pulseaudio] source-output.c: Freeing output 10 "Peak detect"
( 297.524|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 297.524|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 297.524|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 297.524|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 297.524|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 297.524|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 297.524|   0.000) I: [pulseaudio] source-output.c: Freeing output 11 "Peak detect"
( 297.525|   0.000) I: [pulseaudio] source-output.c: Freeing output 12 "Peak detect"
( 297.525|   0.000) I: [pulseaudio] client.c: Freed 9 "PulseAudio Volume Control"
( 297.525|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 297.714|   0.188) D: [alsa-sink-CX20756 Analog] protocol-native.c: Implicit underrun of 'AudioStream'
( 297.714|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1044 bytes ago (16620 bytes ahead in playback buffer)
( 297.714|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1072 bytes ago (16592 bytes ahead in playback buffer)
( 297.714|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1088 bytes ago (16576 bytes ahead in playback buffer)
( 297.714|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
( 297.714|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 0 bytes.
( 297.714|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Mhmm, actually there is nothing to rewind.
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1104 bytes ago (16560 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1112 bytes ago (16552 bytes ahead in playback buffer)
( 297.715|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1148 bytes ago (16516 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1160 bytes ago (16504 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1180 bytes ago (16484 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1188 bytes ago (16476 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1200 bytes ago (16464 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1208 bytes ago (16456 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1220 bytes ago (16444 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1228 bytes ago (16436 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1236 bytes ago (16428 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 1248 bytes ago (16416 bytes ahead in playback buffer)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 297.715|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 297.716|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 297.716|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 297.716|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17372 bytes.
( 297.716|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 297.716|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4343
( 297.716|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4343
( 297.716|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17372 bytes.
( 297.716|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 297.716|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 77771
( 297.716|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 297.721|   0.005) I: [pulseaudio] sink-input.c: Freeing input 12 "AudioStream"
( 297.721|   0.000) D: [pulseaudio] ratelimit.c: 112 events suppressed
( 297.721|   0.000) D: [pulseaudio] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 302.528|   4.806) I: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 302.528|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 302.528|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Device suspended...
( 302.528|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 302.539|   0.011) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo idle for too long, suspending ...
( 302.540|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0004, suspending
( 302.542|   0.002) I: [alsa-sink-HDMI 0] alsa-sink.c: Device suspended...
( 302.542|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 302.549|   0.006) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC0 is accessible: yes
( 302.549|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_01.1.
( 302.549|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
( 302.549|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
( 302.716|   0.166) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 302.716|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 302.718|   0.001) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
( 302.718|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 302.725|   0.006) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
( 302.725|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
( 316.155|  13.430) I: [pulseaudio] client.c: Created 10 "Native client (UNIX socket client)"
( 316.155|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
( 316.155|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
( 316.155|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
( 316.155|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
( 316.156|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for clementine
( 316.214|   0.058) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
( 316.214|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream pulsesink probe, because already set.
( 316.214|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
( 316.214|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 316.215|   0.000) I: [pulseaudio] sink-input.c: Rate changed to 44100 Hz
( 316.215|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
( 316.215|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
( 316.215|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 316.215|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
( 316.215|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
( 316.216|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Trying resume...
( 316.216|   0.000) D: [alsa-sink-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
( 316.217|   0.000) D: [alsa-sink-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 316.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: hwbuf_unused=0
( 316.218|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: setting avail_min=1
( 316.218|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Resumed successfully...
( 316.218|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 316.218|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
( 316.218|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 316.218|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
( 316.218|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 316.218|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 44100 (method copy)
( 316.218|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
( 316.218|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
( 316.218|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 316.218|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 316.218|   0.000) I: [pulseaudio] sink-input.c: Created input 13 "pulsesink probe" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     media.name = "pulsesink probe"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "5537"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
( 316.218|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
( 316.219|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=136.05 ms, minreq=20.00 ms
( 316.219|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
( 316.219|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=48.03 ms, Received latency=100.14 ms
( 316.219|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
( 316.219|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
( 316.219|   0.000) I: [pulseaudio] protocol-native.c: Final latency 240.27 ms = 100.14 ms + 2*20.00 ms + 100.14 ms
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15481 /  24% / -37.60 dB,   front-right: 15481 /  24% / -37.60 dB
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65295 / 100% / -0.10 dB,   front-right: 65295 / 100% / -0.10 dB (accurate-enough=yes)
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15424 at 4093747537
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91808 usec
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91655 usec
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91428 usec
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91362 usec
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91327 usec
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91280 usec
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 316.220|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 30401 at 4093764375
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91103 usec
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17368 bytes.
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4342
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4342
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17368 bytes.
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 1328
( 316.221|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15424 at 4093649936 was written 6673 usec late
( 316.221|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 316.222|   0.001) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 316.227|   0.004) I: [pulseaudio] sink-input.c: Freeing input 13 "pulsesink probe"
( 316.227|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
( 316.227|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream pulsesink probe, because already set.
( 316.227|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
( 316.227|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 316.227|   0.000) I: [pulseaudio] sink-input.c: Rate changed to 44100 Hz
( 316.227|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
( 316.227|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
( 316.227|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 316.227|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 316.227|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
( 316.227|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 316.227|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 44100 (method copy)
( 316.227|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
( 316.227|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
( 316.227|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 316.227|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 316.227|   0.000) I: [pulseaudio] sink-input.c: Created input 14 "pulsesink probe" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     media.name = "pulsesink probe"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "5537"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
( 316.227|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
( 316.228|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=136.05 ms, minreq=20.00 ms
( 316.228|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
( 318.236|   2.008) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB (request) != front-left: 15246 /  23% / -38.00 dB,   front-right: 15246 /  23% / -38.00 dB
( 318.237|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 9327 usec
( 318.237|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 318.237|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30401 at 4093665936 was written 2006692 usec late
( 320.244|   2.007) D: [pulseaudio] protocol-native.c: Requested latency=48.03 ms, Received latency=100.14 ms
( 320.244|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
( 320.244|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=49440, base=8, prebuf=42392, minreq=7056 maxrewind=0
( 320.244|   0.000) I: [pulseaudio] protocol-native.c: Final latency 240.27 ms = 100.14 ms + 2*20.00 ms + 100.14 ms
( 320.245|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB
( 320.245|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15481 /  24% / -37.60 dB,   front-right: 15481 /  24% / -37.60 dB
( 320.245|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65295 / 100% / -0.10 dB,   front-right: 65295 / 100% / -0.10 dB (accurate-enough=yes)
( 320.245|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15424 at 4097672563
( 320.245|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15424 at 4097672563 was written 8024 usec late
( 322.252|   2.007) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 322.252|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB (request) != front-left: 15246 /  23% / -38.00 dB,   front-right: 15246 /  23% / -38.00 dB
( 322.252|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 322.254|   0.001) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
( 322.255|   0.000) I: [pulseaudio] core.c: All sinks and sources are suspended, vacuuming memory
( 322.262|   0.007) I: [pulseaudio] client.c: Created 11 "Native client (UNIX socket client)"
( 322.263|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
( 322.263|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
( 322.263|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
( 322.263|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
( 322.263|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
( 322.263|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
( 322.263|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 322.263|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 322.263|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 322.263|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 30401 at 4099707309
( 322.263|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7953 usec
( 322.263|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7914 usec
( 322.264|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 322.264|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 322.268|   0.004) I: [pulseaudio] sink-input.c: Freeing input 14 "pulsesink probe"
( 322.269|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for pavucontrol
( 322.269|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:Clementine.
( 322.269|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Playback Stream, because already set.
( 322.269|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.channels = "2"  format.rate = "44100"  format.channel_map = "\"front-left,front-right\""
( 322.269|   0.000) I: [pulseaudio] sink-input.c: Trying to change sample rate
( 322.269|   0.000) I: [pulseaudio] sink-input.c: Rate changed to 44100 Hz
( 322.269|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring volume for sink input sink-input-by-application-name:Clementine.
( 322.269|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:Clementine.
( 322.269|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 322.269|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
( 322.270|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio1'
( 322.270|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 1189 usec
( 322.270|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 1145 usec
( 322.270|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Trying resume...
( 322.271|   0.000) D: [alsa-sink-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
( 322.271|   0.000) D: [alsa-sink-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 322.271|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: hwbuf_unused=0
( 322.271|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: setting avail_min=1
( 322.272|   0.000) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Resumed successfully...
( 322.272|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30401 at 4099707309 was written 199 usec late
( 322.272|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 324.280|   2.008) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Starting playback.
( 324.281|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 324.281|   0.000) I: [pulseaudio] resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.
( 324.281|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 324.281|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 44100 (method copy)
( 324.281|   0.000) D: [pulseaudio] resampler.c:   format float32le -> s16le (intermediate s16le)
( 324.281|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 2 (resampling 2)
( 324.281|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 324.281|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 324.281|   0.000) I: [pulseaudio] sink-input.c: Created input 15 "Playback Stream" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec float32le 2ch 44100Hz and channel map front-left,front-right
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     media.name = "Playback Stream"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.name = "Clementine"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "5537"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "clementine"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     application.icon_name = "application-x-clementine"
( 324.281|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:Clementine"
( 324.282|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=200.00 ms, minreq=10.00 ms
( 324.282|   0.000) D: [pulseaudio] protocol-native.c: Adjust latency mode enabled, configuring sink latency to half of overall latency.
( 324.282|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=90.00 ms, Received latency=100.14 ms
( 324.282|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=42384, base=8, prebuf=0, minreq=3528 maxrewind=0
( 324.282|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=42384, base=8, prebuf=0, minreq=3528 maxrewind=0
( 324.282|   0.000) I: [pulseaudio] protocol-native.c: Final latency 220.27 ms = 100.14 ms + 2*10.00 ms + 100.14 ms
( 324.282|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB
( 324.282|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 15481 /  24% / -37.60 dB,   front-right: 15481 /  24% / -37.60 dB
( 324.283|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65295 / 100% / -0.10 dB,   front-right: 65295 / 100% / -0.10 dB (accurate-enough=yes)
( 324.283|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 15424 at 4101810385
( 324.283|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91845 usec
( 324.283|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91707 usec
( 324.283|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91333 usec
( 324.283|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91186 usec
( 324.283|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 91126 usec
( 324.284|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 90958 usec
( 324.284|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 90901 usec
( 324.290|   0.006) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 324.290|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 324.290|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 324.290|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to uncorking
( 324.290|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 324.290|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17384 bytes.
( 324.290|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 324.290|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4346
( 324.291|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4346
( 324.291|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17384 bytes.
( 324.291|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 324.291|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 1304
( 324.291|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 15424 at 4101719859 was written 6697 usec late
( 326.304|   2.013) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 15424 /  24% / -37.70 dB,   front-right: 15424 /  24% / -37.70 dB (request) != front-left: 15246 /  23% / -38.00 dB,   front-right: 15246 /  23% / -38.00 dB
( 326.305|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 326.312|   0.007) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 326.312|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 326.312|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 326.312|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 326.312|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 326.312|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes busy, resuming.
( 326.312|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0000, resuming
( 326.313|   0.000) D: [pulseaudio] reserve-wrap.c: Successfully acquired reservation lock on device 'Audio0'
( 326.313|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Trying resume...
( 326.315|   0.001) D: [alsa-sink-HDMI 0] alsa-util.c: Maximum hw buffer size is 371 ms
( 326.315|   0.000) D: [alsa-sink-HDMI 0] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 326.315|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: hwbuf_unused=0
( 326.315|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: setting avail_min=1
( 326.315|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Resumed successfully...
( 326.315|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 326.315|   0.000) I: [alsa-sink-HDMI 0] alsa-sink.c: Starting playback.
( 326.316|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 326.316|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 326.316|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 326.316|   0.000) D: [pulseaudio] resampler.c:     +------------
( 326.316|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 326.316|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 326.316|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 326.316|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 326.316|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 326.316|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 326.316|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 326.316|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 326.316|   0.000) I: [pulseaudio] source-output.c: Created output 13 "Peak detect" on alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 326.316|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5701"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 326.316|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 326.317|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 326.317|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 326.317|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 326.317|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 326.318|   0.000) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 326.318|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 326.318|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 326.318|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 326.318|   0.000) I: [pulseaudio] source.c: Cannot update rate, this is a monitor source and the sink is running.
( 326.318|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 326.318|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 326.318|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 326.318|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 326.318|   0.000) D: [pulseaudio] resampler.c:     +------------
( 326.318|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 326.318|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 326.318|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 326.318|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 326.318|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 326.318|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 326.318|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 326.318|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 326.318|   0.000) I: [pulseaudio] source-output.c: Created output 14 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 326.318|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5701"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 326.318|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 326.319|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 326.319|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 326.319|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 326.321|   0.001) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 326.321|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 326.321|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 326.321|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 326.321|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 326.321|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 326.321|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0000, resuming
( 326.321|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Trying resume...
( 326.322|   0.000) D: [alsa-source-CX20756 Analog] alsa-util.c: Maximum hw buffer size is 371 ms
( 326.322|   0.000) D: [alsa-source-CX20756 Analog] alsa-util.c: Set buffer size first (to 4416 samples), period size second (to 736 samples).
( 326.322|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: hwbuf_unused=0
( 326.322|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: setting avail_min=1
( 326.322|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Resumed successfully...
( 326.322|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Starting capture.
( 326.322|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 326.322|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 326.322|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 326.322|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 326.322|   0.000) D: [pulseaudio] resampler.c:     +------------
( 326.322|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 326.322|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 326.322|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 326.322|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 326.322|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 326.322|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 326.322|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 326.322|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 326.322|   0.000) I: [pulseaudio] source-output.c: Created output 15 "Peak detect" on alsa_input.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 25Hz and channel map mono
( 326.322|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5701"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 326.322|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 326.323|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 326.323|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 326.323|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 326.323|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 326.323|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 326.323|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 326.323|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 326.323|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 326.327|   0.003) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 326.327|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 326.327|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 326.327|   0.000) I: [pulseaudio] source.c: Cannot update rate, SOURCE_IS_RUNNING, will keep using 44100 Hz
( 326.327|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 326.327|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 326.327|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 326.327|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 326.327|   0.000) D: [pulseaudio] resampler.c:     +------------
( 326.327|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 326.327|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 326.327|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 326.327|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 326.327|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 326.327|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 326.327|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 326.327|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 326.327|   0.000) I: [pulseaudio] source-output.c: Created output 16 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 326.327|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5701"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 326.327|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 326.328|   0.001) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 326.328|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 326.328|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 328.863|   2.534) D: [alsa-sink-CX20756 Analog] ratelimit.c: 376 events suppressed
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 328.863|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 330.778|   1.914) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17380 bytes.
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4345
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4345
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17380 bytes.
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17380 bytes on render memblockq.
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 34760 bytes on implementor.
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 330.778|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17512 bytes ago (152 bytes ahead in playback buffer)
( 330.779|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17528 bytes ago (136 bytes ahead in playback buffer)
( 330.779|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17584 bytes ago (80 bytes ahead in playback buffer)
( 330.779|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17608 bytes ago (56 bytes ahead in playback buffer)
( 330.779|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17636 bytes ago (28 bytes ahead in playback buffer)
( 330.779|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17652 bytes ago (12 bytes ahead in playback buffer)
( 330.781|   0.001) I: [pulseaudio] source-output.c: Freeing output 16 "Peak detect"
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 30401 at 4108224837
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 330.781|   0.000) I: [pulseaudio] sink-input.c: Freeing input 15 "'180db_' by 'Aphex Twin'"
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17372 bytes.
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4343
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4343
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17372 bytes.
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 330.781|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 330.782|   0.000) I: [pulseaudio] client.c: Freed 10 "Clementine"
( 330.782|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 330.789|   0.006) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 30401 at 4108224837 was written 35 usec late
( 349.664|  18.875) I: [pulseaudio] client.c: Created 12 "Native client (UNIX socket client)"
( 349.688|   0.024) I: [pulseaudio] client.c: Freed 12 "Native client (UNIX socket client)"
( 349.688|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 349.689|   0.000) I: [pulseaudio] client.c: Created 13 "Native client (UNIX socket client)"
( 349.689|   0.000) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
( 349.689|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
( 349.689|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
( 349.689|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
( 349.689|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for plugin-container
( 349.690|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:ALSA plug-in [plugin-container].
( 349.690|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream ALSA Playback, because already set.
( 349.690|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"s16le\""  format.rate = "44100"  format.channels = "2"  format.channel_map = "\"front-left,front-right\""
( 349.690|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:ALSA plug-in [plugin-container].
( 349.690|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 349.690|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 349.690|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 349.691|   0.000) I: [pulseaudio] sink-input.c: Created input 16 "ALSA Playback" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     media.name = "ALSA Playback"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     application.name = "ALSA plug-in [plugin-container]"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "5919"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "plugin-container"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 349.691|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:ALSA plug-in [plugin-container]"
( 349.691|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=500.00 ms, minreq=20.00 ms
( 349.691|   0.000) D: [pulseaudio] protocol-native.c: Early requests mode enabled, configuring sink latency to minreq.
( 349.691|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=20.00 ms, Received latency=100.14 ms
( 349.691|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=88200, base=4, prebuf=3528, minreq=17660 maxrewind=0
( 349.691|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=88200, base=4, prebuf=3528, minreq=17660 maxrewind=0
( 349.691|   0.000) I: [pulseaudio] protocol-native.c: Final latency 600.14 ms = 299.77 ms + 2*100.11 ms + 100.14 ms
( 349.692|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 349.692|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 349.692|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 349.692|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 349.694|   0.002) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 349.694|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17384 bytes.
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4346
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4346
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17384 bytes.
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17384 bytes on render memblockq.
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] protocol-native.c: Implicit underrun of 'ALSA Playback'
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 13984 bytes ago (3680 bytes ahead in playback buffer)
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14016 bytes ago (3648 bytes ahead in playback buffer)
( 349.695|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14036 bytes ago (3628 bytes ahead in playback buffer)
( 349.696|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14072 bytes ago (3592 bytes ahead in playback buffer)
( 349.696|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14084 bytes ago (3580 bytes ahead in playback buffer)
( 349.696|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14168 bytes ago (3492 bytes ahead in playback buffer)
( 349.696|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14196 bytes ago (3468 bytes ahead in playback buffer)
( 349.696|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14220 bytes ago (3444 bytes ahead in playback buffer)
( 349.697|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14260 bytes ago (3400 bytes ahead in playback buffer)
( 349.697|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14292 bytes ago (3372 bytes ahead in playback buffer)
( 349.697|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14308 bytes ago (3356 bytes ahead in playback buffer)
( 349.697|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14352 bytes ago (3312 bytes ahead in playback buffer)
( 349.697|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14372 bytes ago (3292 bytes ahead in playback buffer)
( 349.697|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14400 bytes ago (3264 bytes ahead in playback buffer)
( 349.698|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14416 bytes ago (3248 bytes ahead in playback buffer)
( 349.698|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14444 bytes ago (3220 bytes ahead in playback buffer)
( 349.698|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14484 bytes ago (3180 bytes ahead in playback buffer)
( 349.698|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14536 bytes ago (3128 bytes ahead in playback buffer)
( 349.698|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14572 bytes ago (3092 bytes ahead in playback buffer)
( 349.699|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14620 bytes ago (3044 bytes ahead in playback buffer)
( 349.699|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14636 bytes ago (3028 bytes ahead in playback buffer)
( 349.699|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14672 bytes ago (2992 bytes ahead in playback buffer)
( 349.699|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 14700 bytes ago (2964 bytes ahead in playback buffer)
( 349.702|   0.002) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 15164 bytes ago (2500 bytes ahead in playback buffer)
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17344 bytes.
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4336
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4336
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17344 bytes.
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 349.702|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 349.703|   0.000) I: [pulseaudio] sink-input.c: Freeing input 16 "ALSA Playback"
( 349.706|   0.003) I: [pulseaudio] module-stream-restore.c: Restoring device for stream sink-input-by-application-name:ALSA plug-in [plugin-container].
( 349.706|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream ALSA Playback, because already set.
( 349.706|   0.000) D: [pulseaudio] sink-input.c: Negotiated format: pcm, format.sample_format = "\"s16le\""  format.rate = "44100"  format.channels = "2"  format.channel_map = "\"front-left,front-right\""
( 349.706|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for sink input sink-input-by-application-name:ALSA plug-in [plugin-container].
( 349.706|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 349.706|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 349.706|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 349.706|   0.000) I: [pulseaudio] sink-input.c: Created input 17 "ALSA Playback" on alsa_output.pci-0000_00_14.2.analog-stereo with sample spec s16le 2ch 44100Hz and channel map front-left,front-right
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     media.name = "ALSA Playback"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     application.name = "ALSA plug-in [plugin-container]"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.peer = "UNIX socket client"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     native-protocol.version = "29"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     application.process.id = "5919"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     application.process.user = "david"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     application.process.host = "fuileach"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     application.process.binary = "plugin-container"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     window.x11.display = ":0"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     application.language = "ga_IE.UTF-8"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     application.process.session_id = "1"
( 349.706|   0.000) I: [pulseaudio] sink-input.c:     module-stream-restore.id = "sink-input-by-application-name:ALSA plug-in [plugin-container]"
( 349.706|   0.000) I: [pulseaudio] protocol-native.c: Requested tlength=500.00 ms, minreq=20.00 ms
( 349.706|   0.000) D: [pulseaudio] protocol-native.c: Early requests mode enabled, configuring sink latency to minreq.
( 349.706|   0.000) D: [pulseaudio] protocol-native.c: Requested latency=20.00 ms, Received latency=100.14 ms
( 349.706|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=88200, base=4, prebuf=70544, minreq=17660 maxrewind=0
( 349.707|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=88200, base=4, prebuf=70544, minreq=17660 maxrewind=0
( 349.707|   0.000) I: [pulseaudio] protocol-native.c: Final latency 600.14 ms = 299.77 ms + 2*100.11 ms + 100.14 ms
( 349.707|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 349.707|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 349.707|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 349.707|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 349.711|   0.004) D: [alsa-sink-CX20756 Analog] protocol-native.c: Requesting rewind due to end of underrun.
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17392 bytes.
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4348
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4348
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17392 bytes.
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 0
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 17392 bytes on render memblockq.
( 349.711|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 349.747|   0.036) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 349.747|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 349.747|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 349.747|   0.000) I: [pulseaudio] source.c: Cannot update rate, SOURCE_IS_RUNNING, will keep using 44100 Hz
( 349.748|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 349.748|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 349.748|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 349.748|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 349.748|   0.000) D: [pulseaudio] resampler.c:     +------------
( 349.748|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 349.748|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 349.748|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 349.748|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 349.748|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 349.748|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 349.748|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 349.748|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 349.748|   0.000) I: [pulseaudio] source-output.c: Created output 17 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 349.748|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "5701"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 349.748|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 349.748|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 349.748|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 349.748|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 354.945|   5.197) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 354.946|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 30401 /  46% / -20.02 dB,   front-right: 30401 /  46% / -20.02 dB
( 354.946|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 30419 /  46% / -20.00 dB,   front-right: 30419 /  46% / -20.00 dB
( 354.946|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 354.946|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 354.979|   0.033) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 354.980|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 36955 /  56% / -14.93 dB,   front-right: 36955 /  56% / -14.93 dB
( 354.980|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 37137 /  57% / -14.80 dB,   front-right: 37137 /  57% / -14.80 dB
( 354.980|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65215 / 100% / -0.13 dB,   front-right: 65215 / 100% / -0.13 dB (accurate-enough=yes)
( 354.980|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 36955 at 4132423780
( 354.980|   0.000) D: [alsa-sink-CX20756 Analog] ratelimit.c: 66 events suppressed
( 354.980|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7972 usec
( 354.980|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 354.980|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7815 usec
( 354.980|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 7523 usec
( 354.981|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6942 usec
( 354.981|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6876 usec
( 354.982|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6353 usec
( 354.982|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 6297 usec
( 354.982|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 5778 usec
( 354.982|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 5710 usec
( 354.983|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 5191 usec
( 354.983|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Next volume change in 5100 usec
( 354.988|   0.005) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 36955 at 4132423780 was written 44 usec late
( 355.012|   0.024) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 356.997|   1.984) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 43509 /  66% / -10.67 dB,   front-right: 43509 /  66% / -10.67 dB
( 356.997|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 43633 /  67% / -10.60 dB,   front-right: 43633 /  67% / -10.60 dB
( 356.997|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65350 / 100% / -0.07 dB,   front-right: 65350 / 100% / -0.07 dB (accurate-enough=yes)
( 356.997|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 43509 at 4134440564
( 356.997|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 356.998|   0.001) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 356.998|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 50063 /  76% / -7.02 dB,   front-right: 50063 /  76% / -7.02 dB
( 356.998|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 50097 /  76% / -7.00 dB,   front-right: 50097 /  76% / -7.00 dB
( 356.998|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65492 / 100% / -0.02 dB,   front-right: 65492 / 100% / -0.02 dB (accurate-enough=yes)
( 356.998|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 50063 at 4134442254
( 356.998|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 357.001|   0.002) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 357.001|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 56617 /  86% / -3.81 dB,   front-right: 56617 /  86% / -3.81 dB
( 357.001|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 56643 /  86% / -3.80 dB,   front-right: 56643 /  86% / -3.80 dB
( 357.001|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65506 / 100% / -0.01 dB,   front-right: 65506 / 100% / -0.01 dB (accurate-enough=yes)
( 357.001|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 56617 at 4134445178
( 357.001|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 357.002|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 357.002|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 63171 /  96% / -0.96 dB,   front-right: 63171 /  96% / -0.96 dB
( 357.003|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 63555 /  97% / -0.80 dB,   front-right: 63555 /  97% / -0.80 dB
( 357.003|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65140 /  99% / -0.16 dB,   front-right: 65140 /  99% / -0.16 dB (accurate-enough=yes)
( 357.003|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 63171 at 4134446513
( 357.003|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 357.003|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 357.003|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
( 357.003|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
( 357.003|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB (accurate-enough=yes)
( 357.003|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 65536 at 4134447229
( 357.003|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 357.004|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB (accurate-enough=yes)
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 65536 at 4134447788
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 65536 at 4134447229 was dropped
( 357.004|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB (accurate-enough=yes)
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 65536 at 4134448362
( 357.004|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 65536 at 4134447788 was dropped
( 357.005|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 357.005|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 58982 /  90% / -2.75 dB,   front-right: 58982 /  90% / -2.75 dB
( 357.005|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 59312 /  91% / -2.60 dB,   front-right: 59312 /  91% / -2.60 dB
( 357.005|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65171 /  99% / -0.15 dB,   front-right: 65171 /  99% / -0.15 dB (accurate-enough=yes)
( 357.005|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going up to 58982 at 4134448696
( 357.005|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 63171 at 4134446513 was dropped
( 357.005|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 65536 at 4134448362 was dropped
( 357.005|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 43509 at 4134440564 was written 210 usec late
( 357.005|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 357.005|   0.000) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 359.012|   2.007) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Written HW volume did not match with the request: front-left: 43509 /  66% / -10.67 dB,   front-right: 43509 /  66% / -10.67 dB (request) != front-left: 42968 /  66% / -11.00 dB,   front-right: 42968 /  66% / -11.00 dB
( 359.013|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 50063 at 4134442254 was written 2006277 usec late
( 359.013|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 56617 at 4134445178 was written 2003353 usec late
( 359.013|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 58982 at 4134448696 was written 1999835 usec late
( 361.024|   2.011) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 52428 /  80% / -5.81 dB,   front-right: 52428 /  80% / -5.81 dB
( 361.024|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 52459 /  80% / -5.80 dB,   front-right: 52459 /  80% / -5.80 dB
( 361.024|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65497 / 100% / -0.02 dB,   front-right: 65497 / 100% / -0.02 dB (accurate-enough=yes)
( 361.024|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 52428 at 4138452283
( 361.024|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 52428 at 4138452283 was written 8031 usec late
( 361.025|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 363.034|   2.009) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 363.035|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 45874 /  70% / -9.29 dB,   front-right: 45874 /  70% / -9.29 dB
( 363.035|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 46041 /  70% / -9.20 dB,   front-right: 46041 /  70% / -9.20 dB
( 363.035|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65298 / 100% / -0.09 dB,   front-right: 65298 / 100% / -0.09 dB (accurate-enough=yes)
( 363.035|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 45874 at 4140462739
( 363.035|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 45874 at 4140462739 was written 8032 usec late
( 363.035|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 365.042|   2.006) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 365.042|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 39320 /  60% / -13.31 dB,   front-right: 39320 /  60% / -13.31 dB
( 365.042|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 39490 /  60% / -13.20 dB,   front-right: 39490 /  60% / -13.20 dB
( 365.042|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65254 / 100% / -0.11 dB,   front-right: 65254 / 100% / -0.11 dB (accurate-enough=yes)
( 365.042|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 39320 at 4142470061
( 365.042|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 39320 at 4142470061 was written 8053 usec late
( 365.042|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 365.043|   0.000) I: [pulseaudio] module-device-restore.c: Synced.
( 367.055|   2.012) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 367.055|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 32766 /  50% / -18.06 dB,   front-right: 32766 /  50% / -18.06 dB
( 367.055|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 32846 /  50% / -18.00 dB,   front-right: 32846 /  50% / -18.00 dB
( 367.055|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65376 / 100% / -0.06 dB,   front-right: 65376 / 100% / -0.06 dB (accurate-enough=yes)
( 367.055|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 32766 at 4144483011
( 367.055|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 32766 at 4144483011 was written 8053 usec late
( 367.055|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 369.066|   2.010) D: [pulseaudio] protocol-native.c: Client gnome-shell changes volume of sink alsa_output.pci-0000_00_14.2.analog-stereo.
( 369.066|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 26212 /  40% / -23.88 dB,   front-right: 26212 /  40% / -23.88 dB
( 369.066|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 26291 /  40% / -23.80 dB,   front-right: 26291 /  40% / -23.80 dB
( 369.066|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65339 / 100% / -0.08 dB,   front-right: 65339 / 100% / -0.08 dB (accurate-enough=yes)
( 369.066|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume going down to 26212 at 4146493987
( 369.066|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume change to 26212 at 4146493987 was written 8052 usec late
( 369.066|   0.000) I: [pulseaudio] module-device-restore.c: Storing volume/mute for device+port sink:alsa_output.pci-0000_00_14.2.analog-stereo:analog-output.
( 377.055|   7.989) I: [pulseaudio] module-device-restore.c: Synced.
( 384.502|   7.446) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 384.502|   0.000) I: [pulseaudio] source-output.c: Freeing output 13 "Peak detect"
( 384.503|   0.000) I: [pulseaudio] source-output.c: Freeing output 14 "Peak detect"
( 384.503|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 384.503|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 384.503|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 384.503|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 384.504|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 384.504|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 384.504|   0.000) I: [pulseaudio] source-output.c: Freeing output 15 "Peak detect"
( 384.504|   0.000) I: [pulseaudio] source-output.c: Freeing output 17 "Peak detect"
( 384.504|   0.000) I: [pulseaudio] client.c: Freed 11 "PulseAudio Volume Control"
( 384.504|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 387.745|   3.240) I: [pulseaudio] client.c: Created 14 "Native client (UNIX socket client)"
( 387.819|   0.074) D: [pulseaudio] protocol-native.c: Protocol version: remote 29, local 29
( 387.819|   0.000) I: [pulseaudio] protocol-native.c: Got credentials: uid=1000 gid=1000 success=1
( 387.819|   0.000) D: [pulseaudio] protocol-native.c: SHM possible: yes
( 387.819|   0.000) D: [pulseaudio] protocol-native.c: Negotiated SHM: yes
( 387.820|   0.000) D: [pulseaudio] module-augment-properties.c: Looking for .desktop file for pavucontrol
( 387.966|   0.145) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 387.966|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 387.966|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 387.966|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 387.966|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 387.966|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes busy, resuming.
( 387.966|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 387.966|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 387.966|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 387.966|   0.000) D: [pulseaudio] resampler.c:     +------------
( 387.966|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 387.966|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 387.966|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 387.966|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 387.966|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 387.966|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 387.966|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 387.966|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 387.966|   0.000) I: [pulseaudio] source-output.c: Created output 18 "Peak detect" on alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 387.966|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "6297"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 387.966|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 387.967|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 387.967|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 387.967|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 387.967|   0.000) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 387.967|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 387.967|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 387.967|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 387.967|   0.000) I: [pulseaudio] source.c: Cannot update rate, this is a monitor source and the sink is running.
( 387.967|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 387.967|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 387.967|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 387.967|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 387.967|   0.000) D: [pulseaudio] resampler.c:     +------------
( 387.967|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 387.968|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 387.968|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 387.968|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 387.968|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 387.968|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 387.968|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 387.968|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 387.968|   0.000) I: [pulseaudio] source-output.c: Created output 19 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 387.968|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "6297"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 387.968|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 387.968|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 387.968|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 387.968|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 387.969|   0.001) D: [pulseaudio] module-stream-restore.c: Not restoring device for stream source-output-by-application-id:org.PulseAudio.pavucontrol, because already set
( 387.970|   0.000) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 387.970|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 387.970|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 387.970|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 387.970|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 387.970|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 387.970|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 387.970|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 387.970|   0.000) D: [pulseaudio] resampler.c:     +------------
( 387.970|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 387.970|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 387.970|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 387.970|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 387.970|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 387.970|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 387.970|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 387.970|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 387.970|   0.000) I: [pulseaudio] source-output.c: Created output 20 "Peak detect" on alsa_input.pci-0000_00_14.2.analog-stereo with sample spec float32le 1ch 25Hz and channel map mono
( 387.970|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "6297"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 387.970|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 387.970|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 387.971|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 387.971|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 387.971|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 387.971|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 387.971|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 387.971|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 387.989|   0.018) D: [pulseaudio] module-intended-roles.c: Not setting device for stream Peak detect, because already set.
( 387.989|   0.000) D: [pulseaudio] source-output.c: Negotiated format: pcm, format.sample_format = "\"float32le\""  format.rate = "25"  format.channels = "1"  format.channel_map = "\"mono\""
( 387.989|   0.000) I: [pulseaudio] source-output.c: Trying to change sample rate
( 387.989|   0.000) I: [pulseaudio] source.c: Cannot update rate, SOURCE_IS_RUNNING, will keep using 44100 Hz
( 387.989|   0.000) I: [pulseaudio] module-stream-restore.c: Restoring mute state for source output source-output-by-application-id:org.PulseAudio.pavucontrol.
( 387.989|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes busy, resuming.
( 387.989|   0.000) D: [pulseaudio] resampler.c: Channel matrix:
( 387.989|   0.000) D: [pulseaudio] resampler.c:        I00   I01 
( 387.989|   0.000) D: [pulseaudio] resampler.c:     +------------
( 387.989|   0.000) D: [pulseaudio] resampler.c: O00 | 0.500 0.500
( 387.989|   0.000) I: [pulseaudio] remap.c: Using generic matrix remapping
( 387.989|   0.000) D: [pulseaudio] resampler.c: Resampler:
( 387.989|   0.000) D: [pulseaudio] resampler.c:   rate 44100 -> 25 (method peaks)
( 387.989|   0.000) D: [pulseaudio] resampler.c:   format s16le -> float32le (intermediate s16le)
( 387.989|   0.000) D: [pulseaudio] resampler.c:   channels 2 -> 1 (resampling 1)
( 387.989|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=33554432, tlength=0, base=4, prebuf=0, minreq=1 maxrewind=0
( 387.989|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=33554432, tlength=33554432, base=4, prebuf=0, minreq=4 maxrewind=0
( 387.990|   0.000) I: [pulseaudio] source-output.c: Created output 21 "Peak detect" on alsa_output.pci-0000_00_14.2.analog-stereo.monitor with sample spec float32le 1ch 25Hz and channel map mono
( 387.990|   0.000) I: [pulseaudio] source-output.c:     media.name = "Peak detect"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.name = "PulseAudio Volume Control"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     native-protocol.peer = "UNIX socket client"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     native-protocol.version = "29"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.id = "org.PulseAudio.pavucontrol"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.icon_name = "audio-card"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.version = "2.0"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.process.id = "6297"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.process.user = "david"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.process.host = "fuileach"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.process.binary = "pavucontrol"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.language = "ga_IE.UTF-8"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     window.x11.display = ":0"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.process.machine_id = "fb75a029cab0d31b5676ade754660933"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     application.process.session_id = "1"
( 387.990|   0.000) I: [pulseaudio] source-output.c:     module-stream-restore.id = "source-output-by-application-id:org.PulseAudio.pavucontrol"
( 387.990|   0.000) D: [pulseaudio] memblockq.c: memblockq requested: maxlength=4194304, tlength=0, base=4, prebuf=1, minreq=0 maxrewind=0
( 387.990|   0.000) D: [pulseaudio] memblockq.c: memblockq sanitized: maxlength=4194304, tlength=4194304, base=4, prebuf=4, minreq=4 maxrewind=0
( 387.990|   0.000) I: [pulseaudio] protocol-native.c: Final latency 180.14 ms = 80.00 ms + 100.14 ms
( 390.265|   2.274) D: [pulseaudio] module-stream-restore.c: Client pavucontrol changes entry sink-input-by-media-role:event.
( 390.651|   0.386) D: [pulseaudio] module-stream-restore.c: Client pavucontrol changes entry sink-input-by-media-role:event.
( 394.045|   3.393) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo becomes idle, timeout in 5 seconds.
( 394.045|   0.000) I: [pulseaudio] source-output.c: Freeing output 18 "Peak detect"
( 394.046|   0.000) I: [pulseaudio] source-output.c: Freeing output 19 "Peak detect"
( 394.046|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Requested volume: front-left: 44205 /  67% / -10.26 dB,   front-right: 44205 /  67% / -10.26 dB
( 394.046|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Got hardware volume: front-left: 41350 /  63% / -12.00 dB,   front-right: 41350 /  63% / -12.00 dB
( 394.046|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Calculated software volume: front-left: 70061 / 107% / 1.74 dB,   front-right: 70061 / 107% / 1.74 dB (accurate-enough=no)
( 394.046|   0.000) D: [alsa-source-CX20756 Analog] source.c: Volume not changing
( 394.046|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 394.046|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 394.046|   0.000) I: [pulseaudio] source-output.c: Freeing output 20 "Peak detect"
( 394.046|   0.000) I: [pulseaudio] source-output.c: Freeing output 21 "Peak detect"
( 394.047|   0.000) I: [pulseaudio] client.c: Freed 14 "PulseAudio Volume Control"
( 394.047|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 399.045|   4.998) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_01.1.hdmi-stereo idle for too long, suspending ...
( 399.046|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_01.1.hdmi-stereo is 0x0004, suspending
( 399.048|   0.001) I: [alsa-sink-HDMI 0] alsa-sink.c: Device suspended...
( 399.048|   0.000) I: [pulseaudio] module-suspend-on-idle.c: Source alsa_input.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 399.048|   0.000) D: [pulseaudio] source.c: Suspend cause of source alsa_input.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 399.048|   0.000) I: [alsa-source-CX20756 Analog] alsa-source.c: Device suspended...
( 399.049|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC0 is accessible: yes
( 399.049|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_01.1.
( 399.049|   0.000) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
( 399.049|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
( 400.266|   1.217) I: [pulseaudio] module-stream-restore.c: Synced.
( 475.431|  75.164) D: [alsa-sink-CX20756 Analog] sink-input.c: Requesting rewind due to corking
( 475.470|   0.038) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 10588 bytes.
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 2647
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 2647
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 10588 bytes.
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 38065
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 10588 bytes on render memblockq.
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] sink-input.c: Have to rewind 10588 bytes on implementor.
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17452 bytes ago (212 bytes ahead in playback buffer)
( 475.470|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17464 bytes ago (200 bytes ahead in playback buffer)
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17504 bytes ago (160 bytes ahead in playback buffer)
( 475.470|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17516 bytes ago (148 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17528 bytes ago (136 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17536 bytes ago (128 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17548 bytes ago (116 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17560 bytes ago (104 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17568 bytes ago (96 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17576 bytes ago (88 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17584 bytes ago (80 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17592 bytes ago (72 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] ratelimit.c: 70 events suppressed
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] flist.c: pulsecore/memblockq.c: list_items flist is full (don't worry)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17636 bytes ago (28 bytes ahead in playback buffer)
( 475.471|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Found underrun 17656 bytes ago (8 bytes ahead in playback buffer)
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested volume: front-left: 26212 /  40% / -23.88 dB,   front-right: 26212 /  40% / -23.88 dB
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Got hardware volume: front-left: 26291 /  40% / -23.80 dB,   front-right: 26291 /  40% / -23.80 dB
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Calculated software volume: front-left: 65339 / 100% / -0.08 dB,   front-right: 65339 / 100% / -0.08 dB (accurate-enough=yes)
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Volume not changing
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Requested to rewind 17664 bytes.
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Limited to 17364 bytes.
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: before: 4341
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: after: 4341
( 475.472|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Rewound 17364 bytes.
( 475.473|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: Processing rewind...
( 475.473|   0.000) D: [alsa-sink-CX20756 Analog] sink.c: latency = 40457
( 475.473|   0.000) D: [alsa-sink-CX20756 Analog] source.c: Processing rewind...
( 475.473|   0.000) D: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo becomes idle, timeout in 5 seconds.
( 475.473|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 475.480|   0.007) I: [pulseaudio] sink-input.c: Freeing input 17 "ALSA Playback"
( 475.481|   0.000) I: [pulseaudio] client.c: Freed 13 "ALSA plug-in [plugin-container]"
( 475.481|   0.000) I: [pulseaudio] protocol-native.c: Connection died.
( 480.478|   4.997) I: [pulseaudio] module-suspend-on-idle.c: Sink alsa_output.pci-0000_00_14.2.analog-stereo idle for too long, suspending ...
( 480.478|   0.000) D: [pulseaudio] sink.c: Suspend cause of sink alsa_output.pci-0000_00_14.2.analog-stereo is 0x0004, suspending
( 480.479|   0.001) I: [alsa-sink-CX20756 Analog] alsa-sink.c: Device suspended...
( 480.479|   0.000) D: [pulseaudio] core.c: Hmm, no streams around, trying to vacuum.
( 480.483|   0.003) D: [pulseaudio] module-udev-detect.c: /dev/snd/controlC1 is accessible: yes
( 480.483|   0.000) D: [pulseaudio] module-udev-detect.c: Resuming all sinks and sources of card alsa_card.pci-0000_00_14.2.
( 514.224|  33.741) I: [pulseaudio] main.c: Got signal SIGINT.
( 514.224|   0.000) I: [pulseaudio] main.c: Exiting.
( 514.224|   0.000) I: [pulseaudio] main.c: Daemon shutdown initiated.
( 514.225|   0.000) I: [pulseaudio] module.c: Unloading "module-filter-apply" (index: #19).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloaded "module-filter-apply" (index: #19).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloading "module-filter-heuristics" (index: #18).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloaded "module-filter-heuristics" (index: #18).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloading "module-role-cork" (index: #17).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloaded "module-role-cork" (index: #17).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloading "module-position-event-sounds" (index: #16).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloaded "module-position-event-sounds" (index: #16).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloading "module-systemd-login" (index: #15).
( 514.225|   0.000) D: [pulseaudio] module-systemd-login.c: Removing session 6
( 514.225|   0.000) I: [pulseaudio] client.c: Freed 0 "Login Session 6"
( 514.225|   0.000) D: [pulseaudio] module-systemd-login.c: Removing session 1
( 514.225|   0.000) I: [pulseaudio] client.c: Freed 1 "Login Session 1"
( 514.225|   0.000) I: [pulseaudio] module.c: Unloaded "module-systemd-login" (index: #15).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloading "module-console-kit" (index: #14).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloaded "module-console-kit" (index: #14).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloading "module-suspend-on-idle" (index: #13).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloaded "module-suspend-on-idle" (index: #13).
( 514.225|   0.000) I: [pulseaudio] module.c: Unloading "module-intended-roles" (index: #12).
( 514.226|   0.000) I: [pulseaudio] module.c: Unloaded "module-intended-roles" (index: #12).
( 514.226|   0.000) I: [pulseaudio] module.c: Unloading "module-always-sink" (index: #11).
( 514.226|   0.000) I: [pulseaudio] module.c: Unloaded "module-always-sink" (index: #11).
( 514.226|   0.000) I: [pulseaudio] module.c: Unloading "module-rescue-streams" (index: #10).
( 514.226|   0.000) I: [pulseaudio] module.c: Unloaded "module-rescue-streams" (index: #10).
( 514.226|   0.000) I: [pulseaudio] module.c: Unloading "module-default-device-restore" (index: #9).
( 514.226|   0.000) I: [pulseaudio] module.c: Unloaded "module-default-device-restore" (index: #9).
( 514.226|   0.000) I: [pulseaudio] module.c: Unloading "module-native-protocol-unix" (index: #8).
( 514.226|   0.000) I: [pulseaudio] client.c: Freed 2 "GNOME Volume Control Media Keys"
( 514.226|   0.000) I: [pulseaudio] client.c: Freed 3 "GNOME Shell Volume Control"
( 514.226|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.226|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.226|   0.000) I: [pulseaudio] client.c: Freed 4 "AudioStream"
( 514.226|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.226|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.227|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.227|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.227|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.227|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.227|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.227|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.227|   0.000) D: [pulseaudio] flist.c: pulsecore/hashmap.c: entries flist is full (don't worry)
( 514.227|   0.000) I: [pulseaudio] module.c: Unloaded "module-native-protocol-unix" (index: #8).
( 514.227|   0.000) I: [pulseaudio] module.c: Unloading "module-alsa-card" (index: #7).
( 514.227|   0.000) D: [alsa-sink-CX20756 Analog] alsa-sink.c: Thread shutting down
( 514.227|   0.000) I: [pulseaudio] sink.c: Freeing sink 1 "alsa_output.pci-0000_00_14.2.analog-stereo"
( 514.228|   0.000) I: [pulseaudio] source.c: Freeing source 1 "alsa_output.pci-0000_00_14.2.analog-stereo.monitor"
( 514.228|   0.000) D: [pulseaudio] core-subscribe.c: Dropped redundant event due to change event.
( 514.228|   0.000) D: [alsa-source-CX20756 Analog] alsa-source.c: Thread shutting down
( 514.228|   0.000) I: [pulseaudio] source.c: Freeing source 2 "alsa_input.pci-0000_00_14.2.analog-stereo"
( 514.228|   0.000) I: [pulseaudio] card.c: Freed 1 "alsa_card.pci-0000_00_14.2"
( 514.229|   0.000) I: [pulseaudio] module.c: Unloaded "module-alsa-card" (index: #7).
( 514.229|   0.000) I: [pulseaudio] module.c: Unloading "module-alsa-card" (index: #6).
( 514.229|   0.000) D: [alsa-sink-HDMI 0] alsa-sink.c: Thread shutting down
( 514.229|   0.000) I: [pulseaudio] sink.c: Freeing sink 0 "alsa_output.pci-0000_00_01.1.hdmi-stereo"
( 514.229|   0.000) I: [pulseaudio] source.c: Freeing source 0 "alsa_output.pci-0000_00_01.1.hdmi-stereo.monitor"
( 514.229|   0.000) I: [pulseaudio] card.c: Freed 0 "alsa_card.pci-0000_00_01.1"
( 514.230|   0.000) I: [pulseaudio] module.c: Unloaded "module-alsa-card" (index: #6).
( 514.230|   0.000) I: [pulseaudio] module.c: Unloading "module-udev-detect" (index: #5).
( 514.230|   0.000) I: [pulseaudio] module.c: Unloaded "module-udev-detect" (index: #5).
( 514.231|   0.000) I: [pulseaudio] module.c: Unloading "module-switch-on-port-available" (index: #4).
( 514.231|   0.000) I: [pulseaudio] module.c: Unloaded "module-switch-on-port-available" (index: #4).
( 514.231|   0.000) I: [pulseaudio] module.c: Unloading "module-augment-properties" (index: #3).
( 514.231|   0.000) I: [pulseaudio] module.c: Unloaded "module-augment-properties" (index: #3).
( 514.231|   0.000) I: [pulseaudio] module.c: Unloading "module-card-restore" (index: #2).
( 514.231|   0.000) I: [pulseaudio] module.c: Unloaded "module-card-restore" (index: #2).
( 514.231|   0.000) I: [pulseaudio] module.c: Unloading "module-stream-restore" (index: #1).
( 514.231|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1 removed from object /org/pulseaudio/stream_restore1
( 514.231|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry0
( 514.231|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry1
( 514.231|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry2
( 514.231|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry3
( 514.231|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry4
( 514.231|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry5
( 514.231|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry6
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry7
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry8
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry9
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry10
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry11
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry12
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry13
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry14
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry15
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry16
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry17
( 514.232|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry18
( 514.233|   0.000) D: [pulseaudio] protocol-dbus.c: Interface org.PulseAudio.Ext.StreamRestore1.RestoreEntry removed from object /org/pulseaudio/stream_restore1/entry19
( 514.233|   0.000) I: [pulseaudio] module.c: Unloaded "module-stream-restore" (index: #1).
( 514.233|   0.000) I: [pulseaudio] module.c: Unloading "module-device-restore" (index: #0).
( 514.233|   0.000) I: [pulseaudio] module.c: Unloaded "module-device-restore" (index: #0).
( 514.233|   0.000) I: [pulseaudio] main.c: Daemon terminated.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-pulseaudio-devel/attachments/20141126/abbbae6a/attachment-0001.sig>

From fsateler at debian.org  Fri Nov 28 13:34:42 2014
From: fsateler at debian.org (Felipe Sateler)
Date: Fri, 28 Nov 2014 10:34:42 -0300
Subject: Debian/Ubuntu Pulseaudio packaging
In-Reply-To: <20141123212708.GA4639@acapella>
References: <CAAfdZj9d_BtNyVpV_SmFO4Kv7VHvaZZ-Q-Ouhtm9oK2W8-4paQ@mail.gmail.com>
 <20141123212708.GA4639@acapella>
Message-ID: <CAAfdZj_NHAkYoPbT2R8CrMaeg1JW8uHejfWuNPAr3tBRQVzu+g@mail.gmail.com>

On Sun, Nov 23, 2014 at 6:27 PM, Luke Yelavich
<luke.yelavich at canonical.com> wrote:
> On Sun, Nov 23, 2014 at 12:14:35AM AEDT, Felipe Sateler wrote:
>> Trimming CC list to ubuntu and debian lists only.
>>
>> > On 2014-11-18 00:25, Luke Yelavich wrote:
>> >>
>> >> Hey folks.
>> >> I'm starting to work on merging Ubuntu and Debian packaging for
>> >> pulseaudio.
>>
>> Excellent! If there is anything I can do to help, please let me know.
>> Are you using a clone of the pkg-pulseaudio git repo or are you doing
>> the merging somewhere else?
>
> I used a clone of the pkg-pulse git tree and have a local branch for the Ubuntu packaging.

I see you have the rc ready in ubuntu. Could you push this work
somewhere so we can prepare the package for debian experimental as
well? I'd be ok with you pushing this to a new branch in the pkg-pulse
repository, or somewhere else I can pull from.

If we use a shared repository, I propose that changes for ubuntu go to
ubuntu/master by default. similarly, we could rename the debian branch
to debian/master. Upstream tarballs still go to the upstream branch.
That way he have no collission, and if you there is a need for
already-released fixes there is the possibility of using
debian/(codename) or ubuntu/(codename).

Version tags should be prefixed, upstream/* for upstream versions,
debian/* for debian releases, and ubuntu/* for ubuntu releases. This
can be automated by git-buildpackage via an appropriate
debian/gbp.conf setting debian-tag to ubuntu/$(version)s (the other
two are the default for gbp).

If you prefer another layout, please tell me what would you prefer.

> I am a member of the pkg-pulse team, so I do have commit access, but I am not sure
> everybody else who touches pulseaudio packaging in Ubuntu is a member of that team
> yet, and we still need to discuss where and how we want to manage the Ubuntu
> packaging going forward, but that is for another mail.

If you decide to use the alioth space, then of course adding everyone
to the team will be no problem. But you have to decide if you want to
do that or use another hosting space. I believe we would be ok with
either, but obviously it would be simpler if we used the same.

>
> Thanks for the heads up on the patches and their upstream status.

:)


-- 

Saludos,
Felipe Sateler


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:36 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:36 +0000
Subject: [pulseaudio] branch ubuntu created (now 8209b83)
Message-ID: <20141130224835.19450.82988@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a change to branch ubuntu
in repository pulseaudio.

        at  8209b83   Disable systemd socket activation for now

This branch includes the following new commits:

       new  ba509cf   Merge Ubuntu changes with updated Debian packaging.
       new  9d219da   Imported Upstream version 5.99.1
       new  e615027   Merge tag 'upstream/5.99.1'
       new  948f1c2   New upstream release candidate
       new  1881bb9   Dropped patches, either applied upstream or are now obsolete:
       new  b21dbfc   Refreshed debian/patches/gnu-kfreebsd.patch
       new  f24679e   Remove all references to start-pulseaudio-kde, it was dropped upstream
       new  7047863   Pulse now ships zsh completions, so drop install code, and adjust pulseaudio.install to match
       new  36bf7b0   Update shlibs
       new  72002db   Update symbols
       new  85e451a   Merge unreleased update to 5.99.1
       new  152eb05   Refresh gnu-kfreebsd
       new  48c8926   Refreshed patches, and dropped patches that were either applied upstream or are obsolete
       new  948a8f3   Bump version number
       new  eedf52a   Bump back up to using bluez5
       new  6a5af30   Fix typo in the updating of a patch
       new  fb3765c   Update call to rtpoll_run
       new  e123399   Adjust for PPA version
       new  8209b83   Disable systemd socket activation for now

The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:38 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:38 +0000
Subject: [pulseaudio] 03/19: Merge tag 'upstream/5.99.1'
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIE-000573-B8@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit e61502779303d4fc523c5bec33348c66bd07bac1
Merge: b9c2106 9d219da
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 09:38:43 2014 +1100

    Merge tag 'upstream/5.99.1'
    
    Upstream version 5.99.1

 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 Makefile.am                                        |   22 +-
 Makefile.in                                        |   86 +-
 NEWS                                               |   61 +
 PROTOCOL                                           |   22 +-
 README                                             |    3 -
 bootstrap.sh                                       |    4 -
 build-aux/ltmain.sh                                |    4 +-
 config.h.in                                        |   25 +-
 configure                                          |  919 +++--
 configure.ac                                       |  154 +-
 doxygen/Makefile.in                                |   18 +-
 doxygen/doxygen.conf.in                            | 1115 ++++--
 man/Makefile.am                                    |    3 -
 man/Makefile.in                                    |   26 +-
 man/default.pa.5                                   |    4 +-
 man/pactl.1                                        |   20 +-
 man/pactl.1.xml.in                                 |   27 +-
 man/pax11publish.1                                 |    2 +-
 man/pulse-cli-syntax.5                             |    4 +-
 man/pulse-client.conf.5                            |    6 +-
 man/pulse-client.conf.5.xml.in                     |    2 +-
 man/pulse-daemon.conf.5                            |   18 +-
 man/pulse-daemon.conf.5.xml.in                     |   14 +-
 man/pulseaudio.1                                   |    6 +-
 man/start-pulseaudio-kde.1                         |   14 -
 man/start-pulseaudio-kde.1.xml.in                  |   48 -
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    4 +-
 po/el.po                                           | 3587 ++++++++++++--------
 po/pt_BR.po                                        |  854 ++---
 po/ru.po                                           |  465 +--
 po/{el.po => sk.po}                                | 2803 +++++++--------
 po/uk.po                                           |  581 ++--
 pulseaudio.supp                                    |   50 +
 .../pulseaudio}                                    |    4 +-
 .../_pulseaudio}                                   |  402 ++-
 src/.gitignore                                     |   11 +-
 src/Makefile.am                                    |  140 +-
 src/Makefile.in                                    | 1312 ++++---
 src/daemon/.gitignore                              |    1 -
 src/daemon/caps.c                                  |    7 +-
 src/daemon/cmdline.c                               |    2 +-
 src/daemon/daemon-conf.c                           |    8 +-
 src/daemon/daemon.conf.in                          |    2 +-
 src/daemon/default.pa.in                           |   10 +-
 src/daemon/main.c                                  |  181 +-
 src/daemon/pulseaudio-kde.desktop.in               |   10 -
 src/daemon/pulseaudio.desktop.in                   |    1 +
 src/daemon/server-lookup.c                         |   30 +-
 src/daemon/start-pulseaudio-kde.in                 |   30 -
 src/daemon/start-pulseaudio-x11.in                 |    6 +-
 src/daemon/systemd/user/pulseaudio.service.in      |   10 +
 src/daemon/systemd/user/pulseaudio.socket          |   10 +
 src/map-file                                       |    3 +
 src/modules/alsa/alsa-mixer.c                      |  248 +-
 src/modules/alsa/alsa-mixer.h                      |   10 +-
 src/modules/alsa/alsa-sink.c                       |   37 +-
 src/modules/alsa/alsa-source.c                     |   35 +-
 src/modules/alsa/alsa-ucm.c                        |    7 +-
 src/modules/alsa/alsa-util.c                       |  121 +-
 src/modules/alsa/alsa-util.h                       |    9 +-
 src/modules/alsa/mixer/paths/analog-input.conf     |   15 +
 .../mixer/paths/analog-output-desktop-speaker.conf |  102 -
 .../mixer/paths/analog-output-headphones-2.conf    |    8 +
 .../alsa/mixer/paths/analog-output-headphones.conf |   20 +
 .../alsa/mixer/paths/analog-output-lineout.conf    |   19 +
 .../alsa/mixer/paths/analog-output-mono.conf       |   10 +
 .../mixer/paths/analog-output-speaker-always.conf  |   16 +-
 .../alsa/mixer/paths/analog-output-speaker.conf    |   22 +-
 src/modules/alsa/mixer/paths/analog-output.conf    |   30 -
 src/modules/alsa/mixer/paths/hdmi-output-4.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-5.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-6.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-7.conf    |   10 +
 .../alsa/mixer/profile-sets/90-pulseaudio.rules    |    4 -
 src/modules/alsa/mixer/profile-sets/default.conf   |  292 +-
 .../alsa/mixer/profile-sets/extra-hdmi.conf        |  164 -
 .../profile-sets/force-speaker-and-int-mic.conf    |   46 +-
 .../alsa/mixer/profile-sets/force-speaker.conf     |   46 +-
 src/modules/alsa/module-alsa-card.c                |   77 +-
 src/modules/bluetooth/backend-native.c             |  501 +++
 src/modules/bluetooth/backend-ofono.c              |  665 ++++
 src/modules/bluetooth/bluez5-util.c                |  201 +-
 src/modules/bluetooth/bluez5-util.h                |   53 +-
 src/modules/bluetooth/module-bluetooth-discover.c  |    5 +-
 src/modules/bluetooth/module-bluetooth-policy.c    |   45 +-
 src/modules/bluetooth/module-bluez4-device.c       |   39 +-
 src/modules/bluetooth/module-bluez5-device.c       |  686 +++-
 src/modules/bluetooth/module-bluez5-discover.c     |   39 +-
 src/modules/dbus/iface-core.c                      |    6 +-
 src/modules/dbus/iface-device.c                    |   15 +-
 src/modules/dbus/iface-stream.c                    |    4 +-
 src/modules/echo-cancel/module-echo-cancel.c       |   31 +-
 src/modules/gconf/gconf-helper.c                   |    2 +
 src/modules/gconf/module-gconf.c                   |    7 +-
 src/modules/jack/module-jack-sink.c                |    4 +-
 src/modules/jack/module-jack-source.c              |    4 +-
 src/modules/macosx/module-coreaudio-device.c       |    2 +-
 src/modules/module-card-restore.c                  |    6 +-
 src/modules/module-combine-sink.c                  |  193 +-
 src/modules/module-console-kit.c                   |   10 +-
 src/modules/module-device-manager.c                |    4 +-
 src/modules/module-device-restore.c                |   18 +-
 src/modules/module-equalizer-sink.c                |    2 +-
 src/modules/module-esound-sink.c                   |   15 +-
 src/modules/module-mmkbd-evdev.c                   |    7 +-
 src/modules/module-null-sink.c                     |    2 +-
 src/modules/module-null-source.c                   |    2 +-
 src/modules/module-pipe-sink.c                     |    2 +-
 src/modules/module-pipe-source.c                   |    2 +-
 src/modules/module-protocol-stub.c                 |    6 +-
 src/modules/module-rescue-streams.c                |  105 +-
 src/modules/module-role-cork.c                     |    9 +-
 src/modules/module-sine-source.c                   |    2 +-
 src/modules/module-solaris.c                       |   27 +-
 src/modules/module-stream-restore.c                |   24 +-
 src/modules/module-suspend-on-idle.c               |    5 +-
 src/modules/module-switch-on-connect.c             |   34 +-
 src/modules/module-switch-on-port-available.c      |   38 +-
 src/modules/module-tunnel-sink-new.c               |   98 +-
 src/modules/module-tunnel-source-new.c             |   47 +-
 src/modules/module-tunnel.c                        |   22 +-
 src/modules/module-virtual-surround-sink.c         |   57 +-
 src/modules/module-waveout.c                       |    2 +-
 src/modules/module-zeroconf-publish.c              |   47 +-
 src/modules/oss/module-oss.c                       |    2 +-
 src/modules/raop/module-raop-sink.c                |   10 +-
 src/modules/raop/raop_client.c                     |    9 +-
 src/modules/rtp/headerlist.c                       |    8 +-
 src/modules/rtp/module-rtp-recv.c                  |   14 +-
 src/modules/rtp/module-rtp-send.c                  |    2 +-
 src/modules/rtp/rtp.c                              |   25 +-
 src/modules/xen/module-xenpv-sink.c                |    2 +-
 src/pulse/channelmap.c                             |    6 +
 src/pulse/client-conf-x11.c                        |    9 +-
 src/pulse/client-conf-x11.h                        |    6 +-
 src/pulse/client-conf.c                            |  213 +-
 src/pulse/client-conf.h                            |   39 +-
 src/pulse/client.conf.in                           |    2 +-
 src/pulse/context.c                                |  153 +-
 src/pulse/def.h                                    |    4 +-
 src/{pulsecore/cpu.h => pulse/direction.c}         |   41 +-
 src/pulse/{client-conf-x11.h => direction.h}       |   20 +-
 src/pulse/error.c                                  |    2 +-
 src/pulse/ext-device-manager.c                     |    1 +
 src/pulse/ext-device-manager.h                     |    3 +
 src/pulse/format.c                                 |   43 +-
 src/pulse/internal.h                               |    3 +
 src/pulse/introspect.c                             |    6 +-
 src/pulse/mainloop-api.h                           |   14 +-
 src/pulse/mainloop.c                               |   13 +-
 src/pulse/proplist.c                               |    5 +-
 src/pulse/proplist.h                               |    2 +-
 src/pulse/pulseaudio.h                             |    5 +-
 src/pulse/simple.c                                 |   21 +-
 src/pulse/stream.c                                 |   20 +-
 src/pulse/stream.h                                 |   13 +-
 src/pulse/thread-mainloop.c                        |    7 +-
 src/pulse/thread-mainloop.h                        |    4 +-
 src/pulse/util.c                                   |   59 +-
 src/pulse/version.h                                |    6 +-
 src/pulse/volume.h                                 |    2 +-
 src/pulsecore/asyncmsgq.c                          |    2 -
 src/pulsecore/aupdate.c                            |    2 +-
 src/pulsecore/auth-cookie.c                        |    2 +-
 src/pulsecore/authkey.c                            |   66 +-
 src/pulsecore/authkey.h                            |    3 +-
 src/pulsecore/card.c                               |    2 +-
 src/pulsecore/cli-text.c                           |    4 +-
 src/pulsecore/conf-parser.c                        |    1 +
 src/pulsecore/core-util.c                          |  157 +-
 src/pulsecore/core-util.h                          |    8 +-
 src/pulsecore/core.c                               |   16 +-
 src/pulsecore/core.h                               |   13 +-
 src/pulsecore/cpu-arm.c                            |   22 +-
 src/pulsecore/cpu-arm.h                            |    4 +-
 src/pulsecore/cpu.c                                |   38 +
 src/pulsecore/cpu.h                                |    6 +
 src/pulsecore/creds.h                              |   13 +
 src/pulsecore/database-simple.c                    |    9 +-
 src/pulsecore/device-port.c                        |   27 +
 src/pulsecore/device-port.h                        |    2 +
 src/pulsecore/endianmacros.h                       |   27 +-
 src/pulsecore/esound.h                             |    2 +-
 src/pulsecore/fdsem.c                              |    3 +-
 src/pulsecore/fdsem.h                              |    4 +-
 src/pulsecore/hashmap.c                            |   13 +
 src/pulsecore/hashmap.h                            |    7 +
 src/pulsecore/iochannel.c                          |   92 +-
 src/pulsecore/iochannel.h                          |    3 +-
 src/pulsecore/log.c                                |   12 +-
 src/pulsecore/log.h                                |    4 +-
 src/pulsecore/macro.h                              |    8 +-
 src/pulsecore/memblock.c                           |   56 +-
 src/pulsecore/memblock.h                           |   10 +-
 src/pulsecore/memblockq.c                          |    3 +-
 src/pulsecore/memchunk.c                           |    2 +-
 src/pulsecore/memtrap.c                            |    3 +
 src/pulsecore/mix.c                                |   31 +-
 src/pulsecore/mix_neon.c                           |  131 +-
 src/pulsecore/modargs.c                            |    3 -
 src/pulsecore/native-common.h                      |    7 +-
 src/pulsecore/pdispatch.c                          |   37 +-
 src/pulsecore/pdispatch.h                          |    4 +-
 src/pulsecore/pid.c                                |    2 +-
 src/pulsecore/pipe.c                               |    4 +-
 src/pulsecore/poll-win32.c                         |   60 +-
 src/pulsecore/protocol-dbus.c                      |    3 +-
 src/pulsecore/protocol-esound.c                    |   17 +-
 src/pulsecore/protocol-native.c                    |  133 +-
 src/pulsecore/protocol-native.h                    |    1 +
 src/pulsecore/pstream-util.c                       |   45 +-
 src/pulsecore/pstream-util.h                       |    1 +
 src/pulsecore/pstream.c                            |  351 +-
 src/pulsecore/pstream.h                            |    9 +-
 src/pulsecore/remap.c                              |  480 ++-
 src/pulsecore/remap.h                              |   20 +-
 src/pulsecore/remap_mmx.c                          |   53 +-
 src/pulsecore/remap_neon.c                         |  498 +++
 src/pulsecore/remap_sse.c                          |   53 +-
 src/pulsecore/resampler.c                          |  701 +---
 src/pulsecore/resampler.h                          |   51 +
 src/pulsecore/resampler/ffmpeg.c                   |  132 +
 src/pulsecore/resampler/libsamplerate.c            |  102 +
 src/pulsecore/resampler/peaks.c                    |  163 +
 src/pulsecore/resampler/speex.c                    |  180 +
 src/pulsecore/resampler/trivial.c                  |  102 +
 src/pulsecore/rtpoll.c                             |   14 +-
 src/pulsecore/rtpoll.h                             |    7 +-
 src/pulsecore/sample-util.c                        |    4 +-
 src/pulsecore/sconv-s16le.c                        |   22 +-
 src/pulsecore/sconv_neon.c                         |   10 +-
 src/pulsecore/sconv_sse.c                          |    3 +-
 src/pulsecore/shm.c                                |   12 +-
 src/pulsecore/shm.h                                |    2 +-
 src/pulsecore/sink-input.c                         |  157 +-
 src/pulsecore/sink-input.h                         |   14 +-
 src/pulsecore/sink.c                               |  249 +-
 src/pulsecore/sink.h                               |   37 +-
 src/pulsecore/socket-server.c                      |   98 +-
 src/pulsecore/socket-util.c                        |   18 +
 src/pulsecore/source-output.c                      |  136 +-
 src/pulsecore/source-output.h                      |   14 +-
 src/pulsecore/source.c                             |  235 +-
 src/pulsecore/source.h                             |   33 +-
 src/pulsecore/srbchannel.c                         |  378 +++
 src/pulsecore/srbchannel.h                         |   59 +
 src/pulsecore/start-child.c                        |    2 +-
 src/pulsecore/svolume_c.c                          |    6 +-
 src/tests/alsa-time-test.c                         |   37 +-
 src/tests/connect-stress.c                         |    8 +-
 src/tests/cpu-mix-test.c                           |  226 ++
 src/tests/cpu-remap-test.c                         |  436 +++
 src/tests/cpu-sconv-test.c                         |  265 ++
 src/tests/cpu-test.c                               |  887 -----
 src/tests/cpu-volume-test.c                        |  249 ++
 src/tests/flist-test.c                             |    2 +-
 src/tests/format-test.c                            |    2 +-
 src/tests/lo-test-util.c                           |   10 +-
 src/tests/mcalign-test.c                           |    5 +-
 src/tests/memblock-test.c                          |    4 +-
 src/tests/mix-special-test.c                       |  326 --
 src/tests/mix-test.c                               |  231 +-
 src/tests/resampler-test.c                         |    8 +-
 src/tests/rtpoll-test.c                            |    4 +-
 src/tests/sigbus-test.c                            |    2 +
 src/tests/srbchannel-test.c                        |  138 +
 src/utils/pacat.c                                  |   12 +-
 src/utils/pactl.c                                  |  322 +-
 src/utils/pax11publish.c                           |   12 +-
 vala/libpulse-simple.deps                          |    1 +
 vala/libpulse-simple.vapi                          |   36 +
 vala/libpulse.vapi                                 |    8 +
 275 files changed, 17561 insertions(+), 9623 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:38 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:38 +0000
Subject: [pulseaudio] 04/19: New upstream release candidate
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIE-00057t-NM@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 948f1c2c1ea185103ddd9dd2792c655dcb5b02c4
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 09:39:48 2014 +1100

    New upstream release candidate
---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6e1e9dd..4d10dd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
+
 pulseaudio (5.0-13) unstable; urgency=medium
 
   * Replace raop channels patch with proper fix from upstream.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:39 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:39 +0000
Subject: [pulseaudio] 06/19: Refreshed debian/patches/gnu-kfreebsd.patch
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIF-00059L-OP@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit b21dbfc120fcb70eb9224eb98c91c94cef7bbfe2
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 10:05:12 2014 +1100

    Refreshed debian/patches/gnu-kfreebsd.patch
---
 debian/changelog                  |  1 +
 debian/patches/gnu-kfreebsd.patch | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cab46ae..b7427dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
     - util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch
     - util-Try-finding-out-application-name-using-dladdr.patch
     - zsh-completion-Fix-completion-for-default-sink-sourc.patch
+  * Refreshed debian/patches/gnu-kfreebsd.patch
 
  -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
 
diff --git a/debian/patches/gnu-kfreebsd.patch b/debian/patches/gnu-kfreebsd.patch
index 37c2cee..e606583 100644
--- a/debian/patches/gnu-kfreebsd.patch
+++ b/debian/patches/gnu-kfreebsd.patch
@@ -10,17 +10,6 @@ Date:   Sun Aug 3 17:37:03 2014 -0400
     Use the alternative when the functionality tested is for kernel
     features, and keep the __FreeBSD__ one when using freebsd libc headers.
 
---- a/src/daemon/caps.c
-+++ b/src/daemon/caps.c
-@@ -86,7 +86,7 @@ void pa_drop_caps(void) {
-     pa_assert_se(cap_clear(caps) == 0);
-     pa_assert_se(cap_set_proc(caps) == 0);
-     pa_assert_se(cap_free(caps) == 0);
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-     /* FreeBSD doesn't have this functionality, even though sys/capability.h is
-      * available. See https://bugs.freedesktop.org/show_bug.cgi?id=73967 */
- #else
 --- a/src/pulsecore/atomic.h
 +++ b/src/pulsecore/atomic.h
 @@ -180,7 +180,7 @@ static inline bool pa_atomic_ptr_cmpxchg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:39 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:39 +0000
Subject: [pulseaudio] 07/19: Remove all references to start-pulseaudio-kde,
 it was dropped upstream
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIF-00059f-RO@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit f24679eca36ef9822e49da113224eebc89c721e1
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 11:01:40 2014 +1100

    Remove all references to start-pulseaudio-kde, it was dropped upstream
---
 debian/changelog           | 1 +
 debian/pulseaudio.install  | 2 --
 debian/pulseaudio.manpages | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7427dc..e169c40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
     - util-Try-finding-out-application-name-using-dladdr.patch
     - zsh-completion-Fix-completion-for-default-sink-sourc.patch
   * Refreshed debian/patches/gnu-kfreebsd.patch
+  * Remove all references to start-pulseaudio-kde, it was dropped upstream
 
  -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
 
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 67a86b0..6414647 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -3,10 +3,8 @@ etc/pulse/system.pa
 etc/pulse/daemon.conf
 etc/dbus-1/system.d/pulseaudio-system.conf
 etc/xdg/autostart/pulseaudio.desktop
-etc/xdg/autostart/pulseaudio-kde.desktop
 usr/bin/pulseaudio
 usr/bin/start-pulseaudio-x11
-usr/bin/start-pulseaudio-kde
 usr/lib/pulse-*/modules/libalsa-util.so
 usr/lib/pulse-*/modules/libcli.so
 usr/lib/pulse-*/modules/libprotocol-cli.so
diff --git a/debian/pulseaudio.manpages b/debian/pulseaudio.manpages
index b5aa8a7..c767547 100644
--- a/debian/pulseaudio.manpages
+++ b/debian/pulseaudio.manpages
@@ -2,5 +2,4 @@ debian/tmp/usr/share/man/man1/pulseaudio.1
 debian/tmp/usr/share/man/man5/pulse-cli-syntax.5
 debian/tmp/usr/share/man/man5/pulse-client.conf.5
 debian/tmp/usr/share/man/man5/pulse-daemon.conf.5
-debian/tmp/usr/share/man/man1/start-pulseaudio-kde.1
 debian/tmp/usr/share/man/man1/start-pulseaudio-x11.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:39 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:39 +0000
Subject: [pulseaudio] 08/19: Pulse now ships zsh completions,
 so drop install code, and adjust pulseaudio.install to match
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIF-0005A5-Ua@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 7047863ab1ede9f52649cba2e31e0883be9fd97f
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 11:03:09 2014 +1100

    Pulse now ships zsh completions, so drop install code, and adjust pulseaudio.install to match
---
 debian/changelog          | 2 ++
 debian/pulseaudio.install | 2 +-
 debian/rules              | 5 -----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e169c40..28a414c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
     - zsh-completion-Fix-completion-for-default-sink-sourc.patch
   * Refreshed debian/patches/gnu-kfreebsd.patch
   * Remove all references to start-pulseaudio-kde, it was dropped upstream
+  * Pulse now ships zsh completions, so drop install code, and adjust
+    pulseaudio.install to match
 
  -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
 
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 6414647..d25f179 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -81,5 +81,5 @@ usr/share/locale
 usr/share/pulseaudio
 usr/lib/*/libpulsecore-*.so usr/lib
 usr/share/alsa
-usr/share/zsh/vendor-completions/*
+usr/share/zsh
 etc/bash_completion.d/*
diff --git a/debian/rules b/debian/rules
index 9e72ac7..c834d4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,11 +36,6 @@ common-install-arch::
 	install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks
 	cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py
 
-install/pulseaudio::
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/zsh/vendor-completions/
-	install -m 644 shell-completion/pulseaudio-zsh-completion.zsh \
-		$(CURDIR)/debian/tmp/usr/share/zsh/vendor-completions/_pulseaudio
-
 common-binary-post-install-arch:: list-missing
 
 clean::

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:40 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:40 +0000
Subject: [pulseaudio] 09/19: Update shlibs
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIG-0005AN-18@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 36bf7b02b6125e04a3992c4ffae177fe30710fc5
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 11:45:02 2014 +1100

    Update shlibs
---
 debian/changelog    | 1 +
 debian/shlibs.local | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28a414c..d89dc80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
   * Remove all references to start-pulseaudio-kde, it was dropped upstream
   * Pulse now ships zsh completions, so drop install code, and adjust
     pulseaudio.install to match
+  * Update shlibs
 
  -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
 
diff --git a/debian/shlibs.local b/debian/shlibs.local
index 70b123b..cd3f3e2 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1,2 +1,2 @@
-libpulsecommon 5.0 libpulse0 (= ${binary:Version})
-libpulsecore 5.0 pulseaudio (= ${binary:Version})
+libpulsecommon 5.99 libpulse0 (= ${binary:Version})
+libpulsecore 5.99 pulseaudio (= ${binary:Version})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:40 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:40 +0000
Subject: [pulseaudio] 10/19: Update symbols
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIG-0005Ah-3u@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 72002db9df6391f0e4fda0dfa78b1dcbb5d7e97d
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 12:35:40 2014 +1100

    Update symbols
---
 debian/changelog         |   1 +
 debian/libpulse0.symbols | 785 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 786 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d89dc80..d4465c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
   * Pulse now ships zsh completions, so drop install code, and adjust
     pulseaudio.install to match
   * Update shlibs
+  * Update symbols
 
  -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
 
diff --git a/debian/libpulse0.symbols b/debian/libpulse0.symbols
index 7c19521..5b3c829 100644
--- a/debian/libpulse0.symbols
+++ b/debian/libpulse0.symbols
@@ -155,6 +155,8 @@ libpulse.so.0 libpulse0 #MINVER#
  pa_cvolume_snprint at PULSE_0 0.99.1
  pa_cvolume_snprint_verbose at PULSE_0 5.0
  pa_cvolume_valid at PULSE_0 0.99.1
+ pa_direction_to_string at PULSE_0 5.99.1
+ pa_direction_valid at PULSE_0 5.99.1
  pa_encoding_to_string at PULSE_0 0.99.4
  pa_ext_device_manager_delete at PULSE_0 0.99.1
  pa_ext_device_manager_enable_role_device_priority_routing at PULSE_0 0.99.1
@@ -327,6 +329,7 @@ libpulse.so.0 libpulse0 #MINVER#
  pa_stream_update_timing_info at PULSE_0 0.99.1
  pa_stream_writable_size at PULSE_0 0.99.1
  pa_stream_write at PULSE_0 0.99.1
+ pa_stream_write_ext_free at PULSE_0 5.99.1
  pa_strerror at PULSE_0 0.99.1
  pa_sw_cvolume_divide at PULSE_0 0.99.1
  pa_sw_cvolume_divide_scalar at PULSE_0 0.99.1
@@ -373,3 +376,785 @@ libpulse.so.0 libpulse0 #MINVER#
  pa_xrealloc at PULSE_0 0.99.1
  pa_xstrdup at PULSE_0 0.99.1
  pa_xstrndup at PULSE_0 0.99.1
+libpulsecommon-5.99.so libpulse0 #MINVER#
+ pa_accept_cloexec at Base 5.99.1
+ pa_append_to_config_home_dir at Base 5.99.1
+ pa_append_to_home_dir at Base 5.99.1
+ pa_ascii_filter at Base 5.99.1
+ pa_ascii_valid at Base 5.99.1
+ pa_atod at Base 5.99.1
+ pa_atoi at Base 5.99.1
+ pa_atol at Base 5.99.1
+ pa_atou at Base 5.99.1
+ pa_aupdate_free at Base 5.99.1
+ pa_aupdate_new at Base 5.99.1
+ pa_aupdate_read_begin at Base 5.99.1
+ pa_aupdate_read_end at Base 5.99.1
+ pa_aupdate_write_begin at Base 5.99.1
+ pa_aupdate_write_end at Base 5.99.1
+ pa_aupdate_write_swap at Base 5.99.1
+ pa_authkey_load at Base 5.99.1
+ pa_authkey_save at Base 5.99.1
+ pa_autospawn_lock_acquire at Base 5.99.1
+ pa_autospawn_lock_done at Base 5.99.1
+ pa_autospawn_lock_init at Base 5.99.1
+ pa_autospawn_lock_release at Base 5.99.1
+ pa_bitset_equals at Base 5.99.1
+ pa_bitset_get at Base 5.99.1
+ pa_bitset_set at Base 5.99.1
+ pa_bytes_per_second at Base 5.99.1
+ pa_bytes_snprint at Base 5.99.1
+ pa_bytes_to_usec at Base 5.99.1
+ pa_bytes_to_usec_round_up at Base 5.99.1
+ pa_channel_map_can_balance at Base 5.99.1
+ pa_channel_map_can_fade at Base 5.99.1
+ pa_channel_map_compatible at Base 5.99.1
+ pa_channel_map_equal at Base 5.99.1
+ pa_channel_map_has_position at Base 5.99.1
+ pa_channel_map_init at Base 5.99.1
+ pa_channel_map_init_auto at Base 5.99.1
+ pa_channel_map_init_extend at Base 5.99.1
+ pa_channel_map_init_mono at Base 5.99.1
+ pa_channel_map_init_stereo at Base 5.99.1
+ pa_channel_map_mask at Base 5.99.1
+ pa_channel_map_parse at Base 5.99.1
+ pa_channel_map_snprint at Base 5.99.1
+ pa_channel_map_superset at Base 5.99.1
+ pa_channel_map_to_name at Base 5.99.1
+ pa_channel_map_to_pretty_name at Base 5.99.1
+ pa_channel_map_valid at Base 5.99.1
+ pa_channel_position_from_string at Base 5.99.1
+ pa_channel_position_to_pretty_string at Base 5.99.1
+ pa_channel_position_to_string at Base 5.99.1
+ pa_channels_valid at Base 5.99.1
+ pa_check_in_group at Base 5.99.1
+ pa_check_signal_is_blocked at Base 5.99.1
+ pa_client_conf_free at Base 5.99.1
+ pa_client_conf_from_x11 at Base 5.99.1
+ pa_client_conf_load at Base 5.99.1
+ pa_client_conf_load_cookie at Base 5.99.1
+ pa_client_conf_new at Base 5.99.1
+ pa_client_conf_set_cookie_file_from_application at Base 5.99.1
+ pa_close at Base 5.99.1
+ pa_close_all at Base 5.99.1
+ pa_close_allv at Base 5.99.1
+ pa_close_pipe at Base 5.99.1
+ pa_cond_free at Base 5.99.1
+ pa_cond_new at Base 5.99.1
+ pa_cond_signal at Base 5.99.1
+ pa_cond_wait at Base 5.99.1
+ pa_config_parse at Base 5.99.1
+ pa_config_parse_bool at Base 5.99.1
+ pa_config_parse_int at Base 5.99.1
+ pa_config_parse_not_bool at Base 5.99.1
+ pa_config_parse_size at Base 5.99.1
+ pa_config_parse_string at Base 5.99.1
+ pa_config_parse_unsigned at Base 5.99.1
+ pa_convert_size at Base 5.99.1
+ pa_cstrerror at Base 5.99.1
+ pa_cvolume_avg at Base 5.99.1
+ pa_cvolume_avg_mask at Base 5.99.1
+ pa_cvolume_channels_equal_to at Base 5.99.1
+ pa_cvolume_compatible at Base 5.99.1
+ pa_cvolume_compatible_with_channel_map at Base 5.99.1
+ pa_cvolume_dec at Base 5.99.1
+ pa_cvolume_equal at Base 5.99.1
+ pa_cvolume_get_balance at Base 5.99.1
+ pa_cvolume_get_fade at Base 5.99.1
+ pa_cvolume_get_position at Base 5.99.1
+ pa_cvolume_inc at Base 5.99.1
+ pa_cvolume_inc_clamp at Base 5.99.1
+ pa_cvolume_init at Base 5.99.1
+ pa_cvolume_max at Base 5.99.1
+ pa_cvolume_max_mask at Base 5.99.1
+ pa_cvolume_merge at Base 5.99.1
+ pa_cvolume_min at Base 5.99.1
+ pa_cvolume_min_mask at Base 5.99.1
+ pa_cvolume_remap at Base 5.99.1
+ pa_cvolume_scale at Base 5.99.1
+ pa_cvolume_scale_mask at Base 5.99.1
+ pa_cvolume_set at Base 5.99.1
+ pa_cvolume_set_balance at Base 5.99.1
+ pa_cvolume_set_fade at Base 5.99.1
+ pa_cvolume_set_position at Base 5.99.1
+ pa_cvolume_snprint at Base 5.99.1
+ pa_cvolume_snprint_verbose at Base 5.99.1
+ pa_cvolume_valid at Base 5.99.1
+ pa_dbus_add_matches at Base 5.99.1
+ pa_dbus_append_basic_array at Base 5.99.1
+ pa_dbus_append_basic_array_variant at Base 5.99.1
+ pa_dbus_append_basic_array_variant_dict_entry at Base 5.99.1
+ pa_dbus_append_basic_variant at Base 5.99.1
+ pa_dbus_append_basic_variant_dict_entry at Base 5.99.1
+ pa_dbus_append_proplist at Base 5.99.1
+ pa_dbus_append_proplist_variant at Base 5.99.1
+ pa_dbus_append_proplist_variant_dict_entry at Base 5.99.1
+ pa_dbus_free_pending_list at Base 5.99.1
+ pa_dbus_get_error_message at Base 5.99.1
+ pa_dbus_get_proplist_arg at Base 5.99.1
+ pa_dbus_pending_free at Base 5.99.1
+ pa_dbus_pending_new at Base 5.99.1
+ pa_dbus_remove_matches at Base 5.99.1
+ pa_dbus_send_basic_array_variant_reply at Base 5.99.1
+ pa_dbus_send_basic_value_reply at Base 5.99.1
+ pa_dbus_send_basic_variant_reply at Base 5.99.1
+ pa_dbus_send_empty_reply at Base 5.99.1
+ pa_dbus_send_error at Base 5.99.1
+ pa_dbus_send_proplist_variant_reply at Base 5.99.1
+ pa_dbus_sync_pending_list at Base 5.99.1
+ pa_dbus_wrap_connection_free at Base 5.99.1
+ pa_dbus_wrap_connection_get at Base 5.99.1
+ pa_dbus_wrap_connection_new at Base 5.99.1
+ pa_dbus_wrap_connection_new_from_existing at Base 5.99.1
+ pa_deinterleave at Base 5.99.1
+ pa_detect_fork at Base 5.99.1
+ pa_disable_sigpipe at Base 5.99.1
+ pa_dynarray_append at Base 5.99.1
+ pa_dynarray_free at Base 5.99.1
+ pa_dynarray_get at Base 5.99.1
+ pa_dynarray_new at Base 5.99.1
+ pa_dynarray_size at Base 5.99.1
+ pa_dynarray_steal_last at Base 5.99.1
+ pa_encoding_from_string at Base 5.99.1
+ pa_encoding_to_string at Base 5.99.1
+ pa_endswith at Base 5.99.1
+ pa_escape at Base 5.99.1
+ pa_fdsem_after_poll at Base 5.99.1
+ pa_fdsem_before_poll at Base 5.99.1
+ pa_fdsem_free at Base 5.99.1
+ pa_fdsem_get at Base 5.99.1
+ pa_fdsem_new at Base 5.99.1
+ pa_fdsem_new_shm at Base 5.99.1
+ pa_fdsem_open_shm at Base 5.99.1
+ pa_fdsem_post at Base 5.99.1
+ pa_fdsem_try at Base 5.99.1
+ pa_fdsem_wait at Base 5.99.1
+ pa_find_config_file at Base 5.99.1
+ pa_flist_free at Base 5.99.1
+ pa_flist_new at Base 5.99.1
+ pa_flist_new_with_name at Base 5.99.1
+ pa_flist_pop at Base 5.99.1
+ pa_flist_push at Base 5.99.1
+ pa_fopen_cloexec at Base 5.99.1
+ pa_format_info_copy at Base 5.99.1
+ pa_format_info_free at Base 5.99.1
+ pa_format_info_free_string_array at Base 5.99.1
+ pa_format_info_from_sample_spec2 at Base 5.99.1
+ pa_format_info_from_sample_spec at Base 5.99.1
+ pa_format_info_from_string at Base 5.99.1
+ pa_format_info_get_channel_map at Base 5.99.1
+ pa_format_info_get_channels at Base 5.99.1
+ pa_format_info_get_prop_int at Base 5.99.1
+ pa_format_info_get_prop_int_array at Base 5.99.1
+ pa_format_info_get_prop_int_range at Base 5.99.1
+ pa_format_info_get_prop_string at Base 5.99.1
+ pa_format_info_get_prop_string_array at Base 5.99.1
+ pa_format_info_get_prop_type at Base 5.99.1
+ pa_format_info_get_rate at Base 5.99.1
+ pa_format_info_get_sample_format at Base 5.99.1
+ pa_format_info_is_compatible at Base 5.99.1
+ pa_format_info_is_pcm at Base 5.99.1
+ pa_format_info_new at Base 5.99.1
+ pa_format_info_set_channel_map at Base 5.99.1
+ pa_format_info_set_channels at Base 5.99.1
+ pa_format_info_set_prop_int at Base 5.99.1
+ pa_format_info_set_prop_int_array at Base 5.99.1
+ pa_format_info_set_prop_int_range at Base 5.99.1
+ pa_format_info_set_prop_string at Base 5.99.1
+ pa_format_info_set_prop_string_array at Base 5.99.1
+ pa_format_info_set_rate at Base 5.99.1
+ pa_format_info_set_sample_format at Base 5.99.1
+ pa_format_info_snprint at Base 5.99.1
+ pa_format_info_to_sample_spec2 at Base 5.99.1
+ pa_format_info_to_sample_spec at Base 5.99.1
+ pa_format_info_to_sample_spec_fake at Base 5.99.1
+ pa_format_info_valid at Base 5.99.1
+ pa_frame_align at Base 5.99.1
+ pa_frame_aligned at Base 5.99.1
+ pa_frame_size at Base 5.99.1
+ pa_gcd at Base 5.99.1
+ pa_get_binary_name at Base 5.99.1
+ pa_get_binary_name_malloc at Base 5.99.1
+ pa_get_config_home_dir at Base 5.99.1
+ pa_get_fqdn at Base 5.99.1
+ pa_get_gid_of_group at Base 5.99.1
+ pa_get_home_dir at Base 5.99.1
+ pa_get_home_dir_malloc at Base 5.99.1
+ pa_get_host_name at Base 5.99.1
+ pa_get_host_name_malloc at Base 5.99.1
+ pa_get_runtime_dir at Base 5.99.1
+ pa_get_state_dir at Base 5.99.1
+ pa_get_temp_dir at Base 5.99.1
+ pa_get_user_name at Base 5.99.1
+ pa_get_user_name_malloc at Base 5.99.1
+ pa_get_volume_func at Base 5.99.1
+ pa_getcwd at Base 5.99.1
+ pa_getgrgid_free at Base 5.99.1
+ pa_getgrgid_malloc at Base 5.99.1
+ pa_getgrnam_free at Base 5.99.1
+ pa_getgrnam_malloc at Base 5.99.1
+ pa_getpwnam_free at Base 5.99.1
+ pa_getpwnam_malloc at Base 5.99.1
+ pa_getpwuid_free at Base 5.99.1
+ pa_getpwuid_malloc at Base 5.99.1
+ pa_gettimeofday at Base 5.99.1
+ pa_hashmap_first at Base 5.99.1
+ pa_hashmap_free at Base 5.99.1
+ pa_hashmap_get at Base 5.99.1
+ pa_hashmap_isempty at Base 5.99.1
+ pa_hashmap_iterate at Base 5.99.1
+ pa_hashmap_iterate_backwards at Base 5.99.1
+ pa_hashmap_last at Base 5.99.1
+ pa_hashmap_new at Base 5.99.1
+ pa_hashmap_new_full at Base 5.99.1
+ pa_hashmap_put at Base 5.99.1
+ pa_hashmap_remove at Base 5.99.1
+ pa_hashmap_remove_all at Base 5.99.1
+ pa_hashmap_remove_and_free at Base 5.99.1
+ pa_hashmap_size at Base 5.99.1
+ pa_hashmap_steal_first at Base 5.99.1
+ pa_hexstr at Base 5.99.1
+ pa_idxset_copy at Base 5.99.1
+ pa_idxset_first at Base 5.99.1
+ pa_idxset_free at Base 5.99.1
+ pa_idxset_get_by_data at Base 5.99.1
+ pa_idxset_get_by_index at Base 5.99.1
+ pa_idxset_isempty at Base 5.99.1
+ pa_idxset_iterate at Base 5.99.1
+ pa_idxset_new at Base 5.99.1
+ pa_idxset_next at Base 5.99.1
+ pa_idxset_put at Base 5.99.1
+ pa_idxset_remove_all at Base 5.99.1
+ pa_idxset_remove_by_data at Base 5.99.1
+ pa_idxset_remove_by_index at Base 5.99.1
+ pa_idxset_rrobin at Base 5.99.1
+ pa_idxset_size at Base 5.99.1
+ pa_idxset_steal_first at Base 5.99.1
+ pa_idxset_string_compare_func at Base 5.99.1
+ pa_idxset_string_hash_func at Base 5.99.1
+ pa_idxset_trivial_compare_func at Base 5.99.1
+ pa_idxset_trivial_hash_func at Base 5.99.1
+ pa_in_system_mode at Base 5.99.1
+ pa_init_i18n at Base 5.99.1
+ pa_init_proplist at Base 5.99.1
+ pa_interleave at Base 5.99.1
+ pa_iochannel_creds_enable at Base 5.99.1
+ pa_iochannel_creds_supported at Base 5.99.1
+ pa_iochannel_free at Base 5.99.1
+ pa_iochannel_get_mainloop_api at Base 5.99.1
+ pa_iochannel_get_recv_fd at Base 5.99.1
+ pa_iochannel_get_send_fd at Base 5.99.1
+ pa_iochannel_is_hungup at Base 5.99.1
+ pa_iochannel_is_readable at Base 5.99.1
+ pa_iochannel_is_writable at Base 5.99.1
+ pa_iochannel_new at Base 5.99.1
+ pa_iochannel_read at Base 5.99.1
+ pa_iochannel_read_with_ancil_data at Base 5.99.1
+ pa_iochannel_set_callback at Base 5.99.1
+ pa_iochannel_set_noclose at Base 5.99.1
+ pa_iochannel_socket_is_local at Base 5.99.1
+ pa_iochannel_socket_peer_to_string at Base 5.99.1
+ pa_iochannel_socket_set_rcvbuf at Base 5.99.1
+ pa_iochannel_socket_set_sndbuf at Base 5.99.1
+ pa_iochannel_write at Base 5.99.1
+ pa_iochannel_write_with_creds at Base 5.99.1
+ pa_iochannel_write_with_fds at Base 5.99.1
+ pa_ioline_close at Base 5.99.1
+ pa_ioline_defer_close at Base 5.99.1
+ pa_ioline_detach_iochannel at Base 5.99.1
+ pa_ioline_is_drained at Base 5.99.1
+ pa_ioline_new at Base 5.99.1
+ pa_ioline_printf at Base 5.99.1
+ pa_ioline_puts at Base 5.99.1
+ pa_ioline_ref at Base 5.99.1
+ pa_ioline_set_callback at Base 5.99.1
+ pa_ioline_set_drain_callback at Base 5.99.1
+ pa_ioline_unref at Base 5.99.1
+ pa_ip_acl_check at Base 5.99.1
+ pa_ip_acl_free at Base 5.99.1
+ pa_ip_acl_new at Base 5.99.1
+ pa_is_fd_nonblock at Base 5.99.1
+ pa_is_ip_address at Base 5.99.1
+ pa_is_path_absolute at Base 5.99.1
+ pa_locale_to_utf8 at Base 5.99.1
+ pa_lock_fd at Base 5.99.1
+ pa_lock_lockfile at Base 5.99.1
+ pa_log_level at Base 5.99.1
+ pa_log_level_meta at Base 5.99.1
+ pa_log_levelv at Base 5.99.1
+ pa_log_levelv_meta at Base 5.99.1
+ pa_log_parse_target at Base 5.99.1
+ pa_log_ratelimit at Base 5.99.1
+ pa_log_set_flags at Base 5.99.1
+ pa_log_set_ident at Base 5.99.1
+ pa_log_set_level at Base 5.99.1
+ pa_log_set_show_backtrace at Base 5.99.1
+ pa_log_set_skip_backtrace at Base 5.99.1
+ pa_log_set_target at Base 5.99.1
+ pa_log_target_free at Base 5.99.1
+ pa_log_target_new at Base 5.99.1
+ pa_log_target_to_string at Base 5.99.1
+ pa_loop_read at Base 5.99.1
+ pa_loop_write at Base 5.99.1
+ pa_machine_id at Base 5.99.1
+ pa_make_fd_block at Base 5.99.1
+ pa_make_fd_cloexec at Base 5.99.1
+ pa_make_fd_nonblock at Base 5.99.1
+ pa_make_path_absolute at Base 5.99.1
+ pa_make_realtime at Base 5.99.1
+ pa_make_secure_dir at Base 5.99.1
+ pa_make_secure_parent_dir at Base 5.99.1
+ pa_make_socket_low_delay at Base 5.99.1
+ pa_make_tcp_socket_low_delay at Base 5.99.1
+ pa_make_udp_socket_low_delay at Base 5.99.1
+ pa_match at Base 5.99.1
+ pa_maybe_prefix_path at Base 5.99.1
+ pa_mcalign_csize at Base 5.99.1
+ pa_mcalign_flush at Base 5.99.1
+ pa_mcalign_free at Base 5.99.1
+ pa_mcalign_new at Base 5.99.1
+ pa_mcalign_pop at Base 5.99.1
+ pa_mcalign_push at Base 5.99.1
+ pa_memblock_acquire at Base 5.99.1
+ pa_memblock_acquire_chunk at Base 5.99.1
+ pa_memblock_get_length at Base 5.99.1
+ pa_memblock_get_pool at Base 5.99.1
+ pa_memblock_is_ours at Base 5.99.1
+ pa_memblock_is_read_only at Base 5.99.1
+ pa_memblock_is_silence at Base 5.99.1
+ pa_memblock_new at Base 5.99.1
+ pa_memblock_new_fixed at Base 5.99.1
+ pa_memblock_new_pool at Base 5.99.1
+ pa_memblock_new_user at Base 5.99.1
+ pa_memblock_ref at Base 5.99.1
+ pa_memblock_ref_is_one at Base 5.99.1
+ pa_memblock_release at Base 5.99.1
+ pa_memblock_set_is_silence at Base 5.99.1
+ pa_memblock_unref at Base 5.99.1
+ pa_memblock_unref_fixed at Base 5.99.1
+ pa_memblock_will_need at Base 5.99.1
+ pa_memblockq_apply_attr at Base 5.99.1
+ pa_memblockq_drop at Base 5.99.1
+ pa_memblockq_flush_read at Base 5.99.1
+ pa_memblockq_flush_write at Base 5.99.1
+ pa_memblockq_free at Base 5.99.1
+ pa_memblockq_get_attr at Base 5.99.1
+ pa_memblockq_get_base at Base 5.99.1
+ pa_memblockq_get_length at Base 5.99.1
+ pa_memblockq_get_maxlength at Base 5.99.1
+ pa_memblockq_get_maxrewind at Base 5.99.1
+ pa_memblockq_get_minreq at Base 5.99.1
+ pa_memblockq_get_nblocks at Base 5.99.1
+ pa_memblockq_get_prebuf at Base 5.99.1
+ pa_memblockq_get_read_index at Base 5.99.1
+ pa_memblockq_get_tlength at Base 5.99.1
+ pa_memblockq_get_write_index at Base 5.99.1
+ pa_memblockq_is_empty at Base 5.99.1
+ pa_memblockq_is_readable at Base 5.99.1
+ pa_memblockq_missing at Base 5.99.1
+ pa_memblockq_new at Base 5.99.1
+ pa_memblockq_peek at Base 5.99.1
+ pa_memblockq_peek_fixed_size at Base 5.99.1
+ pa_memblockq_pop_missing at Base 5.99.1
+ pa_memblockq_prebuf_active at Base 5.99.1
+ pa_memblockq_prebuf_disable at Base 5.99.1
+ pa_memblockq_prebuf_force at Base 5.99.1
+ pa_memblockq_push at Base 5.99.1
+ pa_memblockq_push_align at Base 5.99.1
+ pa_memblockq_rewind at Base 5.99.1
+ pa_memblockq_seek at Base 5.99.1
+ pa_memblockq_set_maxlength at Base 5.99.1
+ pa_memblockq_set_maxrewind at Base 5.99.1
+ pa_memblockq_set_minreq at Base 5.99.1
+ pa_memblockq_set_prebuf at Base 5.99.1
+ pa_memblockq_set_silence at Base 5.99.1
+ pa_memblockq_set_tlength at Base 5.99.1
+ pa_memblockq_silence at Base 5.99.1
+ pa_memblockq_splice at Base 5.99.1
+ pa_memblockq_willneed at Base 5.99.1
+ pa_memchunk_dump_to_file at Base 5.99.1
+ pa_memchunk_isset at Base 5.99.1
+ pa_memchunk_make_writable at Base 5.99.1
+ pa_memchunk_memcpy at Base 5.99.1
+ pa_memchunk_reset at Base 5.99.1
+ pa_memchunk_sine at Base 5.99.1
+ pa_memchunk_will_need at Base 5.99.1
+ pa_memexport_free at Base 5.99.1
+ pa_memexport_new at Base 5.99.1
+ pa_memexport_process_release at Base 5.99.1
+ pa_memexport_put at Base 5.99.1
+ pa_memimport_free at Base 5.99.1
+ pa_memimport_get at Base 5.99.1
+ pa_memimport_new at Base 5.99.1
+ pa_memimport_process_revoke at Base 5.99.1
+ pa_mempool_block_size_max at Base 5.99.1
+ pa_mempool_free at Base 5.99.1
+ pa_mempool_get_shm_id at Base 5.99.1
+ pa_mempool_get_stat at Base 5.99.1
+ pa_mempool_is_remote_writable at Base 5.99.1
+ pa_mempool_is_shared at Base 5.99.1
+ pa_mempool_new at Base 5.99.1
+ pa_mempool_set_is_remote_writable at Base 5.99.1
+ pa_mempool_vacuum at Base 5.99.1
+ pa_memtrap_add at Base 5.99.1
+ pa_memtrap_install at Base 5.99.1
+ pa_memtrap_is_good at Base 5.99.1
+ pa_memtrap_remove at Base 5.99.1
+ pa_memtrap_update at Base 5.99.1
+ pa_msleep at Base 5.99.1
+ pa_mutex_free at Base 5.99.1
+ pa_mutex_lock at Base 5.99.1
+ pa_mutex_new at Base 5.99.1
+ pa_mutex_try_lock at Base 5.99.1
+ pa_mutex_unlock at Base 5.99.1
+ pa_ncpus at Base 5.99.1
+ pa_nullify_stdfds at Base 5.99.1
+ pa_once_begin at Base 5.99.1
+ pa_once_end at Base 5.99.1
+ pa_open_cloexec at Base 5.99.1
+ pa_open_config_file at Base 5.99.1
+ pa_own_uid_in_group at Base 5.99.1
+ pa_packet_new at Base 5.99.1
+ pa_packet_new_dynamic at Base 5.99.1
+ pa_packet_ref at Base 5.99.1
+ pa_packet_unref at Base 5.99.1
+ pa_parent_dir at Base 5.99.1
+ pa_parse_address at Base 5.99.1
+ pa_parse_boolean at Base 5.99.1
+ pa_parse_sample_format at Base 5.99.1
+ pa_parse_volume at Base 5.99.1
+ pa_parsehex at Base 5.99.1
+ pa_path_get_filename at Base 5.99.1
+ pa_pdispatch_creds at Base 5.99.1
+ pa_pdispatch_fds at Base 5.99.1
+ pa_pdispatch_is_pending at Base 5.99.1
+ pa_pdispatch_new at Base 5.99.1
+ pa_pdispatch_ref at Base 5.99.1
+ pa_pdispatch_register_reply at Base 5.99.1
+ pa_pdispatch_run at Base 5.99.1
+ pa_pdispatch_set_drain_callback at Base 5.99.1
+ pa_pdispatch_unref at Base 5.99.1
+ pa_pdispatch_unregister_reply at Base 5.99.1
+ pa_pid_file_check_running at Base 5.99.1
+ pa_pid_file_create at Base 5.99.1
+ pa_pid_file_kill at Base 5.99.1
+ pa_pid_file_remove at Base 5.99.1
+ pa_pipe_buf at Base 5.99.1
+ pa_pipe_cloexec at Base 5.99.1
+ pa_proplist_clear at Base 5.99.1
+ pa_proplist_contains at Base 5.99.1
+ pa_proplist_copy at Base 5.99.1
+ pa_proplist_equal at Base 5.99.1
+ pa_proplist_free at Base 5.99.1
+ pa_proplist_from_string at Base 5.99.1
+ pa_proplist_get at Base 5.99.1
+ pa_proplist_get_stream_group at Base 5.99.1
+ pa_proplist_gets at Base 5.99.1
+ pa_proplist_isempty at Base 5.99.1
+ pa_proplist_iterate at Base 5.99.1
+ pa_proplist_key_valid at Base 5.99.1
+ pa_proplist_new at Base 5.99.1
+ pa_proplist_set at Base 5.99.1
+ pa_proplist_setf at Base 5.99.1
+ pa_proplist_setp at Base 5.99.1
+ pa_proplist_sets at Base 5.99.1
+ pa_proplist_size at Base 5.99.1
+ pa_proplist_to_string at Base 5.99.1
+ pa_proplist_to_string_sep at Base 5.99.1
+ pa_proplist_unset at Base 5.99.1
+ pa_proplist_unset_many at Base 5.99.1
+ pa_proplist_update at Base 5.99.1
+ pa_pstream_enable_shm at Base 5.99.1
+ pa_pstream_get_shm at Base 5.99.1
+ pa_pstream_is_pending at Base 5.99.1
+ pa_pstream_new at Base 5.99.1
+ pa_pstream_ref at Base 5.99.1
+ pa_pstream_send_error at Base 5.99.1
+ pa_pstream_send_memblock at Base 5.99.1
+ pa_pstream_send_packet at Base 5.99.1
+ pa_pstream_send_release at Base 5.99.1
+ pa_pstream_send_revoke at Base 5.99.1
+ pa_pstream_send_simple_ack at Base 5.99.1
+ pa_pstream_send_tagstruct_with_creds at Base 5.99.1
+ pa_pstream_send_tagstruct_with_fds at Base 5.99.1
+ pa_pstream_set_die_callback at Base 5.99.1
+ pa_pstream_set_drain_callback at Base 5.99.1
+ pa_pstream_set_receive_memblock_callback at Base 5.99.1
+ pa_pstream_set_receive_packet_callback at Base 5.99.1
+ pa_pstream_set_release_callback at Base 5.99.1
+ pa_pstream_set_revoke_callback at Base 5.99.1
+ pa_pstream_set_srbchannel at Base 5.99.1
+ pa_pstream_unlink at Base 5.99.1
+ pa_pstream_unref at Base 5.99.1
+ pa_queue_free at Base 5.99.1
+ pa_queue_isempty at Base 5.99.1
+ pa_queue_new at Base 5.99.1
+ pa_queue_pop at Base 5.99.1
+ pa_queue_push at Base 5.99.1
+ pa_raise_priority at Base 5.99.1
+ pa_random at Base 5.99.1
+ pa_random_seed at Base 5.99.1
+ pa_ratelimit_test at Base 5.99.1
+ pa_read at Base 5.99.1
+ pa_read_line_from_file at Base 5.99.1
+ pa_readlink at Base 5.99.1
+ pa_realpath at Base 5.99.1
+ pa_reduce at Base 5.99.1
+ pa_replace at Base 5.99.1
+ pa_reset_personality at Base 5.99.1
+ pa_reset_priority at Base 5.99.1
+ pa_reset_sigs at Base 5.99.1
+ pa_reset_sigsv at Base 5.99.1
+ pa_rtclock_age at Base 5.99.1
+ pa_rtclock_from_wallclock at Base 5.99.1
+ pa_rtclock_get at Base 5.99.1
+ pa_rtclock_hrtimer at Base 5.99.1
+ pa_rtclock_hrtimer_enable at Base 5.99.1
+ pa_rtclock_now at Base 5.99.1
+ pa_run_from_build_tree at Base 5.99.1
+ pa_run_once at Base 5.99.1
+ pa_running_in_vm at Base 5.99.1
+ pa_runtime_path at Base 5.99.1
+ pa_sample_clamp at Base 5.99.1
+ pa_sample_format_is_be at Base 5.99.1
+ pa_sample_format_is_le at Base 5.99.1
+ pa_sample_format_to_string at Base 5.99.1
+ pa_sample_format_valid at Base 5.99.1
+ pa_sample_rate_valid at Base 5.99.1
+ pa_sample_size at Base 5.99.1
+ pa_sample_size_of_format at Base 5.99.1
+ pa_sample_spec_equal at Base 5.99.1
+ pa_sample_spec_init at Base 5.99.1
+ pa_sample_spec_snprint at Base 5.99.1
+ pa_sample_spec_valid at Base 5.99.1
+ pa_semaphore_free at Base 5.99.1
+ pa_semaphore_new at Base 5.99.1
+ pa_semaphore_post at Base 5.99.1
+ pa_semaphore_wait at Base 5.99.1
+ pa_session_id at Base 5.99.1
+ pa_set_env at Base 5.99.1
+ pa_set_env_and_record at Base 5.99.1
+ pa_set_volume_func at Base 5.99.1
+ pa_shm_attach at Base 5.99.1
+ pa_shm_cleanup at Base 5.99.1
+ pa_shm_create_rw at Base 5.99.1
+ pa_shm_free at Base 5.99.1
+ pa_shm_punch at Base 5.99.1
+ pa_sig2str at Base 5.99.1
+ pa_silence_cache_done at Base 5.99.1
+ pa_silence_cache_init at Base 5.99.1
+ pa_silence_memblock at Base 5.99.1
+ pa_silence_memchunk at Base 5.99.1
+ pa_silence_memchunk_get at Base 5.99.1
+ pa_silence_memory at Base 5.99.1
+ pa_smoother_fix_now at Base 5.99.1
+ pa_smoother_free at Base 5.99.1
+ pa_smoother_get at Base 5.99.1
+ pa_smoother_new at Base 5.99.1
+ pa_smoother_pause at Base 5.99.1
+ pa_smoother_put at Base 5.99.1
+ pa_smoother_reset at Base 5.99.1
+ pa_smoother_resume at Base 5.99.1
+ pa_smoother_set_time_offset at Base 5.99.1
+ pa_smoother_translate at Base 5.99.1
+ pa_sndfile_dump_formats at Base 5.99.1
+ pa_sndfile_format_from_string at Base 5.99.1
+ pa_sndfile_init_proplist at Base 5.99.1
+ pa_sndfile_read_channel_map at Base 5.99.1
+ pa_sndfile_read_sample_spec at Base 5.99.1
+ pa_sndfile_readf_function at Base 5.99.1
+ pa_sndfile_write_channel_map at Base 5.99.1
+ pa_sndfile_write_sample_spec at Base 5.99.1
+ pa_sndfile_writef_function at Base 5.99.1
+ pa_snprintf at Base 5.99.1
+ pa_socket_address_is_local at Base 5.99.1
+ pa_socket_client_is_local at Base 5.99.1
+ pa_socket_client_new_ipv4 at Base 5.99.1
+ pa_socket_client_new_ipv6 at Base 5.99.1
+ pa_socket_client_new_sockaddr at Base 5.99.1
+ pa_socket_client_new_string at Base 5.99.1
+ pa_socket_client_new_unix at Base 5.99.1
+ pa_socket_client_ref at Base 5.99.1
+ pa_socket_client_set_callback at Base 5.99.1
+ pa_socket_client_unref at Base 5.99.1
+ pa_socket_cloexec at Base 5.99.1
+ pa_socket_is_local at Base 5.99.1
+ pa_socket_peer_to_string at Base 5.99.1
+ pa_socket_server_get_address at Base 5.99.1
+ pa_socket_server_new at Base 5.99.1
+ pa_socket_server_new_ipv4 at Base 5.99.1
+ pa_socket_server_new_ipv4_any at Base 5.99.1
+ pa_socket_server_new_ipv4_loopback at Base 5.99.1
+ pa_socket_server_new_ipv4_string at Base 5.99.1
+ pa_socket_server_new_ipv6 at Base 5.99.1
+ pa_socket_server_new_ipv6_any at Base 5.99.1
+ pa_socket_server_new_ipv6_loopback at Base 5.99.1
+ pa_socket_server_new_ipv6_string at Base 5.99.1
+ pa_socket_server_new_unix at Base 5.99.1
+ pa_socket_server_ref at Base 5.99.1
+ pa_socket_server_set_callback at Base 5.99.1
+ pa_socket_server_unref at Base 5.99.1
+ pa_socket_set_rcvbuf at Base 5.99.1
+ pa_socket_set_sndbuf at Base 5.99.1
+ pa_split at Base 5.99.1
+ pa_split_in_place at Base 5.99.1
+ pa_split_spaces at Base 5.99.1
+ pa_split_spaces_strv at Base 5.99.1
+ pa_sprintf_malloc at Base 5.99.1
+ pa_srbchannel_export at Base 5.99.1
+ pa_srbchannel_free at Base 5.99.1
+ pa_srbchannel_new at Base 5.99.1
+ pa_srbchannel_new_from_template at Base 5.99.1
+ pa_srbchannel_read at Base 5.99.1
+ pa_srbchannel_set_callback at Base 5.99.1
+ pa_srbchannel_write at Base 5.99.1
+ pa_startswith at Base 5.99.1
+ pa_state_path at Base 5.99.1
+ pa_static_mutex_get at Base 5.99.1
+ pa_static_semaphore_get at Base 5.99.1
+ pa_str_in_list_spaces at Base 5.99.1
+ pa_strbuf_free at Base 5.99.1
+ pa_strbuf_isempty at Base 5.99.1
+ pa_strbuf_new at Base 5.99.1
+ pa_strbuf_printf at Base 5.99.1
+ pa_strbuf_putc at Base 5.99.1
+ pa_strbuf_puts at Base 5.99.1
+ pa_strbuf_putsn at Base 5.99.1
+ pa_strbuf_tostring at Base 5.99.1
+ pa_strbuf_tostring_free at Base 5.99.1
+ pa_strip at Base 5.99.1
+ pa_strip_nl at Base 5.99.1
+ pa_strlcpy at Base 5.99.1
+ pa_strlist_data at Base 5.99.1
+ pa_strlist_free at Base 5.99.1
+ pa_strlist_next at Base 5.99.1
+ pa_strlist_parse at Base 5.99.1
+ pa_strlist_pop at Base 5.99.1
+ pa_strlist_prepend at Base 5.99.1
+ pa_strlist_remove at Base 5.99.1
+ pa_strlist_reverse at Base 5.99.1
+ pa_strlist_tostring at Base 5.99.1
+ pa_sw_cvolume_divide at Base 5.99.1
+ pa_sw_cvolume_divide_scalar at Base 5.99.1
+ pa_sw_cvolume_multiply at Base 5.99.1
+ pa_sw_cvolume_multiply_scalar at Base 5.99.1
+ pa_sw_cvolume_snprint_dB at Base 5.99.1
+ pa_sw_volume_divide at Base 5.99.1
+ pa_sw_volume_from_dB at Base 5.99.1
+ pa_sw_volume_from_linear at Base 5.99.1
+ pa_sw_volume_multiply at Base 5.99.1
+ pa_sw_volume_snprint_dB at Base 5.99.1
+ pa_sw_volume_to_dB at Base 5.99.1
+ pa_sw_volume_to_linear at Base 5.99.1
+ pa_tagstruct_data at Base 5.99.1
+ pa_tagstruct_eof at Base 5.99.1
+ pa_tagstruct_free at Base 5.99.1
+ pa_tagstruct_free_data at Base 5.99.1
+ pa_tagstruct_get at Base 5.99.1
+ pa_tagstruct_get_arbitrary at Base 5.99.1
+ pa_tagstruct_get_boolean at Base 5.99.1
+ pa_tagstruct_get_channel_map at Base 5.99.1
+ pa_tagstruct_get_cvolume at Base 5.99.1
+ pa_tagstruct_get_format_info at Base 5.99.1
+ pa_tagstruct_get_proplist at Base 5.99.1
+ pa_tagstruct_get_sample_spec at Base 5.99.1
+ pa_tagstruct_get_timeval at Base 5.99.1
+ pa_tagstruct_get_usec at Base 5.99.1
+ pa_tagstruct_get_volume at Base 5.99.1
+ pa_tagstruct_gets64 at Base 5.99.1
+ pa_tagstruct_gets at Base 5.99.1
+ pa_tagstruct_getu32 at Base 5.99.1
+ pa_tagstruct_getu64 at Base 5.99.1
+ pa_tagstruct_getu8 at Base 5.99.1
+ pa_tagstruct_new at Base 5.99.1
+ pa_tagstruct_put at Base 5.99.1
+ pa_tagstruct_put_arbitrary at Base 5.99.1
+ pa_tagstruct_put_boolean at Base 5.99.1
+ pa_tagstruct_put_channel_map at Base 5.99.1
+ pa_tagstruct_put_cvolume at Base 5.99.1
+ pa_tagstruct_put_format_info at Base 5.99.1
+ pa_tagstruct_put_proplist at Base 5.99.1
+ pa_tagstruct_put_sample_spec at Base 5.99.1
+ pa_tagstruct_put_timeval at Base 5.99.1
+ pa_tagstruct_put_usec at Base 5.99.1
+ pa_tagstruct_put_volume at Base 5.99.1
+ pa_tagstruct_puts64 at Base 5.99.1
+ pa_tagstruct_puts at Base 5.99.1
+ pa_tagstruct_putu32 at Base 5.99.1
+ pa_tagstruct_putu64 at Base 5.99.1
+ pa_tagstruct_putu8 at Base 5.99.1
+ pa_thread_free at Base 5.99.1
+ pa_thread_free_nojoin at Base 5.99.1
+ pa_thread_get_data at Base 5.99.1
+ pa_thread_get_name at Base 5.99.1
+ pa_thread_is_running at Base 5.99.1
+ pa_thread_join at Base 5.99.1
+ pa_thread_new at Base 5.99.1
+ pa_thread_self at Base 5.99.1
+ pa_thread_set_data at Base 5.99.1
+ pa_thread_set_name at Base 5.99.1
+ pa_thread_yield at Base 5.99.1
+ pa_timespec_load at Base 5.99.1
+ pa_timespec_store at Base 5.99.1
+ pa_timeval_add at Base 5.99.1
+ pa_timeval_age at Base 5.99.1
+ pa_timeval_cmp at Base 5.99.1
+ pa_timeval_diff at Base 5.99.1
+ pa_timeval_load at Base 5.99.1
+ pa_timeval_rtstore at Base 5.99.1
+ pa_timeval_store at Base 5.99.1
+ pa_timeval_sub at Base 5.99.1
+ pa_tls_free at Base 5.99.1
+ pa_tls_get at Base 5.99.1
+ pa_tls_new at Base 5.99.1
+ pa_tls_set at Base 5.99.1
+ pa_tokenizer_free at Base 5.99.1
+ pa_tokenizer_get at Base 5.99.1
+ pa_tokenizer_new at Base 5.99.1
+ pa_truncate_utf8 at Base 5.99.1
+ pa_uid_in_group at Base 5.99.1
+ pa_uname_string at Base 5.99.1
+ pa_unblock_sigs at Base 5.99.1
+ pa_unblock_sigsv at Base 5.99.1
+ pa_unescape at Base 5.99.1
+ pa_unix_socket_is_stale at Base 5.99.1
+ pa_unix_socket_remove_stale at Base 5.99.1
+ pa_unlock_lockfile at Base 5.99.1
+ pa_unset_env at Base 5.99.1
+ pa_unset_env_recorded at Base 5.99.1
+ pa_usec_to_bytes at Base 5.99.1
+ pa_usec_to_bytes_round_up at Base 5.99.1
+ pa_utf8_filter at Base 5.99.1
+ pa_utf8_to_locale at Base 5.99.1
+ pa_utf8_valid at Base 5.99.1
+ pa_volume_func_init_arm at Base 5.99.1
+ pa_volume_func_init_mmx at Base 5.99.1
+ pa_volume_func_init_sse at Base 5.99.1
+ pa_volume_snprint at Base 5.99.1
+ pa_volume_snprint_verbose at Base 5.99.1
+ pa_vsnprintf at Base 5.99.1
+ pa_vsprintf_malloc at Base 5.99.1
+ pa_will_need at Base 5.99.1
+ pa_write at Base 5.99.1
+ pa_x11_del_prop at Base 5.99.1
+ pa_x11_get_prop at Base 5.99.1
+ pa_x11_set_prop at Base 5.99.1
+ pa_xfree at Base 5.99.1
+ pa_xfreev at Base 5.99.1
+ pa_xmalloc0 at Base 5.99.1
+ pa_xmalloc at Base 5.99.1
+ pa_xmemdup at Base 5.99.1
+ pa_xrealloc at Base 5.99.1
+ pa_xstrdup at Base 5.99.1
+ pa_xstrndup at Base 5.99.1
+ pretty_table at Base 5.99.1
+ rtkit_get_max_realtime_priority at Base 5.99.1
+ rtkit_get_min_nice_level at Base 5.99.1
+ rtkit_get_rttime_usec_max at Base 5.99.1
+ rtkit_make_high_priority at Base 5.99.1
+ rtkit_make_realtime at Base 5.99.1
+ st_13linear2alaw at Base 5.99.1
+ st_14linear2ulaw at Base 5.99.1
+ st_alaw2linear16 at Base 5.99.1
+ st_ulaw2linear16 at Base 5.99.1
+ table at Base 5.99.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:40 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:40 +0000
Subject: [pulseaudio] 11/19: Merge unreleased update to 5.99.1
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIG-0005B0-8J@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 85e451a03287738c5b3e92ab06571b8d3118eb1e
Merge: ba509cf 72002db
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 14:53:46 2014 +1100

    Merge unreleased update to 5.99.1

 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 Makefile.am                                        |   22 +-
 Makefile.in                                        |   86 +-
 NEWS                                               |   61 +
 PROTOCOL                                           |   22 +-
 README                                             |    3 -
 bootstrap.sh                                       |    4 -
 build-aux/ltmain.sh                                |    4 +-
 config.h.in                                        |   25 +-
 configure                                          |  919 +++--
 configure.ac                                       |  154 +-
 debian/changelog                                   |   24 +
 debian/libpulse0.symbols                           |  785 +++++
 ...use-incompatible-default-sample-spec-para.patch |   41 -
 ...se-the-fixed-point-speex-resampler-on-ARM.patch |   70 -
 debian/patches/0003-exit-with-X-session.patch      |   55 -
 .../0004-dont-start-when-already-running.patch     |   30 -
 debian/patches/broken-PA_FLOAT32_SWAP.patch        |  320 --
 ...ndianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch |   27 -
 debian/patches/gnu-kfreebsd.patch                  |   11 -
 .../kfreebsd_no_lock_and_threads_synchro.patch     |   29 -
 debian/patches/misc-cleanups-and-bug-fixes.patch   |  118 -
 ...Fix-mixing-of-S24-samples-stored-as-S32RE.patch |   37 -
 debian/patches/only-autostart-kde-version.patch    |   12 -
 ...x-crash-on-empty-UDP-packets-CVE-2014-397.patch |   57 -
 debian/patches/series                              |   16 -
 debian/patches/tests-Cleanup-mix-test.patch        |   41 -
 .../tests-Fix-mix-test-on-big-endian-systems.patch |  364 --
 ...Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch |   38 -
 ...finding-out-application-name-using-dladdr.patch |   78 -
 ...ion-Fix-completion-for-default-sink-sourc.patch |   22 -
 debian/pulseaudio.install                          |    4 +-
 debian/pulseaudio.manpages                         |    1 -
 debian/rules                                       |    5 -
 debian/shlibs.local                                |    4 +-
 doxygen/Makefile.in                                |   18 +-
 doxygen/doxygen.conf.in                            | 1115 ++++--
 man/Makefile.am                                    |    3 -
 man/Makefile.in                                    |   26 +-
 man/default.pa.5                                   |    4 +-
 man/pactl.1                                        |   20 +-
 man/pactl.1.xml.in                                 |   27 +-
 man/pax11publish.1                                 |    2 +-
 man/pulse-cli-syntax.5                             |    4 +-
 man/pulse-client.conf.5                            |    6 +-
 man/pulse-client.conf.5.xml.in                     |    2 +-
 man/pulse-daemon.conf.5                            |   18 +-
 man/pulse-daemon.conf.5.xml.in                     |   14 +-
 man/pulseaudio.1                                   |    6 +-
 man/start-pulseaudio-kde.1                         |   14 -
 man/start-pulseaudio-kde.1.xml.in                  |   48 -
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    4 +-
 po/el.po                                           | 3587 ++++++++++++--------
 po/pt_BR.po                                        |  854 ++---
 po/ru.po                                           |  465 +--
 po/{el.po => sk.po}                                | 2803 +++++++--------
 po/uk.po                                           |  581 ++--
 pulseaudio.supp                                    |   50 +
 .../pulseaudio}                                    |    4 +-
 .../_pulseaudio}                                   |  402 ++-
 src/.gitignore                                     |   11 +-
 src/Makefile.am                                    |  140 +-
 src/Makefile.in                                    | 1312 ++++---
 src/daemon/.gitignore                              |    1 -
 src/daemon/caps.c                                  |    7 +-
 src/daemon/cmdline.c                               |    2 +-
 src/daemon/daemon-conf.c                           |    8 +-
 src/daemon/daemon.conf.in                          |    2 +-
 src/daemon/default.pa.in                           |   10 +-
 src/daemon/main.c                                  |  181 +-
 src/daemon/pulseaudio-kde.desktop.in               |   10 -
 src/daemon/pulseaudio.desktop.in                   |    1 +
 src/daemon/server-lookup.c                         |   30 +-
 src/daemon/start-pulseaudio-kde.in                 |   30 -
 src/daemon/start-pulseaudio-x11.in                 |    6 +-
 src/daemon/systemd/user/pulseaudio.service.in      |   10 +
 src/daemon/systemd/user/pulseaudio.socket          |   10 +
 src/map-file                                       |    3 +
 src/modules/alsa/alsa-mixer.c                      |  248 +-
 src/modules/alsa/alsa-mixer.h                      |   10 +-
 src/modules/alsa/alsa-sink.c                       |   37 +-
 src/modules/alsa/alsa-source.c                     |   35 +-
 src/modules/alsa/alsa-ucm.c                        |    7 +-
 src/modules/alsa/alsa-util.c                       |  121 +-
 src/modules/alsa/alsa-util.h                       |    9 +-
 src/modules/alsa/mixer/paths/analog-input.conf     |   15 +
 .../mixer/paths/analog-output-desktop-speaker.conf |  102 -
 .../mixer/paths/analog-output-headphones-2.conf    |    8 +
 .../alsa/mixer/paths/analog-output-headphones.conf |   20 +
 .../alsa/mixer/paths/analog-output-lineout.conf    |   19 +
 .../alsa/mixer/paths/analog-output-mono.conf       |   10 +
 .../mixer/paths/analog-output-speaker-always.conf  |   16 +-
 .../alsa/mixer/paths/analog-output-speaker.conf    |   22 +-
 src/modules/alsa/mixer/paths/analog-output.conf    |   30 -
 src/modules/alsa/mixer/paths/hdmi-output-4.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-5.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-6.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-7.conf    |   10 +
 .../alsa/mixer/profile-sets/90-pulseaudio.rules    |    4 -
 src/modules/alsa/mixer/profile-sets/default.conf   |  292 +-
 .../alsa/mixer/profile-sets/extra-hdmi.conf        |  164 -
 .../profile-sets/force-speaker-and-int-mic.conf    |   46 +-
 .../alsa/mixer/profile-sets/force-speaker.conf     |   46 +-
 src/modules/alsa/module-alsa-card.c                |   77 +-
 src/modules/bluetooth/backend-native.c             |  501 +++
 src/modules/bluetooth/backend-ofono.c              |  665 ++++
 src/modules/bluetooth/bluez5-util.c                |  201 +-
 src/modules/bluetooth/bluez5-util.h                |   53 +-
 src/modules/bluetooth/module-bluetooth-discover.c  |    5 +-
 src/modules/bluetooth/module-bluetooth-policy.c    |   45 +-
 src/modules/bluetooth/module-bluez4-device.c       |   39 +-
 src/modules/bluetooth/module-bluez5-device.c       |  686 +++-
 src/modules/bluetooth/module-bluez5-discover.c     |   39 +-
 src/modules/dbus/iface-core.c                      |    6 +-
 src/modules/dbus/iface-device.c                    |   15 +-
 src/modules/dbus/iface-stream.c                    |    4 +-
 src/modules/echo-cancel/module-echo-cancel.c       |   31 +-
 src/modules/gconf/gconf-helper.c                   |    2 +
 src/modules/gconf/module-gconf.c                   |    7 +-
 src/modules/jack/module-jack-sink.c                |    4 +-
 src/modules/jack/module-jack-source.c              |    4 +-
 src/modules/macosx/module-coreaudio-device.c       |    2 +-
 src/modules/module-card-restore.c                  |    6 +-
 src/modules/module-combine-sink.c                  |  193 +-
 src/modules/module-console-kit.c                   |   10 +-
 src/modules/module-device-manager.c                |    4 +-
 src/modules/module-device-restore.c                |   18 +-
 src/modules/module-equalizer-sink.c                |    2 +-
 src/modules/module-esound-sink.c                   |   15 +-
 src/modules/module-mmkbd-evdev.c                   |    7 +-
 src/modules/module-null-sink.c                     |    2 +-
 src/modules/module-null-source.c                   |    2 +-
 src/modules/module-pipe-sink.c                     |    2 +-
 src/modules/module-pipe-source.c                   |    2 +-
 src/modules/module-protocol-stub.c                 |    6 +-
 src/modules/module-rescue-streams.c                |  105 +-
 src/modules/module-role-cork.c                     |    9 +-
 src/modules/module-sine-source.c                   |    2 +-
 src/modules/module-solaris.c                       |   27 +-
 src/modules/module-stream-restore.c                |   24 +-
 src/modules/module-suspend-on-idle.c               |    5 +-
 src/modules/module-switch-on-connect.c             |   34 +-
 src/modules/module-switch-on-port-available.c      |   38 +-
 src/modules/module-tunnel-sink-new.c               |   98 +-
 src/modules/module-tunnel-source-new.c             |   47 +-
 src/modules/module-tunnel.c                        |   22 +-
 src/modules/module-virtual-surround-sink.c         |   57 +-
 src/modules/module-waveout.c                       |    2 +-
 src/modules/module-zeroconf-publish.c              |   47 +-
 src/modules/oss/module-oss.c                       |    2 +-
 src/modules/raop/module-raop-sink.c                |   10 +-
 src/modules/raop/raop_client.c                     |    9 +-
 src/modules/rtp/headerlist.c                       |    8 +-
 src/modules/rtp/module-rtp-recv.c                  |   14 +-
 src/modules/rtp/module-rtp-send.c                  |    2 +-
 src/modules/rtp/rtp.c                              |   25 +-
 src/modules/xen/module-xenpv-sink.c                |    2 +-
 src/pulse/channelmap.c                             |    6 +
 src/pulse/client-conf-x11.c                        |    9 +-
 src/pulse/client-conf-x11.h                        |    6 +-
 src/pulse/client-conf.c                            |  213 +-
 src/pulse/client-conf.h                            |   39 +-
 src/pulse/client.conf.in                           |    2 +-
 src/pulse/context.c                                |  153 +-
 src/pulse/def.h                                    |    4 +-
 src/{pulsecore/cpu.h => pulse/direction.c}         |   41 +-
 src/pulse/{client-conf-x11.h => direction.h}       |   20 +-
 src/pulse/error.c                                  |    2 +-
 src/pulse/ext-device-manager.c                     |    1 +
 src/pulse/ext-device-manager.h                     |    3 +
 src/pulse/format.c                                 |   43 +-
 src/pulse/internal.h                               |    3 +
 src/pulse/introspect.c                             |    6 +-
 src/pulse/mainloop-api.h                           |   14 +-
 src/pulse/mainloop.c                               |   13 +-
 src/pulse/proplist.c                               |    5 +-
 src/pulse/proplist.h                               |    2 +-
 src/pulse/pulseaudio.h                             |    5 +-
 src/pulse/simple.c                                 |   21 +-
 src/pulse/stream.c                                 |   20 +-
 src/pulse/stream.h                                 |   13 +-
 src/pulse/thread-mainloop.c                        |    7 +-
 src/pulse/thread-mainloop.h                        |    4 +-
 src/pulse/util.c                                   |   59 +-
 src/pulse/version.h                                |    6 +-
 src/pulse/volume.h                                 |    2 +-
 src/pulsecore/asyncmsgq.c                          |    2 -
 src/pulsecore/aupdate.c                            |    2 +-
 src/pulsecore/auth-cookie.c                        |    2 +-
 src/pulsecore/authkey.c                            |   66 +-
 src/pulsecore/authkey.h                            |    3 +-
 src/pulsecore/card.c                               |    2 +-
 src/pulsecore/cli-text.c                           |    4 +-
 src/pulsecore/conf-parser.c                        |    1 +
 src/pulsecore/core-util.c                          |  157 +-
 src/pulsecore/core-util.h                          |    8 +-
 src/pulsecore/core.c                               |   16 +-
 src/pulsecore/core.h                               |   13 +-
 src/pulsecore/cpu-arm.c                            |   22 +-
 src/pulsecore/cpu-arm.h                            |    4 +-
 src/pulsecore/cpu.c                                |   38 +
 src/pulsecore/cpu.h                                |    6 +
 src/pulsecore/creds.h                              |   13 +
 src/pulsecore/database-simple.c                    |    9 +-
 src/pulsecore/device-port.c                        |   27 +
 src/pulsecore/device-port.h                        |    2 +
 src/pulsecore/endianmacros.h                       |   27 +-
 src/pulsecore/esound.h                             |    2 +-
 src/pulsecore/fdsem.c                              |    3 +-
 src/pulsecore/fdsem.h                              |    4 +-
 src/pulsecore/hashmap.c                            |   13 +
 src/pulsecore/hashmap.h                            |    7 +
 src/pulsecore/iochannel.c                          |   92 +-
 src/pulsecore/iochannel.h                          |    3 +-
 src/pulsecore/log.c                                |   12 +-
 src/pulsecore/log.h                                |    4 +-
 src/pulsecore/macro.h                              |    8 +-
 src/pulsecore/memblock.c                           |   56 +-
 src/pulsecore/memblock.h                           |   10 +-
 src/pulsecore/memblockq.c                          |    3 +-
 src/pulsecore/memchunk.c                           |    2 +-
 src/pulsecore/memtrap.c                            |    3 +
 src/pulsecore/mix.c                                |   31 +-
 src/pulsecore/mix_neon.c                           |  131 +-
 src/pulsecore/modargs.c                            |    3 -
 src/pulsecore/native-common.h                      |    7 +-
 src/pulsecore/pdispatch.c                          |   37 +-
 src/pulsecore/pdispatch.h                          |    4 +-
 src/pulsecore/pid.c                                |    2 +-
 src/pulsecore/pipe.c                               |    4 +-
 src/pulsecore/poll-win32.c                         |   60 +-
 src/pulsecore/protocol-dbus.c                      |    3 +-
 src/pulsecore/protocol-esound.c                    |   17 +-
 src/pulsecore/protocol-native.c                    |  133 +-
 src/pulsecore/protocol-native.h                    |    1 +
 src/pulsecore/pstream-util.c                       |   45 +-
 src/pulsecore/pstream-util.h                       |    1 +
 src/pulsecore/pstream.c                            |  351 +-
 src/pulsecore/pstream.h                            |    9 +-
 src/pulsecore/remap.c                              |  480 ++-
 src/pulsecore/remap.h                              |   20 +-
 src/pulsecore/remap_mmx.c                          |   53 +-
 src/pulsecore/remap_neon.c                         |  498 +++
 src/pulsecore/remap_sse.c                          |   53 +-
 src/pulsecore/resampler.c                          |  701 +---
 src/pulsecore/resampler.h                          |   51 +
 src/pulsecore/resampler/ffmpeg.c                   |  132 +
 src/pulsecore/resampler/libsamplerate.c            |  102 +
 src/pulsecore/resampler/peaks.c                    |  163 +
 src/pulsecore/resampler/speex.c                    |  180 +
 src/pulsecore/resampler/trivial.c                  |  102 +
 src/pulsecore/rtpoll.c                             |   14 +-
 src/pulsecore/rtpoll.h                             |    7 +-
 src/pulsecore/sample-util.c                        |    4 +-
 src/pulsecore/sconv-s16le.c                        |   22 +-
 src/pulsecore/sconv_neon.c                         |   10 +-
 src/pulsecore/sconv_sse.c                          |    3 +-
 src/pulsecore/shm.c                                |   12 +-
 src/pulsecore/shm.h                                |    2 +-
 src/pulsecore/sink-input.c                         |  157 +-
 src/pulsecore/sink-input.h                         |   14 +-
 src/pulsecore/sink.c                               |  249 +-
 src/pulsecore/sink.h                               |   37 +-
 src/pulsecore/socket-server.c                      |   98 +-
 src/pulsecore/socket-util.c                        |   18 +
 src/pulsecore/source-output.c                      |  136 +-
 src/pulsecore/source-output.h                      |   14 +-
 src/pulsecore/source.c                             |  235 +-
 src/pulsecore/source.h                             |   33 +-
 src/pulsecore/srbchannel.c                         |  378 +++
 src/pulsecore/srbchannel.h                         |   59 +
 src/pulsecore/start-child.c                        |    2 +-
 src/pulsecore/svolume_c.c                          |    6 +-
 src/tests/alsa-time-test.c                         |   37 +-
 src/tests/connect-stress.c                         |    8 +-
 src/tests/cpu-mix-test.c                           |  226 ++
 src/tests/cpu-remap-test.c                         |  436 +++
 src/tests/cpu-sconv-test.c                         |  265 ++
 src/tests/cpu-test.c                               |  887 -----
 src/tests/cpu-volume-test.c                        |  249 ++
 src/tests/flist-test.c                             |    2 +-
 src/tests/format-test.c                            |    2 +-
 src/tests/lo-test-util.c                           |   10 +-
 src/tests/mcalign-test.c                           |    5 +-
 src/tests/memblock-test.c                          |    4 +-
 src/tests/mix-special-test.c                       |  326 --
 src/tests/mix-test.c                               |  231 +-
 src/tests/resampler-test.c                         |    8 +-
 src/tests/rtpoll-test.c                            |    4 +-
 src/tests/sigbus-test.c                            |    2 +
 src/tests/srbchannel-test.c                        |  138 +
 src/utils/pacat.c                                  |   12 +-
 src/utils/pactl.c                                  |  322 +-
 src/utils/pax11publish.c                           |   12 +-
 vala/libpulse-simple.deps                          |    1 +
 vala/libpulse-simple.vapi                          |   36 +
 vala/libpulse.vapi                                 |    8 +
 299 files changed, 18373 insertions(+), 11000 deletions(-)

diff --cc debian/changelog
index d5fec58,d4465c5..5f7856c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,31 +1,58 @@@
 -pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
 -
 +pulseaudio (1:5.0-13ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Merge from Debian unstable, remaining changes:
 +    - epoch (my stupid fault :S)
 +    - Remove libwebrtc-audio-processing-dev build dep, its in universe
 +    - Don't ship the consolekit module, and explicitly depend on the PAM
 +      systemd module
 +    - Add a module to allow pulseaudio to use the Android audio HAL
 +    - Adjust gbp.conf file to point to the ubuntu branch for package builds
 +    - Disable module-role-cork by default
 +    - Load module-x11-bell in the start-pulseaudio-x11 script
 +    - Hide pulseaudio from startup apps dialog
 +    - Quit daemon if pid file is removed
 +    - Avoid abort when poll descriptor is 0, such as when using it with the
 +      audioflinger bridge, like done in ubuntu touch
 +    - change default rlimit_rttime value to 200 ms
 +    - Don't probe UCM profiles, trust that the profile writer knows what they
 +      are doing
 +    - Add card hook to allow modules to do something before a profile becomes
 +      active
 +    - Add an option to the bluez4 discovery module to set the profile
 +    - Allow leaving bluetooth transport running while sink and source are
 +      suspended.
 +    - Add option to module-switch-on-connect to skip abstract devices
 +    - Add property to module-device-restore to skip store/restore
 +    - Add missing fields for sink_input/source_output info struct to the vala
 +      bindings
 +    - Add example upstart job to run pulseaudio in system mode
 +    - Add a build/run autopkgtest for libpulse-dev
+   * New upstream release candidate
+   * Dropped patches, either applied upstream or are now obsolete:
+     - 0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
+     - 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
+     - 0003-exit-with-X-session.patch
+     - 0004-dont-start-when-already-running.patch
+     - broken-PA_FLOAT32_SWAP.patch
+     - endianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch
+     - kfreebsd_no_lock_and_threads_synchro.patch
+     - misc-cleanups-and-bug-fixes.patch
+     - mix-Fix-mixing-of-S24-samples-stored-as-S32RE.patch
+     - only-autostart-kde-version.patch
+     - rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch
+     - tests-Cleanup-mix-test.patch
+     - tests-Fix-mix-test-on-big-endian-systems.patch
+     - util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch
+     - util-Try-finding-out-application-name-using-dladdr.patch
+     - zsh-completion-Fix-completion-for-default-sink-sourc.patch
+   * Refreshed debian/patches/gnu-kfreebsd.patch
+   * Remove all references to start-pulseaudio-kde, it was dropped upstream
+   * Pulse now ships zsh completions, so drop install code, and adjust
+     pulseaudio.install to match
+   * Update shlibs
+   * Update symbols
  
 - -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
 + -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2014 11:21:32 +1100
  
  pulseaudio (5.0-13) unstable; urgency=medium
  
diff --cc debian/patches/series
index 2ce2eba,9dd5712..7f56643
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,37 -1,1 +1,21 @@@
 +# Debian patches
- 0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
- 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
- 0003-exit-with-X-session.patch
- 0004-dont-start-when-already-running.patch
- kfreebsd_no_lock_and_threads_synchro.patch
- only-autostart-kde-version.patch
- rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch
- zsh-completion-Fix-completion-for-default-sink-sourc.patch
  gnu-kfreebsd.patch
- mix-Fix-mixing-of-S24-samples-stored-as-S32RE.patch
- tests-Cleanup-mix-test.patch
- endianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch
- tests-Fix-mix-test-on-big-endian-systems.patch
- util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch
- misc-cleanups-and-bug-fixes.patch
- util-Try-finding-out-application-name-using-dladdr.patch
- broken-PA_FLOAT32_SWAP.patch
 +
 +# Ubuntu/Debian specific config/fixes
 +0005-dont-load-cork-music-on-phone.patch
 +0006-load-module-x11-bell.patch
 +0016-nodisplay-autostart.patch
 +#0020-stream-Return-error-in-case-a-client-peeks-to-early.patch
 +0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
 +0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
 +0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch
 +
 +# Ubuntu touch stuff
 +0202-dont-probe-ucm.patch
 +0203-card-Add-hook-before-profile-changes.patch
 +0206-module-bluetooth-discover-adding-module-option-profi.patch
 +0207-Enable-pulseaudio-droid.patch
 +0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
 +0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
 +0210-module-device-restore-adding-property-to-skip.patch
 +0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:40 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:40 +0000
Subject: [pulseaudio] 12/19: Refresh gnu-kfreebsd
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIG-0005Ba-JD@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 152eb05accbff6e4d760326e6394f7491d4ba950
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Wed Nov 26 09:54:18 2014 +1100

    Refresh gnu-kfreebsd
---
 debian/patches/gnu-kfreebsd.patch | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/debian/patches/gnu-kfreebsd.patch b/debian/patches/gnu-kfreebsd.patch
index e606583..ccf9341 100644
--- a/debian/patches/gnu-kfreebsd.patch
+++ b/debian/patches/gnu-kfreebsd.patch
@@ -10,8 +10,10 @@ Date:   Sun Aug 3 17:37:03 2014 -0400
     Use the alternative when the functionality tested is for kernel
     features, and keep the __FreeBSD__ one when using freebsd libc headers.
 
---- a/src/pulsecore/atomic.h
-+++ b/src/pulsecore/atomic.h
+Index: pulseaudio/src/pulsecore/atomic.h
+===================================================================
+--- pulseaudio.orig/src/pulsecore/atomic.h
++++ pulseaudio/src/pulsecore/atomic.h
 @@ -180,7 +180,7 @@ static inline bool pa_atomic_ptr_cmpxchg
      return r == old_p;
  }
@@ -21,8 +23,10 @@ Date:   Sun Aug 3 17:37:03 2014 -0400
  
  #include <sys/cdefs.h>
  #include <sys/types.h>
---- a/src/pulsecore/sconv_sse.c
-+++ b/src/pulsecore/sconv_sse.c
+Index: pulseaudio/src/pulsecore/sconv_sse.c
+===================================================================
+--- pulseaudio.orig/src/pulsecore/sconv_sse.c
++++ pulseaudio/src/pulsecore/sconv_sse.c
 @@ -33,7 +33,7 @@
  #include "cpu-x86.h"
  #include "sconv.h"
@@ -41,8 +45,10 @@ Date:   Sun Aug 3 17:37:03 2014 -0400
  
      if (flags & PA_CPU_X86_SSE2) {
          pa_log_info("Initialising SSE2 optimized conversions.");
---- a/src/pulsecore/svolume_mmx.c
-+++ b/src/pulsecore/svolume_mmx.c
+Index: pulseaudio/src/pulsecore/svolume_mmx.c
+===================================================================
+--- pulseaudio.orig/src/pulsecore/svolume_mmx.c
++++ pulseaudio/src/pulsecore/svolume_mmx.c
 @@ -34,7 +34,7 @@
  
  #include "sample-util.h"
@@ -71,8 +77,10 @@ Date:   Sun Aug 3 17:37:03 2014 -0400
 -#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
 +#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
  }
---- a/src/pulsecore/svolume_sse.c
-+++ b/src/pulsecore/svolume_sse.c
+Index: pulseaudio/src/pulsecore/svolume_sse.c
+===================================================================
+--- pulseaudio.orig/src/pulsecore/svolume_sse.c
++++ pulseaudio/src/pulsecore/svolume_sse.c
 @@ -34,7 +34,7 @@
  
  #include "sample-util.h"
@@ -101,8 +109,10 @@ Date:   Sun Aug 3 17:37:03 2014 -0400
 -#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */
 +#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */
  }
---- a/src/tests/once-test.c
-+++ b/src/tests/once-test.c
+Index: pulseaudio/src/tests/once-test.c
+===================================================================
+--- pulseaudio.orig/src/tests/once-test.c
++++ pulseaudio/src/tests/once-test.c
 @@ -24,8 +24,10 @@
  #ifdef HAVE_PTHREAD
  #include <pthread.h>
@@ -124,8 +134,10 @@ Date:   Sun Aug 3 17:37:03 2014 -0400
      cpuset_t mask;
  #else
      cpu_set_t mask;
---- a/src/tests/rtstutter.c
-+++ b/src/tests/rtstutter.c
+Index: pulseaudio/src/tests/rtstutter.c
+===================================================================
+--- pulseaudio.orig/src/tests/rtstutter.c
++++ pulseaudio/src/tests/rtstutter.c
 @@ -31,8 +31,10 @@
  #ifdef HAVE_PTHREAD
  #include <pthread.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:40 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:40 +0000
Subject: [pulseaudio] 13/19: Refreshed patches,
 and dropped patches that were either applied upstream or are obsolete
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIG-0005Bs-Mn@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 48c8926816584be2b0e0c6eda40e9ad379d02b26
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Wed Nov 26 10:03:18 2014 +1100

    Refreshed patches, and dropped patches that were either applied upstream or are obsolete
---
 debian/changelog                                   |  2 ++
 .../0005-dont-load-cork-music-on-phone.patch       |  8 ++---
 debian/patches/0006-load-module-x11-bell.patch     | 16 ++-------
 debian/patches/0016-nodisplay-autostart.patch      |  2 +-
 ...rapper-Quit-daemon-if-pid-file-is-removed.patch | 26 +++++++--------
 ...nd_mixer_poll_descriptors_count_when_zero.patch |  6 ++--
 ....c-changing-default-rlimit_rttime-value-t.patch | 26 ---------------
 debian/patches/0202-dont-probe-ucm.patch           |  8 ++---
 ...0203-card-Add-hook-before-profile-changes.patch |  2 +-
 debian/patches/0207-Enable-pulseaudio-droid.patch  | 14 ++++----
 ...tooth-device-Allow-leaving-transport-runn.patch | 12 +++----
 ...ch-on-connect-adding-parameter-to-allow-s.patch | 29 ++++++++---------
 ...le-device-restore-adding-property-to-skip.patch |  8 ++---
 ...pi-adding-missing-fields-for-sink_input-s.patch | 38 ----------------------
 debian/patches/series                              |  3 --
 15 files changed, 60 insertions(+), 140 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f7856c..bdd68e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,8 @@ pulseaudio (1:5.0-13ubuntu1) UNRELEASED; urgency=medium
     pulseaudio.install to match
   * Update shlibs
   * Update symbols
+  * Refreshed patches, and dropped patches that were either applied upstream
+    or are obsolete
 
  -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2014 11:21:32 +1100
 
diff --git a/debian/patches/0005-dont-load-cork-music-on-phone.patch b/debian/patches/0005-dont-load-cork-music-on-phone.patch
index 803287b..c5918f0 100644
--- a/debian/patches/0005-dont-load-cork-music-on-phone.patch
+++ b/debian/patches/0005-dont-load-cork-music-on-phone.patch
@@ -1,8 +1,8 @@
-Index: pulseaudio-2.99.1/src/daemon/default.pa.in
+Index: pulseaudio/src/daemon/default.pa.in
 ===================================================================
---- pulseaudio-2.99.1.orig/src/daemon/default.pa.in	2012-11-16 11:19:57.904259183 +0100
-+++ pulseaudio-2.99.1/src/daemon/default.pa.in	2012-11-16 11:20:18.408258877 +0100
-@@ -154,7 +154,7 @@
+--- pulseaudio.orig/src/daemon/default.pa.in
++++ pulseaudio/src/daemon/default.pa.in
+@@ -161,7 +161,7 @@ load-module module-systemd-login
  load-module module-position-event-sounds
  
  ### Cork music/video streams when a phone stream is active
diff --git a/debian/patches/0006-load-module-x11-bell.patch b/debian/patches/0006-load-module-x11-bell.patch
index 6720ac4..a6b06ac 100644
--- a/debian/patches/0006-load-module-x11-bell.patch
+++ b/debian/patches/0006-load-module-x11-bell.patch
@@ -2,23 +2,11 @@ Index: pulseaudio/src/daemon/start-pulseaudio-x11.in
 ===================================================================
 --- pulseaudio.orig/src/daemon/start-pulseaudio-x11.in
 +++ pulseaudio/src/daemon/start-pulseaudio-x11.in
-@@ -31,6 +31,7 @@ fi
+@@ -22,6 +22,7 @@ set -e
  if [ x"$DISPLAY" != x ] ; then
  
      @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
 +    @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null
      @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null
  
-     if [ x"$SESSION_MANAGER" != x ] ; then
-Index: pulseaudio/src/daemon/start-pulseaudio-kde.in
-===================================================================
---- pulseaudio.orig/src/daemon/start-pulseaudio-kde.in
-+++ pulseaudio/src/daemon/start-pulseaudio-kde.in
-@@ -33,6 +33,7 @@ fi
- if [ x"$DISPLAY" != x ] ; then
- 
-     @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
-+    @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null
- 
- fi
- 
+     if [ x"$KDE_FULL_SESSION" = x"true" ]; then
diff --git a/debian/patches/0016-nodisplay-autostart.patch b/debian/patches/0016-nodisplay-autostart.patch
index e0a2c39..fdea536 100644
--- a/debian/patches/0016-nodisplay-autostart.patch
+++ b/debian/patches/0016-nodisplay-autostart.patch
@@ -10,5 +10,5 @@ Index: pulseaudio/src/daemon/pulseaudio.desktop.in
 @@ -9,3 +9,4 @@ Categories=
  GenericName=
  X-GNOME-Autostart-Phase=Initialization
- NotShowIn=KDE;
+ X-KDE-autostart-phase=1
 +NoDisplay=true
diff --git a/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch b/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
index 4bbb704..41ecf2d 100644
--- a/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
+++ b/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
@@ -29,9 +29,9 @@ Index: pulseaudio/src/Makefile.am
 ===================================================================
 --- pulseaudio.orig/src/Makefile.am
 +++ pulseaudio/src/Makefile.am
-@@ -883,6 +883,7 @@ libpulsecore_ at PA_MAJORMINOR@_la_SOURCES
+@@ -920,6 +920,7 @@ libpulsecore_ at PA_MAJORMINOR@_la_SOURCES
+ 		pulsecore/core-subscribe.c pulsecore/core-subscribe.h \
  		pulsecore/core.c pulsecore/core.h \
- 		pulsecore/fdsem.c pulsecore/fdsem.h \
  		pulsecore/hook-list.c pulsecore/hook-list.h \
 +		pulsecore/inotify-wrapper.c pulsecore/inotify-wrapper.h \
  		pulsecore/ltdl-helper.c pulsecore/ltdl-helper.h \
@@ -41,7 +41,7 @@ Index: pulseaudio/src/daemon/main.c
 ===================================================================
 --- pulseaudio.orig/src/daemon/main.c
 +++ pulseaudio/src/daemon/main.c
-@@ -74,6 +74,7 @@
+@@ -75,6 +75,7 @@
  #include <pulsecore/core-rtclock.h>
  #include <pulsecore/core-scache.h>
  #include <pulsecore/core.h>
@@ -49,7 +49,7 @@ Index: pulseaudio/src/daemon/main.c
  #include <pulsecore/module.h>
  #include <pulsecore/cli-command.h>
  #include <pulsecore/log.h>
-@@ -360,6 +361,15 @@ static char *check_configured_address(vo
+@@ -334,6 +335,15 @@ static char *check_configured_address(vo
      return default_server;
  }
  
@@ -65,23 +65,23 @@ Index: pulseaudio/src/daemon/main.c
  #ifdef HAVE_DBUS
  static pa_dbus_connection *register_dbus_name(pa_core *c, DBusBusType bus, const char* name) {
      DBusError error;
-@@ -402,7 +412,6 @@ int main(int argc, char *argv[]) {
+@@ -376,7 +386,6 @@ int main(int argc, char *argv[]) {
      char *s;
      char *configured_address;
      int r = 0, retval = 1, d = 0;
 -    bool valid_pid_file = false;
      bool ltdl_init = false;
-     int passed_fd = -1;
+     int n_fds = 0, *passed_fds = NULL;
      const char *e;
-@@ -414,6 +423,7 @@ int main(int argc, char *argv[]) {
-     pa_time_event *win32_timer;
-     struct timeval win32_tv;
+@@ -384,6 +393,7 @@ int main(int argc, char *argv[]) {
+     int daemon_pipe[2] = { -1, -1 };
+     int daemon_pipe2[2] = { -1, -1 };
  #endif
 +    pa_inotify *pid_monitor = NULL;
      int autospawn_fd = -1;
      bool autospawn_locked = false;
  #ifdef HAVE_DBUS
-@@ -1032,6 +1042,9 @@ int main(int argc, char *argv[]) {
+@@ -1024,6 +1034,9 @@ int main(int argc, char *argv[]) {
          goto finish;
      }
  
@@ -91,9 +91,9 @@ Index: pulseaudio/src/daemon/main.c
      c->default_sample_spec = conf->default_sample_spec;
      c->alternate_sample_rate = conf->alternate_sample_rate;
      c->default_channel_map = conf->default_channel_map;
-@@ -1179,6 +1192,9 @@ finish:
-         pa_mainloop_get_api(mainloop)->time_free(win32_timer);
- #endif
+@@ -1155,6 +1168,9 @@ finish:
+         pa_autospawn_lock_done(false);
+     }
  
 +    if (pid_monitor)
 +        pa_inotify_stop(pid_monitor);
diff --git a/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch b/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
index c4439fa..4dce3f96 100644
--- a/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
+++ b/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
@@ -2,9 +2,9 @@ Description: Avoid abort when poll descriptor is 0 (LP: #1092377)
 
 Index: pulseaudio/src/modules/alsa/alsa-mixer.c
 ===================================================================
---- pulseaudio.orig/src/modules/alsa/alsa-mixer.c	2012-12-20 00:37:53.862456000 -0200
-+++ pulseaudio/src/modules/alsa/alsa-mixer.c	2012-12-20 00:39:58.631080479 -0200
-@@ -160,6 +160,9 @@
+--- pulseaudio.orig/src/modules/alsa/alsa-mixer.c
++++ pulseaudio/src/modules/alsa/alsa-mixer.c
+@@ -217,6 +217,9 @@ static void defer_cb(pa_mainloop_api *a,
      if (n < 0) {
          pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
          return;
diff --git a/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch b/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch
deleted file mode 100644
index f2cde66..0000000
--- a/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 264e2d7c27d0f690b67e4cacf7b19dfeb7eeeca0 Mon Sep 17 00:00:00 2001
-From: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
-Date: Fri, 27 Jun 2014 16:36:48 -0300
-Subject: [PATCH] daemon-conf.c: changing default rlimit_rttime value to 200 ms
-
-Since rtkit v11, the top limit for rttime is 200 ms (previously it
-was wrongly limited to 2 seconds).
-
-Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
----
- src/daemon/daemon-conf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: pulseaudio/src/daemon/daemon-conf.c
-===================================================================
---- pulseaudio.orig/src/daemon/daemon-conf.c
-+++ pulseaudio/src/daemon/daemon-conf.c
-@@ -139,7 +139,7 @@ static const pa_daemon_conf default_conf
-    ,.rlimit_rtprio = { .value = 9, .is_set = true }    /* One below JACK's default for the server */
- #endif
- #ifdef RLIMIT_RTTIME
--   ,.rlimit_rttime = { .value = PA_USEC_PER_SEC, .is_set = true }
-+   ,.rlimit_rttime = { .value = 200*PA_USEC_PER_MSEC, .is_set = true } /* rtkit's limit is 200 ms */
- #endif
- #endif
- };
diff --git a/debian/patches/0202-dont-probe-ucm.patch b/debian/patches/0202-dont-probe-ucm.patch
index f0e0ca8..d669f4f 100644
--- a/debian/patches/0202-dont-probe-ucm.patch
+++ b/debian/patches/0202-dont-probe-ucm.patch
@@ -1,8 +1,8 @@
-Index: pulseaudio-5.0/src/modules/alsa/alsa-ucm.c
+Index: pulseaudio/src/modules/alsa/alsa-ucm.c
 ===================================================================
---- pulseaudio-5.0.orig/src/modules/alsa/alsa-ucm.c	2014-03-19 13:15:43.734768910 +1100
-+++ pulseaudio-5.0/src/modules/alsa/alsa-ucm.c	2014-03-19 13:15:43.730768910 +1100
-@@ -1541,7 +1541,8 @@
+--- pulseaudio.orig/src/modules/alsa/alsa-ucm.c
++++ pulseaudio/src/modules/alsa/alsa-ucm.c
+@@ -1540,7 +1540,8 @@ pa_alsa_profile_set* pa_alsa_ucm_add_pro
          ucm_create_profile(ucm, ps, verb, verb_name, verb_desc);
      }
  
diff --git a/debian/patches/0203-card-Add-hook-before-profile-changes.patch b/debian/patches/0203-card-Add-hook-before-profile-changes.patch
index 0d091af..500892b 100644
--- a/debian/patches/0203-card-Add-hook-before-profile-changes.patch
+++ b/debian/patches/0203-card-Add-hook-before-profile-changes.patch
@@ -27,7 +27,7 @@ Index: pulseaudio/src/pulsecore/core.h
 ===================================================================
 --- pulseaudio.orig/src/pulsecore/core.h
 +++ pulseaudio/src/pulsecore/core.h
-@@ -116,6 +116,7 @@ typedef enum pa_core_hook {
+@@ -124,6 +124,7 @@ typedef enum pa_core_hook {
      PA_CORE_HOOK_CARD_PUT,
      PA_CORE_HOOK_CARD_UNLINK,
      PA_CORE_HOOK_CARD_PROFILE_CHANGED,
diff --git a/debian/patches/0207-Enable-pulseaudio-droid.patch b/debian/patches/0207-Enable-pulseaudio-droid.patch
index 3105b2d..3fdecaf 100644
--- a/debian/patches/0207-Enable-pulseaudio-droid.patch
+++ b/debian/patches/0207-Enable-pulseaudio-droid.patch
@@ -2,7 +2,7 @@ Index: pulseaudio/configure.ac
 ===================================================================
 --- pulseaudio.orig/configure.ac
 +++ pulseaudio/configure.ac
-@@ -796,6 +796,21 @@ AM_CONDITIONAL([HAVE_ALSA], [test "x$HAV
+@@ -807,6 +807,21 @@ AM_CONDITIONAL([HAVE_ALSA], [test "x$HAV
  AS_IF([test "x$HAVE_ALSA" = "x1"], AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?]))
  AS_IF([test "x$HAVE_ALSA_UCM" = "x1"], AC_DEFINE([HAVE_ALSA_UCM], 1, [Have ALSA UCM?]))
  
@@ -24,7 +24,7 @@ Index: pulseaudio/configure.ac
  #### EsounD support (optional) ####
  
  AC_ARG_ENABLE([esound],
-@@ -1417,6 +1432,7 @@ AS_IF([test "x$HAVE_X11" = "x1"], ENABLE
+@@ -1497,6 +1512,7 @@ AS_IF([test "x$HAVE_X11" = "x1"], ENABLE
  AS_IF([test "x$HAVE_OSS_OUTPUT" = "x1"], ENABLE_OSS_OUTPUT=yes, ENABLE_OSS_OUTPUT=no)
  AS_IF([test "x$HAVE_OSS_WRAPPER" = "x1"], ENABLE_OSS_WRAPPER=yes, ENABLE_OSS_WRAPPER=no)
  AS_IF([test "x$HAVE_ALSA" = "x1"], ENABLE_ALSA=yes, ENABLE_ALSA=no)
@@ -32,7 +32,7 @@ Index: pulseaudio/configure.ac
  AS_IF([test "x$HAVE_COREAUDIO" = "x1"], ENABLE_COREAUDIO=yes, ENABLE_COREAUDIO=no)
  AS_IF([test "x$HAVE_SOLARIS" = "x1"], ENABLE_SOLARIS=yes, ENABLE_SOLARIS=no)
  AS_IF([test "x$HAVE_WAVEOUT" = "x1"], ENABLE_WAVEOUT=yes, ENABLE_WAVEOUT=no)
-@@ -1473,6 +1489,7 @@ echo "
+@@ -1557,6 +1573,7 @@ echo "
      Enable OSS Wrapper:            ${ENABLE_OSS_WRAPPER}
      Enable EsounD:                 ${ENABLE_ESOUND}
      Enable Alsa:                   ${ENABLE_ALSA}
@@ -44,7 +44,7 @@ Index: pulseaudio/src/Makefile.am
 ===================================================================
 --- pulseaudio.orig/src/Makefile.am
 +++ pulseaudio/src/Makefile.am
-@@ -1196,6 +1196,16 @@ modlibexec_LTLIBRARIES += \
+@@ -1249,6 +1249,16 @@ modlibexec_LTLIBRARIES += \
  		module-alsa-source.la \
  		module-alsa-card.la
  
@@ -60,8 +60,8 @@ Index: pulseaudio/src/Makefile.am
 +
  dist_alsaprofilesets_DATA = \
  		modules/alsa/mixer/profile-sets/default.conf \
- 		modules/alsa/mixer/profile-sets/extra-hdmi.conf \
-@@ -1459,6 +1469,13 @@ SYMDEF_FILES = \
+ 		modules/alsa/mixer/profile-sets/force-speaker.conf \
+@@ -1518,6 +1528,13 @@ SYMDEF_FILES = \
  		module-filter-apply-symdef.h \
  		module-filter-heuristics-symdef.h
  
@@ -75,7 +75,7 @@ Index: pulseaudio/src/Makefile.am
  if HAVE_ESOUND
  SYMDEF_FILES += \
  		module-esound-protocol-tcp-symdef.h \
-@@ -1768,6 +1785,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS)
+@@ -1827,6 +1844,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS)
  libalsa_util_la_CFLAGS += $(DBUS_CFLAGS)
  endif
  
diff --git a/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch b/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
index 7d21968..8d9eaca 100644
--- a/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
+++ b/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
@@ -155,7 +155,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c
  /* Run from IO thread */
  static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
      struct userdata *u = PA_SINK(o)->userdata;
-@@ -1423,6 +1487,10 @@ static int sco_over_pcm_state_update(str
+@@ -1430,6 +1494,10 @@ static int sco_over_pcm_state_update(str
          if (u->stream_fd < 0)
              return 0;
  
@@ -166,7 +166,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c
          pa_log_debug("Closing SCO over PCM");
  
          bt_transport_release(u);
-@@ -1466,6 +1534,11 @@ static pa_hook_result_t transport_nrec_c
+@@ -1473,6 +1541,11 @@ static pa_hook_result_t transport_nrec_c
      if (t != u->transport)
          return PA_HOOK_OK;
  
@@ -178,7 +178,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c
      p = pa_proplist_new();
      pa_proplist_sets(p, "bluetooth.nrec", t->nrec ? "1" : "0");
      pa_source_update_proplist(u->source, PA_UPDATE_REPLACE, p);
-@@ -1828,7 +1901,7 @@ static int setup_transport(struct userda
+@@ -1835,7 +1908,7 @@ static int setup_transport(struct userda
      pa_bluez4_transport *t;
  
      pa_assert(u);
@@ -187,7 +187,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c
      pa_assert(u->profile != PA_BLUEZ4_PROFILE_OFF);
  
      /* check if profile has a transport */
-@@ -1908,7 +1981,8 @@ static void stop_thread(struct userdata
+@@ -1915,7 +1988,8 @@ static void stop_thread(struct userdata
  
      if (u->transport) {
          bt_transport_release(u);
@@ -197,7 +197,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c
      }
  
      if (u->sink) {
-@@ -2513,6 +2587,10 @@ int pa__init(pa_module *m) {
+@@ -2520,6 +2594,10 @@ int pa__init(pa_module *m) {
          pa_hook_connect(pa_bluez4_discovery_hook(u->discovery, PA_BLUEZ4_HOOK_TRANSPORT_SPEAKER_GAIN_CHANGED),
                          PA_HOOK_NORMAL, (pa_hook_cb_t) transport_speaker_gain_changed_cb, u);
  
@@ -208,7 +208,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c
      /* Add the card structure. This will also initialize the default profile */
      if (add_card(u) < 0)
          goto fail;
-@@ -2592,6 +2670,9 @@ void pa__done(pa_module *m) {
+@@ -2599,6 +2677,9 @@ void pa__done(pa_module *m) {
      if (u->transport_speaker_changed_slot)
          pa_hook_slot_free(u->transport_speaker_changed_slot);
  
diff --git a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
index c2c3776..2d0c47f 100644
--- a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
+++ b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
@@ -12,19 +12,18 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c
 ===================================================================
 --- pulseaudio.orig/src/modules/module-switch-on-connect.c
 +++ pulseaudio/src/modules/module-switch-on-connect.c
-@@ -41,6 +41,8 @@ PA_MODULE_AUTHOR("Michael Terry");
- PA_MODULE_DESCRIPTION("When a sink/source is added, switch to it");
- PA_MODULE_VERSION(PACKAGE_VERSION);
+@@ -43,6 +43,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION);
  PA_MODULE_LOAD_ONCE(true);
-+PA_MODULE_USAGE(
+ PA_MODULE_USAGE(
+         "only_from_unavailable=<boolean, only switch from unavailable ports> "
 +        "skip_abstract=<yes or no>");
+ );
  
  static const char* const valid_modargs[] = {
-     NULL,
-@@ -50,13 +52,15 @@ struct userdata {
-     pa_hook_slot
+@@ -55,13 +56,14 @@ struct userdata {
          *sink_put_slot,
          *source_put_slot;
+     bool only_from_unavailable;
 +    bool skip_abstract;
  };
  
@@ -34,11 +33,10 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c
      pa_sink *def;
 -    const char *s;
 +    const char *s, *class;
-+    struct userdata *u = userdata;
+     struct userdata *u = userdata;
  
      pa_assert(c);
-     pa_assert(sink);
-@@ -73,6 +77,12 @@ static pa_hook_result_t sink_put_hook_ca
+@@ -80,6 +82,12 @@ static pa_hook_result_t sink_put_hook_ca
              return PA_HOOK_OK;
      }
  
@@ -51,17 +49,16 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c
      def = pa_namereg_get_default_sink(c);
      if (def == sink)
          return PA_HOOK_OK;
-@@ -105,7 +115,8 @@ static pa_hook_result_t source_put_hook_
+@@ -116,7 +124,7 @@ static pa_hook_result_t source_put_hook_
      pa_source_output *o;
      uint32_t idx;
      pa_source *def;
 -    const char *s;
 +    const char *s, *class;
-+    struct userdata *u = userdata;
+     struct userdata *u = userdata;
  
      pa_assert(c);
-     pa_assert(source);
-@@ -126,6 +137,12 @@ static pa_hook_result_t source_put_hook_
+@@ -139,6 +147,12 @@ static pa_hook_result_t source_put_hook_
              return PA_HOOK_OK;
      }
  
@@ -74,9 +71,9 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c
      def = pa_namereg_get_default_source(c);
      if (def == source)
          return PA_HOOK_OK;
-@@ -167,6 +184,11 @@ int pa__init(pa_module*m) {
+@@ -184,6 +198,11 @@ int pa__init(pa_module*m) {
  
-     m->userdata = u = pa_xnew(struct userdata, 1);
+     m->userdata = u = pa_xnew0(struct userdata, 1);
  
 +    if (pa_modargs_get_value_boolean(ma, "skip_abstract", &u->skip_abstract) < 0) {
 +        pa_log_error("skip_abstract= expects a boolean argument, assuming false by default");
diff --git a/debian/patches/0210-module-device-restore-adding-property-to-skip.patch b/debian/patches/0210-module-device-restore-adding-property-to-skip.patch
index 04830ed..b4a5566 100644
--- a/debian/patches/0210-module-device-restore-adding-property-to-skip.patch
+++ b/debian/patches/0210-module-device-restore-adding-property-to-skip.patch
@@ -28,7 +28,7 @@ Index: pulseaudio/src/modules/module-device-restore.c
  
  static const char* const valid_modargs[] = {
      "restore_volume",
-@@ -611,6 +613,9 @@ static void subscribe_callback(pa_core *
+@@ -613,6 +615,9 @@ static void subscribe_callback(pa_core *
          if (!(sink = pa_idxset_get_by_index(c->sinks, idx)))
              return;
  
@@ -38,7 +38,7 @@ Index: pulseaudio/src/modules/module-device-restore.c
          type = PA_DEVICE_TYPE_SINK;
          name = pa_sprintf_malloc("sink:%s", sink->name);
          if (sink->active_port)
-@@ -650,6 +655,9 @@ static void subscribe_callback(pa_core *
+@@ -652,6 +657,9 @@ static void subscribe_callback(pa_core *
          if (!(source = pa_idxset_get_by_index(c->sources, idx)))
              return;
  
@@ -48,7 +48,7 @@ Index: pulseaudio/src/modules/module-device-restore.c
          type = PA_DEVICE_TYPE_SOURCE;
          name = pa_sprintf_malloc("source:%s", source->name);
          if (source->active_port)
-@@ -815,6 +823,9 @@ static pa_hook_result_t sink_port_hook_c
+@@ -818,6 +826,9 @@ static pa_hook_result_t sink_port_hook_c
      pa_assert(u);
      pa_assert(u->restore_volume || u->restore_muted);
  
@@ -58,7 +58,7 @@ Index: pulseaudio/src/modules/module-device-restore.c
      name = pa_sprintf_malloc("sink:%s", sink->name);
  
      if ((e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL)))) {
-@@ -956,6 +967,9 @@ static pa_hook_result_t source_port_hook
+@@ -960,6 +971,9 @@ static pa_hook_result_t source_port_hook
      pa_assert(u);
      pa_assert(u->restore_volume || u->restore_muted);
  
diff --git a/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch b/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch
deleted file mode 100644
index 82a45e9..0000000
--- a/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5c0bea7f5a0a649d86262d9dc8d81b69ad614cb4 Mon Sep 17 00:00:00 2001
-From: Ricardo Salveti de Araujo <rsalveti at rsalveti.net>
-Date: Wed, 17 Sep 2014 01:07:58 -0300
-Subject: [PATCH] libpulse.vapi: adding missing fields for
- sink_input/source_output info struct
-
-Upstream: http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-October/021885.html
-Signed-off-by: Ricardo Salveti de Araujo <rsalveti at rsalveti.net>
----
- vala/libpulse.vapi | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: pulseaudio/vala/libpulse.vapi
-===================================================================
---- pulseaudio.orig/vala/libpulse.vapi
-+++ pulseaudio/vala/libpulse.vapi
-@@ -1376,6 +1376,9 @@ namespace PulseAudio {
-                 public string driver;
-                 public int mute;
-                 public Proplist proplist;
-+                public int corked;
-+                public int has_volume;
-+                public int volume_writable;
-         }
- 
-         [CCode (cname="pa_source_output_info", has_type_id=false)]
-@@ -1392,6 +1395,11 @@ namespace PulseAudio {
-                 public string resample_method;
-                 public string driver;
-                 public Proplist proplist;
-+                public int corked;
-+                public CVolume volume;
-+                public int mute;
-+                public int has_volume;
-+                public int volume_writable;
-         }
- 
-         [CCode (cname="pa_stat_info", has_type_id=false)]
diff --git a/debian/patches/series b/debian/patches/series
index 7f56643..20f93ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,10 +5,8 @@ gnu-kfreebsd.patch
 0005-dont-load-cork-music-on-phone.patch
 0006-load-module-x11-bell.patch
 0016-nodisplay-autostart.patch
-#0020-stream-Return-error-in-case-a-client-peeks-to-early.patch
 0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
 0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
-0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch
 
 # Ubuntu touch stuff
 0202-dont-probe-ucm.patch
@@ -18,4 +16,3 @@ gnu-kfreebsd.patch
 0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
 0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
 0210-module-device-restore-adding-property-to-skip.patch
-0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:40 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:40 +0000
Subject: [pulseaudio] 14/19: Bump version number
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIG-0005CE-Qz@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 948a8f36c026183e5d709056ed89ee83bd297a6e
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Wed Nov 26 10:04:38 2014 +1100

    Bump version number
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bdd68e5..ed6f87b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (1:5.0-13ubuntu1) UNRELEASED; urgency=medium
+pulseaudio (1:5.99.1-0ubuntu1) UNRELEASED; urgency=medium
 
   * Merge from Debian unstable, remaining changes:
     - epoch (my stupid fault :S)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:40 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:40 +0000
Subject: [pulseaudio] 15/19: Bump back up to using bluez5
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIG-0005CY-VP@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit eedf52a84033be591d749ed0107f69ba6f5fa760
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Wed Nov 26 10:06:08 2014 +1100

    Bump back up to using bluez5
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index ab3b2b1..29ae8fd 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9),
     libasyncns-dev,
     libatomic-ops-dev,
     libavahi-client-dev,
-    libbluetooth-dev (>= 4.40) [linux-any],
+    libbluetooth-dev (>= 4.99) [linux-any],
     libsbc-dev [linux-any],
     libcap-dev [linux-any],
     libfftw3-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:41 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:41 +0000
Subject: [pulseaudio] 16/19: Fix typo in the updating of a patch
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIH-0005Cy-2z@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 6a5af30093bdcfbdd850a2ee716c93f2b451cf24
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Wed Nov 26 10:14:18 2014 +1100

    Fix typo in the updating of a patch
---
 .../0209-module-switch-on-connect-adding-parameter-to-allow-s.patch     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
index 2d0c47f..f8a679e 100644
--- a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
+++ b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
@@ -16,7 +16,7 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c
  PA_MODULE_LOAD_ONCE(true);
  PA_MODULE_USAGE(
          "only_from_unavailable=<boolean, only switch from unavailable ports> "
-+        "skip_abstract=<yes or no>");
++        "skip_abstract=<yes or no>"
  );
  
  static const char* const valid_modargs[] = {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:41 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:41 +0000
Subject: [pulseaudio] 17/19: Update call to rtpoll_run
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIH-0005DJ-61@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit fb3765c65883d0c1ca249ec2d1c9104c18196d37
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Wed Nov 26 10:24:27 2014 +1100

    Update call to rtpoll_run
---
 debian/patches/0207-Enable-pulseaudio-droid.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0207-Enable-pulseaudio-droid.patch b/debian/patches/0207-Enable-pulseaudio-droid.patch
index 3fdecaf..56c64ec 100644
--- a/debian/patches/0207-Enable-pulseaudio-droid.patch
+++ b/debian/patches/0207-Enable-pulseaudio-droid.patch
@@ -829,7 +829,7 @@ Index: pulseaudio/src/modules/droid/droid-sink.c
 +            pa_rtpoll_set_timer_disabled(u->rtpoll);
 +
 +        /* Sleep */
-+        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
++        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
 +            goto fail;
 +
 +        if (ret == 0)
@@ -2099,7 +2099,7 @@ Index: pulseaudio/src/modules/droid/droid-source.c
 +            pa_rtpoll_set_timer_disabled(u->rtpoll);
 +
 +        /* Sleep */
-+        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
++        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
 +            goto fail;
 +
 +        if (ret == 0)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:41 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:41 +0000
Subject: [pulseaudio] 18/19: Adjust for PPA version
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIH-0005Dd-AE@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit e123399b0f7e700a0e3479e55a2515fed4cdc742
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Wed Nov 26 14:05:03 2014 +1100

    Adjust for PPA version
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ed6f87b..b72ad88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (1:5.99.1-0ubuntu1) UNRELEASED; urgency=medium
+pulseaudio (1:5.99.1-0ubuntu1~vivid1) UNRELEASED; urgency=medium
 
   * Merge from Debian unstable, remaining changes:
     - epoch (my stupid fault :S)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:41 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:41 +0000
Subject: [pulseaudio] 19/19: Disable systemd socket activation for now
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIH-0005Dy-Dl@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 8209b8373107e7999192ec206c05ce4cdfec6896
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Thu Nov 27 08:36:19 2014 +1100

    Disable systemd socket activation for now
---
 debian/changelog | 3 ++-
 debian/rules     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b72ad88..e26bd27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (1:5.99.1-0ubuntu1~vivid1) UNRELEASED; urgency=medium
+pulseaudio (1:5.99.1-0ubuntu1~vivid2) UNRELEASED; urgency=medium
 
   * Merge from Debian unstable, remaining changes:
     - epoch (my stupid fault :S)
@@ -53,6 +53,7 @@ pulseaudio (1:5.99.1-0ubuntu1~vivid1) UNRELEASED; urgency=medium
   * Update symbols
   * Refreshed patches, and dropped patches that were either applied upstream
     or are obsolete
+  * Disable systemd socket activation for now
 
  -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2014 11:21:32 +1100
 
diff --git a/debian/rules b/debian/rules
index b025014..1dee76a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,8 @@ debian/stamp-post-patches:
 # normal directory as pulseaudio is foreign
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 \
   --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-  --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules
+  --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules \
+  --disable-systemd-daemon
 
 ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1)
   DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:49:01 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:49:01 +0000
Subject: [pulseaudio] branch upstream updated (bbd5e15 -> 9d219da)
Message-ID: <20141130224900.21191.55718@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a change to branch upstream
in repository pulseaudio.

      from  bbd5e15   Imported Upstream version 5.0
      adds  9d219da   Imported Upstream version 5.99.1

No new revisions were added by this update.

Summary of changes:
 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 Makefile.am                                        |   22 +-
 Makefile.in                                        |   86 +-
 NEWS                                               |   61 +
 PROTOCOL                                           |   22 +-
 README                                             |    3 -
 bootstrap.sh                                       |    4 -
 build-aux/ltmain.sh                                |    4 +-
 config.h.in                                        |   25 +-
 configure                                          |  919 +++--
 configure.ac                                       |  154 +-
 doxygen/Makefile.in                                |   18 +-
 doxygen/doxygen.conf.in                            | 1115 ++++--
 man/Makefile.am                                    |    3 -
 man/Makefile.in                                    |   26 +-
 man/default.pa.5                                   |    4 +-
 man/pactl.1                                        |   20 +-
 man/pactl.1.xml.in                                 |   27 +-
 man/pax11publish.1                                 |    2 +-
 man/pulse-cli-syntax.5                             |    4 +-
 man/pulse-client.conf.5                            |    6 +-
 man/pulse-client.conf.5.xml.in                     |    2 +-
 man/pulse-daemon.conf.5                            |   18 +-
 man/pulse-daemon.conf.5.xml.in                     |   14 +-
 man/pulseaudio.1                                   |    6 +-
 man/start-pulseaudio-kde.1                         |   14 -
 man/start-pulseaudio-kde.1.xml.in                  |   48 -
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    4 +-
 po/el.po                                           | 3587 ++++++++++++--------
 po/pt_BR.po                                        |  854 ++---
 po/ru.po                                           |  465 +--
 po/{he.po => sk.po}                                | 3433 ++++++++++---------
 po/uk.po                                           |  581 ++--
 pulseaudio.supp                                    |   50 +
 .../pulseaudio}                                    |    4 +-
 .../_pulseaudio}                                   |  402 ++-
 src/.gitignore                                     |   11 +-
 src/Makefile.am                                    |  140 +-
 src/Makefile.in                                    | 1312 ++++---
 src/daemon/.gitignore                              |    1 -
 src/daemon/caps.c                                  |    7 +-
 src/daemon/cmdline.c                               |    2 +-
 src/daemon/daemon-conf.c                           |    8 +-
 src/daemon/daemon.conf.in                          |    2 +-
 src/daemon/default.pa.in                           |   10 +-
 src/daemon/main.c                                  |  181 +-
 src/daemon/pulseaudio-kde.desktop.in               |   10 -
 src/daemon/pulseaudio.desktop.in                   |    1 +
 src/daemon/server-lookup.c                         |   30 +-
 src/daemon/start-pulseaudio-kde.in                 |   30 -
 src/daemon/start-pulseaudio-x11.in                 |    6 +-
 src/daemon/systemd/user/pulseaudio.service.in      |   10 +
 src/daemon/systemd/user/pulseaudio.socket          |   10 +
 src/map-file                                       |    3 +
 src/modules/alsa/alsa-mixer.c                      |  248 +-
 src/modules/alsa/alsa-mixer.h                      |   10 +-
 src/modules/alsa/alsa-sink.c                       |   37 +-
 src/modules/alsa/alsa-source.c                     |   35 +-
 src/modules/alsa/alsa-ucm.c                        |    7 +-
 src/modules/alsa/alsa-util.c                       |  121 +-
 src/modules/alsa/alsa-util.h                       |    9 +-
 src/modules/alsa/mixer/paths/analog-input.conf     |   15 +
 .../mixer/paths/analog-output-desktop-speaker.conf |  102 -
 .../mixer/paths/analog-output-headphones-2.conf    |    8 +
 .../alsa/mixer/paths/analog-output-headphones.conf |   20 +
 .../alsa/mixer/paths/analog-output-lineout.conf    |   19 +
 .../alsa/mixer/paths/analog-output-mono.conf       |   10 +
 .../mixer/paths/analog-output-speaker-always.conf  |   16 +-
 .../alsa/mixer/paths/analog-output-speaker.conf    |   22 +-
 src/modules/alsa/mixer/paths/analog-output.conf    |   30 -
 src/modules/alsa/mixer/paths/hdmi-output-4.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-5.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-6.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-7.conf    |   10 +
 .../alsa/mixer/profile-sets/90-pulseaudio.rules    |    4 -
 src/modules/alsa/mixer/profile-sets/default.conf   |  292 +-
 .../alsa/mixer/profile-sets/extra-hdmi.conf        |  164 -
 .../profile-sets/force-speaker-and-int-mic.conf    |   46 +-
 .../alsa/mixer/profile-sets/force-speaker.conf     |   46 +-
 src/modules/alsa/module-alsa-card.c                |   77 +-
 src/modules/bluetooth/backend-native.c             |  501 +++
 src/modules/bluetooth/backend-ofono.c              |  665 ++++
 src/modules/bluetooth/bluez5-util.c                |  201 +-
 src/modules/bluetooth/bluez5-util.h                |   53 +-
 src/modules/bluetooth/module-bluetooth-discover.c  |    5 +-
 src/modules/bluetooth/module-bluetooth-policy.c    |   45 +-
 src/modules/bluetooth/module-bluez4-device.c       |   39 +-
 src/modules/bluetooth/module-bluez5-device.c       |  686 +++-
 src/modules/bluetooth/module-bluez5-discover.c     |   39 +-
 src/modules/dbus/iface-core.c                      |    6 +-
 src/modules/dbus/iface-device.c                    |   15 +-
 src/modules/dbus/iface-stream.c                    |    4 +-
 src/modules/echo-cancel/module-echo-cancel.c       |   31 +-
 src/modules/gconf/gconf-helper.c                   |    2 +
 src/modules/gconf/module-gconf.c                   |    7 +-
 src/modules/jack/module-jack-sink.c                |    4 +-
 src/modules/jack/module-jack-source.c              |    4 +-
 src/modules/macosx/module-coreaudio-device.c       |    2 +-
 src/modules/module-card-restore.c                  |    6 +-
 src/modules/module-combine-sink.c                  |  193 +-
 src/modules/module-console-kit.c                   |   10 +-
 src/modules/module-device-manager.c                |    4 +-
 src/modules/module-device-restore.c                |   18 +-
 src/modules/module-equalizer-sink.c                |    2 +-
 src/modules/module-esound-sink.c                   |   15 +-
 src/modules/module-mmkbd-evdev.c                   |    7 +-
 src/modules/module-null-sink.c                     |    2 +-
 src/modules/module-null-source.c                   |    2 +-
 src/modules/module-pipe-sink.c                     |    2 +-
 src/modules/module-pipe-source.c                   |    2 +-
 src/modules/module-protocol-stub.c                 |    6 +-
 src/modules/module-rescue-streams.c                |  105 +-
 src/modules/module-role-cork.c                     |    9 +-
 src/modules/module-sine-source.c                   |    2 +-
 src/modules/module-solaris.c                       |   27 +-
 src/modules/module-stream-restore.c                |   24 +-
 src/modules/module-suspend-on-idle.c               |    5 +-
 src/modules/module-switch-on-connect.c             |   34 +-
 src/modules/module-switch-on-port-available.c      |   38 +-
 src/modules/module-tunnel-sink-new.c               |   98 +-
 src/modules/module-tunnel-source-new.c             |   47 +-
 src/modules/module-tunnel.c                        |   22 +-
 src/modules/module-virtual-surround-sink.c         |   57 +-
 src/modules/module-waveout.c                       |    2 +-
 src/modules/module-zeroconf-publish.c              |   47 +-
 src/modules/oss/module-oss.c                       |    2 +-
 src/modules/raop/module-raop-sink.c                |   10 +-
 src/modules/raop/raop_client.c                     |    9 +-
 src/modules/rtp/headerlist.c                       |    8 +-
 src/modules/rtp/module-rtp-recv.c                  |   14 +-
 src/modules/rtp/module-rtp-send.c                  |    2 +-
 src/modules/rtp/rtp.c                              |   25 +-
 src/modules/xen/module-xenpv-sink.c                |    2 +-
 src/pulse/channelmap.c                             |    6 +
 src/pulse/client-conf-x11.c                        |    9 +-
 src/pulse/client-conf-x11.h                        |    6 +-
 src/pulse/client-conf.c                            |  213 +-
 src/pulse/client-conf.h                            |   39 +-
 src/pulse/client.conf.in                           |    2 +-
 src/pulse/context.c                                |  153 +-
 src/pulse/def.h                                    |    4 +-
 src/pulse/{cdecl.h => direction.c}                 |   40 +-
 src/pulse/{error.h => direction.h}                 |   22 +-
 src/pulse/error.c                                  |    2 +-
 src/pulse/ext-device-manager.c                     |    1 +
 src/pulse/ext-device-manager.h                     |    3 +
 src/pulse/format.c                                 |   43 +-
 src/pulse/internal.h                               |    3 +
 src/pulse/introspect.c                             |    6 +-
 src/pulse/mainloop-api.h                           |   14 +-
 src/pulse/mainloop.c                               |   13 +-
 src/pulse/proplist.c                               |    5 +-
 src/pulse/proplist.h                               |    2 +-
 src/pulse/pulseaudio.h                             |    5 +-
 src/pulse/simple.c                                 |   21 +-
 src/pulse/stream.c                                 |   20 +-
 src/pulse/stream.h                                 |   13 +-
 src/pulse/thread-mainloop.c                        |    7 +-
 src/pulse/thread-mainloop.h                        |    4 +-
 src/pulse/util.c                                   |   59 +-
 src/pulse/version.h                                |    6 +-
 src/pulse/volume.h                                 |    2 +-
 src/pulsecore/asyncmsgq.c                          |    2 -
 src/pulsecore/aupdate.c                            |    2 +-
 src/pulsecore/auth-cookie.c                        |    2 +-
 src/pulsecore/authkey.c                            |   66 +-
 src/pulsecore/authkey.h                            |    3 +-
 src/pulsecore/card.c                               |    2 +-
 src/pulsecore/cli-text.c                           |    4 +-
 src/pulsecore/conf-parser.c                        |    1 +
 src/pulsecore/core-util.c                          |  157 +-
 src/pulsecore/core-util.h                          |    8 +-
 src/pulsecore/core.c                               |   16 +-
 src/pulsecore/core.h                               |   13 +-
 src/pulsecore/cpu-arm.c                            |   22 +-
 src/pulsecore/cpu-arm.h                            |    4 +-
 src/pulsecore/cpu.c                                |   38 +
 src/pulsecore/cpu.h                                |    6 +
 src/pulsecore/creds.h                              |   13 +
 src/pulsecore/database-simple.c                    |    9 +-
 src/pulsecore/device-port.c                        |   27 +
 src/pulsecore/device-port.h                        |    2 +
 src/pulsecore/endianmacros.h                       |   27 +-
 src/pulsecore/esound.h                             |    2 +-
 src/pulsecore/fdsem.c                              |    3 +-
 src/pulsecore/fdsem.h                              |    4 +-
 src/pulsecore/hashmap.c                            |   13 +
 src/pulsecore/hashmap.h                            |    7 +
 src/pulsecore/iochannel.c                          |   92 +-
 src/pulsecore/iochannel.h                          |    3 +-
 src/pulsecore/log.c                                |   12 +-
 src/pulsecore/log.h                                |    4 +-
 src/pulsecore/macro.h                              |    8 +-
 src/pulsecore/memblock.c                           |   56 +-
 src/pulsecore/memblock.h                           |   10 +-
 src/pulsecore/memblockq.c                          |    3 +-
 src/pulsecore/memchunk.c                           |    2 +-
 src/pulsecore/memtrap.c                            |    3 +
 src/pulsecore/mix.c                                |   31 +-
 src/pulsecore/mix_neon.c                           |  131 +-
 src/pulsecore/modargs.c                            |    3 -
 src/pulsecore/native-common.h                      |    7 +-
 src/pulsecore/pdispatch.c                          |   37 +-
 src/pulsecore/pdispatch.h                          |    4 +-
 src/pulsecore/pid.c                                |    2 +-
 src/pulsecore/pipe.c                               |    4 +-
 src/pulsecore/poll-win32.c                         |   60 +-
 src/pulsecore/protocol-dbus.c                      |    3 +-
 src/pulsecore/protocol-esound.c                    |   17 +-
 src/pulsecore/protocol-native.c                    |  133 +-
 src/pulsecore/protocol-native.h                    |    1 +
 src/pulsecore/pstream-util.c                       |   45 +-
 src/pulsecore/pstream-util.h                       |    1 +
 src/pulsecore/pstream.c                            |  351 +-
 src/pulsecore/pstream.h                            |    9 +-
 src/pulsecore/remap.c                              |  480 ++-
 src/pulsecore/remap.h                              |   20 +-
 src/pulsecore/remap_mmx.c                          |   53 +-
 src/pulsecore/remap_neon.c                         |  498 +++
 src/pulsecore/remap_sse.c                          |   53 +-
 src/pulsecore/resampler.c                          |  701 +---
 src/pulsecore/resampler.h                          |   51 +
 src/pulsecore/resampler/ffmpeg.c                   |  132 +
 src/pulsecore/resampler/libsamplerate.c            |  102 +
 src/pulsecore/resampler/peaks.c                    |  163 +
 src/pulsecore/resampler/speex.c                    |  180 +
 src/pulsecore/resampler/trivial.c                  |  102 +
 src/pulsecore/rtpoll.c                             |   14 +-
 src/pulsecore/rtpoll.h                             |    7 +-
 src/pulsecore/sample-util.c                        |    4 +-
 src/pulsecore/sconv-s16le.c                        |   22 +-
 src/pulsecore/sconv_neon.c                         |   10 +-
 src/pulsecore/sconv_sse.c                          |    3 +-
 src/pulsecore/shm.c                                |   12 +-
 src/pulsecore/shm.h                                |    2 +-
 src/pulsecore/sink-input.c                         |  157 +-
 src/pulsecore/sink-input.h                         |   14 +-
 src/pulsecore/sink.c                               |  249 +-
 src/pulsecore/sink.h                               |   37 +-
 src/pulsecore/socket-server.c                      |   98 +-
 src/pulsecore/socket-util.c                        |   18 +
 src/pulsecore/source-output.c                      |  136 +-
 src/pulsecore/source-output.h                      |   14 +-
 src/pulsecore/source.c                             |  235 +-
 src/pulsecore/source.h                             |   33 +-
 src/pulsecore/srbchannel.c                         |  378 +++
 src/pulsecore/srbchannel.h                         |   59 +
 src/pulsecore/start-child.c                        |    2 +-
 src/pulsecore/svolume_c.c                          |    6 +-
 src/tests/alsa-time-test.c                         |   37 +-
 src/tests/connect-stress.c                         |    8 +-
 src/tests/cpu-mix-test.c                           |  226 ++
 src/tests/cpu-remap-test.c                         |  436 +++
 src/tests/cpu-sconv-test.c                         |  265 ++
 src/tests/cpu-test.c                               |  887 -----
 src/tests/cpu-volume-test.c                        |  249 ++
 src/tests/flist-test.c                             |    2 +-
 src/tests/format-test.c                            |    2 +-
 src/tests/lo-test-util.c                           |   10 +-
 src/tests/mcalign-test.c                           |    5 +-
 src/tests/memblock-test.c                          |    4 +-
 src/tests/mix-special-test.c                       |  326 --
 src/tests/mix-test.c                               |  231 +-
 src/tests/resampler-test.c                         |    8 +-
 src/tests/rtpoll-test.c                            |    4 +-
 src/tests/sigbus-test.c                            |    2 +
 src/tests/srbchannel-test.c                        |  138 +
 src/utils/pacat.c                                  |   12 +-
 src/utils/pactl.c                                  |  322 +-
 src/utils/pax11publish.c                           |   12 +-
 vala/libpulse-simple.deps                          |    1 +
 vala/libpulse-simple.vapi                          |   36 +
 vala/libpulse.vapi                                 |    8 +
 275 files changed, 17874 insertions(+), 9941 deletions(-)
 delete mode 100644 man/start-pulseaudio-kde.1
 delete mode 100644 man/start-pulseaudio-kde.1.xml.in
 copy po/{he.po => sk.po} (57%)
 create mode 100644 pulseaudio.supp
 rename shell-completion/{pulseaudio-bash-completion.sh => bash/pulseaudio} (99%)
 rename shell-completion/{pulseaudio-zsh-completion.zsh => zsh/_pulseaudio} (60%)
 delete mode 100644 src/daemon/pulseaudio-kde.desktop.in
 delete mode 100755 src/daemon/start-pulseaudio-kde.in
 create mode 100644 src/daemon/systemd/user/pulseaudio.service.in
 create mode 100644 src/daemon/systemd/user/pulseaudio.socket
 delete mode 100644 src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
 create mode 100644 src/modules/alsa/mixer/paths/hdmi-output-4.conf
 create mode 100644 src/modules/alsa/mixer/paths/hdmi-output-5.conf
 create mode 100644 src/modules/alsa/mixer/paths/hdmi-output-6.conf
 create mode 100644 src/modules/alsa/mixer/paths/hdmi-output-7.conf
 delete mode 100644 src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
 create mode 100644 src/modules/bluetooth/backend-native.c
 create mode 100644 src/modules/bluetooth/backend-ofono.c
 copy src/pulse/{cdecl.h => direction.c} (54%)
 copy src/pulse/{error.h => direction.h} (62%)
 create mode 100644 src/pulsecore/cpu.c
 create mode 100644 src/pulsecore/remap_neon.c
 create mode 100644 src/pulsecore/resampler/ffmpeg.c
 create mode 100644 src/pulsecore/resampler/libsamplerate.c
 create mode 100644 src/pulsecore/resampler/peaks.c
 create mode 100644 src/pulsecore/resampler/speex.c
 create mode 100644 src/pulsecore/resampler/trivial.c
 create mode 100644 src/pulsecore/srbchannel.c
 create mode 100644 src/pulsecore/srbchannel.h
 create mode 100644 src/tests/cpu-mix-test.c
 create mode 100644 src/tests/cpu-remap-test.c
 create mode 100644 src/tests/cpu-sconv-test.c
 delete mode 100644 src/tests/cpu-test.c
 create mode 100644 src/tests/cpu-volume-test.c
 delete mode 100644 src/tests/mix-special-test.c
 create mode 100644 src/tests/srbchannel-test.c
 create mode 100644 vala/libpulse-simple.deps
 create mode 100644 vala/libpulse-simple.vapi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:49:14 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:49:14 +0000
Subject: [pulseaudio] branch pristine-tar updated (de07956 -> 5696911)
Message-ID: <20141130224914.22005.55945@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a change to branch pristine-tar
in repository pulseaudio.

      from  de07956   pristine-tar data for pulseaudio_5.0.orig.tar.xz
       new  5696911   pristine-tar data for pulseaudio_5.99.1.orig.tar.xz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pulseaudio_5.99.1.orig.tar.xz.delta | Bin 0 -> 35840 bytes
 pulseaudio_5.99.1.orig.tar.xz.id    |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 pulseaudio_5.99.1.orig.tar.xz.delta
 create mode 100644 pulseaudio_5.99.1.orig.tar.xz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:49:15 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:49:15 +0000
Subject: [pulseaudio] 01/01: pristine-tar data for
 pulseaudio_5.99.1.orig.tar.xz
In-Reply-To: <20141130224914.22005.55945@moszumanska.debian.org>
References: <20141130224914.22005.55945@moszumanska.debian.org>
Message-ID: <E1XvDIp-0005k6-2h@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch pristine-tar
in repository pulseaudio.

commit 5696911fddc9b90d303081866cfc654993521b88
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 09:38:43 2014 +1100

    pristine-tar data for pulseaudio_5.99.1.orig.tar.xz
---
 pulseaudio_5.99.1.orig.tar.xz.delta | Bin 0 -> 35840 bytes
 pulseaudio_5.99.1.orig.tar.xz.id    |   1 +
 2 files changed, 1 insertion(+)

diff --git a/pulseaudio_5.99.1.orig.tar.xz.delta b/pulseaudio_5.99.1.orig.tar.xz.delta
new file mode 100644
index 0000000..03b7b1b
Binary files /dev/null and b/pulseaudio_5.99.1.orig.tar.xz.delta differ
diff --git a/pulseaudio_5.99.1.orig.tar.xz.id b/pulseaudio_5.99.1.orig.tar.xz.id
new file mode 100644
index 0000000..660ac46
--- /dev/null
+++ b/pulseaudio_5.99.1.orig.tar.xz.id
@@ -0,0 +1 @@
+c8f12d72a7ee025ded7cd31476b168b37f03c69c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:49:32 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:49:32 +0000
Subject: [pulseaudio] annotated tag upstream/5.99.1 created (now dfebf9f)
Message-ID: <20141130224932.22368.10347@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a change to annotated tag upstream/5.99.1
in repository pulseaudio.

        at  dfebf9f   (tag)
   tagging  9d219dac2000a04b697106f01bf42498b2e90e42 (commit)
  replaces  upstream/5.0
 tagged by  Luke Yelavich
        on  Tue Nov 25 09:38:43 2014 +1100

- Log -----------------------------------------------------------------
Upstream version 5.99.1

Luke Yelavich (1):
      Imported Upstream version 5.99.1

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

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:37 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:37 -0000
Subject: [pulseaudio] 01/19: Merge Ubuntu changes with updated Debian
 packaging.
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIC-00056K-Lu@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit ba509cf5a622a7e5c3c9322e42c8a4dab99078c8
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 18 12:22:30 2014 +1100

    Merge Ubuntu changes with updated Debian packaging.
---
 debian/changelog                                   | 3396 +++++++++++-
 debian/control                                     |   41 +-
 debian/gbp.conf                                    |    1 +
 .../0005-dont-load-cork-music-on-phone.patch       |   13 +
 debian/patches/0006-load-module-x11-bell.patch     |   24 +
 debian/patches/0016-nodisplay-autostart.patch      |   14 +
 ...urn-error-in-case-a-client-peeks-to-early.patch |   64 +
 ...rapper-Quit-daemon-if-pid-file-is-removed.patch |  257 +
 ...nd_mixer_poll_descriptors_count_when_zero.patch |   16 +
 ....c-changing-default-rlimit_rttime-value-t.patch |   26 +
 debian/patches/0202-dont-probe-ucm.patch           |   14 +
 ...0203-card-Add-hook-before-profile-changes.patch |   37 +
 ...tooth-discover-adding-module-option-profi.patch |   45 +
 debian/patches/0207-Enable-pulseaudio-droid.patch  | 5513 ++++++++++++++++++++
 ...tooth-device-Allow-leaving-transport-runn.patch |  220 +
 ...ch-on-connect-adding-parameter-to-allow-s.patch |   88 +
 ...le-device-restore-adding-property-to-skip.patch |   70 +
 ...pi-adding-missing-fields-for-sink_input-s.patch |   38 +
 debian/patches/series                              |   20 +
 debian/pulseaudio-module-droid.install             |    6 +
 debian/pulseaudio.install                          |    2 -
 debian/pulseaudio.upstart.example                  |   48 +
 debian/rules                                       |   14 +
 debian/tests/build                                 |   30 +
 debian/tests/control                               |    2 +
 25 files changed, 9970 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e1e9dd..d5fec58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+pulseaudio (1:5.0-13ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - epoch (my stupid fault :S)
+    - Remove libwebrtc-audio-processing-dev build dep, its in universe
+    - Don't ship the consolekit module, and explicitly depend on the PAM
+      systemd module
+    - Add a module to allow pulseaudio to use the Android audio HAL
+    - Adjust gbp.conf file to point to the ubuntu branch for package builds
+    - Disable module-role-cork by default
+    - Load module-x11-bell in the start-pulseaudio-x11 script
+    - Hide pulseaudio from startup apps dialog
+    - Quit daemon if pid file is removed
+    - Avoid abort when poll descriptor is 0, such as when using it with the
+      audioflinger bridge, like done in ubuntu touch
+    - change default rlimit_rttime value to 200 ms
+    - Don't probe UCM profiles, trust that the profile writer knows what they
+      are doing
+    - Add card hook to allow modules to do something before a profile becomes
+      active
+    - Add an option to the bluez4 discovery module to set the profile
+    - Allow leaving bluetooth transport running while sink and source are
+      suspended.
+    - Add option to module-switch-on-connect to skip abstract devices
+    - Add property to module-device-restore to skip store/restore
+    - Add missing fields for sink_input/source_output info struct to the vala
+      bindings
+    - Add example upstart job to run pulseaudio in system mode
+    - Add a build/run autopkgtest for libpulse-dev
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2014 11:21:32 +1100
+
 pulseaudio (5.0-13) unstable; urgency=medium
 
   * Replace raop channels patch with proper fix from upstream.
@@ -251,6 +283,228 @@ pulseaudio (4.0-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 16 Jun 2013 17:20:36 +0200
 
+pulseaudio (1:4.0-0ubuntu22) utopic; urgency=medium
+
+  * 0211-module-stream-restore-use-entry_write-when-filling-u.patch =>
+    0108-module-stream-restore-use-entry_write-when-filling-u.patch:
+    - Renaming as it was accepted upstream
+  * 0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch:
+    - Patch sent upstream, adding link to the thread
+  * 0207-Enable-pulseaudio-droid.patch:
+    - Fixing route when adding/removing devices (LP: #1363083)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Wed, 08 Oct 2014 02:01:14 -0300
+
+pulseaudio (1:4.0-0ubuntu21) utopic; urgency=medium
+
+  * 0211-module-stream-restore-use-entry_write-when-filling-u.patch:
+    - Fixing use case for fallback_table, so we can provide default values
+      for stream restore
+  * 0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch:
+    - Adding missing fields for sink_input/source_output structs
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Wed, 01 Oct 2014 12:37:54 -0300
+
+pulseaudio (1:4.0-0ubuntu20) utopic; urgency=medium
+
+  * debian/pulseaudio.install:
+    - Installing missing module-role-ducking
+  * 0107-sink-source-Fix-restore-of-volume-on-devices-without.patch:
+    - Updated version of 0211-fix-volume-max-boot.patch, that was merged
+      upstream
+  * 0207-Enable-pulseaudio-droid.patch:
+    - Adding option to create voice virtual stream when voicecall is active
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Thu, 04 Sep 2014 01:07:26 -0300
+
+pulseaudio (1:4.0-0ubuntu19) utopic; urgency=medium
+
+  * 0210-module-device-restore-adding-property-to-skip.patch:
+    - Adding property to skip device store/restore per sink/source
+  * 0211-fix-volume-max-boot.patch:
+    - Fix initial volume for sink (LP: #598308)
+  * 0207-Enable-pulseaudio-droid.patch:
+    - Adding support to track voice call volume when switching to the
+      voicecall mode
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Wed, 20 Aug 2014 15:15:16 -0300
+
+pulseaudio (1:4.0-0ubuntu18) utopic; urgency=medium
+
+  * 0207-Enable-pulseaudio-droid.patch:
+    - Fixing default priority for sink/source ports
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Fri, 01 Aug 2014 01:18:38 -0300
+
+pulseaudio (1:4.0-0ubuntu17) utopic; urgency=medium
+
+  * 0207-Enable-pulseaudio-droid.patch:
+    - droid-sink: enabling transport property on sco.fakesink
+    - droid-source: setting up default audio source
+  * 0208-module-bluetooth-device-Allow-leaving-transport-runn.patch:
+    - module-bluetooth-device: Allow leaving transport running while sink and
+      source source are suspended.
+  * 0209-module-switch-on-connect-adding-parameter-to-allow-s.patch:
+    - module-switch-on-connect: adding parameter to allow skipping abstract
+      devices
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Mon, 21 Jul 2014 19:00:21 -0300
+
+pulseaudio (1:4.0-0ubuntu16) utopic; urgency=medium
+
+  * 0207-Enable-pulseaudio-droid.patch:
+    - Skipping SPEAKER_DRC_ENABLED_TAG as it's not yet supported (available on
+      hammerhead)
+    - Adding missing flags (AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD and
+      AUDIO_OUTPUT_FLAG_NON_BLOCKING)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Sat, 28 Jun 2014 01:16:55 -0300
+
+pulseaudio (1:4.0-0ubuntu15) utopic; urgency=medium
+
+  * 0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch:
+    - Changing default rlimit_rttime value as rtkit's limit is now 200ms
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Fri, 27 Jun 2014 16:57:48 -0300
+
+pulseaudio (1:4.0-0ubuntu14) utopic; urgency=medium
+
+  * Removing 0201-ALSA-Add-extcon-Android-switch-jack-detection.patch,
+    0204-Add-module-to-talk-to-the-Android-audio-hal-to-set-u.patch and
+    Disable-tsched-for-Nexus-10.patch code migrated to the pulse droid module
+  * Removing 0206-enable-module-switch-on-connect-ubuntu-touch.patch, as touch
+    as its own script file now
+  * 0206-module-bluetooth-discover-adding-module-option-profi.patch:
+    - Adding module option 'profile' in module-bluetooth-discover
+  * 0207-Enable-pulseaudio-droid.patch:
+    - Adding pulseaudio-droid element (used by Ubuntu Touch)
+  * debian/control: adding pulseaudio-module-droid
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Mon, 23 Jun 2014 03:23:51 -0300
+
+pulseaudio (1:4.0-0ubuntu13) utopic; urgency=medium
+
+  * 0206-enable-module-switch-on-connect-ubuntu-touch.patch:
+    - Enable module switch-on-connect by default on Ubuntu Touch
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Mon, 16 Jun 2014 21:45:19 -0300
+
+pulseaudio (1:4.0-0ubuntu12) utopic; urgency=high
+
+  * No change rebuild against new dh_installinit, to call update-rc.d at
+    postinst.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Wed, 28 May 2014 10:41:54 +0100
+
+pulseaudio (1:4.0-0ubuntu11) trusty; urgency=medium
+
+  * 0105-sink-source-Initialize-port-before-fixate-hook-fixes.patch:
+    Fix volume/mute not restored in some cases (LP: #1285179, LP: #1289515)
+  * 0106-module-switch-on-port-available-Don-t-switch-profile.patch:
+    Fix profile incorrectly switched on startup (LP: #1256511) 
+
+ -- David Henningsson <david.henningsson at canonical.com>  Fri, 04 Apr 2014 09:39:55 +0200
+
+pulseaudio (1:4.0-0ubuntu10) trusty; urgency=medium
+
+  * 0204-Add-module-to-talk-to-the-Android-audio-hal-to-set-u.patch:
+    - Setting audio mode before shutting down output stream (LP: #1283818)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Thu, 27 Feb 2014 22:37:56 -0300
+
+pulseaudio (1:4.0-0ubuntu9) trusty; urgency=medium
+
+  * 0205-suspend-on-idle-ensure-we-still-time-out-if-a-stream-remains-corked.patch:
+    - Properly suspending sink/source if the stream started corked and remains
+      corked (LP: #1284415)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Tue, 25 Feb 2014 16:37:26 -0300
+
+pulseaudio (1:4.0-0ubuntu8) trusty; urgency=medium
+
+  * 0201-ALSA-Add-extcon-Android-switch-jack-detection.patch:
+    - Only getting udev events from the switch subsystem (LP: #1284410)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Mon, 24 Feb 2014 23:43:50 -0300
+
+pulseaudio (1:4.0-0ubuntu7) trusty; urgency=low
+
+  * 0204-Add-module-to-talk-to-the-Android-audio-hal-to-set-u.patch:
+    - Refresh patch to use libhardware's pkg-config instead of looking for
+      audio.h
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Fri, 20 Dec 2013 04:08:09 -0200
+
+pulseaudio (1:4.0-0ubuntu6) saucy; urgency=low
+
+  * Three crash fixes from upstream:
+    0102-combine-Fix-crash-in-output-freeing.patch:
+    - Fix crash in module-combine-sink (LP: #1228759)
+    0103-resampler-Fix-peaks-resampler-s-channel-handling.patch:
+    - Fix crash in peak resampler (LP: #1212019)
+    0104-default-system.pa-Do-not-load-module-dbus-protocol.patch:
+    - module-dbus-protocol is still crashy, unfortunately (LP: #1213369)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Mon, 30 Sep 2013 15:11:42 +0200
+
+pulseaudio (1:4.0-0ubuntu5) saucy; urgency=low
+
+  [ David Henningsson ]
+  * Ubuntu phone: Suspend sinks/sources before tearing down voice calls
+    (LP: #1226298)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Wed, 25 Sep 2013 13:06:49 -0300
+
+pulseaudio (1:4.0-0ubuntu4) saucy; urgency=low
+
+  * debian/patches/Disable-tsched-for-Nexus-10.patch
+    Add a workaround patch for Nexus 10 and only apply it on armhf
+
+ -- David Henningsson <david.henningsson at canonical.com>  Thu, 12 Sep 2013 17:07:21 -0400
+
+pulseaudio (1:4.0-0ubuntu3) saucy; urgency=low
+
+  * Ubuntu Phone: Enable setting volume in voice calls
+    Fix speaker phone mode on Nexus 4
+
+ -- David Henningsson <david.henningsson at canonical.com>  Tue, 10 Sep 2013 12:32:10 -0400
+
+pulseaudio (1:4.0-0ubuntu2+build1) saucy; urgency=low
+
+  * No-change rebuild (updated android-platform-headers)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Mon, 02 Sep 2013 17:12:10 +0200
+
+pulseaudio (1:4.0-0ubuntu2) saucy; urgency=low
+
+  * patches/020*, control, pulseaudio.install.armhf:
+    Add patches for Ubuntu Touch, make us detect Android jacks,
+    and talk to the Audio HAL for voice calls
+
+ -- David Henningsson <david.henningsson at canonical.com>  Tue, 27 Aug 2013 10:53:46 +0200
+
+pulseaudio (1:4.0-0ubuntu1) saucy; urgency=low
+
+  [ Luke Yelavich ]
+  * New upstream test release
+  * Drop all patches originally taken from upstream
+  * 0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch: Refreshed
+  * Update symbols files
+  * Update shlibs
+  * Add/update lintian overrides from Debian package
+
+  [ David Henningsson ]
+  * 0019-disable-dbus-protocol.patch: Dropped, bug fixed upstream
+  * 0007-handle-Master-Front.patch: Dropped. "Master Front" does not exist as
+    of Linux 3.9 
+  * Drop references to pulseaudio-module-udev, pulseaudio-rygel-media-server and
+    pulseaudio-module-hal. We didn't have them in 12.04 and we don't support
+    upgrades bypassing 12.04.
+  * Ship new module-remap-source module and bash completion 
+  * Add an build/run autopkgtest for libpulse-dev
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 26 Jul 2013 11:02:06 +1000
+
 pulseaudio (3.0-1) experimental; urgency=low
 
   [ Sjoerd Simons ]
@@ -301,6 +555,141 @@ pulseaudio (3.0-1) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Mon, 11 Feb 2013 19:33:15 +0100
 
+pulseaudio (1:3.0-0ubuntu9) saucy; urgency=low
+
+  * debian/patches/0112-*, 0113-*: Add better support for machines with
+    "Headphone Mic" and "Headset Mic" jacks, used in some newer hardware
+    (LP: #1169143)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Wed, 24 Jul 2013 09:43:55 +0200
+
+pulseaudio (1:3.0-0ubuntu8) saucy; urgency=low
+
+  * debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch:
+    - Avoid abort when poll descriptor is 0, such as when using it with the
+      audioflinger bridge, like done in ubuntu touch (LP: #1092377)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Mon, 10 Jun 2013 17:54:18 -0300
+
+pulseaudio (1:3.0-0ubuntu7) saucy; urgency=low
+
+  [ Martin Pitt ]
+  * Add 0111-logind-check.patch: Check for logind, not for systemd init. Patch
+    backported from upstream master.
+  * Switch to logind for session tracking:
+    - debian/control: Add systemd build dependencies for logind support. Move
+      dependency from consolekit to libpam-systemd.
+    - debian/pulseaudio.install: Install logind module instead of the
+      consolekit module.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 29 Apr 2013 15:13:12 +1000
+
+pulseaudio (1:3.0-0ubuntu6) raring; urgency=low
+
+  * 0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch:
+    Fix patch not to cause 100% CPU (LP: #1170313)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Thu, 18 Apr 2013 13:24:16 +0200
+
+pulseaudio (1:3.0-0ubuntu5) raring; urgency=low
+
+  * 0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch: 
+    Fix stale pulseaudio processes after logout (LP: #1167192)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Wed, 17 Apr 2013 16:13:04 +0200
+
+pulseaudio (1:3.0-0ubuntu4b2) raring; urgency=low
+
+  * Another no-change rebuild against libudev1 to pick up transitive
+    dependencies.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 14 Mar 2013 10:23:58 +0100
+
+pulseaudio (1:3.0-0ubuntu4b1) raring; urgency=low
+
+  * No-change rebuild against libudev1
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Wed, 13 Mar 2013 07:02:09 +0000
+
+pulseaudio (1:3.0-0ubuntu4) raring; urgency=low
+
+  [ Kaj Ailomaa ]
+  * 0108-module-jackdbus-detect-channel-config.patch
+    0109-module-jackdbus-detect-channel-config-fix.patch
+    Adds channel configuration to module-jackdbus-detect
+  * 0110-module-jackdbus-detect-channel-config-default.patch
+    Sets default channel config for module-jackdbus-detect to 2,
+    as jack is not well adapted for anything beyond mono or stereo
+    connections.
+
+ -- David Henningsson <david.henningsson at canonical.com>  Fri, 01 Mar 2013 15:13:31 +0100
+
+pulseaudio (1:3.0-0ubuntu3) raring; urgency=low
+
+  * 0106-reserve-Move-get_name_owner-to-the-public-rd_device-.patch,
+    0107-reserve-Fix-leaking-NameLost-signals-after-release-a.patch:
+    Fix sound suddenly stops working, seems particularly frequent with VLC
+    (LP: #1129990, LP: #1127872)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Thu, 21 Feb 2013 10:55:16 +0100
+
+pulseaudio (1:3.0-0ubuntu2) raring; urgency=low
+
+  * Update libpulse0 symbols
+  * Pulseaudio should have a hard dependency on the binary version of libpulse0
+    to guard against libpulsecommon ABI breakage.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 18 Feb 2013 09:43:39 +0000
+
+pulseaudio (1:3.0-0ubuntu1) raring; urgency=low
+
+  [ Luke Yelavich ]
+  * debian/control: Update Vcs-Bzr field for raring
+  * Bump upstream version and rules/shlib files to 3.0.
+
+  [ David Henningsson ]
+  * New upstream release (3.0)
+  * 0100-resampler-Fix-volume-on-downmix-to-mono.patch,
+    0101-alsa-mixer-Remove-analog-output-lfe-on-mono.patch,
+    0010-lp453966-handle-digmic-pt2.patch:
+    Dropped, applied upstream
+  * 0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch:
+    Dropped, Debian dropped it and we got it from there
+  * 0002-add-padsp-wrapper-check.patch:
+    Dropped, makes no sense now that OSS is disabled in the kernel
+  * 0008-delay-gnome-autostart.patch:
+    Dropped per Martin Pitt's recommendation (incompatible upstream change)
+  * 0101-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch,
+    0102-Call-change_cb-only-when-there-s-an-actual-change.patch,
+    0103-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch:
+    Added from upstream stable-3.x tree
+  * Other patches refreshed
+  * debian/control: PulseAudio binary package is no longer 
+    "Multi-Arch: foreign" (LP: #1078543)
+  * debian/control, pulseaudio-module-bluetooth.install:
+    Update for new bluetooth dependency (libsbc)
+  * debian/watch: Change to .xz by default (because Debian does)
+  * debian/pulseaudio.init: Don't claim to support reload (Debian BTS: #690736)
+  * debian/rules, debian/pulseaudio.manpages: Fix installation of default.pa
+    (Debian BTS: #690416)
+  * debian/rules: disable hal compat module
+  * debian/pulse-alsa.conf, debian/README.Debian,
+    debian/pulseaudio-esound-compat.links, debian/pulseaudio.init,
+    debian/pulseaudio.install: Sync with Debian.
+  * debian/manpages/esdcompat.1: Remove, already upstream.
+  * debian/control: Sync build-dependencies with debian, in particular,
+    - add fftw3 development library
+  * debian/control: Cosmetic changes (sync with Debian)
+  * debian/pulseaudio.postinst: Remove ancient upgrade stuff - we won't support
+    direct upgrades from 8.04 to 13.04+ anyway
+
+  [ Luke Yelavich ]
+  * 0104-alsa-ucm-Fallback-to-stereo-duplex.patch: Added from upstrea git
+    stable tree to fix ucm related issues.
+  * Disable use of UCM in PulseAudio for now.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 14 Feb 2013 12:05:20 +1100
+
 pulseaudio (2.1-2) experimental; urgency=low
 
   * debian/control: Use linux-any where applicable instead of specifying
@@ -322,6 +711,43 @@ pulseaudio (2.1-1) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 21 Jul 2012 17:38:52 +0200
 
+pulseaudio (1:2.1-0ubuntu4) quantal-proposed; urgency=low
+
+  * 0101-alsa-mixer-Remove-analog-output-lfe-on-mono.patch:
+    Fix muted audio on startup in Virtualbox VM (LP: #1016969) 
+  * 0020-stream-Return-error-in-case-a-client-peeks-to-early.patch:
+    Fix clients crashing when asking for data, but there is no data
+    to hand out (LP: #1058200) 
+
+ -- David Henningsson <david.henningsson at canonical.com>  Thu, 04 Oct 2012 14:43:27 +0200
+
+pulseaudio (1:2.1-0ubuntu3) quantal; urgency=low
+
+  [ David Henningsson ]
+  * 0100-resampler-Fix-volume-on-downmix-to-mono.patch:
+    Fix clipped audio on downmix to mono (LP: #416190)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 11 Sep 2012 09:24:29 +1000
+
+pulseaudio (1:2.1-0ubuntu2) quantal; urgency=low
+
+  * Merge changes that were accidentally squashed from 2.0-0ubuntu2.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 13 Aug 2012 15:14:32 +1000
+
+pulseaudio (1:2.1-0ubuntu1) quantal; urgency=low
+
+  [ David Henningsson ]
+  * Remove the old 01PulseAudio pm-utils script, since it
+    causes (LP: #665314) and is not recommended by upstream.
+
+  [ Luke Yelavich ]
+  * New upstream release.
+  * Dropped patches, applied upstream:
+    - 0621-Add-special-profiles-for-some-laptops-missing-speake.patch
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 13 Aug 2012 15:05:52 +1000
+
 pulseaudio (2.0-3) unstable; urgency=low
 
   [ Martin-?ric Racine ]
@@ -347,7 +773,7 @@ pulseaudio (2.0-2) unstable; urgency=low
     - LSB: NetworkManager to network-manager.
     - LSB: added missing Stop levels 0 and 6.
     - Added --disallow-exit option (Closes: #671470).
-  * pulseaudio-esound-compat.links: added man page link for esd.1.gz 
+  * pulseaudio-esound-compat.links: added man page link for esd.1.gz
   * watch: updated to point to FreeDesktop.org XZ tarball archive.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Fri, 18 May 2012 20:54:08 +0200
@@ -364,6 +790,44 @@ pulseaudio (2.0-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 13 May 2012 17:07:15 +0200
 
+pulseaudio (1:2.0-0ubuntu2) quantal; urgency=low
+
+  * deprecate pulseaudio.default.  Move it's helpful comments into the upstart
+    script.
+  * pulseaudio.upstart:
+    - replace mkdir/chmod/chown by install
+    - remove PULSEAUDIO_SYSTEM_START=0, and instead comment out the 'start on'
+      with a comment explaining how to re-enable
+    - remove started udev from start on - it's redundant with runlevel 2, and
+      would fail in the case of switching to runlevel 1 and back to 2.
+
+ -- Serge Hallyn <serge.hallyn at ubuntu.com>  Fri, 20 Jul 2012 12:30:47 -0500
+
+pulseaudio (1:2.0-0ubuntu1) quantal; urgency=low
+
+  [ Luke Yelavich ]
+  * New upstream release.
+  * Drop all patches which are now upstream, including jack detection.
+  * Refreshed patches:
+    - 0002-add-padsp-wrapper-check.patch
+    - 0005-dont-load-cork-music-on-phone.patch
+  * debian/pulseaudio.install: Point to module-role-cork.so
+  * debian/rules: pulse-1.1 -> pulse-2.0
+
+  [ Pali Roh?r ]
+  * Convert System V pulseaudio init script to upstart
+
+  [ Luke Yelavich ]
+  * debian/libpulse0.install, debian/libpulsedsp.install:
+    - Point to new location of libpulsecommon.
+  * Ship new modules:
+    - switch-on-port-available.so
+    - virtual-surround-sink.so
+  * Ship new manpages.
+  * Switch to package version 3.0 quilt.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 08 Jun 2012 15:51:39 +1000
+
 pulseaudio (1.1-3.2) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -397,6 +861,213 @@ pulseaudio (1.1-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 23 Oct 2011 11:08:01 +0200
 
+pulseaudio (1:1.1-0ubuntu16) quantal; urgency=low
+
+  [ Luke Yelavich ]
+  * debian/control: Update Vcs-Bzr field for quantal.
+
+  [ David Henningsson ]
+  * 0621-Add-special-profiles-for-some-laptops-missing-speake.patch:
+    Add missing speaker/internal mic ports for some laptops (LP #946232)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Mon, 28 May 2012 11:14:08 +0200
+
+pulseaudio (1:1.1-0ubuntu15) precise; urgency=low
+
+  * 0125-alsa-sink-source-Really-set-volumes-on-port-change.patch:
+    Fix volume not being correctly set on port change. With this fixed
+    we can also drop
+    0017-Hack-around-a-bug-in-the-core-causing-volumes-not-to.patch.
+  * 0022-allow-analog-input-path-for-no-volume.patch:
+    Allow inputs with no volume controls to still have ports. The lack of
+    ports caused a problem for the new sound settings UI (LP: #978109)
+  * 0126-alsa-sink-source-Make-sure-volumes-are-synchronised-.patch:
+    Fix volumes not synchronised in guest session (LP: #915035)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Thu, 12 Apr 2012 00:24:20 +0200
+
+pulseaudio (1:1.1-0ubuntu14) precise; urgency=low
+
+  * 012*.patch: Cherry-pick bugfix patches from upstream git
+  * 0620-alsa-mixer-Show-HDMI-ports-for-older-Nvidia-cards.patch (LP: #961286)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Fri, 30 Mar 2012 09:47:17 +0200
+
+pulseaudio (1:1.1-0ubuntu13) precise; urgency=low
+
+  * 0020-daemon-Initialize-dbus-to-use-thread-safe-mode-by-de.patch:
+    Make sure dbus is thread safe to avoid crashes in pa_make_realtime 
+    (LP: #937933)
+  * 0111-protocol-native-Protect-against-clients-trying-to-se.patch:
+    Don't crash if clients try to set a NULL port (LP: #951273)
+  * 0021-Fix-input-device-for-M-audio-fasttrack-pro.patch:
+    Probe two different input devices (LP: #569932)
+  * 0112-module-loopback-Never-call-adjust_rates-after-teardo.patch:
+    Don't crash on shutdown in module-loopback (LP: #946400)
+  * 0619-module-switch-on-port-available-Do-not-switch-profil.patch:
+    Prevent switching to HDMI profiles from analog profiles, as a result
+    of discussion on the pulseaudio-discuss and ubuntu-audio-dev mailinglist.
+
+ -- David Henningsson <david.henningsson at canonical.com>  Wed, 21 Mar 2012 10:47:33 +0100
+
+pulseaudio (1:1.1-0ubuntu12) precise; urgency=low
+
+  [ Luke Yelavich ]
+  * debian/control: Demote pulseaudio-esound-compat to suggests (LP: #930703)
+
+  [ David Henningsson ]
+  * 0110-flist-Avoid-the-ABA-problem.patch:
+    Fix occasional crashes in pa_memblock_free, pa_memblock_ref and drop_block
+    (LP: #924416)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Fri, 09 Mar 2012 00:08:42 +0100
+
+pulseaudio (1:1.1-0ubuntu11) precise; urgency=low
+
+  * Cherry-pick a few crash-related patches from upstream git
+  * 0616-alsa-mixer-Make-speaker-get-available-no-when-headph.patch:
+    Don't remove paths if the state(un)plugged of the jack differs (LP: 933825)  
+
+ -- David Henningsson <david.henningsson at canonical.com>  Wed, 29 Feb 2012 11:03:32 +0100
+
+pulseaudio (1:1.1-0ubuntu10) precise; urgency=low
+
+  * debian/pulse-alsa.conf: Update syntax, as this file was throwing
+    errors when apps used the alsa pulse plugin.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 23 Feb 2012 14:58:36 +1100
+
+pulseaudio (1:1.1-0ubuntu9) precise; urgency=low
+
+  * debian/pulseaudio.init: Don't tell the user pulseaudio daemon isn't
+    starting when in per-user mode.  This is the most common case in Ubuntu
+    and causing needless distracting text on the screen. (LP: #656426)
+
+ -- Mario Limonciello <Mario_Limonciello at Dell.com>  Fri, 17 Feb 2012 16:32:52 -0600
+
+pulseaudio (1:1.1-0ubuntu8) precise; urgency=low
+
+  [ David Henningsson ]
+  * Make sure we switch away from unavailable ports at 
+    startup (LP: #928914)
+  * 0020-Fix-Darth-Vader-panning-bug.patch: 
+    Fix distorted sound when panned hard left (or right). (LP: #928757)
+  * 0618-alsa-mixer-Don-t-use-dangling-pointers-as-port-hashm.patch:
+    Fix inability to set port when options were used (LP: #932804)
+  * Minimize margins for deferred volumes, as a workaround for volume 
+    changes being dropped on port change.
+  * 0610-Jack-detection-kcontrol-implementation.patch:
+    Fix a bug in the headphone path
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 17 Feb 2012 07:28:23 +1100
+
+pulseaudio (1:1.1-0ubuntu7) precise; urgency=low
+
+  * Move the pulse.conf ALSA config file to the correct location, alsa.conf.d
+    not conf.d, thanks to Pete Graner for teh heads up.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 09 Feb 2012 08:22:04 +1100
+
+pulseaudio (1:1.1-0ubuntu6) precise; urgency=low
+
+  [ David Henningsson ]
+  * 0103-alsa-mixer-Allow-speaker-port-to-control-Front-Speak.patch:
+    - Control "Front Speaker" and a few more. From upstream git. (LP: #551441)
+  * 0105-loopback-Fix-crashes.patch:
+    - Fix some crashes on shutting down the loopback module, from upstream git.
+  * 0104-alsa-Improve-well-known-descriptions-for-ports.patch:
+    - Replace with upstream version.
+  * 0018-module-tunnel-source-fixup-create_record_stream.patch:
+    - Fix protocol error in module-tunnel-source (LP: #923661)
+  * Fixup HDMI patch to make sure it does not affect M-audio fasttrack Pro
+    (LP: #926911)
+  * Add two more jack detection patches to make it work better with the 
+    upcoming UI changes
+
+  [ Martin-?ric Racine ]
+  * Use --disallow-exit when running in system mode, as recommended
+    by PulseAudio log file (LP: #922848)  
+
+  [ Luke Yelavich ]
+  * Move the main pulse ALSA configuration file, pulse.conf to
+    /usr/share/alsa/conf.d, available in ALSA 1.0.25.
+  * Disable the dbus-protocol by default, as there have been recent reports
+    of crashes and race conditions, and upstream no longer finds the code
+    trustworthy.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 08 Feb 2012 15:58:41 +1100
+
+pulseaudio (1:1.1-0ubuntu5) precise; urgency=low
+ 
+  * Redo jack detection patches, so that they use the new jack detection
+    interface and the upstream code whenever possible.
+  * New patch better-well-known-descriptions.patch:
+    - Simplify port names. This patch is to be committed upstream shortly
+  * New patches from upstream git:
+    - 0101-alsa-Ignore-the-virtual-thinkpad-acpi-card.patch:
+      Ignore the dummy thinkpad-acpi soundcard (as it cannot playback or
+      record sound anyway)
+    - 0102-alsa-mixer-When-selecting-an-input-turn-off-boosts-o.patch:
+      alsa-mixer: When selecting an input, turn off boosts of
+      other inputs
+
+ -- David Henningsson <david.henningsson at canonical.com>  Fri, 27 Jan 2012 13:56:46 +0100
+
+pulseaudio (1:1.1-0ubuntu4) precise; urgency=low
+
+  [ Daniel T Chen ]
+  * Don't load module-raop-discover by default. (LP: #782860)
+
+  [ Gabor Kelemen ]
+  * Run dh_translations to generate translation template, add it as build-dep.
+    (LP: #876866)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 14 Dec 2011 10:50:16 +1100
+
+pulseaudio (1:1.1-0ubuntu3) precise; urgency=low
+
+  * Allow pulseaudio-module-bluetooth to build on armhf.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Mon, 05 Dec 2011 12:57:06 -0700
+
+pulseaudio (1:1.1-0ubuntu2) precise; urgency=low
+
+  * No-change rebuild to drop spurious libsfgcc1 dependency on armhf.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Fri, 02 Dec 2011 17:31:22 -0700
+
+pulseaudio (1:1.1-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+  * debian/watch: Update to new location
+  * Dropped patches, as these were from upstream:
+    - 0100-extended-Fix-doxygen-comment-style-typos.patch
+    - 0101-sink-source-Avoid-unnecessary-call-to-pa_rtclock_now.patch
+    - 0102-Always-return-a-three-part-version-number-in-API-cal.patch
+    - 0103-module-jackdbus-detect-Avoid-double-free-of-modargs.patch
+    - 0104-source-output-Do-not-use-unset-channel-map-in-pa_sou.patch
+    - 0105-Fix-deferred-volume-not-being-applied-if-sink-is-clo.patch
+    - 0106-sink-Move-updating-the-requested-latency-after-the-r.patch
+    - 0107-n ull-sink-Set-latency-range-at-the-time-of-initializ.patch
+    - 0108-Make-pulse-build-with-clang-again.patch
+    - 0109-alsa-Give-compressed-formats-preference-over-PCM.patch
+    - 0110-alsa-Better-error-handling-in-mixer-rtpoll-callback.patch
+    - 0111-echo-cancel-Fail-if-loaded-between-a-sink-and-its-mo.patch
+    - 0112-doc-Add-some-more-doxygen-tags-to-existing-comments.patch
+    - 0113-alsa-Make-mixer-error-handling-more-robust-still.patch
+    - 0114-echo-cancel-Don-t-crash-if-adjust_time-0.patch
+    - 0115-echo-cancel-Close-debug-files-on-module-unload.patch
+    - 0116-tests-Fix-calculation-of-memblock-size-in-resampler-.patch
+    - 0117-filter-apply-Move-sink-source-unlink-callbacks-befor.patch
+    - 0118-build-sys-Drop-libsamplerate-from-pulsecommon-deps.patch
+    - 0119-build-sys-Provide-a-simple-CMake-Config-setup-simila.patch
+  * Put libpulsedsp.so into its own package, so it can be built for
+    multi-arch
+  * debian/rules: Update for 1.1
+  * Update shlib files
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 27 Oct 2011 12:36:17 +1100
+
 pulseaudio (1.0-4) unstable; urgency=low
 
   * debian/control: Don't depend on libasound2-plugins on kfreebsd
@@ -426,6 +1097,157 @@ pulseaudio (1.0-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Wed, 28 Sep 2011 00:52:27 +0100
 
+pulseaudio (1:1.0-0ubuntu4) precise; urgency=low
+
+  [ David Henningsson ]
+  * Added patches:
+    0103-module-jackdbus-detect-Avoid-double-free-of-modargs.patch:
+      (LP: #867444)
+    0104-source-output-Do-not-use-unset-channel-map-in-pa_sou.patch: 
+      (LP: #864071)
+    0105-Fix-deferred-volume-not-being-applied-if-sink-is-clo.patch,
+    0017-Hack-around-a-bug-in-the-core-causing-volumes-not-to.patch:
+      These two patches affect users not having their volume correctly
+      set on port change (LP: #877954)
+
+  [ Luke Yelavich ]
+  * debian/control: Update Vcs-Bzr field
+  * 0102-Always-return-a-three-part-version-number-in-API-cal.patch: Refresh
+    the patch from upstrea git, to refer to the correct commit hash, and
+    update the description
+  * Pull some bug fixes from the stable-1.x upstream git branch:
+    - 411af6b (sink: Move updating the requested latency after the rewind
+               request when finishing a stream move.)
+    - 87f70c6 (null-sink: Set latency range at the time of initialization of
+               module.)
+    - d71a291 (Make pulse build with clang again)
+    - 4e5943b (alsa: Give compressed formats preference over PCM)
+    - 867170a (alsa: Better error handling in mixer rtpoll callback)
+    - c055c55 (echo-cancel: Fail if loaded between a sink and its monitor)
+    - 8754e0c (doc: Add some more doxygen tags to existing comments)
+    - 2c30c07 (alsa: Make mixer error handling more robust still)
+    - 8a5e6e8 (echo-cancel: Don't crash if adjust_time = 0)
+    - 7b13a79 (echo-cancel: Close debug files on module unload)
+    - 6bf0489 (tests: Fix calculation of memblock size in resampler-test)
+    - 93f55a4 (filter-apply: Move sink/source unlink callbacks before m-s-r)
+    - b1dabfb (build-sys: Drop libsamplerate from pulsecommon deps)
+    - 743a4d0 (build-sys: Provide a simple CMake Config setup (similar to
+               pkgconfig))
+  * Add liborc-0.4-dev as a build dependency to add orc support
+  * debian/libpulse-dev.install: Ship cmake files
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 20 Oct 2011 11:36:43 +1100
+
+pulseaudio (1:1.0-0ubuntu3) oneiric; urgency=low
+
+  * debian/patches/0102-Always-return-a-three-part-version-number-in-API
+    -cal.patch: Update to fix skype regression as well (LP: #865820)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Thu, 06 Oct 2011 10:39:49 +0200
+
+pulseaudio (1:1.0-0ubuntu2) oneiric; urgency=low
+
+  [ Matthias Klose ]
+  * Drop build dependency on libatomic-ops-dev. Not needed on !ia64.
+
+  [ Scott Kitterman ]
+  * Add debian/patches/0102-Always-return-a-three-part-version-number-in-API
+    -cal.patch to fix regression in pulseaudio version detection by
+    applications depending on the three part version number previously used by
+    pulseaudio (including phonon)
+      - Cherrypicked from upstream
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 04 Oct 2011 22:06:39 -0500
+
+pulseaudio (1:1.0-0ubuntu1) oneiric; urgency=low
+
+  [ David Henningsson ]
+  * Fix "Parse failure" error with remote sources/sinks,
+    thanks to Martin-Eric Racine for reporting/testing! (LP: #852902)
+  * Fix crash when dbus module does not load (LP: #855729)
+  * Add more bug fixes from upstream git
+
+  [ Daniel T Chen ]
+  * debian/copyright: Update all shipped sources
+  * Various xcb_*() bugs already fixed in Sep 2010 (LP: #642030,
+    LP: #646583, LP: #646616, LP: #648104)
+  * Passthrough is supported in 1.0 (LP: #448024)
+  * PulseAudio + alsa-plugins route through PulseAudio by default
+    (LP: #378382)
+
+  [ Luke Yelavich ]
+  * New upstream bugfix release
+    - vala: Add has_type_id=false to all enums, structs and classes
+    - module-switch-on-connect: Don't switch unlinked sink input and source
+      outputs
+    - alsa-mixer: Set "Front" control to 0 dB on headphone path
+    - module-equalizer-sink: Use %z for printf of size_t variables
+    - module-equalizer-sink: Use = in initialising variables
+    - bluetooth/sbc: Use __asm__ keyword
+    - module-equalizer-sink: Use correct limit in loop
+    - Squash the last gcc warnings
+    - Make gcc --std=c99 happy
+    - device-restore: Simplify the migration of data to per-port keys.
+    - stream-restore: Add in some variable sets that were missing from 9ffa93.
+    - stream-restore: Add proper data validity checks to the legacy database
+      entry read.
+    - formats: The format code should be in libpulse, not libpulsecommon
+    - formats: Export more functions needed for a clean build.
+    - device-restore: Fix use-after-free error.
+    - raop: Use the port supplied by avahi when connecting to RAOP devices.
+    - loopback: New modargs: sink_input_properties and
+      source_output_properties.
+    - bluetooth: Bump DBus version to 1.3.0 and drop conditional code.
+    - alsa: Tidy up argument descriptions
+    - module-suspend-on-idle: Move vacuum code to core
+    - alsa-mixer: Add support for the Microsoft Kinect Sensor device
+    - modargs: Ensure modargs can be accessed in their raw form.
+    - raop: Properly deal with the name coming from the device.
+    - build-sys: Oops forgot to add the Kinect profile to the build system.
+    - volume: Rename 'sync volume' to 'deferred volume'.
+    - raop: Don't crash if fd is not open when trying to close it
+    - doc: Update README with fresh links.
+    - doc: Add info about running pulseaudio from the build dir
+    - stream: Relax assert for extended API
+    - def: Hide server-side sink/source flags
+    - volume: Handle varying channel count for shared volumes
+    - virtual: Make volume sharing on by default
+    - equalizer: Use volume sharing by default
+    - echo-cancel: Use volume sharing by default
+    - sink,source: Avoid crash by not updating volume on shutdown
+    - conf: Make sure module-dbus-protocol is loaded after
+      module-default-device-restore
+    - build-sys: bump soname
+    - sink,source: Handle missing in the shared volume case
+    - dbus: Don't crash if the module does not load
+    - Fix crash in threaded message queues
+    - build-sys: Switch to the tar-ustar format (as per a lot of GNOME stuff
+      for 3.2) and distribute .xz files.
+    - build-sys: bump soname
+  * Dropped patches, all applied upstream:
+    - 0017-Avoid-crash-by-not-updating-volume-on-shutdown.patch
+    - 0018-RAOP-Don-t-crash-if-fd-is-not-open-when-trying-to-cl.patch
+    - 0019-Make-sure-module-dbus-protocol-is-loaded-after-modul.patch
+    - 0100-vala-Add-has_type_id-false-to-all-enums-structs-and-.patch
+    - 0101-module-switch-on-connect-Don-t-switch-unlinked-sink-.patch
+    - 0102-alsa-mixer-Set-Front-control-to-0-dB-on-headphone-pa.patch
+    - 0103-module-equalizer-sink-Use-z-for-printf-of-size_t-var.patch
+    - 0104-module-equalizer-sink-Use-in-initialising-variables.patch
+    - 0105-bluetooth-sbc-Use-__asm__-keyword.patch
+    - 0106-module-equalizer-sink-Use-correct-limit-in-loop.patch
+    - 0107-Squash-the-last-gcc-warnings.patch
+    - 0108-Make-gcc-std-c99-happy.patch
+    - 0109-device-restore-Simplify-the-migration-of-data-to-per.patch
+    - 0110-stream-restore-Add-in-some-variable-sets-that-were-m.patch
+    - 0111-stream-restore-Add-proper-data-validity-checks-to-th.patch
+  * Pull some post-1.0 fixes from upstream git master
+    - 6878140 (extended: Fix doxygen comment style typos)
+    - 6a9272f (sink,source: Avoid unnecessary call to pa_rtclock_now())
+  * debian/rules: Modules are now in a 1.0 directory
+  * Update symbols
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 29 Sep 2011 10:01:56 +1000
+
 pulseaudio (0.99.4-1) experimental; urgency=low
 
   * New upstream release
@@ -433,6 +1255,122 @@ pulseaudio (0.99.4-1) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Fri, 16 Sep 2011 21:23:47 +0100
 
+pulseaudio (1:0.99.3-0ubuntu5) oneiric; urgency=low
+
+  [ David Henningsson ]
+  * 0017-Avoid-crash-by-not-updating-volume-on-shutdown.patch:
+    Fix typo in patch
+
+  [ Luke Yelavich ]
+  * Patch from David Henningssen to make sure module-dbus-protocol is loaded
+    after module-device-restore (LP: #843780)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 15 Sep 2011 09:59:20 +1000
+
+pulseaudio (1:0.99.3-0ubuntu4) oneiric; urgency=low
+
+  * Fix crash in jack detection patches (LP: #845468)
+  * Fix crash when reading volume when sink/source is unlinked (LP: #841968)
+  * Fix crash in RAOP (LP: #845286)
+
+ -- David Henningsson <david.henningsson at canonical.com>  Mon, 12 Sep 2011 10:29:00 +0200
+
+pulseaudio (1:0.99.3-0ubuntu3) oneiric; urgency=low
+
+  * Jack detection support, second version, now with HDMI support
+
+ -- David Henningsson <david.henningsson at canonical.com>  Mon, 05 Sep 2011 16:41:12 +0200
+
+pulseaudio (1:0.99.3-0ubuntu2) oneiric; urgency=low
+
+  * Dropped patches (applied upstream):
+    - 0004-mute-iec958-optical-raw-for-audigyX.patch
+    - 0011-lp451635-handle-dove-x0-line-hp-swap.patch
+    - 0012-JACK-Load-module-jackdbus-detect-in-default.pa.patch
+
+ -- David Henningsson <david.henningsson at canonical.com>  Mon, 05 Sep 2011 11:55:59 +0200
+
+pulseaudio (1:0.99.3-0ubuntu1) oneiric; urgency=low
+
+  [ David Henningsson ]
+  * 0018-alsa-mixer-Set-Front-control-to-0-dB-on-headphone-pa.patch:
+    Set Front to 0 dB for Headphones (LP: #836921)
+
+  [ Luke Yelavich ]
+  * New upstream bugfix release
+    - source: Remove the PA_SOURCE_PASSTHROUGH flag
+    - alsa: Don't always suspend/unsuspend on sink-input removal
+    - formats: Use correct API to check for passthrough streams
+    - alsa: Open iec958 device with NONAUDIO bit set in passthrough mode
+    - formats: Fix bad passsthrough check
+    - alsa: Fix bad function name
+    - daemon: Fix compiler warning about missing function prototype
+    - passthrough: We must not plug in a resampler on stream move
+    - sink-input: Ensure no volumes are applied for passthrough streams
+    - source-output: Ensure no volumes are applied for passthrough streams
+    - Revert "device-restore: Make bools not be bit fields"
+    - sample-util: Fix off-by-one in error check
+    - sink: Add PA_SINK_SET_FORMATS macro
+    - build-sys: Fix some LDFLAGS vs. LDADD usage
+    - echo-cancel: Add multiple include protection for header
+    - echo-cancel: Use pa_streq instead of strcmp
+    - echo-cancel: Move speex preprocessing out of the main module
+    - passthrough: Fix what volume we set sinks/sources to
+    - passthrough: Fix setting volume to unamplified again
+    - echo-cancel: Make save_aec modarg a bool instead of an int
+    - echo-cancel: Don't allow streams to attach while unloading
+    - echo-cancel: Get rid of annoying compiler warnings
+    - equalizer: Comment out unused function
+    - def: Add a new enum to allow differntiation between sinks and sources.
+    - dbus: Use pa_device_type_t rather than an internal equivalent
+    - device-restore: Change the API to include type information (sink
+      vs. source)
+    - device-restore: Split device restore database into two parts.
+    - device-restore: Restore volumes on port change.
+    - build-sys: bump soname
+    - alsa-mixer: Mute IEC958 optical raw for several Audigy models
+    - alsa-mixer: Add "Line HP Swap" element
+    - JACK: Load module-jackdbus-detect in default.pa
+    - Remove offensive part of error message
+    - switch-on-connect: Don't switch to a monitor source
+    - Fix spelling sucess -> success
+    - Set better priorities on input paths
+    - introspect: fix typo in default sink/source docs
+    - pacat: make pacat respond to cork/uncork events
+    - Spelling fixes in public headers
+    - More spelling fixes
+    - gitignore: Add Orc autogenerated files
+    - echo-cancel: Use stream index in debug message
+    - Remove extra ; s where they are not allowed in strict C99
+    - sndfile-util: Check return value of sf_command for errors
+  * Pull some further fixes from upstream git master:
+    - fb107fc (vala: Add has_type_id=false to all enums, structs and classes)
+    - c7bba24 (module-switch-on-connect: Don't switch unlinked sink input and
+               source outputs)
+    - 9636991 (alsa-mixer: Set "Front" control to 0 dB on headphone path)
+    - fc3ddfb (module-equalizer-sink: Use %z for printf of size_t variables)
+    - 918f168 (module-equalizer-sink: Use = in initialising variables)
+    - 3d04a05 (bluetooth/sbc: Use __asm__ keyword)
+    - 647048e (module-equalizer-sink: Use correct limit in loop)
+    - dfd706d (Squash the last gcc warnings)
+    - 9133c6c (Make gcc --std=c99 happy)
+    - 47c9d8c (device-restore: Simplify the migration of data to per-port keys.)
+    - e7b65d3 (stream-restore: Add in some variable sets that were missing
+               from 9ffa93.)
+    - 2b96fdf (stream-restore: Add proper data validity checks to the legacy
+               database entry read.)
+  * Dropped patches, applied upstream:
+    - 0017-Make-dbus-error-more-polite.patch
+    - 0018-alsa-mixer-Set-Front-control-to-0-dB-on-headphone-pa.patch
+    - 0400-introspect-fix-typo-in-default-sink-source-docs.patch
+    - 0401-source-Remove-the-PA_SOURCE_PASSTHROUGH-flag.patch
+    - 0402-alsa-Don-t-always-suspend-unsuspend-on-sink-input-re.patch
+    - 0403-formats-Use-correct-API-to-check-for-passthrough-str.patch
+  * 0604-ALSA-part-of-jack-detection-and-a-small-policy-modul.patch: Refreshed
+  * Update symbols files
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 05 Sep 2011 14:37:01 +1000
+
 pulseaudio (0.99.2-2) experimental; urgency=low
 
   * Fix build on kfreebsd architectures (Closes: 637785)
@@ -452,6 +1390,30 @@ pulseaudio (0.99.2-1) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Tue, 23 Aug 2011 20:51:25 +0200
 
+pulseaudio (1:0.99.2-0ubuntu2) oneiric; urgency=low
+
+  * Build-depend on libxcb1-dev (>= 1.6) rather than libxcb-atom1-dev, in
+    line with the packaging in Debian experimental.
+  * Build-depend on libtdb-dev rather than tdb-dev.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Thu, 18 Aug 2011 16:10:53 +0100
+
+pulseaudio (1:0.99.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream bugfix release
+  * 0005-dont-load-cork-music-on-phone.patch: Refreshed
+  * Dropped patches, applied upstream
+    - 0400-Fix-crash-in-path-subset-elimination.patch
+    - 0402-source-output-Fix-resampling.patch
+    - 0403-stream-restore-Save-restore-source-output-volume-mut.patch
+  * Pull some post 0.99.2 fixes from upstream git master:
+    - 7ed177d (introspect: fix typo in default sink/source docs)
+    - 2677911 (source: Remove the PA_SOURCE_PASSTHROUGH flag)
+    - dde09c7 (alsa: Don't always suspend/unsuspend on sink-input removal)
+    - adbdb62 (formats: Use correct API to check for passthrough streams)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 18 Aug 2011 09:17:09 +1000
+
 pulseaudio (0.99.1-1) experimental; urgency=low
 
   * New upstream test release
@@ -490,6 +1452,68 @@ pulseaudio (0.99.1-1) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 13 Aug 2011 14:21:02 +0200
 
+pulseaudio (1:0.99.1-0ubuntu3) oneiric; urgency=low
+
+  * debian/libpulse-glib-mainloop0.symbols: Fix a typo in the package name
+    which was made at the time of symbol generation
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 16 Aug 2011 15:20:47 +1000
+
+pulseaudio (1:0.99.1-0ubuntu2) oneiric; urgency=low
+
+  * Build for multiarch:
+    - libpulse{,-mainloop-glib}0{,-dbg} and libpulse-dev are Multi-Arch: same.
+    - pulseaudio itself should be Multi-Arch: foreign, since it's a daemon.
+    - drop dh-buildinfo build-dependency, incompatible with multiarch and not
+      relevant in Ubuntu where we have build logs for all builds.
+    - LP: #825342.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Sat, 13 Aug 2011 02:22:42 +0000
+
+pulseaudio (1:0.99.1-0ubuntu1) oneiric; urgency=low
+
+  [ Daniel T Chen ]
+  * 0017-Make-dbus-error-more-polite.patch: Remove language that doesn't
+    add anything to the error message (LP: #444400).
+
+  [ David Henningsson ]
+  * New upstream release, remaining patches:
+  * Add build dependency on libjson0-dev
+  * Dropped patches (implemented upstream):
+    0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
+    0009-lp533877-handle-digmic.patch
+    0015-alsa-mixer-Add-workaround-for-some-USB-headsets.patch
+    0200-gold.patch
+    0201-alsa-mixer-Add-a-few-well-known-descriptions.patch
+    0202-alsa-mixer-add-required-any-and-required-for-enum-op.patch
+    0203-alsa-mixer-always-round-towards-0-dB.patch
+    0204-alsa-mixer-Add-new-paths-for-Internal-Mic-Front-Mic-.patch
+    0205-alsa-mixer-Fixup-Mic-Line-analog-input-paths-to-work.patch
+    0206-alsa-mixer-Make-sure-capture-source-and-input-source.patch
+    0207-PulseAudio-added-IT-block-to-fix-thumb-conditional-i.patch
+    0208-alsa-sink-Fix-incorrect-work_done-value-to-prevent-expensive-update...
+    _smoother-calls.patch
+    0209-sndfile-pacat-Use-file-extension-and-fix-format-from-string.patch
+  * Refreshed patches:
+    0005-dont-load-cork-music-on-phone.patch
+    0012-JACK-Load-module-jackdbus-detect-in-default.pa.patch
+    0013-Load-RAOP-Zeroconf-by-default.patch
+    0014-alsa-mixer-Add-separate-profile-for-Nvidia.patch
+    0017-Make-dbus-error-more-polite.patch
+  * Upstream has removed libpulsebrowse, replace with dummy packages for the
+    time being.
+  * Updated shlibs files and debian/rules with new version number
+  * Add new modules to the pulseaudio package
+  * Initial pulseaudio support for jack detection
+
+  [ Luke Yelavich ]
+  * debian/control: Remove the libpulse-browse0 package, and add set
+    pulseaudio to replace that package until after the next LTS
+  * Add symbols files for libpulse0 and libpulse-mainloop-glib0 and adjust
+    other shlibs files as necessary
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 11 Aug 2011 14:30:44 +1000
+
 pulseaudio (0.9.23-1) unstable; urgency=low
 
   [ Daniel T Chen ]
@@ -533,33 +1557,744 @@ pulseaudio (0.9.23-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Mon, 25 Jul 2011 23:05:29 +0100
 
-pulseaudio (0.9.22-1) experimental; urgency=low
+pulseaudio (1:0.9.23-0ubuntu2) oneiric; urgency=low
 
-  * New upstream release
-  * debian/patches/0002-CVE-2009-1299.patch:
-    + Dropped, fixed upstream
-  * debian/patches/0003-Re-bootstrap.patch
-    + Dropped, not needed anymore
-  * debian/rules: Stop using -g0 on mips{,el} the toolchain has been fixed
-  * debian/rules, debian/control: Update build-depends and force building
-    with X11
-  * debian/control: Suggest rtkit
-  * debian/control: Prune unneeded depends of libpulse-dev
+  [ Daniel T Chen ]
+  * Add the following patches backported from upstream git:
+    - aa7bc32 (parecord: Automatically detect file format from extension)
+      [series patch 0208]
+    - 226ddb1 (alsa-sink: fix mmap_write() work_done) [series patch 0209]
+  * Update debian/copyright to cover echo-cancel files.
+
+  [ Michael Terry ]
+  * 0016-nodisplay-autostart.patch:
+    - Don't show in "Startup Applications" (LP: #803917)
+
+ -- Michael Terry <mterry at ubuntu.com>  Fri, 01 Jul 2011 12:56:15 +0100
+
+pulseaudio (1:0.9.23-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release, the following commits from the stable-queue branch
+    are included in this release:
+    - d4c9ad1 (streams: Fix the actual resampler method shown in debug
+               messages.)
+    - cc91a8f (module-combine-sink: Initialize smoother with offset
+               pa_rtclock_now())
+    - 8a437ee (module-combine-sink: Initialize smoother in paused state)
+    - b54a43a (module-combine-sink: Check running flag before rendering in null
+               mode
+    - b3e4152 (pulsecore: Add a couple pa_asserts() on pa_tagstruct* calls.)
+    - 22c0dcb (device-manager: Free a hook slot to prevent segv on unload)
+    - c3bfcc9 (SSE/MMX: Fix problem with highpitched noise on i386)
+    - 9ee4229 (build-sys: Add echo-cancel dummy Makefile)
+    - f558189 (build-sys: bump soname)
+  * Bumped shlibs
+  * debian/rules: Exclude 0.9.23 modules from shlibs
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 24 Jun 2011 10:18:17 +1000
+
+pulseaudio (1:0.9.22+stable-queue-69-gf8e8-0ubuntu1) oneiric; urgency=low
+
+  * Merge from unreleased Debian git, remaining changes:
+    - epoch (my stupid fault :S)
+    - use speex-float-1 and change buffer and fragment size, depending on
+      architecture
+    - Add alsa configuration files to route alsa applications via pulseaudio
+    - Move libasound2-plugins from Recommends to Depends
+    - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio
+      daemons
+    - Make initscript more informative in the default case of per-user
+      sessions
+    - add status check for system wide pulseaudio instance
+    - create /var/run/pulse, and make restart more robust
+    - indicate that the system pulseaudio instance is being started from the
+      init script
+    - check whether pulseaudio is running before preloading the padsp library
+    - Add DEB_OPT_FLAG = -O3 as per recommendation from
+      pulseaudio-discuss/2007-December/001017.html
+    - Generate a PO template on build
+    - the esd wrapper script should not load pulseaudio if pulseaudio is being
+      used as a system service
+    - add a pulseaudio apport hook
+    - drop padevchooser(Recommends) and pavucontrol (Suggests)
+    - add libudev-dev as a build-dependency
+    - Fix initialization of devices with modem subdevices
+    - Disable cork-music-on-phone
+    - disable flat volume
+    - Mute IEC958 Optical Raw by default
+    - use tdd instead of gdbm
+    - Add conflicts/replaces for pulseaudio-module-udev and
+      pulseaudio-module-rygel-media-server
+    - Add replaces for pulseaudio-module-hal to the pulseaudio package to handle
+      upgrades from hardy
+    - Load module-x11-bell in the start-pulseaudio-x11 script
+    - added IT block to fix thumb conditional instruction build error messages
+    - recommend instead of suggest rtkit
+    - Ship the jackdbus-detect module
+    - Ship extra quirks to mixer profiles for various x86 and ARM hardware, as
+      well as USB hardware
+  * New snapshot based on upstream git branch stable-queue:
+    - 4f67775 (http: support HTTP HEAD)
+    - 3bb6546 (vala: More vala fixes)
+    - 7fd0771 (x11: Fix build errors with newest xcb-util.)
+    - b72fc9b (x11: More XCB fixes.)
+    - f8e8a03 (rtkit: use private bus connection in order to avoid threading
+               issues when invoking pa_make_realtime())
+    - c524b4c (memblockq: implement new call pa_memblockq_peek_fixed_size())
+    - 1a8cf00 (make echo-cancel module that exposes a new sink and source)
+    - 9fa71e7 (echo-cancel: take into account snapshot delay)
+    - 7b972f5 (echo-cancel: use the phone media role)
+    - de6cdf9 (echo-cancel: tweak the resync code a little)
+    - 1c26694 (echo-cancel: improve debug)
+    - b30bf12 (echo-cancel: keep frame_size a power of 2)
+    - 6d8a907 (echo-cancel: Move the module into it's own directory)
+    - 57c5983 (echo-cancel: Split out speex code from the core module)
+    - 668f4e4 (echo-cancel: Pass arguments to the specific canceller module)
+    - c975dfa (echo-cancel: Let AEC module determine source/sink spec)
+    - 47e4dd1 (echo-cancel: Add alternative echo-cancellation implementation)
+    - 4a9fa8c (echo-cancel: Allow selection of AEC method using modargs)
+    - b6b8a7b (echo-cancel: Make blocksize a module-wide parameter)
+    - 2923c5e (echo-cancel: Mark immutable parameters as const in vfunc)
+    - 9f79c0e (echo-cancel: rework alignment code)
+    - 56a4684 (echo-cancel: improve accuracy)
+    - e936447 (echo-cancel: pause timer when echo canceling is off)
+    - d39043c (echo-cancel: Fix make distcheck)
+    - d8fab84 (echo-cancel: Fix out-of-tree build)
+    - 1212a6f (echo-cancel: Ensure correct handling of endianness)
+    - d866ade (echo-cancel: Use S16NE for adrian module)
+    - f93b5e1 (echo-cancel: Fix source may_move_to function)
+    - 6664650 (i18n: Update POTFILES.*)
+  * debian/libpulse-dev.install: Ship vala bindings
+  * Dropped patches, either they were previously backported, or are now
+    upstream:
+    - 0005-load-sample-dir-lazy.patch
+    - 0090-disable-flat-volumes.patch
+    - 0211-module-loopback-Add-adjust_time-to-valid-args.patch
+    - 0212-Limit-rate-adjustments-to-small-inaudible-jumps.patch
+    - 0213-module-rtp-recv-Use-new-algorithm-for-adjusting-samp.patch
+    - 0214-module-rtp-recv-Average-the-estimated-real-sample-ra.patch
+    - 0215-module-rtp-recv-Remove-smoother-from-write-index.patch
+    - 0216-conf-Make-system.pa-use-udev-detect-and-not-hal-dete.patch
+    - 0217-volume-Add-a-PA_VOLUME_UI_MAX-define-for-the-recomme.patch
+    - 0218-vala-Some-bugfixes-for-the-vala-bindings.patch
+    - 0219-vala-delegate-FreeCb-does-not-have-a-target.patch
+    - 0220-vala-move-GLibMainLoop-class-into-separate-file-to-f.patch
+    - 0221-vala-Fix-path-error-in-the-last-commit.patch
+    - 0222-build-sys-Link-binaries-linking-libpulse-to-libpulse.patch
+    - 0223-build-sys-Link-binaries-linking-libpulsecommon-to-li.patch
+    - 0224-build-sys-Link-lirc-libraries-in-right-order.patch
+    - 0225-module-jack-sink-source-protect-against-null-return-.patch
+    - 0226-vala-ChannelMap-has-no-destroy-function.patch
+  * debian/patches/series: Renamed and re-ordered some patches, and clearly
+    identified distro specific patches and upstream/upstreamable patches
+  * 0209-alsa-mixer-Fix-makefile-in.patch: Drop, as we use dh-autoreconf,
+    which takes care of this for us
+  * debian/pulseaudio.install: Add the echo-cancel module
+  * 0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch: Drop,
+    upstream
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Dec 2010 12:01:37 +0000
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 27 May 2011 14:05:01 +1000
 
-pulseaudio (0.9.21-3) unstable; urgency=low
+pulseaudio (1:0.9.22+stable-queue-24-g67d18-0ubuntu4) oneiric; urgency=low
 
-  * debian/rules: Compile with -g0 on mips{,el} to work around #519006 in
-    gcc-4.4
+  [ David Henningsson ]
+  * Fix missing Internal/Front/Rear mics on Nvidia chipsets (LP: #771739)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 03 Jul 2010 15:12:54 +0100
+  [ Luke Yelavich ]
+  * debian/control: Update Vcs-Bzr field
 
-pulseaudio (0.9.21-2) unstable; urgency=low
+ -- David Henningsson <david.henningsson at canonical.com>  Thu, 28 Apr 2011 10:31:42 +0200
 
-  * Import NMU patches into pkg-pulse git, thanks to the security team for
-    their work!
-  * debian/patches/0003-Re-bootstrap.patch
+pulseaudio (1:0.9.22+stable-queue-24-g67d18-0ubuntu3) natty; urgency=low
+
+  [ David Henningsson ]
+  * Add separate profile for Nvidia to make it easier to select the right 
+    codec out of four (LP: #716371)
+  * Add workaround to make it possible to control the volume of some
+    USB headsets (LP: #749856, LP: #671560)
+
+  [ Luke Yelavich ]
+  * debian/control: Demote pulseaudio-module-raop to suggests, as it is
+    causing various issues, including crashers, (LP: #742281, #743073)
+    and re-opens (LP #688272)
+  * Pull some bugfixes from the stable-queue branch:
+    - 4fa7495 (vala: Some bugfixes for the vala bindings)
+    - ea0a2a6 (vala: delegate FreeCb does not have a target.)
+    - 64985aa (vala: move GLibMainLoop class into separate file to fix linker
+               errors)
+    - 9f52c10 (vala: Fix path error in the last commit.)
+    - 1ade8df (build-sys: Link binaries linking libpulse to libpulsecommon too)
+    - c25207f (build-sys: Link binaries linking libpulsecommon to libpulse too)
+    - 4be49ae (build-sys: Link lirc libraries in right order)
+    - fd5b282 (module-jack-sink/source: protect against null return in
+               jack_get_ports) (LP: #733424)
+    - 93e7a19 (vala: ChannelMap has no destroy function.)
+  * debian/patches/0097-explicitly-link-libraries.patch: Dropped, applied
+    upstream
+  * debian/control, debian/rules: Add dh-autoreconf
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 11 Apr 2011 16:58:14 +1000
+
+pulseaudio (1:0.9.22+stable-queue-24-g67d18-0ubuntu2) natty; urgency=low
+
+  * Update to latest stable queue patches:
+    - 09770e5 (module-loopback: Add adjust_time to valid args
+    - 90c5520 (Limit rate adjustments to small, inaudible jumps
+    - 4620039 (module-rtp-recv: Use new algorithm for adjusting sample rate
+    - 2bfc032 (module-rtp-recv: Average the estimated real sample rate
+    - 2ee4ec5 (module-rtp-recv: Remove smoother from write index (LP: #569378)
+    - a8cd9d2 (conf: Make system.pa use udev-detect and not hal-detect.
+    - b872254 (volume: Add a PA_VOLUME_UI_MAX define for the recommended max
+               volume to show in UIs)
+  * 0210-PulseAudio-added-IT-block-to-fix-thumb-conditional-i.patch:
+    - added IT block to fix thumb conditional instruction build error messages
+  * debian/rules: Remove CFLAGS that are specific to arm, the above patch
+    makes those redundant (LP: #721498)
+  * debian/control: Add a dependency on pulseaudio-module-raop
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 10 Mar 2011 07:15:02 +1100
+
+pulseaudio (1:0.9.22+stable-queue-24-g67d18-0ubuntu1) natty; urgency=low
+
+  [ David Henningsson ]
+  * debian/patches/020x patches - add PulseAudio input mixer rewrite.
+    This will cause several HDA chips to have better named and controlled
+    sliders on the input side. 
+
+  [ Luke Yelavich ]
+  * New upstream snapshot based on stable queue:
+    - 67d1888 (client: Don't update smoother while corked)
+    - 6b280e9 (Fighting rewinds: Reduce calls to handle_seek)
+    - 3aeb047 (Fighting rewinds: Seek and write data in the same message)
+    - 1e1b299 (Core: Fix incorrect check of return value)
+    - 4080725 (tunnel: Fix automatic names when source/sink_name argument is
+              missing.)
+    - ec5a785 (ratelimit: fix log levels of log suppression messages)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 18 Feb 2011 13:50:30 +1100
+
+pulseaudio (1:0.9.22+stable-queue-18-geb966-0ubuntu2) natty; urgency=low
+
+  * Fix FTBFS with ld.gold.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 19 Jan 2011 06:57:29 +0100
+
+pulseaudio (1:0.9.22+stable-queue-18-geb966-0ubuntu1) natty; urgency=low
+
+  [ Daniel T Chen ]
+  * debian/control: pulseaudio-module-zeroconf Depends on avahi-daemon
+    (LP: #689093)
+  * debian/patches/0101-update-stable-queue.patch: Apply 84c8b23c to
+    resolve incorrect header being used for libsndfile seen with pacat
+    --file-format (LP: #660504)
+  * debian/patches/0104-Load-RAOP-Zeroconf-by-default.patch: Follow
+    recommendation by Martin-?ric Racine to conditionally load support
+    by default for streaming to an Apple Airport Express (LP: #688272)
+  * debian/pulseaudio-utils.links: Also add pamon(1) and parecord(1)
+    (Closes: #599696)
+
+  [ David Henningsson ]
+  * debian/pulse-alsa.conf: Add name hint for default pcm device,
+    indicating that PulseAudio is active.
+
+  [ Luke Yelavich ]
+  * New upstream snapshot based on the stable queue branch:
+    - eb966f7 (build-sys: Make --disable-dbus actually work.)
+    - 8f8d247 (build-sys: Mention dbus support in the summary)
+    - b3ff4f4 (build-sys: Put in specific warnings when there is no udev or
+              DBUS support)
+    - 862bbee (console-kit: Console Kit support is dependent on DBUS and is
+              thus optional.)
+    - 7cb1401 (padsp: wrap __open_2 and __open64_2)
+    - 6f870f5 (fix bug about get source-output status)
+    - 4269b05 (Fix typos)
+    - 1c83b03 (Further clarify src- and speex- references in pulse-daemon.conf)
+    - 84c8b23 (Fix return value of pa_sndfile_format_from_string)
+    - d963b86 (core: Fix variable "has_whined" value bug)
+    - 52e3268 (trivial: Mention speex as a resampler reference in
+              pulse-daemon.conf)
+    - 3e6af07 (module-loopback: Prevent an infinite loop when rate adjusting
+              is disabled
+  * 0101-update-stable-queue.patch and
+    #0102-autoreconf.patch:
+    - Disable for now, since latest stable queue are roled into the snapshot
+      tarball
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 14 Jan 2011 10:03:49 -0600
+
+pulseaudio (0.9.22-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/patches/0002-CVE-2009-1299.patch:
+    + Dropped, fixed upstream
+  * debian/patches/0003-Re-bootstrap.patch
+    + Dropped, not needed anymore
+  * debian/rules: Stop using -g0 on mips{,el} the toolchain has been fixed
+  * debian/rules, debian/control: Update build-depends and force building
+    with X11
+  * debian/control: Suggest rtkit
+  * debian/control: Prune unneeded depends of libpulse-dev
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Dec 2010 12:01:37 +0000
+
+pulseaudio (1:0.9.22-0ubuntu3) natty; urgency=low
+
+  * debian/pulseaudio-module-jack.install: Ship the jackdbus-detect module
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 08 Dec 2010 17:57:18 +1100
+
+pulseaudio (1:0.9.22-0ubuntu2) natty; urgency=low
+
+  * 0101-update-stable-queue.patch, update to latest stable queue:
+    - 205cad6 (jack: Add module-jackdbus-detect
+    - e9deb97 (build-sys: Include the .version file in the distribution
+               tarball)
+    - a1f1255 (build-sys: Fix make distcheck failure due to udev rules
+               fixed install path)
+    - 675cc0a (build-sys: Replace dummy Makefiles with proper Makefile.am's)
+    - bd769fa (rescue-streams: Fix segfault in some conditions)
+    - f6574c8 (volume: Add explicit checks for ARMv6 instructions)
+  * 0102-autoreconf.patch: Re-generate autotools pieces for the above update
+  * 0103-JACK-Load-module-jackdbus-detect-in-default.pa.patch: Enable jackdbus
+    module by default for now, hopefully longer term there will be a better
+    way to turn this module on/off
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 08 Dec 2010 16:58:27 +1100
+
+pulseaudio (1:0.9.22-0ubuntu1) natty; urgency=low
+
+  * New upstream release, based on the stable-queue branch
+  * Drop following patches, as applied upstream:
+    - 0101-alsa-mixer-add-profile-for-Native-Instruments-Koreco.patch
+    - 0102-intended-roles-Mark-devices-with-a-form-factor-of-he.patch
+  * debian/rules:
+    - Disable --as-needed due to a circular dependency for libpulsecommon
+    - Adjust filenames/paths for 0.9.22
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 26 Nov 2010 13:44:10 +1100
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-98-ga8d7-0ubuntu3) natty; urgency=low
+
+  * 0101-alsa-mixer-add-profile-for-Native-Instruments-Koreco.patch: Also
+    adjust src/Makefile.in, so that the new profile actually gets shipped
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 05 Nov 2010 14:27:34 -0400
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-98-ga8d7-0ubuntu2) natty; urgency=low
+
+  * debian/control: Update Vcs-Bzr field
+  * Pull latest fixes from stable queue:
+    - 8a30d4c (alsa-mixer: add profile for Native Instruments Korecontroller)
+    - 848dd37 (intended-roles: Mark devices with a form factor of 'headset' as
+               being appropriate for 'phone' streams)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 05 Nov 2010 10:40:47 -0400
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-98-ga8d7-0ubuntu1) natty; urgency=low
+
+  * New upstream snapshot, based on the stable-queue branch
+  * 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
+    - 0195-SSE-MMX-ARM-Fix-high-frequency-noise-with-unusual-nu.patch
+  * debian/control: Update Vcs-Bzr link
+  * 0097-explicitly-link-libraries.patch: Patch to explicitly link pulseaudio
+    tests binaries against pulseaudio libraries, due to gcc 4.5 and new
+    binutils in natty enforcing explicit linking
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 29 Oct 2010 12:39:27 -0400
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu21.1) maverick-proposed; urgency=low
+
+  * 0195-SSE-MMX-ARM-Fix-high-frequency-noise-with-unusual-nu.patch:
+    - Pull fix from the upstream stable-queue branch a8d76e9 to Fix a high
+      frequency noise with an nunusual number of channels, when either SSE,
+      MMX, or ARM optimized volume scaling code is used. (LP: #445849)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 14 Oct 2010 16:38:46 +1100
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu21) maverick; urgency=low
+
+  * Add 0192-stream-restore-Clear-the-save_sink-save_source-flags.patch
+    Clear the save_sink/save_source flags on apply_entry.
+  * Add 0193-augment-properties-Search-for-.desktop-files-in-subf.patch
+    Search for .desktop files in subfolders too.
+  * Add 0194-device-manager-Ensure-that-sinks-sources-populate-th.patch
+    Ensure that sinks/sources populate the device manager lists in order
+    of their priority.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 03 Oct 2010 20:38:24 +0100
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu20) maverick; urgency=low
+
+  * 0093-backport-fixes-stable-queue-head.patch: Backport the following
+    changesets from the stable-queue branch:
+    + 2c564f2 (xcb: Ensure the XCB connection is valid before using it.)
+    + 5c0bc09 (xcb: xcb_get_setup() can return 0, so make sure we check it before using)
+    + 165cb87 (x11: Use the default screen for X11 properties.)
+    (LP: #640127)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sat, 18 Sep 2010 08:46:31 -0400
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu19) maverick; urgency=low
+
+  * Removed packaging for a patch that was being tested locally, as the
+    patch is not going into maverick. Fixes FTBFS
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 15 Sep 2010 14:38:38 +1000
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu18) maverick; urgency=low
+
+  [ Emmet Hikory ]
+  * Drop 0001-change-resample-and-buffering.patch
+  * debian/rules: Add arch-specific build-time configuration patching system
+    - set resample-method to speex-fixed-1 and fragments to 2 for armel
+    - set resample-method to speex-float-1 and fragments to 8 for other arches
+    - Closes LP: #623242
+
+  [ Luke Yelavich ]
+  * debian/rules:
+    - Back up src/daemon/daemon.conf.in, restoring on package clean, allowing
+      the package to be built more than once, and keeping the diff sane
+    - Disable flat volumes via regular expression instead of a patch, to
+      prevent the mess that goes with touching a file multiple times, and
+      with multiple methods
+  * 0093-backport-fixes-stable-queue-head.patch: Backport the following
+    changesets from the stable-queue branch:
+    + 6c8660a (alsa: Fix assertion on mmap_write (triggered via a52 plugin))
+    + aaae99d (alsa: disable rewinds when using ALSA plugins)
+    + 4a1072e (udev: fix hex decoding)
+    + 2b88634 (x11: Partially convert to XCB.)
+    + 9375019 (alsa: resume smoother after unsuspend)
+    + 4fb02d8 (alsa: increase the smoother window)
+    + e2ef3a1 (alsa: don't make use of tsched related variables when tsched is
+               disabled)
+    + 514fd1e (add rewind-safeguard parameter)
+    + 8748ebd (alsa-sink: Get rid of a compiler warning regarding
+               rewind_safeguard type.)
+    + a65825f (alsa: Set the rewind safeguard proportionally to sample spec)
+    + 3d9b710 (smoother: avoid losing precision)
+    + 1503b8c (alsa-source: refactor smoother and device start)
+    + 74c117f (alsa-time-test: make test usable for capture too)
+    + 1c29f55 (alsa: work around slightly broken _delay implementations)
+    + 1ff360c (alsa: make defines for smoother configuration)
+    + 28f4aeb (alsa-mixer: add profile for Traktor Kontrol S4)
+    + eef247b (alsa: Only set the 'first' flag to false when we actually call
+               snd_pcm_start())
+  * debian/control: Add libxcb-atom1-dev and libx11-xcb-dev to build depends
+  * debian/patches/0090-disable-flat-volumes.patch: Drop, as per above
+  * debian/patches/0097-regenerate-configure.patch: Refreshed
+  * debian/patches/0098-tarball-version.patch: Ensure the version string for
+    pulseaudio internally stays the same, in case the build process wants
+    to regenerate autotools files
+  * debian/patches/0094-add-missing-mixer-paths-and-rerun-automake.patch:
+    - Remove the patch to Makefile.in, easier to do it all at once in a
+      single patch later in the series
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 15 Sep 2010 13:57:55 +1000
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu17) maverick; urgency=low
+
+  * No-change rebuild to pick up new j-a-c-k shlibs
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 21 Jul 2010 11:29:18 +0200
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu16) maverick; urgency=low
+
+  * Include /usr/bin/start-pulseaudio-kde and its autostart file now that KDE
+    will be using PulseAudio by default in Maverick (LP: #563250)
+  * Also update 0057-load-module-x11-bell.patch to give its improvements to
+    /usr/bin/start-pulseaudio-kde as well
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org>  Mon, 07 Jun 2010 18:32:53 -0400
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu15) maverick; urgency=low
+
+  * 0093-backport-fixes-stable-queue-head.patch: Backport the following
+    changesets from the stable-queue branch:
+    + bc7314f (name all threads for /proc/$PID/task/$TID/comm)
+    + d519ca4 (prevent crash on jack server shutdown) (LP: #538815)
+    + 65f89dc (fix bracketing in pa_rtp_recv())
+  * debian/01PulseAudio: modify the ConsoleKit active seat checks in the
+    pm-utils hook so that:
+    - pre-suspend: all users' sink & source states are stored, then only
+      the active seat's sinks and sources are muted
+    - post-resume: all users' sink & source pre-suspend states are
+      restored
+    This resolves the issue where users' post-resume sink & source
+    states don't correspond with their pre-suspend ones.
+    (LP: #569395)
+  * debian/01PulseAudio: fix broken quoting and misuse of su -l. Merged
+    from lp:~hyperair/pulseaudio/fix-01Pulseaudio-quoting. Thanks,
+    Chow Loong Jin! (LP: #572391)
+  * debian/control: Update bzr branch for maverick.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sat, 08 May 2010 11:08:56 -0400
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu14) lucid; urgency=low
+
+  * 0096-lp451635-handle-dove-x0-line-hp-swap.patch: Make the connector
+    work as intended: if 'Analog Output' is selected in the dropdown,
+    then 'Line HP Swap' is muted; if 'Analog Headphones' is selected,
+    then 'Line HP Swap' is unmuted. This better fits existing speaker
+    semantics and actually works. Many thanks to Tobin Davis for
+    helping chase this one. Really closes (LP: #451635)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Fri, 26 Mar 2010 15:18:35 -0700
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu13) lucid; urgency=low
+
+  [ Daniel T Chen ]
+  * 0093-backport-fixes-stable-queue-head.patch: Backport the following
+    changesets from the stable-queue branch:
+    + a7c1778 (don't pick monitor sources automatically for role-based
+               device selection).
+    + e8b83fa (handle asyncns failure when IPv6 is not supported in the
+               kernel).
+  * 0096-lp453966-handle-digmic-pt2.patch: Raise the priority of the
+    'Digital Mic 1' digital input source for newer Dell laptops.
+    (LP: #453966)
+  * 0096-lp451635-handle-dove-x0-line-hp-swap.patch: Add 'Line HP Swap'
+    to the Headphone profile. (LP: #451635)
+  * debian/control: Update Vcs-Bzr to point to new branch that uses pack
+    repo format 2a.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 25 Mar 2010 21:58:46 -0700
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu12) lucid; urgency=low
+
+  * debian/pulseaudio.init: Remove udev from Required-* LSB headers
+    (LP: #432301)
+  * debian/patches/:
+    + 0095-cve-2009-1299.patch: Fix insecure temporary file creation;
+      pulled from upstream stable-queue d3efa43; CVE-2009-1299.
+      (LP: #509008)
+    + 0096-lp533877-handle-digmic.patch: Prefer the built-in digital
+      mic on newer Dells, e.g., XPS 1330. (stable-queue 29845be)
+      (LP: #533877)
+    + 0097-regenerate-configure.patch: Apply changes from stable-queue
+      f9b31fe (gobject linking) and d3efa43 above.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 10 Mar 2010 18:53:51 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu11) lucid; urgency=low
+
+  * 0093-backport-fixes-stable-queue-head.patch: Backport the following
+    changesets from the stable-queue branch:
+    + 522c44 (strip spaces from ALSA card/pcm names)
+    + 195069 (use pa_strip())
+    + dd682d (reset max_rewind/max_request in sink while suspending)
+    + 30f28e (fix wrong counters by using pa_memblockq_pop_missing() for
+      all request handling)
+    + 0d1154 (rework how stream volumes affect sink volumes)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Mon, 22 Feb 2010 00:22:50 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu10) lucid; urgency=low
+
+  * 0093-backport-fixes-stable-queue-head.patch: Backport the following
+    changesets from the stable-queue branch:
+    + dfe27f (don't complain about missing SHM segments)
+    + 5ce18c (fix definition of INVALID_INDEX for vala)
+    + 6bbdd2 (fix definition of the GLib mainloop adapter for vala)
+    + 3f44bf (Use "Subwoofer" in channelmap)
+    + 117c99 (fix wrapping of port setting calls for vala)
+    + ddabaa (explicitly mention 'test' role in proplist)
+    + 8adf53 (increase verboseness when not restoring sink)
+    + 180589 (use sample name for unmodified fallback)
+    + f9b957 (don't queue cached sample when sink is suspended)
+    + b2e9fb (pass buffer_attr to recording streams)
+    + a469d4 (make devices resume for corked state to fix latency
+      miscalculation) (LP: #511558)
+    + 4a3210 (improve buffer_attrs logging)
+  * 0094-add-missing-mixer-paths-and-rerun-automake.patch has been
+    merged upstream (047e16f in the stable-queue branch), but we'll continue to
+    carry it until the next stable tarball is rolled.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 21 Feb 2010 22:37:37 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu9) lucid; urgency=low
+
+  * 0094-add-missing-mixer-paths-and-rerun-automake.patch: Fix missing paths
+    elements that broke volume control.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 18 Feb 2010 23:56:42 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu8) lucid; urgency=low
+
+  * Back out 307bd1 until we can roll a new tarball. Applying it to the
+    current source package requires all sorts of nasty hacks.
+    (LP: #523716)
+  * Drop 0094-autoconf.patch, as it's no longer needed
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 18 Feb 2010 07:32:58 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu7) lucid; urgency=low
+
+  * debian/control: Since JACK has been approved for promotion back into
+    main, add its packages
+  * 0093-backport-fixes-stable-queue-head.patch: Backport the following
+    changesets from the stable-queue branch:
+    + 19fa81 (always fulfill write requests from the server)
+    + 96ec29 (store away fd type for pacmd)
+    + 6e064d (don't enter busy loop when reading from stdin very early)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 17 Feb 2010 22:33:34 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu6) lucid; urgency=low
+
+  [ Daniel T Chen ]
+  * pulseaudio.default: More clearly describe the conditions for
+    autospawn to function correctly given the recent login-speedup work.
+    (As a side effect, it now also lists what one needs to do to disable
+    PA.)
+  * 0093-backport-fixes-stable-queue-head.patch: Backport the following
+    changesets from the stable-queue branch:
+    + a631be (PA_SINK_INPUT_IS_LINKED typo fix)
+    + e8cb96 ('Desktop Speaker' handling)
+    + 7d6bab ('Shared Mic/Line in', 'Analog Source' handling)
+    + 0c836a ('Internal Mic' handling)
+    + 307bd1 (default output port names)
+    + f9b31f (gobject explicit linking)
+    + ff2474 (padsp handling of /dev/audio)
+    + 96592c (dbus timeout callback timer fix)
+    + 5e2af2 (logging of eventfd read failures)
+  * 0094-autoconf.patch: Rerun autoconf given explicit gobject link
+    addition; readd version string.
+
+  [ Martin Pitt ]
+  * 0092-delay-gnome-autostart.patch: Push it out a little further; the X11
+    bell is not crucial at desktop startup, and it keeps other programs from
+    doing more urgent initialization.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Mon, 08 Feb 2010 12:42:02 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu5) lucid; urgency=low
+
+  * Add bzr-builddeb configuration (merge mode).
+  * debian/control: Prefix the Debian git Vcs-* fields with XS-Debian-*, so
+    that debcheckout on Ubuntu will actually work.
+  * Add 0092-delay-gnome-autostart.patch: Delay applet startup by two seconds,
+    so that pulseaudio has started up enough to avoid starting it a second
+    time through autospawn.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 01 Feb 2010 18:12:13 -0800
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu4) lucid; urgency=low
+
+  * debian/01PulseAudio: Break from state (re)store in the correct
+    place!
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 31 Jan 2010 13:44:57 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu3) lucid; urgency=low
+
+  * debian/01PulseAudio:
+    + Fix su(1) -c quoting (LP: #515038)
+    + Now that PA only stores mixer state for the active CK seat, and
+      because the active ConsoleKit seat is the only one we care about,
+      we don't need to save all PA users' mixer states.  Thus, we can
+      stop (re)storing state as soon as we've finished processing the
+      active ConsoleKit seat, thereby further optimizing the suspend/
+      resume speed.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 31 Jan 2010 13:16:46 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu2) lucid; urgency=low
+
+  * debian/01PulseAudio: Use su(1) instead of sudo(8)
+    (LP: #489144, #498980).
+  * debian/patches/series: To trim the startup time, don't lazy-load
+    sounds by not applying 0005-load-sample-dir-lazy.patch.
+  * 0091-dont-load-cork-music-on-phone.patch: Refresh.
+  * 0057-load-module-x11-bell.patch: Don't explicitly load the daemon
+    since it will autospawn if necessary, and if the system or user
+    configuration has autospawn disabled it breaks that semantics
+    (LP: #513120).
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Fri, 29 Jan 2010 14:37:52 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-32-g8478-0ubuntu1) lucid; urgency=low
+
+  * New snapshot of stable-queue branch as requested by upstream
+  * debian/patches/0099-back-out-8d3566.patch: Drop. Seeking is fixed
+    in the latest snapshot.
+  * debian/pulseaudio.default: Update instructions for using system
+    mode.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 17 Jan 2010 22:51:57 -0500
+
+pulseaudio (1:0.9.22~0.9.21+stable-queue-24-gfa64-0ubuntu1) lucid; urgency=low
+
+  * Reroll actual stable-queue tarball (arrrg!)
+  * debian/01PulseAudio: Rework pacmd bits (LP: #507941)
+  * debian/patches/:
+    + add:  0099-back-out-8d3566.patch (upstream says this commit causes
+            regressions)
+    - drop: 0099-change-configure-git-version-tag.patch (no longer
+            relevant)
+    + refresh: 0001-change-resample-and-buffering.patch
+               0054-mute-iec958-optical-raw-for-audigyX.patch
+               0090-disable-flat-volumes.patch
+               0091-dont-load-cork-music-on-phone.patch
+               0057-load-module-x11-bell.patch
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Fri, 15 Jan 2010 19:06:15 -0500
+
+pulseaudio (1:0.9.22~0.9.21+341-g62bf-0ubuntu1) lucid; urgency=low
+
+  * New snapshot based on stable-queue git branch (testing requested
+    specifically by upstream)
+    - LP: #164745, #173212, #201391, #204536, #207796, #210016, #221038,
+    - LP: #226342, #230408, #236423, #237443, #250059, #269585, #274304,
+    - LP: #274577, #275474, #277532, #277566, #277932, #278025, #280534,
+    - LP: #283049, #286816, #287036, #292732, #298011, #298301, #300290,
+    - LP: #302038, #311497, #311853, #324062, #339448, #344057, #348979,
+    - LP: #350829, #356206, #367379, #367544, #369822, #371897, #374846,
+    - LP: #375570, #381801, #399515, #402950, #403786, #408169, #409322,
+    - LP: #409723, #410326, #410446, #417695, #417976, #419271, #421072,
+    - LP: #422774, #423979, #424655, #425028, #427016, #431072, #432660,
+    - LP: #437640, #437996, #442191, #443306, #443389, #446719, #449762,
+    - LP: #455417, #461532, #464652, #483191, #497537, #503780
+  * debian/patches/:
+    + add: 0099-change-configure-git-version-tag.patch: Match released
+           upstream 0.9.21 for shlibs and LIBPULSE_VERSION_INFO
+    - drop: 0004-set-tsched0.patch (no longer relevant)
+            0050-revert-pacmd-poll-argv.patch (no longer relevant)
+            0056-dont-bail-on-sound-class-modem.patch (merged)
+            0056-ignore-sound-class-modem.patch (merged)
+            0058-Backport-4c793.patch (merged)
+            0059-Backport-978d3.patch (merged)
+            0060-fix-implicit-func-decl-cpu-arm.patch (merged)
+            0061-Backport-c5fdb.patch (merged)
+            0070-dont-bail-on-sound-class-modem-devs.patch (merged)
+    + refresh: 0001-change-resample-and-buffering.patch
+               0090-disable-flat-volumes.patch
+               0091-dont-load-cork-music-on-phone.patch
+               0057-load-module-x11-bell.patch
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 14 Jan 2010 20:33:05 -0500
+
+pulseaudio (0.9.21-3) unstable; urgency=low
+
+  * debian/rules: Compile with -g0 on mips{,el} to work around #519006 in
+    gcc-4.4
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 03 Jul 2010 15:12:54 +0100
+
+pulseaudio (0.9.21-2) unstable; urgency=low
+
+  * Import NMU patches into pkg-pulse git, thanks to the security team for
+    their work!
+  * debian/patches/0003-Re-bootstrap.patch
     + Added. Update configure so we don't have to re-run autotools when
     building the package (Closes: #576457, #576546, #576769)
   * Install a KDE specific startup file and module-device-manager.
@@ -603,6 +2338,91 @@ pulseaudio (0.9.21-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Mon, 23 Nov 2009 23:51:16 +0000
 
+pulseaudio (1:0.9.21-0ubuntu6) lucid; urgency=low
+
+  * Backport fix from master HEAD:
+    + 0061-Backport-c5fdb.patch (LP: #502992)
+  * The following patches have been merged upstream, but we'll continue
+    to apply them here until the next upstream snapshot:
+    . 0056-ignore-sound-class-modem.patch
+    . 0060-fix-implicit-func-decl-cpu-arm.patch
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Tue, 05 Jan 2010 18:34:40 -0500
+
+pulseaudio (1:0.9.21-0ubuntu5) lucid; urgency=low
+
+  * Refresh 0060-fix-implicit-func-decl-cpu-arm.patch with more FTBFS-
+    on-armel fixes (all submitted upstream).
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 17 Dec 2009 00:01:49 -0500
+
+pulseaudio (1:0.9.21-0ubuntu4) lucid; urgency=low
+
+  * 0060-fix-implicit-func-decl-cpu-arm.patch: Fix FTBFS on armel.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 16 Dec 2009 22:45:25 -0500
+
+pulseaudio (1:0.9.21-0ubuntu3) lucid; urgency=low
+
+  * 0070-dont-bail-on-sound-class-modem-devs.patch: Fix parameter
+    in function call. Thanks to Whoopie for spotting.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 16 Dec 2009 20:13:43 -0500
+
+pulseaudio (1:0.9.21-0ubuntu2) lucid; urgency=low
+
+  * Fix LP: #394500, #450222:
+    + 0070-dont-bail-on-sound-class-modem-devs.patch:
+      + Add pa_udev_get_sysattr() helper function so that we can
+        retrieve pcm_class.
+      + Add short-circuit in is_card_busy(). Currently there is an
+        incorrect break out of the loop when an HDA modem is driven by
+        slmodemd/hsfmodem. An HDA modem resides in device 6 and will
+        not contain "closed\n" for
+        /proc/asound/card.../pcm.../sub.../status.
+  * 0058-Backport-4c793.patch: Use pa_stream pointers to hashmaps
+    instead of dynarrays.
+  * 0059-Backport-978d3.patch: Mark shared variables as volatile
+    to supress compiler optimizations.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 06 Dec 2009 19:40:04 -0500
+
+pulseaudio (1:0.9.21-0ubuntu1) lucid; urgency=low
+
+  [ Daniel T Chen ]
+  * New upstream bugfix release
+  * debian/control: pulseaudio-module-raop must Depends
+    pulseaudio-module-zeroconf (LP: #484870). Thanks, Dominic Evans!
+  * Bump for 0.9.21:
+    + debian/libpulse0.shlibs
+    + debian/pulseaudio.shlibs
+    + debian/rules
+  * debian/pulseaudio.install:
+    debian/copyright: Amend for addition of:
+    + module-device-manager.so
+  * debian/README.Debian: Update for Ubuntu 9.04+.
+  * 0002-Fix-makefiles-to-include-all-alsa-path-files-on-inst.patch:
+    Drop, fixed upstream.
+  * 0051-fix-sigfpe-mcalign.patch: Drop, needs fixing in alsa-kernel
+    and alsa-lib.
+
+  [ Chow Loong Jin ]
+  * debian/01PulseAudio: Add/modify functions to (re)store sink/source
+    state for (resume/)suspend (LP: #404986, #483900)
+
+  [ Luke Yelavich ]
+  * Remove wrapper scripts and accessibility special case, to help with the
+    desktop startup time. The accessibility case should be solved in
+    speech-dispatcher by the time lucid ships.
+    - debian/patches/0006-a11y-special-case-disable.patch: Removed
+    - debian/70pulseaudio: Removed
+    - debian/pulse-session: Removed
+    - debian/pulseaudio.install: Re-add the xdg autostart desktop file
+    - debian/pulseaudio.preinst: Instead of removing the xdg autostart desktop
+      file on upgrade, remove the 70pulseaudio X Session script on upgrade
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 25 Nov 2009 16:34:54 -0500
+
 pulseaudio (0.9.20-1) unstable; urgency=low
 
   * New upstream release
@@ -611,6 +2431,123 @@ pulseaudio (0.9.20-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 14 Nov 2009 22:50:52 +0000
 
+pulseaudio (1:0.9.20-0ubuntu3) lucid; urgency=low
+
+  * drop the enforced switch to ARMv6 in debian rules (we build for cortex-a8
+    by default now).
+  * Make sure the arm specific assembler code builds properly with thumb
+    support by adding -Wa,-mimplicit-it=thumb instead until it is added to
+    the default compiler flags (fixes FTBFS).
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Wed, 25 Nov 2009 14:16:59 +0100
+
+pulseaudio (1:0.9.20-0ubuntu2) lucid; urgency=low
+
+  * Add 0002-Fix-makefiles-to-include-all-alsa-path-files-on-inst.patch
+    from Debian unstable (thanks, Sjoerd Simons!)
+  * Fix 0055-handle-Master-Front.patch to handle only front elements
+    based on comments from Lennart. The patch now does the right thing
+    despite linux still doing the wrong thing, but at least we handle
+    cases where linux will do the right thing.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 15 Nov 2009 13:45:49 -0500
+
+pulseaudio (1:0.9.20-0ubuntu1) lucid; urgency=low
+
+  * New upstream bugfix release
+    + Fix BT validation (LP: #437293)
+  * debian/control:
+    + pulseaudio Provides pulseaudio-module-hal, pulseaudio-module-udev,
+      and pulseaudio-module-rygel-media-server for upgrades (really
+      fixes LP #477382)
+  * debian/patches/:
+    - 0002-work-around-suspend-on-idle-source-sink-race.patch:
+    - 0052-revert-sse2-optimize.patch:
+    - 0055-backport-alsa-bt-position-fixes-b3592a1.patch:
+      Remove; applied upstream
+    + 0054-mute-iec958-optical-raw-for-audigyX.patch: Refresh
+    + 0055-handle-Master-Front.patch: For new VIA-based HDA, handle
+      this mixer control until we've fixed it in linux (LP: #478868)
+  * Bump for 0.9.20:
+    + debian/libpulse0.shlibs
+    + debian/pulseaudio.shlibs
+    + debian/rules
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 12 Nov 2009 19:19:21 -0500
+
+pulseaudio (1:0.9.19-2ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    + Promote pulseaudio-utils to Depends for pulseaudio so that the
+      pm-utils script is present (LP: #478182)
+    - Drop obsolete Depends on pulseaudio-module-udev for pulseaudio
+      (LP: #477382)
+  * debian/01PulseAudio: Don't fail suspend/resume when system-wide
+    daemon is running (LP: #476505)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Fri, 06 Nov 2009 18:37:36 -0500
+
+pulseaudio (1:0.9.19-2ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - epoch (my stupid fault :S)
+    - Don't build against, and create jack package. Jack is not in main
+    - use speex-float-1 resampler to work better with lack of PREEMPT in
+      karmic's -generic kernel config, also change buffer size
+    - Add alsa configuration files to route alsa applications via pulseaudio
+    - Move libasound2-plugins from Recommends to Depends
+    - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio
+      daemons
+    - Make initscript more informative in the default case of per-user
+      sessions
+    - add status check for system wide pulseaudio instance
+    - create /var/run/pulse, and make restart more robust
+    - LSB {Required-*,Should-*} should specify hal instead of dbus,
+      since hal is required (and already requires dbus)
+    - indicate that the system pulseaudio instance is being started from the init
+      script
+    - Install more upstream man pages
+    - Link to pacat for parec man page
+    - check whether pulseaudio is running before preloading the padsp library
+    - Add DEB_OPT_FLAG = -O3 as per recommendation from
+      pulseaudio-discuss/2007-December/001017.html
+    - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load
+    - Generate a PO template on build
+    - add special case to disable pulseaudio loading if accessibility/speech
+      is being used
+    - the esd wrapper script should not load pulseaudio if pulseaudio is being
+      used as a system service
+    - add a pulseaudio apport hook
+    - fix some typos in README.Debian
+    - drop padevchooser(Recommends) and pavucontrol (Suggests)
+    - drop libasyncns-dev build dependency, its in universe
+    - add libudev-dev as a build-dependency
+    - Fix initialization of devices with modem subdevices
+    - Backport ALSA BlueTOoth position fixes from git HEAD
+    - Disable cork-music-on-phone
+    - Revert sse2 optimizations
+    - disable flat volume
+    - Handle div by zero attempts
+    - Mute IEC958 Optical Raw by default
+    - use tdd instead of gdbm
+  * debian/control:
+    - Dro packages, due to debian including the files in these packages in the
+      main pulseaudio package: pulseaudio-module-udev,
+      pulseaudio-module-udev-dbg, pulseaudio-module-rygel-media-server,
+      pulseaudio-module-rygel-media-server-dbg
+    - Add conflicts/replaces for pulseaudio-module-udev and
+      pulseaudio-module-rygel-media-server
+    - Add replaces for pulseaudio-module-hal to the pulseaudio package to handle
+      upgrades from hardy
+    - Remove rtkit from conflicts, and add it to recommends, as 2.6.32 has the
+      needed patches
+
+  [ Daniel T Chen ]
+  * 0057-load-module-x11-bell.patch: Load module-x11-bell in the
+    start-pulseaudio-x11 script (LP: #301174)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 06 Nov 2009 14:07:19 +1100
+
 pulseaudio (0.9.19-2) unstable; urgency=low
 
   * Built with normal old-style hal support on kfreebsd and the hurd
@@ -637,6 +2574,65 @@ pulseaudio (0.9.19-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 03 Oct 2009 18:22:56 +0100
 
+pulseaudio (1:0.9.19-0ubuntu4) karmic; urgency=low
+
+  * Remove 0053-fix-sigsegv-module-bluetooth-device.patch, as it did
+    more harm than good (reopens LP #437293).
+  * debian/01PulseAudio: Fix bashisms, and make suspend/resume actually
+    work with sudo -H -u (LP: #432096, #450461).
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Tue, 20 Oct 2009 10:29:04 -0400
+
+pulseaudio (1:0.9.19-0ubuntu3) karmic; urgency=low
+
+  [ Tony Espy ]
+  * debian/control: Add a Conflicts for rtkit so we force removal, and
+    hence get more testing coverage between now and Karmic final (LP: #452458).
+
+  [ Daniel T Chen ]
+  * debian/patches/0056-ignore-sound-class-modem.patch:
+    + Apply patch from Whoopie to fix initialization of devices with
+      modem subdevices (LP: #394500, #450222)
+
+ -- Tony Espy <espy at ubuntu.com>  Thu, 15 Oct 2009 15:33:02 -0400
+
+pulseaudio (1:0.9.19-0ubuntu2) karmic; urgency=low
+
+  * debian/control: Drop rtkit from recommends, as the kernel patches have
+    not landed in karmic, so rtkit is currently useless.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 14 Oct 2009 12:02:50 +1100
+
+pulseaudio (1:0.9.19-0ubuntu1) karmic; urgency=low
+
+  * New upstream bugfix release
+  * debian/:
+    . {libpulse0,pulseaudio}.shlibs:
+    . shlibs{,_pulseaudio}.local:
+    . rules: Update for new release
+  * debian
+    + pulseaudio.dirs:
+    . patches/0006-a11y-special-case-disable.patch:
+    . pulse-session: Use a system-wide flag to assist in fixing
+      alsactl store race.
+  * debian/patches/:
+    - 0060-backport-c194d.patch: Drop, subsumed by new release
+    + 0053-fix-sigsegv-module-bluetooth-device.patch: Don't strcmp
+      uninitialized memory (LP: #437293)
+    + 0055-backport-alsa-bt-position-fixes-b3592a1.patch: Apply the
+      following changesets from origin/master HEAD for fixes:
+      40c1ca76c48147c7648e1f1a72cc2c747f3d0c9b,
+      7b682c969025845f75cbc74a9f830ad2dec8a415,
+      c96d2d1117a7e59b351358c8cdd79ef465ddbd49,
+      b3592a160f0d2a28605048a81c0261bf7c45acbb
+    + 0091-dont-load-cork-music-on-phone.patch: Disable for Karmic;
+      it's confusing users (LP: #437638)
+  * Previous uploads resolved Launchpad bug reports:
+    - LP: #434003 (crashed with SIGILL in pa_smoother_translate() )
+    - LP: #437638 (cpulimit.c: Received request to terminate)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Tue, 06 Oct 2009 18:40:38 -0400
+
 pulseaudio (0.9.18-1) unstable; urgency=low
 
   * New upstream release
@@ -664,6 +2660,46 @@ pulseaudio (0.9.18-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 27 Sep 2009 23:46:37 +0200
 
+pulseaudio (1:0.9.18-0ubuntu3) karmic; urgency=low
+
+  * debian/patches/:
+    + 0052-revert-sse2-optimize.patch: Revert 3d5a57 causing audio
+      anomalies (LP: #428619)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Tue, 22 Sep 2009 22:19:42 -0400
+
+pulseaudio (1:0.9.18-0ubuntu2) karmic; urgency=low
+
+  * Remove epoch again, fixes FTBFs.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 21 Sep 2009 11:12:00 +1000
+
+pulseaudio (1:0.9.18-0ubuntu1) karmic; urgency=low
+
+  [ Daniel T Chen ]
+  * New upstream bugfix release
+  * debian/patches/:
+    - 0052-backport-56b6e18030.patch: Drop
+    - 0053-fix-output-element.patch: Drop, applied upstream
+    - 0090-use-volume-ignore-for-analog-output.patch: Stop applying
+      this patch. Too many people are confused as to why PCM isn't
+      being changed when they adjust PA's volume.
+    + 0060-backport-c194d.patch: Backport fixes from 0.9.18-stable
+      branch (to changeset c194db71b0ff853b4f46df26e135edf63b215451)
+    + 0090-disable-flat-volumes.patch: Many people seem uncomfortable
+      with PA's new default volume adjustment routine, so disable it
+      in favour of the existing behaviour known in previous Ubuntu
+      releases. The downside is that the user again has many knobs to
+      fiddle; the upside is that applications can no longer drop the
+      volume floor. This addresses LP: #403859, #433209.
+
+  [ Luke Yelavich ]
+  * debian/pulse-alsa.conf: Expose the pulse device to the ALSA name hint API.
+    Thanks to David Henningsson <launchpad.web at epost.diwic.se> for the patch.
+  * Add epoch to shlibs version definitions.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 21 Sep 2009 10:28:25 +1000
+
 pulseaudio (0.9.17-1) unstable; urgency=low
 
   * New upstream release
@@ -672,6 +2708,30 @@ pulseaudio (0.9.17-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 12 Sep 2009 10:27:46 +0100
 
+pulseaudio (1:0.9.17-0ubuntu2) karmic; urgency=low
+
+  * debian/patches/:
+    + 0051-fix-sigfpe-mcalign.patch: Handle div by zero attempts
+      (LP: #412224)
+    + 0052-backport-56b6e18030.patch: Backport fixes from git HEAD
+      (56b6e18030b5a467946bd0a5803ec119efccdc8a)
+    + 0053-fix-output-element.patch: Fix misspelling of Surround
+    + 0054-mute-iec958-optical-raw-for-audigyX.patch: Mute
+      IEC958 Optical Raw by default (LP: #400629, #408370)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 17 Sep 2009 19:57:15 -0400
+
+pulseaudio (1:0.9.17-0ubuntu1) karmic; urgency=low
+
+  [ Daniel T Chen ]
+  * New upstream release
+
+  [ Luke Yelavich ]
+  * debian/rules: refer to the 0.9.17 directory
+  * bump shlibs
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 14 Sep 2009 10:01:24 +1000
+
 pulseaudio (0.9.16-1) unstable; urgency=low
 
   * New upstream release
@@ -684,18 +2744,263 @@ pulseaudio (0.9.16-1) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Thu, 10 Sep 2009 21:53:15 +0100
 
+pulseaudio (1:0.9.16-0ubuntu1) karmic; urgency=low
+
+  [ 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
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 11 Sep 2009 09:24:39 +1000
+
+pulseaudio (1:0.9.16~test7-14-g7ca81-0ubuntu2) karmic; urgency=low
+
+  * debian/control: Fix missing pulseaudio-module-rygel-media-server
+    Depends thanks to lintian
+  * debian/patches/0054-use-sse2-volume.patch:
+    - Remove, resolved differently upstream (see below)
+  * debian/patches/0054-volume-libpulse-backported-fixes.patch:
+    + Add fixes from git HEAD:
+      e6a666d8d5fffbc9847b51b35349b88d74970079 (PA_BYTES_SNPRINT_MAX)
+      5cf0c1e544a5fce97d514c793256b2e301277136 (rearrange functions)
+      508c462841fd087528649ed1ca3646363387bb5d:
+         b5ac3839e18524524fa3e0da7ec68dbce16e8203 (remap/vol only SSE2)
+         723499439f575f744f07c85a42b47d95cdc98de6 (init SSE2)
+      3bbc5e6a4d0211d8cedd2fe6698c2e2c07d1c4b9 (add PA_VOLUME_INVALID)
+      cc6c4fe91f916451bbea9073619c11a6b122b684 (check pa_volume_t args)
+      9755bfa58af0c27b478d5d8cc56013527a6f660b (drop expensive checks)
+      d000dd6f4b976894558613f69bdad2974cce7d1e (NULL chan map consist.)
+      41a0dc1e9987ae00b605fd88bf887becbdf097d5 (log invalid fade/bal)
+      08a4d57ce2f20173ea8a90e597a3ebcd28398242 (ok NULL proplist inv.)
+  * debian/patches/0055-llvm-clang-analyzer-fixes.patch:
+    + Add fixes from git HEAD:
+      f5046759cdd72daf5ba3b31c9dfc7b8d5be6bc9b..
+      7cc100d9e1d7093da44c8c83cbf61bb8c6000d9a
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Tue, 08 Sep 2009 18:21:00 -0400
+
+pulseaudio (1:0.9.16~test7-14-g7ca81-0ubuntu1) karmic; urgency=low
+
+  * New git snapshot of origin/master (0.9.16~test7-14-g7ca81)
+    fixes LP: #419658, #422451, #424127
+  * debian/pulseaudio.install: add module-loopback
+  * debian/control: remove liboil*-dev build-dependency thanks to
+    included ASM optimisations
+  * debian/copyright: update; we've added module-loopback
+  * debian/patches/0052-disable-cpu-limit.patch: Disable cpu limit as
+    per 812be327836c93492ad389333bcc037566141eb8
+  * debian/patches/0053-add-input-sources.patch: Add internal mic and
+    docking station as per 8cd635bc614834c13d0f1c586d472b4a52b98664
+  * debian/patches/0054-use-sse2-volume.patch: Only use if SSE2 is
+    available. This is a workaround for LP: #418448, thanks "knarf"!
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 06 Sep 2009 14:23:15 -0400
+
+pulseaudio (1:0.9.16~test6-3-g57e1-0ubuntu2) karmic; urgency=low
+
+  * add -march=armv6 to compiler flags on armel, recent upstream changes
+    make pulse fail building on anything below v6 (what a very bad idea !)
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Thu, 27 Aug 2009 16:25:15 +0200
+
+pulseaudio (1:0.9.16~test6-3-g57e1-0ubuntu1) karmic; urgency=low
+
+  [ Daniel T Chen ]
+  * New git snapshot of origin/master (0.9.16~test6-3-g57e1)
+  * debian/patches/:
+    + 0050-revert-pacmd-poll-argv.patch: Retain, still seeing
+      excessive cpu usage with resume
+    - 0051-leave-hp-enabled.patch: Drop, applied upstream
+    + 0051-reduce-lib-linking.patch: Refresh and rename previous
+      0052-reduce.. so that minimal changes are made
+
+  [ Luke Yelavich ]
+  * debian/control: Promote rtkit from suggests to recommends
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Aug 2009 09:44:32 +1000
+
 pulseaudio (0.9.16~test5-1) experimental; urgency=low
 
   * New Upstream Version
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 22 Aug 2009 21:59:34 +0100
 
+pulseaudio (1:0.9.16~test5-0ubuntu2) karmic; urgency=low
+
+  [ Daniel T Chen ]
+  * debian/patches/0051-leave-hp-enabled.patch: Leave
+    headphones enabled in the default analog mixer profiles
+
+  [ Luke Yelavich ]
+  * debian/patches/0052-reduce-lib-linking.patch: Reduce the number of
+    libraries that the libpulse libraries are linked against as much as
+    possible, to lessen the work needed to make bi-arch libpulse packages
+    in the future
+  * Remove pulseaudio.desktop once again, as the a11y special case is
+    not being honoured, and we have the Xsession.d script to start pulse
+    for us, to avoid any races with other apps wanting to play sounds on
+    session startup
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 21 Aug 2009 15:48:31 +1000
+
+pulseaudio (1:0.9.16~test5-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+  * debian/patches/0050-backport-git-post-test4.patch: drop
+  * debian/patches/0050-revert-pacmd-poll-argv.patch: revert pacmd
+    changesets due to excessive cpu usage (poll()) with resume:
+    - aae7054b1c442e62cc1154d15a4b7a569d60d8f4
+    - 5fcb8a3c0838a4ecdb00a0af09b6e1a358b114d0
+  * debian/01PulseAudio: Escape hash when passed to sudo -u
+    (LP: #414385). Thanks, Christoph Kurrat and Dana Goyette!
+  * debian/pulseaudio.init: Add NetworkManager to
+    Should-St{art,op} to fix sink/source publishing with Avahi
+    (LP: #413443). Thanks, Martin-?ric Racine!
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 19 Aug 2009 17:43:48 -0400
+
 pulseaudio (0.9.16~test4-1) experimental; urgency=low
 
   * New Upstream Version
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 09 Aug 2009 18:24:46 +0100
 
+pulseaudio (1:0.9.16~test4-0ubuntu6) karmic; urgency=low
+
+  * Correct changelog entry for 1:0.9.16~test4-0ubuntu5
+    (5fcb8a3c0838a4ecdb00a0af09b6e1a358b114d0 was _not_
+    applied)
+  * Resync proper 0050-backport-git-post-test4.patch
+    from the ~ubuntu-audio-dev PPA branch
+  * debian/control: Drop libgdbm-dev; use tdb-dev instead
+    since it's upstream's approach
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 13 Aug 2009 22:49:07 -0400
+
+pulseaudio (1:0.9.16~test4-0ubuntu5) karmic; urgency=low
+
+  [ Daniel T Chen ]
+  * 0050-backport-git-post-test4.patch: Add the following changesets
+    from git (can be dropped with -test5):
+    + 51b3899348bf29dd88b56691aeea9f57895dfd14
+    + 7d4916379bbf05384ad199004949cc220822aa5f
+    + 23a294c97e62e0bee9b17b1f8ad20a39e1ba15da
+    + d27e26dca0b492b1906b42b2d0f7decd38ed8ae3
+    + 462cdf44b7fe36768c836c90761f6b8153290517
+    + e8340345f6a102cd03b6676576bcd3879ead7aad
+    + 8998cba6839a46f11daec411c83a1b35723c5117
+    + facae1f27504983d7eff7c7c3ffa864f7e002272
+    + 9f53aa5546e7bf9246546c6dda5637d50679483c
+    + ef176ecb62a8f04bd14ca37e7c2a40469f0bb8ba
+    + 27b8cd783c2aedb23af8f88fc88632d5c4f387fd
+    + 5921324fd3c16e2b3d38d07b200febd90835f169
+    + 286ab2f19370c7a0041897435614b2c6aadc8e70
+    + 17d57415f5abad5b7c30301227054b4c899bc705
+
+  [ Luke Yelavich ]
+  * debian/pulseaudio.install: Also add previously dropped 70pulseaudio file
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 14 Aug 2009 10:29:16 +1000
+
+pulseaudio (1:0.9.16~test4-0ubuntu4) karmic; urgency=low
+
+  * debian/pulseaudio.install: ...and also re-add droped apport hook, and
+    alsa configuration files
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 07 Aug 2009 10:05:51 +0100
+
+pulseaudio (1:0.9.16~test4-0ubuntu3) karmic; urgency=low
+
+  * debian/pulseaudio.install: Also re-add pulse-session wrapper script
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 07 Aug 2009 09:41:15 +0100
+
+pulseaudio (1:0.9.16~test4-0ubuntu2) karmic; urgency=low
+
+  * debian/pulseaudio.install:
+    - Re-add the pm-utils script that was inadvertantly left out with the
+      previous Debian merge
+    - Add udev rules from upstream, needed for particular sound hardware
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 06 Aug 2009 18:49:12 +0100
+
+pulseaudio (1:0.9.16~test4-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+  * debian/patches/0008-clean-out-old-files.patch: Dropped, applied upstream
+  * debian/control: Fix pulseaudio-module-rygel-media-server debug package name
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 05 Aug 2009 12:02:18 +0100
+
+pulseaudio (1:0.9.16~test3-0ubuntu1) karmic; urgency=low
+
+  * New upstream release
+  * debian/pulseaudio.postinst:
+    - Do not create the pulse-rt group any more
+    - Do not make the pulseaudio binary suid root
+  * debian/pulseaudio.postrm: Do not try to remove the pulse-rt group
+  * debian/pulseaudio.preinst: Remove the pulse-rt group on upgrade
+  * debian/control:
+    - Suggest rtkit
+    - Renamed pulseaudio-module-hal and pulseaudio-module-hal-dbg to
+      pulseaudio-module-udev and pulseaudio-module-udev-dbg respectively
+    - pulseaudio-module-udev replaces pulseaudio-module-hal
+    - Bumped libudev-dev requirement to >= 143
+    - Added build dependencies libICE-dev, libxi-dev, x11proto-core-dev
+    - Add new package for the rygel-media-server module
+    - Tighten libasound2-dev and libsndfile1-dev dependencies
+  * debian/pulseaudio.init: Change all hal references to udev
+  * debian/patches/0008-clean-out-old-files.patch: Remove non-existant files
+    from POTFILES.in, patch sent upstream
+  * Merge from Debian unstable, remaining changes:
+    - epoch (my stupid fault :S)
+    - Don't build against, and create jack package. Jack is not in main
+    - use speex-float-1 resampler to work better with lack of PREEMPT in
+      karmic's -generic kernel config, also change buffer size
+    - Add alsa configuration files to route alsa applications via pulseaudio
+    - Move libasound2-plugins from Recommends to Depends
+    - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio
+      daemons
+    - patch to fix source/sink and suspend-on-idle race
+    - Make initscript more informative in the default case of per-user
+      sessions
+    - add status check for system wide pulseaudio instance
+    - create /var/run/pulse, and make restart more robust
+    - LSB {Required-*,Should-*} should specify hal instead of dbus,
+      since hal is required (and already requires dbus)
+    - indicate that the system pulseaudio instance is being started from the init
+      script
+    - Install more upstream man pages
+    - Link to pacat for parec man page
+    - check whether pulseaudio is running before preloading the padsp library
+    - Add DEB_OPT_FLAG = -O3 as per recommendation from
+      pulseaudio-discuss/2007-December/001017.html
+    - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load
+    - Generate a PO template on build
+    - add special case to disable pulseaudio loading if accessibility/speech
+      is being used
+    - the esd wrapper script should not load pulseaudio if pulseaudio is being
+      used as a system service
+    - add a pulseaudio apport hook
+    - fix some typos in README.Debian
+    - drop padevchooser(Recommends) and pavucontrol (Suggests)
+    - drop libasyncns-dev build dependency, its in universe
+    - add libudev-dev as a build-dependency
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 04 Aug 2009 11:46:25 +0100
+
 pulseaudio (0.9.16~test2~20090726git59659e1db-1) experimental; urgency=low
 
   * New Upstream Version
@@ -723,6 +3028,72 @@ pulseaudio (0.9.15-4.1) unstable; urgency=high
 
  -- Nico Golde <nion at debian.org>  Fri, 24 Jul 2009 18:02:24 +0200
 
+pulseaudio (1:0.9.15-4ubuntu3) karmic; urgency=low
+
+  * debian/01PulseAudio: Mute sinks and sources prior to
+    suspend; unmute sinks and sources after resume (LP: #404986)
+  * debian/patches/series: Reenable glitch-free.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Mon, 27 Jul 2009 22:06:34 -0400
+
+pulseaudio (1:0.9.15-4ubuntu2) karmic; urgency=low
+
+  * SECURITY UPDATE: root escalation from BIND_NOW re-execution.
+    - 0040-do-not-exec-for-bindnow.patch: use -Wl,-z,now instead of
+      performing a racey re-exec.
+    - CVE-2009-1894
+
+ -- Kees Cook <kees at ubuntu.com>  Thu, 16 Jul 2009 10:03:46 -0700
+
+pulseaudio (1:0.9.15-4ubuntu1) karmic; urgency=low
+
+  [ Daniel T Chen ]
+  * debian/patches/0001_change_resample_and_buffering.patch: Bump
+    default resampler to speex-float-1 due to remaining audio
+    anomalies when playing DVDs (LP: #376374)
+
+  [ Luke Yelavich ]
+  * Merge from Debian unstable, remaining changes:
+    - epoch (my stupid fault :S)
+    - Don't build against, and create jack package. Jack is not in main
+    - use speex-float-1 resampler to work better with lack of PREEMPT in
+      karmic's -generic kernel config, also change buffer size
+    - Add alsa configuration files to route alsa applications via pulseaudio
+    - Move libasound2-plugins from Recommends to Depends
+    - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio
+      daemons
+    - patch to fix source/sink and suspend-on-idle race
+    - Make initscript more informative in the default case of per-user
+      sessions
+    - add status check for system wide pulseaudio instance
+    - create /var/run/pulse, and make restart more robust
+    - LSB {Required-*,Should-*} should specify hal instead of dbus,
+      since hal is required (and already requires dbus)
+    - indicate that the system pulseaudio instance is being started from the init
+      script
+    - Install more upstream man pages
+    - Link to pacat for parec man page
+    - check whether pulseaudio is running before preloading the padsp library
+    - Add DEB_OPT_FLAG = -O3 as per recommendation from
+      pulseaudio-discuss/2007-December/001017.html
+    - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load
+    - disable glitch free (use tsched=0)
+    - Generate a PO template on build
+    - add special case to disable pulseaud  * debian/patches/0090-fix-sw-mute-desync.patch: Dropped, as this is included
+    in the recently added patches in Debian.io loading if accessibility/speech
+      is being used
+    - the esd wrapper script should not load pulseaudio if pulseaudio is being
+      used as a system service
+    - add a pulseaudio apport hook
+    - fix some typos in README.Debian
+    - drop padevchooser(Recommends) and pavucontrol (Suggests)
+    - drop libasyncns-dev build dependency, its in universe
+    - add libudev-dev as a build-dependency
+  * debian/patches/0090-fix-sw-mute-desync.patch: Dropped, as this is included
+    in the recently added patches in Debian.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 22 Jun 2009 11:17:06 +1000
+
 pulseaudio (0.9.15-4) unstable; urgency=low
 
   * Synchronize our patches with Mandriva and Fedora (thanks to Colin Guthrie
@@ -759,6 +3130,56 @@ pulseaudio (0.9.15-4) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 21 Jun 2009 15:40:33 +0100
 
+pulseaudio (1:0.9.15-3ubuntu1) karmic; urgency=low
+
+  [ Daniel T Chen ]
+  * debian/patches/0001_change_resample_and_buffering.patch: Bump
+    default resampler to ffmpeg. We cannot peg the cpu, and we cannot
+    have audio anomalies, so this change _should_ be regression-free
+    but needs extensive testing (LP: #376374).
+  * debian/patches/0090_fix_sw_mute_desync.patch: Backport from
+    git HEAD to resolve sw vol becoming muted on logout
+    (LP: #315971, #352732)
+
+  [ Luke Yelavich ]
+  * Merge from Debian unstable, remaining changes:
+    - epoch (my stupid fault :S)
+    - Don't build against, and create jack package. Jack is not in main
+    - use ffmpeg resampler to work better with lack of PREEMPT in jaunty's
+      -generic kernel config, also change buffer size
+    - Add alsa configuration files to route alsa applications via pulseaudio
+    - Move libasound2-plugins from Recommends to Depends
+    - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio
+      daemons
+    - patch to fix source/sink and suspend-on-idle race
+    - Make initscript more informative in the default case of per-user
+      sessions
+    - add status check for system wide pulseaudio instance
+    - create /var/run/pulse, and make restart more robust
+    - LSB {Required-*,Should-*} should specify hal instead of dbus,
+      since hal is required (and already requires dbus)
+    - indicate that the system pulseaudio instance is being started from the init
+      script
+    - Install more upstream man pages
+    - Link to pacat for parec man page
+    - check whether pulseaudio is running before preloading the padsp library
+    - Add DEB_OPT_FLAG = -O3 as per recommendation from
+      pulseaudio-discuss/2007-December/001017.html
+    - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load
+    - disable glitch free (use tsched=0)
+    - Generate a PO template on build
+    - add special case to disable pulseaudio loading if accessibility/speech
+      is being used
+    - the esd wrapper script should not load pulseaudio if pulseaudio is being
+      used as a system service
+    - add a pulseaudio apport hook
+    - fix some typos in README.Debian
+    - drop padevchooser(Recommends) and pavucontrol (Suggests)
+    - drop libasyncns-dev build dependency, its in universe
+    - add libudev-dev as a build-dependency
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 09 Jun 2009 10:47:05 +1000
+
 pulseaudio (0.9.15-3) unstable; urgency=low
 
   * Re-enable bluetooth support (Closes: #530514)
@@ -776,6 +3197,51 @@ pulseaudio (0.9.15-3) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 22:30:33 +0100
 
+pulseaudio (1:0.9.15-2ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - epoch (my stupid fault :S)
+    - Don't build against, and create jack package. Jack is not in main
+    - use linear resampler to work better with lack of PREEMPT in jaunty's
+      -generic kernel config, also change buffer size
+    - Add alsa configuration files to route alsa applications via pulseaudio
+    - Move libasound2-plugins from Recommends to Depends
+    - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio
+      daemons
+    - patch to fix source/sink and suspend-on-idle race
+    - Make initscript more informative in the default case of per-user
+      sessions
+    - create /var/run/pulse, and make restart more robust
+    - add status check for system wide pulseaudio instance
+    - LSB {Required-*,Should-*} should specify hal instead of dbus,
+      since hal is required (and already requires dbus)
+    - indicate that the system pulseaudio instance is being started from the init
+      script
+    - Install more upstream man pages
+    - Link to pacat for parec man page
+    - check whether pulseaudio is running before preloading the padsp library
+    - Add DEB_OPT_FLAG = -O3 as per recommendation from
+      pulseaudio-discuss/2007-December/001017.html
+    - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load
+    - disable glitch free (use tsched=0)
+    - Generate a PO template on build
+    - add special case to disable pulseaudio loading if accessibility/speech
+      is being used
+    - the sd wrapper script should not load pulseaudio if pulseaudio is being
+      used as a system service
+    - add a pulseaudio apport hook
+    - fix some typos in README.Debian
+    - demote paprefs to suggests
+    - drop padevchooser(Recommends) and pavucontrol (Suggests)
+    - drop libasyncns-dev build dependency, its in universe
+    - add libudev-dev as a build-dependency
+    - Retain libbluetooth-dev build dependency
+  * debian/01Pulseaudio: Harvist users by UID, and not username, to ensure
+    that the script doesn't choak on characters not already considered as
+    used in a username (LP: #374694)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 26 May 2009 23:33:42 +0200
+
 pulseaudio (0.9.15-2) unstable; urgency=low
 
   * debian/control: Add strict dependencies from libpulse-dev to the various
@@ -785,6 +3251,62 @@ pulseaudio (0.9.15-2) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Thu, 21 May 2009 00:54:38 +0100
 
+pulseaudio (1:0.9.15-1ubuntu3) karmic; urgency=low
+
+  * debian/control: libltdl7-dev -> libltdl-dev
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 11 May 2009 12:33:08 +1000
+
+pulseaudio (1:0.9.15-1ubuntu2) karmic; urgency=low
+
+  * debian/01PulseAudio: harvest users more robustly. Thanks,
+    Chow Loong Jin <hyperair at gmail.com>! (LP: #202089)
+  * debian/control: pulseaudio depends on pulseaudio-module-hal
+    to fix LP: #326532
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 09 Apr 2009 17:03:00 -0400
+
+pulseaudio (1:0.9.15-1ubuntu1) karmic; urgency=low
+
+  * Merge from unreleased Debian pulseaudio git, remaining changes:
+    - epoch (my stupid fault :S)
+    - Don't build against, and create jack package. Jack is not in main
+    - use linear resampler to work better with lack of PREEMPT in jaunty's
+      -generic kernel config, also change buffer size
+    - Add alsa configuration files to route alsa applications via pulseaudio
+    - Move libasound2-plugins from Recommends to Depends
+    - Add pm-utils sleep hook to suspend (and resume) users' pulseaudio
+      daemons
+    - patch to fix source/sink and suspend-on-idle race
+    - Make initscript more informative in the default case of per-user
+      sessions
+    - create /var/run/pulse, and make restart more robust
+    - add status check for system wide pulseaudio instance
+    - LSB {Required-*,Should-*} should specify hal instead of dbus,
+      since hal is required (and already requires dbus)
+    - indicate that the system pulseaudio instance is being started from the init
+      script
+    - Install more upstream man pages
+    - Link to pacat for parec man page
+    - check whether pulseaudio is running before preloading the padsp library
+    - Add DEB_OPT_FLAG = -O3 as per recommendation from
+      pulseaudio-discuss/2007-December/001017.html
+    - cache /usr/share/sounds/ubuntu/stereo/ wav files on pulseaudio load
+    - disable glitch free (use tsched=0)
+    - Generate a PO template on build
+    - add special case to disable pulseaudio loading if accessibility/speech
+      is being used
+    - the sd wrapper script should not load pulseaudio if pulseaudio is being
+      used as a system service
+    - add a pulseaudio apport hook
+    - fix some typos in README.Debian
+    - demote paprefs to suggests
+    - drop padevchooser(Recommends) and pavucontrol (Suggests)
+    - drop libasyncns-dev build dependency, its in universe
+  * add libudev-dev as a build-dependency
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 05 May 2009 14:18:20 +1000
+
 pulseaudio (0.9.15-1) unstable; urgency=low
 
   * debian/control: Build-Depend on libcap-dev instead of libcap2-dev
@@ -874,6 +3396,418 @@ pulseaudio (0.9.14-1) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 01 Feb 2009 12:47:55 +0000
 
+pulseaudio (1:0.9.14-0ubuntu20) jaunty; urgency=low
+
+  * debian/01PulseAudio: use pactl instead of pacmd (LP: #202089)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 08 Apr 2009 18:54:30 -0400
+
+pulseaudio (1:0.9.14-0ubuntu19) jaunty; urgency=low
+
+  [ Daniel T Chen ]
+  * debian/pulseaudio.init:
+    - Fix inane stop() syntax (LP: #357201)
+  * Update backported (from git HEAD) fixes:
+    - 0091_workaround_alsa_horkage.patch
+  * Add new fixes:
+    - 0049_fix_sampling_rate_not_beyond_pa-rate-max.patch
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Thu, 09 Apr 2009 07:29:24 +1000
+
+pulseaudio (1:0.9.14-0ubuntu18) jaunty; urgency=low
+
+  * debian/apport-hook.py: Add apport hook
+  * debian/rules, debian/pulseaudio.install: Install apport hook
+  * LP: #357913
+
+ -- Matt Zimmerman <mdz at ubuntu.com>  Wed, 08 Apr 2009 20:14:17 +0100
+
+pulseaudio (1:0.9.14-0ubuntu17) jaunty; urgency=low
+
+  [ Daniel T Chen ]
+  * debian/pulseaudio.init:
+    - Actually create /var/run/pulse, and make handling of /restart
+      more robust (LP #317921)
+    - Add /status check for system-wide daemon instance
+      (LP: #298299)
+  * Backport from upstream git HEAD:
+    - 0046_ignore_hal_no_such_cap.patch,
+    - 0047_pick_up_all_cards.patch (LP: #353807),
+    - 0048_fix_stuck_prebuf.patch (LP: #355825)
+
+  [ Luke Yelavich ]
+  * debian/control: Drop recommends from the pulseaudio-module-x11 package. if
+    they were dropped previously, they were re-added somehow, so lets get rid
+    of them once and for all.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 07 Apr 2009 16:51:59 +1000
+
+pulseaudio (1:0.9.14-0ubuntu16) jaunty; urgency=low
+
+  * Introduce epoch to fix my stupidity in uploading a test release of
+    pulseaudio.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 01 Apr 2009 14:04:33 +1100
+
+pulseaudio (0.9.14-0ubuntu15) jaunty; urgency=low
+
+  [ Daniel T Chen ]
+  * README.Debian:
+    pulse-session:
+    pulseaudio.default: Clarify function of system-wide check, and
+    make /usr/bin/pulse-session do the right thing if system-wide
+    is enabled (LP: #286966)
+
+  [ Luke Yelavich ]
+  * Make the a11y no start special case per user, not system wide.
+  * Also make the esd wrapper script honour system wide pulseaudio.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 30 Mar 2009 11:33:33 +1100
+
+pulseaudio (0.9.14-0ubuntu14) jaunty; urgency=low
+
+  * No-change rebuild to fix lpia shared library dependencies.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Thu, 19 Mar 2009 13:57:35 +0000
+
+pulseaudio (0.9.14-0ubuntu13) jaunty; urgency=low
+
+  * debian/rules: Generate a PO template on build. Thanks to Timo Jyrinki for
+    the patch! (LP: #342159)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 16 Mar 2009 10:14:19 +0100
+
+pulseaudio (0.9.14-0ubuntu12) jaunty; urgency=low
+
+  * 0091_workaround_alsa_horkage.patch:
+    - Lower severity of logging level to prevent DoS on syslog
+      LP: #320875, #343254
+      LP #330814
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sat, 14 Mar 2009 22:39:03 -0400
+
+pulseaudio (0.9.14-0ubuntu11) jaunty; urgency=low
+
+  [ Daniel T Chen ]
+  * Reenable 0030_set_tsched0.patch, which re-disables glitch-free;
+    too many users are reporting regressions and audio aberrations.
+  * Adjust 0003_change_resample_and_buffering.patch to use linear
+    resampler to work better with lack of PREEMPT in jaunty's
+    -generic kernel config (LP: #207135, #322250, #332761, #335955,
+    LP: #336965).
+  * Last upload, specifically 0091_workaround_alsa_horkage, fixes:
+    LP: #235990, #237443, #279847, #317997, #323185, #330814,
+    LP: #334874.
+  * sudo -H change in ubuntu6 fixed LP: #312505.
+  * Closing old bugs fixed in 0.9.11+: LP: #187963, #193520, #211052.
+  * Refresh 0006_regen-autotools.patch.
+  * Add 0043_load_sample_dir_lazy.patch to cache
+    /usr/share/sounds/ubuntu/stereo/* in default.pa.
+  * debian/:
+    - control: Build against libcap2-dev (LP: #339448);
+    - copyright: Update copyright from Debian's 0.9.14-2;
+    - rules: Add DEB_OPT_FLAG = -O3 as per recommendation from
+      pulseaudio-discuss/2007-December/001017.html.
+  * Refresh fixes from git HEAD:
+    - 0038_handle_errno_properly.patch,
+    - 0091_workaround_alsa_horkage.patch,
+    - 0092_fix_null_pointer_access.patch.
+
+  [ Luke Yelavich ]
+  * Add a special case to prevent Pulseaudio from being started when the
+    blindness accessibility profile has been enabled from the Ubuntu live CD,
+    and for an accessibility install. Unfortunately Pulseaudio and speech do
+    not currently work very well with each other, and its too late in
+    the cycle to solve this problem any other way.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 10 Mar 2009 09:00:40 +1100
+
+pulseaudio (0.9.14-0ubuntu10) jaunty; urgency=low
+
+  [ Daniel T Chen ]
+  * 0030_set_tsched0.patch: Disable this patch, which has the effect of
+    reenabling glitch-free. Depends on 0091_workaround_alsa_horkage.
+  * 0091_workaround_alsa_horkage.patch: Rework ALSA delay handling.
+
+  [ Luke Yelavich ]
+  * debian/control: re-add the vcs bzr URL for Ubuntu's pulseaudio packaging
+    as it got lost somewhere along the way
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 02 Mar 2009 10:40:11 +1100
+
+pulseaudio (0.9.14-0ubuntu9) jaunty; urgency=low
+
+  * PulseAudio does not need to be started before gdm, especially since we use
+    user sessions by default.
+
+ -- Scott James Remnant <scott at ubuntu.com>  Fri, 27 Feb 2009 01:27:20 +0000
+
+pulseaudio (0.9.14-0ubuntu8) jaunty; urgency=low
+
+  [ Daniel T Chen ]
+  * Backport fixes from git HEAD:
+    - 0041_clarify_cmdline_opts.patch,
+    - 0042_fix_selem_init.patch
+
+  [ Luke Yelavich ]
+  * 0001_more_translatable_strings.patch: Make the .desktop file and PolicyKit
+    files translatable, thanks to Gabor Kelemen <kelemeng at gnome.hu for this
+    work (LP: #331831)
+  * 0006_regen-autotools.patch: re-create to take into account changes needed
+    for the above mentioned translation additions
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 24 Feb 2009 13:46:25 +1100
+
+pulseaudio (0.9.14-0ubuntu7) jaunty; urgency=low
+
+  [ Luke Yelavich ]
+  * 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch: Dropped,
+    no longer applicable, as evident in Debian's pulseaudio git branch.
+
+  [ Daniel T Chen ]
+  * 0004_enable_autospawn.patch: Renamed from .."disable".. for clarity,
+    and actually apply it.
+  * 0012_clarify_driver_error_redirect_to_alsa_devs.patch: Clarify
+    logging message for 'linux' source package and ALSA developers
+    instead of PulseAudio developers in alsa-util.c, too.
+    - This patch can be tweaked, since upstream has now applied it to
+      git HEAD
+  * Backport fixes from git HEAD:
+    - 0035_fix_module-detect_access.patch,
+    - 0036_increase_memblock_imports.patch,
+    - 0037_fill_silence_fail_import_memblock.patch,
+    - 0038_handle_errno_properly.patch,
+    - 0039_add_validity_checks.patch,
+    - 0040_legacy_fixes.patch
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 19 Feb 2009 19:34:03 -0500
+
+pulseaudio (0.9.14-0ubuntu6) jaunty; urgency=low
+
+  * 0004_disable_autospawn.patch: Disable this patch. Doing so
+    allows the daemon to spawn if not already running, which
+    works around LP: #191027, #204272
+  * 0012_clarify_driver_error_redirect_to_alsa_devs.patch:
+    - Only log POLL* being set if tsched is used so that syslog
+      isn't filled with innocuous messages when we set tsched=0
+      (see 0030 below) (LP: #323712),
+    - Hint 'linux' source package instead of 'alsa-driver' for
+      Launchpad bug reports,
+    - The debug-specific portion is only applicable to 0.9.14;
+      0.9.15 enables a rate limiting module by default to work
+      around this (and other) issues
+  * 0029_fix_suspend_on_idle_null_race.patch: Handle sink case,
+    too
+  * 0030_set_tsched0.patch: Work around a shedload of (driver)
+    bugs by falling back to interrupt-based buffer semantics
+    (LP: #190754, #292880, #295519, #298494, #301755, #302964,
+     LP: #319118, #323976, #324103, #326205, #326864)
+  * Backport fixes from git HEAD:
+    - 0031_fix_6chan_map.patch,
+    - 0032_reinit_proplist.patch,
+    - 0033_fix_pa-gcc-packedmalloc.patch,
+    - 0034_bt_fixes.patch
+  * Make invoking the stop target in the initscript not fail an
+    upgrade (LP: #317921)
+  * Previous upload (0.9.14-0ubuntu3) fixed LP: #321357
+  * 01PulseAudio: use sudo -H to ensure that $HOME is, in fact,
+    the user's when invoking pacmd for suspend/resume
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 15 Feb 2009 02:35:26 -0500
+
+pulseaudio (0.9.14-0ubuntu5) jaunty; urgency=low
+
+  * Add fixes from git HEAD:
+    - 0028_fix_uninit_rtp_resamp.patch,
+    - 0029_fix_suspend_on_idle_null_race.patch
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 12 Feb 2009 18:28:42 -0500
+
+pulseaudio (0.9.14-0ubuntu4) jaunty; urgency=low
+
+  * Add fixes from git HEAD:
+    - 0023_work_around_dlsym_retval_mistyping.patch,
+    - 0024_fix_sink_source_calls_in_suspended.patch,
+    - 0025_shortcut_pa-sink-process-rewind.patch,
+    - 0026_reset_rewind-requested_when_suspend.patch,
+    - 0027_fix_piped_pacmd.patch
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 04 Feb 2009 19:36:09 -0500
+
+pulseaudio (0.9.14-0ubuntu3) jaunty; urgency=low
+
+  [ Daniel T Chen ]
+  * Add fixes from git HEAD:
+    - 0014_fix_avail-min_calc.patch,
+    - 0015_no_pa-asyncq-push_fail.patch,
+    - 0016_dont_rely_pa-sink-running-idle_for_optim.patch,
+    - 0017_fix_hsp_rate_chan.patch,
+    - 0018_dont_restore_mute_vol_when_already_set.patch,
+    - 0019_fix_mem_leak_in_pa-alsa-open-by-device-string.patch,
+    - 0020_ask_for_same_frag_set_when_resuming_oss_dev.patch,
+    - 0021_add_missing_const.patch,
+    - 0022_dont_hit_assert_in_esound-sink_when_latency_queried.patch
+
+  [ Luke Yelavich ]
+  * Re-instate /etc/X11/Xsession.d/70pulseaudio, to again load pulseaudio
+    earlier in the X session, to aleviate a pulse/login-sound race condition
+    (LP: #322374)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 02 Feb 2009 15:27:55 +0100
+
+pulseaudio (0.9.14-0ubuntu2) jaunty; urgency=low
+
+  * Add fixes from trunk:
+    - 0012_clarify_driver_error_redirect_to_alsa_devs.patch
+  * Add 0013_add_padsp_wrapper_check.patch (LP: #269939)
+  * debian/pulseaudio.manpages:
+    debian/pulseaudio-esound-compat.manpages:
+    debian/pulseaudio-utils.links:
+    - Install upstream man pages (LP: #219669, #318660),
+    - Link to pacat for parec man page (LP: #294628)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 22 Jan 2009 02:57:54 -0500
+
+pulseaudio (0.9.14-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release. (LP: #317502, #317613)
+  * Dropped patches, all in upstream release.
+    - 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
+    - 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
+    - 0005-Fix-two-typos-that-broke-tunnels.patch
+    - 0008_regen_autotools.patch
+    - 0009_shm-arch-indep.patch
+    - 0010_check_before_using_environment.patch
+    - 0011_load_restore_before_other_modules.patch
+    - 0013_dont_hit_assert_issuing_two_rewinds_in_single_iter.patch
+    - 0014_retry_without_snd-pcm-no-auto-format.patch
+    - 0015_use_fionread.patch
+    - 0016_add_pa-source-message-get-latency.patch
+    - 0017_allow_dev_dsp_w-ok.patch
+    - 0019_fix_macro_pa-unlikely.patch
+    - 0020_catch_driver_errors.patch
+    - 0022_fix_return_val_dump-resample-methods.patch
+    - 0023_use_gdbm-nolock.patch
+    - 0024_dont_mix_front-center_into_rear.patch
+    - 0025_drop_cap-nice_properly.patch
+    - 0027_handle_multicast_sdp_with_same_ip_ttl_as_rtp.patch
+    - 0029_add_minor_fixes.patch
+    - 0030_dont_drop_client_data.patch
+    - 0031_use_fragsize_for_record_stream_latency.patch
+  * Bumped shlibs for libpulse0.
+  * Package libpulsecore8 -> libpulsecore9.
+  * Add libdbus-glib-1-dev to build-depends.
+  * Regression fix:
+    - pulse.conf: Always honour ~/.asoundrc and /etc/asound.conf with highest
+      priority, thanks to Daniel T Chen. (LP: #295832)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 19 Jan 2009 14:45:36 +1100
+
+pulseaudio (0.9.13-2ubuntu7) UNRELEASED; urgency=low
+
+  * Add fixes from 0.9.14:
+    - 0030_dont_drop_client_data.patch,
+    - 0031_use_fragsize_for_record_stream_latency.patch,
+    - 0032_fix_suspend_sinks_sources.patch (LP: #317613)
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 15 Jan 2009 17:26:14 -0500
+
+pulseaudio (0.9.13-2ubuntu6) jaunty; urgency=low
+
+  * debian/control: Package pulseaudio-module-x11,
+    Recommends: gnome-audio | ubuntu-sounds.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 13 Jan 2009 16:15:48 +1100
+
+pulseaudio (0.9.13-2ubuntu5) jaunty; urgency=low
+
+  [ Daniel T Chen ]
+  * Add fixes from git:
+    - 0015_use_fionread.patch,
+    - 0016_add_pa-source-message-get-latency.patch,
+    - 0017_allow_dev_dsp_w-ok.patch,
+    - 0018_fix_return_val_pa-frame-aligned.patch,
+    - 0019_fix_macro_pa-unlikely.patch,
+    - 0020_catch_driver_errors.patch (LP: #312373),
+    - 0021_convert_to_pa-bool-t.patch,
+    - 0022_fix_return_val_dump-resample-methods.patch,
+    - 0023_use_gdbm-nolock.patch,
+    - 0024_dont_mix_front-center_into_rear.patch,
+    - 0025_drop_cap-nice_properly.patch,
+    - 0027_handle_multicast_sdp_with_same_ip_ttl_as_rtp.patch,
+    - 0028_prefer_mixer_controls_with_vols.patch (LP: #281605),
+    - 0029_add_minor_fixes.patch
+  * Forward-port workaround from hardy branch for source/sink and
+    suspend-on-idle race (LP: #203654):
+    - 0026_work_around_suspend-on-idle_source_sink_race.patch
+  * debian/control: Drop padevchooser(Recommends) and pavucontrol
+    (Suggests) completely - functionality has been subsumed by
+    jaunty's gnome-volume-control.
+  * debian/pulseaudio.init:
+    - Make initscript more informative in the default case of per-user
+      sessions (LP: #259522),
+    - Make initscript retry (until three-second timeout) if stopping
+      fails when restarting (LP: #244414),
+    - LSB {Required-*,Should-*} should specify hal instead of dbus,
+      since hal is required (and already requires dbus) (LP: #244679)
+  * Previous upload contains patches to close:
+    LP: #193491, #268891, #295164, #298301
+
+  [ Luke Yelavich ]
+  * 0008_regen_autotools.patch: Pull some libtool 2.2 updates from git,
+    and regenerate autotools glue.
+  * debian/rules: Add --enable-static to force creation of libpulse.a,
+    a side-effect of messing with the autotools files. This shouldn't
+    be needed for the 0.9.14 release.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 09 Jan 2009 17:05:38 +1100
+
+pulseaudio (0.9.13-2ubuntu4) jaunty; urgency=low
+
+  * Demote paprefs to suggests (LP: #309422)
+  * Add fixes from git:
+    - 0010_check_before_using_environment.patch,
+    - 0011_load_restore_before_other_modules.patch,
+    - 0012_dont_hit_assert_checking_for_idleness.patch,
+    - 0013_dont_hit_assert_issuing_two_rewinds_in_single_iter.patch,
+    - 0014_retry_without_snd-pcm-no-auto-format.patch.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 28 Dec 2008 23:43:01 -0500
+
+pulseaudio (0.9.13-2ubuntu3) jaunty; urgency=low
+
+  * Add pm-utils sleep hook to suspend (and resume) users' pulseaudio
+    daemons (LP: #202089). Based on a patch by
+    Chow Loong Jin <hyperair at gmail.com>.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Mon, 08 Dec 2008 22:11:32 -0800
+
+pulseaudio (0.9.13-2ubuntu2) jaunty; urgency=low
+
+  * debian/patches/0009_shm-arch-indep.patch:
+    - Make shm marker architecture independant, taken from git.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 01 Dec 2008 12:06:00 +1100
+
+pulseaudio (0.9.13-2ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - Don't build against, and create jack package. Jack is not in main.
+    - Remove --disable-per-user-esound-socket from configure flags, as we still
+      want per user esound sockets.
+    - Remove stop links from rc0 and rc6.
+    - Change default resample algorithm and bubffer size.
+    - Add alsa configuration files to route alsa applications via pulseaudio.
+    - Move libasound2-plugins from Recommends to Depends.
+    - debian/pulseaudio.preinst: When upgrading from intrepid, remove
+      /etc/X11/Xsession.d/70pulseaudio, as this was used to minimize a race
+      condition when starting GNOME in intrepid. This race should not exist in
+      jaunty once libcanberra is built to use pulseaudio as a backend.
+    - Do not spawn a pulseaudio server if clients fail to find a running server.
+    - Regenerate autotools files for ubuntu.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2008 10:44:03 +1100
+
 pulseaudio (0.9.13-2) experimental; urgency=low
 
   * Rename libpulsecore5 to libpulsecore8 to correctly reflect the soname
@@ -887,6 +3821,42 @@ pulseaudio (0.9.13-2) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 16 Nov 2008 18:13:05 +0000
 
+pulseaudio (0.9.13-1ubuntu3) jaunty; urgency=low
+
+  * Build-depend on libltdl7-dev to make the armel buildd happy.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 19 Nov 2008 16:26:45 +0000
+
+pulseaudio (0.9.13-1ubuntu2) jaunty; urgency=low
+
+  * Drop libasyncns-dev again. Its in universe, and we will worry about
+    whether we really need it again later.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 18 Nov 2008 15:47:20 +1100
+
+pulseaudio (0.9.13-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Don't build against, and create jack package. Jack is not in main.
+    - Remove --disable-per-user-esound-socket from configure flags, as we still
+      want per user esound sockets.
+    - Remove stop links from rc0 and rc6.
+    - Change default resample algorithm and bubffer size.
+    - Add alsa configuration files to route alsa applications via pulseaudio.
+    - Move libasound2-plugins from Recommends to Depends.
+  * debian/pulseaudio.preinst: When upgrading from intrepid, remove
+    /etc/X11/Xsession.d/70pulseaudio, as this was used to minimize a race
+    condition when starting GNOME in intrepid. This race should not exist in
+    jaunty once libcanberra is built to use pulseaudio as a backend.
+  * Do not spawn a pulseaudio server if clients fail to find a running server.
+  * Remove explicit version dependency for libspeex-dev to allow the package
+    to be built for now.
+  * Regenerate autotools files to work with Ubuntu's newer libtool/libltdl.
+  * debian/control: libpulsecore5 -> libpulsecore8 to match the library
+    soname.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 04 Nov 2008 15:46:00 +1100
+
 pulseaudio (0.9.13-1) experimental; urgency=low
 
   [ Bas Zoetekouw ]
@@ -935,6 +3905,109 @@ pulseaudio (0.9.10-3) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 30 Aug 2008 14:24:51 +0100
 
+pulseaudio (0.9.10-2ubuntu9) intrepid; urgency=low
+
+  * debian/70pulseaudio && debian/pulse-session: Use a wrapper script
+    to start pulseaudio at the Xsession.d phase of the login process.
+    The wrapper script is necessary to execute processes that need to
+    be loaded after pulseaudio, such as the X session manager. This
+    works around a race condition involving pulseaudio and canberra-gtk-play
+    and the GNOME login sound. (LP: #274124)
+  * debian/pulseaudio.preinst: Remove /etc/xdg/autostart/pulseaudio.desktop
+    if it exists. We don't want pulseaudio started more than once.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 20 Oct 2008 13:26:28 +1100
+
+pulseaudio (0.9.10-2ubuntu8) intrepid; urgency=low
+
+  * debian/pulseaudio.desktop: Use a slightly modified version of the
+    pulseaudio desktop file from more recent versions, and place it in
+    /etc/xdg/autostart, to start pulseaudio earlier in the GNOME desktop
+    initialization. This should avoid a race condition between the login
+    sound being played, and pulseaudio being loaded. (LP: #274124)
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Fri, 10 Oct 2008 15:22:51 +1100
+
+pulseaudio (0.9.10-2ubuntu7) intrepid; urgency=low
+
+  * Fix some errors in the pid file handling patch, thanks to Mandriva.
+  * debian/pulse.conf: Do not use an absolute path when referring to the
+    pulse alsa plugin, as this breaks bi-arch configurations. libasound2
+    and lib32/64asound2 now include ldconfig files to include the alsa-plugins
+    path for the architecture in use.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Wed, 08 Oct 2008 11:20:17 +1100
+
+pulseaudio (0.9.10-2ubuntu6) intrepid; urgency=low
+
+  * debian/pulse-alsa.conf: extend configuration to include "pulse"
+    definitions for buggy ALSA applications (e.g., Skype). (LP: #258581)
+
+ -- Conn O Griofa <connogriofa at gmail.com>  Tue, 23 Sep 2008 16:12:19 +0100
+
+pulseaudio (0.9.10-2ubuntu5) intrepid; urgency=low
+
+  * debian/control: Bump libasound2-plugins from recommends to depends to be
+    sure that nobody's audio set up for alsa applications is broken.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 23 Sep 2008 23:07:23 +1000
+
+pulseaudio (0.9.10-2ubuntu4) intrepid; urgency=low
+
+  * debian/pulse.conf, debian/pulse-alsa.conf. Asoundrc configuration files
+    to allow the use of pulseaudio as the default output for applications
+    using alsa, when pulseaudio is running.
+  * debian/patches/0015-Change-resampler-and-buffering.patch: Change the
+    resample method used as well as the buffer size.
+  * Some patches taken from Mandriva's pulseaudio package. See comments in
+    patch headers for more details:
+    - 0007-Perfer-client.conf-over-X11-property-variables.patch
+    - 0008-Also-link-libpulsecore.la-to-some-libraries-needed.patch
+    - 0009-Rejig-r2495-slightly-and-directly-compile-the-necess.patch
+    - 0010-Do-not-invalidate-the-cookie-if-no-file-was-specifie.patch
+    - 0011-fix-error-path-spotted-by-Coling-Guthrie.patch
+    - 0012-Change-policykit-policy-to-allow-high-priority-and-d.patch
+    - 0013-More-robust-pid-file-handling.patch
+    - 0014-Disable-hotplug-sound-as-it-interferes-with-too-many.patch
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 23 Sep 2008 16:02:48 +1000
+
+pulseaudio (0.9.10-2ubuntu3) intrepid; urgency=low
+
+  * Remove stop links from rc0 and rc6 (LP: #254254):
+    - debian/rules: change DEB_UPDATE_RCD_PARAMS to
+      start 25 2 3 4 5 . stop 15 1 .
+
+ -- Cesare Tirabassi <norsetto at ubuntu.com>  Mon, 04 Aug 2008 19:22:43 +0200
+
+pulseaudio (0.9.10-2ubuntu2) intrepid; urgency=low
+
+  * debian/patches/0006-pcspkr-last.patch: Load the PC speaker as a sink
+    after all other sound card sinks have been loaded. (LP: #242966)
+  * debian/patches/0007-relibtoolize.patch: Regenerate relevant libtool
+    bits, because even though libltdl7 is supposed to be API-compatible
+    with libltdl3, the package FTBFs without regeneration.
+
+ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 29 Jul 2008 16:07:18 +1000
+
+pulseaudio (0.9.10-2ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable.
+  * Patches
+    + 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch:
+      continue to disable this patch, as we want user sockets to be
+      the default in the conffile;
+    - 0050-Reduce-RT-highprio-log-to-info: absorbed into Debian unstable;
+    - 0051-Reduce-pa_pid_file_create-Daemon-already-running-log-spam:
+      removed as per discussion with Sjoerd, as it can confuse human
+      debugging;
+  * Packaging
+    + MaintainerField and Vcs munging;
+    + Don't generate or install the jackd module;
+    + Use multiuser semantics.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 14 May 2008 15:47:31 -0400
+
 pulseaudio (0.9.10-2) unstable; urgency=low
 
   * debian/patches/0003-Define-PULSE_INTERNAL.patch
@@ -950,6 +4023,32 @@ pulseaudio (0.9.10-2) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 10 May 2008 22:16:12 +0200
 
+pulseaudio (0.9.10-1ubuntu1) hardy; urgency=low
+
+  [ Daniel T Chen ]
+  * Merge from Debian unstable:
+  * Patches
+    + 0050-Reduce-RT-highprio-log-to-info:
+    + 0051-Reduce-pa_pid_file_create-Daemon-already-running-log-spam:
+      Retain to prevent innocuous messages from spamming user log;
+    - 0052-Add-extra-checks-to-padsp-debug-calls:
+    - 0053-Handle-channel-map-failure:
+    - 0054-Invoke-pa_ltdl_done-conditionally:
+    - 0055-fix_record_stream_moved:  Merged in new upstream version.
+  * Packaging
+    + control:  Adhere to DebianMaintainerField spec, and add a
+      Vcs-Bzr entry;
+    + control:
+    + pulseaudio-module-jack.install:  Don't generate or install the
+      jackd module;
+    + pulseaudio.init:
+    + rules:  Use multiuser semantics.
+
+  [ Luke Yelavich ]
+  * FFe granted. (LP: #211592)
+
+ -- Luke Yelavich <luke.yelavich at canonical.com>  Mon, 07 Apr 2008 10:40:01 +1000
+
 pulseaudio (0.9.10-1) unstable; urgency=low
 
   [ CJ van den Berg ]
@@ -975,6 +4074,52 @@ pulseaudio (0.9.10-1) unstable; urgency=low
 
  -- CJ van den Berg <cj at vdbonline.com>  Sun, 30 Mar 2008 20:11:02 +0200
 
+pulseaudio (0.9.9-1ubuntu4) hardy; urgency=low
+
+  * Patch from Thorvald Natvig to fix protocol error when moving source outputs.
+    (LP: #194756)
+
+ -- Luke Yelavich <luke.yelavich at canonical.com>  Fri, 28 Mar 2008 15:58:55 +1100
+
+pulseaudio (0.9.9-1ubuntu3) hardy; urgency=low
+
+  * Patches:
+    - Apply (new) patch to handle channel mapping failure.  From
+      upstream SVN changeset 2105.  (LP: #178442)
+    - Apply (new) patch to invoke pa_ltdl_done() conditionally.
+      From upstream SVN changeset 2111.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Mon, 18 Feb 2008 18:40:28 -0500
+
+pulseaudio (0.9.9-1ubuntu2) hardy; urgency=low
+
+  * Packaging:
+    - Add versioned dependency on sysv-rc to pulseaudio for LTS->LTS.
+      Thanks, Steve Langasek (LP: #187469)!
+  * Patches:
+    - Apply (new) patch from Mandriva adding checks to debug calls,
+      preventing crashes, with padsp.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 30 Jan 2008 20:43:29 -0500
+
+pulseaudio (0.9.9-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Packaging:
+      + pulseaudio-module-x11 does not recommend an audio theme,
+      + no jack packages,
+      + pulseaudio-utils long description clarification,
+      + multiuser initscript semantics (Teardown spec),
+      + Vcs-Bzr entry and DebianMaintainerField mangling;
+    - Patches:
+      + omit 0001-Set-ESD-socket-to-tmp-..,
+      + omit socket parameter in 0007-Change-config-.. to apply
+        cleanly given above 0001-Set-ESD-socket omission,
+      + lower verboseness of some log messages,
+      + drop backported CVE-2008-008 fix (already in 0.9.9).
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Fri, 25 Jan 2008 16:04:34 -0500
+
 pulseaudio (0.9.9-1) unstable; urgency=high
 
   * New Upstream Version.
@@ -983,6 +4128,48 @@ pulseaudio (0.9.9-1) unstable; urgency=high
 
  -- Sjoerd Simons <sjoerd at debian.org>  Thu, 24 Jan 2008 12:44:55 +0100
 
+pulseaudio (0.9.8-2ubuntu3) hardy; urgency=low
+
+  * [SECURITY] Apply (new) patch fixing unchecked setuid() return
+    values.  Patch backported from upstream 0.9.9.
+  * References:
+    CVE-2008-0008
+    https://bugzilla.novell.com/show_bug.cgi?id=347822
+    https://bugzilla.redhat.com/show_bug.cgi?id=425481
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Wed, 23 Jan 2008 20:11:25 -0500
+
+pulseaudio (0.9.8-2ubuntu2) hardy; urgency=low
+
+  * Apply (new) 0051-Reduce-pa_pid_file_create.. patch that lowers the
+    "Daemon already running", "pa_pid_file_create() failed", and
+    "setrlimit(..Operation not permitted" levels to prevent spamming
+    /var/log/syslog.  Normal users not in the pulse-rt group don't need
+    this level of verbosity, and the "errors" are innocuous given per-
+    user session invocation.  (These changes really close LP #83137 and
+    duplicates.)
+  * Thanks to Sjoerd Simons for the insight.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Tue, 08 Jan 2008 06:36:42 -0500
+
+pulseaudio (0.9.8-2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Packaging:
+      + pulseaudio-module-x11 does not recommend an audio theme,
+      + no jack packages,
+      + pulseaudio-utils long description clarification,
+      + multiuser initscript semantics (Teardown spec),
+      + Vcs-Bzr entry and DebianMaintainerField mangling;
+    - Patches:
+      + omit 0001-Set-ESD-socket-to-tmp-..,
+      + omit socket parameter in 0007-Change-config-.. to apply
+        cleanly given above 0001-Set-ESD-socket omission,
+      + apply (new) 0050-Reduce-RT-highprio-log-to-info.patch
+        (LP: #83137 and duplicates).
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Fri, 04 Jan 2008 21:46:57 +0000
+
 pulseaudio (0.9.8-2) unstable; urgency=low
 
   * Bump shlibs of libpulse and libpulse-browse. Upstream has started
@@ -1006,6 +4193,44 @@ pulseaudio (0.9.8-2) unstable; urgency=low
 
  -- Sjoerd Simons <sjoerd at debian.org>  Fri, 04 Jan 2008 16:12:27 +0100
 
+pulseaudio (0.9.8-1ubuntu3) hardy; urgency=low
+
+  * debian/control: Drop Recommendation of ubuntu-sounds entirely; it's wrong
+    for derivatives, and theming should be done with seeds and derivative
+    specific meta packages.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 10 Dec 2007 14:37:37 +0100
+
+pulseaudio (0.9.8-1ubuntu2) hardy; urgency=low
+
+  * debian/control: Make pulseaudio-module-x11 recommend ubuntu-sounds,
+    not gnome-audio.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Thu, 06 Dec 2007 07:12:07 -0500
+
+pulseaudio (0.9.8-1ubuntu1) hardy; urgency=low
+
+  "Hail our new PulseAudio overlords (part two)."
+
+  * Merge from Debian unstable.
+  * Ubuntu-specific changes:
+    - debian/control:
+      + Don't build-depend on libjack0.100.0-dev or build jack module
+        packages,
+      + Update pulseaudio's Recommends and Suggests to accomodate
+        existing promoted main packages,
+      + Explicitly mention pasuspender in pulseaudio-utils's long
+        description,
+      + Add Vcs-Bzr URI,
+      + Adhere to DebianMaintainerField;
+    - debian/rules: Use multiuser for update-rc.d;
+    - debian/patches/series: Retain the exclusion of
+      0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch.
+  * Dropped Ubuntu-specific change (absorbed into Debian source):
+    debian/patches/0002-Double-esound-maximum-sample-size.patch.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Tue, 04 Dec 2007 00:56:08 +0000
+
 pulseaudio (0.9.8-1) unstable; urgency=low
 
   [ CJ van den Berg ]
@@ -1047,6 +4272,40 @@ pulseaudio (0.9.8-1) unstable; urgency=low
 
  -- CJ van den Berg <cj at vdbonline.com>  Thu, 22 Nov 2007 02:33:51 +0100
 
+pulseaudio (0.9.7-3ubuntu2) hardy; urgency=low
+
+  * Disable 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch. We
+    do want per-user esd sockets in Ubuntu. This unbreaks multiuser support
+    and matches the patch that we did to esound for the very same reason:
+    every user needs its own esd socket path to have them not conflict to each
+    other.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 20 Nov 2007 22:30:35 +0100
+
+pulseaudio (0.9.7-3ubuntu1) hardy; urgency=low
+
+  "Hail our new PulseAudio overlords (part one)."
+
+  * Merge from Debian unstable.
+  * Apply Ubuntu-specific changes:
+    - debian/control:
+      + drop libasyncns-dev and libjack0.100.0-dev build-dependencies
+        since we don't build the jack plugin [yet];
+      + add versioned lsb-base dependency to pulseaudio;
+      + keep pulseaudio installable by demoting some recommended
+        packages to suggested [retain libasound2-plugins,
+        libgstreamer-plugins-pulse0.10-0, and
+        pulseaudio-esound-compat.  pulseaudio-module-hal,
+        pulseaudio-module-x11, libao-pulse, paprefs, and
+        padevchooser are currently in universe];
+      + adhere to DebianMaintainerField spec;
+    - debian/rules:
+      + use multiuser instead of defaults in DEB_UPDATE_RCD_PARAMS.
+  * Drop obsolete Ubuntu-specific change:
+    - src/pulsecore/protocol-esound.c: applied upstream.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sat, 17 Nov 2007 00:10:48 +0000
+
 pulseaudio (0.9.7-3) unstable; urgency=low
 
   [ CJ van den Berg ]
@@ -1124,6 +4383,25 @@ pulseaudio (0.9.6-2) unstable; urgency=low
 
  -- CJ van den Berg <cj at vdbonline.com>  Sun, 02 Sep 2007 20:22:19 +0200
 
+pulseaudio (0.9.6-1ubuntu2) gutsy; urgency=low
+
+  * fix esound max samplesize again to make sure teh login sound is playable
+    on networked connections. 
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Thu, 28 Jun 2007 15:31:28 +0200
+
+pulseaudio (0.9.6-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/control:
+      + Add lsb-base (>= 3) to pulseaudio's dependencies,
+      + Adhere to DebianMaintainerField policy,
+      + Don't build-depend on libjack0.100.0-dev or libasyncns-dev,
+    - debian/patches/: Remove all Ubuntu-created patches (merged
+      upstream).
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Mon, 28 May 2007 22:30:44 +0100
+
 pulseaudio (0.9.6-1) unstable; urgency=low
 
   * New Upstream Version.
@@ -1145,6 +4423,22 @@ pulseaudio (0.9.6-1) unstable; urgency=low
 
  -- CJ van den Berg <cj at vdbonline.com>  Mon, 28 May 2007 00:53:28 +0200
 
+pulseaudio (0.9.5-7ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/control:
+      + Add lsb-base (>= 3) to pulseaudio's dependencies,
+      + Adhere to DebianMaintainerField policy,
+    - debian/patches/:
+      + Add 10_fix_DoS_vulns.dpatch (pA ticket 67) and
+        11_disallow_excessively_high_sampling_rates.dpatch,
+      + Drop 06_fix_suspend.dpatch in favour of
+        06_pulseaudio-0.9.5-suspend.dpatch,
+      + Retain 07_fix_esdcompat_bashism.dpatch and
+        09_fix_esd_max_samplesize.dpatch.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Fri, 25 May 2007 01:32:39 -0400
+
 pulseaudio (0.9.5-7) unstable; urgency=low
 
   * debian/control: Make pulseaudio-module-hal depend on hal, not just
@@ -1161,6 +4455,39 @@ pulseaudio (0.9.5-6) unstable; urgency=low
 
  -- CJ van den Berg <cj at vdbonline.com>  Mon, 12 Feb 2007 11:24:50 +0100
 
+pulseaudio (0.9.5-5ubuntu4) feisty; urgency=low
+
+  * add 09_fix_esd_max_samplesize.dpatch to make sure the login and logout
+    gnome sounds can be processed on remote connections. 
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Tue,  6 Mar 2007 14:14:08 +0100
+
+pulseaudio (0.9.5-5ubuntu3) feisty; urgency=low
+
+  * debian/control:
+    - Add lsb-base (>= 3) to pulseaudio's dependencies,
+    - Adhere to DebianMaintainerField policy,
+    - Pull in fix from Debian's 0.9.5-7 adding hal to
+      pulseaudio-module-hal's dependencies,
+  * debian/pulseaudio.init: LSB-ify.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 25 Feb 2007 02:30:31 -0500
+
+pulseaudio (0.9.5-5ubuntu2) feisty; urgency=low
+
+  * added 06_fix_suspend.dpatch from http://pulseaudio.org/ticket/26
+  * added 07_fix_esdcompat_bashism.dpatch to avoid esdcompat trying to 
+    shift an empty $1 on POSIX shells
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Tue, 30 Jan 2007 23:50:57 +0100
+
+pulseaudio (0.9.5-5ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable, remaining change:
+    - debian/{control,rules}: Don't use jack or asyncns.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Mon, 29 Jan 2007 10:36:35 -0500
+
 pulseaudio (0.9.5-5) unstable; urgency=low
 
   * debian/control: Make Build-deps more specific. (Closes: #401111)
@@ -1169,6 +4496,19 @@ pulseaudio (0.9.5-5) unstable; urgency=low
 
  -- CJ van den Berg <cj at vdbonline.com>  Mon,  8 Jan 2007 23:02:53 +0100
 
+pulseaudio (0.9.5-4ubuntu2) feisty; urgency=low
+
+  * disable libasyncns to fix ftbfs 
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Sat, 20 Jan 2007 11:10:59 +0100
+
+pulseaudio (0.9.5-4ubuntu1) feisty; urgency=low
+
+  * merge from debian unstable
+    * keep jack removal
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Tue, 28 Nov 2006 19:51:21 +0100
+
 pulseaudio (0.9.5-4) unstable; urgency=low
 
   * Add comment about resampling methods and CPU consumption to
@@ -1186,6 +4526,20 @@ pulseaudio (0.9.5-4) unstable; urgency=low
 
  -- CJ van den Berg <cj at vdbonline.com>  Wed, 18 Oct 2006 23:10:47 +0200
 
+pulseaudio (0.9.5-3ubuntu1) feisty; urgency=low
+
+  * indeed remove the jack plugin from debian/control as well 
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Tue, 14 Nov 2006 21:05:29 +0100
+
+pulseaudio (0.9.5-3ubuntu0) feisty; urgency=low
+
+  * initial package
+  * disable jack
+  * disable asyncns
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Sun, 12 Nov 2006 20:00:18 +0100
+
 pulseaudio (0.9.5-3) unstable; urgency=low
 
   * Add support for .ifexists configuration directive.
diff --git a/debian/control b/debian/control
index 5c8e3fb..ab3b2b1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pulseaudio
 Section: sound
 Priority: optional
-Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd at debian.org>,
     Balint Reczey <balint at balintreczey.hu>,
     Felipe Sateler <fsateler at debian.org>
@@ -16,12 +17,13 @@ Build-Depends: debhelper (>= 9),
     libasyncns-dev,
     libatomic-ops-dev,
     libavahi-client-dev,
-    libbluetooth-dev (>= 4.99) [linux-any],
+    libbluetooth-dev (>= 4.40) [linux-any],
     libsbc-dev [linux-any],
     libcap-dev [linux-any],
     libfftw3-dev,
     libgconf2-dev,
     libglib2.0-dev,
+    libhardware-dev [armhf i386 amd64],
     libgtk-3-dev,
     libice-dev,
     libjack-dev,
@@ -38,21 +40,22 @@ Build-Depends: debhelper (>= 9),
     libsystemd-journal-dev [linux-any],
     libtdb-dev [!hurd-any],
     libudev-dev (>= 143) [linux-any],
-    libwebrtc-audio-processing-dev,
     libwrap0-dev,
     libx11-xcb-dev,
     libxcb1-dev (>= 1.6),
     libxtst-dev
 Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/git/pkg-pulseaudio/pulseaudio.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-pulseaudio/pulseaudio.git
+XS-Debian-Vcs-Git: git://anonscm.debian.org/git/pkg-pulseaudio/pulseaudio.git
+XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-pulseaudio/pulseaudio.git
+XS-Testsuite: autopkgtest
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-audio-dev/pulseaudio/ubuntu
 Homepage: http://www.pulseaudio.org
 
 Package: pulseaudio
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
-  lsb-base (>= 3.2-13),
+  lsb-base (>= 3.2-13), libpam-systemd,
   udev (>= 143) [linux-any],
   libasound2-plugins [linux-any],
   libpulse0 (= ${binary:Version}),
@@ -285,6 +288,32 @@ Description: RAOP module for PulseAudio sound server (debugging symbols)
  .
  This package contains debugging symbols for the PulseAudio RAOP module.
 
+Package: pulseaudio-module-droid
+Architecture: armhf i386 amd64
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: pulseaudio (<< 0.9.14-2)
+Description: Android Audio HAL module for PulseAudio sound server
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This module enables PulseAudio to work on top of the Android Audio HAL.
+ .
+ The module is called module-droid.
+
+Package: pulseaudio-module-droid-dbg
+Architecture: armhf i386 amd64
+Priority: extra
+Section: debug
+Depends: ${misc:Depends}, pulseaudio-module-droid (= ${binary:Version})
+Description: Android Audio HAL module for PulseAudio sound server (debugging)
+ PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+ WIN32 systems. It is a drop in replacement for the ESD sound server with
+ much better latency, mixing/re-sampling quality and overall architecture.
+ .
+ This package contains debugging symbols for the PulseAudio droid module.
+
 Package: pulseaudio-module-bluetooth
 Architecture: linux-any
 Priority: extra
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..d8d8b1e 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,3 @@
 [DEFAULT]
 pristine-tar = True
+debian-branch = ubuntu
diff --git a/debian/patches/0005-dont-load-cork-music-on-phone.patch b/debian/patches/0005-dont-load-cork-music-on-phone.patch
new file mode 100644
index 0000000..803287b
--- /dev/null
+++ b/debian/patches/0005-dont-load-cork-music-on-phone.patch
@@ -0,0 +1,13 @@
+Index: pulseaudio-2.99.1/src/daemon/default.pa.in
+===================================================================
+--- pulseaudio-2.99.1.orig/src/daemon/default.pa.in	2012-11-16 11:19:57.904259183 +0100
++++ pulseaudio-2.99.1/src/daemon/default.pa.in	2012-11-16 11:20:18.408258877 +0100
+@@ -154,7 +154,7 @@
+ load-module module-position-event-sounds
+ 
+ ### Cork music/video streams when a phone stream is active
+-load-module module-role-cork
++#load-module module-role-cork
+ 
+ ### Modules to allow autoloading of filters (such as echo cancellation)
+ ### on demand. module-filter-heuristics tries to determine what filters
diff --git a/debian/patches/0006-load-module-x11-bell.patch b/debian/patches/0006-load-module-x11-bell.patch
new file mode 100644
index 0000000..6720ac4
--- /dev/null
+++ b/debian/patches/0006-load-module-x11-bell.patch
@@ -0,0 +1,24 @@
+Index: pulseaudio/src/daemon/start-pulseaudio-x11.in
+===================================================================
+--- pulseaudio.orig/src/daemon/start-pulseaudio-x11.in
++++ pulseaudio/src/daemon/start-pulseaudio-x11.in
+@@ -31,6 +31,7 @@ fi
+ if [ x"$DISPLAY" != x ] ; then
+ 
+     @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
++    @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null
+     @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null
+ 
+     if [ x"$SESSION_MANAGER" != x ] ; then
+Index: pulseaudio/src/daemon/start-pulseaudio-kde.in
+===================================================================
+--- pulseaudio.orig/src/daemon/start-pulseaudio-kde.in
++++ pulseaudio/src/daemon/start-pulseaudio-kde.in
+@@ -33,6 +33,7 @@ fi
+ if [ x"$DISPLAY" != x ] ; then
+ 
+     @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
++    @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null
+ 
+ fi
+ 
diff --git a/debian/patches/0016-nodisplay-autostart.patch b/debian/patches/0016-nodisplay-autostart.patch
new file mode 100644
index 0000000..e0a2c39
--- /dev/null
+++ b/debian/patches/0016-nodisplay-autostart.patch
@@ -0,0 +1,14 @@
+Description: Clean up Startup Applications dialog by hiding default apps
+Author: Michael Terry <michael.terry at canonical.com>
+Bug-Ubuntu: https://launchpad.net/bugs/803917
+Forwarded: not-needed
+
+Index: pulseaudio/src/daemon/pulseaudio.desktop.in
+===================================================================
+--- pulseaudio.orig/src/daemon/pulseaudio.desktop.in
++++ pulseaudio/src/daemon/pulseaudio.desktop.in
+@@ -9,3 +9,4 @@ Categories=
+ GenericName=
+ X-GNOME-Autostart-Phase=Initialization
+ NotShowIn=KDE;
++NoDisplay=true
diff --git a/debian/patches/0020-stream-Return-error-in-case-a-client-peeks-to-early.patch b/debian/patches/0020-stream-Return-error-in-case-a-client-peeks-to-early.patch
new file mode 100644
index 0000000..2f6d7e0
--- /dev/null
+++ b/debian/patches/0020-stream-Return-error-in-case-a-client-peeks-to-early.patch
@@ -0,0 +1,64 @@
+From david.henningsson at canonical.com  Mon Oct  1 15:06:56 2012
+Return-Path: <david.henningsson at canonical.com>
+X-Original-To: diwic at mail.canonical.com
+Delivered-To: diwic at mail.canonical.com
+Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145])
+	by grenadilla.canonical.com (Postfix) with ESMTP id A48961472160
+	for <diwic at mail.canonical.com>; Mon,  1 Oct 2012 15:06:56 +0000 (UTC)
+Received: from cluster-e.mailcontrol.com (cluster-e.mailcontrol.com [85.115.58.190])
+	by fiordland.canonical.com (Postfix) with ESMTP id 5DC1EA18423
+	for <david.henningsson at cleanmail.canonical.com>; Mon,  1 Oct 2012 15:06:56 +0000 (UTC)
+Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158])
+	by rly62e.srv.mailcontrol.com (MailControl) with ESMTP id q91F6t9E016745
+	for <david.henningsson at cleanmail.canonical.com>; Mon, 1 Oct 2012 16:06:55 +0100
+Received: from fiordland.canonical.com ([91.189.94.145])
+	by arctowski.canonical.com with esmtp (Exim 4.71)
+	(envelope-from <david.henningsson at canonical.com>)
+	id 1TIhaB-0002MW-HX
+	for david.henningsson at cleanmail.canonical.com; Mon, 01 Oct 2012 15:06:55 +0000
+Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112])
+	by fiordland.canonical.com (Postfix) with ESMTP id 8706DA18423
+	for <david.henningsson at canonical.com>; Mon,  1 Oct 2012 15:06:55 +0000 (UTC)
+Received: from hd9483857.selulk5.dyn.perspektivbredband.net ([217.72.56.87] helo=localhost.localdomain)
+	by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
+	(Exim 4.71)
+	(envelope-from <david.henningsson at canonical.com>)
+	id 1TIhaB-0006f2-8F; Mon, 01 Oct 2012 15:06:55 +0000
+From: David Henningsson <david.henningsson at canonical.com>
+To: pulseaudio-discuss at lists.freedesktop.org
+Cc: 1058200 at bugs.launchpad.net,
+        David Henningsson <david.henningsson at canonical.com>
+Subject: [PATCH] stream: Return error in case a client peeks to early
+Date: Mon,  1 Oct 2012 17:06:55 +0200
+Message-Id: <1349104015-5924-1-git-send-email-david.henningsson at canonical.com>
+X-Mailer: git-send-email 1.7.9.5
+X-Mailcontrol-Inbound: uq3drnD2P+ps5SfEb0fvr78+NoP1DHBZwGqKpaXB2eTgNv8D6KLIxb8+NoP1DHBZ8VSaBg0k0xw=
+X-Spam-Score: -0.4
+X-Scanned-By: MailControl 9446.0 (www.mailcontrol.com) on 10.69.0.172
+
+If there is no silence memblock and no data, pa_memblockq_peek can
+return NULL. In this case, do not crash on an assertion in
+pa_memblock_acquire, but instead return a proper error to the client.
+
+BugLink: http://bugs.launchpad.net/bugs/1058200
+Signed-off-by: David Henningsson <david.henningsson at canonical.com>
+---
+ src/pulse/stream.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/pulse/stream.c b/src/pulse/stream.c
+index 2b6d306..9bb0995 100644
+--- a/src/pulse/stream.c
++++ b/src/pulse/stream.c
+@@ -1598,6 +1598,8 @@ int pa_stream_peek(pa_stream *s, const void **data, size_t *length) {
+             return 0;
+         }
+ 
++        PA_CHECK_VALIDITY(s->context, s->peek_memchunk.memblock != NULL, PA_ERR_NODATA);
++
+         s->peek_data = pa_memblock_acquire(s->peek_memchunk.memblock);
+     }
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch b/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
new file mode 100644
index 0000000..4bbb704
--- /dev/null
+++ b/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
@@ -0,0 +1,257 @@
+From afd823b21c544eb4764d9e38f2f15e5a4f50ab7a Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Wed, 17 Apr 2013 16:07:32 +0200
+Subject: [PATCH] inotify-wrapper: Quit daemon if pid file is removed
+
+XDG_RUNTIME_DIR is deleted on logout (according to xdg spec), and
+that's where we keep our pid file and native protocol socket.
+
+When these two files are deleted, it makes no sense to run anymore,
+so quit. Hanging around is not only sloppy, but can also be harmful:
+e g, if esd compat module is loaded, it will bind to the esd address.
+When a new pulseaudio process is created on next login of the same
+user, pulseaudio cannot start because the esd address is occupied.
+
+Buglink: https://bugs.launchpad.net/bugs/1167192
+Signed-off-by: David Henningsson <david.henningsson at canonical.com>
+---
+ src/Makefile.am                 |    1 +
+ src/daemon/main.c               |   20 +++++++-
+ src/pulsecore/inotify-wrapper.c |  103 +++++++++++++++++++++++++++++++++++++++
+ src/pulsecore/inotify-wrapper.h |   13 +++++
+ src/pulsecore/pid.c             |    5 ++
+ src/pulsecore/pid.h             |    1 +
+ 6 files changed, 141 insertions(+), 2 deletions(-)
+ create mode 100644 src/pulsecore/inotify-wrapper.c
+ create mode 100644 src/pulsecore/inotify-wrapper.h
+
+Index: pulseaudio/src/Makefile.am
+===================================================================
+--- pulseaudio.orig/src/Makefile.am
++++ pulseaudio/src/Makefile.am
+@@ -883,6 +883,7 @@ libpulsecore_ at PA_MAJORMINOR@_la_SOURCES
+ 		pulsecore/core.c pulsecore/core.h \
+ 		pulsecore/fdsem.c pulsecore/fdsem.h \
+ 		pulsecore/hook-list.c pulsecore/hook-list.h \
++		pulsecore/inotify-wrapper.c pulsecore/inotify-wrapper.h \
+ 		pulsecore/ltdl-helper.c pulsecore/ltdl-helper.h \
+ 		pulsecore/modargs.c pulsecore/modargs.h \
+ 		pulsecore/modinfo.c pulsecore/modinfo.h \
+Index: pulseaudio/src/daemon/main.c
+===================================================================
+--- pulseaudio.orig/src/daemon/main.c
++++ pulseaudio/src/daemon/main.c
+@@ -74,6 +74,7 @@
+ #include <pulsecore/core-rtclock.h>
+ #include <pulsecore/core-scache.h>
+ #include <pulsecore/core.h>
++#include <pulsecore/inotify-wrapper.h>
+ #include <pulsecore/module.h>
+ #include <pulsecore/cli-command.h>
+ #include <pulsecore/log.h>
+@@ -360,6 +361,15 @@ static char *check_configured_address(vo
+     return default_server;
+ }
+ 
++static bool valid_pid_file = false;
++static void pid_file_deleted(void *userdata)
++{
++    pa_core *c = userdata;
++    pa_log_info("Our pid file has been deleted (probably due to session logout), quitting...");
++    valid_pid_file = false;
++    pa_core_exit(c, true, 0);
++}
++
+ #ifdef HAVE_DBUS
+ static pa_dbus_connection *register_dbus_name(pa_core *c, DBusBusType bus, const char* name) {
+     DBusError error;
+@@ -402,7 +412,6 @@ int main(int argc, char *argv[]) {
+     char *s;
+     char *configured_address;
+     int r = 0, retval = 1, d = 0;
+-    bool valid_pid_file = false;
+     bool ltdl_init = false;
+     int passed_fd = -1;
+     const char *e;
+@@ -414,6 +423,7 @@ int main(int argc, char *argv[]) {
+     pa_time_event *win32_timer;
+     struct timeval win32_tv;
+ #endif
++    pa_inotify *pid_monitor = NULL;
+     int autospawn_fd = -1;
+     bool autospawn_locked = false;
+ #ifdef HAVE_DBUS
+@@ -1032,6 +1042,9 @@ int main(int argc, char *argv[]) {
+         goto finish;
+     }
+ 
++    if (valid_pid_file)
++        pid_monitor = pa_inotify_start(pa_pid_file_name(), c, pid_file_deleted, c);
++
+     c->default_sample_spec = conf->default_sample_spec;
+     c->alternate_sample_rate = conf->alternate_sample_rate;
+     c->default_channel_map = conf->default_channel_map;
+@@ -1179,6 +1192,9 @@ finish:
+         pa_mainloop_get_api(mainloop)->time_free(win32_timer);
+ #endif
+ 
++    if (pid_monitor)
++        pa_inotify_stop(pid_monitor);
++
+     if (c) {
+         /* Ensure all the modules/samples are unloaded when the core is still ref'ed,
+          * as unlink callback hooks in modules may need the core to be ref'ed */
+Index: pulseaudio/src/pulsecore/inotify-wrapper.c
+===================================================================
+--- /dev/null
++++ pulseaudio/src/pulsecore/inotify-wrapper.c
+@@ -0,0 +1,103 @@
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <fcntl.h>
++#include <sys/inotify.h>
++#include <errno.h>
++
++#include "inotify-wrapper.h"
++#include <pulse/mainloop.h>
++#include <pulsecore/core-util.h>
++#include <pulsecore/core-error.h>
++
++struct pa_inotify {
++    char *filename;
++    void *callback_data;
++    pa_inotify_cb callback;
++    int fd;
++    pa_io_event *io_event;
++    pa_core *core;
++};
++
++
++static void inotify_cb(
++        pa_mainloop_api *a,
++        pa_io_event *e,
++        int fd,
++        pa_io_event_flags_t events,
++        void *userdata) {
++
++    struct {
++        struct inotify_event event;
++        char name[NAME_MAX+1];
++    } buf;
++
++    pa_inotify *i = userdata;
++    int pid_fd;
++
++    pa_assert(i);
++
++    if (pa_read(fd, &buf, sizeof(buf), NULL) < (int) sizeof(buf.event))
++        pa_log_warn("inotify did not read a full event.");
++    else
++        pa_log_debug("inotify callback, event mask: 0x%x", (int) buf.event.mask);
++
++    pid_fd = pa_open_cloexec(i->filename, O_RDONLY
++#ifdef O_NOFOLLOW
++                       |O_NOFOLLOW
++#endif
++                       , S_IRUSR);
++
++    if (pid_fd < 0) {
++        if (i->callback)
++            i->callback(i->callback_data);
++    } else
++        pa_close(pid_fd);
++}
++
++
++pa_inotify *pa_inotify_start(const char *filename, void *userdata, pa_inotify_cb cb, pa_core *core) {
++
++    pa_inotify *i = pa_xnew0(pa_inotify, 1);
++    pa_assert(i);
++
++    i->core = core;
++    pa_core_ref(core);
++
++    i->filename = pa_xstrdup(filename);
++    i->callback_data = userdata;
++    i->callback = cb;
++    i->fd = inotify_init1(IN_CLOEXEC|IN_NONBLOCK);
++
++    if (i->fd < 0) {
++        pa_log("inotify_init1() failed: %s", pa_cstrerror(errno));
++        pa_inotify_stop(i);
++        return NULL;
++    }
++
++    if (inotify_add_watch(i->fd, filename, IN_DELETE_SELF|IN_MOVE_SELF) < 0) {
++        pa_log("inotify_add_watch() failed: %s", pa_cstrerror(errno));
++        pa_inotify_stop(i);
++        return NULL;
++    }
++
++    pa_assert_se(i->io_event = core->mainloop->io_new(core->mainloop, i->fd, PA_IO_EVENT_INPUT, inotify_cb, i));
++
++    return i;
++}
++
++
++void pa_inotify_stop(pa_inotify *i) {
++
++    pa_assert(i);
++
++    if (i->io_event)
++        i->core->mainloop->io_free(i->io_event);
++    if (i->fd)
++        pa_close(i->fd);
++    pa_xfree(i->filename);
++    if (i->core)
++        pa_core_unref(i->core);
++    pa_xfree(i);
++}
+Index: pulseaudio/src/pulsecore/inotify-wrapper.h
+===================================================================
+--- /dev/null
++++ pulseaudio/src/pulsecore/inotify-wrapper.h
+@@ -0,0 +1,13 @@
++#ifndef fooinotifywrapperhfoo
++#define fooinotifywrapperhfoo
++
++#include <pulsecore/core.h>
++
++typedef struct pa_inotify pa_inotify;
++
++typedef void (*pa_inotify_cb)(void *userdata);
++
++pa_inotify *pa_inotify_start(const char *filename, void *userdata, pa_inotify_cb cb, pa_core *c);
++void pa_inotify_stop(pa_inotify *i);
++
++#endif
+Index: pulseaudio/src/pulsecore/pid.c
+===================================================================
+--- pulseaudio.orig/src/pulsecore/pid.c
++++ pulseaudio/src/pulsecore/pid.c
+@@ -183,6 +183,11 @@ static int proc_name_ours(pid_t pid, con
+ 
+ }
+ 
++char *pa_pid_file_name()
++{
++    return pa_runtime_path("pid");
++}
++
+ /* Create a new PID file for the current process. */
+ int pa_pid_file_create(const char *procname) {
+     int fd = -1;
+Index: pulseaudio/src/pulsecore/pid.h
+===================================================================
+--- pulseaudio.orig/src/pulsecore/pid.h
++++ pulseaudio/src/pulsecore/pid.h
+@@ -22,6 +22,7 @@
+   USA.
+ ***/
+ 
++char *pa_pid_file_name(void);
+ int pa_pid_file_create(const char *procname);
+ int pa_pid_file_remove(void);
+ int pa_pid_file_check_running(pid_t *pid, const char *procname);
diff --git a/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch b/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
new file mode 100644
index 0000000..c4439fa
--- /dev/null
+++ b/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
@@ -0,0 +1,16 @@
+Description: Avoid abort when poll descriptor is 0 (LP: #1092377)
+
+Index: pulseaudio/src/modules/alsa/alsa-mixer.c
+===================================================================
+--- pulseaudio.orig/src/modules/alsa/alsa-mixer.c	2012-12-20 00:37:53.862456000 -0200
++++ pulseaudio/src/modules/alsa/alsa-mixer.c	2012-12-20 00:39:58.631080479 -0200
+@@ -160,6 +160,9 @@
+     if (n < 0) {
+         pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n));
+         return;
++    } else if (n == 0) {
++        pa_log("snd_mixer_poll_descriptors_count() equal 0");
++        return;
+     }
+     num_fds = (unsigned) n;
+ 
diff --git a/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch b/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch
new file mode 100644
index 0000000..f2cde66
--- /dev/null
+++ b/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch
@@ -0,0 +1,26 @@
+From 264e2d7c27d0f690b67e4cacf7b19dfeb7eeeca0 Mon Sep 17 00:00:00 2001
+From: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+Date: Fri, 27 Jun 2014 16:36:48 -0300
+Subject: [PATCH] daemon-conf.c: changing default rlimit_rttime value to 200 ms
+
+Since rtkit v11, the top limit for rttime is 200 ms (previously it
+was wrongly limited to 2 seconds).
+
+Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+---
+ src/daemon/daemon-conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: pulseaudio/src/daemon/daemon-conf.c
+===================================================================
+--- pulseaudio.orig/src/daemon/daemon-conf.c
++++ pulseaudio/src/daemon/daemon-conf.c
+@@ -139,7 +139,7 @@ static const pa_daemon_conf default_conf
+    ,.rlimit_rtprio = { .value = 9, .is_set = true }    /* One below JACK's default for the server */
+ #endif
+ #ifdef RLIMIT_RTTIME
+-   ,.rlimit_rttime = { .value = PA_USEC_PER_SEC, .is_set = true }
++   ,.rlimit_rttime = { .value = 200*PA_USEC_PER_MSEC, .is_set = true } /* rtkit's limit is 200 ms */
+ #endif
+ #endif
+ };
diff --git a/debian/patches/0202-dont-probe-ucm.patch b/debian/patches/0202-dont-probe-ucm.patch
new file mode 100644
index 0000000..f0e0ca8
--- /dev/null
+++ b/debian/patches/0202-dont-probe-ucm.patch
@@ -0,0 +1,14 @@
+Index: pulseaudio-5.0/src/modules/alsa/alsa-ucm.c
+===================================================================
+--- pulseaudio-5.0.orig/src/modules/alsa/alsa-ucm.c	2014-03-19 13:15:43.734768910 +1100
++++ pulseaudio-5.0/src/modules/alsa/alsa-ucm.c	2014-03-19 13:15:43.730768910 +1100
+@@ -1541,7 +1541,8 @@
+         ucm_create_profile(ucm, ps, verb, verb_name, verb_desc);
+     }
+ 
+-    ucm_probe_profile_set(ucm, ps);
++/*  Just trust that the person writing the UCM file knows what (s)he was doing, right? */
++/*    ucm_probe_profile_set(ucm, ps); */
+     ps->probed = true;
+ 
+     return ps;
diff --git a/debian/patches/0203-card-Add-hook-before-profile-changes.patch b/debian/patches/0203-card-Add-hook-before-profile-changes.patch
new file mode 100644
index 0000000..0d091af
--- /dev/null
+++ b/debian/patches/0203-card-Add-hook-before-profile-changes.patch
@@ -0,0 +1,37 @@
+From 3e04d944626ba4caee8a4d74a683c6c967e935ca Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Tue, 13 Aug 2013 12:43:29 +0200
+Subject: [PATCH 203/204] card: Add hook before profile changes
+
+This is useful to modules that want to do things just before a
+profile becomes inactive.
+---
+ src/pulsecore/card.c |    2 ++
+ src/pulsecore/core.h |    1 +
+ 2 files changed, 3 insertions(+)
+
+Index: pulseaudio/src/pulsecore/card.c
+===================================================================
+--- pulseaudio.orig/src/pulsecore/card.c
++++ pulseaudio/src/pulsecore/card.c
+@@ -278,6 +278,8 @@ int pa_card_set_profile(pa_card *c, pa_c
+         return 0;
+     }
+ 
++    pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGING], profile);
++
+     if ((r = c->set_profile(c, profile)) < 0)
+         return r;
+ 
+Index: pulseaudio/src/pulsecore/core.h
+===================================================================
+--- pulseaudio.orig/src/pulsecore/core.h
++++ pulseaudio/src/pulsecore/core.h
+@@ -116,6 +116,7 @@ typedef enum pa_core_hook {
+     PA_CORE_HOOK_CARD_PUT,
+     PA_CORE_HOOK_CARD_UNLINK,
+     PA_CORE_HOOK_CARD_PROFILE_CHANGED,
++    PA_CORE_HOOK_CARD_PROFILE_CHANGING,
+     PA_CORE_HOOK_CARD_PROFILE_ADDED,
+     PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED,
+     PA_CORE_HOOK_PORT_AVAILABLE_CHANGED,
diff --git a/debian/patches/0206-module-bluetooth-discover-adding-module-option-profi.patch b/debian/patches/0206-module-bluetooth-discover-adding-module-option-profi.patch
new file mode 100644
index 0000000..afc17c6
--- /dev/null
+++ b/debian/patches/0206-module-bluetooth-discover-adding-module-option-profi.patch
@@ -0,0 +1,45 @@
+From 6b12d4743640059c4ad9ffe055ddeebb616f6a9a Mon Sep 17 00:00:00 2001
+From: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+Date: Sun, 22 Jun 2014 23:00:59 -0300
+Subject: [PATCH] module-bluetooth-discover: adding module option profile
+
+Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+---
+ src/modules/bluetooth/module-bluez4-discover.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+Index: pulseaudio-5.0/src/modules/bluetooth/module-bluez4-discover.c
+===================================================================
+--- pulseaudio-5.0.orig/src/modules/bluetooth/module-bluez4-discover.c
++++ pulseaudio-5.0/src/modules/bluetooth/module-bluez4-discover.c
+@@ -40,11 +40,13 @@
+ PA_MODULE_AUTHOR("Jo?o Paulo Rechi Vita");
+ PA_MODULE_DESCRIPTION("Detect available BlueZ 4 Bluetooth audio devices and load BlueZ 4 Bluetooth audio drivers");
+ PA_MODULE_VERSION(PACKAGE_VERSION);
+-PA_MODULE_USAGE("sco_sink=<name of sink> "
++PA_MODULE_USAGE("profile=<a2dp|hsp|hfgw> "
++                "sco_sink=<name of sink> "
+                 "sco_source=<name of source> ");
+ PA_MODULE_LOAD_ONCE(true);
+ 
+ static const char* const valid_modargs[] = {
++    "profile",
+     "sco_sink",
+     "sco_source",
+     "async", /* deprecated */
+@@ -83,6 +85,15 @@ static pa_hook_result_t load_module_for_
+ 
+             args = pa_sprintf_malloc("address=\"%s\" path=\"%s\"", d->address, d->path);
+ 
++            if (pa_modargs_get_value(u->modargs, "profile", NULL)) {
++                char *profile;
++
++                profile = pa_sprintf_malloc("%s profile=\"%s\"", args,
++                                        pa_modargs_get_value(u->modargs, "profile", NULL));
++                pa_xfree(args);
++                args = profile;
++            }
++
+             if (pa_modargs_get_value(u->modargs, "sco_sink", NULL) &&
+                 pa_modargs_get_value(u->modargs, "sco_source", NULL)) {
+                 char *tmp;
diff --git a/debian/patches/0207-Enable-pulseaudio-droid.patch b/debian/patches/0207-Enable-pulseaudio-droid.patch
new file mode 100644
index 0000000..3105b2d
--- /dev/null
+++ b/debian/patches/0207-Enable-pulseaudio-droid.patch
@@ -0,0 +1,5513 @@
+Index: pulseaudio/configure.ac
+===================================================================
+--- pulseaudio.orig/configure.ac
++++ pulseaudio/configure.ac
+@@ -796,6 +796,21 @@ AM_CONDITIONAL([HAVE_ALSA], [test "x$HAV
+ AS_IF([test "x$HAVE_ALSA" = "x1"], AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?]))
+ AS_IF([test "x$HAVE_ALSA_UCM" = "x1"], AC_DEFINE([HAVE_ALSA_UCM], 1, [Have ALSA UCM?]))
+ 
++#### Android Audio HAL support (optional) ####
++
++AC_ARG_ENABLE([android-hal],
++    AS_HELP_STRING([--disable-android-hal],[Disable optional droid module (Android Audio HAL support)]))
++
++AS_IF([test "x$enable_android_hal" != "xno"],
++    [PKG_CHECK_MODULES(LIBHARDWARE, [ libhardware ], HAVE_ANDROID=1, HAVE_ANDROID=0)],
++    HAVE_ANDROID=0)
++
++AS_IF([test "x$enable_android_hal" = "xyes" && test "x$HAVE_ANDROID" = "x0"],
++    [AC_MSG_ERROR([*** libhardware not found])])
++
++AM_CONDITIONAL([HAVE_ANDROID], [test "x$HAVE_ANDROID" = "x1"])
++AS_IF([test "x$HAVE_ANDROID" = "x1"], AC_DEFINE([HAVE_ANDROID], 1, [Have Android Audio HAL?]))
++
+ #### EsounD support (optional) ####
+ 
+ AC_ARG_ENABLE([esound],
+@@ -1417,6 +1432,7 @@ AS_IF([test "x$HAVE_X11" = "x1"], ENABLE
+ AS_IF([test "x$HAVE_OSS_OUTPUT" = "x1"], ENABLE_OSS_OUTPUT=yes, ENABLE_OSS_OUTPUT=no)
+ AS_IF([test "x$HAVE_OSS_WRAPPER" = "x1"], ENABLE_OSS_WRAPPER=yes, ENABLE_OSS_WRAPPER=no)
+ AS_IF([test "x$HAVE_ALSA" = "x1"], ENABLE_ALSA=yes, ENABLE_ALSA=no)
++AS_IF([test "x$HAVE_ANDROID" = "x1"], ENABLE_ANDROID=yes, ENABLE_ANDROID=no)
+ AS_IF([test "x$HAVE_COREAUDIO" = "x1"], ENABLE_COREAUDIO=yes, ENABLE_COREAUDIO=no)
+ AS_IF([test "x$HAVE_SOLARIS" = "x1"], ENABLE_SOLARIS=yes, ENABLE_SOLARIS=no)
+ AS_IF([test "x$HAVE_WAVEOUT" = "x1"], ENABLE_WAVEOUT=yes, ENABLE_WAVEOUT=no)
+@@ -1473,6 +1489,7 @@ echo "
+     Enable OSS Wrapper:            ${ENABLE_OSS_WRAPPER}
+     Enable EsounD:                 ${ENABLE_ESOUND}
+     Enable Alsa:                   ${ENABLE_ALSA}
++    Enable Android Audio HAL:      ${ENABLE_ANDROID}
+     Enable CoreAudio:              ${ENABLE_COREAUDIO}
+     Enable Solaris:                ${ENABLE_SOLARIS}
+     Enable WaveOut:                ${ENABLE_WAVEOUT}
+Index: pulseaudio/src/Makefile.am
+===================================================================
+--- pulseaudio.orig/src/Makefile.am
++++ pulseaudio/src/Makefile.am
+@@ -1196,6 +1196,16 @@ modlibexec_LTLIBRARIES += \
+ 		module-alsa-source.la \
+ 		module-alsa-card.la
+ 
++if HAVE_ANDROID
++modlibexec_LTLIBRARIES += \
++		libdroid-util.la \
++		libdroid-sink.la \
++		libdroid-source.la \
++		module-droid-sink.la \
++		module-droid-source.la \
++		module-droid-card.la
++endif
++
+ dist_alsaprofilesets_DATA = \
+ 		modules/alsa/mixer/profile-sets/default.conf \
+ 		modules/alsa/mixer/profile-sets/extra-hdmi.conf \
+@@ -1459,6 +1469,13 @@ SYMDEF_FILES = \
+ 		module-filter-apply-symdef.h \
+ 		module-filter-heuristics-symdef.h
+ 
++if HAVE_ANDROID
++SYMDEF_FILES += \
++		module-droid-sink-symdef.h \
++		module-droid-source-symdef.h \
++		module-droid-card-symdef.h
++endif
++
+ if HAVE_ESOUND
+ SYMDEF_FILES += \
+ 		module-esound-protocol-tcp-symdef.h \
+@@ -1768,6 +1785,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS)
+ libalsa_util_la_CFLAGS += $(DBUS_CFLAGS)
+ endif
+ 
++if HAVE_ANDROID
++libdroid_util_la_SOURCES = modules/droid/droid-util.c modules/droid/droid-util.h
++libdroid_util_la_LDFLAGS = -avoid-version
++libdroid_util_la_LIBADD = $(MODULE_LIBADD) $(LIBHARDWARE_LIBS)
++libdroid_util_la_CFLAGS = $(AM_CFLAGS) $(LIBHARDWARE_CFLAGS)
++
++libdroid_sink_la_SOURCES = modules/droid/droid-sink.c modules/droid/droid-sink.h
++libdroid_sink_la_LDFLAGS = -avoid-version
++libdroid_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBHARDWARE_LIBS) libdroid-util.la
++libdroid_sink_la_CFLAGS = $(AM_CFLAGS) $(LIBHARDWARE_CFLAGS)
++
++libdroid_source_la_SOURCES = modules/droid/droid-source.c modules/droid/droid-source.h
++libdroid_source_la_LDFLAGS = -avoid-version
++libdroid_source_la_LIBADD = $(MODULE_LIBADD) $(LIBHARDWARE_LIBS) libdroid-util.la
++libdroid_source_la_CFLAGS = $(AM_CFLAGS) $(LIBHARDWARE_CFLAGS)
++
++module_droid_sink_la_SOURCES = modules/droid/module-droid-sink.c
++module_droid_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
++module_droid_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBHARDWARE_LIBS) libdroid-util.la libdroid-sink.la
++module_droid_sink_la_CFLAGS = $(AM_CFLAGS) $(LIBHARDWARE_CFLAGS)
++
++module_droid_source_la_SOURCES = modules/droid/module-droid-source.c
++module_droid_source_la_LDFLAGS = $(MODULE_LDFLAGS)
++module_droid_source_la_LIBADD = $(MODULE_LIBADD) $(LIBHARDWARE_LIBS) libdroid-util.la libdroid-source.la
++module_droid_source_la_CFLAGS = $(AM_CFLAGS) $(LIBHARDWARE_CFLAGS)
++
++module_droid_card_la_SOURCES = modules/droid/module-droid-card.c
++module_droid_card_la_LDFLAGS = $(MODULE_LDFLAGS)
++module_droid_card_la_LIBADD = $(MODULE_LIBADD) $(LIBHARDWARE_LIBS) libdroid-util.la libdroid-sink.la libdroid-source.la
++module_droid_card_la_CFLAGS = $(AM_CFLAGS) $(LIBHARDWARE_CFLAGS)
++
++if HAVE_UDEV
++module_droid_card_la_SOURCES += modules/droid/droid-extcon.c modules/droid/droid-extcon.h
++module_droid_card_la_LIBADD += $(UDEV_LIBS)
++module_droid_card_la_CFLAGS += $(UDEV_CFLAGS)
++endif
++endif
++
+ module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c
+ module_alsa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
+ module_alsa_sink_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
+Index: pulseaudio/src/modules/droid/droid-extcon.c
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-extcon.c
+@@ -0,0 +1,269 @@
++/***
++  This file is part of PulseAudio.
++
++  Copyright (C) 2013 Canonical Ltd.
++  Contact: David Henningsson
++           Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
++
++  PulseAudio is free software; you can redistribute it and/or modify
++  it under the terms of the GNU Lesser General Public License as published
++  by the Free Software Foundation; either version 2.1 of the License,
++  or (at your option) any later version.
++
++  PulseAudio is distributed in the hope that it will be useful, but
++  WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++  General Public License for more details.
++
++  You should have received a copy of the GNU Lesser General Public License
++  along with PulseAudio; if not, write to the Free Software
++  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++  USA.
++***/
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <pulsecore/core-util.h>
++#include <pulsecore/device-port.h>
++#include <pulsecore/i18n.h>
++#include <libudev.h>
++
++#include "droid-extcon.h"
++
++/* For android */
++#define EXTCON_NAME "switch"
++
++/* TODO: Backport stuff to 4.0, remove before upstreaming */
++#ifndef PA_PORT_AVAILABLE_YES
++#define PA_PORT_AVAILABLE_YES PA_AVAILABLE_YES
++#define PA_PORT_AVAILABLE_NO PA_AVAILABLE_NO
++#define PA_PORT_AVAILABLE_UNKNOWN PA_AVAILABLE_UNKNOWN
++#define pa_port_available_t pa_available_t
++#endif
++
++static pa_port_available_t hponly_avail(int state)
++{
++    return (state & 2) ? PA_PORT_AVAILABLE_YES : PA_PORT_AVAILABLE_NO;
++}
++
++static pa_port_available_t hsmic_avail(int state)
++{
++    return (state & 1) ? PA_PORT_AVAILABLE_YES : PA_PORT_AVAILABLE_NO;
++}
++
++struct droid_switch {
++    char *name;
++    uint32_t current_value;
++};
++
++static void droid_switch_free(struct droid_switch *as) {
++    if (!as)
++        return;
++    pa_xfree(as->name);
++    pa_xfree(as);
++}
++
++static struct droid_switch *droid_switch_new(const char *name) {
++
++    struct droid_switch *as = NULL;
++    char *filename = pa_sprintf_malloc("/sys/class/%s/%s/state", EXTCON_NAME, name);
++    char *state = pa_read_line_from_file(filename);
++
++    if (state == NULL) {
++        pa_log_debug("Cannot open '%s'. Skipping.", filename);
++        pa_xfree(filename);
++        return NULL;
++    }
++    pa_xfree(filename);
++
++    as = pa_xnew0(struct droid_switch, 1);
++    as->name = pa_xstrdup(name);
++
++    if (pa_atou(state, &as->current_value) < 0) {
++        pa_log_warn("Switch '%s' has invalid value '%s'", name, state);
++        pa_xfree(state);
++        droid_switch_free(as);
++        return NULL;
++    }
++    pa_log_debug("Switch '%s' opened with value '%s'", name, state);
++
++    return as;
++}
++
++struct udev_data {
++    struct udev *udev;
++    struct udev_monitor *monitor;
++    pa_io_event *event;
++};
++
++struct pa_droid_extcon {
++    pa_card *card;
++    struct droid_switch *h2w;
++    struct udev_data udev;
++};
++
++static struct droid_switch *find_matching_switch(pa_droid_extcon *u,
++                                                   const char *devpath) {
++
++    if (pa_streq(devpath, "/devices/virtual/" EXTCON_NAME "/h2w"))
++        return u->h2w;  /* To be extended if we ever support more switches */
++    return NULL;
++}
++
++static void notify_ports(pa_droid_extcon *u, struct droid_switch *as) {
++
++    pa_device_port *p;
++    void *state;
++
++    pa_assert(as == u->h2w); /* To be extended if we ever support more switches */
++
++    pa_log_debug("Value of switch %s is now %d.", as->name, as->current_value);
++
++    PA_HASHMAP_FOREACH(p, u->card->ports, state) {
++        if (p->direction == PA_DIRECTION_OUTPUT) {
++            if (!strcmp(p->name, "output-wired_headset"))
++                pa_device_port_set_available(p, hsmic_avail(as->current_value));
++            if (!strcmp(p->name, "output-wired_headphone"))
++                pa_device_port_set_available(p, hponly_avail(as->current_value));
++        }
++        if (p->direction == PA_DIRECTION_INPUT) {
++            if (!strcmp(p->name, "input-wired_headset"))
++                pa_device_port_set_available(p, hsmic_avail(as->current_value));
++        }
++    }
++}
++
++static void udev_cb(pa_mainloop_api *a, pa_io_event *e, int fd,
++                    pa_io_event_flags_t events, void *userdata) {
++
++    pa_droid_extcon *u = userdata;
++    struct udev_device *d = udev_monitor_receive_device(u->udev.monitor);
++    struct udev_list_entry *entry;
++    struct droid_switch *as;
++    const char *devpath, *state;
++
++    if (!d) {
++        pa_log("udev_monitor_receive_device failed.");
++        pa_assert(a);
++        a->io_free(u->udev.event);
++        u->udev.event = NULL;
++        return;
++    }
++
++    devpath = udev_device_get_devpath(d);
++    if (!devpath) {
++        pa_log("udev_device_get_devpath failed.");
++        goto out;
++    }
++    pa_log_debug("Got uevent with devpath=%s", devpath);
++
++    as = find_matching_switch(u, devpath);
++    if (!as)
++        goto out;
++
++    entry = udev_list_entry_get_by_name(
++            udev_device_get_properties_list_entry(d), "SWITCH_STATE");
++    if (!entry) {
++        pa_log("udev_list_entry_get_by_name failed to find 'SWITCH_STATE' entry.");
++        goto out;
++    }
++
++    state = udev_list_entry_get_value(entry);
++    if (!state) {
++        pa_log("udev_list_entry_get_by_name failed.");
++        goto out;
++    }
++
++    if (pa_atou(state, &as->current_value) < 0) {
++        pa_log_warn("Switch '%s' has invalid value '%s'", as->name, state);
++        goto out;
++    }
++
++    notify_ports(u, as);
++
++out:
++    udev_device_unref(d);
++}
++
++static bool init_udev(pa_droid_extcon *u, pa_core *core) {
++
++    int fd;
++
++    u->udev.udev = udev_new();
++    if (!u->udev.udev) {
++        pa_log("udev_new failed.");
++        return false;
++    }
++
++    u->udev.monitor = udev_monitor_new_from_netlink(u->udev.udev, "udev");
++    if (!u->udev.monitor) {
++        pa_log("udev_monitor_new_from_netlink failed.");
++        return false;
++    }
++
++    if (udev_monitor_filter_add_match_subsystem_devtype(u->udev.monitor, EXTCON_NAME, NULL) < 0) {
++        pa_log("udev_monitor_filter_add_match_subsystem_devtype failed.");
++        return false;
++    }
++
++    if (udev_monitor_enable_receiving(u->udev.monitor) < 0) {
++        pa_log("udev_monitor_enable_receiving failed.");
++        return false;
++    }
++
++    fd = udev_monitor_get_fd(u->udev.monitor);
++    if (fd < 0) {
++        pa_log("udev_monitor_get_fd failed");
++        return false;
++    }
++
++    pa_assert_se(u->udev.event = core->mainloop->io_new(core->mainloop, fd,
++                 PA_IO_EVENT_INPUT, udev_cb, u));
++
++    return true;
++}
++
++pa_droid_extcon *pa_droid_extcon_new(pa_core *core, pa_card *card) {
++
++    pa_droid_extcon *u = pa_xnew0(pa_droid_extcon, 1);
++
++    pa_assert(core);
++    pa_assert(card);
++
++    u->card = card;
++    u->h2w = droid_switch_new("h2w");
++    if (!u->h2w)
++        goto fail;
++
++    if (!init_udev(u, core))
++        goto fail;
++
++    notify_ports(u, u->h2w);
++
++    return u;
++
++fail:
++    pa_droid_extcon_free(u);
++    return NULL;
++}
++
++void pa_droid_extcon_free(pa_droid_extcon *u) {
++
++    pa_assert(u);
++
++    if (u->udev.event)
++        u->card->core->mainloop->io_free(u->udev.event);
++
++    if (u->udev.monitor)
++        udev_monitor_unref(u->udev.monitor);
++
++    if (u->udev.udev)
++        udev_unref(u->udev.udev);
++
++    if (u->h2w)
++        droid_switch_free(u->h2w);
++
++    pa_xfree(u);
++}
+Index: pulseaudio/src/modules/droid/droid-extcon.h
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-extcon.h
+@@ -0,0 +1,32 @@
++#ifndef foodroidextconhfoo
++#define foodroidextconhfoo
++
++/***
++  This file is part of PulseAudio.
++
++  Copyright (C) 2013 Canonical Ltd.
++  Contact: David Henningsson
++
++  PulseAudio is free software; you can redistribute it and/or modify
++  it under the terms of the GNU Lesser General Public License as published
++  by the Free Software Foundation; either version 2.1 of the License,
++  or (at your option) any later version.
++
++  PulseAudio is distributed in the hope that it will be useful, but
++  WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++  General Public License for more details.
++
++  You should have received a copy of the GNU Lesser General Public License
++  along with PulseAudio; if not, write to the Free Software
++  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++  USA.
++***/
++
++typedef struct pa_droid_extcon pa_droid_extcon;
++
++pa_droid_extcon *pa_droid_extcon_new(pa_core *, pa_card *);
++
++void pa_droid_extcon_free(pa_droid_extcon *);
++
++#endif
+Index: pulseaudio/src/modules/droid/droid-sink.c
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-sink.c
+@@ -0,0 +1,1394 @@
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ * Copyright (C) 2010 Nokia Corporation.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <signal.h>
++#include <stdio.h>
++#define __STDC_FORMAT_MACROS
++#include <inttypes.h>
++
++#ifdef HAVE_VALGRIND_MEMCHECK_H
++#include <valgrind/memcheck.h>
++#endif
++
++#include <pulse/rtclock.h>
++#include <pulse/timeval.h>
++#include <pulse/volume.h>
++#include <pulse/xmalloc.h>
++
++#include <pulsecore/core.h>
++#include <pulsecore/i18n.h>
++#include <pulsecore/module.h>
++#include <pulsecore/memchunk.h>
++#include <pulsecore/sink.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/core-rtclock.h>
++#include <pulsecore/core-util.h>
++#include <pulsecore/sample-util.h>
++#include <pulsecore/log.h>
++#include <pulsecore/macro.h>
++#include <pulsecore/thread.h>
++#include <pulsecore/thread-mq.h>
++#include <pulsecore/rtpoll.h>
++#include <pulsecore/time-smoother.h>
++#include <pulsecore/hashmap.h>
++#include <pulsecore/core-subscribe.h>
++
++#include "droid-sink.h"
++#include "droid-util.h"
++
++struct userdata {
++    pa_core *core;
++    pa_module *module;
++    pa_card *card;
++    pa_sink *sink;
++
++    pa_thread *thread;
++    pa_thread_mq thread_mq;
++    pa_rtpoll *rtpoll;
++    int32_t routing_counter;
++    int32_t mute_routing_before;
++    int32_t mute_routing_after;
++
++    bool deferred_volume; /* TODO */
++
++    pa_memblockq *memblockq;
++    pa_memchunk silence;
++    size_t buffer_count;
++    size_t buffer_size;
++    pa_usec_t buffer_latency;
++    pa_usec_t timestamp;
++
++    audio_devices_t primary_devices;
++    audio_devices_t extra_devices;
++
++    bool use_hw_volume;
++    bool use_voice_volume;
++    bool voice_volume_call_mode;
++    bool voice_virtual_stream;
++    char *voice_property_key;
++    char *voice_property_value;
++    pa_sink_input *voice_virtual_sink_input;
++    pa_sink_input *voice_control_sink_input;
++    pa_subscription *sink_input_subscription;
++
++    pa_hook_slot *sink_input_put_hook_slot;
++    pa_hook_slot *sink_input_unlink_hook_slot;
++    pa_hook_slot *sink_proplist_changed_hook_slot;
++    pa_hashmap *parameters;
++
++    pa_droid_card_data *card_data;
++    pa_droid_hw_module *hw_module;
++    struct audio_stream_out *stream_out;
++
++    char *sco_fake_sink_name;
++    struct pa_sink *sco_fake_sink;
++};
++
++enum {
++    SINK_MESSAGE_DO_ROUTING = PA_SINK_MESSAGE_MAX,
++};
++
++#define DEFAULT_MODULE_ID "primary"
++
++/* sink properties */
++#define PROP_DROID_PARAMETER_PREFIX "droid.parameter."
++typedef struct droid_parameter_mapping {
++    char *key;
++    char *value;
++} droid_parameter_mapping;
++
++/* sink-input properties */
++#define PROP_DROID_ROUTE "droid.device.additional-route"
++
++/* Voice call volume control.
++ * With defaults defined below, whenever sink-input with proplist key "media.role" with
++ * value "phone" connects to the sink AND voice volume control is enabled, that connected
++ * sink-input's absolute volume is used for HAL voice volume. */
++#define DEFAULT_VOICE_CONTROL_PROPERTY_KEY      "media.role"
++#define DEFAULT_VOICE_CONTROL_PROPERTY_VALUE    "phone"
++
++/* While the HAL interface supports until 0, android just use up to ~0.05
++ * Lower values can crash the modem or cause mixer issues */
++#define VOICE_VOLUME_MIN_VALUE                  0.05
++
++/* Name of the fake sco sink used for HSP (used to set transport property) */
++#define DEFAULT_SCO_FAKE_SINK "sink.fake.sco"
++#define HSP_PREVENT_SUSPEND_STR "bluetooth.hsp.prevent.suspend.transport"
++
++static void userdata_free(struct userdata *u);
++static void set_voice_volume_from_input(struct userdata *u, pa_sink_input *i);
++static struct pa_sink *pa_sco_fake_sink_discover(pa_core *core, const char *sink_name);
++
++static void set_primary_devices(struct userdata *u, audio_devices_t devices) {
++    pa_assert(u);
++    pa_assert(devices);
++
++    u->primary_devices = devices;
++}
++
++static void add_extra_devices(struct userdata *u, audio_devices_t devices) {
++    pa_assert(u);
++    pa_assert(devices);
++
++    u->extra_devices |= devices;
++}
++
++static void remove_extra_devices(struct userdata *u, audio_devices_t devices) {
++    pa_assert(u);
++    pa_assert(devices);
++
++    u->extra_devices &= ~devices;
++}
++
++static void parameter_free(droid_parameter_mapping *m) {
++    pa_assert(m);
++
++    pa_xfree(m->key);
++    pa_xfree(m->value);
++    pa_xfree(m);
++}
++
++static void set_fake_sco_sink_transport_property(struct userdata *u, const char *value) {
++    pa_proplist *pl;
++
++    pa_assert(u);
++    pa_assert(value);
++    pa_assert(u->sco_fake_sink);
++
++    pl = pa_proplist_new();
++    pa_proplist_sets(pl, HSP_PREVENT_SUSPEND_STR, value);
++    pa_sink_update_proplist(u->sco_fake_sink, PA_UPDATE_REPLACE, pl);
++    pa_proplist_free(pl);
++}
++
++/* Called from main context during voice calls, and from IO context during media operation. */
++static bool do_routing(struct userdata *u) {
++    audio_devices_t routing;
++    char tmp[32];
++
++    pa_assert(u);
++    pa_assert(u->stream_out);
++
++    routing = u->primary_devices | u->extra_devices;
++
++    pa_snprintf(tmp, sizeof(tmp), "%s=%u;", AUDIO_PARAMETER_STREAM_ROUTING, routing);
++    pa_log_debug("Routing: set_parameters(): %s (%#010x)", tmp, routing);
++    pa_droid_hw_module_lock(u->hw_module);
++    u->stream_out->common.set_parameters(&u->stream_out->common, tmp);
++    pa_droid_hw_module_unlock(u->hw_module);
++
++    return true;
++}
++
++static bool parse_device_list(const char *str, audio_devices_t *dst) {
++    char *dev;
++    const char *state = NULL;
++
++    pa_assert(str);
++    pa_assert(dst);
++
++    *dst = 0;
++
++    while ((dev = pa_split(str, "|", &state))) {
++        audio_devices_t d;
++
++        if (!pa_string_convert_output_device_str_to_num(dev, &d)) {
++            pa_log_warn("Unknown device %s", dev);
++            pa_xfree(dev);
++            return false;
++        }
++
++        *dst |= d;
++
++        pa_xfree(dev);
++    }
++
++    return true;
++}
++
++static int thread_write_silence(struct userdata *u) {
++    const void *p;
++    ssize_t wrote;
++
++    /* Drop our rendered audio and write silence to HAL. */
++    pa_memblockq_drop(u->memblockq, u->buffer_size);
++
++    /* We should be able to write everything in one go as long as memblock size
++     * is multiples of buffer_size. Even if we don't write whole buffer size
++     * here it's okay, as long as mute time isn't configured too strictly. */
++
++    p = pa_memblock_acquire(u->silence.memblock);
++    wrote = u->stream_out->write(u->stream_out, (const uint8_t*) p + u->silence.index, u->silence.length);
++    pa_memblock_release(u->silence.memblock);
++
++    if (wrote < 0)
++        return -1;
++
++    return 0;
++}
++
++static int thread_write(struct userdata *u) {
++    pa_memchunk c;
++    const void *p;
++    ssize_t wrote;
++
++    pa_memblockq_peek_fixed_size(u->memblockq, u->buffer_size, &c);
++
++    /* We should be able to write everything in one go as long as memblock size
++     * is multiples of buffer_size. */
++
++    for (;;) {
++        p = pa_memblock_acquire(c.memblock);
++        wrote = u->stream_out->write(u->stream_out, (const uint8_t*) p + c.index, c.length);
++        pa_memblock_release(c.memblock);
++
++        if (wrote < 0) {
++            pa_memblockq_drop(u->memblockq, c.length);
++            pa_memblock_unref(c.memblock);
++            return -1;
++        }
++
++        if (wrote < (ssize_t) c.length) {
++            c.index += wrote;
++            c.length -= wrote;
++            continue;
++        }
++
++        pa_memblockq_drop(u->memblockq, c.length);
++        pa_memblock_unref(c.memblock);
++
++        break;
++    }
++
++    return 0;
++}
++static void thread_render(struct userdata *u) {
++    size_t length;
++    size_t missing;
++
++    length = pa_memblockq_get_length(u->memblockq);
++    missing = u->buffer_size * u->buffer_count - length;
++
++    if (missing > 0) {
++        pa_memchunk c;
++        pa_sink_render_full(u->sink, missing, &c);
++        pa_memblockq_push_align(u->memblockq, &c);
++        pa_memblock_unref(c.memblock);
++    }
++}
++
++static void process_rewind(struct userdata *u) {
++    size_t rewind_nbytes;
++    size_t max_rewind_nbytes;
++    size_t queue_length;
++
++    pa_assert(u);
++
++    if (u->sink->thread_info.rewind_nbytes == 0) {
++        pa_sink_process_rewind(u->sink, 0);
++        return;
++    }
++
++    rewind_nbytes = u->sink->thread_info.rewind_nbytes;
++    u->sink->thread_info.rewind_nbytes = 0;
++
++    pa_assert(rewind_nbytes > 0);
++    pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes);
++
++    queue_length = pa_memblockq_get_length(u->memblockq);
++    if (queue_length <= u->buffer_size)
++        goto do_nothing;
++    max_rewind_nbytes = queue_length - u->buffer_size;
++    if (max_rewind_nbytes == 0)
++        goto do_nothing;
++
++    if (rewind_nbytes > max_rewind_nbytes)
++        rewind_nbytes = max_rewind_nbytes;
++
++    pa_memblockq_drop(u->memblockq, rewind_nbytes);
++
++    pa_sink_process_rewind(u->sink, rewind_nbytes);
++
++    pa_log_debug("Rewound %lu bytes.", (unsigned long) rewind_nbytes);
++    return;
++
++do_nothing:
++    pa_log_debug("Rewound 0 bytes.");
++    pa_sink_process_rewind(u->sink, 0);
++}
++
++static void thread_func(void *userdata) {
++    struct userdata *u = userdata;
++
++    pa_assert(u);
++
++    pa_log_debug("Thread starting up.");
++
++    if (u->core->realtime_scheduling)
++        pa_make_realtime(u->core->realtime_priority);
++
++    pa_thread_mq_install(&u->thread_mq);
++
++    u->timestamp = 0;
++
++    for (;;) {
++        int ret;
++
++        if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) {
++
++            u->timestamp = pa_rtclock_now();
++
++            if (PA_UNLIKELY(u->sink->thread_info.rewind_requested))
++                process_rewind(u);
++            else
++                thread_render(u);
++
++            if (pa_rtpoll_timer_elapsed(u->rtpoll)) {
++                pa_usec_t now, sleept;
++
++                if (u->routing_counter == u->mute_routing_after) {
++                    do_routing(u);
++                    u->routing_counter--;
++                } else if (u->routing_counter > -1) {
++                    thread_write_silence(u);
++                    u->routing_counter--;
++                } else
++                    thread_write(u);
++
++                now = pa_rtclock_now();
++
++                if (now - u->timestamp > u->buffer_latency / 2)
++                    sleept = 0;
++                else
++                    sleept = u->buffer_latency / 2 - (now - u->timestamp) ;
++
++                pa_rtpoll_set_timer_relative(u->rtpoll, sleept);
++            }
++        } else
++            pa_rtpoll_set_timer_disabled(u->rtpoll);
++
++        /* Sleep */
++        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
++            goto fail;
++
++        if (ret == 0)
++            goto finish;
++    }
++
++fail:
++    /* If this was no regular exit from the loop we have to continue
++     * processing messages until we received PA_MESSAGE_SHUTDOWN */
++    pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL);
++    pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN);
++
++finish:
++    pa_log_debug("Thread shutting down.");
++}
++
++/* Called from IO context */
++static int suspend(struct userdata *u) {
++    int ret;
++    size_t length;
++
++    pa_assert(u);
++    pa_assert(u->sink);
++    pa_assert(u->stream_out);
++
++    ret = u->stream_out->common.standby(&u->stream_out->common);
++
++    if (ret == 0) {
++        pa_sink_set_max_request_within_thread(u->sink, 0);
++        pa_log_info("Device suspended.");
++    } else
++        pa_log("Couldn't set standby, err %d", ret);
++
++    /* Clear memblockq */
++    if ((length = pa_memblockq_get_length(u->memblockq)) > 0)
++        pa_memblockq_drop(u->memblockq, length);
++
++    return ret;
++}
++
++static int unsuspend(struct userdata *u) {
++    pa_assert(u);
++    pa_assert(u->sink);
++
++    /* HAL resumes automagically when writing to standby stream, but let's set max request */
++    pa_sink_set_max_request_within_thread(u->sink, u->buffer_size);
++
++    pa_log_info("Resuming...");
++
++    return 0;
++}
++
++/* Called from IO context */
++static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
++    struct userdata *u = PA_SINK(o)->userdata;
++
++    switch (code) {
++        case SINK_MESSAGE_DO_ROUTING: {
++            /* When mute_routing_before & mute_routing_after are 0, routing change is done
++             * immediately when next round in thread_func. Otherwise write silence until
++             * counter equals mute_routing_after, execute routing, and write silence until
++             * routing_counter is 0. */
++            u->routing_counter = u->mute_routing_before + u->mute_routing_after;
++            return 0;
++        }
++
++        case PA_SINK_MESSAGE_GET_LATENCY: {
++            pa_usec_t r = 0;
++
++            /* HAL reports milliseconds */
++            if (u->stream_out)
++                r = u->stream_out->get_latency(u->stream_out) * PA_USEC_PER_MSEC * u->buffer_count;
++
++            *((pa_usec_t*) data) = r;
++
++            return 0;
++        }
++
++        case PA_SINK_MESSAGE_SET_STATE: {
++            switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {
++                case PA_SINK_SUSPENDED: {
++                    int r;
++
++                    pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state));
++
++                    if ((r = suspend(u)) < 0)
++                        return r;
++
++                    break;
++                }
++
++                case PA_SINK_IDLE:
++                    /* Fall through */
++                case PA_SINK_RUNNING: {
++                    int r;
++                    u->timestamp = 0;
++
++                    if (u->sink->thread_info.state == PA_SINK_SUSPENDED) {
++                        if ((r = unsuspend(u)) < 0)
++                            return r;
++                    }
++
++                    pa_rtpoll_set_timer_absolute(u->rtpoll, pa_rtclock_now());
++                    break;
++                }
++
++                /* not needed */
++                case PA_SINK_UNLINKED:
++                case PA_SINK_INIT:
++                case PA_SINK_INVALID_STATE:
++                    ;
++            }
++            break;
++        }
++    }
++
++    return pa_sink_process_msg(o, code, data, offset, chunk);
++}
++
++static int sink_set_port_cb(pa_sink *s, pa_device_port *p) {
++    struct userdata *u = s->userdata;
++    pa_droid_port_data *data;
++    const char *sco_transport_enabled;
++
++    pa_assert(u);
++    pa_assert(p);
++
++    data = PA_DEVICE_PORT_DATA(p);
++
++    if (!data->device) {
++        /* If there is no device defined, just return 0 to say everything is ok.
++         * Then next port change can be whatever sink port, even the one enabled
++         * before parking. */
++        pa_log_debug("Sink set port to parking");
++        return 0;
++    }
++
++    pa_log_debug("Sink set port %u", data->device);
++
++    set_primary_devices(u, data->device);
++
++    /* See if the sco fake sink element is available (only when needed) */
++    if ((u->sco_fake_sink == NULL) && (data->device & AUDIO_DEVICE_OUT_ALL_SCO))
++        u->sco_fake_sink = pa_sco_fake_sink_discover(u->core, u->sco_fake_sink_name);
++
++    /* Update the bluetooth hsp transport property before we do the routing */
++    if (u->sco_fake_sink) {
++        sco_transport_enabled = pa_proplist_gets(u->sco_fake_sink->proplist, HSP_PREVENT_SUSPEND_STR);
++        if (sco_transport_enabled && pa_streq(sco_transport_enabled, "true")) {
++            if (data->device & ~AUDIO_DEVICE_OUT_ALL_SCO)
++                set_fake_sco_sink_transport_property(u, "false");
++        } else if (data->device & AUDIO_DEVICE_OUT_ALL_SCO)
++            set_fake_sco_sink_transport_property(u, "true");
++    }
++
++    /* If we are in voice call, sink is usually in suspended state and routing change can be applied immediately.
++     * When in media use cases, do the routing change in IO thread. */
++    if (u->use_voice_volume)
++        do_routing(u);
++    else {
++        pa_asyncmsgq_post(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_DO_ROUTING, NULL, 0, NULL, NULL);
++    }
++
++    return 0;
++}
++
++static void sink_set_volume_cb(pa_sink *s) {
++    struct userdata *u = s->userdata;
++    pa_cvolume r;
++
++    /* Shift up by the base volume */
++    pa_sw_cvolume_divide_scalar(&r, &s->real_volume, s->base_volume);
++
++    if (r.channels == 1) {
++        float val = pa_sw_volume_to_linear(r.values[0]);
++        pa_log_debug("Set hw volume %f", val);
++        pa_droid_hw_module_lock(u->hw_module);
++        if (u->stream_out->set_volume(u->stream_out, val, val) < 0)
++            pa_log_warn("Failed to set hw volume.");
++        pa_droid_hw_module_unlock(u->hw_module);
++    } else if (r.channels == 2) {
++        float val[2];
++        for (unsigned i = 0; i < 2; i++)
++            val[i] = pa_sw_volume_to_linear(r.values[i]);
++        pa_log_debug("Set hw volume %f : %f", val[0], val[1]);
++        pa_droid_hw_module_lock(u->hw_module);
++        if (u->stream_out->set_volume(u->stream_out, val[0], val[1]) < 0)
++            pa_log_warn("Failed to set hw volume.");
++        pa_droid_hw_module_unlock(u->hw_module);
++    }
++}
++
++/* Called from main context when set from input and from IO when set from sink volume. */
++static void set_voice_volume(struct userdata *u, pa_cvolume vol) {
++    float val;
++
++    pa_assert(u);
++
++    val = pa_sw_volume_to_linear(pa_cvolume_avg(&vol));
++
++    /* Make sure our lower value is still HAL compatible */
++    if (val < VOICE_VOLUME_MIN_VALUE) {
++        val = VOICE_VOLUME_MIN_VALUE;
++        pa_log_debug("Forcing minimal voice volume to %f", val);
++    }
++
++    pa_log_debug("Set voice volume %f", val);
++
++    pa_droid_hw_module_lock(u->hw_module);
++    if (u->hw_module->device->set_voice_volume(u->hw_module->device, val) < 0)
++        pa_log_warn("Failed to set voice volume.");
++    pa_droid_hw_module_unlock(u->hw_module);
++}
++
++static void sink_set_voice_volume_cb(pa_sink *s) {
++    struct userdata *u = s->userdata;
++    pa_cvolume r;
++
++    /* Shift up by the base volume */
++    pa_sw_cvolume_divide_scalar(&r, &s->real_volume, s->base_volume);
++
++    set_voice_volume(u, r);
++}
++
++/* Called from main thread */
++static void set_voice_volume_from_input(struct userdata *u, pa_sink_input *i) {
++    pa_cvolume vol;
++    float val;
++
++    pa_assert_ctl_context();
++    pa_assert(u);
++    pa_assert(i);
++
++    pa_sink_input_get_volume(i, &vol, true);
++
++    set_voice_volume(u, vol);
++}
++
++static void update_volumes(struct userdata *u) {
++    int ret = -1;
++
++    /* set_volume returns 0 if hw volume control is implemented, < 0 otherwise. */
++    pa_droid_hw_module_lock(u->hw_module);
++    if (u->stream_out->set_volume) {
++        pa_log_debug("Probe hw volume support for %s", u->sink->name);
++        pa_log_debug("Stream out volume set to 1.0f, 1.0f");
++        ret = u->stream_out->set_volume(u->stream_out, 1.0f, 1.0f);
++    }
++    pa_droid_hw_module_unlock(u->hw_module);
++
++    u->use_hw_volume = (ret == 0);
++
++    /* Apply callbacks */
++    pa_droid_sink_set_voice_control(u->sink, false);
++}
++
++static void set_sink_name(pa_modargs *ma, pa_sink_new_data *data, const char *module_id) {
++    const char *tmp;
++
++    pa_assert(ma);
++    pa_assert(data);
++
++    if ((tmp = pa_modargs_get_value(ma, "sink_name", NULL))) {
++        pa_sink_new_data_set_name(data, tmp);
++        data->namereg_fail = true;
++        pa_proplist_sets(data->proplist, PA_PROP_DEVICE_DESCRIPTION, "Droid sink");
++    } else {
++        char *tt;
++        pa_assert(module_id);
++        tt = pa_sprintf_malloc("sink.%s", module_id);
++        pa_sink_new_data_set_name(data, tt);
++        pa_xfree(tt);
++        data->namereg_fail = false;
++        pa_proplist_setf(data->proplist, PA_PROP_DEVICE_DESCRIPTION, "Droid sink %s", module_id);
++    }
++}
++
++/* Called from main thread */
++static pa_sink_input *find_volume_control_sink_input(struct userdata *u) {
++    const char *val;
++    uint32_t idx;
++    pa_sink_input *i;
++
++    pa_assert_ctl_context();
++    pa_assert(u);
++    pa_assert(u->sink);
++
++    PA_IDXSET_FOREACH(i, u->sink->inputs, idx) {
++        if ((val = pa_proplist_gets(i->proplist, u->voice_property_key))) {
++            if (pa_streq(val, u->voice_property_value)) {
++                return i;
++            }
++        }
++    }
++
++    return NULL;
++}
++
++/* Called from main thread */
++static void sink_input_subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, struct userdata *u) {
++    pa_sink_input *i;
++
++    pa_assert_ctl_context();
++
++    if (t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_NEW) &&
++        t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_CHANGE) &&
++        t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_REMOVE))
++        return;
++
++    if (!(i = pa_idxset_get_by_index(c->sink_inputs, idx)))
++        return;
++
++    if (t == (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_NEW)) {
++        if (!u->voice_control_sink_input && (i = find_volume_control_sink_input(u))) {
++            u->voice_control_sink_input = i;
++            set_voice_volume_from_input(u, i);
++        }
++    }
++    else if (t == (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_CHANGE)) {
++        if (u->voice_control_sink_input == i)
++            set_voice_volume_from_input(u, i);
++    }
++    else if (t == (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_REMOVE)) {
++        if (u->voice_control_sink_input == i)
++            u->voice_control_sink_input = NULL;
++    }
++}
++
++/* For voice virtual stream, based on meego-mainvolume */
++static void sink_input_kill_cb(pa_sink_input *i) {
++    struct userdata *u;
++
++    pa_sink_input_assert_ref(i);
++    pa_assert_se(u = i->userdata);
++
++    pa_sink_input_unlink(u->voice_virtual_sink_input);
++    pa_sink_input_unref(u->voice_virtual_sink_input);
++    u->voice_virtual_sink_input = NULL;
++}
++
++/* no-op */
++static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk) {
++    return 0;
++}
++
++/* no-op */
++static void sink_input_process_rewind_cb(pa_sink_input *i, size_t nbytes) {
++}
++
++static void create_voice_virtual_stream(struct userdata *u) {
++    pa_sink_input_new_data data;
++
++    pa_assert(u);
++
++    if (!u->voice_virtual_stream || u->voice_virtual_sink_input)
++        return;
++
++    pa_sink_input_new_data_init(&data);
++
++    data.driver = __FILE__;
++    data.module = u->module;
++    pa_proplist_sets(data.proplist, PA_PROP_MEDIA_NAME, "Virtual Stream for Voice Volume Control (Droid)");
++    pa_proplist_sets(data.proplist, PA_PROP_MEDIA_ROLE, "phone");
++    pa_sink_input_new_data_set_sample_spec(&data, &u->core->default_sample_spec);
++    pa_sink_input_new_data_set_channel_map(&data, &u->core->default_channel_map);
++    data.flags = PA_SINK_INPUT_START_CORKED | PA_SINK_INPUT_NO_REMAP | PA_SINK_INPUT_NO_REMIX;
++
++    pa_sink_input_new(&u->voice_virtual_sink_input, u->module->core, &data);
++    pa_sink_input_new_data_done(&data);
++
++    if (!u->voice_virtual_sink_input) {
++        pa_log_warn("Failed to create virtual sink input.");
++        return;
++    }
++
++    u->voice_virtual_sink_input->userdata = u;
++    u->voice_virtual_sink_input->kill = sink_input_kill_cb;
++    u->voice_virtual_sink_input->pop = sink_input_pop_cb;
++    u->voice_virtual_sink_input->process_rewind = sink_input_process_rewind_cb;
++
++    pa_sink_input_put(u->voice_virtual_sink_input);
++
++    pa_log_debug("Created virtual sink input for voice call volume control.");
++}
++
++static void destroy_voice_virtual_stream(struct userdata *u) {
++    pa_assert(u);
++
++    if (!u->voice_virtual_sink_input)
++        return;
++
++    sink_input_kill_cb(u->voice_virtual_sink_input);
++
++    pa_log_debug("Removed virtual stream.");
++}
++
++/* Called from main thread */
++void pa_droid_sink_set_voice_control(pa_sink* sink, bool enable) {
++    pa_sink_input *i;
++    struct userdata *u;
++
++    pa_assert_ctl_context();
++    pa_assert(sink);
++
++    u = sink->userdata;
++    pa_assert(u);
++    pa_assert(u->sink == sink);
++
++    pa_log_debug("Set voice control - use_voice_volume: %d, enable: %d", u->use_voice_volume, enable);
++    if (u->use_voice_volume == enable)
++        return;
++
++    u->use_voice_volume = enable;
++
++    if (u->use_voice_volume) {
++        pa_log_debug("Using voice volume control for %s", u->sink->name);
++
++        if (u->voice_virtual_stream)
++            create_voice_virtual_stream(u);
++
++        if (u->voice_volume_call_mode) {
++            /* In this case we want the sink volume to directly map into the voice volume */
++            pa_log_debug("Sink volume is now controlling the voice volume for %s", u->sink->name);
++
++            /* First disable module-device-restore, as we don't want to save the voice volume
++             * as the default sink volume when restoring to the default mode */
++            pa_proplist_sets(u->sink->proplist, MODULE_DEVICE_RESTORE_SKIP_PROPERTY, "true");
++
++            /* Then map normal sink volume changes to voice call volume changes */
++            pa_sink_set_set_volume_callback(u->sink, sink_set_voice_volume_cb);
++        } else {
++            pa_sink_set_set_volume_callback(u->sink, NULL);
++
++            /* Susbcription tracking voice call volume control sink-input is set up when
++             * voice volume control is enabled. In case volume control sink-input has already
++             * connected to the sink, check for the sink-input here as well. */
++
++            if (!u->sink_input_subscription)
++                u->sink_input_subscription = pa_subscription_new(u->core,
++                                                                 PA_SUBSCRIPTION_MASK_SINK_INPUT,
++                                                                 (pa_subscription_cb_t) sink_input_subscription_cb,
++                                                                 u);
++
++            if ((i = find_volume_control_sink_input(u))) {
++                u->voice_control_sink_input = i;
++                set_voice_volume_from_input(u, i);
++            }
++        }
++    } else {
++        if (u->voice_virtual_stream)
++            destroy_voice_virtual_stream(u);
++
++        if (u->voice_volume_call_mode) {
++            /* Enable module-device-restore again now that we're back to !voicecall mode */
++            pa_proplist_unset(u->sink->proplist, MODULE_DEVICE_RESTORE_SKIP_PROPERTY);
++        }
++
++        if (u->sink_input_subscription) {
++            pa_subscription_free(u->sink_input_subscription);
++            u->sink_input_subscription = NULL;
++            u->voice_control_sink_input = NULL;
++        }
++
++        if (u->use_hw_volume) {
++            pa_log_debug("Using hardware volume control for %s", u->sink->name);
++            pa_sink_set_set_volume_callback(u->sink, sink_set_volume_cb);
++        } else {
++            pa_log_debug("Using software volume control for %s", u->sink->name);
++            pa_sink_set_set_volume_callback(u->sink, NULL);
++        }
++    }
++}
++
++/* When sink-input with proper proplist variable appears, do extra routing configuration
++ * for the lifetime of that sink-input. */
++static pa_hook_result_t sink_input_put_hook_cb(pa_core *c, pa_sink_input *sink_input, struct userdata *u) {
++    const char *dev_str;
++    const char *media_str;
++    audio_devices_t devices;
++
++    /* Dynamic routing changes do not apply during active voice call. */
++    if (u->use_voice_volume)
++        return PA_HOOK_OK;
++
++    if ((dev_str = pa_proplist_gets(sink_input->proplist, PROP_DROID_ROUTE))) {
++
++        /* Do not change routing for gstreamer pulsesink probe. Workaround for unnecessary routing changes when gst-plugin
++         * pulsesink connects to our sink. Not the best fix or the best place for a fix, but let's have this here
++         * for now anyway. */
++        if ((media_str = pa_proplist_gets(sink_input->proplist, PA_PROP_MEDIA_NAME)) && pa_streq(media_str, "pulsesink probe"))
++            return PA_HOOK_OK;
++
++        if (parse_device_list(dev_str, &devices) && devices) {
++
++            pa_log_debug("Add extra route %s (%u).", dev_str, devices);
++
++            add_extra_devices(u, devices);
++            /* post routing change */
++            pa_asyncmsgq_post(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_DO_ROUTING, NULL, 0, NULL, NULL);
++        }
++    }
++
++    return PA_HOOK_OK;
++}
++
++/* Remove extra routing when sink-inputs disappear. */
++static pa_hook_result_t sink_input_unlink_hook_cb(pa_core *c, pa_sink_input *sink_input, struct userdata *u) {
++    const char *dev_str;
++    const char *media_str;
++    audio_devices_t devices;
++
++    /* Dynamic routing changes do not apply during active voice call. */
++    if (u->use_voice_volume)
++        return PA_HOOK_OK;
++
++    if ((dev_str = pa_proplist_gets(sink_input->proplist, PROP_DROID_ROUTE))) {
++
++        /* Do not change routing for gstreamer pulsesink probe. Workaround for unnecessary routing changes when gst-plugin
++         * pulsesink connects to our sink. Not the best fix or the best place for a fix, but let's have this here
++         * for now anyway. */
++        if ((media_str = pa_proplist_gets(sink_input->proplist, PA_PROP_MEDIA_NAME)) && pa_streq(media_str, "pulsesink probe"))
++            return PA_HOOK_OK;
++
++        if (parse_device_list(dev_str, &devices) && devices) {
++
++            pa_log_debug("Remove extra route %s (%u).", dev_str, devices);
++
++            remove_extra_devices(u, devices);
++            /* post routing change */
++            pa_asyncmsgq_post(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_DO_ROUTING, NULL, 0, NULL, NULL);
++        }
++    }
++
++    return PA_HOOK_OK;
++}
++
++/* Watch for properties starting with droid.parameter. and translate them directly to
++ * HAL set_parameters() calls. */
++static pa_hook_result_t sink_proplist_changed_hook_cb(pa_core *c, pa_sink *sink, struct userdata *u) {
++    bool changed = false;
++    const char *pkey;
++    const char *key;
++    const char *value;
++    char *tmp;
++    void *state = NULL;
++    droid_parameter_mapping *parameter = NULL;
++
++    pa_assert(sink);
++    pa_assert(u);
++
++    if (u->sink != sink)
++        return PA_HOOK_OK;
++
++    while ((key = pa_proplist_iterate(sink->proplist, &state))) {
++        if (!pa_startswith(key, PROP_DROID_PARAMETER_PREFIX))
++            continue;
++
++        pkey = key + strlen(PROP_DROID_PARAMETER_PREFIX);
++        if (pkey[0] == '\0')
++            continue;
++
++        changed = false;
++
++        if (!(parameter = pa_hashmap_get(u->parameters, pkey))) {
++            parameter = pa_xnew0(droid_parameter_mapping, 1);
++            parameter->key = pa_xstrdup(pkey);
++            parameter->value = pa_xstrdup(pa_proplist_gets(sink->proplist, key));
++            pa_hashmap_put(u->parameters, parameter->key, parameter);
++            changed = true;
++        } else {
++            value = pa_proplist_gets(sink->proplist, key);
++            if (!pa_streq(parameter->value, value)) {
++                pa_xfree(parameter->value);
++                parameter->value = pa_xstrdup(value);
++                changed = true;
++            }
++        }
++
++        if (changed) {
++            pa_assert(parameter);
++            tmp = pa_sprintf_malloc("%s=%s;", parameter->key, parameter->value);
++            pa_log_debug("sink proplist changed: set_parameters(): %s", tmp);
++            pa_droid_hw_module_lock(u->hw_module);
++            u->stream_out->common.set_parameters(&u->stream_out->common, tmp);
++            pa_droid_hw_module_unlock(u->hw_module);
++            pa_xfree(tmp);
++        }
++    }
++
++    return PA_HOOK_OK;
++}
++
++static struct pa_sink *pa_sco_fake_sink_discover(pa_core *core, const char *sink_name) {
++    struct pa_sink *sink;
++    pa_idxset *idxset;
++    void *state = NULL;
++
++    pa_assert(core);
++    pa_assert(sink_name);
++    pa_assert_se((idxset = core->sinks));
++
++    while ((sink = pa_idxset_iterate(idxset, &state, NULL)) != NULL) {
++        if (pa_streq(sink_name, sink->name)) {
++            pa_log_debug("Found fake SCO sink '%s'", sink_name);
++            return sink;
++        }
++    }
++
++    return NULL;
++}
++
++pa_sink *pa_droid_sink_new(pa_module *m,
++                             pa_modargs *ma,
++                             const char *driver,
++                             pa_droid_card_data *card_data,
++                             audio_output_flags_t flags,
++                             pa_droid_mapping *am,
++                             pa_card *card) {
++
++    struct userdata *u = NULL;
++    bool deferred_volume = false;
++    bool voice_volume_call_mode = false;
++    bool voice_virtual_stream = false;
++    char *thread_name = NULL;
++    pa_sink_new_data data;
++    const char *module_id = NULL;
++    const char *tmp;
++    /* char *list = NULL; */
++    uint32_t alternate_sample_rate;
++    uint32_t sample_rate;
++    audio_devices_t dev_out;
++    pa_sample_spec sample_spec;
++    pa_channel_map channel_map;
++    bool namereg_fail = false;
++    uint32_t total_latency;
++    pa_droid_config_audio *config = NULL; /* Only used when sink is created without card */
++    int32_t mute_routing_before = 0;
++    int32_t mute_routing_after = 0;
++    uint32_t sink_buffer = 0;
++    int ret;
++
++    audio_format_t hal_audio_format = 0;
++    audio_channel_mask_t hal_channel_mask = 0;
++
++    pa_assert(m);
++    pa_assert(ma);
++    pa_assert(driver);
++
++    deferred_volume = m->core->deferred_volume;
++    if (pa_modargs_get_value_boolean(ma, "deferred_volume", &deferred_volume) < 0) {
++        pa_log("Failed to parse deferred_volume argument.");
++        goto fail;
++    }
++
++    if (card && am)
++        module_id = am->output->module->name;
++    else
++        module_id = pa_modargs_get_value(ma, "module_id", DEFAULT_MODULE_ID);
++
++    sample_spec = m->core->default_sample_spec;
++    channel_map = m->core->default_channel_map;
++
++    if (pa_modargs_get_sample_spec_and_channel_map(ma, &sample_spec, &channel_map, PA_CHANNEL_MAP_AIFF) < 0) {
++        pa_log("Failed to parse sample specification and channel map.");
++        goto fail;
++    }
++
++    alternate_sample_rate = m->core->alternate_sample_rate;
++    if (pa_modargs_get_alternate_sample_rate(ma, &alternate_sample_rate) < 0) {
++        pa_log("Failed to parse alternate sample rate.");
++        goto fail;
++    }
++
++    if ((pa_modargs_get_value_s32(ma, "mute_routing_before", &mute_routing_before) < 0) || mute_routing_before < 0) {
++        pa_log("Failed to parse mute_routing_before. Needs to be integer >= 0.");
++        goto fail;
++    }
++
++    if ((pa_modargs_get_value_s32(ma, "mute_routing_after", &mute_routing_after) < 0) || mute_routing_after < 0) {
++        pa_log("Failed to parse mute_routing_after. Needs to be integer >= 0.");
++        goto fail;
++    }
++
++    if (pa_modargs_get_value_u32(ma, "sink_buffer", &sink_buffer) < 0) {
++        pa_log("Failed to parse sink_buffer. Needs to be integer >= 0.");
++        goto fail;
++    }
++
++    if (pa_modargs_get_value_boolean(ma, "voice_volume_call_mode", &voice_volume_call_mode) < 0) {
++        pa_log("Failed to parse voice_volume_call_mode. Needs to be a boolean argument.");
++        goto fail;
++    }
++
++    if (pa_modargs_get_value_boolean(ma, "voice_virtual_stream", &voice_virtual_stream) < 0) {
++        pa_log("Failed to parse voice_virtual_stream. Needs to be a boolean argument.");
++        goto fail;
++    }
++
++    u = pa_xnew0(struct userdata, 1);
++    u->core = m->core;
++    u->module = m;
++    u->card = card;
++    u->deferred_volume = deferred_volume;
++    u->rtpoll = pa_rtpoll_new();
++    pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
++    u->parameters = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) parameter_free);
++    u->voice_volume_call_mode = voice_volume_call_mode;
++    u->voice_virtual_stream = voice_virtual_stream;
++    u->voice_property_key   = pa_xstrdup(pa_modargs_get_value(ma, "voice_property_key", DEFAULT_VOICE_CONTROL_PROPERTY_KEY));
++    u->voice_property_value = pa_xstrdup(pa_modargs_get_value(ma, "voice_property_value", DEFAULT_VOICE_CONTROL_PROPERTY_VALUE));
++    u->sco_fake_sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sco_fake_sink", DEFAULT_SCO_FAKE_SINK));
++
++    if (card_data) {
++        u->card_data = card_data;
++        pa_assert(card);
++        pa_assert_se((u->hw_module = pa_droid_hw_module_get(u->core, NULL, card_data->module_id)));
++    } else {
++        /* Sink wasn't created from inside card module, so we'll need to open
++         * hw module ourselves.
++         * TODO some way to share hw module between other sinks/sources since
++         * opening same module from different places likely isn't a good thing. */
++
++        if (!(config = pa_droid_config_load(ma)))
++            goto fail;
++
++        /* Ownership of config transfers to hw_module if opening of hw module succeeds. */
++        if (!(u->hw_module = pa_droid_hw_module_get(u->core, config, module_id)))
++            goto fail;
++    }
++
++    if (!pa_convert_format(sample_spec.format, CONV_FROM_PA, &hal_audio_format)) {
++        pa_log("Sample spec format %u not supported.", sample_spec.format);
++        goto fail;
++    }
++
++    for (int i = 0; i < channel_map.channels; i++) {
++        audio_channel_mask_t c;
++        if (!pa_convert_output_channel(channel_map.map[i], CONV_FROM_PA, &c)) {
++            pa_log("Failed to convert channel map.");
++            goto fail;
++        }
++        hal_channel_mask |= c;
++    }
++
++    struct audio_config config_out = {
++        .sample_rate = sample_spec.rate,
++        .channel_mask = hal_channel_mask,
++        .format = hal_audio_format
++    };
++
++    /* Default routing */
++    dev_out = AUDIO_DEVICE_OUT_DEFAULT;
++
++    if ((tmp = pa_modargs_get_value(ma, "output_devices", NULL))) {
++        audio_devices_t tmp_dev;
++
++        if (parse_device_list(tmp, &tmp_dev) && tmp_dev)
++            dev_out = tmp_dev;
++
++        pa_log_debug("Set initial devices %s", tmp);
++    }
++
++    if (am)
++        flags = am->output->flags;
++
++    pa_droid_hw_module_lock(u->hw_module);
++    ret = u->hw_module->device->open_output_stream(u->hw_module->device,
++                                                   u->hw_module->stream_out_id++,
++                                                   dev_out,
++                                                   flags,
++                                                   &config_out,
++                                                   &u->stream_out);
++    pa_droid_hw_module_unlock(u->hw_module);
++
++    if (!u->stream_out) {
++        pa_log("Failed to open output stream. (errno %d)", ret);
++        goto fail;
++    }
++
++    if ((sample_rate = u->stream_out->common.get_sample_rate(&u->stream_out->common)) != sample_spec.rate) {
++        pa_log_warn("Requested sample rate %u but got %u instead.", sample_spec.rate, sample_rate);
++        sample_spec.rate = sample_rate;
++    }
++
++    u->buffer_size = u->stream_out->common.get_buffer_size(&u->stream_out->common);
++    if (sink_buffer) {
++        if (sink_buffer < u->buffer_size)
++            pa_log_warn("Requested buffer size %u less than HAL reported buffer size (%u).", sink_buffer, u->buffer_size);
++        else if (sink_buffer % u->buffer_size) {
++            uint32_t trunc = (sink_buffer / u->buffer_size) * u->buffer_size;
++            pa_log_warn("Requested buffer size %u not multiple of HAL buffer size (%u). Using buffer size %u", sink_buffer, u->buffer_size, trunc);
++            u->buffer_size = trunc;
++        } else {
++            pa_log_info("Using requested buffer size %u.", sink_buffer);
++            u->buffer_size = sink_buffer;
++        }
++    }
++
++    u->buffer_latency = pa_bytes_to_usec(u->buffer_size, &sample_spec);
++    /* Disable internal rewinding for now. */
++    u->buffer_count = 1;
++
++    pa_log_info("Created Android stream with device: %u flags: %u sample rate: %u channel mask: %u format: %u buffer size: %u",
++            dev_out,
++            flags,
++            sample_rate,
++            config_out.channel_mask,
++            config_out.format,
++            u->buffer_size);
++
++
++    u->mute_routing_before = mute_routing_before / u->buffer_size;
++    u->mute_routing_after = mute_routing_after / u->buffer_size;
++    if (u->mute_routing_before == 0 && mute_routing_before)
++        u->mute_routing_before = u->buffer_size;
++    if (u->mute_routing_after == 0 && mute_routing_after)
++        u->mute_routing_after = u->buffer_size;
++    if (u->mute_routing_before || u->mute_routing_after)
++        pa_log_debug("Mute playback when routing is changing, %u before and %u after.",
++                     u->mute_routing_before * u->buffer_size,
++                     u->mute_routing_after * u->buffer_size);
++    pa_silence_memchunk_get(&u->core->silence_cache, u->core->mempool, &u->silence, &sample_spec, u->buffer_size);
++    u->memblockq = pa_memblockq_new("droid-sink", 0, u->buffer_size * u->buffer_count, u->buffer_size * u->buffer_count, &sample_spec, 1, 0, 0, &u->silence);
++
++    pa_sink_new_data_init(&data);
++    data.driver = driver;
++    data.module = m;
++    data.card = card;
++
++    set_sink_name(ma, &data, module_id);
++    pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "sound");
++    pa_proplist_sets(data.proplist, PA_PROP_DEVICE_FORM_FACTOR, "internal");
++
++    /* We need to give pa_modargs_get_value_boolean() a pointer to a local
++     * variable instead of using &data.namereg_fail directly, because
++     * data.namereg_fail is a bitfield and taking the address of a bitfield
++     * variable is impossible. */
++    namereg_fail = data.namereg_fail;
++    if (pa_modargs_get_value_boolean(ma, "namereg_fail", &namereg_fail) < 0) {
++        pa_log("Failed to parse namereg_fail argument.");
++        pa_sink_new_data_done(&data);
++        goto fail;
++    }
++    data.namereg_fail = namereg_fail;
++
++    pa_sink_new_data_set_sample_spec(&data, &sample_spec);
++    pa_sink_new_data_set_channel_map(&data, &channel_map);
++    pa_sink_new_data_set_alternate_sample_rate(&data, alternate_sample_rate);
++
++    /*
++    if (!(list = pa_list_string_output_device(dev_out))) {
++        pa_log("Couldn't format device list string.");
++        goto fail;
++    }
++    pa_proplist_sets(data.proplist, PROP_DROID_DEVICES, list);
++    pa_xfree(list);
++
++    if (flags) {
++        if (!(list = pa_list_string_flags(flags))) {
++            pa_log("Couldn't format flag list string.");
++            goto fail;
++        }
++    } else
++        list = NULL;
++
++    pa_proplist_sets(data.proplist, PROP_DROID_FLAGS, list ? list : "");
++    pa_xfree(list);
++    */
++
++    if (am)
++        pa_droid_add_ports(data.ports, am, card);
++
++    u->sink = pa_sink_new(m->core, &data, PA_SINK_HARDWARE | PA_SINK_LATENCY | PA_SINK_FLAT_VOLUME);
++    pa_sink_new_data_done(&data);
++
++    if (!u->sink) {
++        pa_log("Failed to create sink.");
++        goto fail;
++    }
++
++    u->sink->userdata = u;
++
++    u->sink->parent.process_msg = sink_process_msg;
++
++    u->sink->set_port = sink_set_port_cb;
++
++    pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
++    pa_sink_set_rtpoll(u->sink, u->rtpoll);
++
++    /* Rewind internal memblockq */
++    pa_sink_set_max_rewind(u->sink, u->buffer_size * (u->buffer_count - 1));
++
++    thread_name = pa_sprintf_malloc("droid-sink-%s", module_id);
++    if (!(u->thread = pa_thread_new(thread_name, thread_func, u))) {
++        pa_log("Failed to create thread.");
++        goto fail;
++    }
++    pa_xfree(thread_name);
++    thread_name = NULL;
++
++    /* Latency consists of HAL latency + our memblockq latency */
++    total_latency = u->stream_out->get_latency(u->stream_out) + (uint32_t) pa_bytes_to_usec(u->buffer_size * u->buffer_count, &sample_spec);
++    pa_sink_set_fixed_latency(u->sink, total_latency);
++    pa_log_debug("Set fixed latency %lu usec", (unsigned long) pa_bytes_to_usec(total_latency, &sample_spec));
++    pa_sink_set_max_request(u->sink, u->buffer_size * u->buffer_count);
++
++    if (u->sink->active_port)
++        sink_set_port_cb(u->sink, u->sink->active_port);
++
++    /* Hooks to track appearance and disappearance of sink-inputs. */
++    /* Hook a little bit earlier and later than module-role-ducking. */
++    u->sink_input_put_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_PUT], PA_HOOK_LATE+10,
++            (pa_hook_cb_t) sink_input_put_hook_cb, u);
++    u->sink_input_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK], PA_HOOK_EARLY-10,
++            (pa_hook_cb_t) sink_input_unlink_hook_cb, u);
++    u->sink_proplist_changed_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PROPLIST_CHANGED], PA_HOOK_EARLY,
++            (pa_hook_cb_t) sink_proplist_changed_hook_cb, u);
++
++    update_volumes(u);
++
++    pa_sink_put(u->sink);
++
++    return u->sink;
++
++fail:
++    pa_xfree(thread_name);
++
++    if (config)
++        pa_xfree(config);
++
++    if (u)
++        userdata_free(u);
++
++    return NULL;
++}
++
++void pa_droid_sink_free(pa_sink *s) {
++    struct userdata *u;
++
++    pa_sink_assert_ref(s);
++    pa_assert_se(u = s->userdata);
++
++    userdata_free(u);
++}
++
++static void userdata_free(struct userdata *u) {
++
++    if (u->sink)
++        pa_sink_unlink(u->sink);
++
++    if (u->thread) {
++        pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
++        pa_thread_free(u->thread);
++    }
++
++    pa_thread_mq_done(&u->thread_mq);
++
++    if (u->sink_input_subscription)
++        pa_subscription_free(u->sink_input_subscription);
++
++    if (u->sink_input_put_hook_slot)
++        pa_hook_slot_free(u->sink_input_put_hook_slot);
++
++    if (u->sink_input_unlink_hook_slot)
++        pa_hook_slot_free(u->sink_input_unlink_hook_slot);
++
++    if (u->sink_proplist_changed_hook_slot)
++        pa_hook_slot_free(u->sink_proplist_changed_hook_slot);
++
++    if (u->sink)
++        pa_sink_unref(u->sink);
++
++    if (u->parameters)
++        pa_hashmap_free(u->parameters);
++
++    if (u->hw_module && u->stream_out) {
++        pa_droid_hw_module_lock(u->hw_module);
++        u->hw_module->device->close_output_stream(u->hw_module->device, u->stream_out);
++        pa_droid_hw_module_unlock(u->hw_module);
++    }
++
++    if (u->memblockq)
++        pa_memblockq_free(u->memblockq);
++
++    if (u->silence.memblock)
++        pa_memblock_unref(u->silence.memblock);
++
++    if (u->hw_module)
++        pa_droid_hw_module_unref(u->hw_module);
++
++    if (u->sco_fake_sink_name)
++        pa_xfree(u->sco_fake_sink_name);
++
++    if (u->voice_property_key)
++        pa_xfree(u->voice_property_key);
++    if (u->voice_property_value)
++        pa_xfree(u->voice_property_value);
++
++    pa_xfree(u);
++}
+Index: pulseaudio/src/modules/droid/droid-sink.h
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-sink.h
+@@ -0,0 +1,57 @@
++#ifndef foodroidsinkfoo
++#define foodroidsinkfoo
++
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_VALGRIND_MEMCHECK_H
++#include <valgrind/memcheck.h>
++#endif
++
++#include <pulse/xmalloc.h>
++
++#include <pulsecore/core.h>
++#include <pulsecore/i18n.h>
++#include <pulsecore/module.h>
++#include <pulsecore/sink.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/log.h>
++#include <pulsecore/macro.h>
++#include <pulsecore/card.h>
++
++#include "droid-util.h"
++
++pa_sink *pa_droid_sink_new(pa_module *m,
++                             pa_modargs *ma,
++                             const char *driver,
++                             pa_droid_card_data *card_data,
++                             audio_output_flags_t flags,
++                             pa_droid_mapping *am,
++                             pa_card *card);
++void pa_droid_sink_free(pa_sink *s);
++
++void pa_droid_sink_set_voice_control(pa_sink* sink, bool enable);
++
++#endif
+Index: pulseaudio/src/modules/droid/droid-source.c
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-source.c
+@@ -0,0 +1,667 @@
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <signal.h>
++#include <stdio.h>
++
++#ifdef HAVE_VALGRIND_MEMCHECK_H
++#include <valgrind/memcheck.h>
++#endif
++
++#include <pulse/rtclock.h>
++#include <pulse/timeval.h>
++#include <pulse/volume.h>
++#include <pulse/xmalloc.h>
++
++#include <pulsecore/core.h>
++#include <pulsecore/i18n.h>
++#include <pulsecore/module.h>
++#include <pulsecore/memchunk.h>
++#include <pulsecore/source.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/core-rtclock.h>
++#include <pulsecore/core-util.h>
++#include <pulsecore/sample-util.h>
++#include <pulsecore/log.h>
++#include <pulsecore/macro.h>
++#include <pulsecore/thread.h>
++#include <pulsecore/thread-mq.h>
++#include <pulsecore/rtpoll.h>
++#include <pulsecore/time-smoother.h>
++
++#include "droid-source.h"
++#include "droid-util.h"
++
++struct userdata {
++    pa_core *core;
++    pa_module *module;
++    pa_card *card;
++    pa_source *source;
++
++    pa_thread *thread;
++    pa_thread_mq thread_mq;
++    pa_rtpoll *rtpoll;
++
++    pa_memchunk memchunk;
++    audio_devices_t primary_devices;
++    audio_devices_t enabled_devices;
++    bool routing_changes_enabled;
++
++    size_t buffer_size;
++    pa_usec_t timestamp;
++
++    pa_droid_card_data *card_data;
++    pa_droid_hw_module *hw_module;
++    audio_stream_in_t *stream;
++};
++
++#define DEFAULT_MODULE_ID "primary"
++
++static void userdata_free(struct userdata *u);
++
++static bool do_routing(struct userdata *u, audio_devices_t devices) {
++    char tmp[32];
++    char *devlist;
++
++    pa_assert(u);
++    pa_assert(u->stream);
++
++    if (!u->routing_changes_enabled) {
++        pa_log_debug("Skipping routing change.");
++        return false;
++    }
++
++    if (u->primary_devices == devices)
++        pa_log_debug("Refresh active device routing.");
++
++    u->enabled_devices &= ~u->primary_devices;
++    u->primary_devices = devices;
++    u->enabled_devices |= u->primary_devices;
++
++    devlist = pa_list_string_input_device(devices);
++    pa_assert(devlist);
++#ifdef DROID_DEVICE_I9305
++    pa_snprintf(tmp, sizeof(tmp), "%s=%u", AUDIO_PARAMETER_STREAM_ROUTING, devices & ~AUDIO_DEVICE_BIT_IN);
++#else
++    pa_snprintf(tmp, sizeof(tmp), "%s=%u", AUDIO_PARAMETER_STREAM_ROUTING, devices);
++#endif
++    pa_log_debug("set_parameters(): %s (%s : %#010x)", tmp, devlist, devices);
++    pa_xfree(devlist);
++#ifdef DROID_DEVICE_MAKO
++#warning Using mako set_parameters hack.
++    u->card_data->set_parameters(u->card_data, tmp);
++#else
++    u->stream->common.set_parameters(&u->stream->common, tmp);
++#endif
++
++    return true;
++}
++
++static bool parse_device_list(const char *str, audio_devices_t *dst) {
++    char *dev;
++    const char *state = NULL;
++
++    pa_assert(str);
++    pa_assert(dst);
++
++    *dst = 0;
++
++    while ((dev = pa_split(str, "|", &state))) {
++        audio_devices_t d;
++
++        if (!pa_string_convert_input_device_str_to_num(dev, &d)) {
++            pa_log_warn("Unknown device %s", dev);
++            pa_xfree(dev);
++            return false;
++        }
++
++        *dst |= d;
++
++        pa_xfree(dev);
++    }
++
++    return true;
++}
++
++static int thread_read(struct userdata *u) {
++    void *p;
++    ssize_t readd;
++    pa_memchunk chunk;
++
++    chunk.memblock = pa_memblock_new(u->core->mempool, (size_t) u->buffer_size);
++
++    p = pa_memblock_acquire(chunk.memblock);
++    readd = u->stream->read(u->stream, (uint8_t*) p, pa_memblock_get_length(chunk.memblock));
++    pa_memblock_release(chunk.memblock);
++
++    if (readd < 0) {
++        pa_log("Failed to read from stream. (err %i)", readd);
++        goto end;
++    }
++
++    u->timestamp += pa_bytes_to_usec(readd, &u->source->sample_spec);
++
++    chunk.index = 0;
++    chunk.length = readd;
++
++    if (chunk.length > 0)
++        pa_source_post(u->source, &chunk);
++
++end:
++    pa_memblock_unref(chunk.memblock);
++
++    return 0;
++}
++
++static void thread_func(void *userdata) {
++    struct userdata *u = userdata;
++
++    pa_assert(u);
++
++    pa_log_debug("Thread starting up.");
++
++    if (u->core->realtime_scheduling)
++        pa_make_realtime(u->core->realtime_priority);
++
++    pa_thread_mq_install(&u->thread_mq);
++
++    u->timestamp = pa_rtclock_now();
++
++    for (;;) {
++        int ret;
++
++        if (PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
++            thread_read(u);
++
++            pa_rtpoll_set_timer_absolute(u->rtpoll, u->timestamp);
++        } else
++            pa_rtpoll_set_timer_disabled(u->rtpoll);
++
++        /* Sleep */
++        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
++            goto fail;
++
++        if (ret == 0)
++            goto finish;
++
++    }
++
++fail:
++    /* If this was no regular exit from the loop we have to continue
++     * processing messages until we received PA_MESSAGE_SHUTDOWN */
++    pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL);
++    pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN);
++
++finish:
++    pa_log_debug("Thread shutting down.");
++}
++
++/* Called from IO context */
++static int suspend(struct userdata *u) {
++    int ret;
++
++    pa_assert(u);
++    pa_assert(u->stream);
++
++    ret = u->stream->common.standby(&u->stream->common);
++
++    if (ret == 0)
++        pa_log_info("Device suspended.");
++
++    return ret;
++}
++
++/* Called from IO context */
++static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
++    struct userdata *u = PA_SOURCE(o)->userdata;
++
++    switch (code) {
++        case PA_SOURCE_MESSAGE_SET_STATE: {
++            switch ((pa_source_state_t) PA_PTR_TO_UINT(data)) {
++                case PA_SOURCE_SUSPENDED: {
++                    int r;
++
++                    pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state));
++
++                    if ((r = suspend(u)) < 0)
++                        return r;
++
++                    break;
++                }
++
++                case PA_SOURCE_IDLE:
++                    break;
++                case PA_SOURCE_RUNNING: {
++                    pa_log_info("Resuming...");
++                    u->timestamp = pa_rtclock_now();
++                    break;
++                }
++
++                /* not needed */
++                case PA_SOURCE_UNLINKED:
++                case PA_SOURCE_INIT:
++                case PA_SOURCE_INVALID_STATE:
++                    ;
++            }
++            break;
++        }
++    }
++
++    return pa_source_process_msg(o, code, data, offset, chunk);
++}
++
++static int source_set_port_cb(pa_source *s, pa_device_port *p) {
++    struct userdata *u = s->userdata;
++    pa_droid_port_data *data;
++
++    pa_assert(u);
++    pa_assert(p);
++
++    data = PA_DEVICE_PORT_DATA(p);
++
++    if (!data->device) {
++        /* If there is no device defined, just return 0 to say everything is ok.
++         * Then next port change can be whatever source port, even the one enabled
++         * before parking. */
++        pa_log_debug("Source set port to parking");
++        return 0;
++    }
++
++    pa_log_debug("Source set port %u", data->device);
++
++    do_routing(u, data->device);
++
++    return 0;
++}
++
++
++static void source_set_name(pa_modargs *ma, pa_source_new_data *data, const char *module_id) {
++    const char *tmp;
++
++    pa_assert(ma);
++    pa_assert(data);
++
++    if ((tmp = pa_modargs_get_value(ma, "source_name", NULL))) {
++        pa_source_new_data_set_name(data, tmp);
++        data->namereg_fail = true;
++        pa_proplist_sets(data->proplist, PA_PROP_DEVICE_DESCRIPTION, "Droid source");
++    } else {
++        char *tt;
++        pa_assert(module_id);
++        tt = pa_sprintf_malloc("source.%s", module_id);
++        pa_source_new_data_set_name(data, tt);
++        pa_xfree(tt);
++        data->namereg_fail = false;
++        pa_proplist_setf(data->proplist, PA_PROP_DEVICE_DESCRIPTION, "Droid source %s", module_id);
++    }
++}
++
++static void source_get_mute_cb(pa_source *s) {
++    struct userdata *u = s->userdata;
++    bool b;
++
++    pa_assert(u);
++    pa_assert(u->hw_module && u->hw_module->device);
++
++    pa_droid_hw_module_lock(u->hw_module);
++    if (u->hw_module->device->get_mic_mute(u->hw_module->device, &b) < 0) {
++        pa_log("Failed to get mute state.");
++        pa_droid_hw_module_unlock(u->hw_module);
++        return;
++    }
++    pa_droid_hw_module_unlock(u->hw_module);
++
++    s->muted = b;
++}
++
++static void source_set_mute_cb(pa_source *s) {
++    struct userdata *u = s->userdata;
++
++    pa_assert(u);
++    pa_assert(u->hw_module && u->hw_module->device);
++
++    pa_droid_hw_module_lock(u->hw_module);
++    if (u->hw_module->device->set_mic_mute(u->hw_module->device, s->muted) < 0)
++        pa_log("Failed to set mute state to %smuted.", s->muted ? "" : "un");
++    pa_droid_hw_module_unlock(u->hw_module);
++}
++
++static void source_set_mute_control(struct userdata *u) {
++    pa_assert(u);
++    pa_assert(u->hw_module && u->hw_module->device);
++
++    if (u->hw_module->device->set_mic_mute) {
++        pa_log_info("Using hardware mute control for %s", u->source->name);
++        pa_source_set_get_mute_callback(u->source, source_get_mute_cb);
++        pa_source_set_set_mute_callback(u->source, source_set_mute_cb);
++    } else {
++        pa_log_info("Using software mute control for %s", u->source->name);
++        pa_source_set_get_mute_callback(u->source, NULL);
++        pa_source_set_set_mute_callback(u->source, NULL);
++    }
++}
++
++void pa_droid_source_set_routing(pa_source *s, bool enabled) {
++    struct userdata *u = s->userdata;
++
++    pa_assert(s);
++    pa_assert(s->userdata);
++
++    if (u->routing_changes_enabled != enabled)
++        pa_log_debug("%s source routing changes.", enabled ? "Enabling" : "Disabling");
++    u->routing_changes_enabled = enabled;
++}
++
++pa_source *pa_droid_source_new(pa_module *m,
++                                 pa_modargs *ma,
++                                 const char *driver,
++                                 pa_droid_card_data *card_data,
++                                 pa_droid_mapping *am,
++                                 pa_card *card) {
++
++    struct userdata *u = NULL;
++    char *thread_name = NULL;
++    pa_source_new_data data;
++    const char *module_id = NULL;
++    /* const char *tmp; */
++    uint32_t sample_rate;
++    uint32_t alternate_sample_rate;
++    audio_devices_t dev_in;
++    pa_sample_spec sample_spec;
++    pa_channel_map channel_map;
++    bool namereg_fail = false;
++    pa_droid_config_audio *config = NULL; /* Only used when source is created without card */
++    uint32_t source_buffer = 0;
++    char audio_source[32];
++    int ret;
++
++    audio_format_t hal_audio_format = 0;
++    audio_channel_mask_t hal_channel_mask = 0;
++
++    pa_assert(m);
++    pa_assert(ma);
++    pa_assert(driver);
++
++    /* When running under card use hw module name for source by default. */
++    if (card && ma)
++        module_id = am->input->module->name;
++    else
++        module_id = pa_modargs_get_value(ma, "module_id", DEFAULT_MODULE_ID);
++
++    sample_spec = m->core->default_sample_spec;
++    channel_map = m->core->default_channel_map;
++
++    if (pa_modargs_get_sample_spec_and_channel_map(ma, &sample_spec, &channel_map, PA_CHANNEL_MAP_AIFF) < 0) {
++        pa_log("Failed to parse sample specification and channel map.");
++        goto fail;
++    }
++
++    alternate_sample_rate = m->core->alternate_sample_rate;
++    if (pa_modargs_get_alternate_sample_rate(ma, &alternate_sample_rate) < 0) {
++        pa_log("Failed to parse alternate sample rate.");
++        goto fail;
++    }
++
++    if (pa_modargs_get_value_u32(ma, "source_buffer", &source_buffer) < 0) {
++        pa_log("Failed to parse source_buffer. Needs to be integer >= 0.");
++        goto fail;
++    }
++
++    u = pa_xnew0(struct userdata, 1);
++    u->core = m->core;
++    u->module = m;
++    u->card = card;
++    u->rtpoll = pa_rtpoll_new();
++    pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
++
++    /* Enabled routing changes by default. */
++    u->routing_changes_enabled = true;
++
++    if (card_data) {
++        pa_assert(card);
++        u->card_data = card_data;
++        pa_assert_se((u->hw_module = pa_droid_hw_module_get(u->core, NULL, card_data->module_id)));
++    } else {
++        /* Stand-alone source */
++
++        if (!(config = pa_droid_config_load(ma)))
++            goto fail;
++
++        /* Ownership of config transfers to hw_module if opening of hw module succeeds. */
++        if (!(u->hw_module = pa_droid_hw_module_get(u->core, config, module_id)))
++            goto fail;
++    }
++
++    if (!pa_convert_format(sample_spec.format, CONV_FROM_PA, &hal_audio_format)) {
++        pa_log("Sample spec format %u not supported.", sample_spec.format);
++        goto fail;
++    }
++
++    for (int i = 0; i < channel_map.channels; i++) {
++        audio_channel_mask_t c;
++        if (!pa_convert_input_channel(channel_map.map[i], CONV_FROM_PA, &c)) {
++            pa_log("Failed to convert channel map.");
++            goto fail;
++        }
++        hal_channel_mask |= c;
++    }
++
++    struct audio_config config_in = {
++        .sample_rate = sample_spec.rate,
++        .channel_mask = hal_channel_mask,
++        .format = hal_audio_format
++    };
++
++    /* Default routing */
++    /* FIXME So while setting routing through stream with HALv2 API fails, creation of stream
++     * requires HALv2 style device to work properly. So until that oddity is resolved we always
++     * set AUDIO_DEVICE_IN_BUILTIN_MIC as initial device here. */
++#if 0
++    pa_assert_se(pa_string_convert_input_device_str_to_num("AUDIO_DEVICE_IN_BUILTIN_MIC", &dev_in));
++
++    if ((tmp = pa_modargs_get_value(ma, "input_devices", NULL))) {
++        audio_devices_t tmp_dev;
++
++        if (parse_device_list(tmp, &tmp_dev) && tmp_dev)
++            dev_in = tmp_dev;
++
++        pa_log_debug("Set initial devices %s", tmp);
++    }
++#else
++    pa_log_info("FIXME: Setting AUDIO_DEVICE_IN_BUILTIN_MIC as initial device.");
++    dev_in = AUDIO_DEVICE_IN_BUILTIN_MIC;
++#endif
++    pa_droid_hw_module_lock(u->hw_module);
++    ret = u->hw_module->device->open_input_stream(u->hw_module->device,
++                                                  u->hw_module->stream_in_id,
++                                                  dev_in,
++                                                  &config_in,
++                                                  &u->stream);
++    /* On some devices the first call will fail if the config parameters are
++     * not supported, but it'll automatically set the right ones, expecting
++     * the caller to call it again, so let's try at least one more time */
++    if (!u->stream)
++        ret = u->hw_module->device->open_input_stream(u->hw_module->device,
++                                                      u->hw_module->stream_in_id,
++                                                      dev_in,
++                                                      &config_in,
++                                                      &u->stream);
++
++    u->hw_module->stream_in_id++;
++    pa_droid_hw_module_unlock(u->hw_module);
++
++    if (ret < 0) {
++        pa_log("Failed to open input stream.");
++        goto fail;
++    }
++
++    if ((sample_rate = u->stream->common.get_sample_rate(&u->stream->common)) != sample_spec.rate) {
++        pa_log_warn("Requested sample rate %u but got %u instead.", sample_spec.rate, sample_rate);
++        sample_spec.rate = sample_rate;
++    }
++
++    u->buffer_size = u->stream->common.get_buffer_size(&u->stream->common);
++    if (source_buffer) {
++        if (source_buffer < u->buffer_size)
++            pa_log_warn("Requested buffer size %u less than HAL reported buffer size (%u).", source_buffer, u->buffer_size);
++        else if (source_buffer % u->buffer_size) {
++            uint32_t trunc = (source_buffer / u->buffer_size) * u->buffer_size;
++            pa_log_warn("Requested buffer size %u not multiple of HAL buffer size (%u). Using buffer size %u", source_buffer, u->buffer_size, trunc);
++            u->buffer_size = trunc;
++        } else {
++            pa_log_info("Using requested buffer size %u.", source_buffer);
++            u->buffer_size = source_buffer;
++        }
++    }
++
++    pa_log_info("Created Android stream with device: %u sample rate: %u channel mask: %u format: %u buffer size: %u",
++            dev_in,
++            sample_rate,
++            config_in.channel_mask,
++            config_in.format,
++            u->buffer_size);
++
++    /* Setting audio source to MIC by default */
++    pa_snprintf(audio_source, sizeof(audio_source), "%s=%u", AUDIO_PARAMETER_STREAM_INPUT_SOURCE, AUDIO_SOURCE_MIC);
++    u->stream->common.set_parameters(&u->stream->common, audio_source);
++    pa_log_debug("Setting audio source to AUDIO_SOURCE_MIC by default");
++
++    pa_source_new_data_init(&data);
++    data.driver = driver;
++    data.module = m;
++    data.card = card;
++
++    source_set_name(ma, &data, module_id);
++
++    /* We need to give pa_modargs_get_value_boolean() a pointer to a local
++     * variable instead of using &data.namereg_fail directly, because
++     * data.namereg_fail is a bitfield and taking the address of a bitfield
++     * variable is impossible. */
++    namereg_fail = data.namereg_fail;
++    if (pa_modargs_get_value_boolean(ma, "namereg_fail", &namereg_fail) < 0) {
++        pa_log("Failed to parse namereg_fail argument.");
++        pa_source_new_data_done(&data);
++        goto fail;
++    }
++    data.namereg_fail = namereg_fail;
++
++    pa_source_new_data_set_sample_spec(&data, &sample_spec);
++    pa_source_new_data_set_channel_map(&data, &channel_map);
++    pa_source_new_data_set_alternate_sample_rate(&data, alternate_sample_rate);
++
++    if (am)
++        pa_droid_add_ports(data.ports, am, card);
++
++    u->source = pa_source_new(m->core, &data, PA_SOURCE_HARDWARE);
++    pa_source_new_data_done(&data);
++
++    if (!u->source) {
++        pa_log("Failed to create source.");
++        goto fail;
++    }
++
++    u->source->userdata = u;
++
++    u->source->parent.process_msg = source_process_msg;
++
++    source_set_mute_control(u);
++
++    u->source->set_port = source_set_port_cb;
++
++    pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
++    pa_source_set_rtpoll(u->source, u->rtpoll);
++
++    /* Disable rewind for droid source */
++    pa_source_set_max_rewind(u->source, 0);
++
++    thread_name = pa_sprintf_malloc("droid-source-%s", module_id);
++    if (!(u->thread = pa_thread_new(thread_name, thread_func, u))) {
++        pa_log("Failed to create thread.");
++        goto fail;
++    }
++    pa_xfree(thread_name);
++    thread_name = NULL;
++
++    pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(u->buffer_size, &sample_spec));
++    pa_log_debug("Set fixed latency %" PRIu64 " usec", pa_bytes_to_usec(u->buffer_size, &sample_spec));
++
++    if (u->source->active_port)
++        source_set_port_cb(u->source, u->source->active_port);
++
++    pa_source_put(u->source);
++
++    return u->source;
++
++fail:
++    pa_xfree(thread_name);
++
++    if (config)
++        pa_xfree(config);
++
++    if (u)
++        userdata_free(u);
++
++    return NULL;
++}
++
++void pa_droid_source_free(pa_source *s) {
++    struct userdata *u;
++
++    pa_source_assert_ref(s);
++    pa_assert_se(u = s->userdata);
++
++    userdata_free(u);
++}
++
++static void userdata_free(struct userdata *u) {
++
++    if (u->source)
++        pa_source_unlink(u->source);
++
++    if (u->thread) {
++        pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
++        pa_thread_free(u->thread);
++    }
++
++    pa_thread_mq_done(&u->thread_mq);
++
++    if (u->source)
++        pa_source_unref(u->source);
++
++    if (u->memchunk.memblock)
++        pa_memblock_unref(u->memchunk.memblock);
++
++    if (u->hw_module && u->stream) {
++        pa_droid_hw_module_lock(u->hw_module);
++        u->hw_module->device->close_input_stream(u->hw_module->device, u->stream);
++        pa_droid_hw_module_unlock(u->hw_module);
++    }
++
++    // Stand alone source
++    if (u->hw_module)
++        pa_droid_hw_module_unref(u->hw_module);
++
++    pa_xfree(u);
++}
+Index: pulseaudio/src/modules/droid/droid-source.h
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-source.h
+@@ -0,0 +1,56 @@
++#ifndef foodroidsourcefoo
++#define foodroidsourcefoo
++
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_VALGRIND_MEMCHECK_H
++#include <valgrind/memcheck.h>
++#endif
++
++#include <pulse/xmalloc.h>
++
++#include <pulsecore/core.h>
++#include <pulsecore/i18n.h>
++#include <pulsecore/module.h>
++#include <pulsecore/source.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/log.h>
++#include <pulsecore/macro.h>
++#include <pulsecore/card.h>
++
++#include "droid-util.h"
++
++pa_source *pa_droid_source_new(pa_module *m,
++                                 pa_modargs *ma,
++                                 const char *driver,
++                                 pa_droid_card_data *card_data,
++                                 pa_droid_mapping *am,
++                                 pa_card *card);
++void pa_droid_source_free(pa_source *s);
++
++void pa_droid_source_set_routing(pa_source *s, bool enabled);
++
++#endif
+Index: pulseaudio/src/modules/droid/droid-util-41qc.h
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-util-41qc.h
+@@ -0,0 +1,274 @@
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifndef _ANDROID_UTIL_V412_H_
++#define _ANDROID_UTIL_V412_H_
++
++// PulseAudio value    -    Android value
++
++static uint32_t conversion_table_output_channel[][2] = {
++    { PA_CHANNEL_POSITION_MONO,                     AUDIO_CHANNEL_OUT_MONO },
++    { PA_CHANNEL_POSITION_FRONT_LEFT,               AUDIO_CHANNEL_OUT_FRONT_LEFT },
++    { PA_CHANNEL_POSITION_FRONT_RIGHT,              AUDIO_CHANNEL_OUT_FRONT_RIGHT},
++    { PA_CHANNEL_POSITION_FRONT_CENTER,             AUDIO_CHANNEL_OUT_FRONT_CENTER },
++    { PA_CHANNEL_POSITION_SUBWOOFER,                AUDIO_CHANNEL_OUT_LOW_FREQUENCY },
++    { PA_CHANNEL_POSITION_REAR_LEFT,                AUDIO_CHANNEL_OUT_BACK_LEFT },
++    { PA_CHANNEL_POSITION_REAR_RIGHT,               AUDIO_CHANNEL_OUT_BACK_RIGHT },
++    { PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,     AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER },
++    { PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,    AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER },
++    { PA_CHANNEL_POSITION_REAR_CENTER,              AUDIO_CHANNEL_OUT_BACK_CENTER },
++    { PA_CHANNEL_POSITION_SIDE_LEFT,                AUDIO_CHANNEL_OUT_SIDE_LEFT },
++    { PA_CHANNEL_POSITION_SIDE_RIGHT,               AUDIO_CHANNEL_OUT_SIDE_RIGHT },
++    { PA_CHANNEL_POSITION_TOP_CENTER,               AUDIO_CHANNEL_OUT_TOP_CENTER },
++    { PA_CHANNEL_POSITION_TOP_FRONT_LEFT,           AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT },
++    { PA_CHANNEL_POSITION_TOP_FRONT_CENTER,         AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER },
++    { PA_CHANNEL_POSITION_TOP_FRONT_RIGHT,          AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT },
++    { PA_CHANNEL_POSITION_TOP_REAR_LEFT,            AUDIO_CHANNEL_OUT_TOP_BACK_LEFT },
++    { PA_CHANNEL_POSITION_TOP_REAR_CENTER,          AUDIO_CHANNEL_OUT_TOP_BACK_CENTER },
++    { PA_CHANNEL_POSITION_TOP_REAR_RIGHT,           AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT }
++};
++
++static uint32_t conversion_table_input_channel[][2] = {
++    { PA_CHANNEL_POSITION_MONO,                     AUDIO_CHANNEL_IN_MONO },
++    { PA_CHANNEL_POSITION_FRONT_LEFT,               AUDIO_CHANNEL_IN_LEFT },
++    { PA_CHANNEL_POSITION_FRONT_RIGHT,              AUDIO_CHANNEL_IN_RIGHT},
++    { PA_CHANNEL_POSITION_FRONT_CENTER,             AUDIO_CHANNEL_IN_FRONT },
++    { PA_CHANNEL_POSITION_REAR_CENTER,              AUDIO_CHANNEL_IN_BACK },
++    /* Following are missing suitable counterparts on PulseAudio side. */
++    { AUDIO_CHANNEL_IN_LEFT_PROCESSED,              AUDIO_CHANNEL_IN_LEFT_PROCESSED },
++    { AUDIO_CHANNEL_IN_RIGHT_PROCESSED,             AUDIO_CHANNEL_IN_RIGHT_PROCESSED },
++    { AUDIO_CHANNEL_IN_FRONT_PROCESSED,             AUDIO_CHANNEL_IN_FRONT_PROCESSED },
++    { AUDIO_CHANNEL_IN_BACK_PROCESSED,              AUDIO_CHANNEL_IN_BACK_PROCESSED },
++    { AUDIO_CHANNEL_IN_PRESSURE,                    AUDIO_CHANNEL_IN_PRESSURE },
++    { AUDIO_CHANNEL_IN_X_AXIS,                      AUDIO_CHANNEL_IN_X_AXIS },
++    { AUDIO_CHANNEL_IN_Y_AXIS,                      AUDIO_CHANNEL_IN_Y_AXIS },
++    { AUDIO_CHANNEL_IN_Z_AXIS,                      AUDIO_CHANNEL_IN_Z_AXIS },
++    { AUDIO_CHANNEL_IN_VOICE_UPLINK,                AUDIO_CHANNEL_IN_VOICE_UPLINK },
++    { AUDIO_CHANNEL_IN_VOICE_DNLINK,                AUDIO_CHANNEL_IN_VOICE_DNLINK }
++};
++
++static uint32_t conversion_table_format[][2] = {
++    { PA_SAMPLE_U8,             AUDIO_FORMAT_PCM_8_BIT },
++    { PA_SAMPLE_S16LE,          AUDIO_FORMAT_PCM_16_BIT },
++    { PA_SAMPLE_S32LE,          AUDIO_FORMAT_PCM_32_BIT },
++    { PA_SAMPLE_S24LE,          AUDIO_FORMAT_PCM_8_24_BIT }
++};
++
++struct string_conversion {
++    uint32_t value;
++    const char *str;
++};
++
++#if defined(STRING_ENTRY) || defined(STRING_ENTRY)
++#error STRING_ENTRY already defined somewhere, fix this lib.
++#endif
++#define STRING_ENTRY(str) { str, #str }
++/* Output devices */
++static struct string_conversion string_conversion_table_output_device[] = {
++    STRING_ENTRY(AUDIO_DEVICE_OUT_EARPIECE),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_SPEAKER),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_WIRED_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_WIRED_HEADPHONE),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_SCO),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_AUX_DIGITAL),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_USB_ACCESSORY),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_USB_DEVICE),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_FM),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_FM_TX),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ANC_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ANC_HEADPHONE),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_PROXY),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ALL),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ALL_A2DP),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ALL_SCO),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ALL_USB),
++    { 0, NULL }
++};
++
++static struct string_conversion string_conversion_table_output_device_fancy[] = {
++    { AUDIO_DEVICE_OUT_EARPIECE,                    "output-earpiece" },
++    { AUDIO_DEVICE_OUT_SPEAKER,                     "output-speaker" },
++    { AUDIO_DEVICE_OUT_SPEAKER
++        | AUDIO_DEVICE_OUT_WIRED_HEADPHONE,         "output-speaker+wired_headphone" },
++    { AUDIO_DEVICE_OUT_WIRED_HEADSET,               "output-wired_headset" },
++    { AUDIO_DEVICE_OUT_WIRED_HEADPHONE,             "output-wired_headphone" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_SCO,               "output-bluetooth_sco" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET,       "output-sco_headset" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT,        "output-sco_carkit" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_A2DP,              "output-a2dp" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,   "output-a2dp_headphones" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER,      "output-a2dp_speaker" },
++    { AUDIO_DEVICE_OUT_AUX_DIGITAL,                 "output-aux_digital" },
++    { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET,           "output-analog_dock_headset" },
++    { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET,           "output-digital_dock_headset" },
++    { AUDIO_DEVICE_OUT_USB_ACCESSORY,               "output-usb_accessory" },
++    { AUDIO_DEVICE_OUT_USB_DEVICE,                  "output-usb_device" },
++    { AUDIO_DEVICE_OUT_FM,                          "output-fm" },
++    { AUDIO_DEVICE_OUT_FM_TX,                       "output-fm_tx" },
++    { AUDIO_DEVICE_OUT_ANC_HEADSET,                 "output-anc_headset" },
++    { AUDIO_DEVICE_OUT_ANC_HEADPHONE,               "output-anc_headphone" },
++    { AUDIO_DEVICE_OUT_PROXY,                       "output-proxy" },
++    { 0, NULL }
++};
++
++/* Input devices */
++static struct string_conversion string_conversion_table_input_device[] = {
++    STRING_ENTRY(AUDIO_DEVICE_IN_COMMUNICATION),
++    STRING_ENTRY(AUDIO_DEVICE_IN_AMBIENT),
++    STRING_ENTRY(AUDIO_DEVICE_IN_BUILTIN_MIC),
++    STRING_ENTRY(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_IN_WIRED_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_IN_AUX_DIGITAL),
++    STRING_ENTRY(AUDIO_DEVICE_IN_VOICE_CALL),
++    STRING_ENTRY(AUDIO_DEVICE_IN_BACK_MIC),
++    STRING_ENTRY(AUDIO_DEVICE_IN_ANC_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_IN_FM_RX),
++    STRING_ENTRY(AUDIO_DEVICE_IN_FM_RX_A2DP),
++    STRING_ENTRY(AUDIO_DEVICE_IN_PROXY),
++    { 0, NULL }
++};
++
++static struct string_conversion string_conversion_table_input_device_fancy[] = {
++    { AUDIO_DEVICE_IN_COMMUNICATION,            "input-in_communication" },
++    { AUDIO_DEVICE_IN_AMBIENT,                  "input-ambient" },
++    { AUDIO_DEVICE_IN_BUILTIN_MIC,              "input-builtin_mic" },
++    { AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,    "input-bluetooth_sco_headset" },
++    { AUDIO_DEVICE_IN_WIRED_HEADSET,            "input-wired_headset" },
++    { AUDIO_DEVICE_IN_AUX_DIGITAL,              "input-aux_digital" },
++    { AUDIO_DEVICE_IN_VOICE_CALL,               "input-voice_call" },
++    { AUDIO_DEVICE_IN_BACK_MIC,                 "input-back_mic" },
++    { AUDIO_DEVICE_IN_ANC_HEADSET,              "input-anc_headset" },
++    { AUDIO_DEVICE_IN_FM_RX,                    "input-fm_rx" },
++    { AUDIO_DEVICE_IN_FM_RX_A2DP,               "input-fm_rx_a2dp" },
++    { AUDIO_DEVICE_IN_PROXY,                    "input-in_proxy" },
++    { 0, NULL }
++};
++
++/* Flags */
++static struct string_conversion string_conversion_table_flag[] = {
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_NONE),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_DIRECT),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_PRIMARY),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_FAST),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_DEEP_BUFFER),
++    /* Qualcomm flags */
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_LPA),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_TUNNEL),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_VOIP_RX),
++    { 0, NULL }
++};
++
++/* Channels */
++static struct string_conversion string_conversion_table_output_channels[] = {
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_LOW_FREQUENCY),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_BACK_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_BACK_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_BACK_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_SIDE_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_SIDE_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_BACK_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_BACK_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_MONO),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_STEREO),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_QUAD),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_SURROUND),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_5POINT1),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_7POINT1),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_ALL),
++    { 0, NULL }
++};
++static struct string_conversion string_conversion_table_input_channels[] = {
++    STRING_ENTRY(AUDIO_CHANNEL_IN_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_FRONT),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_BACK),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_LEFT_PROCESSED),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_RIGHT_PROCESSED),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_FRONT_PROCESSED),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_BACK_PROCESSED),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_PRESSURE),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_X_AXIS),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_Y_AXIS),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_Z_AXIS),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_VOICE_UPLINK),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_VOICE_DNLINK),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_MONO),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_STEREO),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_5POINT1),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_VOICE_CALL_MONO),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_ALL),
++    { 0, NULL }
++};
++
++/* Formats */
++static struct string_conversion string_conversion_table_format[] = {
++    STRING_ENTRY(AUDIO_FORMAT_DEFAULT),
++    STRING_ENTRY(AUDIO_FORMAT_PCM),
++    STRING_ENTRY(AUDIO_FORMAT_MP3),
++    STRING_ENTRY(AUDIO_FORMAT_AMR_NB),
++    STRING_ENTRY(AUDIO_FORMAT_AMR_WB),
++    STRING_ENTRY(AUDIO_FORMAT_AAC),
++    STRING_ENTRY(AUDIO_FORMAT_HE_AAC_V1),
++    STRING_ENTRY(AUDIO_FORMAT_HE_AAC_V2),
++    STRING_ENTRY(AUDIO_FORMAT_VORBIS),
++    STRING_ENTRY(AUDIO_FORMAT_EVRC),
++    STRING_ENTRY(AUDIO_FORMAT_QCELP),
++    STRING_ENTRY(AUDIO_FORMAT_AC3),
++    STRING_ENTRY(AUDIO_FORMAT_AC3_PLUS),
++    STRING_ENTRY(AUDIO_FORMAT_DTS),
++    STRING_ENTRY(AUDIO_FORMAT_WMA),
++    STRING_ENTRY(AUDIO_FORMAT_WMA_PRO),
++    STRING_ENTRY(AUDIO_FORMAT_AAC_ADIF),
++    STRING_ENTRY(AUDIO_FORMAT_EVRCB),
++    STRING_ENTRY(AUDIO_FORMAT_EVRCWB),
++    STRING_ENTRY(AUDIO_FORMAT_EAC3),
++    STRING_ENTRY(AUDIO_FORMAT_DTS_LBR),
++    STRING_ENTRY(AUDIO_FORMAT_AMR_WB_PLUS),
++    /* Currently we support only PCM formats, but keep all formats
++     * here so audio_policy.conf can be parsed. */
++    STRING_ENTRY(AUDIO_FORMAT_PCM_16_BIT),
++    STRING_ENTRY(AUDIO_FORMAT_PCM_8_BIT),
++    STRING_ENTRY(AUDIO_FORMAT_PCM_32_BIT),
++    STRING_ENTRY(AUDIO_FORMAT_PCM_8_24_BIT),
++    { 0, NULL }
++};
++#undef STRING_ENTRY
++
++#endif
+Index: pulseaudio/src/modules/droid/droid-util-42.h
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-util-42.h
+@@ -0,0 +1,286 @@
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifndef _ANDROID_UTIL_V42_H_
++#define _ANDROID_UTIL_V42_H_
++
++#define HAL_V2
++
++// PulseAudio value    -    Android value
++
++static uint32_t conversion_table_output_channel[][2] = {
++    { PA_CHANNEL_POSITION_MONO,                     AUDIO_CHANNEL_OUT_MONO },
++    { PA_CHANNEL_POSITION_FRONT_LEFT,               AUDIO_CHANNEL_OUT_FRONT_LEFT },
++    { PA_CHANNEL_POSITION_FRONT_RIGHT,              AUDIO_CHANNEL_OUT_FRONT_RIGHT},
++    { PA_CHANNEL_POSITION_FRONT_CENTER,             AUDIO_CHANNEL_OUT_FRONT_CENTER },
++    { PA_CHANNEL_POSITION_SUBWOOFER,                AUDIO_CHANNEL_OUT_LOW_FREQUENCY },
++    { PA_CHANNEL_POSITION_REAR_LEFT,                AUDIO_CHANNEL_OUT_BACK_LEFT },
++    { PA_CHANNEL_POSITION_REAR_RIGHT,               AUDIO_CHANNEL_OUT_BACK_RIGHT },
++    { PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,     AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER },
++    { PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,    AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER },
++    { PA_CHANNEL_POSITION_REAR_CENTER,              AUDIO_CHANNEL_OUT_BACK_CENTER },
++    { PA_CHANNEL_POSITION_SIDE_LEFT,                AUDIO_CHANNEL_OUT_SIDE_LEFT },
++    { PA_CHANNEL_POSITION_SIDE_RIGHT,               AUDIO_CHANNEL_OUT_SIDE_RIGHT },
++    { PA_CHANNEL_POSITION_TOP_CENTER,               AUDIO_CHANNEL_OUT_TOP_CENTER },
++    { PA_CHANNEL_POSITION_TOP_FRONT_LEFT,           AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT },
++    { PA_CHANNEL_POSITION_TOP_FRONT_CENTER,         AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER },
++    { PA_CHANNEL_POSITION_TOP_FRONT_RIGHT,          AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT },
++    { PA_CHANNEL_POSITION_TOP_REAR_LEFT,            AUDIO_CHANNEL_OUT_TOP_BACK_LEFT },
++    { PA_CHANNEL_POSITION_TOP_REAR_CENTER,          AUDIO_CHANNEL_OUT_TOP_BACK_CENTER },
++    { PA_CHANNEL_POSITION_TOP_REAR_RIGHT,           AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT }
++};
++
++static uint32_t conversion_table_input_channel[][2] = {
++    { PA_CHANNEL_POSITION_MONO,                     AUDIO_CHANNEL_IN_MONO },
++    { PA_CHANNEL_POSITION_FRONT_LEFT,               AUDIO_CHANNEL_IN_LEFT },
++    { PA_CHANNEL_POSITION_FRONT_RIGHT,              AUDIO_CHANNEL_IN_RIGHT},
++    { PA_CHANNEL_POSITION_FRONT_CENTER,             AUDIO_CHANNEL_IN_FRONT },
++    { PA_CHANNEL_POSITION_REAR_CENTER,              AUDIO_CHANNEL_IN_BACK },
++    /* Following are missing suitable counterparts on PulseAudio side. */
++    { AUDIO_CHANNEL_IN_LEFT_PROCESSED,              AUDIO_CHANNEL_IN_LEFT_PROCESSED },
++    { AUDIO_CHANNEL_IN_RIGHT_PROCESSED,             AUDIO_CHANNEL_IN_RIGHT_PROCESSED },
++    { AUDIO_CHANNEL_IN_FRONT_PROCESSED,             AUDIO_CHANNEL_IN_FRONT_PROCESSED },
++    { AUDIO_CHANNEL_IN_BACK_PROCESSED,              AUDIO_CHANNEL_IN_BACK_PROCESSED },
++    { AUDIO_CHANNEL_IN_PRESSURE,                    AUDIO_CHANNEL_IN_PRESSURE },
++    { AUDIO_CHANNEL_IN_X_AXIS,                      AUDIO_CHANNEL_IN_X_AXIS },
++    { AUDIO_CHANNEL_IN_Y_AXIS,                      AUDIO_CHANNEL_IN_Y_AXIS },
++    { AUDIO_CHANNEL_IN_Z_AXIS,                      AUDIO_CHANNEL_IN_Z_AXIS },
++    { AUDIO_CHANNEL_IN_VOICE_UPLINK,                AUDIO_CHANNEL_IN_VOICE_UPLINK },
++    { AUDIO_CHANNEL_IN_VOICE_DNLINK,                AUDIO_CHANNEL_IN_VOICE_DNLINK }
++};
++
++static uint32_t conversion_table_format[][2] = {
++    { PA_SAMPLE_U8,             AUDIO_FORMAT_PCM_8_BIT },
++    { PA_SAMPLE_S16LE,          AUDIO_FORMAT_PCM_16_BIT },
++    { PA_SAMPLE_S32LE,          AUDIO_FORMAT_PCM_32_BIT },
++    { PA_SAMPLE_S24LE,          AUDIO_FORMAT_PCM_8_24_BIT }
++};
++
++struct string_conversion {
++    uint32_t value;
++    const char *str;
++};
++
++#if defined(STRING_ENTRY)
++#error STRING_ENTRY already defined somewhere, fix this lib.
++#endif
++#define STRING_ENTRY(str) { str, #str }
++/* Output devices */
++static struct string_conversion string_conversion_table_output_device[] = {
++    STRING_ENTRY(AUDIO_DEVICE_OUT_EARPIECE),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_SPEAKER),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_WIRED_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_WIRED_HEADPHONE),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_SCO),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_AUX_DIGITAL),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_USB_ACCESSORY),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_USB_DEVICE),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_REMOTE_SUBMIX),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ANC_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ANC_HEADPHONE),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_PROXY),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_FM),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_FM_TX),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_SPDIF),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_DEFAULT),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ALL),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ALL_A2DP),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ALL_SCO),
++    STRING_ENTRY(AUDIO_DEVICE_OUT_ALL_USB),
++    { 0, NULL }
++};
++
++static struct string_conversion string_conversion_table_output_device_fancy[] = {
++    { AUDIO_DEVICE_OUT_EARPIECE,                    "output-earpiece" },
++    { AUDIO_DEVICE_OUT_SPEAKER,                     "output-speaker" },
++    { AUDIO_DEVICE_OUT_SPEAKER
++        | AUDIO_DEVICE_OUT_WIRED_HEADPHONE,         "output-speaker+wired_headphone" },
++    { AUDIO_DEVICE_OUT_WIRED_HEADSET,               "output-wired_headset" },
++    { AUDIO_DEVICE_OUT_WIRED_HEADPHONE,             "output-wired_headphone" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_SCO,               "output-bluetooth_sco" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET,       "output-sco_headset" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT,        "output-sco_carkit" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_A2DP,              "output-a2dp" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,   "output-a2dp_headphones" },
++    { AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER,      "output-a2dp_speaker" },
++    { AUDIO_DEVICE_OUT_AUX_DIGITAL,                 "output-aux_digital" },
++    { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET,           "output-analog_dock_headset" },
++    { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET,           "output-digital_dock_headset" },
++    { AUDIO_DEVICE_OUT_USB_ACCESSORY,               "output-usb_accessory" },
++    { AUDIO_DEVICE_OUT_USB_DEVICE,                  "output-usb_device" },
++    { AUDIO_DEVICE_OUT_REMOTE_SUBMIX,               "output-remote_submix" },
++    { AUDIO_DEVICE_OUT_ANC_HEADSET,                 "output-anc_headset" },
++    { AUDIO_DEVICE_OUT_ANC_HEADPHONE,               "output-anc_headphone" },
++    { AUDIO_DEVICE_OUT_PROXY,                       "output-proxy" },
++    { AUDIO_DEVICE_OUT_FM,                          "output-fm" },
++    { AUDIO_DEVICE_OUT_FM_TX,                       "output-fm_tx" },
++    { AUDIO_DEVICE_OUT_SPDIF,                       "output-spdif" },
++    { 0, NULL }
++};
++
++/* Input devices */
++static struct string_conversion string_conversion_table_input_device[] = {
++    STRING_ENTRY(AUDIO_DEVICE_IN_COMMUNICATION),
++    STRING_ENTRY(AUDIO_DEVICE_IN_AMBIENT),
++    STRING_ENTRY(AUDIO_DEVICE_IN_BUILTIN_MIC),
++    STRING_ENTRY(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_IN_WIRED_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_IN_AUX_DIGITAL),
++    STRING_ENTRY(AUDIO_DEVICE_IN_VOICE_CALL),
++    STRING_ENTRY(AUDIO_DEVICE_IN_BACK_MIC),
++    STRING_ENTRY(AUDIO_DEVICE_IN_REMOTE_SUBMIX),
++    STRING_ENTRY(AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_IN_USB_ACCESSORY),
++    STRING_ENTRY(AUDIO_DEVICE_IN_USB_DEVICE),
++    STRING_ENTRY(AUDIO_DEVICE_IN_ANC_HEADSET),
++    STRING_ENTRY(AUDIO_DEVICE_IN_PROXY),
++    STRING_ENTRY(AUDIO_DEVICE_IN_FM_RX),
++    STRING_ENTRY(AUDIO_DEVICE_IN_FM_RX_A2DP),
++    STRING_ENTRY(AUDIO_DEVICE_IN_FM),
++    STRING_ENTRY(AUDIO_DEVICE_IN_MATV),
++    STRING_ENTRY(AUDIO_DEVICE_IN_AUX_DIGITAL2),
++    STRING_ENTRY(AUDIO_DEVICE_IN_ALL_SCO),
++    STRING_ENTRY(AUDIO_DEVICE_IN_DEFAULT),
++    { 0, NULL }
++};
++
++static struct string_conversion string_conversion_table_input_device_fancy[] = {
++    { AUDIO_DEVICE_IN_COMMUNICATION,            "input-communication" },
++    { AUDIO_DEVICE_IN_AMBIENT,                  "input-ambient" },
++    { AUDIO_DEVICE_IN_BUILTIN_MIC,              "input-builtin_mic" },
++    { AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,    "input-bluetooth_sco_headset" },
++    { AUDIO_DEVICE_IN_WIRED_HEADSET,            "input-wired_headset" },
++    { AUDIO_DEVICE_IN_AUX_DIGITAL,              "input-aux_digital" },
++    { AUDIO_DEVICE_IN_VOICE_CALL,               "input-voice_call" },
++    { AUDIO_DEVICE_IN_BACK_MIC,                 "input-back_mic" },
++    { AUDIO_DEVICE_IN_REMOTE_SUBMIX,            "input-remote_submix" },
++    { AUDIO_DEVICE_IN_ANC_HEADSET,              "input-anc_headset" },
++    { AUDIO_DEVICE_IN_PROXY,                    "input-proxy" },
++    { AUDIO_DEVICE_IN_FM_RX,                    "input-fm_rx" },
++    { AUDIO_DEVICE_IN_FM_RX_A2DP,               "input-fm_rx_a2dp" },
++    { AUDIO_DEVICE_IN_FM,                       "input-fm" },
++    { AUDIO_DEVICE_IN_MATV,                     "input-matv" },
++    { AUDIO_DEVICE_IN_AUX_DIGITAL2,             "input-aux_digital2" },
++    { 0, NULL }
++};
++
++/* Flags */
++static struct string_conversion string_conversion_table_flag[] = {
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_NONE),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_DIRECT),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_PRIMARY),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_FAST),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_DEEP_BUFFER),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD),
++    STRING_ENTRY(AUDIO_OUTPUT_FLAG_NON_BLOCKING),
++    { 0, NULL }
++};
++
++/* Channels */
++static struct string_conversion string_conversion_table_output_channels[] = {
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_LOW_FREQUENCY),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_BACK_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_BACK_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_BACK_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_SIDE_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_SIDE_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_BACK_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_BACK_CENTER),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_MONO),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_STEREO),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_QUAD),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_SURROUND),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_5POINT1),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_7POINT1),
++    STRING_ENTRY(AUDIO_CHANNEL_OUT_ALL),
++    { 0, NULL }
++};
++static struct string_conversion string_conversion_table_input_channels[] = {
++    STRING_ENTRY(AUDIO_CHANNEL_IN_LEFT),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_RIGHT),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_FRONT),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_BACK),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_LEFT_PROCESSED),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_RIGHT_PROCESSED),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_FRONT_PROCESSED),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_BACK_PROCESSED),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_PRESSURE),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_X_AXIS),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_Y_AXIS),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_Z_AXIS),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_VOICE_UPLINK),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_VOICE_DNLINK),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_MONO),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_STEREO),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_FRONT_BACK),
++    STRING_ENTRY(AUDIO_CHANNEL_IN_ALL),
++    { 0, NULL }
++};
++
++/* Formats */
++static struct string_conversion string_conversion_table_format[] = {
++    STRING_ENTRY(AUDIO_FORMAT_DEFAULT),
++    STRING_ENTRY(AUDIO_FORMAT_PCM),
++    STRING_ENTRY(AUDIO_FORMAT_MP3),
++    STRING_ENTRY(AUDIO_FORMAT_AMR_NB),
++    STRING_ENTRY(AUDIO_FORMAT_AMR_WB),
++    STRING_ENTRY(AUDIO_FORMAT_AAC),
++    STRING_ENTRY(AUDIO_FORMAT_HE_AAC_V1),
++    STRING_ENTRY(AUDIO_FORMAT_HE_AAC_V2),
++    STRING_ENTRY(AUDIO_FORMAT_VORBIS),
++    STRING_ENTRY(AUDIO_FORMAT_MAIN_MASK),
++    STRING_ENTRY(AUDIO_FORMAT_SUB_MASK),
++    STRING_ENTRY(AUDIO_FORMAT_PCM_16_BIT),
++    STRING_ENTRY(AUDIO_FORMAT_PCM_8_BIT),
++    STRING_ENTRY(AUDIO_FORMAT_PCM_32_BIT),
++    STRING_ENTRY(AUDIO_FORMAT_PCM_8_24_BIT),
++    { 0, NULL }
++};
++#undef STRING_ENTRY
++
++/* Ports with availability option (for port/jack detection) */
++static const char* port_availability[] = {
++    "output-wired_headset",
++    "output-wired_headphone",
++    "input-wired_headset",
++    NULL
++};
++
++
++#endif
+Index: pulseaudio/src/modules/droid/droid-util.c
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-util.c
+@@ -0,0 +1,1189 @@
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <signal.h>
++#include <stdio.h>
++
++#ifdef HAVE_VALGRIND_MEMCHECK_H
++#include <valgrind/memcheck.h>
++#endif
++
++#include <pulse/rtclock.h>
++#include <pulse/timeval.h>
++#include <pulse/volume.h>
++#include <pulse/xmalloc.h>
++
++#include <pulsecore/core.h>
++#include <pulsecore/core-error.h>
++#include <pulsecore/i18n.h>
++#include <pulsecore/module.h>
++#include <pulsecore/memchunk.h>
++#include <pulsecore/sink.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/core-rtclock.h>
++#include <pulsecore/core-util.h>
++#include <pulsecore/sample-util.h>
++#include <pulsecore/log.h>
++#include <pulsecore/macro.h>
++#include <pulsecore/thread.h>
++#include <pulsecore/thread-mq.h>
++#include <pulsecore/rtpoll.h>
++#include <pulsecore/time-smoother.h>
++#include <pulsecore/refcnt.h>
++#include <pulsecore/shared.h>
++#include <pulsecore/mutex.h>
++
++#include <hardware/audio.h>
++#include <hardware_legacy/audio_policy_conf.h>
++
++#include "droid-util.h"
++
++#include <android-version.h>
++
++#ifndef ANDROID_VERSION_MAJOR
++#error "ANDROID_VERSION_* not defined."
++#endif
++
++#if ANDROID_VERSION_MAJOR == 4 && ANDROID_VERSION_MINOR == 1
++#include "droid-util-41qc.h"
++#elif ANDROID_VERSION_MAJOR == 4 && ANDROID_VERSION_MINOR >= 2
++#include "droid-util-42.h"
++#else
++#error "No valid ANDROID_VERSION found."
++#endif
++
++#define CONVERT_FUNC(TABL) \
++bool pa_convert_ ## TABL (uint32_t value, pa_conversion_field_t field, uint32_t *to_value) {                    \
++    for (unsigned int i = 0; i < sizeof( conversion_table_ ## TABL )/(sizeof(uint32_t)*2); i++) {               \
++        if ( conversion_table_ ## TABL [i][field] == value) {                                                   \
++            *to_value = conversion_table_ ## TABL [i][!field];                                                  \
++            return true;                                                                                        \
++        }                                                                                                       \
++    }                                                                                                           \
++    return false;                                                                                               \
++} struct __funny_extra_to_allow_semicolon
++
++/* Creates convert_format convert_channel etc.
++ * bool pa_convert_func(uint32_t value, pa_conversion_field_t field, uint32_t *to_value);
++ * return true if conversion succesful */
++CONVERT_FUNC(format);
++CONVERT_FUNC(output_channel);
++CONVERT_FUNC(input_channel);
++
++#define DEFAULT_PRIORITY (100)
++
++static bool string_convert_num_to_str(const struct string_conversion *list, const uint32_t value, const char **to_str) {
++    pa_assert(list);
++    pa_assert(to_str);
++
++    pa_log_debug("Trying to convert %x to string.", value);
++
++    for (unsigned int i = 0; list[i].str; i++) {
++        if (list[i].value == value) {
++            *to_str = list[i].str;
++            return true;
++        }
++    }
++    return false;
++}
++
++static bool string_convert_str_to_num(const struct string_conversion *list, const char *str, uint32_t *to_value) {
++    pa_assert(list);
++    pa_assert(str);
++    pa_assert(to_value);
++
++    pa_log_debug("Trying to convert %s to num.", str);
++
++    for (unsigned int i = 0; list[i].str; i++) {
++        if (pa_streq(list[i].str, str)) {
++            *to_value = list[i].value;
++            return true;
++        }
++    }
++    return false;
++}
++
++static bool check_port_availability(const char *port) {
++    pa_assert(port);
++
++    pa_log_debug("Checking availability for port '%s'", port);
++
++    for (unsigned int i = 0; port_availability[i]; i++) {
++        if (pa_streq(port_availability[i], port)) {
++            return true;
++        }
++    }
++
++    return false;
++}
++
++static char *list_string(struct string_conversion *list, uint32_t flags) {
++    char *str = NULL;
++    char *tmp;
++
++#ifdef HAL_V2
++    if (flags & AUDIO_DEVICE_BIT_IN)
++        flags &= ~AUDIO_DEVICE_BIT_IN;
++#endif
++
++    for (unsigned int i = 0; list[i].str; i++) {
++#ifdef HAL_V2
++        if (list[i].value & AUDIO_DEVICE_BIT_IN) {
++            if (popcount(list[i].value & ~AUDIO_DEVICE_BIT_IN) != 1)
++                continue;
++        } else
++#endif
++        if (popcount(list[i].value) != 1)
++            continue;
++
++        if (flags & list[i].value) {
++            if (str) {
++                tmp = pa_sprintf_malloc("%s|%s", str, list[i].str);
++                pa_xfree(str);
++                str = tmp;
++            } else {
++                str = pa_sprintf_malloc("%s", list[i].str);
++            }
++        }
++    }
++
++    return str;
++}
++
++static void droid_port_free(pa_droid_port *p) {
++    pa_assert(p);
++
++    pa_xfree(p->name);
++    pa_xfree(p->description);
++    pa_xfree(p);
++}
++
++/* Output device */
++bool pa_string_convert_output_device_num_to_str(audio_devices_t value, const char **to_str) {
++    return string_convert_num_to_str(string_conversion_table_output_device, (uint32_t) value, to_str);
++}
++
++bool pa_string_convert_output_device_str_to_num(const char *str, audio_devices_t *to_value) {
++    return string_convert_str_to_num(string_conversion_table_output_device, str, (uint32_t*) to_value);
++}
++
++char *pa_list_string_output_device(audio_devices_t devices) {
++    return list_string(string_conversion_table_output_device, devices);
++}
++
++/* Input device */
++bool pa_string_convert_input_device_num_to_str(audio_devices_t value, const char **to_str) {
++    return string_convert_num_to_str(string_conversion_table_input_device, (uint32_t) value, to_str);
++}
++
++bool pa_string_convert_input_device_str_to_num(const char *str, audio_devices_t *to_value) {
++    return string_convert_str_to_num(string_conversion_table_input_device, str, (uint32_t*) to_value);
++}
++
++char *pa_list_string_input_device(audio_devices_t devices) {
++    return list_string(string_conversion_table_input_device, devices);
++}
++
++/* Flags */
++bool pa_string_convert_flag_num_to_str(audio_output_flags_t value, const char **to_str) {
++    return string_convert_num_to_str(string_conversion_table_flag, (uint32_t) value, to_str);
++}
++
++bool pa_string_convert_flag_str_to_num(const char *str, audio_output_flags_t *to_value) {
++    return string_convert_str_to_num(string_conversion_table_flag, str, (uint32_t*) to_value);
++}
++
++char *pa_list_string_flags(audio_output_flags_t flags) {
++    return list_string(string_conversion_table_flag, flags);
++}
++
++/* Config parser */
++
++#define WHITESPACE "\n\r \t"
++
++static int parse_list(const struct string_conversion *table, const char *str, uint32_t *dst) {
++    int count = 0;
++    char *entry;
++    const char *state = NULL;
++
++    pa_assert(table);
++    pa_assert(str);
++    pa_assert(dst);
++
++    *dst = 0;
++
++    while ((entry = pa_split(str, "|", &state))) {
++        uint32_t d = 0;
++
++        if (!string_convert_str_to_num(table, entry, &d)) {
++            pa_log("Unknown entry %s", entry);
++            pa_xfree(entry);
++            return -1;
++        }
++
++        *dst |= d;
++        count++;
++
++        pa_xfree(entry);
++    }
++
++    return count;
++}
++
++static bool parse_sampling_rates(const char *str, uint32_t sampling_rates[32]) {
++    char *entry;
++    const char *state = NULL;
++
++    pa_assert(str);
++
++    uint32_t pos = 0;
++    while ((entry = pa_split(str, "|", &state))) {
++        int32_t val;
++
++        if (pos == AUDIO_MAX_SAMPLING_RATES) {
++            pa_log("Too many sample rate entries (> %d)", AUDIO_MAX_SAMPLING_RATES);
++            pa_xfree(entry);
++            return false;
++        }
++
++        if (pa_atoi(entry, &val) < 0) {
++            pa_log("Bad sample rate value %s", entry);
++            pa_xfree(entry);
++            return false;
++        }
++
++        sampling_rates[pos++] = val;
++
++        pa_xfree(entry);
++
++    }
++
++    sampling_rates[pos] = 0;
++
++    return true;
++}
++
++static bool parse_formats(const char *str, audio_format_t *formats) {
++    pa_assert(str);
++    pa_assert(formats);
++
++    return parse_list(string_conversion_table_format, str, formats) > 0;
++}
++
++static int parse_channels(const char *str, bool in_output, audio_channel_mask_t *channels) {
++    pa_assert(str);
++    pa_assert(channels);
++
++    /* Needs to be probed later */
++    if (pa_streq(str, "dynamic")) {
++        *channels = 0;
++        return true;
++    }
++
++    if (in_output)
++        return parse_list(string_conversion_table_output_channels, str, channels);
++    else
++        return parse_list(string_conversion_table_input_channels, str, channels);
++}
++
++static bool parse_devices(const char *str, bool in_output, audio_devices_t *devices) {
++    pa_assert(str);
++    pa_assert(devices);
++
++    if (in_output)
++        return parse_list(string_conversion_table_output_device, str, devices) > 0;
++    else
++        return parse_list(string_conversion_table_input_device, str, devices) > 0;
++}
++
++static bool parse_flags(const char *str, audio_output_flags_t *flags) {
++    pa_assert(str);
++    pa_assert(flags);
++
++    return parse_list(string_conversion_table_flag, str, flags) > 0;
++}
++
++bool pa_parse_droid_audio_config(const char *filename, pa_droid_config_audio *config) {
++    FILE *f;
++    int n = 0;
++    bool ret = true;
++
++    enum config_loc {
++        IN_ROOT = 0,
++        IN_GLOBAL = 1,
++        IN_HW_MODULES = 1,
++        IN_MODULE = 2,
++        IN_OUTPUT_INPUT = 3,
++        IN_CONFIG = 4
++    } loc = IN_ROOT;
++
++
++    bool in_global = false;
++    bool in_output = true;
++
++    pa_droid_config_hw_module *module = NULL;
++    pa_droid_config_output *output = NULL;
++    pa_droid_config_input *input = NULL;
++
++    pa_assert(filename);
++    pa_assert(config);
++
++    memset(config, 0, sizeof(pa_droid_config_audio));
++
++    f = fopen(filename, "r");
++
++    if (!f) {
++        pa_log_info("Failed to open config file (%s): %s", filename, pa_cstrerror(errno));
++        ret = false;
++        goto finish;
++    }
++
++    pa_lock_fd(fileno(f), 1);
++
++    while (!feof(f)) {
++        char ln[512];
++        char *d, *v, *val;
++
++        if (!fgets(ln, sizeof(ln), f))
++            break;
++
++        n++;
++
++        pa_strip_nl(ln);
++
++        if (ln[0] == '#' || !*ln )
++            continue;
++
++        /* Enter section */
++        if (ln[strlen(ln)-1] == '{') {
++            d = ln+strspn(ln, WHITESPACE);
++            v = d;
++            d = v+strcspn(v, WHITESPACE);
++            d[0] = '\0';
++
++            if (!*v) {
++                pa_log(__FILE__ ": [%s:%u] failed to parse line - too few words", filename, n);
++                goto finish;
++            }
++
++            switch (loc) {
++                case IN_ROOT:
++                    if (pa_streq(v, GLOBAL_CONFIG_TAG)) {
++                        in_global = true;
++                        loc = IN_GLOBAL;
++                    }
++                    else if (pa_streq(v, AUDIO_HW_MODULE_TAG))
++                        loc = IN_HW_MODULES;
++                    else {
++                        pa_log(__FILE__ ": [%s:%u] failed to parse line - unknown field (%s)", filename, n, v);
++                        ret = false;
++                        goto finish;
++                    }
++                    break;
++
++                case IN_HW_MODULES:
++                    module = &config->hw_modules[config->hw_modules_size];
++                    config->hw_modules_size++;
++                    strncpy(module->name, v, AUDIO_HARDWARE_MODULE_ID_MAX_LEN);
++                    module->config = config;
++                    loc = IN_MODULE;
++                    pa_log_debug("config: New module: %s", module->name);
++                    break;
++
++                case IN_MODULE:
++                    if (pa_streq(v, OUTPUTS_TAG)) {
++                        loc = IN_OUTPUT_INPUT;
++                        in_output = true;
++                    } else if (pa_streq(v, INPUTS_TAG)) {
++                        loc = IN_OUTPUT_INPUT;
++                        in_output = false;
++                    } else {
++                        pa_log(__FILE__ ": [%s:%u] failed to parse line - unknown field (%s)", filename, n, v);
++                        ret = false;
++                        goto finish;
++                    }
++                    break;
++
++                case IN_OUTPUT_INPUT:
++                    pa_assert(module);
++
++                    if (in_output) {
++                        output = &module->outputs[module->outputs_size];
++                        module->outputs_size++;
++                        strncpy(output->name, v, AUDIO_HARDWARE_MODULE_ID_MAX_LEN);
++                        output->module = module;
++                        loc = IN_CONFIG;
++                        pa_log_debug("config: %s: New output: %s", module->name, output->name);
++                    } else {
++                        input = &module->inputs[module->inputs_size];
++                        module->inputs_size++;
++                        strncpy(input->name, v, AUDIO_HARDWARE_MODULE_ID_MAX_LEN);
++                        input->module = module;
++                        loc = IN_CONFIG;
++                        pa_log_debug("config: %s: New input: %s", module->name, input->name);
++                    }
++                    break;
++
++                case IN_CONFIG:
++                    pa_log(__FILE__ ": [%s:%u] failed to parse line - unknown field in config (%s)", filename, n, v);
++                    ret = false;
++                    goto finish;
++            }
++
++            continue;
++        }
++
++        /* Exit section */
++        if (ln[strlen(ln)-1] == '}') {
++            if (loc == IN_ROOT) {
++                pa_log(__FILE__ ": [%s:%u] failed to parse line - extra closing bracket", filename, n);
++                ret = false;
++                goto finish;
++            }
++
++            loc--;
++            if (loc == IN_MODULE) {
++                if (in_output)
++                    output = NULL;
++                else
++                    input = NULL;
++            }
++            if (loc == IN_ROOT)
++                module = NULL;
++
++            in_global = false;
++
++            continue;
++        }
++
++        /* Parse global configuration */
++        if (in_global) {
++            bool success = false;
++
++            d = ln+strspn(ln, WHITESPACE);
++            v = d;
++            d = v+strcspn(v, WHITESPACE);
++
++            val = d+strspn(d, WHITESPACE);
++            d[0] = '\0';
++            d = val+strcspn(val, WHITESPACE);
++            d[0] = '\0';
++
++            if (pa_streq(v, ATTACHED_OUTPUT_DEVICES_TAG))
++                success = parse_devices(val, true, &config->global_config.attached_output_devices);
++            else if (pa_streq(v, DEFAULT_OUTPUT_DEVICE_TAG))
++                success = parse_devices(val, true, &config->global_config.default_output_device);
++            else if (pa_streq(v, ATTACHED_INPUT_DEVICES_TAG))
++                success = parse_devices(val, false, &config->global_config.attached_input_devices);
++            else if (pa_streq(v, SPEAKER_DRC_ENABLED_TAG)) {
++                pa_log(__FILE__ ": speaker drc is not yet supported, skipping", filename);
++                success = true;
++            } else {
++                pa_log(__FILE__ ": [%s:%u] failed to parse line - unknown config entry %s", filename, n, v);
++                success = false;
++            }
++
++            if (!success) {
++                ret = false;
++                goto finish;
++            }
++        }
++
++        /* Parse per-output or per-input configuration */
++        if (loc == IN_CONFIG) {
++            bool success = false;
++
++            pa_assert(module);
++
++            d = ln+strspn(ln, WHITESPACE);
++            v = d;
++            d = v+strcspn(v, WHITESPACE);
++
++            val = d+strspn(d, WHITESPACE);
++            d[0] = '\0';
++            d = val+strcspn(val, WHITESPACE);
++            d[0] = '\0';
++
++
++            if ((in_output && !output) || (!in_output && !input)) {
++                pa_log(__FILE__ ": [%s:%u] failed to parse line", filename, n);
++                ret = false;
++                goto finish;
++            }
++
++            if (pa_streq(v, SAMPLING_RATES_TAG))
++                success = parse_sampling_rates(val, in_output ? output->sampling_rates : input->sampling_rates);
++            else if (pa_streq(v, FORMATS_TAG))
++                success = parse_formats(val, in_output ? &output->formats : &input->formats);
++            else if (pa_streq(v, CHANNELS_TAG)) {
++                if (in_output)
++                    success = (parse_channels(val, true, &output->channel_masks) > 0);
++                else
++                    success = (parse_channels(val, false, &input->channel_masks) > 0);
++            } else if (pa_streq(v, DEVICES_TAG)) {
++                if (in_output)
++                    success = parse_devices(val, true, &output->devices);
++                else
++                    success = parse_devices(val, false, &input->devices);
++            } else if (pa_streq(v, FLAGS_TAG)) {
++                if (in_output)
++                    success = parse_flags(val, &output->flags);
++                else {
++                    pa_log(__FILE__ ": [%s:%u] failed to parse line - output flags inside input definition", filename, n);
++                    success = false;
++                }
++            } else {
++                pa_log(__FILE__ ": [%s:%u] failed to parse line - unknown config entry %s", filename, n, v);
++                success = false;
++            }
++
++            if (!success) {
++                ret = false;
++                goto finish;
++            }
++        }
++    }
++
++    pa_log_info("Parsed config file (%s): %u modules.", filename, config->hw_modules_size);
++
++finish:
++    if (f) {
++        pa_lock_fd(fileno(f), 0);
++        fclose(f);
++    }
++
++    return ret;
++}
++
++
++const pa_droid_config_output *pa_droid_config_find_output(const pa_droid_config_hw_module *module, const char *name) {
++    pa_assert(module);
++    pa_assert(name);
++
++    for (unsigned i = 0; i < module->outputs_size; i++) {
++        if (pa_streq(name, module->outputs[i].name))
++            return &module->outputs[i];
++    }
++
++    return NULL;
++}
++
++const pa_droid_config_input *pa_droid_config_find_input(const pa_droid_config_hw_module *module, const char *name) {
++    pa_assert(module);
++    pa_assert(name);
++
++    for (unsigned i = 0; i < module->inputs_size; i++) {
++        if (pa_streq(name, module->inputs[i].name))
++            return &module->inputs[i];
++    }
++
++    return NULL;
++}
++
++const pa_droid_config_hw_module *pa_droid_config_find_module(const pa_droid_config_audio *config, const char* module_id) {
++    pa_assert(config);
++    pa_assert(module_id);
++
++    for (unsigned i = 0; i < config->hw_modules_size; i++) {
++        if (pa_streq(module_id, config->hw_modules[i].name))
++            return &config->hw_modules[i];
++    }
++
++    return NULL;
++}
++
++pa_droid_profile *pa_droid_profile_new(pa_droid_profile_set *ps, const pa_droid_config_output *output, const pa_droid_config_input *input) {
++    pa_droid_profile *p;
++
++    pa_assert(ps);
++    pa_assert(output);
++
++    p = pa_xnew0(pa_droid_profile, 1);
++    p->profile_set = ps;
++    p->module = output->module;
++    p->name = pa_sprintf_malloc("%s%s%s", output->name, input ? "-" : "", input ? input->name : "");
++    p->description = pa_sprintf_malloc("%s output%s%s%s", output->name,
++                                                          input ? " and " : "",
++                                                          input ? input->name : "",
++                                                          input ? " input." : "");
++    p->priority = DEFAULT_PRIORITY;
++    if (pa_streq(output->name, "primary")) {
++        p->priority += DEFAULT_PRIORITY;
++
++        if (input && pa_streq(input->name, "primary"))
++            p->priority += DEFAULT_PRIORITY;
++    }
++
++    if (output)
++        p->output = pa_droid_mapping_get(ps, PA_DIRECTION_OUTPUT, output);
++    if (input)
++        p->input = pa_droid_mapping_get(ps, PA_DIRECTION_INPUT, input);
++
++    pa_hashmap_put(ps->profiles, p->name, p);
++
++    return p;
++}
++
++static void add_profile(pa_droid_profile_set *ps, const pa_droid_config_output *output, const pa_droid_config_input *input) {
++    pa_droid_profile *ap;
++
++    pa_log_debug("New profile: %s-%s", output->name, input ? input->name : "no input");
++
++    ap = pa_droid_profile_new(ps, output, input);
++
++    pa_hashmap_put(ps->profiles, ap->name, ap);
++}
++
++pa_droid_profile_set *pa_droid_profile_set_new(const pa_droid_config_hw_module *module) {
++    pa_droid_profile_set *ps;
++
++    pa_assert(module);
++
++    ps = pa_xnew0(pa_droid_profile_set, 1);
++    ps->config = module->config;
++    ps->profiles = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) pa_droid_profile_free);
++    ps->output_mappings = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) pa_droid_mapping_free);
++    ps->input_mappings = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) pa_droid_mapping_free);
++    ps->all_ports = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) droid_port_free);
++
++    /* Each distinct hw module output matches one profile. If there are multiple inputs
++     * combinations are made so that all possible outputs and inputs can be selected.
++     * So for outputs "primary" and "hdmi" and input "primary" profiles
++     * "primary-primary" and "hdmi-primary" are created. */
++
++    for (unsigned o = 0; o < module->outputs_size; o++) {
++
++        if (module->inputs_size > 0) {
++            for (unsigned i = 0; i < module->inputs_size; i++) {
++                add_profile(ps, &module->outputs[o], &module->inputs[i]);
++            }
++        } else
++            add_profile(ps, &module->outputs[o], NULL);
++    }
++
++    return ps;
++}
++
++void pa_droid_mapping_free(pa_droid_mapping *am) {
++    pa_assert(am);
++
++    pa_xfree(am->name);
++    pa_proplist_free(am->proplist);
++    pa_idxset_free(am->ports, NULL);
++    pa_xfree(am);
++}
++
++void pa_droid_profile_free(pa_droid_profile *ap) {
++    pa_assert(ap);
++
++    pa_xfree(ap->name);
++    pa_xfree(ap->description);
++    pa_xfree(ap);
++}
++
++void pa_droid_profile_set_free(pa_droid_profile_set *ps) {
++    pa_assert(ps);
++
++    if (ps->output_mappings)
++        pa_hashmap_free(ps->output_mappings);
++
++    if (ps->input_mappings)
++        pa_hashmap_free(ps->input_mappings);
++
++    if (ps->all_ports)
++        pa_hashmap_free(ps->all_ports);
++
++    if (ps->profiles)
++        pa_hashmap_free(ps->profiles);
++
++    pa_xfree(ps);
++}
++
++static pa_droid_port *create_o_port(pa_droid_mapping *am, uint32_t device, const char *name, const char *description) {
++    pa_droid_port *p;
++    char *desc;
++
++    pa_assert(am);
++    pa_assert(name);
++
++    pa_log_debug("  New output port %s", name);
++    p = pa_xnew0(pa_droid_port, 1);
++
++    p->mapping = am;
++    p->name = pa_xstrdup(name);
++    if (description) {
++        p->description = pa_xstrdup(description);
++    } else {
++        desc = pa_replace(name, "output-", "Output to ");
++        p->description = pa_replace(desc, "_", " ");
++        pa_xfree(desc);
++    }
++    p->priority = DEFAULT_PRIORITY;
++    p->device = device;
++
++    if (am->profile_set->config->global_config.attached_output_devices & device)
++        p->priority += DEFAULT_PRIORITY;
++
++    if (am->profile_set->config->global_config.default_output_device & device)
++        p->priority += DEFAULT_PRIORITY;
++
++    if (check_port_availability(p->name))
++        p->priority += (DEFAULT_PRIORITY * 3);
++
++    return p;
++}
++
++static void add_o_ports(pa_droid_mapping *am) {
++    pa_droid_port *p;
++    const char *name;
++    uint32_t devices;
++    uint32_t combo_devices;
++    uint32_t i = 0;
++
++    pa_assert(am);
++
++    devices = am->output->devices;
++
++    devices &= ~AUDIO_DEVICE_OUT_DEFAULT;
++
++    /* IHF combo devices, these devices are combined with IHF */
++    combo_devices = AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_WIRED_HEADPHONE;
++
++    while (devices) {
++        uint32_t cur_device = (1 << i++);
++
++        if (devices & cur_device) {
++
++            pa_assert_se(pa_droid_output_port_name(cur_device, &name));
++
++            if (!(p = pa_hashmap_get(am->profile_set->all_ports, name))) {
++
++                p = create_o_port(am, cur_device, name, NULL);
++                pa_hashmap_put(am->profile_set->all_ports, p->name, p);
++            } else
++                pa_log_debug("  Output port %s from cache", name);
++
++            pa_idxset_put(am->ports, p, NULL);
++
++            devices &= ~cur_device;
++        }
++    }
++
++    /* Combo devices, route to multiple routing targets simultaneously. */
++    if (am->output->devices & combo_devices) {
++        pa_assert_se(pa_droid_output_port_name(combo_devices, &name));
++        if (!(p = pa_hashmap_get(am->profile_set->all_ports, name))) {
++            p = create_o_port(am, combo_devices, name, NULL);
++            /* Reset priority to default. */
++            p->priority = DEFAULT_PRIORITY;
++
++            pa_hashmap_put(am->profile_set->all_ports, p->name, p);
++        } else
++            pa_log_debug("  Output port %s from cache", name);
++
++        pa_idxset_put(am->ports, p, NULL);
++    }
++
++    if (!(p = pa_hashmap_get(am->profile_set->all_ports, PA_DROID_OUTPUT_PARKING))) {
++        /* Create parking port for output mapping to be used when audio_mode_t changes. */
++        p = create_o_port(am, 0, PA_DROID_OUTPUT_PARKING, "Parking port");
++        /* Reset priority to half of default */
++        p->priority = DEFAULT_PRIORITY / 2;
++
++        pa_hashmap_put(am->profile_set->all_ports, p->name, p);
++    } else
++        pa_log_debug("  Output port %s from cache", PA_DROID_OUTPUT_PARKING);
++
++    pa_idxset_put(am->ports, p, NULL);
++}
++
++static void add_i_ports(pa_droid_mapping *am) {
++    pa_droid_port *p;
++    const char *name;
++    char *desc;
++    uint32_t devices;
++    uint32_t i = 0;
++
++    pa_assert(am);
++
++    devices = am->input->devices;
++#ifdef HAL_V2
++    devices &= ~AUDIO_DEVICE_IN_DEFAULT;
++#endif
++
++    while (devices) {
++        uint32_t cur_device = (1 << i++);
++
++        if (devices & cur_device) {
++
++#ifdef HAL_V2
++            cur_device |= AUDIO_DEVICE_BIT_IN;
++#endif
++
++            pa_assert_se(pa_droid_input_port_name(cur_device, &name));
++
++            if (!(p = pa_hashmap_get(am->profile_set->all_ports, name))) {
++                pa_log_debug("  New input port %s", name);
++                p = pa_xnew0(pa_droid_port, 1);
++
++                p->mapping = am;
++                p->name = pa_xstrdup(name);
++                desc = pa_replace(name, "input-", "Input from ");
++                p->description = pa_replace(desc, "_", " ");
++                pa_xfree(desc);
++                p->priority = DEFAULT_PRIORITY;
++                p->device = cur_device;
++
++                if (am->profile_set->config->global_config.attached_input_devices & cur_device & ~AUDIO_DEVICE_BIT_IN)
++                    p->priority += DEFAULT_PRIORITY;
++
++                /* Make builtin mic the default input device */
++                if (cur_device == AUDIO_DEVICE_IN_BUILTIN_MIC)
++                    p->priority += DEFAULT_PRIORITY;
++
++                if (check_port_availability(p->name))
++                    p->priority += (DEFAULT_PRIORITY * 3);
++
++                pa_hashmap_put(am->profile_set->all_ports, p->name, p);
++            } else
++                pa_log_debug("  Input port %s from cache", name);
++
++            pa_idxset_put(am->ports, p, NULL);
++
++            devices &= ~cur_device;
++        }
++    }
++
++    if (!(p = pa_hashmap_get(am->profile_set->all_ports, PA_DROID_INPUT_PARKING))) {
++        pa_log_debug("  New input port %s", PA_DROID_INPUT_PARKING);
++        /* Create parking port for input mapping to be used when audio_mode_t changes. */
++        p = pa_xnew0(pa_droid_port, 1);
++        p->mapping = am;
++        p->name = pa_sprintf_malloc(PA_DROID_INPUT_PARKING);
++        p->description = pa_sprintf_malloc("Parking port");
++        p->priority = 50;
++        p->device = 0; /* No routing */
++
++        pa_hashmap_put(am->profile_set->all_ports, p->name, p);
++    } else
++        pa_log_debug("  Input port %s from cache", PA_DROID_INPUT_PARKING);
++
++    pa_idxset_put(am->ports, p, NULL);
++}
++
++pa_droid_mapping *pa_droid_mapping_get(pa_droid_profile_set *ps, pa_direction_t direction, const void *data) {
++    pa_droid_mapping *am;
++    pa_hashmap *map;
++    const char *name;
++    const pa_droid_config_output *output = NULL;
++    const pa_droid_config_input *input = NULL;
++
++    if (direction == PA_DIRECTION_OUTPUT) {
++        output = (pa_droid_config_output *) data;
++        map = ps->output_mappings;
++        name = output->name;
++    } else {
++        input = (pa_droid_config_input *) data;
++        map = ps->input_mappings;
++        name = input->name;
++    }
++
++    if ((am = pa_hashmap_get(map, name))) {
++        pa_log_debug("  %s mapping %s from cache", input ? "Input" : "Output", name);
++        return am;
++    }
++    pa_log_debug("  New %s mapping %s", input ? "input" : "output", name);
++
++    am = pa_xnew0(pa_droid_mapping, 1);
++    am->profile_set = ps;
++    am->name = pa_xstrdup(name);
++    am->proplist = pa_proplist_new();
++    am->direction = direction;
++    am->output = output;
++    am->input = input;
++    am->ports = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);;
++
++    if (am->direction == PA_DIRECTION_OUTPUT)
++        add_o_ports(am);
++    else
++        add_i_ports(am);
++
++    pa_hashmap_put(map, am->name, am);
++
++    return am;
++}
++
++bool pa_droid_output_port_name(audio_devices_t value, const char **to_str) {
++    return string_convert_num_to_str(string_conversion_table_output_device_fancy, (uint32_t) value, to_str);
++}
++
++bool pa_droid_input_port_name(audio_devices_t value, const char **to_str) {
++    return string_convert_num_to_str(string_conversion_table_input_device_fancy, (uint32_t) value, to_str);
++}
++
++static int add_ports(pa_core *core, pa_card_profile *cp, pa_hashmap *ports, pa_droid_mapping *am, pa_hashmap *extra) {
++    pa_droid_port *p;
++    pa_device_port *dp;
++    pa_droid_port_data *data;
++    uint32_t idx;
++    int count = 0;
++
++    pa_log_debug("Ports for %s%s: %s", cp ? "card " : "", am->direction == PA_DIRECTION_OUTPUT ? "output" : "input", am->name);
++
++    PA_IDXSET_FOREACH(p, am->ports, idx) {
++        if (!(dp = pa_hashmap_get(ports, p->name))) {
++            pa_log_debug("  New port %s", p->name);
++
++            pa_device_port_new_data port_data;
++            pa_device_port_new_data_init(&port_data);
++            pa_device_port_new_data_set_name(&port_data, p->name);
++            pa_device_port_new_data_set_description(&port_data, p->description);
++            pa_device_port_new_data_set_direction(&port_data, p->mapping->direction);
++            dp = pa_device_port_new(core, &port_data, sizeof(pa_droid_port_data));
++            pa_device_port_new_data_done(&port_data);
++            dp->priority = p->priority;
++
++            pa_hashmap_put(ports, dp->name, dp);
++            dp->profiles = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) pa_droid_profile_free);
++
++            data = PA_DEVICE_PORT_DATA(dp);
++            data->device = p->device;
++        } else
++            pa_log_debug("  Port %s from cache", p->name);
++
++        /* If port/jack detection is available, start as not available by default */
++        dp->available = check_port_availability(p->name) ? PA_AVAILABLE_NO : PA_AVAILABLE_UNKNOWN;
++
++        if (cp)
++            pa_hashmap_put(dp->profiles, cp->name, cp);
++
++        count++;
++
++        if (extra) {
++            pa_hashmap_put(extra, dp->name, dp);
++            pa_device_port_ref(dp);
++        }
++    }
++
++    return count;
++}
++
++
++void pa_droid_add_ports(pa_hashmap *p, pa_droid_mapping *am, pa_card *card) {
++    pa_assert(p);
++
++    add_ports(card->core, NULL, card->ports, am, p);
++}
++
++void pa_droid_add_card_ports(pa_card_profile *cp, pa_hashmap *ports, pa_droid_mapping *am, pa_core *core) {
++    pa_assert(cp);
++    pa_assert(am);
++    pa_assert(core);
++
++    add_ports(core, cp, ports, am, NULL);
++}
++
++static char *shared_name_get(const char *module_id) {
++    pa_assert(module_id);
++    return pa_sprintf_malloc("droid-hardware-module-%s", module_id);
++}
++
++static pa_droid_hw_module *droid_hw_module_open(pa_core *core, pa_droid_config_audio *config, const char *module_id) {
++    const pa_droid_config_hw_module *module;
++    pa_droid_hw_module *hw = NULL;
++    struct hw_module_t *hwmod = NULL;
++    audio_hw_device_t *device = NULL;
++    int ret;
++
++    pa_assert(core);
++    pa_assert(module_id);
++
++    if (!config) {
++        pa_log("No configuration provided for opening module with id %s", module_id);
++        goto fail;
++    }
++
++    if (!(module = pa_droid_config_find_module(config, module_id))) {
++        pa_log("Couldn't find module with id %s", module_id);
++        goto fail;
++    }
++
++    hw_get_module_by_class(AUDIO_HARDWARE_MODULE_ID, module->name, (const hw_module_t**) &hwmod);
++    if (!hwmod) {
++        pa_log("Failed to get hw module id: %s name: %s, trying alternative.", AUDIO_HARDWARE_MODULE_ID, module->name);
++        hw_get_module_by_class(AUDIO_HARDWARE_MODULE_ID2, module->name, (const hw_module_t**) &hwmod);
++        if (!hwmod) {
++            pa_log("Failed to get hw module id: %s name: %s.", AUDIO_HARDWARE_MODULE_ID2, module->name);
++            goto fail;
++        }
++    }
++
++    pa_log_info("Loaded hw module %s", module->name);
++
++    ret = audio_hw_device_open(hwmod, &device);
++    if (!device) {
++        pa_log("Failed to open device (errno %d).", ret);
++        goto fail;
++    }
++
++    if ((ret = device->init_check(device)) != 0) {
++        pa_log("Failed init_check() (errno %d)", ret);
++        goto fail;
++    }
++
++    hw = pa_xnew0(pa_droid_hw_module, 1);
++    PA_REFCNT_INIT(hw);
++    hw->core = core;
++    hw->hwmod = hwmod;
++    hw->hw_mutex = pa_mutex_new(true, false);
++    hw->device = device;
++    hw->config = config; /* We take ownership of config struct. */
++    hw->enabled_module = pa_droid_config_find_module(hw->config, module_id);
++    hw->module_id = hw->enabled_module->name;
++    hw->shared_name = shared_name_get(hw->module_id);
++
++    pa_assert_se(pa_shared_set(core, hw->shared_name, hw) >= 0);
++
++    return hw;
++
++fail:
++    if (device)
++        audio_hw_device_close(device);
++
++    if (hw)
++        pa_xfree(hw);
++
++    return NULL;
++}
++
++pa_droid_hw_module *pa_droid_hw_module_get(pa_core *core, pa_droid_config_audio *config, const char *module_id) {
++    pa_droid_hw_module *hw;
++    char *shared_name;
++
++    pa_assert(core);
++    pa_assert(module_id);
++
++    shared_name = shared_name_get(module_id);
++    if ((hw = pa_shared_get(core, shared_name)))
++        hw = pa_droid_hw_module_ref(hw);
++    else
++        hw = droid_hw_module_open(core, config, module_id);
++
++    pa_xfree(shared_name);
++    return hw;
++}
++
++pa_droid_hw_module *pa_droid_hw_module_ref(pa_droid_hw_module *hw) {
++    pa_assert(hw);
++    pa_assert(PA_REFCNT_VALUE(hw) >= 1);
++
++    PA_REFCNT_INC(hw);
++    return hw;
++}
++
++static void droid_hw_module_close(pa_droid_hw_module *hw) {
++    pa_assert(hw);
++
++    pa_log_info("Closing hw module %s", hw->enabled_module->name);
++
++    if (hw->config)
++        pa_xfree(hw->config);
++
++    if (hw->device)
++        audio_hw_device_close(hw->device);
++
++    if (hw->hw_mutex)
++        pa_mutex_free(hw->hw_mutex);
++
++    if (hw->shared_name)
++        pa_xfree(hw->shared_name);
++
++    pa_xfree(hw);
++}
++
++void pa_droid_hw_module_unref(pa_droid_hw_module *hw) {
++
++    pa_assert(hw);
++    pa_assert(PA_REFCNT_VALUE(hw) >= 1);
++
++    if (PA_REFCNT_DEC(hw) > 0)
++        return;
++
++    pa_assert_se(pa_shared_remove(hw->core, hw->shared_name) >= 0);
++    droid_hw_module_close(hw);
++}
++
++pa_droid_config_audio *pa_droid_config_load(pa_modargs *ma) {
++    pa_droid_config_audio *config;
++    const char *config_location;
++
++    pa_assert(ma);
++
++    config = pa_xnew0(pa_droid_config_audio, 1);
++
++    if ((config_location = pa_modargs_get_value(ma, "config", NULL))) {
++        if (!pa_parse_droid_audio_config(config_location, config)) {
++            pa_log("Failed to parse configuration from %s", config_location);
++            goto fail;
++        }
++    } else {
++        config_location = AUDIO_POLICY_VENDOR_CONFIG_FILE;
++
++        if (!pa_parse_droid_audio_config(config_location, config)) {
++            pa_log_debug("Failed to parse configuration from vendor %s", config_location);
++
++            config_location = AUDIO_POLICY_CONFIG_FILE;
++
++            if (!pa_parse_droid_audio_config(config_location, config)) {
++                pa_log("Failed to parse configuration from %s", config_location);
++                goto fail;
++            }
++        }
++    }
++
++    return config;
++
++fail:
++    pa_xfree(config);
++    return NULL;
++}
++
++void pa_droid_hw_module_lock(pa_droid_hw_module *hw) {
++    pa_assert(hw);
++
++    pa_mutex_lock(hw->hw_mutex);
++}
++
++bool pa_droid_hw_module_try_lock(pa_droid_hw_module *hw) {
++    pa_assert(hw);
++
++    return pa_mutex_try_lock(hw->hw_mutex);
++}
++
++void pa_droid_hw_module_unlock(pa_droid_hw_module *hw) {
++    pa_assert(hw);
++
++    pa_mutex_unlock(hw->hw_mutex);
++}
+Index: pulseaudio/src/modules/droid/droid-util.h
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/droid-util.h
+@@ -0,0 +1,256 @@
++#ifndef foodroidutilfoo
++#define foodroidutilfoo
++
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++#include <pulsecore/core-util.h>
++#include <pulsecore/macro.h>
++#include <pulsecore/mutex.h>
++#include <pulsecore/modargs.h>
++
++#include <hardware/audio.h>
++#include <hardware_legacy/audio_policy_conf.h>
++
++#define PROP_DROID_DEVICES    "droid.devices"
++#define PROP_DROID_FLAGS      "droid.flags"
++#define PROP_DROID_HW_MODULE  "droid.hw_module"
++
++/* Alternative module ID */
++#define AUDIO_HARDWARE_MODULE_ID2 "libaudio"
++
++/* From module-device-restore */
++#define MODULE_DEVICE_RESTORE_SKIP_PROPERTY "module-device-restore.skip"
++
++typedef struct pa_droid_hw_module pa_droid_hw_module;
++typedef struct pa_droid_card_data pa_droid_card_data;
++typedef void (*common_set_parameters_cb_t)(pa_droid_card_data *card_data, const char *str);
++
++typedef struct pa_droid_config_audio pa_droid_config_audio;
++typedef struct pa_droid_config_hw_module pa_droid_config_hw_module;
++
++struct pa_droid_hw_module {
++    PA_REFCNT_DECLARE;
++
++    pa_core *core;
++    char *shared_name;
++
++    pa_droid_config_audio *config;
++    const pa_droid_config_hw_module *enabled_module;
++    pa_mutex *hw_mutex;
++
++    struct hw_module_t *hwmod;
++    audio_hw_device_t *device;
++
++    const char *module_id;
++
++    uint32_t stream_out_id;
++    uint32_t stream_in_id;
++
++};
++
++struct pa_droid_card_data {
++    void *userdata;
++    /* General functions */
++    char *module_id;
++    common_set_parameters_cb_t set_parameters;
++};
++
++#define AUDIO_MAX_SAMPLING_RATES (32)
++#define AUDIO_MAX_HW_MODULES (8)
++#define AUDIO_MAX_INPUTS (8)
++#define AUDIO_MAX_OUTPUTS (8)
++
++typedef struct pa_droid_config_global {
++    audio_devices_t attached_output_devices;
++    audio_devices_t default_output_device;
++    audio_devices_t attached_input_devices;
++} pa_droid_config_global;
++
++typedef struct pa_droid_config_output {
++    const pa_droid_config_hw_module *module;
++
++    char name[AUDIO_HARDWARE_MODULE_ID_MAX_LEN];
++    uint32_t sampling_rates[AUDIO_MAX_SAMPLING_RATES];
++    audio_channel_mask_t channel_masks; /* 0 -> dynamic */
++    audio_format_t formats;
++    audio_devices_t devices;
++    audio_output_flags_t flags;
++} pa_droid_config_output;
++
++typedef struct pa_droid_config_input {
++    const pa_droid_config_hw_module *module;
++
++    char name[AUDIO_HARDWARE_MODULE_ID_MAX_LEN];
++    uint32_t sampling_rates[AUDIO_MAX_SAMPLING_RATES];
++    audio_channel_mask_t channel_masks; /* 0 -> dynamic */
++    audio_format_t formats;
++    audio_devices_t devices;
++} pa_droid_config_input;
++
++struct pa_droid_config_hw_module {
++    const pa_droid_config_audio *config;
++
++    char name[AUDIO_HARDWARE_MODULE_ID_MAX_LEN];
++    pa_droid_config_output outputs[AUDIO_MAX_OUTPUTS];
++    uint32_t outputs_size;
++    pa_droid_config_input inputs[AUDIO_MAX_INPUTS];
++    uint32_t inputs_size;
++};
++
++struct pa_droid_config_audio {
++    pa_droid_config_global global_config;
++    pa_droid_config_hw_module hw_modules[AUDIO_MAX_HW_MODULES];
++    uint32_t hw_modules_size;
++};
++
++
++/* Profiles */
++
++typedef struct pa_droid_profile_set pa_droid_profile_set;
++typedef struct pa_droid_mapping pa_droid_mapping;
++
++typedef struct pa_droid_port_data {
++    audio_devices_t device;
++} pa_droid_port_data;
++
++typedef struct pa_droid_port {
++    pa_droid_mapping *mapping;
++
++    audio_devices_t device;
++    char *name;
++    char *description;
++    unsigned priority;
++} pa_droid_port;
++
++struct pa_droid_mapping {
++    pa_droid_profile_set *profile_set;
++
++    const pa_droid_config_output *output;
++    const pa_droid_config_input *input;
++
++    char *name;
++    char *description;
++    unsigned priority;
++    pa_proplist *proplist;
++
++    /* Mapping doesn't own the ports */
++    pa_idxset *ports;
++
++    pa_direction_t direction;
++
++    pa_sink *sink;
++    pa_source *source;
++};
++
++typedef struct pa_droid_profile {
++    pa_droid_profile_set *profile_set;
++
++    const pa_droid_config_hw_module *module;
++
++    char *name;
++    char *description;
++    unsigned priority;
++
++    /* Profile doesn't own the mappings */
++    pa_droid_mapping *output;
++    pa_droid_mapping *input;
++
++} pa_droid_profile;
++
++struct pa_droid_profile_set {
++    const pa_droid_config_audio *config;
++
++    pa_hashmap *all_ports;
++    pa_hashmap *output_mappings;
++    pa_hashmap *input_mappings;
++    pa_hashmap *profiles;
++};
++
++#define PA_DROID_OUTPUT_PARKING "output-parking"
++#define PA_DROID_INPUT_PARKING "input-parking"
++
++/* Open hardware module */
++/* 'config' can be NULL if it is assumed that hw module with module_id already is open. */
++/* if opening of hw_module succeeds, config ownership is transferred to hw_module and config
++ * shouldn't be freed. */
++pa_droid_hw_module *pa_droid_hw_module_get(pa_core *core, pa_droid_config_audio *config, const char *module_id);
++pa_droid_hw_module *pa_droid_hw_module_ref(pa_droid_hw_module *hw);
++void pa_droid_hw_module_unref(pa_droid_hw_module *hw);
++
++void pa_droid_hw_module_lock(pa_droid_hw_module *hw);
++bool pa_droid_hw_module_try_lock(pa_droid_hw_module *hw);
++void pa_droid_hw_module_unlock(pa_droid_hw_module *hw);
++
++/* Conversion helpers */
++typedef enum {
++    CONV_FROM_PA,
++    CONV_FROM_HAL
++} pa_conversion_field_t;
++
++bool pa_convert_output_channel(uint32_t value, pa_conversion_field_t from, uint32_t *to_value);
++bool pa_convert_input_channel(uint32_t value, pa_conversion_field_t from, uint32_t *to_value);
++bool pa_convert_format(uint32_t value, pa_conversion_field_t from, uint32_t *to_value);
++
++bool pa_string_convert_output_device_num_to_str(audio_devices_t value, const char **to_str);
++bool pa_string_convert_output_device_str_to_num(const char *str, audio_devices_t *to_value);
++bool pa_string_convert_input_device_num_to_str(audio_devices_t value, const char **to_str);
++bool pa_string_convert_input_device_str_to_num(const char *str, audio_devices_t *to_value);
++
++bool pa_string_convert_flag_num_to_str(audio_output_flags_t value, const char **to_str);
++bool pa_string_convert_flag_str_to_num(const char *str, audio_output_flags_t *to_value);
++
++char *pa_list_string_output_device(audio_devices_t devices);
++char *pa_list_string_input_device(audio_devices_t devices);
++char *pa_list_string_flags(audio_output_flags_t flags);
++
++/* Config parser */
++bool pa_parse_droid_audio_config(const char *filename, pa_droid_config_audio *config);
++pa_droid_config_audio *pa_droid_config_load(pa_modargs *ma);
++
++const pa_droid_config_output *pa_droid_config_find_output(const pa_droid_config_hw_module *module, const char *name);
++const pa_droid_config_input *pa_droid_config_find_input(const pa_droid_config_hw_module *module, const char *name);
++const pa_droid_config_hw_module *pa_droid_config_find_module(const pa_droid_config_audio *config, const char* module_id);
++
++
++/* Profiles */
++pa_droid_profile_set *pa_droid_profile_set_new(const pa_droid_config_hw_module *module);
++void pa_droid_profile_set_free(pa_droid_profile_set *ps);
++
++pa_droid_profile *pa_droid_profile_new(pa_droid_profile_set *ps, const pa_droid_config_output *output, const pa_droid_config_input *input);
++void pa_droid_profile_free(pa_droid_profile *p);
++
++pa_droid_mapping *pa_droid_mapping_get(pa_droid_profile_set *ps, pa_direction_t direction, const void *data);
++void pa_droid_mapping_free(pa_droid_mapping *am);
++
++/* Add ports from sinks/sources */
++void pa_droid_add_ports(pa_hashmap *ports, pa_droid_mapping *am, pa_card *card);
++/* Add ports from card */
++void pa_droid_add_card_ports(pa_card_profile *cp, pa_hashmap *ports, pa_droid_mapping *am, pa_core *core);
++
++/* Pretty port names */
++bool pa_droid_output_port_name(audio_devices_t value, const char **to_str);
++bool pa_droid_input_port_name(audio_devices_t value, const char **to_str);
++
++#endif
+Index: pulseaudio/src/modules/droid/module-droid-card.c
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/module-droid-card.c
+@@ -0,0 +1,636 @@
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <signal.h>
++#include <stdio.h>
++
++#ifdef HAVE_VALGRIND_MEMCHECK_H
++#include <valgrind/memcheck.h>
++#endif
++
++#include <pulse/rtclock.h>
++#include <pulse/timeval.h>
++#include <pulse/volume.h>
++#include <pulse/xmalloc.h>
++
++#include <pulsecore/core.h>
++#include <pulsecore/i18n.h>
++#include <pulsecore/module.h>
++#include <pulsecore/memchunk.h>
++#include <pulsecore/sink.h>
++#include <pulsecore/source.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/core-rtclock.h>
++#include <pulsecore/core-util.h>
++#include <pulsecore/sample-util.h>
++#include <pulsecore/log.h>
++#include <pulsecore/macro.h>
++#include <pulsecore/thread.h>
++#include <pulsecore/thread-mq.h>
++#include <pulsecore/rtpoll.h>
++#include <pulsecore/time-smoother.h>
++#include <pulsecore/card.h>
++#include <pulsecore/device-port.h>
++#include <pulsecore/idxset.h>
++
++#include <hardware/audio.h>
++#include <system/audio.h>
++
++//#include <droid/hardware/audio_policy.h>
++//#include <droid/system/audio_policy.h>
++
++#include "droid-util.h"
++#include "droid-sink.h"
++#include "droid-source.h"
++#ifdef HAVE_UDEV
++#include "droid-extcon.h"
++#endif
++
++#include "module-droid-card-symdef.h"
++
++PA_MODULE_AUTHOR("Juho H?m?l?inen");
++PA_MODULE_DESCRIPTION("Droid card");
++PA_MODULE_VERSION(PACKAGE_VERSION);
++PA_MODULE_USAGE(
++        "card_name=<name for the card> "
++        "sink_name=<name for the sink> "
++        "source_name=<name for the source> "
++        "namereg_fail=<when false attempt to synthesise new names if they are already taken> "
++        "rate=<sample rate> "
++        "output_flags=<flags for sink> "
++        "module_id=<which droid hw module to load, default primary> "
++        "voice_source_routing=<route source ports during voice call, default false> "
++        "deferred_volume=<synchronize software and hardware volume changes to avoid momentary jumps?> "
++        "config=<location for droid audio configuration> "
++        "voice_volume_call_mode=<sink volume controls voice volume during call mode, default false> "
++        "voice_property_key=<proplist key searched for sink-input that should control voice call volume> "
++        "voice_property_value=<proplist value for the key for voice control sink-input> "
++        "voice_virtual_stream=<true/false> create virtual stream for voice call volume control (default false)"
++);
++
++static const char* const valid_modargs[] = {
++    "card_name",
++    "sink_name",
++    "source_name",
++    "namereg_fail",
++    "format",
++    "rate",
++    "output_flags",
++    "module_id",
++    "voice_source_routing",
++    "sink_buffer",
++    "source_buffer",
++    "deferred_volume",
++    "mute_routing_before",
++    "mute_routing_after",
++    "config",
++    "voice_volume_call_mode",
++    "voice_property_key",
++    "voice_property_value",
++    "voice_virtual_stream",
++    NULL,
++};
++
++#define DEFAULT_MODULE_ID "primary"
++#define DEFAULT_AUDIO_POLICY_CONF "/system/etc/audio_policy.conf"
++#define VOICE_CALL_PROFILE_NAME     "voicecall"
++#define VOICE_CALL_PROFILE_DESC     "Call mode"
++#define RINGTONE_PROFILE_NAME       "ringtone"
++#define RINGTONE_PROFILE_DESC       "Ringtone mode"
++#define COMMUNICATION_PROFILE_NAME  "communication"
++#define COMMUNICATION_PROFILE_DESC  "Communication mode"
++
++struct virtual_profile {
++    pa_droid_profile *profile;
++    audio_mode_t mode;
++};
++
++struct userdata {
++    pa_core *core;
++    pa_module *module;
++
++    pa_thread *thread;
++    pa_thread_mq thread_mq;
++    pa_rtpoll *rtpoll;
++
++    pa_droid_profile_set *profile_set;
++
++    pa_droid_hw_module *hw_module;
++    pa_droid_card_data card_data;
++
++    struct virtual_profile call_profile;
++    struct virtual_profile comm_profile;
++    struct virtual_profile ring_profile;
++    pa_droid_profile *old_profile;
++
++#ifdef HAVE_UDEV
++    pa_droid_extcon *extcon;
++#endif
++
++    bool voice_source_routing;
++
++    pa_modargs *modargs;
++    pa_card *card;
++};
++
++struct profile_data {
++    pa_droid_profile *profile;
++};
++
++static void add_disabled_profile(pa_hashmap *profiles) {
++    pa_card_profile *cp;
++    struct profile_data *d;
++
++    cp = pa_card_profile_new("off", _("Off"), sizeof(struct profile_data));
++
++    d = PA_CARD_PROFILE_DATA(cp);
++    d->profile = NULL;
++
++    pa_hashmap_put(profiles, cp->name, cp);
++}
++
++/* Special profile for calls */
++static pa_droid_profile* add_virtual_profile(struct userdata *u, const char *name, const char *description, pa_hashmap *profiles) {
++    pa_droid_profile *ap;
++    pa_card_profile *cp;
++    struct profile_data *d;
++
++    pa_assert(u);
++    pa_assert(u->profile_set);
++
++    pa_log_debug("New virtual profile: %s", name);
++
++    ap = pa_xnew0(pa_droid_profile, 1);
++    ap->profile_set = u->profile_set;
++    ap->name = pa_xstrdup(name);
++    ap->description = pa_xstrdup(description);
++    ap->priority = 50;
++
++    pa_hashmap_put(u->profile_set->profiles, ap->name, ap);
++
++    cp = pa_card_profile_new(ap->name, ap->description, sizeof(struct profile_data));
++    d = PA_CARD_PROFILE_DATA(cp);
++    d->profile = ap;
++
++    pa_hashmap_put(profiles, cp->name, cp);
++
++    return ap;
++}
++
++static void set_parameters_cb(pa_droid_card_data *card_data, const char *str) {
++    struct userdata *u;
++
++    pa_assert(card_data);
++    pa_assert(str);
++
++    u = card_data->userdata;
++
++    if (u) {
++        pa_log_debug("Setting parameters: %s", str);
++        pa_droid_hw_module_lock(u->hw_module);
++        u->hw_module->device->set_parameters(u->hw_module->device, str);
++        pa_droid_hw_module_unlock(u->hw_module);
++    }
++}
++
++static void set_card_name(pa_modargs *ma, pa_card_new_data *data, const char *module_id) {
++    const char *tmp;
++    char *name;
++
++    pa_assert(ma);
++    pa_assert(data);
++    pa_assert(module_id);
++
++    if ((tmp = pa_modargs_get_value(ma, "card_name", NULL))) {
++        pa_card_new_data_set_name(data, tmp);
++        data->namereg_fail = true;
++        return;
++    }
++
++    name = pa_sprintf_malloc("droid_card.%s", module_id);
++    pa_card_new_data_set_name(data, name);
++    pa_xfree(name);
++    data->namereg_fail = false;
++}
++
++static void add_profile(struct userdata *u, pa_hashmap *h, pa_hashmap *ports, pa_droid_profile *ap) {
++    pa_card_profile *cp;
++    struct profile_data *d;
++
++    pa_assert(u);
++    pa_assert(h);
++    pa_assert(ports);
++    pa_assert(ap);
++
++    pa_log_debug("Card profile %s", ap->name);
++
++    cp = pa_card_profile_new(ap->name, ap->description, sizeof(struct profile_data));
++    cp->priority = ap->priority;
++
++    cp->n_sinks = 1;
++    pa_droid_add_card_ports(cp, ports, ap->output, u->core);
++    cp->max_sink_channels = popcount(ap->output->output->channel_masks);
++    if (ap->input) {
++        pa_droid_add_card_ports(cp, ports, ap->input, u->core);
++        cp->n_sources = 1;
++        cp->max_source_channels = popcount(ap->input->input->channel_masks);
++    }
++
++    d = PA_CARD_PROFILE_DATA(cp);
++    d->profile = ap;
++
++    pa_hashmap_put(h, cp->name, cp);
++}
++
++static void add_profiles(struct userdata *u, pa_hashmap *h, pa_hashmap *ports) {
++    void *state;
++    pa_droid_profile *ap;
++
++    pa_assert(u);
++    pa_assert(h);
++    pa_assert(ports);
++
++    PA_HASHMAP_FOREACH(ap, u->profile_set->profiles, state) {
++        add_profile(u, h, ports, ap);
++    }
++}
++
++static void init_profile(struct userdata *u) {
++    pa_droid_mapping *am;
++    struct profile_data *d;
++
++    pa_assert(u);
++
++    pa_log_debug("Init profile.");
++
++    d = PA_CARD_PROFILE_DATA(u->card->active_profile);
++
++    if (d->profile && d->profile->output) {
++        am = d->profile->output;
++        am->sink = pa_droid_sink_new(u->module, u->modargs, __FILE__, &u->card_data, 0, am, u->card);
++    }
++
++    if (d->profile && d->profile->input) {
++        am = d->profile->input;
++        am->source = pa_droid_source_new(u->module, u->modargs, __FILE__, &u->card_data, am, u->card);
++    }
++}
++
++static int set_mode(struct userdata *u, audio_mode_t mode) {
++    int ret;
++    const char *mode_str;
++
++    pa_assert(u);
++    pa_assert(u->hw_module);
++    pa_assert(u->hw_module->device);
++
++    switch (mode) {
++        case AUDIO_MODE_RINGTONE:
++            mode_str = "AUDIO_MODE_RINGTONE";
++            break;
++        case AUDIO_MODE_IN_CALL:
++            mode_str = "AUDIO_MODE_IN_CALL";
++            break;
++        case AUDIO_MODE_IN_COMMUNICATION:
++            mode_str = "AUDIO_MODE_IN_COMMUNICATION";
++            break;
++        default:
++            mode_str = "AUDIO_MODE_NORMAL";
++            break;
++    }
++
++    pa_log_debug("Set mode to %s.", mode_str);
++
++    pa_droid_hw_module_lock(u->hw_module);
++    if ((ret = u->hw_module->device->set_mode(u->hw_module->device, mode)) < 0)
++        pa_log("Failed to set mode.");
++    pa_droid_hw_module_unlock(u->hw_module);
++
++    return ret;
++}
++
++static void park_profile(pa_droid_profile *dp) {
++    pa_assert(dp);
++
++    if (dp->output && dp->output->sink)
++        pa_sink_set_port(dp->output->sink, PA_DROID_OUTPUT_PARKING, false);
++    if (dp->input && dp->input->source)
++        pa_source_set_port(dp->input->source, PA_DROID_INPUT_PARKING, false);
++}
++
++static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
++    struct userdata *u;
++    pa_droid_mapping *am;
++    struct virtual_profile *new_vp = NULL;
++    struct virtual_profile *old_vp = NULL;
++    struct profile_data *nd, *od;
++    pa_queue *sink_inputs = NULL, *source_outputs = NULL;
++
++    pa_assert(c);
++    pa_assert(new_profile);
++    pa_assert_se(u = c->userdata);
++
++    nd = PA_CARD_PROFILE_DATA(new_profile);
++    od = PA_CARD_PROFILE_DATA(c->active_profile);
++
++    if (nd->profile == u->call_profile.profile)
++        new_vp = &u->call_profile;
++    if (nd->profile == u->ring_profile.profile)
++        new_vp = &u->ring_profile;
++    if (nd->profile == u->comm_profile.profile)
++        new_vp = &u->comm_profile;
++
++    if (new_vp) {
++        pa_log_debug("Setting new virtual profile.");
++        if (u->old_profile == NULL)
++            u->old_profile = od->profile;
++
++        park_profile(od->profile);
++
++        set_mode(u, new_vp->mode);
++
++        /* call mode specialities */
++        if (new_vp->profile == u->call_profile.profile) {
++            pa_droid_sink_set_voice_control(u->old_profile->output->sink, true);
++            if (!u->voice_source_routing)
++                pa_droid_source_set_routing(u->old_profile->input->source, false);
++        }
++        return 0;
++    }
++
++    if (od->profile == u->call_profile.profile)
++        old_vp = &u->call_profile;
++    if (od->profile == u->ring_profile.profile)
++        old_vp = &u->ring_profile;
++    if (od->profile == u->comm_profile.profile)
++        old_vp = &u->comm_profile;
++
++    if (old_vp) {
++        pa_assert(u->old_profile);
++
++        park_profile(nd->profile);
++
++        set_mode(u, AUDIO_MODE_NORMAL);
++
++        /* call mode specialities */
++        if (old_vp->profile == u->call_profile.profile) {
++            pa_droid_sink_set_voice_control(u->old_profile->output->sink, false);
++            if (!u->voice_source_routing)
++                pa_droid_source_set_routing(u->old_profile->input->source, true);
++        }
++
++        /* If new profile is the same as from which we switched to
++         * call profile, transfer ownership back to that profile.
++         * Otherwise destroy sinks & sources and switch to new profile. */
++        if (nd->profile == u->old_profile) {
++            u->old_profile = NULL;
++            return 0;
++        } else {
++            od->profile = u->old_profile;
++            u->old_profile = NULL;
++
++            /* Continue to sink-input transfer below */
++        }
++    }
++
++    /* If there are connected sink inputs/source outputs in old profile's sinks/sources move
++     * them all to new sinks/sources. */
++
++    if (od->profile && od->profile->output) {
++        do {
++            am = od->profile->output;
++
++            if (!am->sink)
++                continue;
++
++            if (nd->profile && nd->profile->output && am == nd->profile->output)
++                continue;
++
++            sink_inputs = pa_sink_move_all_start(am->sink, sink_inputs);
++            pa_droid_sink_free(am->sink);
++            am->sink = NULL;
++        } while(0);
++    }
++
++    if (od->profile && od->profile->input) {
++        do {
++            am = od->profile->input;
++
++            if (!am->source)
++                continue;
++
++            if (nd->profile && nd->profile->input && am == nd->profile->input)
++                continue;
++
++            source_outputs = pa_source_move_all_start(am->source, source_outputs);
++            pa_droid_source_free(am->source);
++            am->source = NULL;
++        } while(0);
++    }
++
++    if (nd->profile && nd->profile->output) {
++        am = nd->profile->output;
++
++        if (!am->sink)
++            am->sink = pa_droid_sink_new(u->module, u->modargs, __FILE__, &u->card_data, 0, am, u->card);
++
++        if (sink_inputs && am->sink) {
++            pa_sink_move_all_finish(am->sink, sink_inputs, false);
++            sink_inputs = NULL;
++        }
++    }
++
++    if (nd->profile && nd->profile->input) {
++        am = nd->profile->input;
++
++        if (!am->source)
++            am->source = pa_droid_source_new(u->module, u->modargs, __FILE__, &u->card_data, am, u->card);
++
++        if (source_outputs && am->source) {
++            pa_source_move_all_finish(am->source, source_outputs, false);
++            source_outputs = NULL;
++        }
++    }
++
++    if (sink_inputs)
++        pa_sink_move_all_fail(sink_inputs);
++
++    if (source_outputs)
++        pa_source_move_all_fail(source_outputs);
++
++    return 0;
++}
++
++
++int pa__init(pa_module *m) {
++    pa_modargs *ma = NULL;
++    pa_card_new_data data;
++    pa_droid_config_audio *config = NULL;
++    const char *module_id;
++    bool namereg_fail = false;
++    bool voice_source_routing = false;
++
++    pa_assert(m);
++
++    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
++        pa_log("Failed to parse module argumets.");
++        goto fail;
++    }
++
++    struct userdata *u = pa_xnew0(struct userdata, 1);
++    u->core = m->core;
++
++    if (!(config = pa_droid_config_load(ma)))
++        goto fail;
++
++    if (pa_modargs_get_value_boolean(ma, "voice_source_routing", &voice_source_routing) < 0) {
++        pa_log("Failed to parse voice_source_routing argument.");
++        goto fail;
++    }
++    u->voice_source_routing = voice_source_routing;
++
++    module_id = pa_modargs_get_value(ma, "module_id", DEFAULT_MODULE_ID);
++
++    /* Ownership of config transfers to hw_module if opening of hw module succeeds. */
++    if (!(u->hw_module = pa_droid_hw_module_get(u->core, config, module_id)))
++        goto fail;
++
++    u->card_data.set_parameters = set_parameters_cb;
++    u->card_data.module_id = pa_xstrdup(module_id);
++    u->card_data.userdata = u;
++
++    u->profile_set = pa_droid_profile_set_new(u->hw_module->enabled_module);
++
++    pa_card_new_data_init(&data);
++    data.driver = __FILE__;
++    data.module = m;
++
++    set_card_name(ma, &data, u->hw_module->module_id);
++
++    /* We need to give pa_modargs_get_value_boolean() a pointer to a local
++     * variable instead of using &data.namereg_fail directly, because
++     * data.namereg_fail is a bitfield and taking the address of a bitfield
++     * variable is impossible. */
++    namereg_fail = data.namereg_fail;
++    if (pa_modargs_get_value_boolean(ma, "namereg_fail", &namereg_fail) < 0) {
++        pa_log("Failed to parse namereg_fail argument.");
++        pa_card_new_data_done(&data);
++        goto fail;
++    }
++    data.namereg_fail = namereg_fail;
++
++    add_profiles(u, data.profiles, data.ports);
++
++    if (pa_hashmap_isempty(data.profiles)) {
++        pa_log("Failed to find a working profile.");
++        pa_card_new_data_done(&data);
++        goto fail;
++    }
++
++    u->call_profile.profile = add_virtual_profile(u, VOICE_CALL_PROFILE_NAME,
++                                                  VOICE_CALL_PROFILE_DESC, data.profiles);
++    u->call_profile.mode = AUDIO_MODE_IN_CALL;
++    u->comm_profile.profile = add_virtual_profile(u, COMMUNICATION_PROFILE_NAME,
++                                                  COMMUNICATION_PROFILE_DESC, data.profiles);
++    u->comm_profile.mode = AUDIO_MODE_IN_COMMUNICATION;
++    u->ring_profile.profile = add_virtual_profile(u, RINGTONE_PROFILE_NAME,
++                                                  RINGTONE_PROFILE_DESC, data.profiles);
++    u->ring_profile.mode = AUDIO_MODE_RINGTONE;
++
++    add_disabled_profile(data.profiles);
++
++    pa_proplist_sets(data.proplist, PROP_DROID_HW_MODULE, u->hw_module->module_id);
++
++    u->card = pa_card_new(m->core, &data);
++    pa_card_new_data_done(&data);
++
++    if (!u->card) {
++        pa_log("Couldn't create card.");
++        goto fail;
++    }
++
++    u->card->userdata = u;
++    u->card->set_profile = card_set_profile;
++
++    u->modargs = ma;
++    u->module = m;
++
++    m->userdata = u;
++
++    init_profile(u);
++
++#ifdef HAVE_UDEV
++    u->extcon = pa_droid_extcon_new(m->core, u->card);
++#endif
++
++    return 0;
++
++fail:
++    if (ma)
++        pa_modargs_free(ma);
++
++    pa_xfree(config);
++
++    pa__done(m);
++
++    return -1;
++}
++
++void pa__done(pa_module *m) {
++    struct userdata *u;
++
++    pa_assert(m);
++
++    if ((u = m->userdata)) {
++
++        if (u->card && u->card->sinks)
++            pa_idxset_remove_all(u->card->sinks, (pa_free_cb_t) pa_droid_sink_free);
++
++        if (u->card && u->card->sources)
++            pa_idxset_remove_all(u->card->sources, (pa_free_cb_t) pa_droid_source_free);
++
++#ifdef HAVE_UDEV
++        if (u->extcon)
++            pa_droid_extcon_free(u->extcon);
++#endif
++
++        if (u->card)
++            pa_card_free(u->card);
++
++        if (u->modargs)
++            pa_modargs_free(u->modargs);
++
++        if (u->profile_set)
++            pa_droid_profile_set_free(u->profile_set);
++
++        if (u->card_data.module_id)
++            pa_xfree(u->card_data.module_id);
++
++        if (u->hw_module)
++            pa_droid_hw_module_unref(u->hw_module);
++
++        pa_xfree(u);
++    }
++}
+Index: pulseaudio/src/modules/droid/module-droid-sink.c
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/module-droid-sink.c
+@@ -0,0 +1,103 @@
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_VALGRIND_MEMCHECK_H
++#include <valgrind/memcheck.h>
++#endif
++
++#include <pulse/xmalloc.h>
++
++#include <pulsecore/core.h>
++#include <pulsecore/i18n.h>
++#include <pulsecore/module.h>
++#include <pulsecore/sink.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/log.h>
++#include <pulsecore/macro.h>
++
++#include "droid-util.h"
++#include "droid-sink.h"
++
++#include "module-droid-sink-symdef.h"
++
++PA_MODULE_AUTHOR("Juho H?m?l?inen");
++PA_MODULE_DESCRIPTION("Droid sink");
++PA_MODULE_USAGE("master_sink=<sink to connect to> "
++                "sink_name=<name of created sink> "
++                "sco_fake_sink=<name of the fake sco sink used for hsp>");
++PA_MODULE_VERSION(PACKAGE_VERSION);
++
++static const char* const valid_modargs[] = {
++    "rate",
++    "flags",
++    "devices",
++    "sink_name",
++    "module_id",
++    "mute_routing_before",
++    "mute_routing_after",
++    "sink_buffer",
++    "deferred_volume",
++    "voice_volume_call_mode",
++    "voice_property_key",
++    "voice_property_value",
++    "voice_virtual_stream",
++    "sco_fake_sink",
++    NULL,
++};
++
++void pa__done(pa_module *m) {
++    pa_sink *sink;
++
++    pa_assert(m);
++
++    if ((sink = m->userdata))
++        pa_droid_sink_free(sink);
++}
++
++int pa__init(pa_module *m) {
++    pa_modargs *ma = NULL;
++
++    pa_assert(m);
++
++    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
++        pa_log("Failed to parse module argumets.");
++        goto fail;
++    }
++
++    if (!(m->userdata = pa_droid_sink_new(m, ma, __FILE__, NULL, 0, NULL, NULL)))
++        goto fail;
++
++    pa_modargs_free(ma);
++
++    return 0;
++
++fail:
++    if (ma)
++        pa_modargs_free(ma);
++
++    pa__done(m);
++
++    return -1;
++}
+Index: pulseaudio/src/modules/droid/module-droid-source.c
+===================================================================
+--- /dev/null
++++ pulseaudio/src/modules/droid/module-droid-source.c
+@@ -0,0 +1,95 @@
++/*
++ * Copyright (C) 2013 Jolla Ltd.
++ *
++ * Contact: Juho H?m?l?inen <juho.hamalainen at tieto.com>
++ *
++ * These PulseAudio Modules are free software; you can redistribute
++ * it and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation
++ * version 2.1 of the License.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ * USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_VALGRIND_MEMCHECK_H
++#include <valgrind/memcheck.h>
++#endif
++
++#include <pulse/xmalloc.h>
++
++#include <pulsecore/core.h>
++#include <pulsecore/i18n.h>
++#include <pulsecore/module.h>
++#include <pulsecore/source.h>
++#include <pulsecore/modargs.h>
++#include <pulsecore/log.h>
++#include <pulsecore/macro.h>
++
++#include "droid-util.h"
++#include "droid-source.h"
++
++#include "module-droid-source-symdef.h"
++
++PA_MODULE_AUTHOR("Juho H?m?l?inen");
++PA_MODULE_DESCRIPTION("Droid source");
++PA_MODULE_USAGE("master_source=<source to connect to> "
++                "source_name=<name of created source>");
++PA_MODULE_VERSION(PACKAGE_VERSION);
++
++static const char* const valid_modargs[] = {
++    "rate",
++    "flags",
++    "devices",
++    "source_name",
++    "module_id",
++    "source_buffer",
++    "deferred_volume",
++    NULL,
++};
++
++void pa__done(pa_module *m) {
++    pa_source *source;
++
++    pa_assert(m);
++
++    if ((source = m->userdata))
++        pa_droid_source_free(source);
++}
++
++int pa__init(pa_module *m) {
++    pa_modargs *ma = NULL;
++
++    pa_assert(m);
++
++    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
++        pa_log("Failed to parse module argumets.");
++        goto fail;
++    }
++
++    if (!(m->userdata = pa_droid_source_new(m, ma, __FILE__, NULL, NULL, NULL)))
++        goto fail;
++
++    pa_modargs_free(ma);
++
++    return 0;
++
++fail:
++    if (ma)
++        pa_modargs_free(ma);
++
++    pa__done(m);
++
++    return -1;
++}
+Index: pulseaudio/po/POTFILES.in
+===================================================================
+--- pulseaudio.orig/po/POTFILES.in
++++ pulseaudio/po/POTFILES.in
+@@ -16,6 +16,7 @@ src/modules/alsa/module-alsa-sink.c
+ src/modules/alsa/module-alsa-source.c
+ src/modules/bluetooth/module-bluez4-device.c
+ src/modules/bluetooth/module-bluez5-device.c
++src/modules/droid/module-droid-card.c
+ src/modules/echo-cancel/module-echo-cancel.c
+ src/modules/gconf/gconf-helper.c
+ src/modules/gconf/module-gconf.c
diff --git a/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch b/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
new file mode 100644
index 0000000..7d21968
--- /dev/null
+++ b/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
@@ -0,0 +1,220 @@
+From: Ricardo Salveti de Araujo <rsalveti at rsalveti.net>
+Date: Thu, 17 Jul 2014 19:34:44 -0300
+Subject: [PATCH] module-bluez4-device: Allow leaving transport running
+ while sink and source are suspended.
+
+There are some cases where keeping the SCO transport running even when
+SCO sink and source are suspended is needed. This patch allows keeping
+the transport running when SCO sink has property
+bluetooth.hsp.prevent.suspend.transport set as true.
+
+Patch done by Juho Hamalainen <juho.hamalainen at tieto.com>
+
+Corner-case specific patch (pulse droid), not upstreamable.
+
+Signed-off-by: Ricardo Salveti de Araujo <rsalveti at rsalveti.net>
+---
+ src/modules/bluetooth/bluez4-util.c          | 23 +++++++
+ src/modules/bluetooth/module-bluez4-device.c | 85 ++++++++++++++++++++++++-
+ 2 files changed, 106 insertions(+), 2 deletions(-)
+
+Index: pulseaudio/src/modules/bluetooth/bluez4-util.c
+===================================================================
+--- pulseaudio.orig/src/modules/bluetooth/bluez4-util.c
++++ pulseaudio/src/modules/bluetooth/bluez4-util.c
+@@ -28,6 +28,7 @@
+ #include <pulsecore/core-util.h>
+ #include <pulsecore/shared.h>
+ #include <pulsecore/dbus-shared.h>
++#include <pulse/rtclock.h>
+ 
+ #include "bluez4-util.h"
+ #include "a2dp-codecs.h"
+@@ -61,6 +62,8 @@
+     " </interface>"                                                     \
+     "</node>"
+ 
++#define RACE_CONDITION_TIME 1000000  // 1 second
++
+ struct pa_bluez4_discovery {
+     PA_REFCNT_DECLARE;
+ 
+@@ -506,6 +509,9 @@ static int parse_audio_property(pa_bluez
+     DBusMessageIter variant_i;
+     bool is_audio_interface;
+     pa_bluez4_profile_t p = PA_BLUEZ4_PROFILE_OFF;
++    pa_usec_t tstamp_now;
++    static pa_usec_t tstamp_prev = 0;
++    DBusMessage *m;
+ 
+     pa_assert(d);
+     pa_assert(interface);
+@@ -537,6 +543,23 @@ static int parse_audio_property(pa_bluez
+                 pa_bluez4_transport_state_t old_state;
+ 
+                 pa_log_debug("Device %s interface %s property 'State' changed to value '%s'", d->path, interface, value);
++                /* Device may change state again (e.g. suspend itself) before previous state change
++                 * message has been parsed here. When this take place sink state in here and bluez
++                 * will be out-of-sync. This may generate endless transport acquire/release loop
++                 * which will be sustained by this module. When we notice this to be ongoing
++                 * message is ignored and current state is queried with GetProperties. */
++                if (pa_streq(interface, "org.bluez.AudioSink") && state == PA_BLUEZ4_AUDIO_STATE_CONNECTED) {
++                   tstamp_now = pa_rtclock_now();
++                   if (tstamp_prev != 0 && tstamp_now - tstamp_prev < RACE_CONDITION_TIME) {
++                       pa_log_debug("Race condition. Message ignored.");
++                       tstamp_prev = 0;
++                       pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.AudioSink", "GetProperties"));
++                       send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
++
++                       return 0;
++                   }
++                   tstamp_prev = tstamp_now;
++                }
+ 
+                 if (state == PA_BLUEZ4_AUDIO_STATE_INVALID)
+                     return -1;
+Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c
+===================================================================
+--- pulseaudio.orig/src/modules/bluetooth/module-bluez4-device.c
++++ pulseaudio/src/modules/bluetooth/module-bluez4-device.c
+@@ -189,6 +189,9 @@ struct userdata {
+     pa_modargs *modargs;
+ 
+     int stream_write_type;
++
++    pa_hook_slot *sco_sink_proplist_changed_slot;
++    bool prevent_suspend_transport;
+ };
+ 
+ enum {
+@@ -382,6 +385,67 @@ static int bt_transport_acquire(struct u
+     return 0;
+ }
+ 
++#define HSP_PREVENT_SUSPEND_STR "bluetooth.hsp.prevent.suspend.transport"
++
++/* Check and update prevent_suspend_transport value from sco sink proplist.
++ *
++ * Return < 0 if sink proplist doesn't contain HSP_PREVENT_SUSPEND_STR value,
++ * 1 if value is 'true'
++ * 0 if value is something else. */
++static int check_proplist(struct userdata *u) {
++    int ret;
++    const char *str;
++
++    pa_assert(u);
++    pa_assert(u->hsp.sco_sink);
++
++    if ((str = pa_proplist_gets(u->hsp.sco_sink->proplist, HSP_PREVENT_SUSPEND_STR))) {
++        if (pa_streq(str, "true"))
++            ret = 1;
++        else
++            ret = 0;
++    } else
++        ret = -1;
++
++    u->prevent_suspend_transport = ret == 1;
++
++    pa_log_debug("Set %s %s", HSP_PREVENT_SUSPEND_STR, u->prevent_suspend_transport ? "true" : "false");
++
++    return ret;
++}
++
++/* There are cases where keeping the transport running even when sco sink and source are suspended
++ * is needed.
++ * To work with these cases, check sco.sink for bluetooth.hsp.prevent.suspend.transport value, and
++ * when set to true prevent closing the transport when sink suspends.
++ * Also, if the sink&source are suspended when sco-sink suspend.transport value changes to true,
++ * bring sco transport up. When suspend.transport value changes to false while sink&source are suspended,
++ * tear down the transport. */
++static pa_hook_result_t update_allow_release_cb(pa_core *c, pa_sink *s, struct userdata *u) {
++    pa_assert(u);
++    pa_assert(s);
++
++    if (!u->hsp.sco_sink || u->hsp.sco_sink != s)
++        return PA_HOOK_OK;
++
++    if (check_proplist(u) < 0)
++        return PA_HOOK_OK;
++
++    if (!USE_SCO_OVER_PCM(u)) {
++        pa_log_debug("SCO sink not available.");
++        return PA_HOOK_OK;
++    }
++
++    if (!PA_SINK_IS_OPENED(pa_sink_get_state(u->hsp.sco_sink)) &&
++        !PA_SOURCE_IS_OPENED(pa_source_get_state(u->hsp.sco_source))) {
++
++        /* Clear all suspend bits, effectively resuming SCO sink for a while. */
++        pa_sink_suspend(s, false, PA_SUSPEND_ALL);
++    }
++
++    return PA_HOOK_OK;
++}
++
+ /* Run from IO thread */
+ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
+     struct userdata *u = PA_SINK(o)->userdata;
+@@ -1423,6 +1487,10 @@ static int sco_over_pcm_state_update(str
+         if (u->stream_fd < 0)
+             return 0;
+ 
++        if (check_proplist(u) == 1) {
++            pa_log_debug("Suspend prevention active, not closing SCO over PCM");
++            return 0;
++        }
+         pa_log_debug("Closing SCO over PCM");
+ 
+         bt_transport_release(u);
+@@ -1466,6 +1534,11 @@ static pa_hook_result_t transport_nrec_c
+     if (t != u->transport)
+         return PA_HOOK_OK;
+ 
++    if (!u->source) {
++        pa_log_warn("trying to change bluetooth source property, but source doesn't exist.");
++        return PA_HOOK_OK;
++    }
++
+     p = pa_proplist_new();
+     pa_proplist_sets(p, "bluetooth.nrec", t->nrec ? "1" : "0");
+     pa_source_update_proplist(u->source, PA_UPDATE_REPLACE, p);
+@@ -1828,7 +1901,7 @@ static int setup_transport(struct userda
+     pa_bluez4_transport *t;
+ 
+     pa_assert(u);
+-    pa_assert(!u->transport);
++    pa_assert(!u->transport_acquired);
+     pa_assert(u->profile != PA_BLUEZ4_PROFILE_OFF);
+ 
+     /* check if profile has a transport */
+@@ -1908,7 +1981,8 @@ static void stop_thread(struct userdata
+ 
+     if (u->transport) {
+         bt_transport_release(u);
+-        u->transport = NULL;
++        /* Do not set transport pointer to NULL. When failing to switch
++         * profile NULL u->transport would assert. */
+     }
+ 
+     if (u->sink) {
+@@ -2513,6 +2587,10 @@ int pa__init(pa_module *m) {
+         pa_hook_connect(pa_bluez4_discovery_hook(u->discovery, PA_BLUEZ4_HOOK_TRANSPORT_SPEAKER_GAIN_CHANGED),
+                         PA_HOOK_NORMAL, (pa_hook_cb_t) transport_speaker_gain_changed_cb, u);
+ 
++    u->sco_sink_proplist_changed_slot =
++        pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_SINK_PROPLIST_CHANGED],
++                        PA_HOOK_NORMAL, (pa_hook_cb_t) update_allow_release_cb, u);
++
+     /* Add the card structure. This will also initialize the default profile */
+     if (add_card(u) < 0)
+         goto fail;
+@@ -2592,6 +2670,9 @@ void pa__done(pa_module *m) {
+     if (u->transport_speaker_changed_slot)
+         pa_hook_slot_free(u->transport_speaker_changed_slot);
+ 
++    if (u->sco_sink_proplist_changed_slot)
++        pa_hook_slot_free(u->sco_sink_proplist_changed_slot);
++
+     if (USE_SCO_OVER_PCM(u))
+         restore_sco_volume_callbacks(u);
+ 
diff --git a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
new file mode 100644
index 0000000..c2c3776
--- /dev/null
+++ b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
@@ -0,0 +1,88 @@
+From: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+Date: Sun, 20 Jul 2014 01:27:09 -0300
+Subject: [PATCH] module-switch-on-connect: adding parameter to allow
+ skipping abstract devices
+
+Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+---
+ src/modules/module-switch-on-connect.c | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
+Index: pulseaudio/src/modules/module-switch-on-connect.c
+===================================================================
+--- pulseaudio.orig/src/modules/module-switch-on-connect.c
++++ pulseaudio/src/modules/module-switch-on-connect.c
+@@ -41,6 +41,8 @@ PA_MODULE_AUTHOR("Michael Terry");
+ PA_MODULE_DESCRIPTION("When a sink/source is added, switch to it");
+ PA_MODULE_VERSION(PACKAGE_VERSION);
+ PA_MODULE_LOAD_ONCE(true);
++PA_MODULE_USAGE(
++        "skip_abstract=<yes or no>");
+ 
+ static const char* const valid_modargs[] = {
+     NULL,
+@@ -50,13 +52,15 @@ struct userdata {
+     pa_hook_slot
+         *sink_put_slot,
+         *source_put_slot;
++    bool skip_abstract;
+ };
+ 
+ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void* userdata) {
+     pa_sink_input *i;
+     uint32_t idx;
+     pa_sink *def;
+-    const char *s;
++    const char *s, *class;
++    struct userdata *u = userdata;
+ 
+     pa_assert(c);
+     pa_assert(sink);
+@@ -73,6 +77,12 @@ static pa_hook_result_t sink_put_hook_ca
+             return PA_HOOK_OK;
+     }
+ 
++    /* Check if we want or to skip abstract devices (e.g. null) */
++    if ((class = pa_proplist_gets(sink->proplist, PA_PROP_DEVICE_CLASS))) {
++        if (pa_streq(class, "abstract") && (u->skip_abstract))
++            return PA_HOOK_OK;
++    }
++
+     def = pa_namereg_get_default_sink(c);
+     if (def == sink)
+         return PA_HOOK_OK;
+@@ -105,7 +115,8 @@ static pa_hook_result_t source_put_hook_
+     pa_source_output *o;
+     uint32_t idx;
+     pa_source *def;
+-    const char *s;
++    const char *s, *class;
++    struct userdata *u = userdata;
+ 
+     pa_assert(c);
+     pa_assert(source);
+@@ -126,6 +137,12 @@ static pa_hook_result_t source_put_hook_
+             return PA_HOOK_OK;
+     }
+ 
++    /* Check if we want or to skip abstract devices (e.g. null) */
++    if ((class = pa_proplist_gets(source->proplist, PA_PROP_DEVICE_CLASS))) {
++        if (pa_streq(class, "abstract") && (u->skip_abstract))
++            return PA_HOOK_OK;
++    }
++
+     def = pa_namereg_get_default_source(c);
+     if (def == source)
+         return PA_HOOK_OK;
+@@ -167,6 +184,11 @@ int pa__init(pa_module*m) {
+ 
+     m->userdata = u = pa_xnew(struct userdata, 1);
+ 
++    if (pa_modargs_get_value_boolean(ma, "skip_abstract", &u->skip_abstract) < 0) {
++        pa_log_error("skip_abstract= expects a boolean argument, assuming false by default");
++        u->skip_abstract = false;
++    }
++
+     /* A little bit later than module-rescue-streams... */
+     u->sink_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE+30, (pa_hook_cb_t) sink_put_hook_callback, u);
+     u->source_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE+20, (pa_hook_cb_t) source_put_hook_callback, u);
diff --git a/debian/patches/0210-module-device-restore-adding-property-to-skip.patch b/debian/patches/0210-module-device-restore-adding-property-to-skip.patch
new file mode 100644
index 0000000..04830ed
--- /dev/null
+++ b/debian/patches/0210-module-device-restore-adding-property-to-skip.patch
@@ -0,0 +1,70 @@
+From: Ricardo Salveti de Araujo <rsalveti at rsalveti.net>
+Date: Fri, 15 Aug 2014 02:15:16 -0300
+Subject: [PATCH] module-device-restore: adding property to skip store/restore
+
+Useful when the user wants to control the volume/port/mute without
+storing/restoring the values, at least temporarily (until the property
+gets unset).
+
+Signed-off-by: Ricardo Salveti de Araujo <rsalveti at rsalveti.net>
+
+Index: pulseaudio/src/modules/module-device-restore.c
+===================================================================
+--- pulseaudio.orig/src/modules/module-device-restore.c
++++ pulseaudio/src/modules/module-device-restore.c
+@@ -53,6 +53,7 @@
+ #include <pulsecore/pstream-util.h>
+ #include <pulsecore/database.h>
+ #include <pulsecore/tagstruct.h>
++#include <pulsecore/proplist-util.h>
+ 
+ #include "module-device-restore-symdef.h"
+ 
+@@ -67,6 +68,7 @@ PA_MODULE_USAGE(
+         "restore_formats=<Save/restore saved formats?>");
+ 
+ #define SAVE_INTERVAL (10 * PA_USEC_PER_SEC)
++#define MODULE_DEVICE_RESTORE_SKIP_PROPERTY "module-device-restore.skip"
+ 
+ static const char* const valid_modargs[] = {
+     "restore_volume",
+@@ -611,6 +613,9 @@ static void subscribe_callback(pa_core *
+         if (!(sink = pa_idxset_get_by_index(c->sinks, idx)))
+             return;
+ 
++        if (pa_proplist_gets(sink->proplist, MODULE_DEVICE_RESTORE_SKIP_PROPERTY))
++            return;
++
+         type = PA_DEVICE_TYPE_SINK;
+         name = pa_sprintf_malloc("sink:%s", sink->name);
+         if (sink->active_port)
+@@ -650,6 +655,9 @@ static void subscribe_callback(pa_core *
+         if (!(source = pa_idxset_get_by_index(c->sources, idx)))
+             return;
+ 
++        if (pa_proplist_gets(source->proplist, MODULE_DEVICE_RESTORE_SKIP_PROPERTY))
++            return;
++
+         type = PA_DEVICE_TYPE_SOURCE;
+         name = pa_sprintf_malloc("source:%s", source->name);
+         if (source->active_port)
+@@ -815,6 +823,9 @@ static pa_hook_result_t sink_port_hook_c
+     pa_assert(u);
+     pa_assert(u->restore_volume || u->restore_muted);
+ 
++    if (pa_proplist_gets(sink->proplist, MODULE_DEVICE_RESTORE_SKIP_PROPERTY))
++        return PA_HOOK_OK;
++
+     name = pa_sprintf_malloc("sink:%s", sink->name);
+ 
+     if ((e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL)))) {
+@@ -956,6 +967,9 @@ static pa_hook_result_t source_port_hook
+     pa_assert(u);
+     pa_assert(u->restore_volume || u->restore_muted);
+ 
++    if (pa_proplist_gets(source->proplist, MODULE_DEVICE_RESTORE_SKIP_PROPERTY))
++        return PA_HOOK_OK;
++
+     name = pa_sprintf_malloc("source:%s", source->name);
+ 
+     if ((e = perportentry_read(u, name, (source->active_port ? source->active_port->name : NULL)))) {
diff --git a/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch b/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch
new file mode 100644
index 0000000..82a45e9
--- /dev/null
+++ b/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch
@@ -0,0 +1,38 @@
+From 5c0bea7f5a0a649d86262d9dc8d81b69ad614cb4 Mon Sep 17 00:00:00 2001
+From: Ricardo Salveti de Araujo <rsalveti at rsalveti.net>
+Date: Wed, 17 Sep 2014 01:07:58 -0300
+Subject: [PATCH] libpulse.vapi: adding missing fields for
+ sink_input/source_output info struct
+
+Upstream: http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-October/021885.html
+Signed-off-by: Ricardo Salveti de Araujo <rsalveti at rsalveti.net>
+---
+ vala/libpulse.vapi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: pulseaudio/vala/libpulse.vapi
+===================================================================
+--- pulseaudio.orig/vala/libpulse.vapi
++++ pulseaudio/vala/libpulse.vapi
+@@ -1376,6 +1376,9 @@ namespace PulseAudio {
+                 public string driver;
+                 public int mute;
+                 public Proplist proplist;
++                public int corked;
++                public int has_volume;
++                public int volume_writable;
+         }
+ 
+         [CCode (cname="pa_source_output_info", has_type_id=false)]
+@@ -1392,6 +1395,11 @@ namespace PulseAudio {
+                 public string resample_method;
+                 public string driver;
+                 public Proplist proplist;
++                public int corked;
++                public CVolume volume;
++                public int mute;
++                public int has_volume;
++                public int volume_writable;
+         }
+ 
+         [CCode (cname="pa_stat_info", has_type_id=false)]
diff --git a/debian/patches/series b/debian/patches/series
index 97b3013..2ce2eba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+# Debian patches
 0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
 0003-exit-with-X-session.patch
@@ -15,3 +16,22 @@ util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch
 misc-cleanups-and-bug-fixes.patch
 util-Try-finding-out-application-name-using-dladdr.patch
 broken-PA_FLOAT32_SWAP.patch
+
+# Ubuntu/Debian specific config/fixes
+0005-dont-load-cork-music-on-phone.patch
+0006-load-module-x11-bell.patch
+0016-nodisplay-autostart.patch
+#0020-stream-Return-error-in-case-a-client-peeks-to-early.patch
+0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch
+0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch
+0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch
+
+# Ubuntu touch stuff
+0202-dont-probe-ucm.patch
+0203-card-Add-hook-before-profile-changes.patch
+0206-module-bluetooth-discover-adding-module-option-profi.patch
+0207-Enable-pulseaudio-droid.patch
+0208-module-bluetooth-device-Allow-leaving-transport-runn.patch
+0209-module-switch-on-connect-adding-parameter-to-allow-s.patch
+0210-module-device-restore-adding-property-to-skip.patch
+0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch
diff --git a/debian/pulseaudio-module-droid.install b/debian/pulseaudio-module-droid.install
new file mode 100644
index 0000000..1ccb2d6
--- /dev/null
+++ b/debian/pulseaudio-module-droid.install
@@ -0,0 +1,6 @@
+usr/lib/pulse-*/modules/libdroid-util.so
+usr/lib/pulse-*/modules/libdroid-sink.so
+usr/lib/pulse-*/modules/libdroid-source.so
+usr/lib/pulse-*/modules/module-droid-sink.so
+usr/lib/pulse-*/modules/module-droid-source.so
+usr/lib/pulse-*/modules/module-droid-card.so
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 67a86b0..fe50bb2 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -14,11 +14,9 @@ usr/lib/pulse-*/modules/libprotocol-http.so
 usr/lib/pulse-*/modules/libprotocol-native.so
 usr/lib/pulse-*/modules/libprotocol-simple.so
 usr/lib/pulse-*/modules/librtp.so
-usr/lib/pulse-*/modules/libwebrtc-util.so
 usr/lib/pulse-*/modules/module-alsa-sink.so
 usr/lib/pulse-*/modules/module-alsa-source.so
 usr/lib/pulse-*/modules/module-always-sink.so
-usr/lib/pulse-*/modules/module-console-kit.so
 usr/lib/pulse-*/modules/module-device-restore.so
 usr/lib/pulse-*/modules/module-echo-cancel.so
 usr/lib/pulse-*/modules/module-stream-restore.so
diff --git a/debian/pulseaudio.upstart.example b/debian/pulseaudio.upstart.example
new file mode 100644
index 0000000..27ecac4
--- /dev/null
+++ b/debian/pulseaudio.upstart.example
@@ -0,0 +1,48 @@
+# System PulseAudio service
+
+description	"System PulseAudio sound server"
+author		"Pali Roh?r <pali.rohar at gmail.com>"
+
+# uncomment the 'start on' to start pulseaudio in system mode
+# (enables the pulseaudio init script - requires that users be in the
+# pulse-access group)
+# System mode is not the recommended way to run PulseAudio as it has some
+# limitations (such as no shared memory access) and could potentially allow
+# users to disconnect or redirect each others' audio streams. The
+# recommended way to run PulseAudio is as a per-session daemon. For GNOME/KDE/
+# Xfce sessions in Ubuntu Lucid/10.04, /etc/xdg/autostart/pulseaudio.desktop
+# handles this function of automatically starting PulseAudio on login, and for
+# it to work correctly your user must *not* have "autospawn = no" set in
+# ~/.pulse/client.conf (or in /etc/pulse/client.conf). By default, autospawn
+# is enabled. For other sessions, you can simply start PulseAudio with
+# "pulseaudio --daemonize".
+
+#start on runlevel [2345]
+stop on runlevel [016]
+
+expect daemon
+respawn
+
+# Prevent users from dynamically loading modules into the PulseAudio sound
+# server. Dynamic module loading enhances the flexibility of the PulseAudio
+# system, but may pose a security risk.
+# 0 = no, 1 = yes
+env DISALLOW_MODULE_LOADING=1
+
+# extra arguments to pass to the daemon
+env PULSEAUDIO_ARGS=
+
+pre-start exec install -d -m755 -o pulse -g pulse /run/pulse
+
+exec /usr/bin/pulseaudio --system --daemonize --high-priority --log-target=syslog --disallow-exit --disallow-module-loading=$DISALLOW_MODULE_LOADING $PULSEAUDIO_ARGS
+
+post-start script
+	if [ -e /var/run/pulse/.esd_auth ]; then
+		chown pulse:pulse-access /var/run/pulse/.esd_auth
+		chmod 640 /var/run/pulse/.esd_auth
+	fi
+	if [ -e /var/run/pulse/.pulse-cookie ]; then
+		chown pulse:pulse-access /var/run/pulse/.pulse-cookie
+		chmod 640 /var/run/pulse/.pulse-cookie
+	fi
+end script
diff --git a/debian/rules b/debian/rules
index 9e72ac7..93b85bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ common-build-arch::
 	  debian/pulseaudio.install >  debian/pulseaudio.install.kfreebsd-amd64
 	grep -v -e alsa -e evdev -e udev -e share/pulseaudio -e systemd \
 	  debian/pulseaudio.install > debian/pulseaudio.install.hurd-i386
+	dh_translations
 
 common-install-arch::
 	find $(DEB_DESTDIR) -name "*.la" -delete
@@ -47,6 +48,19 @@ clean::
 	rm -f debian/pulseaudio.install.kfreebsd-i386
 	rm -f debian/pulseaudio.install.kfreebsd-amd64
 	rm -f debian/pulseaudio.install.hurd-i386
+	rm -f debian/stamp-post-patches
+	if test -f $(CURDIR)/debian/daemon.conf.in; then \
+	   mv $(CURDIR)/debian/daemon.conf.in $(CURDIR)/src/daemon/daemon.conf.in; \
+	fi
+
+-post-patches:: debian/stamp-post-patches
+
+debian/stamp-post-patches:
+	cp $(CURDIR)/src/daemon/daemon.conf.in $(CURDIR)/debian/daemon.conf.in
+	sed -e 's/; deferred-volume-safety-margin-usec = 8000/deferred-volume-safety-margin-usec = 1/' \
+	    -e 's/; flat-volumes = yes/flat-volumes = no/' \
+	    $(CURDIR)/src/daemon/daemon.conf.in
+	touch debian/stamp-post-patches
 
 # Libs should be in the multi-arch path, but the modules should be in the
 # normal directory as pulseaudio is foreign
diff --git a/debian/tests/build b/debian/tests/build
new file mode 100755
index 0000000..342ad34
--- /dev/null
+++ b/debian/tests/build
@@ -0,0 +1,30 @@
+#!/bin/sh
+# autopkgtest check: Build and run a program against pulseaudio, to verify that the
+# headers and pkg-config file are installed correctly
+# (C) 2013 Canonical Ltd.
+# Author: Martin Pitt <martin.pitt at ubuntu.com>
+# Author: David Henningsson <david.henningsson at canonical.com>
+
+set -e
+
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+cat <<EOF > buildtest.c
+#include <pulse/pulseaudio.h>
+#include <assert.h>
+
+int main()
+{
+    pa_mainloop * ml = pa_mainloop_new();
+    assert(ml);
+    pa_mainloop_free(ml);
+    return 0;
+}
+EOF
+
+gcc -o buildtest buildtest.c $(pkg-config --cflags --libs libpulse)
+echo "build: OK"
+[ -x buildtest ]
+./buildtest
+echo "run: OK"
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..8e3e6ce
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: build
+Depends: libpulse-dev, build-essential

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:38 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:38 -0000
Subject: [pulseaudio] 02/19: Imported Upstream version 5.99.1
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDID-00056Y-1W@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 9d219dac2000a04b697106f01bf42498b2e90e42
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 09:38:27 2014 +1100

    Imported Upstream version 5.99.1
---
 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 Makefile.am                                        |   22 +-
 Makefile.in                                        |   86 +-
 NEWS                                               |   61 +
 PROTOCOL                                           |   22 +-
 README                                             |    3 -
 bootstrap.sh                                       |    4 -
 build-aux/ltmain.sh                                |    4 +-
 config.h.in                                        |   25 +-
 configure                                          |  919 +++--
 configure.ac                                       |  154 +-
 doxygen/Makefile.in                                |   18 +-
 doxygen/doxygen.conf.in                            | 1115 ++++--
 man/Makefile.am                                    |    3 -
 man/Makefile.in                                    |   26 +-
 man/default.pa.5                                   |    4 +-
 man/pactl.1                                        |   20 +-
 man/pactl.1.xml.in                                 |   27 +-
 man/pax11publish.1                                 |    2 +-
 man/pulse-cli-syntax.5                             |    4 +-
 man/pulse-client.conf.5                            |    6 +-
 man/pulse-client.conf.5.xml.in                     |    2 +-
 man/pulse-daemon.conf.5                            |   18 +-
 man/pulse-daemon.conf.5.xml.in                     |   14 +-
 man/pulseaudio.1                                   |    6 +-
 man/start-pulseaudio-kde.1                         |   14 -
 man/start-pulseaudio-kde.1.xml.in                  |   48 -
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    4 +-
 po/el.po                                           | 3587 ++++++++++++--------
 po/pt_BR.po                                        |  854 ++---
 po/ru.po                                           |  465 +--
 po/{el.po => sk.po}                                | 2803 +++++++--------
 po/uk.po                                           |  581 ++--
 pulseaudio.supp                                    |   50 +
 .../pulseaudio}                                    |    4 +-
 .../_pulseaudio}                                   |  402 ++-
 src/.gitignore                                     |   11 +-
 src/Makefile.am                                    |  140 +-
 src/Makefile.in                                    | 1312 ++++---
 src/daemon/.gitignore                              |    1 -
 src/daemon/caps.c                                  |    7 +-
 src/daemon/cmdline.c                               |    2 +-
 src/daemon/daemon-conf.c                           |    8 +-
 src/daemon/daemon.conf.in                          |    2 +-
 src/daemon/default.pa.in                           |   10 +-
 src/daemon/main.c                                  |  181 +-
 src/daemon/pulseaudio-kde.desktop.in               |   10 -
 src/daemon/pulseaudio.desktop.in                   |    1 +
 src/daemon/server-lookup.c                         |   30 +-
 src/daemon/start-pulseaudio-kde.in                 |   30 -
 src/daemon/start-pulseaudio-x11.in                 |    6 +-
 src/daemon/systemd/user/pulseaudio.service.in      |   10 +
 src/daemon/systemd/user/pulseaudio.socket          |   10 +
 src/map-file                                       |    3 +
 src/modules/alsa/alsa-mixer.c                      |  248 +-
 src/modules/alsa/alsa-mixer.h                      |   10 +-
 src/modules/alsa/alsa-sink.c                       |   37 +-
 src/modules/alsa/alsa-source.c                     |   35 +-
 src/modules/alsa/alsa-ucm.c                        |    7 +-
 src/modules/alsa/alsa-util.c                       |  121 +-
 src/modules/alsa/alsa-util.h                       |    9 +-
 src/modules/alsa/mixer/paths/analog-input.conf     |   15 +
 .../mixer/paths/analog-output-desktop-speaker.conf |  102 -
 .../mixer/paths/analog-output-headphones-2.conf    |    8 +
 .../alsa/mixer/paths/analog-output-headphones.conf |   20 +
 .../alsa/mixer/paths/analog-output-lineout.conf    |   19 +
 .../alsa/mixer/paths/analog-output-mono.conf       |   10 +
 .../mixer/paths/analog-output-speaker-always.conf  |   16 +-
 .../alsa/mixer/paths/analog-output-speaker.conf    |   22 +-
 src/modules/alsa/mixer/paths/analog-output.conf    |   30 -
 src/modules/alsa/mixer/paths/hdmi-output-4.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-5.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-6.conf    |   10 +
 src/modules/alsa/mixer/paths/hdmi-output-7.conf    |   10 +
 .../alsa/mixer/profile-sets/90-pulseaudio.rules    |    4 -
 src/modules/alsa/mixer/profile-sets/default.conf   |  292 +-
 .../alsa/mixer/profile-sets/extra-hdmi.conf        |  164 -
 .../profile-sets/force-speaker-and-int-mic.conf    |   46 +-
 .../alsa/mixer/profile-sets/force-speaker.conf     |   46 +-
 src/modules/alsa/module-alsa-card.c                |   77 +-
 src/modules/bluetooth/backend-native.c             |  501 +++
 src/modules/bluetooth/backend-ofono.c              |  665 ++++
 src/modules/bluetooth/bluez5-util.c                |  201 +-
 src/modules/bluetooth/bluez5-util.h                |   53 +-
 src/modules/bluetooth/module-bluetooth-discover.c  |    5 +-
 src/modules/bluetooth/module-bluetooth-policy.c    |   45 +-
 src/modules/bluetooth/module-bluez4-device.c       |   39 +-
 src/modules/bluetooth/module-bluez5-device.c       |  686 +++-
 src/modules/bluetooth/module-bluez5-discover.c     |   39 +-
 src/modules/dbus/iface-core.c                      |    6 +-
 src/modules/dbus/iface-device.c                    |   15 +-
 src/modules/dbus/iface-stream.c                    |    4 +-
 src/modules/echo-cancel/module-echo-cancel.c       |   31 +-
 src/modules/gconf/gconf-helper.c                   |    2 +
 src/modules/gconf/module-gconf.c                   |    7 +-
 src/modules/jack/module-jack-sink.c                |    4 +-
 src/modules/jack/module-jack-source.c              |    4 +-
 src/modules/macosx/module-coreaudio-device.c       |    2 +-
 src/modules/module-card-restore.c                  |    6 +-
 src/modules/module-combine-sink.c                  |  193 +-
 src/modules/module-console-kit.c                   |   10 +-
 src/modules/module-device-manager.c                |    4 +-
 src/modules/module-device-restore.c                |   18 +-
 src/modules/module-equalizer-sink.c                |    2 +-
 src/modules/module-esound-sink.c                   |   15 +-
 src/modules/module-mmkbd-evdev.c                   |    7 +-
 src/modules/module-null-sink.c                     |    2 +-
 src/modules/module-null-source.c                   |    2 +-
 src/modules/module-pipe-sink.c                     |    2 +-
 src/modules/module-pipe-source.c                   |    2 +-
 src/modules/module-protocol-stub.c                 |    6 +-
 src/modules/module-rescue-streams.c                |  105 +-
 src/modules/module-role-cork.c                     |    9 +-
 src/modules/module-sine-source.c                   |    2 +-
 src/modules/module-solaris.c                       |   27 +-
 src/modules/module-stream-restore.c                |   24 +-
 src/modules/module-suspend-on-idle.c               |    5 +-
 src/modules/module-switch-on-connect.c             |   34 +-
 src/modules/module-switch-on-port-available.c      |   38 +-
 src/modules/module-tunnel-sink-new.c               |   98 +-
 src/modules/module-tunnel-source-new.c             |   47 +-
 src/modules/module-tunnel.c                        |   22 +-
 src/modules/module-virtual-surround-sink.c         |   57 +-
 src/modules/module-waveout.c                       |    2 +-
 src/modules/module-zeroconf-publish.c              |   47 +-
 src/modules/oss/module-oss.c                       |    2 +-
 src/modules/raop/module-raop-sink.c                |   10 +-
 src/modules/raop/raop_client.c                     |    9 +-
 src/modules/rtp/headerlist.c                       |    8 +-
 src/modules/rtp/module-rtp-recv.c                  |   14 +-
 src/modules/rtp/module-rtp-send.c                  |    2 +-
 src/modules/rtp/rtp.c                              |   25 +-
 src/modules/xen/module-xenpv-sink.c                |    2 +-
 src/pulse/channelmap.c                             |    6 +
 src/pulse/client-conf-x11.c                        |    9 +-
 src/pulse/client-conf-x11.h                        |    6 +-
 src/pulse/client-conf.c                            |  213 +-
 src/pulse/client-conf.h                            |   39 +-
 src/pulse/client.conf.in                           |    2 +-
 src/pulse/context.c                                |  153 +-
 src/pulse/def.h                                    |    4 +-
 src/{pulsecore/cpu.h => pulse/direction.c}         |   41 +-
 src/pulse/{client-conf-x11.h => direction.h}       |   20 +-
 src/pulse/error.c                                  |    2 +-
 src/pulse/ext-device-manager.c                     |    1 +
 src/pulse/ext-device-manager.h                     |    3 +
 src/pulse/format.c                                 |   43 +-
 src/pulse/internal.h                               |    3 +
 src/pulse/introspect.c                             |    6 +-
 src/pulse/mainloop-api.h                           |   14 +-
 src/pulse/mainloop.c                               |   13 +-
 src/pulse/proplist.c                               |    5 +-
 src/pulse/proplist.h                               |    2 +-
 src/pulse/pulseaudio.h                             |    5 +-
 src/pulse/simple.c                                 |   21 +-
 src/pulse/stream.c                                 |   20 +-
 src/pulse/stream.h                                 |   13 +-
 src/pulse/thread-mainloop.c                        |    7 +-
 src/pulse/thread-mainloop.h                        |    4 +-
 src/pulse/util.c                                   |   59 +-
 src/pulse/version.h                                |    6 +-
 src/pulse/volume.h                                 |    2 +-
 src/pulsecore/asyncmsgq.c                          |    2 -
 src/pulsecore/aupdate.c                            |    2 +-
 src/pulsecore/auth-cookie.c                        |    2 +-
 src/pulsecore/authkey.c                            |   66 +-
 src/pulsecore/authkey.h                            |    3 +-
 src/pulsecore/card.c                               |    2 +-
 src/pulsecore/cli-text.c                           |    4 +-
 src/pulsecore/conf-parser.c                        |    1 +
 src/pulsecore/core-util.c                          |  157 +-
 src/pulsecore/core-util.h                          |    8 +-
 src/pulsecore/core.c                               |   16 +-
 src/pulsecore/core.h                               |   13 +-
 src/pulsecore/cpu-arm.c                            |   22 +-
 src/pulsecore/cpu-arm.h                            |    4 +-
 src/pulsecore/cpu.c                                |   38 +
 src/pulsecore/cpu.h                                |    6 +
 src/pulsecore/creds.h                              |   13 +
 src/pulsecore/database-simple.c                    |    9 +-
 src/pulsecore/device-port.c                        |   27 +
 src/pulsecore/device-port.h                        |    2 +
 src/pulsecore/endianmacros.h                       |   27 +-
 src/pulsecore/esound.h                             |    2 +-
 src/pulsecore/fdsem.c                              |    3 +-
 src/pulsecore/fdsem.h                              |    4 +-
 src/pulsecore/hashmap.c                            |   13 +
 src/pulsecore/hashmap.h                            |    7 +
 src/pulsecore/iochannel.c                          |   92 +-
 src/pulsecore/iochannel.h                          |    3 +-
 src/pulsecore/log.c                                |   12 +-
 src/pulsecore/log.h                                |    4 +-
 src/pulsecore/macro.h                              |    8 +-
 src/pulsecore/memblock.c                           |   56 +-
 src/pulsecore/memblock.h                           |   10 +-
 src/pulsecore/memblockq.c                          |    3 +-
 src/pulsecore/memchunk.c                           |    2 +-
 src/pulsecore/memtrap.c                            |    3 +
 src/pulsecore/mix.c                                |   31 +-
 src/pulsecore/mix_neon.c                           |  131 +-
 src/pulsecore/modargs.c                            |    3 -
 src/pulsecore/native-common.h                      |    7 +-
 src/pulsecore/pdispatch.c                          |   37 +-
 src/pulsecore/pdispatch.h                          |    4 +-
 src/pulsecore/pid.c                                |    2 +-
 src/pulsecore/pipe.c                               |    4 +-
 src/pulsecore/poll-win32.c                         |   60 +-
 src/pulsecore/protocol-dbus.c                      |    3 +-
 src/pulsecore/protocol-esound.c                    |   17 +-
 src/pulsecore/protocol-native.c                    |  133 +-
 src/pulsecore/protocol-native.h                    |    1 +
 src/pulsecore/pstream-util.c                       |   45 +-
 src/pulsecore/pstream-util.h                       |    1 +
 src/pulsecore/pstream.c                            |  351 +-
 src/pulsecore/pstream.h                            |    9 +-
 src/pulsecore/remap.c                              |  480 ++-
 src/pulsecore/remap.h                              |   20 +-
 src/pulsecore/remap_mmx.c                          |   53 +-
 src/pulsecore/remap_neon.c                         |  498 +++
 src/pulsecore/remap_sse.c                          |   53 +-
 src/pulsecore/resampler.c                          |  701 +---
 src/pulsecore/resampler.h                          |   51 +
 src/pulsecore/resampler/ffmpeg.c                   |  132 +
 src/pulsecore/resampler/libsamplerate.c            |  102 +
 src/pulsecore/resampler/peaks.c                    |  163 +
 src/pulsecore/resampler/speex.c                    |  180 +
 src/pulsecore/resampler/trivial.c                  |  102 +
 src/pulsecore/rtpoll.c                             |   14 +-
 src/pulsecore/rtpoll.h                             |    7 +-
 src/pulsecore/sample-util.c                        |    4 +-
 src/pulsecore/sconv-s16le.c                        |   22 +-
 src/pulsecore/sconv_neon.c                         |   10 +-
 src/pulsecore/sconv_sse.c                          |    3 +-
 src/pulsecore/shm.c                                |   12 +-
 src/pulsecore/shm.h                                |    2 +-
 src/pulsecore/sink-input.c                         |  157 +-
 src/pulsecore/sink-input.h                         |   14 +-
 src/pulsecore/sink.c                               |  249 +-
 src/pulsecore/sink.h                               |   37 +-
 src/pulsecore/socket-server.c                      |   98 +-
 src/pulsecore/socket-util.c                        |   18 +
 src/pulsecore/source-output.c                      |  136 +-
 src/pulsecore/source-output.h                      |   14 +-
 src/pulsecore/source.c                             |  235 +-
 src/pulsecore/source.h                             |   33 +-
 src/pulsecore/srbchannel.c                         |  378 +++
 src/pulsecore/srbchannel.h                         |   59 +
 src/pulsecore/start-child.c                        |    2 +-
 src/pulsecore/svolume_c.c                          |    6 +-
 src/tests/alsa-time-test.c                         |   37 +-
 src/tests/connect-stress.c                         |    8 +-
 src/tests/cpu-mix-test.c                           |  226 ++
 src/tests/cpu-remap-test.c                         |  436 +++
 src/tests/cpu-sconv-test.c                         |  265 ++
 src/tests/cpu-test.c                               |  887 -----
 src/tests/cpu-volume-test.c                        |  249 ++
 src/tests/flist-test.c                             |    2 +-
 src/tests/format-test.c                            |    2 +-
 src/tests/lo-test-util.c                           |   10 +-
 src/tests/mcalign-test.c                           |    5 +-
 src/tests/memblock-test.c                          |    4 +-
 src/tests/mix-special-test.c                       |  326 --
 src/tests/mix-test.c                               |  231 +-
 src/tests/resampler-test.c                         |    8 +-
 src/tests/rtpoll-test.c                            |    4 +-
 src/tests/sigbus-test.c                            |    2 +
 src/tests/srbchannel-test.c                        |  138 +
 src/utils/pacat.c                                  |   12 +-
 src/utils/pactl.c                                  |  322 +-
 src/utils/pax11publish.c                           |   12 +-
 vala/libpulse-simple.deps                          |    1 +
 vala/libpulse-simple.vapi                          |   36 +
 vala/libpulse.vapi                                 |    8 +
 275 files changed, 17561 insertions(+), 9623 deletions(-)

diff --git a/.tarball-version b/.tarball-version
index 819e07a..e8cead2 100644
--- a/.tarball-version
+++ b/.tarball-version
@@ -1 +1 @@
-5.0
+5.99.1
diff --git a/.version b/.version
index 819e07a..e8cead2 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-5.0
+5.99.1
diff --git a/Makefile.am b/Makefile.am
index b0b2553..665736d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = \
 	bootstrap.sh \
 	git-version-gen \
 	LICENSE \
+	pulseaudio.supp \
 	GPL \
 	LGPL \
 	doxygen/Makefile.am \
@@ -29,7 +30,6 @@ EXTRA_DIST = \
 	PROTOCOL \
 	README \
 	todo \
-	shell-completion/pulseaudio-zsh-completion.zsh \
 	.gitignore \
 	doxygen/.gitignore \
 	m4/.gitignore \
@@ -47,7 +47,8 @@ noinst_DATA =
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
 		vala/libpulse.deps vala/libpulse.vapi \
-		vala/libpulse-mainloop-glib.deps vala/libpulse-mainloop-glib.vapi
+		vala/libpulse-mainloop-glib.deps vala/libpulse-mainloop-glib.vapi \
+		vala/libpulse-simple.deps vala/libpulse-simple.vapi
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpulse.pc libpulse-simple.pc
@@ -61,7 +62,22 @@ cmakedir = $(libdir)/cmake/PulseAudio
 cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
 
 bashcompletiondir=$(sysconfdir)/bash_completion.d
-dist_bashcompletion_DATA = shell-completion/pulseaudio-bash-completion.sh
+dist_bashcompletion_DATA = shell-completion/bash/pulseaudio
+
+install-bashcompletion-aliases:
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pactl
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pacmd
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pasuspender
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/padsp
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pacat
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/paplay
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/parec
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/parecord
+
+install-data-hook: install-bashcompletion-aliases
+
+zshcompletiondir=@zshcompletiondir@
+dist_zshcompletion_DATA = shell-completion/zsh/_pulseaudio
 
 homepage: all dist doxygen
 	test -d $$HOME/homepage/private
diff --git a/Makefile.in b/Makefile.in
index b3cc5d7..6f7adcf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,8 +107,9 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/src/pulse/version.h.in \
 	$(srcdir)/PulseAudioConfig.cmake.in \
 	$(srcdir)/PulseAudioConfigVersion.cmake.in \
-	$(dist_bashcompletion_DATA) $(dist_vapi_DATA) ABOUT-NLS NEWS \
-	README build-aux/compile build-aux/config.guess \
+	$(dist_bashcompletion_DATA) $(dist_vapi_DATA) \
+	$(dist_zshcompletion_DATA) ABOUT-NLS NEWS README \
+	build-aux/compile build-aux/config.guess \
 	build-aux/config.rpath build-aux/config.sub \
 	build-aux/install-sh build-aux/missing build-aux/ltmain.sh \
 	$(top_srcdir)/build-aux/compile \
@@ -199,9 +200,9 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(cmakedir)" \
 	"$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(vapidir)" \
-	"$(DESTDIR)$(pkgconfigdir)"
+	"$(DESTDIR)$(zshcompletiondir)" "$(DESTDIR)$(pkgconfigdir)"
 DATA = $(cmake_DATA) $(dist_bashcompletion_DATA) $(dist_vapi_DATA) \
-	$(noinst_DATA) $(pkgconfig_DATA)
+	$(dist_zshcompletion_DATA) $(noinst_DATA) $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -289,6 +290,8 @@ AUTOMAKE = @AUTOMAKE@
 AVAHI_CFLAGS = @AVAHI_CFLAGS@
 AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
+BLUEZ_CFLAGS = @BLUEZ_CFLAGS@
+BLUEZ_LIBS = @BLUEZ_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -336,13 +339,16 @@ HAVE_AVAHI = @HAVE_AVAHI@
 HAVE_BLUEZ = @HAVE_BLUEZ@
 HAVE_BLUEZ_4 = @HAVE_BLUEZ_4@
 HAVE_BLUEZ_5 = @HAVE_BLUEZ_5@
+HAVE_BLUEZ_5_NATIVE_HEADSET = @HAVE_BLUEZ_5_NATIVE_HEADSET@
+HAVE_BLUEZ_5_OFONO_HEADSET = @HAVE_BLUEZ_5_OFONO_HEADSET@
 HAVE_DBUS = @HAVE_DBUS@
 HAVE_GLIB20 = @HAVE_GLIB20@
 HAVE_MKFIFO = @HAVE_MKFIFO@
 HAVE_NEON = @HAVE_NEON@
 HAVE_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
-HAVE_SYSTEMD = @HAVE_SYSTEMD@
+HAVE_SYSTEMD_DAEMON = @HAVE_SYSTEMD_DAEMON@
 HAVE_SYSTEMD_JOURNAL = @HAVE_SYSTEMD_JOURNAL@
+HAVE_SYSTEMD_LOGIN = @HAVE_SYSTEMD_LOGIN@
 HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@
 HAVE_UDEV = @HAVE_UDEV@
 HAVE_WAVEOUT = @HAVE_WAVEOUT@
@@ -365,8 +371,6 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JACK_CFLAGS = @JACK_CFLAGS@
 JACK_LIBS = @JACK_LIBS@
-JOURNAL_CFLAGS = @JOURNAL_CFLAGS@
-JOURNAL_LIBS = @JOURNAL_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@
@@ -433,6 +437,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PA_ACCESS_GROUP = @PA_ACCESS_GROUP@
 PA_API_VERSION = @PA_API_VERSION@
 PA_BINARY = @PA_BINARY@
+PA_DEFAULT_AUTOSPAWN = @PA_DEFAULT_AUTOSPAWN@
 PA_DEFAULT_CONFIG_DIR = @PA_DEFAULT_CONFIG_DIR@
 PA_DLSEARCHPATH = @PA_DLSEARCHPATH@
 PA_INCDIR = @PA_INCDIR@
@@ -466,6 +471,12 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STOW = @STOW@
 STRIP = @STRIP@
+SYSTEMDDAEMON_CFLAGS = @SYSTEMDDAEMON_CFLAGS@
+SYSTEMDDAEMON_LIBS = @SYSTEMDDAEMON_LIBS@
+SYSTEMDJOURNAL_CFLAGS = @SYSTEMDJOURNAL_CFLAGS@
+SYSTEMDJOURNAL_LIBS = @SYSTEMDJOURNAL_LIBS@
+SYSTEMDLOGIN_CFLAGS = @SYSTEMDLOGIN_CFLAGS@
+SYSTEMDLOGIN_LIBS = @SYSTEMDLOGIN_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TDB_CFLAGS = @TDB_CFLAGS@
@@ -538,16 +549,19 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemduserunitdir = @systemduserunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udevrulesdir = @udevrulesdir@
+zshcompletiondir = @zshcompletiondir@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = \
 	bootstrap.sh \
 	git-version-gen \
 	LICENSE \
+	pulseaudio.supp \
 	GPL \
 	LGPL \
 	doxygen/Makefile.am \
@@ -556,7 +570,6 @@ EXTRA_DIST = \
 	PROTOCOL \
 	README \
 	todo \
-	shell-completion/pulseaudio-zsh-completion.zsh \
 	.gitignore \
 	doxygen/.gitignore \
 	m4/.gitignore \
@@ -572,14 +585,16 @@ noinst_DATA =
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
 		vala/libpulse.deps vala/libpulse.vapi \
-		vala/libpulse-mainloop-glib.deps vala/libpulse-mainloop-glib.vapi
+		vala/libpulse-mainloop-glib.deps vala/libpulse-mainloop-glib.vapi \
+		vala/libpulse-simple.deps vala/libpulse-simple.vapi
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpulse.pc libpulse-simple.pc $(am__append_1)
 cmakedir = $(libdir)/cmake/PulseAudio
 cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
 bashcompletiondir = $(sysconfdir)/bash_completion.d
-dist_bashcompletion_DATA = shell-completion/pulseaudio-bash-completion.sh
+dist_bashcompletion_DATA = shell-completion/bash/pulseaudio
+dist_zshcompletion_DATA = shell-completion/zsh/_pulseaudio
 
 # see git-version-gen
 BUILT_SOURCES = $(top_srcdir)/.version
@@ -724,6 +739,27 @@ uninstall-dist_vapiDATA:
 	@list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir)
+install-dist_zshcompletionDATA: $(dist_zshcompletion_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_zshcompletion_DATA)'; test -n "$(zshcompletiondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(zshcompletiondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(zshcompletiondir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(zshcompletiondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(zshcompletiondir)" || exit $$?; \
+	done
+
+uninstall-dist_zshcompletionDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_zshcompletion_DATA)'; test -n "$(zshcompletiondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(zshcompletiondir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
@@ -1048,7 +1084,7 @@ check: $(BUILT_SOURCES)
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(cmakedir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(pkgconfigdir)"; do \
+	for dir in "$(DESTDIR)$(cmakedir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(zshcompletiondir)" "$(DESTDIR)$(pkgconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -1108,8 +1144,10 @@ info: info-recursive
 info-am:
 
 install-data-am: install-cmakeDATA install-dist_bashcompletionDATA \
-	install-dist_vapiDATA install-pkgconfigDATA
-
+	install-dist_vapiDATA install-dist_zshcompletionDATA \
+	install-pkgconfigDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
@@ -1155,10 +1193,11 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-cmakeDATA uninstall-dist_bashcompletionDATA \
-	uninstall-dist_vapiDATA uninstall-pkgconfigDATA
+	uninstall-dist_vapiDATA uninstall-dist_zshcompletionDATA \
+	uninstall-pkgconfigDATA
 
 .MAKE: $(am__recursive_targets) all check install install-am \
-	install-strip
+	install-data-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
@@ -1169,7 +1208,8 @@ uninstall-am: uninstall-cmakeDATA uninstall-dist_bashcompletionDATA \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-cmakeDATA install-data install-data-am \
-	install-dist_bashcompletionDATA install-dist_vapiDATA \
+	install-data-hook install-dist_bashcompletionDATA \
+	install-dist_vapiDATA install-dist_zshcompletionDATA \
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-html install-html-am install-info install-info-am \
 	install-man install-pdf install-pdf-am install-pkgconfigDATA \
@@ -1179,8 +1219,20 @@ uninstall-am: uninstall-cmakeDATA uninstall-dist_bashcompletionDATA \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-cmakeDATA \
 	uninstall-dist_bashcompletionDATA uninstall-dist_vapiDATA \
-	uninstall-pkgconfigDATA
+	uninstall-dist_zshcompletionDATA uninstall-pkgconfigDATA
+
+
+install-bashcompletion-aliases:
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pactl
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pacmd
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pasuspender
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/padsp
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/pacat
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/paplay
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/parec
+	$(LN_S) -f pulseaudio $(DESTDIR)$(bashcompletiondir)/parecord
 
+install-data-hook: install-bashcompletion-aliases
 
 homepage: all dist doxygen
 	test -d $$HOME/homepage/private
diff --git a/NEWS b/NEWS
index 782af5d..a86a33d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,64 @@
+PulseAudio 6.0
+
+Changes at a glance:
+
+  * Bluez 5 HSP (headset profile) support, both with and without oFono
+  * SystemD socket activation support
+  * Better support for multichannel and 2.1 profiles
+  * Protocol optimisations
+  * Zsh shell completion support
+  * Remap optimisations
+  * Lots of other enhancements, bug fixes, and documenation and i18n updates
+
+Detailed change log:
+
+  http://www.freedesktop.org/wiki/Software/PulseAudio/Notes/6.0
+
+Contributors:
+
+  Alexander Couzens
+  Alexander E. Patrakov
+  Alexander Kurtz
+  Alexander Potashev
+  Andrey Semashev
+  Arun Raghavan
+  Bradley Broom
+  Colin Guthrie
+  David Henningsson
+  Dimitris Spingos
+  Du?an Kazik
+  Evan Nemerson
+  Felipe Sateler
+  Hemanth Meenakshisundaram
+  Hui Wang
+  James Bunton
+  Javier Jard?n
+  Jo?o Paulo Rechi Vita
+  Joe Marcus Clarke
+  Juho H?m?l?inen
+  Luiz Augusto von Dentz
+  Lukas Peleska
+  Lukasz Marek
+  Mauro Guerrera
+  Micha? G?rny
+  Niels Ole Salscheider
+  Pali Roh?r
+  Parin Porecha
+  Pete Beardmore
+  Peter Meerwald
+  Peter Ujfalusi
+  Pierre Ossman
+  poljar (Damir Jeli?)
+  Rafael Ferreira
+  Rex Dieter
+  Ricardo Salveti de Araujo
+  Sajeesh Sidharthan
+  Sjoerd Simons
+  Tanu Kaskinen
+  Wim Taymans
+  Yuri Chornoivan
+
+
 PulseAudio 5.0
 
 Changes at a glance:
diff --git a/PROTOCOL b/PROTOCOL
index 0673d86..3c08fea 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -30,7 +30,7 @@ SHM data transfer support
 
 ### v11, implemented by >= 0.9.7
 
-Reply to to PA_COMMAND_GET_SINK_INPUT_INFO, PA_COMMAND_GET_SINK_INPUT_INFO_LIST gets new field at the end:
+Reply to PA_COMMAND_GET_SINK_INPUT_INFO, PA_COMMAND_GET_SINK_INPUT_INFO_LIST gets new field at the end:
 
  mute
 
@@ -351,6 +351,26 @@ New field in all commands that send/receive profile introspection data
 
 The field is added once for every profile.
 
+## v30, implemented by >= 6.0
+#
+A new protocol mechanism supported: Two ringbuffers in shared memory.
+Pulseaudio fdsem (wrappers around event file descriptors) are used for
+signalling new data.
+The protocol has a new SHM flag telling whether a SHM memblock is writable
+by both sides.
+
+PA_COMMAND_ENABLE_SRBCHANNEL
+First sent from server to client, tells the client to start listening on
+the additional SHM ringbuffer channel.
+This command also has ancillary data (two eventfds attached to it).
+Must be directly followed by a memblock which is the ringbuffer memory.
+When memblock is received by the client, it acks by sending
+PA_COMMAND_ENABLE_SRBCHANNEL back (without ancillary or memblock data).
+
+PA_COMMAND_DISABLE_SRBCHANNEL
+Tells the client to stop listening on the additional SHM ringbuffer channel.
+Acked by client by sending PA_COMMAND_DISABLE_SRBCHANNEL back.
+
 #### If you just changed the protocol, read this
 ## module-tunnel depends on the sink/source/sink-input/source-input protocol
 ## internals, so if you changed these, you might have broken module-tunnel.
diff --git a/README b/README
index 66c1847..470de40 100644
--- a/README
+++ b/README
@@ -21,9 +21,6 @@ TRAC/BUGZILLA TICKET CHANGES MAILING LIST:
 IRC:
 	#pulseaudio on irc.freenode.org
 
-CIA:
-	http://cia.navi.cx/stats/project/polypaudio
-
 FRESHMEAT:
 	http://freshmeat.net/projects/pulseaudio/
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 08e0fa4..011aa13 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -47,10 +47,6 @@ fi
 intltoolize --version >/dev/null || DIE=1
 test "$DIE" = 1 && exit 1
 
-if type -p colorgcc > /dev/null ; then
-   export CC=colorgcc
-fi
-
 autopoint --force
 AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index bb5fa02..a356aca 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.7"
+VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
 TIMESTAMP=""
 package_revision=1.3337
 
diff --git a/config.h.in b/config.h.in
index 86e4408..8aa2e1d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -68,6 +68,12 @@
 /* Define to 1 if you have the <atomic_ops.h> header file. */
 #undef HAVE_ATOMIC_OPS_H
 
+/* Bluez 5 native headset backend enabled */
+#undef HAVE_BLUEZ_5_NATIVE_HEADSET
+
+/* Bluez 5 ofono headset backend enabled */
+#undef HAVE_BLUEZ_5_OFONO_HEADSET
+
 /* Define to 1 if you have the <byteswap.h> header file. */
 #undef HAVE_BYTESWAP_H
 
@@ -108,6 +114,9 @@
    don't. */
 #undef HAVE_DECL_ENVIRON
 
+/* Have dladdr? */
+#undef HAVE_DLADDR
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -186,9 +195,6 @@
 /* Define this to enable IPv6 connection support */
 #undef HAVE_IPV6
 
-/* Have JOURNAL? */
-#undef HAVE_JOURNAL
-
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
@@ -408,8 +414,14 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
-/* Have SYSTEMD? */
-#undef HAVE_SYSTEMD
+/* Have SYSTEMDDAEMON? */
+#undef HAVE_SYSTEMD_DAEMON
+
+/* Have SYSTEMDJOURNAL? */
+#undef HAVE_SYSTEMD_JOURNAL
+
+/* Have SYSTEMDLOGIN? */
+#undef HAVE_SYSTEMD_LOGIN
 
 /* Define to 1 if you have the <sys/atomic.h> header file. */
 #undef HAVE_SYS_ATOMIC_H
@@ -658,9 +670,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* Just a test. */
-#undef WIBBLE
-
 /* Needed to avoid including unnecessary headers on Windows */
 #undef WIN32_LEAN_AND_MEAN
 
diff --git a/configure b/configure
index f9c13a1..139ec1b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pulseaudio 5.0.
+# Generated by GNU Autoconf 2.69 for pulseaudio 5.99.1.
 #
 # Report bugs to <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pulseaudio'
 PACKAGE_TARNAME='pulseaudio'
-PACKAGE_VERSION='5.0'
-PACKAGE_STRING='pulseaudio 5.0'
+PACKAGE_VERSION='5.99.1'
+PACKAGE_STRING='pulseaudio 5.99.1'
 PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org'
 PACKAGE_URL='http://pulseaudio.org/'
 
@@ -643,6 +643,7 @@ PA_INCDIR
 PA_LIBDIR
 FORCE_PREOPEN_FALSE
 FORCE_PREOPEN_TRUE
+zshcompletiondir
 udevrulesdir
 PA_DLSEARCHPATH
 modlibexecdir
@@ -675,11 +676,20 @@ BUILD_MANPAGES_TRUE
 HAVE_SYSTEMD_JOURNAL_FALSE
 HAVE_SYSTEMD_JOURNAL_TRUE
 HAVE_SYSTEMD_JOURNAL
-JOURNAL_LIBS
-JOURNAL_CFLAGS
-HAVE_SYSTEMD_FALSE
-HAVE_SYSTEMD_TRUE
-HAVE_SYSTEMD
+SYSTEMDJOURNAL_LIBS
+SYSTEMDJOURNAL_CFLAGS
+HAVE_SYSTEMD_LOGIN_FALSE
+HAVE_SYSTEMD_LOGIN_TRUE
+HAVE_SYSTEMD_LOGIN
+SYSTEMDLOGIN_LIBS
+SYSTEMDLOGIN_CFLAGS
+HAVE_SYSTEMD_DAEMON_FALSE
+HAVE_SYSTEMD_DAEMON_TRUE
+HAVE_SYSTEMD_DAEMON
+PA_DEFAULT_AUTOSPAWN
+SYSTEMDDAEMON_LIBS
+SYSTEMDDAEMON_CFLAGS
+systemduserunitdir
 SYSTEMD_LIBS
 SYSTEMD_CFLAGS
 HAVE_ORCC_FALSE
@@ -717,6 +727,14 @@ HAVE_UDEV_TRUE
 HAVE_UDEV
 UDEV_LIBS
 UDEV_CFLAGS
+HAVE_BLUEZ_5_NATIVE_HEADSET_FALSE
+HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE
+HAVE_BLUEZ_5_NATIVE_HEADSET
+BLUEZ_LIBS
+BLUEZ_CFLAGS
+HAVE_BLUEZ_5_OFONO_HEADSET_FALSE
+HAVE_BLUEZ_5_OFONO_HEADSET_TRUE
+HAVE_BLUEZ_5_OFONO_HEADSET
 HAVE_BLUEZ_FALSE
 HAVE_BLUEZ_TRUE
 HAVE_BLUEZ
@@ -843,7 +861,6 @@ MANIFEST_TOOL
 RANLIB
 ac_ct_AR
 AR
-LN_S
 NM
 ac_ct_DUMPBIN
 DUMPBIN
@@ -947,6 +964,7 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+LN_S
 STOW
 host_os
 host_vendor
@@ -1072,6 +1090,8 @@ enable_lirc
 enable_dbus
 enable_bluez4
 enable_bluez5
+enable_bluez5_ofono_headset
+enable_bluez5_native_headset
 enable_udev
 enable_hal_compat
 enable_ipv6
@@ -1081,8 +1101,10 @@ with_speex
 enable_xen
 enable_gcov
 enable_orc
-enable_systemd
+enable_systemd_daemon
+enable_systemd_login
 enable_systemd_journal
+with_systemduserunitdir
 enable_manpages
 with_system_user
 with_system_group
@@ -1099,6 +1121,7 @@ enable_static_bins
 with_preopen_mods
 with_module_dir
 with_udev_rules_dir
+with_zsh_completion_dir
 enable_force_preopen
 '
       ac_precious_vars='build_alias
@@ -1147,6 +1170,8 @@ DBUS_CFLAGS
 DBUS_LIBS
 SBC_CFLAGS
 SBC_LIBS
+BLUEZ_CFLAGS
+BLUEZ_LIBS
 UDEV_CFLAGS
 UDEV_LIBS
 OPENSSL_CFLAGS
@@ -1159,8 +1184,12 @@ ORC_CFLAGS
 ORC_LIBS
 SYSTEMD_CFLAGS
 SYSTEMD_LIBS
-JOURNAL_CFLAGS
-JOURNAL_LIBS
+SYSTEMDDAEMON_CFLAGS
+SYSTEMDDAEMON_LIBS
+SYSTEMDLOGIN_CFLAGS
+SYSTEMDLOGIN_LIBS
+SYSTEMDJOURNAL_CFLAGS
+SYSTEMDJOURNAL_LIBS
 WEBRTC_CFLAGS
 WEBRTC_LIBS'
 
@@ -1703,7 +1732,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pulseaudio 5.0 to adapt to many kinds of systems.
+\`configure' configures pulseaudio 5.99.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1773,7 +1802,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pulseaudio 5.0:";;
+     short | recursive ) echo "Configuration of pulseaudio 5.99.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1823,6 +1852,12 @@ Optional Features:
   --disable-dbus          Disable optional D-Bus support
   --disable-bluez4        Disable optional BlueZ 4 support
   --disable-bluez5        Disable optional BlueZ 5 support
+  --disable-bluez5-ofono-headset
+                          Disable optional ofono headset backend support
+                          (Bluez 5)
+  --disable-bluez5-native-headset
+                          Disable optional native headset backend support
+                          (Bluez 5)
   --disable-udev          Disable optional UDEV support
   --disable-hal-compat    Disable optional HAL->udev transition compatibility
                           support
@@ -1831,7 +1866,10 @@ Optional Features:
   --disable-xen           Disable optional Xen paravirtualized driver
   --enable-gcov           Enable optional gcov coverage analysis
   --enable-orc            use Orc if installed
-  --disable-systemd       Disable optional systemd support
+  --disable-systemd-daemon
+                          Disable optional systemd daemon (socket activation)
+                          support
+  --disable-systemd-login Disable optional systemd login support
   --disable-systemd-journal
                           Disable optional systemd journal support
   --disable-manpages      Disable building and installation of man pages
@@ -1866,6 +1904,8 @@ Optional Packages:
                           Choose database backend.
   --without-fftw          Omit FFTW-using modules (equalizer)
   --without-speex         Omit speex (resampling, AEC)
+  --with-systemduserunitdir=DIR
+                          Directory for systemd user service files
   --with-system-user=<user>
                           User for running the PulseAudio daemon as a
                           system-wide instance (pulse)
@@ -1886,6 +1926,9 @@ Optional Packages:
                           to ${libdir}/pulse-${PA_MAJORMINOR}/modules
   --with-udev-rules-dir   Directory where to install udev rules to (defaults
                           to /lib/udev/rules.d)
+  --with-zsh-completion-dir
+                          Zsh completions directory (defaults to
+                          ${datadir}/zsh/site-functions)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1950,6 +1993,9 @@ Some influential environment variables:
   DBUS_LIBS   linker flags for DBUS, overriding pkg-config
   SBC_CFLAGS  C compiler flags for SBC, overriding pkg-config
   SBC_LIBS    linker flags for SBC, overriding pkg-config
+  BLUEZ_CFLAGS
+              C compiler flags for BLUEZ, overriding pkg-config
+  BLUEZ_LIBS  linker flags for BLUEZ, overriding pkg-config
   UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
   UDEV_LIBS   linker flags for UDEV, overriding pkg-config
   OPENSSL_CFLAGS
@@ -1968,10 +2014,18 @@ Some influential environment variables:
               C compiler flags for SYSTEMD, overriding pkg-config
   SYSTEMD_LIBS
               linker flags for SYSTEMD, overriding pkg-config
-  JOURNAL_CFLAGS
-              C compiler flags for JOURNAL, overriding pkg-config
-  JOURNAL_LIBS
-              linker flags for JOURNAL, overriding pkg-config
+  SYSTEMDDAEMON_CFLAGS
+              C compiler flags for SYSTEMDDAEMON, overriding pkg-config
+  SYSTEMDDAEMON_LIBS
+              linker flags for SYSTEMDDAEMON, overriding pkg-config
+  SYSTEMDLOGIN_CFLAGS
+              C compiler flags for SYSTEMDLOGIN, overriding pkg-config
+  SYSTEMDLOGIN_LIBS
+              linker flags for SYSTEMDLOGIN, overriding pkg-config
+  SYSTEMDJOURNAL_CFLAGS
+              C compiler flags for SYSTEMDJOURNAL, overriding pkg-config
+  SYSTEMDJOURNAL_LIBS
+              linker flags for SYSTEMDJOURNAL, overriding pkg-config
   WEBRTC_CFLAGS
               C compiler flags for WEBRTC, overriding pkg-config
   WEBRTC_LIBS linker flags for WEBRTC, overriding pkg-config
@@ -2043,7 +2097,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pulseaudio configure 5.0
+pulseaudio configure 5.99.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2633,7 +2687,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pulseaudio $as_me 5.0, which was
+It was created by pulseaudio $as_me 5.99.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3585,7 +3639,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pulseaudio'
- VERSION='5.0'
+ VERSION='5.99.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3812,12 +3866,12 @@ PA_MAJORMINOR=`echo $VERSION | cut -d. -f1 | cut -d- -f1`.`echo $VERSION | cut -
 
 PA_API_VERSION=12
 
-PA_PROTOCOL_VERSION=29
+PA_PROTOCOL_VERSION=30
 
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-LIBPULSE_VERSION_INFO=17:3:17
+LIBPULSE_VERSION_INFO=18:0:18
 
 
 # A simplified, synchronous, ABI-stable interface for client
@@ -4001,6 +4055,20 @@ AM_BACKSLASH='\'
 
 
 
+# ln -s
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+
 # CC
 
 ac_ext=c
@@ -9002,7 +9070,7 @@ esac
 
 #### Compiler flags ####
 
-for flag in -Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-par [...]
+for flag in -Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-par [...]
    as_CACHEVAR=`$as_echo "ax_cv_check_cflags_-pedantic -Werror_$flag" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
 $as_echo_n "checking whether C compiler accepts $flag... " >&6; }
@@ -9062,63 +9130,45 @@ fi
 done
 
 
-# Only enable fastpath asserts when doing a debug build, e.g. from bootstrap.sh.
 case " $CFLAGS " in #(
   *" -O0 "*) :
      ;; #(
   *) :
 
+    # Don't append the flag if it already exists.
+    # Only enable fastpath asserts when doing a debug build, e.g. from bootstrap.sh.
+
 if ${CPPFLAGS+:} false; then :
-  if $as_echo " $CPPFLAGS " | $GREP " "-DFASTPATH" " 2>&1 >/dev/null; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS already contains \"-DFASTPATH\""; } >&5
-  (: CPPFLAGS already contains "-DFASTPATH") 2>&5
+  if $as_echo " $CPPFLAGS " | $GREP " -DFASTPATH " 2>&1 >/dev/null; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS already contains -DFASTPATH"; } >&5
+  (: CPPFLAGS already contains -DFASTPATH) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS \"-DFASTPATH\"\""; } >&5
-  (: CPPFLAGS="$CPPFLAGS "-DFASTPATH"") 2>&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS -DFASTPATH\""; } >&5
+  (: CPPFLAGS="$CPPFLAGS -DFASTPATH") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-    as_fn_append CPPFLAGS " "-DFASTPATH""
+    as_fn_append CPPFLAGS " -DFASTPATH"
 fi
 else
-  CPPFLAGS="-DFASTPATH"
+  CPPFLAGS=-DFASTPATH
 fi
- ;;
-esac
 
-# Only set _FORTIFY_SOURCE when optimizations are enabled. If optimizations
-# are disabled, _FORTIFY_SOURCE doesn't do anything, and causes tons of
-# warnings during compiling on some distributions (at least Fedora).
-case " $CFLAGS " in #(
-  *" -O0 "*) :
-     ;; #(
-  *) :
 
-if ${CPPFLAGS+:} false; then :
-  if $as_echo " $CPPFLAGS " | $GREP " "-D_FORTIFY_SOURCE=2" " 2>&1 >/dev/null; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS already contains \"-D_FORTIFY_SOURCE=2\""; } >&5
-  (: CPPFLAGS already contains "-D_FORTIFY_SOURCE=2") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS \"-D_FORTIFY_SOURCE=2\"\""; } >&5
-  (: CPPFLAGS="$CPPFLAGS "-D_FORTIFY_SOURCE=2"") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-    as_fn_append CPPFLAGS " "-D_FORTIFY_SOURCE=2""
-fi
-else
-  CPPFLAGS="-D_FORTIFY_SOURCE=2"
-fi
+    # Cannot use AX_APPEND_FLAG here, as it assumes no space inside the added flags.
+    # Cannot append flags with AX_APPEND_FLAG one by one, as this would destroy all fortifications
+    # if CPPFLAGS already contain -D_FORTIFY_SOURCE=2.
+
+    # Warnings to be aware of that appear with -D_FORTIFY_SOURCE=2 but without -U_FORTIFY_SOURCE:
+    # On Fedora 20 with -O0: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
+    # On Gentoo with -O2:    "_FORTIFY_SOURCE" redefined [enabled by default]
+    as_fn_append CPPFLAGS " -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
  ;;
 esac
 
-
 #### Linker flags ####
 
 # Check whether the linker supports the -version-script option.
@@ -10184,17 +10234,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
@@ -23196,7 +23235,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -23242,7 +23281,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -23266,7 +23305,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -23311,7 +23350,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -23335,7 +23374,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -23376,6 +23415,67 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dladdr" >&5
+$as_echo_n "checking for library containing dladdr... " >&6; }
+if ${ac_cv_search_dladdr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dladdr ();
+int
+main ()
+{
+return dladdr ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dladdr=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dladdr+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dladdr+:} false; then :
+
+else
+  ac_cv_search_dladdr=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dladdr" >&5
+$as_echo "$ac_cv_search_dladdr" >&6; }
+ac_res=$ac_cv_search_dladdr
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  HAVE_DLADDR=1
+else
+  HAVE_DLADDR=0
+fi
+
+
+$as_echo "#define HAVE_DLADDR 1" >>confdefs.h
+
 
 ###################################
 #      External libraries         #
@@ -24012,66 +24112,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBJSON_PKG_ERRORS" >&5
 
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBJSON" >&5
-$as_echo_n "checking for LIBJSON... " >&6; }
-
-if test -n "$LIBJSON_CFLAGS"; then
-    pkg_cv_LIBJSON_CFLAGS="$LIBJSON_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json >= 0.9 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " json >= 0.9 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBJSON_CFLAGS=`$PKG_CONFIG --cflags " json >= 0.9 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBJSON_LIBS"; then
-    pkg_cv_LIBJSON_LIBS="$LIBJSON_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json >= 0.9 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " json >= 0.9 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBJSON_LIBS=`$PKG_CONFIG --libs " json >= 0.9 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBJSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " json >= 0.9 " 2>&1`
-        else
-	        LIBJSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " json >= 0.9 " 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBJSON_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements ( json >= 0.9 ) were not met:
+	as_fn_error $? "Package requirements ( json-c >= 0.11 ) were not met:
 
 $LIBJSON_PKG_ERRORS
 
@@ -24103,107 +24144,6 @@ else
 $as_echo "yes" >&6; }
 
 fi
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBJSON" >&5
-$as_echo_n "checking for LIBJSON... " >&6; }
-
-if test -n "$LIBJSON_CFLAGS"; then
-    pkg_cv_LIBJSON_CFLAGS="$LIBJSON_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json >= 0.9 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " json >= 0.9 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBJSON_CFLAGS=`$PKG_CONFIG --cflags " json >= 0.9 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBJSON_LIBS"; then
-    pkg_cv_LIBJSON_LIBS="$LIBJSON_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json >= 0.9 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " json >= 0.9 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBJSON_LIBS=`$PKG_CONFIG --libs " json >= 0.9 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBJSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " json >= 0.9 " 2>&1`
-        else
-	        LIBJSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " json >= 0.9 " 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBJSON_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements ( json >= 0.9 ) were not met:
-
-$LIBJSON_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBJSON_CFLAGS
-and LIBJSON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBJSON_CFLAGS
-and LIBJSON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	LIBJSON_CFLAGS=$pkg_cv_LIBJSON_CFLAGS
-	LIBJSON_LIBS=$pkg_cv_LIBJSON_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-else
-	LIBJSON_CFLAGS=$pkg_cv_LIBJSON_CFLAGS
-	LIBJSON_LIBS=$pkg_cv_LIBJSON_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
 
 #### Sound file ####
 
@@ -24432,6 +24372,11 @@ $as_echo "#define HAVE_LIBSAMPLERATE 1" >>confdefs.h
 
 fi
 
+if test "x$HAVE_LIBSAMPLERATE" = "x1"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Support for libsamplerate is DEPRECATED" >&5
+$as_echo "$as_me: WARNING: Support for libsamplerate is DEPRECATED" >&2;}
+fi
+
 #### Database support ####
 
 
@@ -26076,6 +26021,128 @@ else
 fi
 
 
+## Bluetooth Headset profiles backend ##
+
+# Check whether --enable-bluez5-ofono-headset was given.
+if test "${enable_bluez5_ofono_headset+set}" = set; then :
+  enableval=$enable_bluez5_ofono_headset;
+fi
+
+if test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_ofono_headset" != "xno"; then :
+  HAVE_BLUEZ_5_OFONO_HEADSET=1
+fi
+
+ if test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = x1; then
+  HAVE_BLUEZ_5_OFONO_HEADSET_TRUE=
+  HAVE_BLUEZ_5_OFONO_HEADSET_FALSE='#'
+else
+  HAVE_BLUEZ_5_OFONO_HEADSET_TRUE='#'
+  HAVE_BLUEZ_5_OFONO_HEADSET_FALSE=
+fi
+
+if test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = "x1"; then :
+
+$as_echo "#define HAVE_BLUEZ_5_OFONO_HEADSET 1" >>confdefs.h
+
+fi
+
+# Check whether --enable-bluez5-native-headset was given.
+if test "${enable_bluez5_native_headset+set}" = set; then :
+  enableval=$enable_bluez5_native_headset;
+fi
+
+if test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_native_headset" != "xno"; then :
+  HAVE_BLUEZ_5_NATIVE_HEADSET=1
+fi
+if test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLUEZ" >&5
+$as_echo_n "checking for BLUEZ... " >&6; }
+
+if test -n "$BLUEZ_CFLAGS"; then
+    pkg_cv_BLUEZ_CFLAGS="$BLUEZ_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" bluez >= 4.101 \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " bluez >= 4.101 ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags " bluez >= 4.101 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$BLUEZ_LIBS"; then
+    pkg_cv_BLUEZ_LIBS="$BLUEZ_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" bluez >= 4.101 \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " bluez >= 4.101 ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs " bluez >= 4.101 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " bluez >= 4.101 " 2>&1`
+        else
+	        BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " bluez >= 4.101 " 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$BLUEZ_PKG_ERRORS" >&5
+
+	as_fn_error $? "*** Bluez library not found (required by native headset backend)" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "*** Bluez library not found (required by native headset backend)" "$LINENO" 5
+else
+	BLUEZ_CFLAGS=$pkg_cv_BLUEZ_CFLAGS
+	BLUEZ_LIBS=$pkg_cv_BLUEZ_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+fi
+
+
+ if test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = x1; then
+  HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE=
+  HAVE_BLUEZ_5_NATIVE_HEADSET_FALSE='#'
+else
+  HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE='#'
+  HAVE_BLUEZ_5_NATIVE_HEADSET_FALSE=
+fi
+
+if test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"; then :
+
+$as_echo "#define HAVE_BLUEZ_5_NATIVE_HEADSET 1" >>confdefs.h
+
+fi
+
 #### UDEV support (optional) ####
 
 # Check whether --enable-udev was given.
@@ -26861,13 +26928,28 @@ fi
 
 #### systemd support (optional) ####
 
-# Check whether --enable-systemd was given.
-if test "${enable_systemd+set}" = set; then :
-  enableval=$enable_systemd;
+# Check whether --enable-systemd-daemon was given.
+if test "${enable_systemd_daemon+set}" = set; then :
+  enableval=$enable_systemd_daemon;
+fi
+
+
+# Check whether --enable-systemd-login was given.
+if test "${enable_systemd_login+set}" = set; then :
+  enableval=$enable_systemd_login;
+fi
+
+
+# Check whether --enable-systemd-journal was given.
+if test "${enable_systemd_journal+set}" = set; then :
+  enableval=$enable_systemd_journal;
 fi
 
 
-if test "x$enable_systemd" != "xno"; then :
+# Newer systemd's combine their subcomponent libraries into one
+# If it exists, we should use it for the further checks
+
+if test "x$enable_systemd_daemon" != "xno" || test "x$enable_systemd_login" != "xno" || test "x$enable_systemd_journal" != "xno"; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
@@ -26877,12 +26959,12 @@ if test -n "$SYSTEMD_CFLAGS"; then
     pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd-login \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libsystemd-login ") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " libsystemd ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags " libsystemd-login " 2>/dev/null`
+  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags " libsystemd " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -26894,12 +26976,12 @@ if test -n "$SYSTEMD_LIBS"; then
     pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd-login \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libsystemd-login ") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " libsystemd ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs " libsystemd-login " 2>/dev/null`
+  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs " libsystemd " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -26920,9 +27002,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libsystemd-login " 2>&1`
+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libsystemd " 2>&1`
         else
-	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libsystemd-login " 2>&1`
+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libsystemd " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SYSTEMD_PKG_ERRORS" >&5
@@ -26943,41 +27025,243 @@ else
   HAVE_SYSTEMD=0
 fi
 
-if test "x$enable_systemd" = "xyes" && test "x$HAVE_SYSTEMD" = "x0"; then :
-  as_fn_error $? "*** Needed systemd support not found" "$LINENO" 5
+if test "x$HAVE_SYSTEMD" = "x1"; then :
+
+        HAVE_SYSTEMD_DAEMON=1
+        HAVE_SYSTEMD_LOGIN=1
+        HAVE_SYSTEMD_JOURNAL=1
+
 fi
 
 
- if test "x$HAVE_SYSTEMD" = x1; then
-  HAVE_SYSTEMD_TRUE=
-  HAVE_SYSTEMD_FALSE='#'
+# Check whether --with-systemduserunitdir was given.
+if test "${with_systemduserunitdir+set}" = set; then :
+  withval=$with_systemduserunitdir;
 else
-  HAVE_SYSTEMD_TRUE='#'
-  HAVE_SYSTEMD_FALSE=
+  with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)
 fi
 
-if test "x$HAVE_SYSTEMD" = "x1"; then :
+if test "x$with_systemduserunitdir" != xno; then
+        systemduserunitdir=$with_systemduserunitdir
 
-$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
+fi
+
+#### systemd daemon support (optional) ####
 
+if test "x$enable_systemd_daemon" != "xno"; then :
+  if test "x$HAVE_SYSTEMD_DAEMON" != "x1"; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMDDAEMON" >&5
+$as_echo_n "checking for SYSTEMDDAEMON... " >&6; }
+
+if test -n "$SYSTEMDDAEMON_CFLAGS"; then
+    pkg_cv_SYSTEMDDAEMON_CFLAGS="$SYSTEMDDAEMON_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd-daemon \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " libsystemd-daemon ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMDDAEMON_CFLAGS=`$PKG_CONFIG --cflags " libsystemd-daemon " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMDDAEMON_LIBS"; then
+    pkg_cv_SYSTEMDDAEMON_LIBS="$SYSTEMDDAEMON_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd-daemon \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " libsystemd-daemon ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMDDAEMON_LIBS=`$PKG_CONFIG --libs " libsystemd-daemon " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
 
-#### journal support (optional) ####
 
-# Check whether --enable-systemd-journal was given.
-if test "${enable_systemd_journal+set}" = set; then :
-  enableval=$enable_systemd_journal;
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMDDAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libsystemd-daemon " 2>&1`
+        else
+	        SYSTEMDDAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libsystemd-daemon " 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMDDAEMON_PKG_ERRORS" >&5
+
+	HAVE_SYSTEMD_DAEMON=0
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_SYSTEMD_DAEMON=0
+else
+	SYSTEMDDAEMON_CFLAGS=$pkg_cv_SYSTEMDDAEMON_CFLAGS
+	SYSTEMDDAEMON_LIBS=$pkg_cv_SYSTEMDDAEMON_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_SYSTEMD_DAEMON=1
+fi
+fi
+else
+  HAVE_SYSTEMD_DAEMON=0
+fi
+
+if test "x$enable_systemd_daemon" = "xyes" && test "x$HAVE_SYSTEMD_DAEMON" = "x0"; then :
+  as_fn_error $? "*** Needed systemd daemon support not found" "$LINENO" 5
+fi
+
+if test "x$HAVE_SYSTEMD_DAEMON" = "x1"; then :
+   PA_DEFAULT_AUTOSPAWN=no
+else
+   PA_DEFAULT_AUTOSPAWN=yes
+fi
+
+
+
+ if test "x$HAVE_SYSTEMD_DAEMON" = x1; then
+  HAVE_SYSTEMD_DAEMON_TRUE=
+  HAVE_SYSTEMD_DAEMON_FALSE='#'
+else
+  HAVE_SYSTEMD_DAEMON_TRUE='#'
+  HAVE_SYSTEMD_DAEMON_FALSE=
+fi
+
+if test "x$HAVE_SYSTEMD_DAEMON" = "x1"; then :
+
+$as_echo "#define HAVE_SYSTEMD_DAEMON 1" >>confdefs.h
+
 fi
 
+#### systemd login support (optional) ####
+
+if test "x$enable_systemd_login" != "xno"; then :
+  if test "x$HAVE_SYSTEMD_LOGIN" != "x1"; then :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMDLOGIN" >&5
+$as_echo_n "checking for SYSTEMDLOGIN... " >&6; }
+
+if test -n "$SYSTEMDLOGIN_CFLAGS"; then
+    pkg_cv_SYSTEMDLOGIN_CFLAGS="$SYSTEMDLOGIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd-login \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " libsystemd-login ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMDLOGIN_CFLAGS=`$PKG_CONFIG --cflags " libsystemd-login " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMDLOGIN_LIBS"; then
+    pkg_cv_SYSTEMDLOGIN_LIBS="$SYSTEMDLOGIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd-login \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " libsystemd-login ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMDLOGIN_LIBS=`$PKG_CONFIG --libs " libsystemd-login " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMDLOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libsystemd-login " 2>&1`
+        else
+	        SYSTEMDLOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libsystemd-login " 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMDLOGIN_PKG_ERRORS" >&5
+
+	HAVE_SYSTEMD_LOGIN=0
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_SYSTEMD_LOGIN=0
+else
+	SYSTEMDLOGIN_CFLAGS=$pkg_cv_SYSTEMDLOGIN_CFLAGS
+	SYSTEMDLOGIN_LIBS=$pkg_cv_SYSTEMDLOGIN_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_SYSTEMD_LOGIN=1
+fi
+fi
+else
+  HAVE_SYSTEMD_LOGIN=0
+fi
+
+if test "x$enable_systemd_login" = "xyes" && test "x$HAVE_SYSTEMD_LOGIN" = "x0"; then :
+  as_fn_error $? "*** Needed systemd login support not found" "$LINENO" 5
+fi
+
+
+ if test "x$HAVE_SYSTEMD_LOGIN" = x1; then
+  HAVE_SYSTEMD_LOGIN_TRUE=
+  HAVE_SYSTEMD_LOGIN_FALSE='#'
+else
+  HAVE_SYSTEMD_LOGIN_TRUE='#'
+  HAVE_SYSTEMD_LOGIN_FALSE=
+fi
+
+if test "x$HAVE_SYSTEMD_LOGIN" = "x1"; then :
+
+$as_echo "#define HAVE_SYSTEMD_LOGIN 1" >>confdefs.h
+
+fi
+
+#### systemd journal support (optional) ####
 
 if test "x$enable_systemd_journal" != "xno"; then :
+  if test "x$HAVE_SYSTEMD_JOURNAL" != "x1"; then :
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JOURNAL" >&5
-$as_echo_n "checking for JOURNAL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMDJOURNAL" >&5
+$as_echo_n "checking for SYSTEMDJOURNAL... " >&6; }
 
-if test -n "$JOURNAL_CFLAGS"; then
-    pkg_cv_JOURNAL_CFLAGS="$JOURNAL_CFLAGS"
+if test -n "$SYSTEMDJOURNAL_CFLAGS"; then
+    pkg_cv_SYSTEMDJOURNAL_CFLAGS="$SYSTEMDJOURNAL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd-journal \""; } >&5
@@ -26985,7 +27269,7 @@ if test -n "$JOURNAL_CFLAGS"; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags " libsystemd-journal " 2>/dev/null`
+  pkg_cv_SYSTEMDJOURNAL_CFLAGS=`$PKG_CONFIG --cflags " libsystemd-journal " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -26993,8 +27277,8 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$JOURNAL_LIBS"; then
-    pkg_cv_JOURNAL_LIBS="$JOURNAL_LIBS"
+if test -n "$SYSTEMDJOURNAL_LIBS"; then
+    pkg_cv_SYSTEMDJOURNAL_LIBS="$SYSTEMDJOURNAL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libsystemd-journal \""; } >&5
@@ -27002,7 +27286,7 @@ if test -n "$JOURNAL_LIBS"; then
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_JOURNAL_LIBS=`$PKG_CONFIG --libs " libsystemd-journal " 2>/dev/null`
+  pkg_cv_SYSTEMDJOURNAL_LIBS=`$PKG_CONFIG --libs " libsystemd-journal " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -27023,12 +27307,12 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libsystemd-journal " 2>&1`
+	        SYSTEMDJOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libsystemd-journal " 2>&1`
         else
-	        JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libsystemd-journal " 2>&1`
+	        SYSTEMDJOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libsystemd-journal " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$JOURNAL_PKG_ERRORS" >&5
+	echo "$SYSTEMDJOURNAL_PKG_ERRORS" >&5
 
 	HAVE_SYSTEMD_JOURNAL=0
 elif test $pkg_failed = untried; then
@@ -27036,12 +27320,13 @@ elif test $pkg_failed = untried; then
 $as_echo "no" >&6; }
 	HAVE_SYSTEMD_JOURNAL=0
 else
-	JOURNAL_CFLAGS=$pkg_cv_JOURNAL_CFLAGS
-	JOURNAL_LIBS=$pkg_cv_JOURNAL_LIBS
+	SYSTEMDJOURNAL_CFLAGS=$pkg_cv_SYSTEMDJOURNAL_CFLAGS
+	SYSTEMDJOURNAL_LIBS=$pkg_cv_SYSTEMDJOURNAL_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	HAVE_SYSTEMD_JOURNAL=1
 fi
+fi
 else
   HAVE_SYSTEMD_JOURNAL=0
 fi
@@ -27061,7 +27346,7 @@ fi
 
 if test "x$HAVE_SYSTEMD_JOURNAL" = "x1"; then :
 
-$as_echo "#define HAVE_JOURNAL 1" >>confdefs.h
+$as_echo "#define HAVE_SYSTEMD_JOURNAL 1" >>confdefs.h
 
 fi
 
@@ -27463,9 +27748,6 @@ $as_echo "#define ENABLE_LEGACY_DATABASE_ENTRY_FORMAT 1" >>confdefs.h
 
 fi
 
-$as_echo "#define WIBBLE 1" >>confdefs.h
-
-
 # Check whether --enable-static-bins was given.
 if test "${enable_static_bins+set}" = set; then :
   enableval=$enable_static_bins;
@@ -27544,6 +27826,17 @@ fi
 
 
 
+
+# Check whether --with-zsh-completion-dir was given.
+if test "${with_zsh_completion_dir+set}" = set; then :
+  withval=$with_zsh_completion_dir; zshcompletiondir=$withval
+else
+  zshcompletiondir="${datadir}/zsh/site-functions"
+fi
+
+
+
+
 # Check whether --enable-force-preopen was given.
 if test "${enable_force_preopen+set}" = set; then :
   enableval=$enable_force_preopen;
@@ -27565,15 +27858,13 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile libpulse.pc libpulse-simple.pc libpulse-mainloop-glib.pc doxygen/Makefile doxygen/doxygen.conf src/pulse/version.h po/Makefile.in man/pulseaudio.1.xml man/esdcompat.1.xml man/pax11publish.1.xml man/paplay.1.xml man/pacat.1.xml man/pacmd.1.xml man/pactl.1.xml man/pasuspender.1.xml man/padsp.1.xml man/pulse-daemon.conf.5.xml man/pulse-client.conf.5.xml man/default.pa.5.xml man/pulse-cli-syntax.5.xml man/start-pulseaudio-k [...]
+ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile libpulse.pc libpulse-simple.pc libpulse-mainloop-glib.pc doxygen/Makefile doxygen/doxygen.conf src/pulse/version.h po/Makefile.in man/pulseaudio.1.xml man/esdcompat.1.xml man/pax11publish.1.xml man/paplay.1.xml man/pacat.1.xml man/pacmd.1.xml man/pactl.1.xml man/pasuspender.1.xml man/padsp.1.xml man/pulse-daemon.conf.5.xml man/pulse-client.conf.5.xml man/default.pa.5.xml man/pulse-cli-syntax.5.xml man/start-pulseaudio-x [...]
 
 
 ac_config_files="$ac_config_files src/esdcompat:src/daemon/esdcompat.in"
 
 ac_config_files="$ac_config_files src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in"
 
-ac_config_files="$ac_config_files src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in"
-
 ac_config_files="$ac_config_files src/client.conf:src/pulse/client.conf.in"
 
 ac_config_files="$ac_config_files src/daemon.conf:src/daemon/daemon.conf.in"
@@ -27582,6 +27873,12 @@ ac_config_files="$ac_config_files src/default.pa:src/daemon/default.pa.in"
 
 ac_config_files="$ac_config_files src/system.pa:src/daemon/system.pa.in"
 
+if test "x$HAVE_SYSTEMD_DAEMON" = "x1"; then :
+
+        ac_config_files="$ac_config_files src/pulseaudio.service:src/daemon/systemd/user/pulseaudio.service.in"
+
+
+fi
 
 # CMake related ProjectConfig files
 PA_LIBDIR="$libdir"
@@ -27900,6 +28197,14 @@ if test -z "${HAVE_BLUEZ_TRUE}" && test -z "${HAVE_BLUEZ_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_BLUEZ\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_BLUEZ_5_OFONO_HEADSET_TRUE}" && test -z "${HAVE_BLUEZ_5_OFONO_HEADSET_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_BLUEZ_5_OFONO_HEADSET\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE}" && test -z "${HAVE_BLUEZ_5_NATIVE_HEADSET_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_BLUEZ_5_NATIVE_HEADSET\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_UDEV_TRUE}" && test -z "${HAVE_UDEV_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_UDEV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27936,8 +28241,12 @@ if test -z "${HAVE_ORCC_TRUE}" && test -z "${HAVE_ORCC_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_ORCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined.
+if test -z "${HAVE_SYSTEMD_DAEMON_TRUE}" && test -z "${HAVE_SYSTEMD_DAEMON_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_SYSTEMD_DAEMON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_SYSTEMD_LOGIN_TRUE}" && test -z "${HAVE_SYSTEMD_LOGIN_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_SYSTEMD_LOGIN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_SYSTEMD_JOURNAL_TRUE}" && test -z "${HAVE_SYSTEMD_JOURNAL_FALSE}"; then
@@ -28369,7 +28678,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pulseaudio $as_me 5.0, which was
+This file was extended by pulseaudio $as_me 5.99.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28436,7 +28745,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pulseaudio config.status 5.0
+pulseaudio config.status 5.99.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -28976,15 +29285,14 @@ do
     "man/pulse-client.conf.5.xml") CONFIG_FILES="$CONFIG_FILES man/pulse-client.conf.5.xml" ;;
     "man/default.pa.5.xml") CONFIG_FILES="$CONFIG_FILES man/default.pa.5.xml" ;;
     "man/pulse-cli-syntax.5.xml") CONFIG_FILES="$CONFIG_FILES man/pulse-cli-syntax.5.xml" ;;
-    "man/start-pulseaudio-kde.1.xml") CONFIG_FILES="$CONFIG_FILES man/start-pulseaudio-kde.1.xml" ;;
     "man/start-pulseaudio-x11.1.xml") CONFIG_FILES="$CONFIG_FILES man/start-pulseaudio-x11.1.xml" ;;
     "src/esdcompat") CONFIG_FILES="$CONFIG_FILES src/esdcompat:src/daemon/esdcompat.in" ;;
     "src/start-pulseaudio-x11") CONFIG_FILES="$CONFIG_FILES src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in" ;;
-    "src/start-pulseaudio-kde") CONFIG_FILES="$CONFIG_FILES src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in" ;;
     "src/client.conf") CONFIG_FILES="$CONFIG_FILES src/client.conf:src/pulse/client.conf.in" ;;
     "src/daemon.conf") CONFIG_FILES="$CONFIG_FILES src/daemon.conf:src/daemon/daemon.conf.in" ;;
     "src/default.pa") CONFIG_FILES="$CONFIG_FILES src/default.pa:src/daemon/default.pa.in" ;;
     "src/system.pa") CONFIG_FILES="$CONFIG_FILES src/system.pa:src/daemon/system.pa.in" ;;
+    "src/pulseaudio.service") CONFIG_FILES="$CONFIG_FILES src/pulseaudio.service:src/daemon/systemd/user/pulseaudio.service.in" ;;
     "PulseAudioConfig.cmake") CONFIG_FILES="$CONFIG_FILES PulseAudioConfig.cmake:PulseAudioConfig.cmake.in" ;;
     "PulseAudioConfigVersion.cmake") CONFIG_FILES="$CONFIG_FILES PulseAudioConfigVersion.cmake" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -30591,7 +30899,6 @@ _LT_EOF
  ;;
     "src/esdcompat":F) chmod +x src/esdcompat ;;
     "src/start-pulseaudio-x11":F) chmod +x src/start-pulseaudio-x11 ;;
-    "src/start-pulseaudio-kde":F) chmod +x src/start-pulseaudio-kde ;;
     "src/daemon.conf":F) m4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf ;;
     "src/default.pa":F) m4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa ;;
     "src/system.pa":F) m4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa ;;
@@ -30742,10 +31049,15 @@ if test "x$HAVE_UDEV" = "x1"; then :
 else
   ENABLE_UDEV=no
 fi
-if test "x$HAVE_SYSTEMD" = "x1"; then :
-  ENABLE_SYSTEMD=yes
+if test "x$HAVE_SYSTEMD_DAEMON" = "x1"; then :
+  ENABLE_SYSTEMD_DAEMON=yes
+else
+  ENABLE_SYSTEMD_DAEMON=no
+fi
+if test "x$HAVE_SYSTEMD_LOGIN" = "x1"; then :
+  ENABLE_SYSTEMD_LOGIN=yes
 else
-  ENABLE_SYSTEMD=no
+  ENABLE_SYSTEMD_LOGIN=no
 fi
 if test "x$HAVE_SYSTEMD_JOURNAL" = "x1"; then :
   ENABLE_SYSTEMD_JOURNAL=yes
@@ -30762,6 +31074,16 @@ if test "x$HAVE_BLUEZ_5" = "x1"; then :
 else
   ENABLE_BLUEZ_5=no
 fi
+if test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = "x1"; then :
+  ENABLE_BLUEZ_5_OFONO_HEADSET=yes
+else
+  ENABLE_BLUEZ_5_OFONO_HEADSET=no
+fi
+if test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"; then :
+  ENABLE_BLUEZ_5_NATIVE_HEADSET=yes
+else
+  ENABLE_BLUEZ_5_NATIVE_HEADSET=no
+fi
 if test "x$HAVE_HAL_COMPAT" = "x1"; then :
   ENABLE_HAL_COMPAT=yes
 else
@@ -30773,7 +31095,7 @@ else
   ENABLE_TCPWRAP=no
 fi
 if test "x$HAVE_LIBSAMPLERATE" = "x1"; then :
-  ENABLE_LIBSAMPLERATE=yes
+  ENABLE_LIBSAMPLERATE="yes (DEPRECATED)"
 else
   ENABLE_LIBSAMPLERATE=no
 fi
@@ -30863,6 +31185,7 @@ echo "
     System Runtime Path:           ${PA_SYSTEM_RUNTIME_PATH}
     System State Path:             ${PA_SYSTEM_STATE_PATH}
     System Config Path:            ${PA_SYSTEM_CONFIG_PATH}
+    Zsh completions directory:     ${zshcompletiondir}
     Compiler:                      ${CC}
     CFLAGS:                        ${CFLAGS}
     CPPFLAGS:                      ${CPPFLAGS}
@@ -30887,10 +31210,14 @@ echo "
     Enable D-Bus:                  ${ENABLE_DBUS}
       Enable BlueZ 4:              ${ENABLE_BLUEZ_4}
       Enable BlueZ 5:              ${ENABLE_BLUEZ_5}
+        Enable ofono headsets:     ${ENABLE_BLUEZ_5_OFONO_HEADSET}
+        Enable native headsets:    ${ENABLE_BLUEZ_5_NATIVE_HEADSET}
     Enable udev:                   ${ENABLE_UDEV}
       Enable HAL->udev compat:     ${ENABLE_HAL_COMPAT}
-    Enable systemd login:          ${ENABLE_SYSTEMD}
-    Enable systemd journal:        ${ENABLE_SYSTEMD_JOURNAL}
+    Enable systemd
+      Daemon (Socket Activation):  ${ENABLE_SYSTEMD_DAEMON}
+      Login (Session Tracking):    ${ENABLE_SYSTEMD_LOGIN}
+      Journal (Logging):           ${ENABLE_SYSTEMD_JOURNAL}
     Enable TCP Wrappers:           ${ENABLE_TCPWRAP}
     Enable libsamplerate:          ${ENABLE_LIBSAMPLERATE}
     Enable IPv6:                   ${ENABLE_IPV6}
diff --git a/configure.ac b/configure.ac
index 4854711..433236b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,11 +41,11 @@ AC_SUBST(PA_MINOR, pa_minor)
 AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)
 
 AC_SUBST(PA_API_VERSION, 12)
-AC_SUBST(PA_PROTOCOL_VERSION, 29)
+AC_SUBST(PA_PROTOCOL_VERSION, 30)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-AC_SUBST(LIBPULSE_VERSION_INFO, [17:3:17])
+AC_SUBST(LIBPULSE_VERSION_INFO, [18:0:18])
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold y=z
@@ -74,6 +74,10 @@ AM_SILENT_RULES([yes])
 
 AC_PROG_MKDIR_P
 
+# ln -s
+
+AC_PROG_LN_S
+
 # CC
 
 AC_PROG_CC
@@ -174,17 +178,23 @@ esac
 #### Compiler flags ####
 
 AX_APPEND_COMPILE_FLAGS(
-    [-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter  [...]
+    [-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter  [...]
     [], [-pedantic -Werror])
 
-# Only enable fastpath asserts when doing a debug build, e.g. from bootstrap.sh.
-AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [AX_APPEND_FLAG(["-DFASTPATH"], [CPPFLAGS])])
+AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [
+    # Don't append the flag if it already exists.
+    # Only enable fastpath asserts when doing a debug build, e.g. from bootstrap.sh.
+    AX_APPEND_FLAG([-DFASTPATH], [CPPFLAGS])
 
-# Only set _FORTIFY_SOURCE when optimizations are enabled. If optimizations
-# are disabled, _FORTIFY_SOURCE doesn't do anything, and causes tons of
-# warnings during compiling on some distributions (at least Fedora).
-AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [AX_APPEND_FLAG(["-D_FORTIFY_SOURCE=2"], [CPPFLAGS])])
+    # Cannot use AX_APPEND_FLAG here, as it assumes no space inside the added flags.
+    # Cannot append flags with AX_APPEND_FLAG one by one, as this would destroy all fortifications
+    # if CPPFLAGS already contain -D_FORTIFY_SOURCE=2.
 
+    # Warnings to be aware of that appear with -D_FORTIFY_SOURCE=2 but without -U_FORTIFY_SOURCE:
+    # On Fedora 20 with -O0: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
+    # On Gentoo with -O2:    "_FORTIFY_SOURCE" redefined [enabled by default]
+    AS_VAR_APPEND([CPPFLAGS],[" -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"])
+])
 
 #### Linker flags ####
 
@@ -574,6 +584,8 @@ AC_SYS_LARGEFILE
 # Check for open64 to know if the current system does have open64() and similar functions
 AC_CHECK_FUNCS_ONCE([open64])
 
+AC_SEARCH_LIBS([dladdr], [dl], [HAVE_DLADDR=1], [HAVE_DLADDR=0])
+AC_DEFINE(HAVE_DLADDR, [1], [Have dladdr?])
 
 ###################################
 #      External libraries         #
@@ -636,8 +648,7 @@ AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1])
 
 #### json parsing ####
 
-PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [],
-		  [PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])])
+PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ])
 
 #### Sound file ####
 
@@ -673,6 +684,8 @@ AS_IF([test "x$enable_samplerate" = "xyes" && test "x$HAVE_LIBSAMPLERATE" = "x0"
 AM_CONDITIONAL([HAVE_LIBSAMPLERATE], [test "x$HAVE_LIBSAMPLERATE" = x1])
 AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], AC_DEFINE([HAVE_LIBSAMPLERATE], 1, [Have libsamplerate?]))
 
+AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], AC_MSG_WARN([Support for libsamplerate is DEPRECATED]))
+
 #### Database support ####
 
 AC_ARG_WITH([database],
@@ -1022,6 +1035,25 @@ AS_IF([test "x$HAVE_BLUEZ_4" = "x1" || test "x$HAVE_BLUEZ_5" = "x1"], HAVE_BLUEZ
 AC_SUBST(HAVE_BLUEZ)
 AM_CONDITIONAL([HAVE_BLUEZ], [test "x$HAVE_BLUEZ" = x1])
 
+## Bluetooth Headset profiles backend ##
+
+AC_ARG_ENABLE([bluez5-ofono-headset],
+    AS_HELP_STRING([--disable-bluez5-ofono-headset],[Disable optional ofono headset backend support (Bluez 5)]))
+AS_IF([test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_ofono_headset" != "xno"], HAVE_BLUEZ_5_OFONO_HEADSET=1)
+AC_SUBST(HAVE_BLUEZ_5_OFONO_HEADSET)
+AM_CONDITIONAL([HAVE_BLUEZ_5_OFONO_HEADSET], [test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = x1])
+AS_IF([test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = "x1"], AC_DEFINE([HAVE_BLUEZ_5_OFONO_HEADSET], 1, [Bluez 5 ofono headset backend enabled]))
+
+AC_ARG_ENABLE([bluez5-native-headset],
+    AS_HELP_STRING([--disable-bluez5-native-headset],[Disable optional native headset backend support (Bluez 5)]))
+AS_IF([test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_native_headset" != "xno"], HAVE_BLUEZ_5_NATIVE_HEADSET=1)
+AS_IF([test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"], [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 4.101 ], [],
+    [AC_MSG_ERROR([*** Bluez library not found (required by native headset backend)])])])
+
+AC_SUBST(HAVE_BLUEZ_5_NATIVE_HEADSET)
+AM_CONDITIONAL([HAVE_BLUEZ_5_NATIVE_HEADSET], [test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = x1])
+AS_IF([test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"], AC_DEFINE([HAVE_BLUEZ_5_NATIVE_HEADSET], 1, [Bluez 5 native headset backend enabled]))
+
 #### UDEV support (optional) ####
 
 AC_ARG_ENABLE([udev],
@@ -1154,27 +1186,69 @@ ORC_CHECK([0.4.11])
 
 #### systemd support (optional) ####
 
-AC_ARG_ENABLE([systemd],
-    AS_HELP_STRING([--disable-systemd],[Disable optional systemd support]))
+AC_ARG_ENABLE([systemd-daemon],
+    AS_HELP_STRING([--disable-systemd-daemon],[Disable optional systemd daemon (socket activation) support]))
 
-AS_IF([test "x$enable_systemd" != "xno"],
-    [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)],
+AC_ARG_ENABLE([systemd-login],
+    AS_HELP_STRING([--disable-systemd-login],[Disable optional systemd login support]))
+
+AC_ARG_ENABLE([systemd-journal],
+    AS_HELP_STRING([--disable-systemd-journal],[Disable optional systemd journal support]))
+
+# Newer systemd's combine their subcomponent libraries into one
+# If it exists, we should use it for the further checks
+
+AS_IF([test "x$enable_systemd_daemon" != "xno" || test "x$enable_systemd_login" != "xno" || test "x$enable_systemd_journal" != "xno"],
+    [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)],
     HAVE_SYSTEMD=0)
 
-AS_IF([test "x$enable_systemd" = "xyes" && test "x$HAVE_SYSTEMD" = "x0"],
-    [AC_MSG_ERROR([*** Needed systemd support not found])])
+AS_IF([test "x$HAVE_SYSTEMD" = "x1"],
+    [
+        HAVE_SYSTEMD_DAEMON=1
+        HAVE_SYSTEMD_LOGIN=1
+        HAVE_SYSTEMD_JOURNAL=1
+    ])
 
-AC_SUBST(HAVE_SYSTEMD)
-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$HAVE_SYSTEMD" = x1])
-AS_IF([test "x$HAVE_SYSTEMD" = "x1"], AC_DEFINE([HAVE_SYSTEMD], 1, [Have SYSTEMD?]))
+AC_ARG_WITH([systemduserunitdir],
+        AS_HELP_STRING([--with-systemduserunitdir=DIR], [Directory for systemd user service files]),
+        [], [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)])
+if test "x$with_systemduserunitdir" != xno; then
+        AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])
+fi
 
-#### journal support (optional) ####
+#### systemd daemon support (optional) ####
 
-AC_ARG_ENABLE([systemd-journal],
-    AS_HELP_STRING([--disable-systemd-journal],[Disable optional systemd journal support]))
+AS_IF([test "x$enable_systemd_daemon" != "xno"],
+    [AS_IF([test "x$HAVE_SYSTEMD_DAEMON" != "x1"], [PKG_CHECK_MODULES(SYSTEMDDAEMON, [ libsystemd-daemon ], HAVE_SYSTEMD_DAEMON=1, HAVE_SYSTEMD_DAEMON=0)])],
+    HAVE_SYSTEMD_DAEMON=0)
+
+AS_IF([test "x$enable_systemd_daemon" = "xyes" && test "x$HAVE_SYSTEMD_DAEMON" = "x0"],
+    [AC_MSG_ERROR([*** Needed systemd daemon support not found])])
+
+AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], [ PA_DEFAULT_AUTOSPAWN=no ], [ PA_DEFAULT_AUTOSPAWN=yes ])
+AC_SUBST(PA_DEFAULT_AUTOSPAWN)
+
+AC_SUBST(HAVE_SYSTEMD_DAEMON)
+AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = x1])
+AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], AC_DEFINE([HAVE_SYSTEMD_DAEMON], 1, [Have SYSTEMDDAEMON?]))
+
+#### systemd login support (optional) ####
+
+AS_IF([test "x$enable_systemd_login" != "xno"],
+    [AS_IF([test "x$HAVE_SYSTEMD_LOGIN" != "x1"], [PKG_CHECK_MODULES(SYSTEMDLOGIN, [ libsystemd-login ], HAVE_SYSTEMD_LOGIN=1, HAVE_SYSTEMD_LOGIN=0)])],
+    HAVE_SYSTEMD_LOGIN=0)
+
+AS_IF([test "x$enable_systemd_login" = "xyes" && test "x$HAVE_SYSTEMD_LOGIN" = "x0"],
+    [AC_MSG_ERROR([*** Needed systemd login support not found])])
+
+AC_SUBST(HAVE_SYSTEMD_LOGIN)
+AM_CONDITIONAL([HAVE_SYSTEMD_LOGIN], [test "x$HAVE_SYSTEMD_LOGIN" = x1])
+AS_IF([test "x$HAVE_SYSTEMD_LOGIN" = "x1"], AC_DEFINE([HAVE_SYSTEMD_LOGIN], 1, [Have SYSTEMDLOGIN?]))
+
+#### systemd journal support (optional) ####
 
 AS_IF([test "x$enable_systemd_journal" != "xno"],
-    [PKG_CHECK_MODULES(JOURNAL, [ libsystemd-journal ], HAVE_SYSTEMD_JOURNAL=1, HAVE_SYSTEMD_JOURNAL=0)],
+    [AS_IF([test "x$HAVE_SYSTEMD_JOURNAL" != "x1"], [PKG_CHECK_MODULES(SYSTEMDJOURNAL, [ libsystemd-journal ], HAVE_SYSTEMD_JOURNAL=1, HAVE_SYSTEMD_JOURNAL=0)])],
     HAVE_SYSTEMD_JOURNAL=0)
 
 AS_IF([test "x$enable_systemd_journal" = "xyes" && test "x$HAVE_SYSTEMD_JOURNAL" = "x0"],
@@ -1182,7 +1256,7 @@ AS_IF([test "x$enable_systemd_journal" = "xyes" && test "x$HAVE_SYSTEMD_JOURNAL"
 
 AC_SUBST(HAVE_SYSTEMD_JOURNAL)
 AM_CONDITIONAL([HAVE_SYSTEMD_JOURNAL], [test "x$HAVE_SYSTEMD_JOURNAL" = x1])
-AS_IF([test "x$HAVE_SYSTEMD_JOURNAL" = "x1"], AC_DEFINE([HAVE_JOURNAL], 1, [Have JOURNAL?]))
+AS_IF([test "x$HAVE_SYSTEMD_JOURNAL" = "x1"], AC_DEFINE([HAVE_SYSTEMD_JOURNAL], 1, [Have SYSTEMDJOURNAL?]))
 
 #### Build and Install man pages ####
 
@@ -1312,7 +1386,6 @@ AC_ARG_ENABLE([legacy-database-entry-format],
 if test "x$enable_legacy_database_entry_format" != "xno" ; then
         AC_DEFINE(ENABLE_LEGACY_DATABASE_ENTRY_FORMAT, [1], [Legacy database entry format])
 fi
-AC_DEFINE([WIBBLE], 1, [Just a test.])
 
 AC_ARG_ENABLE([static-bins],
     AS_HELP_STRING([--enable-static-bins],[Statically link executables.]))
@@ -1347,6 +1420,13 @@ AC_ARG_WITH(
 
 AC_SUBST(udevrulesdir)
 
+AC_ARG_WITH(
+        [zsh-completion-dir],
+        AS_HELP_STRING([--with-zsh-completion-dir], [Zsh completions directory (defaults to ${datadir}/zsh/site-functions)]),
+        [zshcompletiondir=$withval], [zshcompletiondir="${datadir}/zsh/site-functions"])
+
+AC_SUBST(zshcompletiondir)
+
 AC_ARG_ENABLE([force-preopen],
     AS_HELP_STRING([--enable-force-preopen],[Preopen modules, even when dlopen() is supported.]))
 
@@ -1382,13 +1462,11 @@ man/pulse-daemon.conf.5.xml
 man/pulse-client.conf.5.xml
 man/default.pa.5.xml
 man/pulse-cli-syntax.5.xml
-man/start-pulseaudio-kde.1.xml
 man/start-pulseaudio-x11.1.xml
 ])
 
 AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat])
 AC_CONFIG_FILES([src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in], [chmod +x src/start-pulseaudio-x11])
-AC_CONFIG_FILES([src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in], [chmod +x src/start-pulseaudio-kde])
 AC_CONFIG_FILES([src/client.conf:src/pulse/client.conf.in])
 AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in],
     [m4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf])
@@ -1396,6 +1474,10 @@ AC_CONFIG_FILES([src/default.pa:src/daemon/default.pa.in],
     [m4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa])
 AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.in],
     [m4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa])
+AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"],
+    [
+        AC_CONFIG_FILES([src/pulseaudio.service:src/daemon/systemd/user/pulseaudio.service.in])
+    ])
 
 # CMake related ProjectConfig files
 PA_LIBDIR="$libdir"
@@ -1428,13 +1510,16 @@ AS_IF([test "x$HAVE_LIRC" = "x1"], ENABLE_LIRC=yes, ENABLE_LIRC=no)
 AS_IF([test "x$HAVE_XEN" = "x1"], ENABLE_XEN=yes, ENABLE_XEN=no)
 AS_IF([test "x$HAVE_DBUS" = "x1"], ENABLE_DBUS=yes, ENABLE_DBUS=no)
 AS_IF([test "x$HAVE_UDEV" = "x1"], ENABLE_UDEV=yes, ENABLE_UDEV=no)
-AS_IF([test "x$HAVE_SYSTEMD" = "x1"], ENABLE_SYSTEMD=yes, ENABLE_SYSTEMD=no)
+AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], ENABLE_SYSTEMD_DAEMON=yes, ENABLE_SYSTEMD_DAEMON=no)
+AS_IF([test "x$HAVE_SYSTEMD_LOGIN" = "x1"], ENABLE_SYSTEMD_LOGIN=yes, ENABLE_SYSTEMD_LOGIN=no)
 AS_IF([test "x$HAVE_SYSTEMD_JOURNAL" = "x1"], ENABLE_SYSTEMD_JOURNAL=yes, ENABLE_SYSTEMD_JOURNAL=no)
 AS_IF([test "x$HAVE_BLUEZ_4" = "x1"], ENABLE_BLUEZ_4=yes, ENABLE_BLUEZ_4=no)
 AS_IF([test "x$HAVE_BLUEZ_5" = "x1"], ENABLE_BLUEZ_5=yes, ENABLE_BLUEZ_5=no)
+AS_IF([test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = "x1"], ENABLE_BLUEZ_5_OFONO_HEADSET=yes, ENABLE_BLUEZ_5_OFONO_HEADSET=no)
+AS_IF([test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x1"], ENABLE_BLUEZ_5_NATIVE_HEADSET=yes, ENABLE_BLUEZ_5_NATIVE_HEADSET=no)
 AS_IF([test "x$HAVE_HAL_COMPAT" = "x1"], ENABLE_HAL_COMPAT=yes, ENABLE_HAL_COMPAT=no)
 AS_IF([test "x$HAVE_TCPWRAP" = "x1"], ENABLE_TCPWRAP=yes, ENABLE_TCPWRAP=no)
-AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], ENABLE_LIBSAMPLERATE=yes, ENABLE_LIBSAMPLERATE=no)
+AS_IF([test "x$HAVE_LIBSAMPLERATE" = "x1"], ENABLE_LIBSAMPLERATE="yes (DEPRECATED)", ENABLE_LIBSAMPLERATE=no)
 AS_IF([test "x$HAVE_IPV6" = "x1"], ENABLE_IPV6=yes, ENABLE_IPV6=no)
 AS_IF([test "x$HAVE_OPENSSL" = "x1"], ENABLE_OPENSSL=yes, ENABLE_OPENSSL=no)
 AS_IF([test "x$HAVE_FFTW" = "x1"], ENABLE_FFTW=yes, ENABLE_FFTW=no)
@@ -1461,6 +1546,7 @@ echo "
     System Runtime Path:           ${PA_SYSTEM_RUNTIME_PATH}
     System State Path:             ${PA_SYSTEM_STATE_PATH}
     System Config Path:            ${PA_SYSTEM_CONFIG_PATH}
+    Zsh completions directory:     ${zshcompletiondir}
     Compiler:                      ${CC}
     CFLAGS:                        ${CFLAGS}
     CPPFLAGS:                      ${CPPFLAGS}
@@ -1485,10 +1571,14 @@ echo "
     Enable D-Bus:                  ${ENABLE_DBUS}
       Enable BlueZ 4:              ${ENABLE_BLUEZ_4}
       Enable BlueZ 5:              ${ENABLE_BLUEZ_5}
+        Enable ofono headsets:     ${ENABLE_BLUEZ_5_OFONO_HEADSET}
+        Enable native headsets:    ${ENABLE_BLUEZ_5_NATIVE_HEADSET}
     Enable udev:                   ${ENABLE_UDEV}
       Enable HAL->udev compat:     ${ENABLE_HAL_COMPAT}
-    Enable systemd login:          ${ENABLE_SYSTEMD}
-    Enable systemd journal:        ${ENABLE_SYSTEMD_JOURNAL}
+    Enable systemd
+      Daemon (Socket Activation):  ${ENABLE_SYSTEMD_DAEMON}
+      Login (Session Tracking):    ${ENABLE_SYSTEMD_LOGIN}
+      Journal (Logging):           ${ENABLE_SYSTEMD_JOURNAL}
     Enable TCP Wrappers:           ${ENABLE_TCPWRAP}
     Enable libsamplerate:          ${ENABLE_LIBSAMPLERATE}
     Enable IPv6:                   ${ENABLE_IPV6}
diff --git a/doxygen/Makefile.in b/doxygen/Makefile.in
index 1389d94..379a54d 100644
--- a/doxygen/Makefile.in
+++ b/doxygen/Makefile.in
@@ -154,6 +154,8 @@ AUTOMAKE = @AUTOMAKE@
 AVAHI_CFLAGS = @AVAHI_CFLAGS@
 AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
+BLUEZ_CFLAGS = @BLUEZ_CFLAGS@
+BLUEZ_LIBS = @BLUEZ_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -201,13 +203,16 @@ HAVE_AVAHI = @HAVE_AVAHI@
 HAVE_BLUEZ = @HAVE_BLUEZ@
 HAVE_BLUEZ_4 = @HAVE_BLUEZ_4@
 HAVE_BLUEZ_5 = @HAVE_BLUEZ_5@
+HAVE_BLUEZ_5_NATIVE_HEADSET = @HAVE_BLUEZ_5_NATIVE_HEADSET@
+HAVE_BLUEZ_5_OFONO_HEADSET = @HAVE_BLUEZ_5_OFONO_HEADSET@
 HAVE_DBUS = @HAVE_DBUS@
 HAVE_GLIB20 = @HAVE_GLIB20@
 HAVE_MKFIFO = @HAVE_MKFIFO@
 HAVE_NEON = @HAVE_NEON@
 HAVE_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
-HAVE_SYSTEMD = @HAVE_SYSTEMD@
+HAVE_SYSTEMD_DAEMON = @HAVE_SYSTEMD_DAEMON@
 HAVE_SYSTEMD_JOURNAL = @HAVE_SYSTEMD_JOURNAL@
+HAVE_SYSTEMD_LOGIN = @HAVE_SYSTEMD_LOGIN@
 HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@
 HAVE_UDEV = @HAVE_UDEV@
 HAVE_WAVEOUT = @HAVE_WAVEOUT@
@@ -230,8 +235,6 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JACK_CFLAGS = @JACK_CFLAGS@
 JACK_LIBS = @JACK_LIBS@
-JOURNAL_CFLAGS = @JOURNAL_CFLAGS@
-JOURNAL_LIBS = @JOURNAL_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@
@@ -298,6 +301,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PA_ACCESS_GROUP = @PA_ACCESS_GROUP@
 PA_API_VERSION = @PA_API_VERSION@
 PA_BINARY = @PA_BINARY@
+PA_DEFAULT_AUTOSPAWN = @PA_DEFAULT_AUTOSPAWN@
 PA_DEFAULT_CONFIG_DIR = @PA_DEFAULT_CONFIG_DIR@
 PA_DLSEARCHPATH = @PA_DLSEARCHPATH@
 PA_INCDIR = @PA_INCDIR@
@@ -331,6 +335,12 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STOW = @STOW@
 STRIP = @STRIP@
+SYSTEMDDAEMON_CFLAGS = @SYSTEMDDAEMON_CFLAGS@
+SYSTEMDDAEMON_LIBS = @SYSTEMDDAEMON_LIBS@
+SYSTEMDJOURNAL_CFLAGS = @SYSTEMDJOURNAL_CFLAGS@
+SYSTEMDJOURNAL_LIBS = @SYSTEMDJOURNAL_LIBS@
+SYSTEMDLOGIN_CFLAGS = @SYSTEMDLOGIN_CFLAGS@
+SYSTEMDLOGIN_LIBS = @SYSTEMDLOGIN_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TDB_CFLAGS = @TDB_CFLAGS@
@@ -403,11 +413,13 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemduserunitdir = @systemduserunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udevrulesdir = @udevrulesdir@
+zshcompletiondir = @zshcompletiondir@
 all: all-am
 
 .SUFFIXES:
diff --git a/doxygen/doxygen.conf.in b/doxygen/doxygen.conf.in
index a078e27..82ccad6 100644
--- a/doxygen/doxygen.conf.in
+++ b/doxygen/doxygen.conf.in
@@ -1,21 +1,30 @@
-# Doxyfile 1.3.8
+# Doxyfile 1.8.3.1
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a hash (#) is considered a comment and will be ignored.
 # The format is:
 #       TAG = value [value, ...]
 # For lists items can also be appended using:
 #       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# Values that contain spaces should be placed between quotes (" ").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
 
 PROJECT_NAME           = PulseAudio
 
@@ -25,6 +34,19 @@ PROJECT_NAME           = PulseAudio
 
 PROJECT_NUMBER         = @PACKAGE_VERSION@
 
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
 # If a relative path is entered, it will be relative to the location
@@ -35,9 +57,9 @@ OUTPUT_DIRECTORY       =
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
 # format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of source
-# files, where putting all generated files in the same directory would otherwise
-# cause performance problems for the file system.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
 
 CREATE_SUBDIRS         = NO
 
@@ -45,24 +67,15 @@ CREATE_SUBDIRS         = NO
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
 # The default language is English, other supported languages are:
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
-# Swedish, and Ukrainian.
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
 # include brief member descriptions after the members that are listed in
 # the file and class documentation (similar to JavaDoc).
@@ -80,11 +93,12 @@ REPEAT_BRIEF           = YES
 # This tag implements a quasi-intelligent brief description abbreviator
 # that is used to form the text in various listings. Each string
 # in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is used
-# as the annotated text. Otherwise, the brief description is used as-is. If left
-# blank, the following values are used ("$name" is automatically replaced with the
-# name of the entity): "The $name class" "The $name widget" "The $name file"
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       =
 
@@ -94,10 +108,10 @@ ABBREVIATE_BRIEF       =
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
-# members of a class in the documentation of that class as if those members were
-# ordinary class members. Constructors, destructors and assignment operators of
-# the base classes will not be shown.
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
@@ -112,7 +126,9 @@ FULL_PATH_NAMES        = NO
 # only done if one of the specified strings matches the left-hand part of
 # the path. The tag can be used to show relative paths in the file list.
 # If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# path to strip. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxygen is
+# started.
 
 STRIP_FROM_PATH        =
 
@@ -126,7 +142,7 @@ STRIP_FROM_PATH        =
 STRIP_FROM_INC_PATH    =
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# (but less readable) file names. This can be useful if your file system
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
@@ -134,11 +150,19 @@ SHORT_NAMES            = NO
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
 # will interpret the first line (until the first dot) of a JavaDoc-style
 # comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
-# explicit @brief command for a brief description.
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = YES
 
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
 # comments) as a brief description. This used to be the default behaviour.
@@ -147,25 +171,17 @@ JAVADOC_AUTOBRIEF      = YES
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
 # member inherits the documentation from any documented member that it
 # re-implements.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
 
-DISTRIBUTE_GROUP_DOC   = NO
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
@@ -181,20 +197,104 @@ TAB_SIZE               = 4
 
 ALIASES                =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C.
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
 # For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
-# only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented classes,
+# or namespaces to their corresponding documentation. Such a link can be
+# prevented in individual cases by by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
 # the same type (for instance a group of public functions) to be put as a
 # subgroup of that type (e.g. under the Public Functions section). Set it to
@@ -203,6 +303,59 @@ OPTIMIZE_OUTPUT_JAVA   = NO
 
 SUBGROUPING            = YES
 
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE      = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -219,6 +372,11 @@ EXTRACT_ALL            = YES
 
 EXTRACT_PRIVATE        = NO
 
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
@@ -237,6 +395,14 @@ EXTRACT_LOCAL_CLASSES  = YES
 
 EXTRACT_LOCAL_METHODS  = NO
 
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
 # undocumented members of documented classes, files or namespaces.
 # If set to NO (the default) these members will be included in the
@@ -293,6 +459,12 @@ HIDE_SCOPE_NAMES       = NO
 
 SHOW_INCLUDE_FILES     = NO
 
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
 # If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
@@ -312,6 +484,22 @@ SORT_MEMBER_DOCS       = YES
 
 SORT_BRIEF_DOCS        = NO
 
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
 # sorted by fully-qualified names, including namespaces. If set to
 # NO (the default), the class list will be sorted only by class name,
@@ -322,6 +510,15 @@ SORT_BRIEF_DOCS        = NO
 
 SORT_BY_SCOPE_NAME     = NO
 
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
 # The GENERATE_TODOLIST tag can be used to enable (YES) or
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
@@ -344,18 +541,19 @@ GENERATE_BUGLIST       = NO
 # disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
-GENERATE_DEPRECATEDLIST= NO
+GENERATE_DEPRECATEDLIST= YES
 
 # The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# documentation sections, marked by \if section-label ... \endif
+# and \cond section-label ... \endcond blocks.
 
 ENABLED_SECTIONS       =
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
+# the initial value of a variable or macro consists of for it to appear in
 # the documentation. If the initializer consists of more lines than specified
 # here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
+# The appearance of the initializer of individual variables and macros in the
 # documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
@@ -367,6 +565,49 @@ MAX_INITIALIZER_LINES  = 30
 
 SHOW_USED_FILES        = YES
 
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path. Do not use
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES         =
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -395,10 +636,20 @@ WARN_IF_UNDOCUMENTED   = YES
 
 WARN_IF_DOC_ERROR      = YES
 
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that
 # doxygen can produce. The string should contain the $file, $line, and $text
 # tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text.
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
@@ -417,44 +668,53 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT = \
-    @srcdir@/../src/pulse/channelmap.h \
-    @srcdir@/../src/pulse/context.h \
-    @srcdir@/../src/pulse/def.h \
-    @srcdir@/../src/pulse/error.h \
-    @srcdir@/../src/pulse/ext-stream-restore.h \
-    @srcdir@/../src/pulse/ext-device-manager.h \
-    @srcdir@/../src/pulse/ext-device-restore.h \
-    @srcdir@/../src/pulse/format.h \
-    @srcdir@/../src/pulse/gccmacro.h \
-    @srcdir@/../src/pulse/glib-mainloop.h \
-    @srcdir@/../src/pulse/introspect.h \
-    @srcdir@/../src/pulse/mainloop-api.h \
-    @srcdir@/../src/pulse/mainloop-signal.h \
-    @srcdir@/../src/pulse/mainloop.h \
-    @srcdir@/../src/pulse/operation.h \
-    @srcdir@/../src/pulse/proplist.h \
-    @srcdir@/../src/pulse/pulseaudio.h \
-    @srcdir@/../src/pulse/rtclock.h \
-    @srcdir@/../src/pulse/sample.h \
-    @srcdir@/../src/pulse/scache.h \
-    @srcdir@/../src/pulse/simple.h \
-    @srcdir@/../src/pulse/stream.h \
-    @srcdir@/../src/pulse/subscribe.h \
-    @srcdir@/../src/pulse/thread-mainloop.h \
-    @srcdir@/../src/pulse/timeval.h \
-    @srcdir@/../src/pulse/utf8.h \
-    @srcdir@/../src/pulse/util.h \
-    @srcdir@/../src/pulse/version.h \
-    @srcdir@/../src/pulse/volume.h \
-    @srcdir@/../src/pulse/xmalloc.h \
+INPUT                  = @srcdir@/../src/pulse/channelmap.h \
+                         @srcdir@/../src/pulse/context.h \
+                         @srcdir@/../src/pulse/def.h \
+                         @srcdir@/../src/pulse/direction.h \
+                         @srcdir@/../src/pulse/error.h \
+                         @srcdir@/../src/pulse/ext-stream-restore.h \
+                         @srcdir@/../src/pulse/ext-device-manager.h \
+                         @srcdir@/../src/pulse/ext-device-restore.h \
+                         @srcdir@/../src/pulse/format.h \
+                         @srcdir@/../src/pulse/gccmacro.h \
+                         @srcdir@/../src/pulse/glib-mainloop.h \
+                         @srcdir@/../src/pulse/introspect.h \
+                         @srcdir@/../src/pulse/mainloop-api.h \
+                         @srcdir@/../src/pulse/mainloop-signal.h \
+                         @srcdir@/../src/pulse/mainloop.h \
+                         @srcdir@/../src/pulse/operation.h \
+                         @srcdir@/../src/pulse/proplist.h \
+                         @srcdir@/../src/pulse/pulseaudio.h \
+                         @srcdir@/../src/pulse/rtclock.h \
+                         @srcdir@/../src/pulse/sample.h \
+                         @srcdir@/../src/pulse/scache.h \
+                         @srcdir@/../src/pulse/simple.h \
+                         @srcdir@/../src/pulse/stream.h \
+                         @srcdir@/../src/pulse/subscribe.h \
+                         @srcdir@/../src/pulse/thread-mainloop.h \
+                         @srcdir@/../src/pulse/timeval.h \
+                         @srcdir@/../src/pulse/utf8.h \
+                         @srcdir@/../src/pulse/util.h \
+                         @srcdir@/../src/pulse/version.h \
+                         @srcdir@/../src/pulse/volume.h \
+                         @srcdir@/../src/pulse/xmalloc.h
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
 
 FILE_PATTERNS          =
 
@@ -464,28 +724,42 @@ FILE_PATTERNS          =
 
 RECURSIVE              = NO
 
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
 EXCLUDE                =
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       =
 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = @srcdir@/../src/utils @srcdir@/../src/tests
+EXAMPLE_PATH           = @srcdir@/../src/utils \
+                         @srcdir@/../src/tests
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -512,17 +786,20 @@ IMAGE_PATH             =
 # by executing (via popen()) the command <filter> <input-file>, where <filter>
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
 # input file. Doxygen will then use the output that the filter program writes
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
 # ignored.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.  Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.  The filters are a list of the form:
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
 # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
@@ -532,6 +809,21 @@ FILTER_PATTERNS        =
 
 FILTER_SOURCE_FILES    = NO
 
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page (index.html).
+# This can be useful if you have a project on for instance GitHub and want reuse
+# the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -550,22 +842,38 @@ INLINE_SOURCES         = NO
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
 # doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# If the REFERENCED_BY_RELATION tag is set to YES
 # then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default)
+# If the REFERENCES_RELATION tag is set to YES
 # then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
 # will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.
@@ -593,7 +901,8 @@ COLS_IN_ALPHA_INDEX    = 5
 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
-IGNORE_PREFIX          = pa_ PA_
+IGNORE_PREFIX          = pa_ \
+                         PA_
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
@@ -618,7 +927,14 @@ HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a personal HTML header for
 # each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
+# standard header. Note that when using a custom header you are responsible
+#  for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
 
 HTML_HEADER            =
 
@@ -630,22 +946,120 @@ HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# fine-tune the look of the HTML output. If left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
+# tag will in the future become obsolete.
 
 HTML_STYLESHEET        =
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor more
+# robust against future updates. Doxygen will copy the style sheet file to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-HTML_ALIGN_MEMBERS     = YES
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files
 # will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
@@ -670,6 +1084,12 @@ HHC_LOCATION           =
 
 GENERATE_CHI           = NO
 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
 # controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
@@ -681,32 +1101,223 @@ BINARY_TOC             = NO
 
 TOC_EXPAND             = NO
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
 
-DISABLE_INDEX          = NO
+GENERATE_QHP           = NO
 
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
 
-ENUM_VALUES_PER_LINE   = 1
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
 # is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
 
 GENERATE_TREEVIEW      = YES
 
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 1
+
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 250
 
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
+# SVG. The default value is HTML-CSS, which is slower, but has the best
+# compatibility.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript.
+# There are two flavours of web server based search depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools.
+# See the manual for details.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
+# the search results. Doxygen ships with an example indexer (doxyindexer) and
+# search engine (doxysearch.cgi) which are based on the open source search engine
+# library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will returned the search results when EXTERNAL_SEARCH is enabled.
+# Doxygen ships with an example search engine (doxysearch) which is based on
+# the open source search engine library Xapian. See the manual for configuration
+# details.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
+# of to a relative location where the documentation can be found.
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -724,6 +1335,9 @@ LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
@@ -740,7 +1354,7 @@ MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
 
 # The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
+# by the printer. Possible values are: a4, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
@@ -757,6 +1371,13 @@ EXTRA_PACKAGES         =
 
 LATEX_HEADER           =
 
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           =
+
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
 # is prepared for conversion to pdf (using ps2pdf). The pdf file will
 # contain links (just like the HTML output) instead of page references
@@ -783,6 +1404,19 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE        = plain
+
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -814,7 +1448,7 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# Load style sheet definitions from file. Syntax is similar to doxygen's
 # config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
@@ -919,8 +1553,10 @@ GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
 
 # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.  This is useful
-# if you want to understand what is going on.  On the other hand, if this
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
 # tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
@@ -952,12 +1588,12 @@ MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
 # then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = YES
 
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
 
 SEARCH_INCLUDES        = YES
 
@@ -978,22 +1614,25 @@ INCLUDE_FILE_PATTERNS  =
 # are defined before the preprocessor is started (similar to the -D option of
 # gcc). The argument of the tag is a list of macros of the form: name
 # or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed.
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
 
-PREDEFINED             = PA_C_DECL_BEGIN= PA_C_DECL_END=
+PREDEFINED             = PA_C_DECL_BEGIN= \
+                         PA_C_DECL_END=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
 # The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
 
-#EXPAND_AS_DEFINED      = PA_C_DECL_BEGIN, PA_C_DECL_END
+EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse the
-# parser if not removed.
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
@@ -1001,20 +1640,18 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#   TAGFILES = file1 file2 ...
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
-#   TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
@@ -1045,13 +1682,22 @@ PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
-# super classes. Setting the tag to NO turns the diagrams off. Note that this
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
-# recommended to install and use dot, since it yields more powerful graphs.
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented
 # or is not a class.
@@ -1065,10 +1711,38 @@ HIDE_UNDOC_RELATIONS   = YES
 
 HAVE_DOT               = NO
 
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH           =
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
@@ -1079,12 +1753,26 @@ CLASS_GRAPH            = YES
 
 COLLABORATION_GRAPH    = YES
 
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 
 UML_LOOK               = NO
 
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
 # If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
@@ -1104,27 +1792,53 @@ INCLUDE_GRAPH          = YES
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
+# will generate a graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = YES
 
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
 
 DOT_IMAGE_FORMAT       = png
 
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG        = NO
+
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
+# found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               =
 
@@ -1134,33 +1848,47 @@ DOT_PATH               =
 
 DOTFILE_DIRS           =
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+MSCFILE_DIRS           =
 
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
 # graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes that
-# lay further from the root node will be omitted. Note that setting this option to
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that a graph may be further truncated if the graph's image dimensions are
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
 # generate a legend page explaining the meaning of the various boxes and
 # arrows in the dot generated graphs.
@@ -1172,14 +1900,3 @@ GENERATE_LEGEND        = YES
 # the various graphs.
 
 DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
-
-SHOW_DIRECTORIES=NO
diff --git a/man/Makefile.am b/man/Makefile.am
index d0cc8e7..d80ba6a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -32,7 +32,6 @@ noinst_DATA = \
 	pulse-client.conf.5.xml \
 	default.pa.5.xml \
 	pulse-cli-syntax.5.xml \
-	start-pulseaudio-kde.1.xml \
 	start-pulseaudio-x11.1.xml
 
 xmllint: $(noinst_DATA)
@@ -56,7 +55,6 @@ dist_man_MANS = \
 	pulse-client.conf.5 \
 	default.pa.5 \
 	pulse-cli-syntax.5 \
-	start-pulseaudio-kde.1 \
 	start-pulseaudio-x11.1
 
 CLEANFILES = \
@@ -81,7 +79,6 @@ EXTRA_DIST = \
 	pulse-client.conf.5.xml.in \
 	default.pa.5.xml.in \
 	pulse-cli-syntax.5.xml.in \
-	start-pulseaudio-kde.1.xml.in \
 	start-pulseaudio-x11.1.xml.in \
 	xmltoman \
 	xmltoman.css \
diff --git a/man/Makefile.in b/man/Makefile.in
index aa1c594..af32f02 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -105,7 +105,6 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/pulse-client.conf.5.xml.in \
 	$(srcdir)/default.pa.5.xml.in \
 	$(srcdir)/pulse-cli-syntax.5.xml.in \
-	$(srcdir)/start-pulseaudio-kde.1.xml.in \
 	$(srcdir)/start-pulseaudio-x11.1.xml.in $(dist_man_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \
@@ -131,7 +130,7 @@ CONFIG_CLEAN_FILES = pulseaudio.1.xml esdcompat.1.xml \
 	pactl.1.xml pasuspender.1.xml padsp.1.xml \
 	pulse-daemon.conf.5.xml pulse-client.conf.5.xml \
 	default.pa.5.xml pulse-cli-syntax.5.xml \
-	start-pulseaudio-kde.1.xml start-pulseaudio-x11.1.xml
+	start-pulseaudio-x11.1.xml
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_ at AM_V@)
 am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -202,6 +201,8 @@ AUTOMAKE = @AUTOMAKE@
 AVAHI_CFLAGS = @AVAHI_CFLAGS@
 AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
+BLUEZ_CFLAGS = @BLUEZ_CFLAGS@
+BLUEZ_LIBS = @BLUEZ_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -249,13 +250,16 @@ HAVE_AVAHI = @HAVE_AVAHI@
 HAVE_BLUEZ = @HAVE_BLUEZ@
 HAVE_BLUEZ_4 = @HAVE_BLUEZ_4@
 HAVE_BLUEZ_5 = @HAVE_BLUEZ_5@
+HAVE_BLUEZ_5_NATIVE_HEADSET = @HAVE_BLUEZ_5_NATIVE_HEADSET@
+HAVE_BLUEZ_5_OFONO_HEADSET = @HAVE_BLUEZ_5_OFONO_HEADSET@
 HAVE_DBUS = @HAVE_DBUS@
 HAVE_GLIB20 = @HAVE_GLIB20@
 HAVE_MKFIFO = @HAVE_MKFIFO@
 HAVE_NEON = @HAVE_NEON@
 HAVE_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
-HAVE_SYSTEMD = @HAVE_SYSTEMD@
+HAVE_SYSTEMD_DAEMON = @HAVE_SYSTEMD_DAEMON@
 HAVE_SYSTEMD_JOURNAL = @HAVE_SYSTEMD_JOURNAL@
+HAVE_SYSTEMD_LOGIN = @HAVE_SYSTEMD_LOGIN@
 HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@
 HAVE_UDEV = @HAVE_UDEV@
 HAVE_WAVEOUT = @HAVE_WAVEOUT@
@@ -278,8 +282,6 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JACK_CFLAGS = @JACK_CFLAGS@
 JACK_LIBS = @JACK_LIBS@
-JOURNAL_CFLAGS = @JOURNAL_CFLAGS@
-JOURNAL_LIBS = @JOURNAL_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@
@@ -346,6 +348,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PA_ACCESS_GROUP = @PA_ACCESS_GROUP@
 PA_API_VERSION = @PA_API_VERSION@
 PA_BINARY = @PA_BINARY@
+PA_DEFAULT_AUTOSPAWN = @PA_DEFAULT_AUTOSPAWN@
 PA_DEFAULT_CONFIG_DIR = @PA_DEFAULT_CONFIG_DIR@
 PA_DLSEARCHPATH = @PA_DLSEARCHPATH@
 PA_INCDIR = @PA_INCDIR@
@@ -379,6 +382,12 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STOW = @STOW@
 STRIP = @STRIP@
+SYSTEMDDAEMON_CFLAGS = @SYSTEMDDAEMON_CFLAGS@
+SYSTEMDDAEMON_LIBS = @SYSTEMDDAEMON_LIBS@
+SYSTEMDJOURNAL_CFLAGS = @SYSTEMDJOURNAL_CFLAGS@
+SYSTEMDJOURNAL_LIBS = @SYSTEMDJOURNAL_LIBS@
+SYSTEMDLOGIN_CFLAGS = @SYSTEMDLOGIN_CFLAGS@
+SYSTEMDLOGIN_LIBS = @SYSTEMDLOGIN_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TDB_CFLAGS = @TDB_CFLAGS@
@@ -451,11 +460,13 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemduserunitdir = @systemduserunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udevrulesdir = @udevrulesdir@
+zshcompletiondir = @zshcompletiondir@
 DISTCLEANFILES = \
 	$(noinst_DATA)
 
@@ -473,7 +484,6 @@ noinst_DATA = \
 	pulse-client.conf.5.xml \
 	default.pa.5.xml \
 	pulse-cli-syntax.5.xml \
-	start-pulseaudio-kde.1.xml \
 	start-pulseaudio-x11.1.xml
 
 @BUILD_MANPAGES_TRUE at dist_man_MANS = \
@@ -490,7 +500,6 @@ noinst_DATA = \
 @BUILD_MANPAGES_TRUE@	pulse-client.conf.5 \
 @BUILD_MANPAGES_TRUE@	default.pa.5 \
 @BUILD_MANPAGES_TRUE@	pulse-cli-syntax.5 \
- at BUILD_MANPAGES_TRUE@	start-pulseaudio-kde.1 \
 @BUILD_MANPAGES_TRUE@	start-pulseaudio-x11.1
 
 @BUILD_MANPAGES_TRUE at CLEANFILES = \
@@ -510,7 +519,6 @@ EXTRA_DIST = \
 	pulse-client.conf.5.xml.in \
 	default.pa.5.xml.in \
 	pulse-cli-syntax.5.xml.in \
-	start-pulseaudio-kde.1.xml.in \
 	start-pulseaudio-x11.1.xml.in \
 	xmltoman \
 	xmltoman.css \
@@ -576,8 +584,6 @@ default.pa.5.xml: $(top_builddir)/config.status $(srcdir)/default.pa.5.xml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 pulse-cli-syntax.5.xml: $(top_builddir)/config.status $(srcdir)/pulse-cli-syntax.5.xml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-start-pulseaudio-kde.1.xml: $(top_builddir)/config.status $(srcdir)/start-pulseaudio-kde.1.xml.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 start-pulseaudio-x11.1.xml: $(top_builddir)/config.status $(srcdir)/start-pulseaudio-x11.1.xml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
diff --git a/man/default.pa.5 b/man/default.pa.5
index 76ba8d6..f71afb2 100644
--- a/man/default.pa.5
+++ b/man/default.pa.5
@@ -4,10 +4,10 @@ default.pa \- PulseAudio Sound Server Startup Script
 .SH SYNOPSIS
 \fB\fI~/.config/pulse/default.pa\fB
 
-\fI/etc/pulse/default.pa\fB
+\fI/usr/local/etc/pulse/default.pa\fB
 \f1
 .SH DESCRIPTION
-The PulseAudio sound server interprets the file \fI~/.config/pulse/default.pa\f1 on startup, and when that file doesn't exist \fI/etc/pulse/default.pa\f1. It should contain directives in the PulseAudio CLI language, as documented in \fBpulse-cli-syntax(5)\f1.
+The PulseAudio sound server interprets the file \fI~/.config/pulse/default.pa\f1 on startup, and when that file doesn't exist \fI/usr/local/etc/pulse/default.pa\f1. It should contain directives in the PulseAudio CLI language, as documented in \fBpulse-cli-syntax(5)\f1.
 
 The same commands can also be entered during runtime in the \fBpacmd(1)\f1 tool, allowing flexible runtime reconfiguration.
 .SH AUTHORS
diff --git a/man/pactl.1 b/man/pactl.1
index 13abdef..76783ef 100644
--- a/man/pactl.1
+++ b/man/pactl.1
@@ -27,8 +27,8 @@ Choose the server to connect to.
 Specify the client name \fIpactl\f1 shall pass to the server when connecting.
 .SH COMMANDS
 .TP
-\fBstat\f1 [\fIshort\f1]
-Dump a few statistics about the memory usage of the PulseAudio daemon. (Note: for backwards compatibility, we also show the output of the \fIinfo\f1 command. In order to only show statistics, use the optional \fIshort\f1 argument. In a future version of PA we will make this the default)
+\fBstat\f1
+Dump a few statistics about the memory usage of the PulseAudio daemon.
 .TP
 \fBinfo\f1
 Dump some info about the PulseAudio daemon.
@@ -84,17 +84,17 @@ Set the specified source (identified by its symbolic name or numerical index) to
 \fBset-port-latency-offset\f1 \fICARD\f1 \fIPORT\f1 \fIOFFSET\f1
 Set a latency offset to a specified port (identified by its symbolic name) that belongs to a card (identified by its symbolic name or numerical index). \fIOFFSET\f1 is a number which represents the latency offset in microseconds
 .TP
-\fBset-sink-volume\f1 \fISINK\f1 \fIVOLUME\f1
-Set the volume of the specified sink (identified by its symbolic name or numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current sink volume.
+\fBset-sink-volume\f1 \fISINK\f1 \fIVOLUME [VOLUME ...]\f1
+Set the volume of the specified sink (identified by its symbolic name or numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current sink volume. A single volume value affects all channels; if multiple volume values are given their number has to match the sink's num [...]
 .TP
-\fBset-source-volume\f1 \fISOURCE\f1 \fIVOLUME\f1
-Set the volume of the specified source (identified by its symbolic name or numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current source volume.
+\fBset-source-volume\f1 \fISOURCE\f1 \fIVOLUME [VOLUME ...]\f1
+Set the volume of the specified source (identified by its symbolic name or numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current source volume. A single volume value affects all channels; if multiple volume values are given their number has to match the source [...]
 .TP
-\fBset-sink-input-volume\f1 \fIINPUT\f1 \fIVOLUME\f1
-Set the volume of the specified sink input (identified by its numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current sink input volume.
+\fBset-sink-input-volume\f1 \fIINPUT\f1 \fIVOLUME [VOLUME ...]\f1
+Set the volume of the specified sink input (identified by its numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current sink input volume. A single volume value affects all channels; if multiple volume values are given their number has to match the sink input's nu [...]
 .TP
-\fBset-source-output-volume\f1 \fIOUTPUT\f1 \fIVOLUME\f1
-Set the volume of the specified source output (identified by its numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current source output volume.
+\fBset-source-output-volume\f1 \fIOUTPUT\f1 \fIVOLUME [VOLUME ...]\f1
+Set the volume of the specified source output (identified by its numerical index). \fIVOLUME\f1 can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage (e.g. 10%, 100%) or a decibel value (e.g. 0dB, 20dB). If the volume specification start with a + or - the volume adjustment will be relative to the current source output volume. A single volume value affects all channels; if multiple volume values are given their number has to match the source ou [...]
 .TP
 \fBset-sink-mute\f1 \fISINK\f1 \fI1|0|toggle\f1
 Set the mute status of the specified sink (identified by its symbolic name or numerical index).
diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in
index 29071b3..cf6570e 100644
--- a/man/pactl.1.xml.in
+++ b/man/pactl.1.xml.in
@@ -66,11 +66,8 @@ USA.
   <section name="Commands">
 
     <option>
-      <p><opt>stat</opt> [<arg>short</arg>]</p>
-      <optdesc><p>Dump a few statistics about the memory usage of the PulseAudio daemon. (Note: for backwards
-      compatibility, we also show the output of the <arg>info</arg> command. In order to only show
-      statistics, use the optional <arg>short</arg> argument. In a future version of PA we will
-      make this the default)</p></optdesc>
+      <p><opt>stat</opt></p>
+      <optdesc><p>Dump a few statistics about the memory usage of the PulseAudio daemon.</p></optdesc>
     </option>
 
     <option>
@@ -189,33 +186,37 @@ USA.
     </option>
 
     <option>
-      <p><opt>set-sink-volume</opt> <arg>SINK</arg> <arg>VOLUME</arg></p>
+      <p><opt>set-sink-volume</opt> <arg>SINK</arg> <arg>VOLUME [VOLUME ...]</arg></p>
       <optdesc><p>Set the volume of the specified sink (identified by its symbolic name or numerical index).
       <arg>VOLUME</arg> can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage
       (e.g.  10%, 100%) or a decibel value (e.g. 0dB, 20dB).  If the volume specification start with a + or - the volume
-      adjustment will be relative to the current sink volume.</p></optdesc>
+      adjustment will be relative to the current sink volume.  A single volume value affects all channels; if multiple
+      volume values are given their number has to match the sink's number of channels.</p></optdesc>
     </option>
 
     <option>
-      <p><opt>set-source-volume</opt> <arg>SOURCE</arg> <arg>VOLUME</arg></p>
+      <p><opt>set-source-volume</opt> <arg>SOURCE</arg> <arg>VOLUME [VOLUME ...]</arg></p>
       <optdesc><p>Set the volume of the specified source (identified by its symbolic name or numerical index).
       <arg>VOLUME</arg> can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage
       (e.g.  10%, 100%) or a decibel value (e.g. 0dB, 20dB).  If the volume specification start with a + or - the volume
-      adjustment will be relative to the current source volume.</p></optdesc> </option>
+      adjustment will be relative to the current source volume.  A single volume value affects all channels; if multiple
+      volume values are given their number has to match the source's number of channels.</p></optdesc> </option>
 
     <option>
-      <p><opt>set-sink-input-volume</opt> <arg>INPUT</arg> <arg>VOLUME</arg></p>
+      <p><opt>set-sink-input-volume</opt> <arg>INPUT</arg> <arg>VOLUME [VOLUME ...]</arg></p>
       <optdesc><p>Set the volume of the specified sink input (identified by its numerical index).
       <arg>VOLUME</arg> can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage
       (e.g.  10%, 100%) or a decibel value (e.g. 0dB, 20dB).  If the volume specification start with a + or - the volume
-      adjustment will be relative to the current sink input volume.</p></optdesc> </option>
+      adjustment will be relative to the current sink input volume.  A single volume value affects all channels; if multiple
+      volume values are given their number has to match the sink input's number of channels.</p></optdesc> </option>
 
     <option>
-      <p><opt>set-source-output-volume</opt> <arg>OUTPUT</arg> <arg>VOLUME</arg></p>
+      <p><opt>set-source-output-volume</opt> <arg>OUTPUT</arg> <arg>VOLUME [VOLUME ...]</arg></p>
       <optdesc><p>Set the volume of the specified source output (identified by its numerical index).
       <arg>VOLUME</arg> can be specified as an integer (e.g. 2000, 16384), a linear factor (e.g. 0.4, 1.100), a percentage
       (e.g.  10%, 100%) or a decibel value (e.g. 0dB, 20dB).  If the volume specification start with a + or - the volume
-      adjustment will be relative to the current source output volume.</p></optdesc>
+      adjustment will be relative to the current source output volume.  A single volume value affects all channels; if multiple
+      volume values are given their number has to match the source output's number of channels.</p></optdesc>
     </option>
 
     <option>
diff --git a/man/pax11publish.1 b/man/pax11publish.1
index e0e578d..ec241b9 100644
--- a/man/pax11publish.1
+++ b/man/pax11publish.1
@@ -32,7 +32,7 @@ Read the PulseAudio server credentials currently set on the X11 root window and
 Similar to \fB-d\f1, however dumps them in a Bourne shell compatible format so they may be used together with the \fIeval\f1 shell command to set the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables. Also reads the authentication cookie from the root window and stores it in \fI~/.config/pulse/cookie\f1. 
 .TP
 \fB-e\f1
-Export the currently locally used sound server, sink, source configuration to the X11 root window. This takes the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables and combines them with the data from \fI~/.config/pulse/client.conf\f1 (or \fI/etc/pulse/client.conf\f1 if that file does not exist). If specific options are passed on the command line (\fB-S\f1, \fB-O\f1, \fB-I\f1, \fB-c\f1, see below), they take precedence. Also uploads the local authentication co [...]
+Export the currently locally used sound server, sink, source configuration to the X11 root window. This takes the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables and combines them with the data from \fI~/.config/pulse/client.conf\f1 (or \fI/usr/local/etc/pulse/client.conf\f1 if that file does not exist). If specific options are passed on the command line (\fB-S\f1, \fB-O\f1, \fB-I\f1, \fB-c\f1, see below), they take precedence. Also uploads the local authent [...]
 .TP
 \fB-r\f1
 Removes the configured PulseAudio configuration from the X11 root window.
diff --git a/man/pulse-cli-syntax.5 b/man/pulse-cli-syntax.5
index 8112d89..ea9d892 100644
--- a/man/pulse-cli-syntax.5
+++ b/man/pulse-cli-syntax.5
@@ -4,9 +4,9 @@ pulse-cli-syntax \- PulseAudio Command Line Interface Syntax
 .SH SYNOPSIS
 \fB\fI~/.config/pulse/default.pa\fB
 
-\fI/etc/pulse/default.pa\fB
+\fI/usr/local/etc/pulse/default.pa\fB
 
-\fI/etc/pulse/system.pa\fB
+\fI/usr/local/etc/pulse/system.pa\fB
 \f1
 .SH DESCRIPTION
 PulseAudio provides a simple command line language used by configuration scripts, the pacmd interactive shell, and the modules module-cli and module-cli-protocol-{unix,tcp}. Empty lines and lines beginning with a hashmark (#) are silently ignored. Several commands are supported. 
diff --git a/man/pulse-client.conf.5 b/man/pulse-client.conf.5
index 0d88270..77ca52f 100644
--- a/man/pulse-client.conf.5
+++ b/man/pulse-client.conf.5
@@ -4,10 +4,10 @@ pulse-client.conf \- PulseAudio client configuration file
 .SH SYNOPSIS
 \fB\fI~/.config/pulse/client.conf\fB
 
-\fI/etc/pulse/client.conf\fB
+\fI/usr/local/etc/pulse/client.conf\fB
 \f1
 .SH DESCRIPTION
-The PulseAudio client library reads configuration directives from a file \fI~/.config/pulse/client.conf\f1 on startup and when that file doesn't exist from \fI/etc/pulse/client.conf\f1.
+The PulseAudio client library reads configuration directives from a file \fI~/.config/pulse/client.conf\f1 on startup and when that file doesn't exist from \fI/usr/local/etc/pulse/client.conf\f1.
 
 The configuration file is a simple collection of variable declarations. If the configuration file parser encounters either ; or # it ignores the rest of the line until its end.
 
@@ -20,7 +20,7 @@ For the settings that take a boolean argument the values \fBtrue\f1, \fByes\f1,
 .TP
 \fBdefault-server=\f1 The default sever to connect to. The environment variable \fB$PULSE_SERVER\f1 takes precedence.
 .TP
-\fBautospawn=\f1 Autospawn a PulseAudio daemon when needed. Takes a boolean value, defaults to \fByes\f1.
+\fBautospawn=\f1 Autospawn a PulseAudio daemon when needed. Takes a boolean value, defaults to \fBno\f1.
 .TP
 \fBdaemon-binary=\f1 Path to the PulseAudio daemon to run when autospawning. Defaults to a path configured at compile time.
 .TP
diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in
index 45f02da..7025df7 100644
--- a/man/pulse-client.conf.5.xml.in
+++ b/man/pulse-client.conf.5.xml.in
@@ -69,7 +69,7 @@ USA.
 
     <option>
       <p><opt>autospawn=</opt> Autospawn a PulseAudio daemon when
-      needed. Takes a boolean value, defaults to <opt>yes</opt>.</p>
+      needed. Takes a boolean value, defaults to <opt>@PA_DEFAULT_AUTOSPAWN@</opt>.</p>
     </option>
 
     <option>
diff --git a/man/pulse-daemon.conf.5 b/man/pulse-daemon.conf.5
index 2519d69..0a80e2b 100644
--- a/man/pulse-daemon.conf.5
+++ b/man/pulse-daemon.conf.5
@@ -4,10 +4,10 @@ pulse-daemon.conf \- PulseAudio daemon configuration file
 .SH SYNOPSIS
 \fB\fI~/.config/pulse/daemon.conf\fB
 
-\fI/etc/pulse/daemon.conf\fB
+\fI/usr/local/etc/pulse/daemon.conf\fB
 \f1
 .SH DESCRIPTION
-The PulseAudio sound server reads configuration directives from a file \fI~/.config/pulse/daemon.conf\f1 on startup and when that file doesn't exist from \fI/etc/pulse/daemon.conf\f1. Please note that the server also reads a configuration script on startup \fIdefault.pa\f1 which also contains runtime configuration directives.
+The PulseAudio sound server reads configuration directives from a file \fI~/.config/pulse/daemon.conf\f1 on startup and when that file doesn't exist from \fI/usr/local/etc/pulse/daemon.conf\f1. Please note that the server also reads a configuration script on startup \fIdefault.pa\f1 which also contains runtime configuration directives.
 
 The configuration file is a simple collection of variable declarations. If the configuration file parser encounters either ; or # it ignores the rest of the line until its end.
 
@@ -28,7 +28,7 @@ For the settings that take a boolean argument the values \fBtrue\f1, \fByes\f1,
 .TP
 \fBenable-lfe-remixing=\f1 If disabled when upmixing or downmixing ignore LFE channels. When this option is disabled the output LFE channel will only get a signal when an input LFE channel is available as well. If no input LFE channel is available the output LFE channel will always be 0. If no output LFE channel is available the signal on the input LFE channel will be ignored. Defaults to \fBno\f1.
 .TP
-\fBuse-pid-file=\f1 Create a PID file in the runtime directory (\fI$XDG_RUNTIMEDIR/pulse/pid\f1). If this is enabled you may use commands like \fB--kill\f1 or \fB--check\f1. If you are planning to start more than one PulseAudio process per user, you better disable this option since it effectively disables multiple instances. Takes a boolean argument, defaults to \fByes\f1. The \fB--use-pid-file\f1 command line option takes precedence.
+\fBuse-pid-file=\f1 Create a PID file in the runtime directory (\fI$XDG_RUNTIME_DIR/pulse/pid\f1). If this is enabled you may use commands like \fB--kill\f1 or \fB--check\f1. If you are planning to start more than one PulseAudio process per user, you better disable this option since it effectively disables multiple instances. Takes a boolean argument, defaults to \fByes\f1. The \fB--use-pid-file\f1 command line option takes precedence.
 .TP
 \fBcpu-limit=\f1 If disabled do not install the CPU load limiter, even on platforms where it is supported. This option is useful when debugging/profiling PulseAudio to disable disturbing SIGXCPU signals. Takes a boolean argument, defaults to \fBno\f1. The \fB--no-cpu-limit\f1 command line argument takes precedence.
 .TP
@@ -59,9 +59,9 @@ For the settings that take a boolean argument the values \fBtrue\f1, \fByes\f1,
 \fBscache-idle-time=\f1 Unload autoloaded sample cache entries after being idle for this time in seconds. Defaults to 20. The \fB--scache-idle-time\f1 command line option takes precedence.
 .SH PATHS
 .TP
-\fBdl-search-path=\f1 The path were to look for dynamic shared objects (DSOs/plugins). You may specify more than one path separated by colons. The default path depends on compile time settings. The \fB--dl-search-path\f1 command line option takes precedence. 
+\fBdl-search-path=\f1 The path where to look for dynamic shared objects (DSOs/plugins). You may specify more than one path separated by colons. The default path depends on compile time settings. The \fB--dl-search-path\f1 command line option takes precedence. 
 .TP
-\fBdefault-script-file=\f1 The default configuration script file to load. Specify an empty string for not loading a default script file. The default behaviour is to load \fI~/.config/pulse/default.pa\f1, and if that file does not exist fall back to the system wide installed version \fI/etc/pulse/default.pa\f1. If run in system-wide mode the file \fI/etc/pulse/system.pa\f1 is used instead. If \fB-n\f1 is passed on the command line or \fBdefault-script-file=\f1 is disabled the default conf [...]
+\fBdefault-script-file=\f1 The default configuration script file to load. Specify an empty string for not loading a default script file. The default behaviour is to load \fI~/.config/pulse/default.pa\f1, and if that file does not exist fall back to the system wide installed version \fI/usr/local/etc/pulse/default.pa\f1. If run in system-wide mode the file \fI/usr/local/etc/pulse/system.pa\f1 is used instead. If \fB-n\f1 is passed on the command line or \fBdefault-script-file=\f1 is disab [...]
 .TP
 \fBload-default-script-file=\f1 Load the default configuration script file as specified in \fBdefault-script-file=\f1. Defaults to \fByes\f1.
 .SH LOGGING
@@ -72,7 +72,7 @@ For the settings that take a boolean argument the values \fBtrue\f1, \fByes\f1,
 .TP
 \fBlog-meta=\f1 With each logged message log the code location the message was generated from. Defaults to \fBno\f1.
 .TP
-\fBlog-time=\f1 With each logged messages log the relative time since startup. Defaults to \fBno\f1.
+\fBlog-time=\f1 With each logged message log the relative time since startup. Defaults to \fBno\f1.
 .TP
 \fBlog-backtrace=\f1 When greater than 0, with each logged message log a code stack trace up the specified number of stack frames. Defaults to \fB0\f1.
 .SH RESOURCE LIMITS
@@ -104,7 +104,7 @@ See \fBgetrlimit(2)\f1 for more information. Set to -1 if PulseAudio shall not t
 .TP
 \fBrlimit-nice\f1 Defaults to 31. Please make sure that the default nice level as configured with \fBnice-level\f1 fits in this resource limit, if \fBhigh-priority\f1 is enabled.
 .TP
-\fBrlimit-rtprio\f1 Defaults to 9. Please make sure that the default real-time priority level as configured with \fBrealtime-priority=\f1 fits in this resource limit, if \fBrealtime-scheduling\f1 is enabled. The JACK client libraries require a real-time prority of 9 by default. 
+\fBrlimit-rtprio\f1 Defaults to 9. Please make sure that the default real-time priority level as configured with \fBrealtime-priority=\f1 fits in this resource limit, if \fBrealtime-scheduling\f1 is enabled. The JACK client libraries require a real-time priority of 9 by default.
 .TP
 \fBrlimit-rttime\f1 Defaults to 1000000.
 .SH DEFAULT DEVICE SETTINGS
@@ -118,9 +118,9 @@ Most drivers try to open the audio device with these settings and then fall back
 .TP
 \fBdefault-channel-map\f1 The default channel map.
 .TP
-\fBalternate-sample-rate\f1 The alternate sample frequency. Sinks and sources will use either the default-rate-rate value or this alternate value, typically 44.1 or 48kHz. Switching between default and alternate values is enabled only when the sinks/sources are suspended. This option is ignored in passthrough mode where the stream rate will be used. If set to the same as the default sample rate, this feature is disabled.
+\fBalternate-sample-rate\f1 The alternate sample frequency. Sinks and sources will use either the default-sample-rate value or this alternate value, typically 44.1 or 48kHz. Switching between default and alternate values is enabled only when the sinks/sources are suspended. This option is ignored in passthrough mode where the stream rate will be used. If set to the same value as the default sample rate, this feature is disabled.
 .SH DEFAULT FRAGMENT SETTINGS
-Some hardware drivers require the hardware playback buffer to be subdivided into several fragments. It is possible to change these buffer metrics for machines with high scheduling latencies. Not all possible values that may be configured here are available in all hardware. The driver will to find the nearest setting supported. Modern drivers that support timer-based scheduling ignore these options.
+Some hardware drivers require the hardware playback buffer to be subdivided into several fragments. It is possible to change these buffer metrics for machines with high scheduling latencies. Not all possible values that may be configured here are available in all hardware. The driver will find the nearest setting supported. Modern drivers that support timer-based scheduling ignore these options.
 .TP
 \fBdefault-fragments=\f1 The default number of fragments. Defaults to 4.
 .TP
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 9596738..754312e 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -124,7 +124,7 @@ USA.
 
     <option>
       <p><opt>use-pid-file=</opt> Create a PID file in the runtime directory
-      (<file>$XDG_RUNTIMEDIR/pulse/pid</file>). If this is enabled you may
+      (<file>$XDG_RUNTIME_DIR/pulse/pid</file>). If this is enabled you may
       use commands like <opt>--kill</opt> or <opt>--check</opt>. If
       you are planning to start more than one PulseAudio process per
       user, you better disable this option since it effectively
@@ -265,7 +265,7 @@ USA.
   <section name="Paths">
 
     <option>
-      <p><opt>dl-search-path=</opt> The path were to look for dynamic
+      <p><opt>dl-search-path=</opt> The path where to look for dynamic
       shared objects (DSOs/plugins). You may specify more than one
       path separated by colons. The default path depends on compile
       time settings. The <opt>--dl-search-path</opt> command line
@@ -326,7 +326,7 @@ USA.
     </option>
 
     <option>
-      <p><opt>log-time=</opt> With each logged messages log the
+      <p><opt>log-time=</opt> With each logged message log the
       relative time since startup. Defaults to <opt>no</opt>.</p>
     </option>
 
@@ -394,7 +394,7 @@ USA.
       the default real-time priority level as configured with
       <opt>realtime-priority=</opt> fits in this resource limit, if
       <opt>realtime-scheduling</opt> is enabled. The JACK client
-      libraries require a real-time prority of 9 by default. </p>
+      libraries require a real-time priority of 9 by default.</p>
     </option>
     <option>
       <p><opt>rlimit-rttime</opt> Defaults to 1000000.</p>
@@ -437,11 +437,11 @@ USA.
     <option>
       <p><opt>alternate-sample-rate</opt> The alternate sample
       frequency. Sinks and sources will use either the
-      default-rate-rate value or this alternate value, typically 44.1
+      default-sample-rate value or this alternate value, typically 44.1
       or 48kHz. Switching between default and alternate values is
       enabled only when the sinks/sources are suspended. This option
       is ignored in passthrough mode where the stream rate will be used.
-      If set to the same as the default sample rate, this feature is
+      If set to the same value as the default sample rate, this feature is
       disabled.</p>
     </option>
 
@@ -453,7 +453,7 @@ USA.
     be subdivided into several fragments. It is possible to change
     these buffer metrics for machines with high scheduling
     latencies. Not all possible values that may be configured here are
-    available in all hardware. The driver will to find the nearest
+    available in all hardware. The driver will find the nearest
     setting supported. Modern drivers that support timer-based
     scheduling ignore these options.</p>
 
diff --git a/man/pulseaudio.1 b/man/pulseaudio.1
index fdcc44b..7f928b7 100644
--- a/man/pulseaudio.1
+++ b/man/pulseaudio.1
@@ -125,11 +125,11 @@ Open a command interpreter on STDIN/STDOUT after startup. This may be used to co
 \fB-n\f1
 Don't load default script file \fIdefault.pa\f1 (see below) on startup. Useful in conjunction with \fB-C\f1 or \fB--file\f1.
 .SH FILES
-\fI~/.config/pulse/daemon.conf\f1, \fI/etc/pulse/daemon.conf\f1: configuration settings for the PulseAudio daemon. If the version in the user's home directory does not exist the global configuration file is loaded. See \fBpulse-daemon.conf(5)\f1 for more information.
+\fI~/.config/pulse/daemon.conf\f1, \fI/usr/local/etc/pulse/daemon.conf\f1: configuration settings for the PulseAudio daemon. If the version in the user's home directory does not exist the global configuration file is loaded. See \fBpulse-daemon.conf(5)\f1 for more information.
 
-\fI~/.config/pulse/default.pa\f1, \fI/etc/pulse/default.pa\f1: the default configuration script to execute when the PulseAudio daemon is started. If the version in the user's home directory does not exist the global configuration script is loaded. See \fBdefault.pa(5)\f1 for more information.
+\fI~/.config/pulse/default.pa\f1, \fI/usr/local/etc/pulse/default.pa\f1: the default configuration script to execute when the PulseAudio daemon is started. If the version in the user's home directory does not exist the global configuration script is loaded. See \fBdefault.pa(5)\f1 for more information.
 
-\fI~/.config/pulse/client.conf\f1, \fI/etc/pulse/client.conf\f1: configuration settings for PulseAudio client applications. If the version in the user's home directory does not exist the global configuration file is loaded. See \fBpulse-client.conf(5)\f1 for more information.
+\fI~/.config/pulse/client.conf\f1, \fI/usr/local/etc/pulse/client.conf\f1: configuration settings for PulseAudio client applications. If the version in the user's home directory does not exist the global configuration file is loaded. See \fBpulse-client.conf(5)\f1 for more information.
 .SH SIGNALS
 \fISIGINT, SIGTERM\f1: the PulseAudio daemon will shut down (Same as \fB--kill\f1).
 
diff --git a/man/start-pulseaudio-kde.1 b/man/start-pulseaudio-kde.1
deleted file mode 100644
index 0b472ee..0000000
--- a/man/start-pulseaudio-kde.1
+++ /dev/null
@@ -1,14 +0,0 @@
-.TH start-pulseaudio-kde 1 User Manuals
-.SH NAME
-start-pulseaudio-kde \- PulseAudio Sound Server KDE Startup Script
-.SH SYNOPSIS
-\fBstart-pulseaudio-kde [\fIpulseaudio options\fB]
-\f1
-.SH DESCRIPTION
-This script starts pulseaudio (if not already running) and loads module-device-manager to use KDE routing policies.
-
-All arguments are directly passed to pulseaudio.
-.SH AUTHORS
-The PulseAudio Developers <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>; PulseAudio is available from \fBhttp://pulseaudio.org/\f1
-.SH SEE ALSO
-\fBpulseaudio(1)\f1
diff --git a/man/start-pulseaudio-kde.1.xml.in b/man/start-pulseaudio-kde.1.xml.in
deleted file mode 100644
index ef32906..0000000
--- a/man/start-pulseaudio-kde.1.xml.in
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?><!--*-nxml-*-->
-<!DOCTYPE manpage SYSTEM "xmltoman.dtd">
-<?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
-
-<!--
-This file is part of PulseAudio.
-
-PulseAudio is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of the
-License, or (at your option) any later version.
-
-PulseAudio is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
-Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA.
--->
-
-<manpage name="start-pulseaudio-kde" section="1" desc="PulseAudio Sound Server KDE Startup Script">
-
-  <synopsis>
-    <cmd>start-pulseaudio-kde [<arg>pulseaudio options</arg>]</cmd>
-  </synopsis>
-
-  <description>
-    <p>This script starts pulseaudio (if not already running) and loads
-    module-device-manager to use KDE routing policies.</p>
-
-    <p>All arguments are directly passed to pulseaudio.</p>
-  </description>
-
-  <section name="Authors">
-    <p>The PulseAudio Developers &lt;@PACKAGE_BUGREPORT@&gt;;
-    PulseAudio is available from <url href="@PACKAGE_URL@"/></p>
-  </section>
-
-  <section name="See also">
-    <p>
-      <manref name="pulseaudio" section="1"/>
-    </p>
-  </section>
-
-</manpage>
diff --git a/po/LINGUAS b/po/LINGUAS
index 3e3d9de..addf24a 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -25,6 +25,7 @@ pl
 pt_BR
 pt
 ru
+sk
 sr at latin
 sr
 sv
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d06932f..0903741 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,7 @@ src/daemon/dumpmodules.c
 src/daemon/ltdl-bind-now.c
 src/daemon/main.c
 src/daemon/pulseaudio.desktop.in
-src/daemon/pulseaudio-kde.desktop.in
+src/daemon/systemd/user/pulseaudio.service.in
 src/modules/alsa/alsa-mixer.c
 src/modules/alsa/alsa-sink.c
 src/modules/alsa/alsa-source.c
@@ -73,6 +73,7 @@ src/pulse/channelmap.c
 src/pulse/client-conf.c
 src/pulse/client-conf-x11.c
 src/pulse/context.c
+src/pulse/direction.c
 src/pulsecore/asyncmsgq.c
 src/pulsecore/asyncq.c
 src/pulsecore/auth-cookie.c
@@ -88,6 +89,7 @@ src/pulsecore/core-error.c
 src/pulsecore/core-scache.c
 src/pulsecore/core-subscribe.c
 src/pulsecore/core-util.c
+src/pulsecore/core-util.h
 src/pulsecore/dbus-util.c
 src/pulsecore/dllmain.c
 src/pulsecore/dynarray.c
diff --git a/po/el.po b/po/el.po
index dedd12e..8b3b475 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,115 +1,478 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
 # Dimitris Glezos <dimitris at glezos.com>, 2008.
 # Thalia Papoutsaki <saliyath at gmail.com>, 2009, 2012.
-#
+# Dimitris Spingos (???????? ???????) <dmtrs32 at gmail.com>, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 10:10+0000\n"
-"PO-Revision-Date: 2012-01-30 09:53+0000\n"
-"Last-Translator: Thalia Papoutsaki <saliyath at gmail.com>\n"
-"Language-Team: Greek <fedora-trans-el at redhat.com>\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=Pul"
+"seAudio&keywords=I18N+L10N&component=misc\n"
+"POT-Creation-Date: 2014-05-02 22:03+0000\n"
+"PO-Revision-Date: 2014-05-08 09:53+0300\n"
+"Last-Translator: Dimitris Spingos (???????? ???????) <dmtrs32 at gmail.com>\n"
+"Language-Team: team at lists.gnome.gr\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KAider 0.1\n"
+"X-Generator: Virtaal 0.7.0\n"
 
-#: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1204
+#: ../src/daemon/caps.c:54
+msgid "Cleaning up privileges."
+msgstr "?????????? ???????????."
+
+#: ../src/daemon/cmdline.c:113
 #, c-format
+#| msgid ""
+#| "%s [options]\n"
+#| "\n"
+#| "COMMANDS:\n"
+#| "  -h, --help                            Show this help\n"
+#| "      --version                         Show version\n"
+#| "      --dump-conf                       Dump default configuration\n"
+#| "      --dump-modules                    Dump list of available modules\n"
+#| "      --dump-resample-methods           Dump available resample methods\n"
+#| "      --cleanup-shm                     Cleanup stale shared memory "
+#| "segments\n"
+#| "      --start                           Start the daemon if it is not "
+#| "running\n"
+#| "  -k  --kill                            Kill a running daemon\n"
+#| "      --check                           Check for a running daemon (only "
+#| "returns exit code)\n"
+#| "\n"
+#| "OPTIONS:\n"
+#| "      --system[=BOOL]                   Run as system-wide instance\n"
+#| "  -D, --daemonize[=BOOL]                Daemonize after startup\n"
+#| "      --fail[=BOOL]                     Quit when startup fails\n"
+#| "      --high-priority[=BOOL]            Try to set high nice level\n"
+#| "                                        (only available as root, when "
+#| "SUID or\n"
+#| "                                        with elevated RLIMIT_NICE)\n"
+#| "      --realtime[=BOOL]                 Try to enable realtime "
+#| "scheduling\n"
+#| "                                        (only available as root, when "
+#| "SUID or\n"
+#| "                                        with elevated RLIMIT_RTPRIO)\n"
+#| "      --disallow-module-loading[=BOOL]  Disallow module user requested "
+#| "module\n"
+#| "                                        loading/unloading after startup\n"
+#| "      --disallow-exit[=BOOL]            Disallow user requested exit\n"
+#| "      --exit-idle-time=SECS             Terminate the daemon when idle "
+#| "and this\n"
+#| "                                        time passed\n"
+#| "      --scache-idle-time=SECS           Unload autoloaded samples when "
+#| "idle and\n"
+#| "                                        this time passed\n"
+#| "      --log-level[=LEVEL]               Increase or set verbosity level\n"
+#| "  -v                                    Increase the verbosity level\n"
+#| "      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+#| "                                        Specify the log target\n"
+#| "      --log-meta[=BOOL]                 Include code location in log "
+#| "messages\n"
+#| "      --log-time[=BOOL]                 Include timestamps in log "
+#| "messages\n"
+#| "      --log-backtrace=FRAMES            Include a backtrace in log "
+#| "messages\n"
+#| "  -p, --dl-search-path=PATH             Set the search path for dynamic "
+#| "shared\n"
+#| "                                        objects (plugins)\n"
+#| "      --resample-method=METHOD          Use the specified resampling "
+#| "method\n"
+#| "                                        (See --dump-resample-methods for\n"
+#| "                                        possible values)\n"
+#| "      --use-pid-file[=BOOL]             Create a PID file\n"
+#| "      --no-cpu-limit[=BOOL]             Do not install CPU load limiter "
+#| "on\n"
+#| "                                        platforms that support it.\n"
+#| "      --disable-shm[=BOOL]              Disable shared memory support.\n"
+#| "\n"
+#| "STARTUP SCRIPT:\n"
+#| "  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin "
+#| "module with\n"
+#| "                                        the specified argument\n"
+#| "  -F, --file=FILENAME                   Run the specified script\n"
+#| "  -C                                    Open a command line on the "
+#| "running TTY\n"
+#| "                                        after startup\n"
+#| "\n"
+#| "  -n                                    Don't load default script file\n"
 msgid ""
-"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
-"ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"%s [options]\n"
+"\n"
+"COMMANDS:\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"      --dump-conf                       Dump default configuration\n"
+"      --dump-modules                    Dump list of available modules\n"
+"      --dump-resample-methods           Dump available resample methods\n"
+"      --cleanup-shm                     Cleanup stale shared memory "
+"segments\n"
+"      --start                           Start the daemon if it is not "
+"running\n"
+"  -k  --kill                            Kill a running daemon\n"
+"      --check                           Check for a running daemon (only "
+"returns exit code)\n"
+"\n"
+"OPTIONS:\n"
+"      --system[=BOOL]                   Run as system-wide instance\n"
+"  -D, --daemonize[=BOOL]                Daemonize after startup\n"
+"      --fail[=BOOL]                     Quit when startup fails\n"
+"      --high-priority[=BOOL]            Try to set high nice level\n"
+"                                        (only available as root, when SUID "
+"or\n"
+"                                        with elevated RLIMIT_NICE)\n"
+"      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
+"                                        (only available as root, when SUID "
+"or\n"
+"                                        with elevated RLIMIT_RTPRIO)\n"
+"      --disallow-module-loading[=BOOL]  Disallow module user requested "
+"module\n"
+"                                        loading/unloading after startup\n"
+"      --disallow-exit[=BOOL]            Disallow user requested exit\n"
+"      --exit-idle-time=SECS             Terminate the daemon when idle and "
+"this\n"
+"                                        time passed\n"
+"      --scache-idle-time=SECS           Unload autoloaded samples when idle "
+"and\n"
+"                                        this time passed\n"
+"      --log-level[=LEVEL]               Increase or set verbosity level\n"
+"  -v  --verbose                         Increase the verbosity level\n"
+"      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+"                                        Specify the log target\n"
+"      --log-meta[=BOOL]                 Include code location in log "
+"messages\n"
+"      --log-time[=BOOL]                 Include timestamps in log messages\n"
+"      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
+"  -p, --dl-search-path=PATH             Set the search path for dynamic "
+"shared\n"
+"                                        objects (plugins)\n"
+"      --resample-method=METHOD          Use the specified resampling method\n"
+"                                        (See --dump-resample-methods for\n"
+"                                        possible values)\n"
+"      --use-pid-file[=BOOL]             Create a PID file\n"
+"      --no-cpu-limit[=BOOL]             Do not install CPU load limiter on\n"
+"                                        platforms that support it.\n"
+"      --disable-shm[=BOOL]              Disable shared memory support.\n"
+"\n"
+"STARTUP SCRIPT:\n"
+"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module "
+"with\n"
+"                                        the specified argument\n"
+"  -F, --file=FILENAME                   Run the specified script\n"
+"  -C                                    Open a command line on the running "
+"TTY\n"
+"                                        after startup\n"
+"\n"
+"  -n                                    Don't load default script file\n"
 msgstr ""
+"%s [options]\n"
+"\n"
+"???????:\n"
+"  -h, --help                            ???????? ??? ????????\n"
+"      --version                         ???????? ??? ???????\n"
+"      --dump-conf                       ??????? ?????????????? ??????????\n"
+"      --dump-modules                    ????? ?????????? ?????????? ????????\n"
+"      --dump-resample-methods           ????????? ????????? ??????? "
+"???????????????????\n"
+"      --cleanup-shm                     ?????????? ?????? ???????????? "
+"???????? ??????\n"
+"      --start                           ?????? ??? ??????? ?? ??? ??????????\n"
+"  -k  --kill                            ??????????? ???????????? ???????\n"
+"      --check                           ??????? ??? ??????????? ??????? "
+"(?????????? ???? ?????? ??????)\n"
+"\n"
+"????????:\n"
+"      --system[=BOOL]                   ???????? ?? ???????????? ????????? "
+"??? ??????????\n"
+"  -D, --daemonize[=BOOL]                ? ???????? ???? ??? ????????\n"
+"      --fail[=BOOL]                     ?????? ???? ? ???????? ???????????\n"
+"      --high-priority[=BOOL]            ?????????? ??????? ?????? ???????? "
+"nice\n"
+"                                        (????????? ???? ?? ???????????, ?? "
+"SUID ?\n"
+"                                        ?? ?????????? RLIMIT_NICE)\n"
+"      --realtime[=BOOL]                 ?????????? ????????????? ?????????? "
+"??????????? ??????\n"
+"                                        (????????? ???? ?? ???????????, ?? "
+"SUID ?\n"
+"                                        ?? ?????????? RLIMIT_RTPRIO)\n"
+"      --disallow-module-loading[=BOOL]  ?????????? ???????? ??? ???????? ??? "
+"??? ??????\n"
+"                                        ??? ???????/????????? ???? ??? "
+"????????\n"
+"      --disallow-exit[=BOOL]            ?????????? ?????? ??? ???????? ??? "
+"??? ??????\n"
+"      --exit-idle-time=SECS             ??????????? ??? ??????? ???? ????? "
+"??????? ??? ??????\n"
+"                                        ????? ? ??????\n"
+"      --scache-idle-time=SECS           ????????? ???????? ?????????? "
+"????????? ???? ????? ?????? ???\n"
+"                                        ?????? ????? ? ??????\n"
+"      --log-level[=LEVEL]               ?????? ? ???????  ???????? "
+"????????????\n"
+"  -v                                    ?????? ??? ???????? ????????????\n"
+"      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+"                                        ??????? ??? ?????????? ??????????\n"
+"      --log-meta[=BOOL]                 ??????????? ????? ?????? ?? ???????? "
+"??????????\n"
+"      --log-time[=BOOL]                 ??????????? ???????? ????????? ?? "
+"???????? ??????????\n"
+"      --log-backtrace=FRAMES            ??????????? ???????????????? ?? "
+"???????? ??????????\n"
+"  -p, --dl-search-path=PATH             ??????? ??? ????????? ?????????? ??? "
+"???????? ???????????\n"
+"                                        ??????????? (????????)\n"
+"      --resample-method=METHOD          ????? ??? ??????? ??????? "
+"???????????????????\n"
+"                                        (????? --dump-resample-methods ???\n"
+"                                        ??????? ?????)\n"
+"      --use-pid-file[=BOOL]             ?????????? ??????? PID\n"
+"      --no-cpu-limit[=BOOL]             ?? ??? ????????????? ????????? "
+"???????? CPU ??\n"
+"                                        ??????????? ??? ?? ????????????.\n"
+"      --disable-shm[=BOOL]              ?????????????? ???????????? "
+"??????????? ??????.\n"
+"\n"
+"STARTUP SCRIPT:\n"
+"  -L, --load=\"MODULE ARGUMENTS\"         ??????? ??? ????????????? ???????? "
+"?????????\n"
+"                                        ?? ?? ???????????? ??????\n"
+"  -F, --file=FILENAME                   ???????? ??? ????????????? ????????\n"
+"  -C                                    ??????? ???? ??????? ??????? ??? "
+"??????????? TTY\n"
+"                                        ???? ??? ????????\n"
+"\n"
+"  -n                                    ?? ??? ?????????? ?? ????????????? "
+"?????? ????????\n"
 
-#: ../src/modules/alsa/alsa-util.c:1179
-#, c-format
+#: ../src/daemon/cmdline.c:245
+msgid "--daemonize expects boolean argument"
+msgstr "?? --daemonize ????????? ?????? ????? ?????"
+
+#: ../src/daemon/cmdline.c:253
+msgid "--fail expects boolean argument"
+msgstr "?? --fail ????????? ?????? ????? ?????"
+
+#: ../src/daemon/cmdline.c:264
 msgid ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
-"%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
 msgstr ""
+"?? --log-level ????????? ?????? ???????? ?????????? (???? ?????????? ?? "
+"???????? 0..4 ? ??? ?????? ??????????????, ???????????, ???????????, "
+"??????????????, ?????????)."
 
-#: ../src/modules/alsa/alsa-util.c:1220
-#, c-format
+#: ../src/daemon/cmdline.c:276
+msgid "--high-priority expects boolean argument"
+msgstr "?? --high-priority ????????? ?????? ????? ?????"
+
+#: ../src/daemon/cmdline.c:284
+msgid "--realtime expects boolean argument"
+msgstr "?? --realtime ???????? ?????? ????? ?????"
+
+#: ../src/daemon/cmdline.c:292
+msgid "--disallow-module-loading expects boolean argument"
+msgstr "?? --disallow-module-loading ????????? ?????? ????? ?????"
+
+#: ../src/daemon/cmdline.c:300
+msgid "--disallow-exit expects boolean argument"
+msgstr "?? --disallow-exit ????????? ?????? ????? ?????"
+
+#: ../src/daemon/cmdline.c:308
+msgid "--use-pid-file expects boolean argument"
+msgstr "?? --use-pid-file ????????? ?????? ????? ?????"
+
+#: ../src/daemon/cmdline.c:327
+#| msgid ""
+#| "Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid "
+#| "file name 'file:<path>', 'newfile:<path>'."
 msgid ""
-"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
-"%lu.\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
 msgstr ""
+"?????? ?????????? ??????????: ?????????????? ???? 'syslog', 'journal' "
+"'stderr' ???? 'auto' ? ??? ?????? ????? ??????? 'file:<path>', "
+"'newfile:<path>'."
 
-#: ../src/modules/alsa/alsa-util.c:1263
-#, c-format
+#: ../src/daemon/cmdline.c:329
 msgid ""
-"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
-"(%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
+"name 'file:<path>', 'newfile:<path>'."
 msgstr ""
+"?????? ?????????? ??????????: ?????????????? ???? 'syslog', 'stderr' ???? "
+"'auto' ? ??? ?????? ????? ??????? 'file:<path>', 'newfile:<path>'."
 
-#: ../src/modules/module-always-sink.c:38
-msgid "Always keeps at least one sink loaded even if it's a null one"
-msgstr ""
+#: ../src/daemon/cmdline.c:337
+msgid "--log-time expects boolean argument"
+msgstr "?? --log-time ????????? ?????? ????? ?????"
 
-#: ../src/modules/module-always-sink.c:82
-msgid "Dummy Output"
-msgstr ""
+#: ../src/daemon/cmdline.c:345
+msgid "--log-meta expects boolean argument"
+msgstr "?? --log-meta ????????? ?????? ????? ?????"
 
-#: ../src/modules/module-ladspa-sink.c:48
-msgid "Virtual LADSPA sink"
-msgstr ""
+#: ../src/daemon/cmdline.c:365
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr "????? ??????? ??????????????????? '%s'."
+
+#: ../src/daemon/cmdline.c:372
+msgid "--system expects boolean argument"
+msgstr "?? --system ????????? ?????? ????? ?????"
+
+#: ../src/daemon/cmdline.c:380
+msgid "--no-cpu-limit expects boolean argument"
+msgstr "?? --no-cpu-limit ????????? ?????? ????? ?????"
 
-#: ../src/modules/module-ladspa-sink.c:52
+#: ../src/daemon/cmdline.c:388
+msgid "--disable-shm expects boolean argument"
+msgstr "?? --disable-shm ????????? ?????? ????? ?????"
+
+#: ../src/daemon/daemon-conf.c:260
+#, c-format
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr "[%s:%u] ?????? ?????????? ?????????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:275
+#, c-format
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr "[%s:%u] ????? ??????? ?????????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:290
+#, c-format
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr "[%s:%u] ????? ??????? ??????????????????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:312
+#, c-format
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr "[%s:%u] ????? rlimit '%s'."
+
+#: ../src/daemon/daemon-conf.c:332
+#, c-format
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr "[%s:%u] ????? ????? ????????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:350 ../src/daemon/daemon-conf.c:368
+#, c-format
+msgid "[%s:%u] Invalid sample rate '%s'."
+msgstr "[%s:%u] ?????? ?????? ????????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:391
+#, c-format
+msgid "[%s:%u] Invalid sample channels '%s'."
+msgstr "[%s:%u] ????? ??????? ????????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:408
+#, c-format
+msgid "[%s:%u] Invalid channel map '%s'."
+msgstr "[%s:%u] ????? ?????????? ???????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:425
+#, c-format
+msgid "[%s:%u] Invalid number of fragments '%s'."
+msgstr "[%s:%u] ?????? ??????? ???????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:442
+#, c-format
+msgid "[%s:%u] Invalid fragment size '%s'."
+msgstr "[%s:%u] ????? ??????? ???????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:459
+#, c-format
+msgid "[%s:%u] Invalid nice level '%s'."
+msgstr "[%s:%u] ????? ??????? nice '%s'."
+
+#: ../src/daemon/daemon-conf.c:502
+#, c-format
+msgid "[%s:%u] Invalid server type '%s'."
+msgstr "[%s:%u] ?????? ????? ?????????? '%s'."
+
+#: ../src/daemon/daemon-conf.c:615
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr "???????? ?????????? ??????? ?????????: %s"
+
+#: ../src/daemon/daemon-conf.c:631
 msgid ""
-"sink_name=<name for the sink> sink_properties=<properties for the sink> "
-"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<input channel map> plugin=<ladspa "
-"plugin name> label=<ladspa plugin label> control=<comma separated list of "
-"input control values> input_ladspaport_map=<comma separated list of input "
-"LADSPA port names> output_ladspaport_map=<comma separated list of output "
-"LADSPA port names> "
+"The specified default channel map has a different number of channels than "
+"the specified default number of channels."
 msgstr ""
+"? ???????????? ????????????? ?????????? ???????? ???? ???? ??????????? "
+"?????? ???????? ??? ??? ???????????? ????????????? ?????? ????????."
 
-#: ../src/modules/module-null-sink.c:49
-msgid "Clocked NULL sink"
-msgstr ""
+#: ../src/daemon/daemon-conf.c:718
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr "### ???????? ??? ?? ?????? ?????????: %s ###\n"
 
-#: ../src/modules/module-null-sink.c:284
-msgid "Null Output"
-msgstr ""
+#: ../src/daemon/dumpmodules.c:59
+#, c-format
+msgid "Name: %s\n"
+msgstr "?????: %s\n"
 
-#: ../src/pulsecore/sink.c:3349
-msgid "Built-in Audio"
-msgstr "?????????? ????"
+#: ../src/daemon/dumpmodules.c:62
+#, c-format
+msgid "No module information available\n"
+msgstr "??? ???????? ?????????? ??????????? ??? ??? ???????\n"
 
-#: ../src/pulsecore/sink.c:3354
-msgid "Modem"
-msgstr "Modem"
+#: ../src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Version: %s\n"
+msgstr "??????: %s\n"
+
+#: ../src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Description: %s\n"
+msgstr "?????????: %s\n"
+
+#: ../src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Author: %s\n"
+msgstr "??????????: %s\n"
+
+#: ../src/daemon/dumpmodules.c:71
+#, c-format
+msgid "Usage: %s\n"
+msgstr "?????: %s\n"
+
+#: ../src/daemon/dumpmodules.c:72
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "??????? ??? ????: %s\n"
+
+#: ../src/daemon/dumpmodules.c:74
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "????????????? ???????????: %s\n"
+
+#: ../src/daemon/dumpmodules.c:78
+#, c-format
+msgid "Path: %s\n"
+msgstr "????????: %s\n"
+
+#: ../src/daemon/ltdl-bind-now.c:77
+#, c-format
+msgid "Failed to open module %s: %s"
+msgstr "???????? ?????????? ???????? %s: %s"
 
-#: ../src/daemon/ltdl-bind-now.c:127
+#: ../src/daemon/ltdl-bind-now.c:128
 msgid "Failed to find original lt_dlopen loader."
-msgstr ""
+msgstr "???????? ??????? ??????? ??????? lt_dlopen."
 
-#: ../src/daemon/ltdl-bind-now.c:132
+#: ../src/daemon/ltdl-bind-now.c:133
 msgid "Failed to allocate new dl loader."
-msgstr ""
+msgstr "???????? ????????? ???? ??????? dl."
 
-#: ../src/daemon/ltdl-bind-now.c:145
+#: ../src/daemon/ltdl-bind-now.c:146
 msgid "Failed to add bind-now-loader."
-msgstr ""
+msgstr "???????? ????????? ??????? ?????? ????????."
 
 #: ../src/daemon/main.c:139
 #, c-format
 msgid "Got signal %s."
-msgstr "????? ???? ??????? %s."
+msgstr "?????? ???? %s."
 
 #: ../src/daemon/main.c:166
 msgid "Exiting."
@@ -123,256 +486,272 @@ msgstr "???????? ??????? ?????? '%s'."
 #: ../src/daemon/main.c:189
 #, c-format
 msgid "Failed to find group '%s'."
-msgstr "???????? ??????? ?????? ??????? '%s'."
+msgstr "???????? ??????? ?????? '%s'."
 
 #: ../src/daemon/main.c:193
 #, c-format
 msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
-msgstr ""
+msgstr "??????? ??????? '%s' (UID %lu) ??? ????? '%s' (GID %lu)."
 
 #: ../src/daemon/main.c:198
 #, c-format
 msgid "GID of user '%s' and of group '%s' don't match."
-msgstr ""
+msgstr "?? GID ??? ?????? '%s' ??? ??? ?????? '%s' ??? ??????????."
 
 #: ../src/daemon/main.c:203
 #, c-format
 msgid "Home directory of user '%s' is not '%s', ignoring."
-msgstr ""
+msgstr "? ?????????? ????????? ??? ?????? '%s' ??? ????? '%s', ?????????."
 
 #: ../src/daemon/main.c:206 ../src/daemon/main.c:211
 #, c-format
 msgid "Failed to create '%s': %s"
-msgstr ""
+msgstr "???????? ??????????? '%s': %s"
 
 #: ../src/daemon/main.c:218
 #, c-format
 msgid "Failed to change group list: %s"
-msgstr ""
+msgstr "???????? ??????? ??? ????????? ??????: %s"
 
 #: ../src/daemon/main.c:234
 #, c-format
 msgid "Failed to change GID: %s"
-msgstr ""
+msgstr "???????? ??????? GID: %s"
 
 #: ../src/daemon/main.c:250
 #, c-format
 msgid "Failed to change UID: %s"
-msgstr ""
+msgstr "???????? ??????? UID: %s"
 
-#: ../src/daemon/main.c:269
-msgid "Successfully dropped root privileges."
-msgstr ""
+#: ../src/daemon/main.c:271
+msgid "Successfully changed user to \""
+msgstr "?????????? ?????? ?????? ?? \""
 
-#: ../src/daemon/main.c:277
+#: ../src/daemon/main.c:279
 msgid "System wide mode unsupported on this platform."
-msgstr ""
+msgstr "? ????????? ?????????? ??? ????????????? ?? ???? ?? ???????????."
 
-#: ../src/daemon/main.c:295
+#: ../src/daemon/main.c:297
 #, c-format
 msgid "setrlimit(%s, (%u, %u)) failed: %s"
-msgstr ""
+msgstr "???????? setrlimit(%s, (%u, %u)): %s"
 
-#: ../src/daemon/main.c:496
+#: ../src/daemon/main.c:498
 msgid "Failed to parse command line."
-msgstr ""
+msgstr "???????? ???????? ??????? ???????."
 
-#: ../src/daemon/main.c:529
+#: ../src/daemon/main.c:537
 msgid ""
 "System mode refused for non-root user. Only starting the D-Bus server lookup "
 "service."
 msgstr ""
+"?????? ?????????? ?????????? ??? ?? ??????????. ???????? ???? ??? ????????? "
+"?????????? ?????????? ??????? ?????????."
 
-#: ../src/daemon/main.c:611
+#: ../src/daemon/main.c:619
 msgid "Daemon not running"
-msgstr ""
+msgstr "? ???????? ??? ??????????"
 
-#: ../src/daemon/main.c:613
+#: ../src/daemon/main.c:621
 #, c-format
 msgid "Daemon running as PID %u"
-msgstr ""
+msgstr "? ???????? ?????????? ?? PID %u"
 
-#: ../src/daemon/main.c:628
+#: ../src/daemon/main.c:636
 #, c-format
 msgid "Failed to kill daemon: %s"
-msgstr ""
+msgstr "???????? ??????????? ???????: %s"
 
-#: ../src/daemon/main.c:657
+#: ../src/daemon/main.c:665
 msgid ""
 "This program is not intended to be run as root (unless --system is "
 "specified)."
 msgstr ""
+"???? ?? ????????? ??? ??????????? ?? ?????????? ??? ?????????? (????? ??? "
+"??????? --system)."
 
-#: ../src/daemon/main.c:660
+#: ../src/daemon/main.c:668
 msgid "Root privileges required."
-msgstr ""
+msgstr "??????????? ?????????? ??????????."
 
-#: ../src/daemon/main.c:667
+#: ../src/daemon/main.c:675
 msgid "--start not supported for system instances."
-msgstr ""
+msgstr "??? ????????????? ?? --start ??? ??????????? ??????????."
 
-#: ../src/daemon/main.c:707
+#: ../src/daemon/main.c:715
 #, c-format
 msgid "User-configured server at %s, refusing to start/autospawn."
 msgstr ""
+"? ??????????? ??? ??? ?????? ??????????? ??? %s, ???????? ?? ?????????/?? "
+"??????? ????????."
 
-#: ../src/daemon/main.c:713
+#: ../src/daemon/main.c:721
 #, c-format
 msgid ""
 "User-configured server at %s, which appears to be local. Probing deeper."
 msgstr ""
+"? ??????????? ??? ??? ?????? ??????????? ??? %s, ???????? ?? ????? ???????. "
+"???????? ??????????."
 
-#: ../src/daemon/main.c:718
+#: ../src/daemon/main.c:726
 msgid "Running in system mode, but --disallow-exit not set!"
 msgstr ""
+"?????????? ?? ?????????? ??????????, ???? ??? ???????? ? --disallow-exit!"
 
-#: ../src/daemon/main.c:721
+#: ../src/daemon/main.c:729
 msgid "Running in system mode, but --disallow-module-loading not set!"
 msgstr ""
+"?????????? ?? ?????????? ??????????, ???? ??? ???????? ? --disallow-module-"
+"loading!"
 
-#: ../src/daemon/main.c:724
+#: ../src/daemon/main.c:732
 msgid "Running in system mode, forcibly disabling SHM mode!"
 msgstr ""
+"?????????? ?? ?????????? ??????????, ???????????????? ??????????? ?? "
+"?????????? SHM!"
 
-#: ../src/daemon/main.c:729
+#: ../src/daemon/main.c:737
 msgid "Running in system mode, forcibly disabling exit idle time!"
 msgstr ""
+"?????????? ?? ?????????? ??????????, ???????????????? ??????????? ??? ?????? "
+"????? ??????!"
 
-#: ../src/daemon/main.c:757
+#: ../src/daemon/main.c:765
 msgid "Failed to acquire stdio."
-msgstr ""
+msgstr "???????? ????? ??????? ???????/??????."
 
-#: ../src/daemon/main.c:763 ../src/daemon/main.c:828
+#: ../src/daemon/main.c:771 ../src/daemon/main.c:842
 #, c-format
 msgid "pipe() failed: %s"
-msgstr ""
+msgstr "???????? pipe(): %s"
 
-#: ../src/daemon/main.c:768 ../src/daemon/main.c:833
+#: ../src/daemon/main.c:776 ../src/daemon/main.c:847
 #, c-format
 msgid "fork() failed: %s"
-msgstr ""
+msgstr "???????? fork(): %s"
 
-#: ../src/daemon/main.c:783 ../src/daemon/main.c:848 ../src/utils/pacat.c:550
+#: ../src/daemon/main.c:791 ../src/daemon/main.c:862 ../src/utils/pacat.c:569
 #, c-format
 msgid "read() failed: %s"
-msgstr ""
+msgstr "???????? read(): %s"
 
-#: ../src/daemon/main.c:789
+#: ../src/daemon/main.c:797
 msgid "Daemon startup failed."
-msgstr ""
+msgstr "???????? ??????? ???????."
 
-#: ../src/daemon/main.c:791
+#: ../src/daemon/main.c:799
 msgid "Daemon startup successful."
-msgstr ""
+msgstr "?????????? ?????? ???????."
 
-#: ../src/daemon/main.c:816
-#, fuzzy, c-format
+#: ../src/daemon/main.c:830
+#, c-format
 msgid "setsid() failed: %s"
-msgstr "???????? ????????: %s"
+msgstr "???????? setsid(): %s"
 
-#: ../src/daemon/main.c:901
+#: ../src/daemon/main.c:916
 #, c-format
 msgid "This is PulseAudio %s"
 msgstr "???? ????? ?? PulseAudio %s"
 
-#: ../src/daemon/main.c:902
+#: ../src/daemon/main.c:917
 #, c-format
 msgid "Compilation host: %s"
-msgstr ""
+msgstr "???????????? ?????????????: %s"
 
-#: ../src/daemon/main.c:903 ../src/tests/resampler-test.c:418
+#: ../src/daemon/main.c:918 ../src/tests/resampler-test.c:418
 #, c-format
 msgid "Compilation CFLAGS: %s"
-msgstr ""
+msgstr "CFLAGS ?????????????: %s"
 
-#: ../src/daemon/main.c:906
+#: ../src/daemon/main.c:921
 #, c-format
 msgid "Running on host: %s"
-msgstr ""
+msgstr "?????????? ???? ???????????: %s"
 
-#: ../src/daemon/main.c:909
+#: ../src/daemon/main.c:924
 #, c-format
 msgid "Found %u CPUs."
-msgstr ""
+msgstr "???????? %u CPUs."
 
-#: ../src/daemon/main.c:911
+#: ../src/daemon/main.c:926
 #, c-format
 msgid "Page size is %lu bytes"
-msgstr ""
+msgstr "?? ??????? ??? ??????? ????? %lu ???????????"
 
-#: ../src/daemon/main.c:914
+#: ../src/daemon/main.c:929
 msgid "Compiled with Valgrind support: yes"
-msgstr ""
+msgstr "??????????????? ?? ?????????? Valgrind: ???"
 
-#: ../src/daemon/main.c:916
+#: ../src/daemon/main.c:931
 msgid "Compiled with Valgrind support: no"
-msgstr ""
+msgstr "??????????????? ?? ?????????? Valgrind: ???"
 
-#: ../src/daemon/main.c:919
+#: ../src/daemon/main.c:934
 #, c-format
 msgid "Running in valgrind mode: %s"
-msgstr ""
+msgstr "?????????? ?? ????????? valgrind: %s"
 
-#: ../src/daemon/main.c:921
+#: ../src/daemon/main.c:936
 #, c-format
 msgid "Running in VM: %s"
-msgstr ""
+msgstr "?????????? ?? VM: %s"
 
-#: ../src/daemon/main.c:924
+#: ../src/daemon/main.c:939
 msgid "Optimized build: yes"
-msgstr ""
+msgstr "???????????????? ??????: ???"
 
-#: ../src/daemon/main.c:926
+#: ../src/daemon/main.c:941
 msgid "Optimized build: no"
-msgstr ""
+msgstr "???????????????? ??????: ???"
 
-#: ../src/daemon/main.c:930
+#: ../src/daemon/main.c:945
 msgid "NDEBUG defined, all asserts disabled."
-msgstr ""
+msgstr "???????? NDEBUG, ???? ?? ???????????? ?????????????????."
 
-#: ../src/daemon/main.c:932
+#: ../src/daemon/main.c:947
 msgid "FASTPATH defined, only fast path asserts disabled."
 msgstr ""
+"???????? FASTPATH, ???? ?? ???????? ???????????? ????????? ?????????????????."
 
-#: ../src/daemon/main.c:934
+#: ../src/daemon/main.c:949
 msgid "All asserts enabled."
-msgstr ""
+msgstr "???? ?? ???????????? ???????????????."
 
-#: ../src/daemon/main.c:938
+#: ../src/daemon/main.c:953
 msgid "Failed to get machine ID"
-msgstr ""
+msgstr "???????? ????? ?????????????? ???????"
 
-#: ../src/daemon/main.c:941
+#: ../src/daemon/main.c:956
 #, c-format
 msgid "Machine ID is %s."
-msgstr ""
+msgstr "?? ????????????? ??????? ????? %s."
 
-#: ../src/daemon/main.c:945
+#: ../src/daemon/main.c:960
 #, c-format
 msgid "Session ID is %s."
-msgstr ""
+msgstr "?? ????????????? ????????? ????? %s."
 
-#: ../src/daemon/main.c:951
+#: ../src/daemon/main.c:966
 #, c-format
 msgid "Using runtime directory %s."
-msgstr ""
+msgstr "????? ????????? ?????? ????????? %s."
 
-#: ../src/daemon/main.c:956
+#: ../src/daemon/main.c:971
 #, c-format
 msgid "Using state directory %s."
-msgstr ""
+msgstr "????? ????????? ?????????? %s."
 
-#: ../src/daemon/main.c:959
+#: ../src/daemon/main.c:974
 #, c-format
 msgid "Using modules directory %s."
-msgstr ""
+msgstr "????? ????????? ???????? %s."
 
-#: ../src/daemon/main.c:961
+#: ../src/daemon/main.c:976
 #, c-format
 msgid "Running in system mode: %s"
-msgstr ""
+msgstr "?????????? ?? ????????? ??????????: %s"
 
-#: ../src/daemon/main.c:964
+#: ../src/daemon/main.c:979
 msgid ""
 "OK, so you are running PA in system mode. Please note that you most likely "
 "shouldn't be doing that.\n"
@@ -381,559 +760,915 @@ msgid ""
 "Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
 "explanation why system mode is usually a bad idea."
 msgstr ""
+"???????, ????????? PA ?? ?????????? ??????????. ???????????, ????????? ??? "
+"???? ???? ?????????? ??? ?? ?????? ?? ?? ??????.\n"
+"?? ?????? ???? ?? ??????, ???? ????? ???? ??? ??????, ?? ?? ???????? ??? "
+"????????? ???? ??????????.\n"
+"???????????, ???????? http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode "
+"??? ??? ??????? ????? ? ?????????? ?????????? ????? ??????? ??? ?????? ????."
 
-#: ../src/daemon/main.c:981
+#: ../src/daemon/main.c:996
 msgid "pa_pid_file_create() failed."
-msgstr ""
+msgstr "???????? pa_pid_file_create()."
 
-#: ../src/daemon/main.c:991
+#: ../src/daemon/main.c:1006
 msgid "Fresh high-resolution timers available! Bon appetit!"
-msgstr ""
+msgstr "??????????? ????????? ?????? ???????? ????? ??????????! ???? ?????!"
 
-#: ../src/daemon/main.c:993
+#: ../src/daemon/main.c:1008
 msgid ""
 "Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
 "resolution timers enabled!"
 msgstr ""
 "???? ???, ? ??????? ??? ????? ??? ?? ?????! ? ??????? ??? ??? ?????? ????? "
-"Linux ?? ?????????????? ?? high-resolution timers!"
+"?????? ?? ???????????????? ???? ????????? ?????? ????????!"
 
-#: ../src/daemon/main.c:1011
+#: ../src/daemon/main.c:1026
 msgid "pa_core_new() failed."
-msgstr ""
+msgstr "???????? pa_core_new()."
 
-#: ../src/daemon/main.c:1087
+#: ../src/daemon/main.c:1104
 msgid "Failed to initialize daemon."
-msgstr ""
+msgstr "???????? ????????????? ??? ???????."
 
-#: ../src/daemon/main.c:1092
+#: ../src/daemon/main.c:1109
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr ""
+"? ???????? ???????? ????? ???????????? ?????????? ????????, ?????????? ?? "
+"????????."
 
-#: ../src/daemon/main.c:1130
+#: ../src/daemon/main.c:1147
 msgid "Daemon startup complete."
-msgstr ""
+msgstr "???????????? ? ?????? ??? ???????."
 
-#: ../src/daemon/main.c:1136
+#: ../src/daemon/main.c:1153
 msgid "Daemon shutdown initiated."
-msgstr ""
+msgstr "?????? ? ??????????? ??? ???????."
 
-#: ../src/daemon/main.c:1167
+#: ../src/daemon/main.c:1184
 msgid "Daemon terminated."
-msgstr ""
+msgstr "? ???????? ????????."
 
-#: ../src/daemon/cmdline.c:113
-#, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-"COMMANDS:\n"
-"  -h, --help                            Show this help\n"
-"      --version                         Show version\n"
-"      --dump-conf                       Dump default configuration\n"
-"      --dump-modules                    Dump list of available modules\n"
-"      --dump-resample-methods           Dump available resample methods\n"
-"      --cleanup-shm                     Cleanup stale shared memory "
-"segments\n"
-"      --start                           Start the daemon if it is not "
-"running\n"
-"  -k  --kill                            Kill a running daemon\n"
-"      --check                           Check for a running daemon (only "
-"returns exit code)\n"
-"\n"
-"OPTIONS:\n"
-"      --system[=BOOL]                   Run as system-wide instance\n"
-"  -D, --daemonize[=BOOL]                Daemonize after startup\n"
-"      --fail[=BOOL]                     Quit when startup fails\n"
-"      --high-priority[=BOOL]            Try to set high nice level\n"
-"                                        (only available as root, when SUID "
-"or\n"
-"                                        with elevated RLIMIT_NICE)\n"
-"      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
-"                                        (only available as root, when SUID "
-"or\n"
-"                                        with elevated RLIMIT_RTPRIO)\n"
-"      --disallow-module-loading[=BOOL]  Disallow module user requested "
-"module\n"
-"                                        loading/unloading after startup\n"
-"      --disallow-exit[=BOOL]            Disallow user requested exit\n"
-"      --exit-idle-time=SECS             Terminate the daemon when idle and "
-"this\n"
-"                                        time passed\n"
-"      --scache-idle-time=SECS           Unload autoloaded samples when idle "
-"and\n"
-"                                        this time passed\n"
-"      --log-level[=LEVEL]               Increase or set verbosity level\n"
-"  -v                                    Increase the verbosity level\n"
-"      --log-target={auto,syslog,stderr,file:PATH}\n"
-"                                        Specify the log target\n"
-"      --log-meta[=BOOL]                 Include code location in log "
-"messages\n"
-"      --log-time[=BOOL]                 Include timestamps in log messages\n"
-"      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
-"  -p, --dl-search-path=PATH             Set the search path for dynamic "
-"shared\n"
-"                                        objects (plugins)\n"
-"      --resample-method=METHOD          Use the specified resampling method\n"
-"                                        (See --dump-resample-methods for\n"
-"                                        possible values)\n"
-"      --use-pid-file[=BOOL]             Create a PID file\n"
-"      --no-cpu-limit[=BOOL]             Do not install CPU load limiter on\n"
-"                                        platforms that support it.\n"
-"      --disable-shm[=BOOL]              Disable shared memory support.\n"
-"\n"
-"STARTUP SCRIPT:\n"
-"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module "
-"with\n"
-"                                        the specified argument\n"
-"  -F, --file=FILENAME                   Run the specified script\n"
-"  -C                                    Open a command line on the running "
-"TTY\n"
-"                                        after startup\n"
-"\n"
-"  -n                                    Don't load default script file\n"
-msgstr ""
+#: ../src/daemon/pulseaudio.desktop.in.h:1
+msgid "PulseAudio Sound System"
+msgstr "??????? ???? PulseAudio"
 
-#: ../src/daemon/cmdline.c:244
-msgid "--daemonize expects boolean argument"
-msgstr ""
+#: ../src/daemon/pulseaudio.desktop.in.h:2
+msgid "Start the PulseAudio Sound System"
+msgstr "?????? ??? ?????????? ???? PulseAudio"
 
-#: ../src/daemon/cmdline.c:251
-msgid "--fail expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2251
+msgid "Input"
+msgstr "????????"
 
-#: ../src/daemon/cmdline.c:261
-msgid ""
-"--log-level expects log level argument (either numeric in range 0..4 or one "
-"of debug, info, notice, warn, error)."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2252
+msgid "Docking Station Input"
+msgstr "??????? ??????? ?????????"
 
-#: ../src/daemon/cmdline.c:273
-msgid "--high-priority expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2253
+msgid "Docking Station Microphone"
+msgstr "????????? ??????? ?????????"
 
-#: ../src/daemon/cmdline.c:280
-msgid "--realtime expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2254
+msgid "Docking Station Line In"
+msgstr "?????? ??????? ??????? ?????????"
 
-#: ../src/daemon/cmdline.c:287
-msgid "--disallow-module-loading expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2255 ../src/modules/alsa/alsa-mixer.c:2340
+msgid "Line In"
+msgstr "?????? ???????"
 
-#: ../src/daemon/cmdline.c:294
-msgid "--disallow-exit expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2256 ../src/modules/alsa/alsa-mixer.c:2334
+#: ../src/modules/bluetooth/module-bluez4-device.c:2101
+#: ../src/modules/bluetooth/module-bluez5-device.c:1451
+msgid "Microphone"
+msgstr "?????????"
 
-#: ../src/daemon/cmdline.c:301
-msgid "--use-pid-file expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2257 ../src/modules/alsa/alsa-mixer.c:2335
+msgid "Front Microphone"
+msgstr "????????? ?????????"
 
-#: ../src/daemon/cmdline.c:318
-msgid ""
-"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
-"name 'file:<path>'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2258 ../src/modules/alsa/alsa-mixer.c:2336
+msgid "Rear Microphone"
+msgstr "???? ?????????"
 
-#: ../src/daemon/cmdline.c:325
-msgid "--log-time expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2259
+msgid "External Microphone"
+msgstr "????????? ?????????"
 
-#: ../src/daemon/cmdline.c:332
-msgid "--log-meta expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2260 ../src/modules/alsa/alsa-mixer.c:2338
+msgid "Internal Microphone"
+msgstr "????????? ?????????"
 
-#: ../src/daemon/cmdline.c:351
-#, c-format
-msgid "Invalid resample method '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2261 ../src/modules/alsa/alsa-mixer.c:2341
+msgid "Radio"
+msgstr "?????????"
 
-#: ../src/daemon/cmdline.c:358
-msgid "--system expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2262 ../src/modules/alsa/alsa-mixer.c:2342
+msgid "Video"
+msgstr "??????"
 
-#: ../src/daemon/cmdline.c:365
-msgid "--no-cpu-limit expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2263
+msgid "Automatic Gain Control"
+msgstr "????????? ??????? ????????"
 
-#: ../src/daemon/cmdline.c:372
-msgid "--disable-shm expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2264
+msgid "No Automatic Gain Control"
+msgstr "????? ???????? ?????? ????????"
 
-#: ../src/daemon/dumpmodules.c:59
-#, c-format
-msgid "Name: %s\n"
-msgstr "?????: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2265
+msgid "Boost"
+msgstr "????????"
 
-#: ../src/daemon/dumpmodules.c:62
-#, c-format
-msgid "No module information available\n"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2266
+msgid "No Boost"
+msgstr "????? ????????"
 
-#: ../src/daemon/dumpmodules.c:65
-#, c-format
-msgid "Version: %s\n"
-msgstr "??????: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2267
+msgid "Amplifier"
+msgstr "????????"
 
-#: ../src/daemon/dumpmodules.c:67
-#, c-format
-msgid "Description: %s\n"
-msgstr "?????????: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2268
+msgid "No Amplifier"
+msgstr "????? ????????"
 
-#: ../src/daemon/dumpmodules.c:69
-#, c-format
-msgid "Author: %s\n"
-msgstr "??????????: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2269
+msgid "Bass Boost"
+msgstr "???????? ??????"
 
-#: ../src/daemon/dumpmodules.c:71
-#, c-format
-msgid "Usage: %s\n"
-msgstr "?????: %s\n"
+#: ../src/modules/alsa/alsa-mixer.c:2270
+msgid "No Bass Boost"
+msgstr "????? ???????? ??????"
 
-#: ../src/daemon/dumpmodules.c:72
-#, c-format
-msgid "Load Once: %s\n"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2271
+#: ../src/modules/bluetooth/module-bluez4-device.c:2106
+#: ../src/modules/bluetooth/module-bluez5-device.c:1458
+msgid "Speaker"
+msgstr "?????"
 
-#: ../src/daemon/dumpmodules.c:74
-#, c-format
-msgid "DEPRECATION WARNING: %s\n"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2272 ../src/modules/alsa/alsa-mixer.c:2344
+msgid "Headphones"
+msgstr "?????????"
 
-#: ../src/daemon/dumpmodules.c:78
-#, c-format
-msgid "Path: %s\n"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2333
+msgid "Analog Input"
+msgstr "????????? ???????"
 
-#: ../src/daemon/daemon-conf.c:275
-#, c-format
-msgid "[%s:%u] Invalid log target '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2337
+msgid "Dock Microphone"
+msgstr "????????? ??????? ?????????"
 
-#: ../src/daemon/daemon-conf.c:291
-#, c-format
-msgid "[%s:%u] Invalid log level '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2339
+msgid "Headset Microphone"
+msgstr "????????? ??????????"
 
-#: ../src/daemon/daemon-conf.c:307
-#, c-format
-msgid "[%s:%u] Invalid resample method '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2343
+msgid "Analog Output"
+msgstr "????????? ??????"
 
-#: ../src/daemon/daemon-conf.c:330
-#, c-format
-msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2345
+msgid "LFE on Separate Mono Output"
+msgstr "LFE ?? ????????? ?????????? ?????"
 
-#: ../src/daemon/daemon-conf.c:351
-#, c-format
-msgid "[%s:%u] Invalid sample format '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2346
+msgid "Line Out"
+msgstr "?????? ??????"
 
-#: ../src/daemon/daemon-conf.c:370 ../src/daemon/daemon-conf.c:389
-#, c-format
-msgid "[%s:%u] Invalid sample rate '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2347
+msgid "Analog Mono Output"
+msgstr "????????? ?????????? ??????"
 
-#: ../src/daemon/daemon-conf.c:413
-#, c-format
-msgid "[%s:%u] Invalid sample channels '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2348
+msgid "Speakers"
+msgstr "?????"
 
-#: ../src/daemon/daemon-conf.c:431
-#, c-format
-msgid "[%s:%u] Invalid channel map '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2349
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / ???? ?????????"
 
-#: ../src/daemon/daemon-conf.c:449
-#, c-format
-msgid "[%s:%u] Invalid number of fragments '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2350
+msgid "Digital Output (S/PDIF)"
+msgstr "??????? ?????? (S/PDIF)"
 
-#: ../src/daemon/daemon-conf.c:467
-#, c-format
-msgid "[%s:%u] Invalid fragment size '%s'."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2351
+msgid "Digital Input (S/PDIF)"
+msgstr "??????? ??????? (S/PDIF)"
 
-#: ../src/daemon/daemon-conf.c:485
-#, c-format
-msgid "[%s:%u] Invalid nice level '%s'."
+#: ../src/modules/alsa/alsa-mixer.c:2352
+msgid "Digital Passthrough (S/PDIF)"
+msgstr "??????? ???????? (S/PDIF)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3807
+msgid "Analog Mono"
+msgstr "????????? ??????????"
+
+#: ../src/modules/alsa/alsa-mixer.c:3808
+msgid "Analog Stereo"
+msgstr "????????? ????????????"
+
+#: ../src/modules/alsa/alsa-mixer.c:3809
+msgid "Analog Surround 2.1"
+msgstr "?????????? ????????????? ???? 2.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3810
+msgid "Analog Surround 3.0"
+msgstr "?????????? ????????????? ???? 3.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3811
+msgid "Analog Surround 3.1"
+msgstr "?????????? ????????????? ???? 3.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3812
+msgid "Analog Surround 4.0"
+msgstr "?????????? ????????????? ???? 4.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3813
+msgid "Analog Surround 4.1"
+msgstr "?????????? ????????????? ???? 4.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3814
+msgid "Analog Surround 5.0"
+msgstr "?????????? ????????????? ???? 5.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3815
+msgid "Analog Surround 5.1"
+msgstr "?????????? ????????????? ???? 5.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3816
+msgid "Analog Surround 6.0"
+msgstr "?????????? ????????????? ???? 6.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3817
+msgid "Analog Surround 6.1"
+msgstr "?????????? ????????????? ???? 6.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3818
+msgid "Analog Surround 7.0"
+msgstr "?????????? ????????????? ???? 7.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3819
+msgid "Analog Surround 7.1"
+msgstr "?????????? ????????????? ???? 7.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3820
+msgid "Analog 4-channel Input"
+msgstr "????????? 4?????? ???????"
+
+#: ../src/modules/alsa/alsa-mixer.c:3821
+msgid "Digital Stereo (IEC958)"
+msgstr "??????? ???????????? (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3822
+msgid "Digital Passthrough  (IEC958)"
+msgstr "??????? ???????? (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3823
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "???????? ????????????? ???? 4.0 (IEC958/AC3)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3824
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "???????? ????????????? ???? 5.1 (IEC958/AC3)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3825
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "???????? ????????????? ???? 5.1 (IEC958/DTS)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3826
+msgid "Digital Stereo (HDMI)"
+msgstr "???????? ????????????? (HDMI)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3827
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "???????? ????????????? ???? 5.1 (HDMI)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3956
+msgid "Analog Mono Duplex"
+msgstr "?????????? ??????????? ??????????"
+
+#: ../src/modules/alsa/alsa-mixer.c:3957
+msgid "Analog Stereo Duplex"
+msgstr "?????????? ????????????? ??????????"
+
+#: ../src/modules/alsa/alsa-mixer.c:3958
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "???????? ????????????? ?????????? (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3959
+#: ../src/modules/alsa/module-alsa-card.c:193
+#: ../src/modules/bluetooth/module-bluez4-device.c:2297
+#: ../src/modules/bluetooth/module-bluez5-device.c:1656
+msgid "Off"
+msgstr "????????"
+
+#: ../src/modules/alsa/alsa-mixer.c:4058
+#, c-format
+msgid "%s Output"
+msgstr "?????? %s"
+
+#: ../src/modules/alsa/alsa-mixer.c:4066
+#, c-format
+msgid "%s Input"
+msgstr "??????? %s"
+
+#: ../src/modules/alsa/alsa-sink.c:570 ../src/modules/alsa/alsa-sink.c:748
+#, c-format
+msgid ""
+"ALSA woke us up to write new data to the device, but there was actually "
+"nothing to write!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
 msgstr ""
+"? ALSA ?????????????? ??? ??????? ???? ????????? ??? ???????, ???? ??? "
+"?????? ???? ?????????????? ?????? ??? ?? ???????!\n"
+"???? ???? ?????????? ???? ????? ??? ?????? ??? ?????? ALSA '%s'. ??????????? "
+"???????? ???? ?? ???? ????? ??????????????? ALSA.\n"
+"???????????? ?? ?????? POLLOUT -- ???? ? ??????? snd_pcm_avail() ????????? 0 "
+"? ???? ???? < min_avail."
 
-#: ../src/daemon/daemon-conf.c:528
+#: ../src/modules/alsa/alsa-source.c:529 ../src/modules/alsa/alsa-source.c:681
 #, c-format
-msgid "[%s:%u] Invalid server type '%s'."
+msgid ""
+"ALSA woke us up to read new data from the device, but there was actually "
+"nothing to read!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
 msgstr ""
+"? ALSA ?????????????? ??? ???????? ???? ????????? ??? ?? ???????, ???? ??? "
+"?????? ???? ?????????????? ?????? ??? ?? ?????????!\n"
+"???? ???? ?????????? ???? ????? ??? ?????? ??? ?????? ALSA '%s'. ??????????? "
+"???????? ???? ?? ???? ????? ??????????????? ALSA.\n"
+"???????????? ?? ?????? POLLIN -- ???? ? ??????? snd_pcm_avail() ????????? 0 "
+"? ???? ???? < min_avail."
 
-#: ../src/daemon/daemon-conf.c:641
+#: ../src/modules/alsa/alsa-util.c:1135 ../src/modules/alsa/alsa-util.c:1210
 #, c-format
-msgid "Failed to open configuration file: %s"
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
+"?? snd_pcm_avail() ????????? ??? ???? ??? ????? ???? ??????: %lu ??????????? "
+"(%lu ms).\n"
+"?? ?????????? ???? ????? ??? ?????? ???? ????? ALSA '%s'. ???????????, "
+"???????? ???? ?? ???? ????? ??????????????? ALSA."
 
-#: ../src/daemon/daemon-conf.c:657
+#: ../src/modules/alsa/alsa-util.c:1185
+#, c-format
 msgid ""
-"The specified default channel map has a different number of channels than "
-"the specified default number of channels."
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
+"?? snd_pcm_delay() ????????? ??? ???? ??? ????? ???? ??????: %li ??????????? "
+"(%s%lu ms).\n"
+"?? ?????????? ???? ????? ??? ?????? ???? ????? ALSA '%s'. ???????????, "
+"???????? ???? ?? ???? ????? ??????????????? ALSA."
 
-#: ../src/daemon/daemon-conf.c:743
+#: ../src/modules/alsa/alsa-util.c:1226
 #, c-format
-msgid "### Read from configuration file: %s ###\n"
+msgid ""
+"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
+"%lu.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
+"?? snd_pcm_avail_delay() ????????? ????????? ?????: ? ??????????? %lu ????? "
+"????????? ??? ?? avail %lu.\n"
+"?? ?????????? ???? ????? ??? ?????? ???? ????? ALSA '%s'. ???????????, "
+"???????? ???? ?? ???? ????? ??????????????? ALSA."
 
-#: ../src/daemon/caps.c:58
-msgid "Cleaning up privileges."
+#: ../src/modules/alsa/alsa-util.c:1269
+#, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
+"?? snd_pcm_mmap_begin() ????????? ??? ???? ??? ????? ???? ??????: %lu "
+"??????????? (%lu ms).\n"
+"?? ?????????? ???? ????? ??? ?????? ???? ????? ALSA '%s'. ???????????, "
+"???????? ???? ?? ???? ????? ??????????????? ALSA."
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2091
+#: ../src/modules/bluetooth/module-bluez5-device.c:1441
+msgid "Headset"
+msgstr "?????????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2096
+#: ../src/modules/bluetooth/module-bluez5-device.c:1446
+msgid "Handsfree"
+msgstr "???????? ????????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2111
+#: ../src/modules/bluetooth/module-bluez5-device.c:1464
+msgid "Headphone"
+msgstr "?????????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2116
+#: ../src/modules/bluetooth/module-bluez5-device.c:1469
+msgid "Portable"
+msgstr "??????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2121
+#: ../src/modules/bluetooth/module-bluez5-device.c:1474
+msgid "Car"
+msgstr "??????????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2126
+#: ../src/modules/bluetooth/module-bluez5-device.c:1479
+msgid "HiFi"
+msgstr "????? ?????????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2131
+#: ../src/modules/bluetooth/module-bluez5-device.c:1484
+msgid "Phone"
+msgstr "????????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2139
+#: ../src/modules/bluetooth/module-bluez5-device.c:1436
+#: ../src/modules/bluetooth/module-bluez5-device.c:1452
+#: ../src/modules/bluetooth/module-bluez5-device.c:1490
+msgid "Bluetooth Output"
+msgstr "?????? ?????????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2142
+#: ../src/modules/bluetooth/module-bluez5-device.c:1435
+#: ../src/modules/bluetooth/module-bluez5-device.c:1457
+#: ../src/modules/bluetooth/module-bluez5-device.c:1463
+#: ../src/modules/bluetooth/module-bluez5-device.c:1489
+msgid "Bluetooth Input"
+msgstr "??????? ?????????"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2178
+msgid "High Fidelity Playback (A2DP)"
+msgstr "??????????? ?????? ???????? (A2DP)"
 
-#: ../src/daemon/pulseaudio.desktop.in.h:1
-msgid "PulseAudio Sound System"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2189
+msgid "High Fidelity Capture (A2DP)"
+msgstr "???? ?????? ????????? (A2DP)"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2200
+msgid "Telephony Duplex (HSP/HFP)"
+msgstr "????????? ????????? (HSP/HFP)"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2212
+msgid "Handsfree Gateway"
+msgstr "???? ???????? ????????"
+
+#. TODO: Change this profile's name to a2dp_sink, to reflect the remote
+#. * device's role and be consistent with the a2dp source profile
+#: ../src/modules/bluetooth/module-bluez5-device.c:1529
+#| msgid "High Fidelity Playback (A2DP)"
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "??????????? ?????? ????????? (?????? A2DP)"
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1540
+#| msgid "High Fidelity Capture (A2DP)"
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "???? ?????? ????????? (???? A2DP)"
+
+#: ../src/modules/echo-cancel/module-echo-cancel.c:63
+msgid ""
+"source_name=<name for the source> source_properties=<properties for the "
+"source> source_master=<name of source to filter> sink_name=<name for the "
+"sink> sink_properties=<properties for the sink> sink_master=<name of sink to "
+"filter> adjust_time=<how often to readjust rates in s> adjust_threshold=<how "
+"much drift to readjust after in ms> format=<sample format> rate=<sample "
+"rate> channels=<number of channels> channel_map=<channel map> "
+"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
+"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
+"loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
+"source_name=<????? ?????> source_properties=<????????? ?????> "
+"source_master=<????? ????? ??? ???????????> sink_name=<????? ?????> "
+"sink_properties=<????????? ?????> sink_master=<????? ????? ??? ???????????> "
+"adjust_time=<????????? ????????????? ?????? ?? s> adjust_threshold=<???? "
+"?????????? ?? ?????????????? ??????? ?? ms> format=<????? ?????????> "
+"rate=<?????? ?????????> channels=<??????? ????????> channel_map=<?????????? "
+"????????> aec_method=<????????? ??? ?????> aec_args=<?????????? ??? ??? "
+"?????? AEC> save_aec=<?????????? ????????? AEC ?? /tmp> autoloaded=<?????? "
+"?? ???? ? ??????? ????? ???????? ?????????> use_volume_sharing=<??? ? ???> "
+
+#. add on profile
+#: ../src/modules/macosx/module-coreaudio-device.c:756
+msgid "On"
+msgstr "??????"
 
-#: ../src/daemon/pulseaudio.desktop.in.h:2
-msgid "Start the PulseAudio Sound System"
+#: ../src/modules/module-always-sink.c:38
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr ""
+"????? ????? ??????????? ???? ????????? ????? ????? ?? ?? ????? ???? ?????????"
+
+#: ../src/modules/module-always-sink.c:82
+msgid "Dummy Output"
+msgstr "???????? ??????"
+
+#: ../src/modules/module-equalizer-sink.c:72
+msgid "General Purpose Equalizer"
+msgstr "????????????? ??????? ??????"
+
+#: ../src/modules/module-equalizer-sink.c:76
+msgid ""
+"sink_name=<name of the sink> sink_properties=<properties for the sink> "
+"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
+"this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
+"sink_name=<????? ?????> sink_properties=<????????? ?????> "
+"sink_master=<?????? ??? ???????> format=<????? ?????????> rate=<?????? "
+"?????????> channels=<??????? ????????> channel_map=<?????????? ????????> "
+"autoloaded=<?????? ?? ???? ? ??????? ?? ?????????? ????????> "
+"use_volume_sharing=<??? ? ???> "
+
+#: ../src/modules/module-filter-apply.c:48
+msgid "autoclean=<automatically unload unused filters?>"
+msgstr "autoclean=<???????? ????????? ??????????????? ???????;>"
+
+#: ../src/modules/module-ladspa-sink.c:53
+msgid "Virtual LADSPA sink"
+msgstr "????????? ?????? LADSPA"
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:1
-msgid "PulseAudio Sound System KDE Routing Policy"
+#: ../src/modules/module-ladspa-sink.c:57
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<input channel map> plugin=<ladspa "
+"plugin name> label=<ladspa plugin label> control=<comma separated list of "
+"input control values> input_ladspaport_map=<comma separated list of input "
+"LADSPA port names> output_ladspaport_map=<comma separated list of output "
+"LADSPA port names> "
 msgstr ""
+"sink_name=<????? ??? ?????> sink_properties=<????????? ?????> master=<????? "
+"????? ??? ???????????> format=<????? ?????????> rate=<?????? ?????????> "
+"channels=<??????? ????????> channel_map=<?????????? ???????? ???????> "
+"plugin=<????? ????????? ladspa> label=<??????? ????????? ladspa> "
+"control=<????????? ??? ????????? ?? ??????? ??? ????? ??????? ???????> "
+"input_ladspaport_map=<????????? ??? ????????? ?? ??????? ??? ???????? ????? "
+"LADSPA> output_ladspaport_map=<????????? ??? ????????? ?? ??????? ??? "
+"???????? ????? ?????? LADSPA> "
+
+#: ../src/modules/module-null-sink.c:49
+msgid "Clocked NULL sink"
+msgstr "?????? NULL ?? ????????"
+
+#: ../src/modules/module-null-sink.c:280
+msgid "Null Output"
+msgstr "???????? ??????"
+
+#: ../src/modules/module-rygel-media-server.c:510
+#: ../src/modules/module-rygel-media-server.c:548
+#: ../src/modules/module-rygel-media-server.c:907
+msgid "Output Devices"
+msgstr "???????? ??????"
+
+#: ../src/modules/module-rygel-media-server.c:511
+#: ../src/modules/module-rygel-media-server.c:549
+#: ../src/modules/module-rygel-media-server.c:908
+msgid "Input Devices"
+msgstr "???????? ???????"
+
+#: ../src/modules/module-rygel-media-server.c:1065
+msgid "Audio on @HOSTNAME@"
+msgstr "???? ??? @HOSTNAME@"
+
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
+#: ../src/modules/module-tunnel-sink-new.c:293
+#: ../src/modules/module-tunnel-source-new.c:294
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "???????? ??? %s@%s"
+
+#: ../src/modules/module-tunnel-sink-new.c:483
+#: ../src/modules/module-tunnel-source-new.c:485
+#, c-format
+msgid "Tunnel to %s/%s"
+msgstr "???????? ??? %s/%s"
+
+#: ../src/modules/module-virtual-surround-sink.c:49
+msgid "Virtual surround sink"
+msgstr "????????? ????????????? ???? ?????"
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:2
-msgid "Start the PulseAudio Sound System with KDE Routing Policy"
+#: ../src/modules/module-virtual-surround-sink.c:53
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> "
+"use_volume_sharing=<yes or no> force_flat_volume=<yes or no> hrir=/path/to/"
+"left_hrir.wav "
 msgstr ""
+"sink_name=<????? ?????> sink_properties=<????????? ?????> master=<????? "
+"????? ??? ???????????> format=<????? ?????????> rate=<?????? ?????????> "
+"channels=<??????? ????????> channel_map=<?????????? ????????> "
+"use_volume_sharing=<??? ? ???> force_flat_volume=<??? ? ???> hrir=/path/to/"
+"left_hrir.wav "
+
+#: ../src/modules/reserve-wrap.c:151
+msgid "PulseAudio Sound Server"
+msgstr "??????????? ???? PulseAudio"
 
-#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:757
+#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:754
 msgid "Mono"
-msgstr "Mono"
+msgstr "??????????"
 
 #: ../src/pulse/channelmap.c:107
 msgid "Front Center"
-msgstr ""
+msgstr "??????? ??????"
 
 #: ../src/pulse/channelmap.c:108
 msgid "Front Left"
-msgstr ""
+msgstr "??????? ????????"
 
 #: ../src/pulse/channelmap.c:109
 msgid "Front Right"
-msgstr ""
+msgstr "??????? ?????"
 
 #: ../src/pulse/channelmap.c:111
 msgid "Rear Center"
-msgstr ""
+msgstr "???? ??????"
 
 #: ../src/pulse/channelmap.c:112
 msgid "Rear Left"
-msgstr ""
+msgstr "???? ????????"
 
 #: ../src/pulse/channelmap.c:113
 msgid "Rear Right"
-msgstr ""
+msgstr "???? ?????"
 
 #: ../src/pulse/channelmap.c:115
 msgid "Subwoofer"
-msgstr ""
+msgstr "???????????"
 
 #: ../src/pulse/channelmap.c:117
 msgid "Front Left-of-center"
-msgstr ""
+msgstr "??????? ???????? ??? ?? ??????"
 
 #: ../src/pulse/channelmap.c:118
 msgid "Front Right-of-center"
-msgstr ""
+msgstr "??????? ????? ??? ?? ??????"
 
 #: ../src/pulse/channelmap.c:120
 msgid "Side Left"
-msgstr ""
+msgstr "?????? ????????"
 
 #: ../src/pulse/channelmap.c:121
 msgid "Side Right"
-msgstr ""
+msgstr "?????? ?????"
 
 #: ../src/pulse/channelmap.c:123
 msgid "Auxiliary 0"
-msgstr "Auxiliary 0"
+msgstr "????????? 0"
 
 #: ../src/pulse/channelmap.c:124
 msgid "Auxiliary 1"
-msgstr "Auxiliary 1"
+msgstr "????????? 1"
 
 #: ../src/pulse/channelmap.c:125
 msgid "Auxiliary 2"
-msgstr "Auxiliary 2"
+msgstr "????????? 2"
 
 #: ../src/pulse/channelmap.c:126
 msgid "Auxiliary 3"
-msgstr "Auxiliary 3"
+msgstr "????????? 3"
 
 #: ../src/pulse/channelmap.c:127
 msgid "Auxiliary 4"
-msgstr "Auxiliary 4"
+msgstr "????????? 4"
 
 #: ../src/pulse/channelmap.c:128
 msgid "Auxiliary 5"
-msgstr "Auxiliary 5"
+msgstr "????????? 5"
 
 #: ../src/pulse/channelmap.c:129
 msgid "Auxiliary 6"
-msgstr "Auxiliary 6"
+msgstr "????????? 6"
 
 #: ../src/pulse/channelmap.c:130
 msgid "Auxiliary 7"
-msgstr "Auxiliary 7"
+msgstr "????????? 7"
 
 #: ../src/pulse/channelmap.c:131
 msgid "Auxiliary 8"
-msgstr "Auxiliary 8"
+msgstr "????????? 8"
 
 #: ../src/pulse/channelmap.c:132
 msgid "Auxiliary 9"
-msgstr "Auxiliary 9"
+msgstr "????????? 9"
 
 #: ../src/pulse/channelmap.c:133
 msgid "Auxiliary 10"
-msgstr "Auxiliary 10"
+msgstr "????????? 10"
 
 #: ../src/pulse/channelmap.c:134
 msgid "Auxiliary 11"
-msgstr "Auxiliary 11"
+msgstr "????????? 11"
 
 #: ../src/pulse/channelmap.c:135
 msgid "Auxiliary 12"
-msgstr "Auxiliary 12"
+msgstr "????????? 12"
 
 #: ../src/pulse/channelmap.c:136
 msgid "Auxiliary 13"
-msgstr "Auxiliary 13"
+msgstr "????????? 13"
 
 #: ../src/pulse/channelmap.c:137
 msgid "Auxiliary 14"
-msgstr "Auxiliary 14"
+msgstr "????????? 14"
 
 #: ../src/pulse/channelmap.c:138
 msgid "Auxiliary 15"
-msgstr "Auxiliary 15"
+msgstr "????????? 15"
 
 #: ../src/pulse/channelmap.c:139
 msgid "Auxiliary 16"
-msgstr "Auxiliary 16"
+msgstr "????????? 16"
 
 #: ../src/pulse/channelmap.c:140
 msgid "Auxiliary 17"
-msgstr "Auxiliary 17"
+msgstr "????????? 17"
 
 #: ../src/pulse/channelmap.c:141
 msgid "Auxiliary 18"
-msgstr "Auxiliary 18"
+msgstr "????????? 18"
 
 #: ../src/pulse/channelmap.c:142
 msgid "Auxiliary 19"
-msgstr "Auxiliary 19"
+msgstr "????????? 19"
 
 #: ../src/pulse/channelmap.c:143
 msgid "Auxiliary 20"
-msgstr "Auxiliary 20"
+msgstr "????????? 20"
 
 #: ../src/pulse/channelmap.c:144
 msgid "Auxiliary 21"
-msgstr "Auxiliary 21"
+msgstr "????????? 21"
 
 #: ../src/pulse/channelmap.c:145
 msgid "Auxiliary 22"
-msgstr "Auxiliary 22"
+msgstr "????????? 22"
 
 #: ../src/pulse/channelmap.c:146
 msgid "Auxiliary 23"
-msgstr "Auxiliary 23"
+msgstr "????????? 23"
 
 #: ../src/pulse/channelmap.c:147
 msgid "Auxiliary 24"
-msgstr "Auxiliary 24"
+msgstr "????????? 24"
 
 #: ../src/pulse/channelmap.c:148
 msgid "Auxiliary 25"
-msgstr "Auxiliary 25"
+msgstr "????????? 25"
 
 #: ../src/pulse/channelmap.c:149
 msgid "Auxiliary 26"
-msgstr "Auxiliary 26"
+msgstr "????????? 26"
 
 #: ../src/pulse/channelmap.c:150
 msgid "Auxiliary 27"
-msgstr "Auxiliary 27"
+msgstr "????????? 27"
 
 #: ../src/pulse/channelmap.c:151
 msgid "Auxiliary 28"
-msgstr "Auxiliary 28"
+msgstr "????????? 28"
 
 #: ../src/pulse/channelmap.c:152
 msgid "Auxiliary 29"
-msgstr "Auxiliary 29"
+msgstr "????????? 29"
 
 #: ../src/pulse/channelmap.c:153
 msgid "Auxiliary 30"
-msgstr "Auxiliary 30"
+msgstr "????????? 30"
 
 #: ../src/pulse/channelmap.c:154
 msgid "Auxiliary 31"
-msgstr "Auxiliary 31"
+msgstr "????????? 31"
 
 #: ../src/pulse/channelmap.c:156
 msgid "Top Center"
-msgstr ""
+msgstr "????? ??? ??????"
 
 #: ../src/pulse/channelmap.c:158
 msgid "Top Front Center"
-msgstr ""
+msgstr "???? ?????? ??? ??????"
 
 #: ../src/pulse/channelmap.c:159
 msgid "Top Front Left"
-msgstr ""
+msgstr "???? ?????? ????????"
 
 #: ../src/pulse/channelmap.c:160
 msgid "Top Front Right"
-msgstr ""
+msgstr "???? ?????? ?????"
 
 #: ../src/pulse/channelmap.c:162
 msgid "Top Rear Center"
-msgstr ""
+msgstr "???? ???? ??? ??????"
 
 #: ../src/pulse/channelmap.c:163
 msgid "Top Rear Left"
-msgstr ""
+msgstr "???? ???? ????????"
 
 #: ../src/pulse/channelmap.c:164
 msgid "Top Rear Right"
-msgstr ""
+msgstr "???? ???? ?????"
 
-#: ../src/pulse/channelmap.c:484 ../src/pulse/sample.c:169
-#: ../src/pulse/volume.c:297 ../src/pulse/volume.c:323
-#: ../src/pulse/volume.c:343 ../src/pulse/volume.c:373
-#: ../src/pulse/format.c:125
+#: ../src/pulse/channelmap.c:481 ../src/pulse/format.c:123
+#: ../src/pulse/sample.c:177 ../src/pulse/volume.c:296
+#: ../src/pulse/volume.c:322 ../src/pulse/volume.c:342
+#: ../src/pulse/volume.c:374 ../src/pulse/volume.c:414
+#: ../src/pulse/volume.c:433
 msgid "(invalid)"
-msgstr "(?? ??????)"
+msgstr "(?????)"
 
-#: ../src/pulse/channelmap.c:761
+#: ../src/pulse/channelmap.c:758
 msgid "Stereo"
-msgstr "Stereo"
+msgstr "????????????"
 
-#: ../src/pulse/channelmap.c:766
+#: ../src/pulse/channelmap.c:763
 msgid "Surround 4.0"
-msgstr "Surround 4.0"
+msgstr "????????????? ???? 4.0"
 
-#: ../src/pulse/channelmap.c:772
+#: ../src/pulse/channelmap.c:769
 msgid "Surround 4.1"
-msgstr "Surround 4.1"
+msgstr "????????????? ???? 4.1"
 
-#: ../src/pulse/channelmap.c:778
+#: ../src/pulse/channelmap.c:775
 msgid "Surround 5.0"
-msgstr "Surround 5.0"
+msgstr "????????????? ???? 5.0"
 
-#: ../src/pulse/channelmap.c:784
+#: ../src/pulse/channelmap.c:781
 msgid "Surround 5.1"
-msgstr "Surround 5.1"
+msgstr "????????????? ???? 5.1"
 
-#: ../src/pulse/channelmap.c:791
+#: ../src/pulse/channelmap.c:788
 msgid "Surround 7.1"
-msgstr "Surround 7.1"
+msgstr "????????????? ???? 7.1"
+
+#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:99
+msgid "xcb_connect() failed"
+msgstr "???????? xcb_connect()"
+
+#: ../src/pulse/client-conf-x11.c:60 ../src/utils/pax11publish.c:104
+msgid "xcb_connection_has_error() returned true"
+msgstr "????????? ??????? ??? xcb_connection_has_error()"
+
+#: ../src/pulse/client-conf-x11.c:96
+msgid "Failed to parse cookie data"
+msgstr "???????? ???????? ????????? ?????????"
+
+#: ../src/pulse/context.c:529
+msgid "No cookie loaded. Attempting to connect without."
+msgstr "??? ?????????? ????????. ?????????? ??? ??????? ????? ????????."
+
+#: ../src/pulse/context.c:610
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: ../src/pulse/context.c:665
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: ../src/pulse/context.c:1366
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "?????? ?????? ??? ??????? ???????? '%s'"
+
+#: ../src/pulsecore/lock-autospawn.c:143 ../src/pulsecore/lock-autospawn.c:229
+msgid "Cannot access autospawn lock."
+msgstr "??????? ? ???????? ??????????? ????????? ???????????."
+
+#: ../src/pulsecore/log.c:155
+#, c-format
+msgid "Failed to open target file '%s'."
+msgstr "???????? ?????????? ??????? ?????????? '%s'."
+
+#: ../src/pulsecore/log.c:178
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+"??????????? ?? ??????? ??????? ?????????? '%s', '%s.1', '%s.2' ... '%s.%d', "
+"???? ??? ????????."
+
+#: ../src/pulsecore/log.c:633
+msgid "Invalid log target."
+msgstr "?????? ?????????? ??????????."
+
+#: ../src/pulsecore/sink.c:3428
+msgid "Built-in Audio"
+msgstr "?????????? ????"
+
+#: ../src/pulsecore/sink.c:3433
+msgid "Modem"
+msgstr "??????"
 
 #: ../src/pulse/error.c:40
 msgid "OK"
@@ -941,343 +1676,444 @@ msgstr "???????"
 
 #: ../src/pulse/error.c:41
 msgid "Access denied"
-msgstr ""
+msgstr "?????? ?????????"
 
 #: ../src/pulse/error.c:42
 msgid "Unknown command"
-msgstr ""
+msgstr "??????? ??????"
 
 #: ../src/pulse/error.c:43
 msgid "Invalid argument"
-msgstr ""
+msgstr "????? ??????"
 
 #: ../src/pulse/error.c:44
 msgid "Entity exists"
-msgstr ""
+msgstr "?????? ?????????"
 
 #: ../src/pulse/error.c:45
 msgid "No such entity"
-msgstr ""
+msgstr "????????? ??????? ?????????"
 
 #: ../src/pulse/error.c:46
 msgid "Connection refused"
-msgstr ""
+msgstr "?????? ????????"
 
 #: ../src/pulse/error.c:47
 msgid "Protocol error"
-msgstr ""
+msgstr "?????? ??????????"
 
 #: ../src/pulse/error.c:48
 msgid "Timeout"
-msgstr ""
+msgstr "???? ??????"
 
 #: ../src/pulse/error.c:49
 msgid "No authorization key"
-msgstr ""
+msgstr "????? ?????? ??????????????"
 
 #: ../src/pulse/error.c:50
 msgid "Internal error"
-msgstr ""
+msgstr "????????? ??????"
 
 #: ../src/pulse/error.c:51
 msgid "Connection terminated"
-msgstr ""
+msgstr "??????????? ????????"
 
 #: ../src/pulse/error.c:52
 msgid "Entity killed"
-msgstr ""
+msgstr "??????????? ?????????"
 
 #: ../src/pulse/error.c:53
 msgid "Invalid server"
-msgstr ""
+msgstr "?????? ???????????"
 
 #: ../src/pulse/error.c:54
 msgid "Module initialization failed"
-msgstr ""
+msgstr "???????? ????????????? ????????"
 
 #: ../src/pulse/error.c:55
 msgid "Bad state"
-msgstr ""
+msgstr "???? ?????????"
 
 #: ../src/pulse/error.c:56
 msgid "No data"
-msgstr ""
+msgstr "????? ????????"
 
 #: ../src/pulse/error.c:57
 msgid "Incompatible protocol version"
-msgstr ""
+msgstr "???????? ?????? ???????????"
 
 #: ../src/pulse/error.c:58
 msgid "Too large"
-msgstr ""
+msgstr "?????????? ??????"
 
 #: ../src/pulse/error.c:59
 msgid "Not supported"
-msgstr ""
+msgstr "??? ?????????????"
 
 #: ../src/pulse/error.c:60
 msgid "Unknown error code"
-msgstr ""
+msgstr "???????? ??????? ?????????"
 
 #: ../src/pulse/error.c:61
 msgid "No such extension"
-msgstr ""
+msgstr "????????? ??????? ?????????"
 
 #: ../src/pulse/error.c:62
 msgid "Obsolete functionality"
-msgstr ""
+msgstr "????? ??????????"
 
 #: ../src/pulse/error.c:63
 msgid "Missing implementation"
-msgstr ""
+msgstr "??????? ??????????"
 
 #: ../src/pulse/error.c:64
 msgid "Client forked"
-msgstr ""
+msgstr "????????????? ???????"
 
 #: ../src/pulse/error.c:65
 msgid "Input/Output error"
-msgstr ""
+msgstr "?????? ???????/??????"
 
 #: ../src/pulse/error.c:66
 msgid "Device or resource busy"
-msgstr ""
+msgstr "??????? ? ????? ????? ?????????????"
 
-#: ../src/pulse/sample.c:171
+#: ../src/pulse/sample.c:179
 #, c-format
 msgid "%s %uch %uHz"
 msgstr "%s %uch %uHz"
 
-#: ../src/pulse/sample.c:183
+#: ../src/pulse/sample.c:191
 #, c-format
 msgid "%0.1f GiB"
 msgstr "%0.1f GiB"
 
-#: ../src/pulse/sample.c:185
+#: ../src/pulse/sample.c:193
 #, c-format
 msgid "%0.1f MiB"
 msgstr "%0.1f MiB"
 
-#: ../src/pulse/sample.c:187
+#: ../src/pulse/sample.c:195
 #, c-format
 msgid "%0.1f KiB"
 msgstr "%0.1f KiB"
 
-#: ../src/pulse/sample.c:189
+#: ../src/pulse/sample.c:197
 #, c-format
 msgid "%u B"
 msgstr "%u B"
 
-#: ../src/pulse/client-conf-x11.c:54 ../src/utils/pax11publish.c:100
-#, fuzzy
-msgid "xcb_connect() failed"
-msgstr "???????(): %s"
-
-#: ../src/pulse/client-conf-x11.c:59 ../src/utils/pax11publish.c:105
-msgid "xcb_connection_has_error() returned true"
-msgstr ""
-
-#: ../src/pulse/client-conf-x11.c:97
-msgid "Failed to parse cookie data"
-msgstr ""
-
-#: ../src/pulse/client-conf.c:117
+#: ../src/tests/resampler-test.c:257
 #, c-format
-msgid "Failed to open configuration file '%s': %s"
-msgstr ""
-
-#: ../src/pulse/context.c:528
-msgid "No cookie loaded. Attempting to connect without."
+msgid ""
+"%s [options]\n"
+"\n"
+"-h, --help                            Show this help\n"
+"-v, --verbose                         Print debug messages\n"
+"      --from-rate=SAMPLERATE          From sample rate in Hz (defaults to "
+"44100)\n"
+"      --from-format=SAMPLEFORMAT      From sample type (defaults to s16le)\n"
+"      --from-channels=CHANNELS        From number of channels (defaults to "
+"1)\n"
+"      --to-rate=SAMPLERATE            To sample rate in Hz (defaults to "
+"44100)\n"
+"      --to-format=SAMPLEFORMAT        To sample type (defaults to s16le)\n"
+"      --to-channels=CHANNELS          To number of channels (defaults to 1)\n"
+"      --resample-method=METHOD        Resample method (defaults to auto)\n"
+"      --seconds=SECONDS               From stream duration (defaults to 60)\n"
+"\n"
+"If the formats are not specified, the test performs all formats "
+"combinations,\n"
+"back and forth.\n"
+"\n"
+"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
+"alaw,\n"
+"s24le, s24be, s24-32le, s24-32be, s32le, s32be (defaults to s16ne)\n"
+"\n"
+"See --dump-resample-methods for possible values of resample methods.\n"
 msgstr ""
+"%s [options]\n"
+"\n"
+"-h, --help                            ???????? ??? ????????\n"
+"-v, --verbose                         ???????? ????????? ??????????????\n"
+"      --from-rate=SAMPLERATE          ??? ????? ????????? ?? Hz (?????????? "
+"44100)\n"
+"      --from-format=SAMPLEFORMAT      ??? ???? ????????? (?????????? s16le)\n"
+"      --from-channels=CHANNELS        ??? ?????? ???????? (?????????? 1)\n"
+"      --to-rate=SAMPLERATE            ?? ????? ????????? ?? Hz (?????????? "
+"44100)\n"
+"      --to-format=SAMPLEFORMAT        ?? ???? ????????? (?????????? s16le)\n"
+"      --to-channels=CHANNELS          ?? ?????? ???????? (?????????? 1)\n"
+"      --resample-method=METHOD        ??????? ??????????????????? "
+"(?????????? ????????)\n"
+"      --seconds=SECONDS               ??? ???????? ???? (?????????? 60)\n"
+"\n"
+"?? ?? ?????? ??? ?????????, ? ?????? ??????? ????? ???? ??????????? "
+"??????, \n"
+"???? ??? ?????.\n"
+"\n"
+"? ????? ????????? ?????? ?? ????? ???? ??? s16le, s16be, u8, float32le, "
+"float32be, ulaw, alaw,\n"
+"s24le, s24be, s24-32le, s24-32be, s32le, s32be (?????????? s16ne)\n"
+"\n"
+"????? --dump-resample-methods ??? ??????? ????? ??? ??????? "
+"???????????????????.\n"
 
-#: ../src/pulse/context.c:675
-#, fuzzy, c-format
-msgid "fork(): %s"
-msgstr "fork(): %s"
-
-#: ../src/pulse/context.c:730
-#, fuzzy, c-format
-msgid "waitpid(): %s"
-msgstr "waitpid(): %s"
+#: ../src/tests/resampler-test.c:356
+#, c-format
+msgid "%s %s\n"
+msgstr "%s %s\n"
 
-#: ../src/pulse/context.c:1431
+#: ../src/tests/resampler-test.c:419
 #, c-format
-msgid "Received message for unknown extension '%s'"
-msgstr ""
+msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
+msgstr "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
 
-#: ../src/utils/pacat.c:112
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:118
+#, c-format
 msgid "Failed to drain stream: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????????? ????: %s"
 
-#: ../src/utils/pacat.c:117
+#: ../src/utils/pacat.c:123
 msgid "Playback stream drained."
-msgstr ""
+msgstr "?????????? ? ??? ????????????."
 
-#: ../src/utils/pacat.c:128
+#: ../src/utils/pacat.c:134
 msgid "Draining connection to server."
-msgstr ""
+msgstr "??????????? ? ??????? ???? ??????????."
 
-#: ../src/utils/pacat.c:141
+#: ../src/utils/pacat.c:147
 #, c-format
 msgid "pa_stream_drain(): %s"
-msgstr ""
+msgstr "pa_stream_drain(): %s"
 
-#: ../src/utils/pacat.c:164
+#: ../src/utils/pacat.c:170
 #, c-format
 msgid "pa_stream_write() failed: %s"
-msgstr ""
+msgstr "???????? ??? pa_stream_write(): %s"
 
-#: ../src/utils/pacat.c:205
+#: ../src/utils/pacat.c:211
 #, c-format
 msgid "pa_stream_begin_write() failed: %s"
-msgstr ""
+msgstr "???????? ??? pa_stream_begin_write(): %s"
 
-#: ../src/utils/pacat.c:255 ../src/utils/pacat.c:285
+#: ../src/utils/pacat.c:261 ../src/utils/pacat.c:291
 #, c-format
 msgid "pa_stream_peek() failed: %s"
-msgstr ""
+msgstr "???????? ??? pa_stream_peek(): %s"
 
-#: ../src/utils/pacat.c:325
+#: ../src/utils/pacat.c:341
 msgid "Stream successfully created."
-msgstr ""
+msgstr "? ??? ????????????? ?? ????????."
 
-#: ../src/utils/pacat.c:328
+#: ../src/utils/pacat.c:344
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s"
-msgstr ""
+msgstr "???????? ??? pa_stream_get_buffer_attr(): %s"
 
-#: ../src/utils/pacat.c:332
+#: ../src/utils/pacat.c:348
 #, c-format
 msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
 msgstr ""
+"??????? ?????????? ??????: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
 
-#: ../src/utils/pacat.c:335
+#: ../src/utils/pacat.c:351
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u"
-msgstr ""
+msgstr "??????? ?????????? ??????: maxlength=%u, fragsize=%u"
 
-#: ../src/utils/pacat.c:339
+#: ../src/utils/pacat.c:355
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'."
-msgstr ""
+msgstr "????? ??? ???????????? ????????? '%s', ?????????? ???????? '%s'."
 
-#: ../src/utils/pacat.c:343
+#: ../src/utils/pacat.c:359
 #, c-format
-msgid "Connected to device %s (%u, %ssuspended)."
-msgstr ""
+#| msgid "Connected to device %s (%u, %ssuspended)."
+msgid "Connected to device %s (index: %u, suspended: %s)."
+msgstr "??????? ?? ?? ??????? %s (???????: %u, ?? ????????: %s)."
 
-#: ../src/utils/pacat.c:353
+#: ../src/utils/pacat.c:369
 #, c-format
 msgid "Stream error: %s"
-msgstr ""
+msgstr "?????? ????: %s"
 
-#: ../src/utils/pacat.c:363
+#: ../src/utils/pacat.c:379
 #, c-format
 msgid "Stream device suspended.%s"
-msgstr ""
+msgstr "???????? ??????? ????.%s"
 
-#: ../src/utils/pacat.c:365
+#: ../src/utils/pacat.c:381
 #, c-format
 msgid "Stream device resumed.%s"
-msgstr ""
+msgstr "???????? ???????? ????.%s"
 
-#: ../src/utils/pacat.c:373
+#: ../src/utils/pacat.c:389
 #, c-format
 msgid "Stream underrun.%s"
-msgstr ""
+msgstr "?????????? ????.%s"
 
-#: ../src/utils/pacat.c:380
+#: ../src/utils/pacat.c:396
 #, c-format
 msgid "Stream overrun.%s"
-msgstr ""
+msgstr "???????? ????.%s"
 
-#: ../src/utils/pacat.c:387
+#: ../src/utils/pacat.c:403
 #, c-format
 msgid "Stream started.%s"
-msgstr ""
+msgstr "???????? ????.%s"
 
-#: ../src/utils/pacat.c:394
+#: ../src/utils/pacat.c:410
 #, c-format
 msgid "Stream moved to device %s (%u, %ssuspended).%s"
-msgstr ""
+msgstr "? ??? ???????????? ??? ??????? %s (%u, %s ????????).%s"
 
-#: ../src/utils/pacat.c:394
+#: ../src/utils/pacat.c:410
 msgid "not "
-msgstr ""
+msgstr "??? "
 
-#: ../src/utils/pacat.c:401
+#: ../src/utils/pacat.c:417
 #, c-format
 msgid "Stream buffer attributes changed.%s"
-msgstr ""
+msgstr "?????? ??????????? ?????????? ?????? ????.%s"
 
-#: ../src/utils/pacat.c:416
+#: ../src/utils/pacat.c:432
 msgid "Cork request stack is empty: corking stream"
-msgstr ""
+msgstr "? ?????? ??????? ??????????? ????? ????: ??? ???????????"
 
-#: ../src/utils/pacat.c:422
+#: ../src/utils/pacat.c:438
 msgid "Cork request stack is empty: uncorking stream"
-msgstr ""
+msgstr "? ?????? ??????? ??????????? ????? ????: ??? ??????????"
 
-#: ../src/utils/pacat.c:426
+#: ../src/utils/pacat.c:442
 msgid "Warning: Received more uncork requests than cork requests!"
 msgstr ""
+"?????????????: ????????? ???????????? ???????? ?????????? ??? ??????????!"
 
-#: ../src/utils/pacat.c:451
+#: ../src/utils/pacat.c:467
 #, c-format
 msgid "Connection established.%s"
-msgstr ""
+msgstr "???????? ????????.%s"
 
-#: ../src/utils/pacat.c:454
+#: ../src/utils/pacat.c:470
 #, c-format
 msgid "pa_stream_new() failed: %s"
-msgstr ""
+msgstr "???????? pa_stream_new(): %s"
 
-#: ../src/utils/pacat.c:492
+#: ../src/utils/pacat.c:508
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s"
-msgstr ""
+msgstr "???????? pa_stream_connect_playback(): %s"
+
+#: ../src/utils/pacat.c:514
+#, c-format
+msgid "Failed to set monitor stream: %s"
+msgstr "???????? ??????? ???? ??????: %s"
 
-#: ../src/utils/pacat.c:498
+#: ../src/utils/pacat.c:518
 #, c-format
 msgid "pa_stream_connect_record() failed: %s"
-msgstr ""
+msgstr "???????? pa_stream_connect_record(): %s"
 
-#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1252
+#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1455
 #, c-format
 msgid "Connection failure: %s"
 msgstr "???????? ????????: %s"
 
-#: ../src/utils/pacat.c:545
+#: ../src/utils/pacat.c:564
 msgid "Got EOF."
-msgstr ""
+msgstr "?????? EOF."
 
-#: ../src/utils/pacat.c:582
+#: ../src/utils/pacat.c:601
 #, c-format
 msgid "write() failed: %s"
-msgstr ""
+msgstr "???????? write(): %s"
 
-#: ../src/utils/pacat.c:603
+#: ../src/utils/pacat.c:622
 msgid "Got signal, exiting."
-msgstr ""
+msgstr "?????? ????, ??????."
 
-#: ../src/utils/pacat.c:617
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:636
+#, c-format
 msgid "Failed to get latency: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ??????: %s"
 
-#: ../src/utils/pacat.c:622
+#: ../src/utils/pacat.c:641
 #, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr ""
+msgstr "??????: %0.3f sec; ???????? ?????? %0.0f usec."
 
-#: ../src/utils/pacat.c:643
+#: ../src/utils/pacat.c:662
 #, c-format
 msgid "pa_stream_update_timing_info() failed: %s"
-msgstr ""
-
-#: ../src/utils/pacat.c:653
-#, c-format
+msgstr "???????? pa_stream_update_timing_info(): %s"
+
+#: ../src/utils/pacat.c:672
+#, c-format
+#| msgid ""
+#| "%s [options]\n"
+#| "\n"
+#| "  -h, --help                            Show this help\n"
+#| "      --version                         Show version\n"
+#| "\n"
+#| "  -r, --record                          Create a connection for "
+#| "recording\n"
+#| "  -p, --playback                        Create a connection for playback\n"
+#| "\n"
+#| "  -v, --verbose                         Enable verbose operations\n"
+#| "\n"
+#| "  -s, --server=SERVER                   The name of the server to connect "
+#| "to\n"
+#| "  -d, --device=DEVICE                   The name of the sink/source to "
+#| "connect to\n"
+#| "  -n, --client-name=NAME                How to call this client on the "
+#| "server\n"
+#| "      --stream-name=NAME                How to call this stream on the "
+#| "server\n"
+#| "      --volume=VOLUME                   Specify the initial (linear) "
+#| "volume in range 0...65536\n"
+#| "      --rate=SAMPLERATE                 The sample rate in Hz (defaults "
+#| "to 44100)\n"
+#| "      --format=SAMPLEFORMAT             The sample type, one of s16le, "
+#| "s16be, u8, float32le,\n"
+#| "                                        float32be, ulaw, alaw, s32le, "
+#| "s32be, s24le, s24be,\n"
+#| "                                        s24-32le, s24-32be (defaults to "
+#| "s16ne)\n"
+#| "      --channels=CHANNELS               The number of channels, 1 for "
+#| "mono, 2 for stereo\n"
+#| "                                        (defaults to 2)\n"
+#| "      --channel-map=CHANNELMAP          Channel map to use instead of the "
+#| "default\n"
+#| "      --fix-format                      Take the sample format from the "
+#| "sink the stream is\n"
+#| "                                        being connected to.\n"
+#| "      --fix-rate                        Take the sampling rate from the "
+#| "sink the stream is\n"
+#| "                                        being connected to.\n"
+#| "      --fix-channels                    Take the number of channels and "
+#| "the channel map\n"
+#| "                                        from the sink the stream is being "
+#| "connected to.\n"
+#| "      --no-remix                        Don't upmix or downmix channels.\n"
+#| "      --no-remap                        Map channels by index instead of "
+#| "name.\n"
+#| "      --latency=BYTES                   Request the specified latency in "
+#| "bytes.\n"
+#| "      --process-time=BYTES              Request the specified process "
+#| "time per request in bytes.\n"
+#| "      --latency-msec=MSEC               Request the specified latency in "
+#| "msec.\n"
+#| "      --process-time-msec=MSEC          Request the specified process "
+#| "time per request in msec.\n"
+#| "      --property=PROPERTY=VALUE         Set the specified property to the "
+#| "specified value.\n"
+#| "      --raw                             Record/play raw PCM data.\n"
+#| "      --passthrough                     passthrough data \n"
+#| "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
+#| "      --list-file-formats               List available file formats.\n"
+#| "      --monitor-stream=INDEX            Record from the sink input with "
+#| "index INDEX.\n"
 msgid ""
 "%s [options]\n"
 "\n"
@@ -1312,16 +2148,16 @@ msgid ""
 "                                        (defaults to 2)\n"
 "      --channel-map=CHANNELMAP          Channel map to use instead of the "
 "default\n"
-"      --fix-format                      Take the sample format from the sink "
-"the stream is\n"
+"      --fix-format                      Take the sample format from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
-"      --fix-rate                        Take the sampling rate from the sink "
-"the stream is\n"
+"      --fix-rate                        Take the sampling rate from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
 "      --fix-channels                    Take the number of channels and the "
 "channel map\n"
-"                                        from the sink the stream is being "
-"connected to.\n"
+"                                        from the sink/source the stream is "
+"being connected to.\n"
 "      --no-remix                        Don't upmix or downmix channels.\n"
 "      --no-remap                        Map channels by index instead of "
 "name.\n"
@@ -1336,247 +2172,400 @@ msgid ""
 "      --property=PROPERTY=VALUE         Set the specified property to the "
 "specified value.\n"
 "      --raw                             Record/play raw PCM data.\n"
-"      --passthrough                     passthrough data \n"
+"      --passthrough                     Passthrough data.\n"
 "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
 "      --list-file-formats               List available file formats.\n"
+"      --monitor-stream=INDEX            Record from the sink input with "
+"index INDEX.\n"
 msgstr ""
-
-#: ../src/utils/pacat.c:786
+"%s [options]\n"
+"\n"
+"  -h, --help                            ???????? ??? ????????\n"
+"      --version                         ???????? ???????\n"
+"\n"
+"  -r, --record                          ?????????? ???????? ??? ???????\n"
+"  -p, --playback                        ?????????? ???????? ??? ???????????\n"
+"\n"
+"  -v, --verbose                         ???????????? ?????????? ???????????\n"
+"\n"
+"  -s, --server=SERVER                   ?? ????? ??? ?????????? ??? ???????\n"
+"  -d, --device=DEVICE                   ?? ????? ??? ?????/?????????? ??? "
+"???????\n"
+"  -n, --client-name=NAME                ??? ?? ?????? ? ??????? ???? "
+"??????????\n"
+"      --stream-name=NAME                ??? ?? ?????? ? ??? ???? ??????????\n"
+"      --volume=VOLUME                   ??????? ??? ??????? (?????????) "
+"??????? ???? ??????? 0...65536\n"
+"      --rate=SAMPLERATE                 ? ?????? ????????? ?? Hz (?????????? "
+"?? 44100)\n"
+"      --format=SAMPLEFORMAT             ? ????? ?????????, ???? ??? s16le, "
+"s16be, u8, float32le,\n"
+"                                        float32be, ulaw, alaw, s32le, s32be, "
+"s24le, s24be,\n"
+"                                        s24-32le, s24-32be (?????????? ?? "
+"s16ne)\n"
+"      --channels=CHANNELS               ? ??????? ??? ????????, 1 ??? "
+"??????????, 2 ??? ????????????\n"
+"                                        (?????????? ?? 2)\n"
+"      --channel-map=CHANNELMAP          ?????????? ???????? ??? ????? ???? "
+"??? ??? ??????????\n"
+"      --fix-format                      ???? ??? ?????? ????????? ??? ??? "
+"????? ???? ?????? \n"
+"                                        ????????? ? ???.\n"
+"      --fix-rate                        ???? ??? ?????? ????????? ??? ??? "
+"????? ???? ?????\n"
+"                                        ????????? ? ???.\n"
+"      --fix-channels                    ???? ??? ??????? ??? ???????? ??? "
+"??? ??????????? ????????\n"
+"                                        ??? ??? ????? ???? ????? ????????? ? "
+"???.\n"
+"      --no-remix                        ?? ??? ?????????????? ? "
+"?????????????? ???????.\n"
+"      --no-remap                        ?????????? ???????? ?? ?????? ???? "
+"??? ?????.\n"
+"      --latency=BYTES                   ?????? ??? ????????????? ??????????? "
+"?????? ?? ???????????.\n"
+"      --process-time=BYTES              ?????? ??? ????????????? ?????? "
+"??????????? ??? ?????? ?? ???????????. \n"
+"      --latency-msec=MSEC               ?????? ??? ????????????? ??????????? "
+"?????? ?? msec.\n"
+"      --process-time-msec=MSEC          ?????? ??? ????????????? ?????? "
+"?????????? ??? ?????? ?? msec.\n"
+"      --property=PROPERTY=VALUE         ??????? ??? ????????????? ????????? "
+"??? ???????????? ????.\n"
+"      --raw                             ???????/???????????  ???????????? "
+"????????? PCM.\n"
+"      --passthrough                     ???????? ????????? \n"
+"      --file-format[=FFORMAT]           ???????/??????????? ?????????????? "
+"????????? PCM.\n"
+"      --list-file-formats               ????????? ?????????? ?????? ???????.\n"
+"      --monitor-stream=INDEX            ??????? ??? ??? ?????? ??? ????? ?? "
+"?????? INDEX.\n"
+
+#: ../src/utils/pacat.c:810
 #, c-format
 msgid ""
 "pacat %s\n"
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 msgstr ""
+"pacat %s\n"
+"??????????????? ?? libpulse %s\n"
+"????????? ?? libpulse %s\n"
 
-#: ../src/utils/pacat.c:819 ../src/utils/pactl.c:1400
+#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1651
 #, c-format
 msgid "Invalid client name '%s'"
-msgstr ""
+msgstr "????? ????? ?????? '%s'"
 
-#: ../src/utils/pacat.c:834
+#: ../src/utils/pacat.c:858
 #, c-format
 msgid "Invalid stream name '%s'"
-msgstr ""
+msgstr "????? ????? ???? '%s'"
 
-#: ../src/utils/pacat.c:871
+#: ../src/utils/pacat.c:895
 #, c-format
 msgid "Invalid channel map '%s'"
-msgstr ""
+msgstr "????? ?????????? ???????? '%s'"
 
-#: ../src/utils/pacat.c:900 ../src/utils/pacat.c:914
+#: ../src/utils/pacat.c:924 ../src/utils/pacat.c:938
 #, c-format
 msgid "Invalid latency specification '%s'"
-msgstr ""
+msgstr "????? ??????????? ??????????? ?????? '%s'"
 
-#: ../src/utils/pacat.c:907 ../src/utils/pacat.c:921
+#: ../src/utils/pacat.c:931 ../src/utils/pacat.c:945
 #, c-format
 msgid "Invalid process time specification '%s'"
-msgstr ""
+msgstr "????? ??????????? ?????? ???????????? '%s'"
 
-#: ../src/utils/pacat.c:933
+#: ../src/utils/pacat.c:957
 #, c-format
 msgid "Invalid property '%s'"
-msgstr ""
+msgstr "????? ???????? '%s'"
 
-#: ../src/utils/pacat.c:952
+#: ../src/utils/pacat.c:976
 #, c-format
 msgid "Unknown file format %s."
-msgstr ""
+msgstr "??????? ????? ??????? %s."
 
-#: ../src/utils/pacat.c:971
+#: ../src/utils/pacat.c:991
+msgid "Failed to parse the argument for --monitor-stream"
+msgstr "???????? ???????? ??? ????????? ??? --monitor-stream"
+
+#: ../src/utils/pacat.c:1002
 msgid "Invalid sample specification"
-msgstr ""
+msgstr "????? ??????????? ?????????"
 
-#: ../src/utils/pacat.c:981
+#: ../src/utils/pacat.c:1012
 #, c-format
 msgid "open(): %s"
-msgstr ""
+msgstr "open(): %s"
 
-#: ../src/utils/pacat.c:986
+#: ../src/utils/pacat.c:1017
 #, c-format
 msgid "dup2(): %s"
-msgstr ""
+msgstr "dup2(): %s"
 
-#: ../src/utils/pacat.c:993
+#: ../src/utils/pacat.c:1024
 msgid "Too many arguments."
-msgstr ""
+msgstr "?????????? ????????."
 
-#: ../src/utils/pacat.c:1004
+#: ../src/utils/pacat.c:1035
 msgid "Failed to generate sample specification for file."
-msgstr ""
+msgstr "???????? ??????????? ???????????? ????????? ??? ??????."
 
-#: ../src/utils/pacat.c:1030
+#: ../src/utils/pacat.c:1061
 msgid "Failed to open audio file."
-msgstr ""
+msgstr "???????? ?????????? ??????? ????."
 
-#: ../src/utils/pacat.c:1036
+#: ../src/utils/pacat.c:1067
 msgid ""
 "Warning: specified sample specification will be overwritten with "
 "specification from file."
 msgstr ""
+"?????????????: ? ???????????? ??????????? ????????? ?? ?????????????? ?? ??? "
+"??????????? ??? ?? ??????."
 
-#: ../src/utils/pacat.c:1039 ../src/utils/pactl.c:1467
+#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1718
 msgid "Failed to determine sample specification from file."
-msgstr ""
+msgstr "???????? ????????????? ???????????? ????????? ??? ?? ??????."
 
-#: ../src/utils/pacat.c:1048
+#: ../src/utils/pacat.c:1079
 msgid "Warning: Failed to determine channel map from file."
-msgstr ""
+msgstr "?????????????: ???????? ????????????? ??????????? ???????? ??? ??????."
 
-#: ../src/utils/pacat.c:1059
+#: ../src/utils/pacat.c:1090
 msgid "Channel map doesn't match sample specification"
-msgstr ""
+msgstr "? ?????????? ???????? ??? ????????? ???? ??????????? ??? ?????????"
 
-#: ../src/utils/pacat.c:1070
+#: ../src/utils/pacat.c:1101
 msgid "Warning: failed to write channel map to file."
-msgstr ""
+msgstr "?????????????: ???????? ???????? ??????????? ???????? ?? ??????."
 
-#: ../src/utils/pacat.c:1085
+#: ../src/utils/pacat.c:1116
 #, c-format
 msgid ""
 "Opening a %s stream with sample specification '%s' and channel map '%s'."
 msgstr ""
+"??????? ???? %s ?? ??????????? ????????? '%s' ??? ?????????? ???????? '%s'."
 
-#: ../src/utils/pacat.c:1086
+#: ../src/utils/pacat.c:1117
 msgid "recording"
-msgstr ""
+msgstr "??????????"
 
-#: ../src/utils/pacat.c:1086
+#: ../src/utils/pacat.c:1117
 msgid "playback"
-msgstr ""
+msgstr "???????????"
 
-#: ../src/utils/pacat.c:1110
-#, fuzzy
+#: ../src/utils/pacat.c:1141
 msgid "Failed to set media name."
-msgstr "???????? ?????????? ??????? ????."
+msgstr "???????? ??????? ???????? ?????."
 
-#: ../src/utils/pacat.c:1117 ../src/utils/pactl.c:1777
+#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:2068
 msgid "pa_mainloop_new() failed."
-msgstr ""
+msgstr "???????? pa_mainloop_new()."
 
-#: ../src/utils/pacat.c:1136
+#: ../src/utils/pacat.c:1171
 msgid "io_new() failed."
-msgstr ""
+msgstr "???????? io_new()."
 
-#: ../src/utils/pacat.c:1143 ../src/utils/pactl.c:1789
+#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:2080
 msgid "pa_context_new() failed."
-msgstr ""
+msgstr "???????? pa_context_new()."
 
-#: ../src/utils/pacat.c:1151 ../src/utils/pactl.c:1795
+#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:2086
 #, c-format
 msgid "pa_context_connect() failed: %s"
-msgstr ""
+msgstr "???????? pa_context_connect(): %s"
 
-#: ../src/utils/pacat.c:1157
+#: ../src/utils/pacat.c:1192
 msgid "pa_context_rttime_new() failed."
-msgstr ""
+msgstr "???????? pa_context_rttime_new()."
 
-#: ../src/utils/pacat.c:1164 ../src/utils/pactl.c:1800
+#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:2091
 msgid "pa_mainloop_run() failed."
-msgstr ""
+msgstr "???????? pa_mainloop_run()."
 
-#: ../src/utils/pasuspender.c:79
-#, fuzzy, c-format
-msgid "fork(): %s\n"
-msgstr "fork(): %s\n"
+#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1573
+msgid "NAME [ARGS ...]"
+msgstr "????? [???????? ...]"
 
-#: ../src/utils/pasuspender.c:90
-#, fuzzy, c-format
-msgid "execvp(): %s\n"
-msgstr "execvp(): %s\n"
+#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1574
+msgid "NAME|#N"
+msgstr "?????|#?"
 
-#: ../src/utils/pasuspender.c:107
-#, c-format
-msgid "Failure to suspend: %s\n"
-msgstr ""
+#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1578
+msgid "NAME"
+msgstr "?????"
 
-#: ../src/utils/pasuspender.c:122
-#, c-format
-msgid "Failure to resume: %s\n"
-msgstr ""
+#: ../src/utils/pacmd.c:56
+msgid "NAME|#N VOLUME"
+msgstr "?????| ?????? #?"
 
-#: ../src/utils/pasuspender.c:145
-#, c-format
-msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr ""
+#: ../src/utils/pacmd.c:57
+msgid "#N VOLUME"
+msgstr "#? ??????"
 
-#: ../src/utils/pasuspender.c:157
-#, c-format
-msgid "Connection failure: %s\n"
-msgstr ""
+#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1576
+msgid "NAME|#N 1|0"
+msgstr "?????|#? 1|0"
 
-#: ../src/utils/pasuspender.c:174
-#, c-format
-msgid "Got SIGINT, exiting.\n"
-msgstr ""
+#: ../src/utils/pacmd.c:59
+msgid "#N 1|0"
+msgstr "#? 1|0"
 
-#: ../src/utils/pasuspender.c:192
-#, c-format
-msgid "WARNING: Child process terminated by signal %u\n"
-msgstr ""
+#: ../src/utils/pacmd.c:60
+msgid "NAME|#N KEY=VALUE"
+msgstr "?????|#? KEY=VALUE"
+
+#: ../src/utils/pacmd.c:61
+msgid "#N KEY=VALUE"
+msgstr "#N KEY=VALUE"
+
+#: ../src/utils/pacmd.c:63
+msgid "#N"
+msgstr "#N"
+
+#: ../src/utils/pacmd.c:64
+msgid "NAME SINK|#N"
+msgstr "????? ?????|#?"
+
+#: ../src/utils/pacmd.c:66 ../src/utils/pacmd.c:67
+msgid "NAME FILENAME"
+msgstr "???????? ???????? ???????"
+
+#: ../src/utils/pacmd.c:68
+msgid "PATHNAME"
+msgstr "????? ?????????"
+
+#: ../src/utils/pacmd.c:69
+msgid "FILENAME SINK|#N"
+msgstr "????? ??????? ?????|#?"
+
+#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1575
+msgid "#N SINK|SOURCE"
+msgstr "#? ??????|????"
+
+#: ../src/utils/pacmd.c:73 ../src/utils/pacmd.c:79 ../src/utils/pacmd.c:80
+msgid "1|0"
+msgstr "1|0"
+
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1577
+msgid "CARD PROFILE"
+msgstr "???????? ??????"
+
+#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1579
+msgid "NAME|#N PORT"
+msgstr "?????|???? #?"
+
+#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1585
+msgid "CARD-NAME|CARD-#N PORT OFFSET"
+msgstr "????? ??????|?????-#? ???????????? ?????"
+
+#: ../src/utils/pacmd.c:77
+msgid "TARGET"
+msgstr "??????????"
+
+#: ../src/utils/pacmd.c:78
+msgid "NUMERIC LEVEL"
+msgstr "?????????? ???????"
 
-#: ../src/utils/pasuspender.c:210
+#: ../src/utils/pacmd.c:81
+msgid "FRAMES"
+msgstr "???????"
+
+#: ../src/utils/pacmd.c:83
 #, c-format
 msgid ""
-"%s [options] ... \n"
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
-"\n"
+"When no command is given pacmd starts in the interactive mode.\n"
 msgstr ""
+"\n"
+"  -h, --help                            ???????? ??? ????????\n"
+"      --version                         ???????? ???????\n"
+"???? ??? ??????? ????? ?????? pacmd ?????? ???? ??????????? ??????????.\n"
 
-#: ../src/utils/pasuspender.c:248
+#: ../src/utils/pacmd.c:130
 #, c-format
 msgid ""
-"pasuspender %s\n"
+"pacmd %s\n"
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 msgstr ""
+"pacmd %s\n"
+"??????????????? ?? libpulse %s\n"
+"????????? ?? libpulse %s\n"
 
-#: ../src/utils/pasuspender.c:277
-#, c-format
-msgid "pa_mainloop_new() failed.\n"
+#: ../src/utils/pacmd.c:144
+msgid "No PulseAudio daemon running, or not running as session daemon."
 msgstr ""
+"??? ?????????? ? ???????? PulseAudio, ? ??? ?????????? ?? ???????? ?????????."
 
-#: ../src/utils/pasuspender.c:290
+#: ../src/utils/pacmd.c:149
 #, c-format
-msgid "pa_context_new() failed.\n"
-msgstr ""
+msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
+msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 
-#: ../src/utils/pasuspender.c:298
+#: ../src/utils/pacmd.c:166
 #, c-format
-msgid "pa_mainloop_run() failed.\n"
-msgstr ""
+msgid "connect(): %s"
+msgstr "connect(): %s"
+
+#: ../src/utils/pacmd.c:174
+msgid "Failed to kill PulseAudio daemon."
+msgstr "???????? ??????????? ??????? PulseAudio."
+
+#: ../src/utils/pacmd.c:182
+msgid "Daemon not responding."
+msgstr "? ???????? ??? ??????."
+
+#: ../src/utils/pacmd.c:214 ../src/utils/pacmd.c:323 ../src/utils/pacmd.c:341
+#, c-format
+msgid "write(): %s"
+msgstr "write(): %s"
+
+#: ../src/utils/pacmd.c:270
+#, c-format
+msgid "poll(): %s"
+msgstr "poll(): %s"
+
+#: ../src/utils/pacmd.c:281 ../src/utils/pacmd.c:301
+#, c-format
+msgid "read(): %s"
+msgstr "read(): %s"
 
-#: ../src/utils/pactl.c:150
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:166
+#, c-format
 msgid "Failed to get statistics: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ???????????: %s"
 
-#: ../src/utils/pactl.c:156
+#: ../src/utils/pactl.c:172
 #, c-format
 msgid "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr ""
+"???????????????? ????: %u ?????? ??? ????????? ???????? %s ???????????.\n"
 
-#: ../src/utils/pactl.c:159
+#: ../src/utils/pactl.c:175
 #, c-format
 msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr ""
+"???????????? ???? ?? ???????? ??? ????????? ?????? ????: %u ?????? ??? "
+"????????? ???????? %s ???????????.\n"
 
-#: ../src/utils/pactl.c:162
+#: ../src/utils/pactl.c:178
 #, c-format
 msgid "Sample cache size: %s\n"
-msgstr ""
+msgstr "??????? ?????? ?????? ?????????: %s\n"
 
-#: ../src/utils/pactl.c:171
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:187
+#, c-format
 msgid "Failed to get server information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ??????????: %s"
 
-#: ../src/utils/pactl.c:176
+#: ../src/utils/pactl.c:192
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -1586,8 +2575,14 @@ msgid ""
 "Client Index: %u\n"
 "Tile Size: %zu\n"
 msgstr ""
+"???????????? ??????????: %s\n"
+"?????? ??????????? ???????????: %u\n"
+"?????? ??????????? ??????????: %u\n"
+"????? ??????: %s\n"
+"??????? ??????: %u\n"
+"??????? ?????????: %zu\n"
 
-#: ../src/utils/pactl.c:192
+#: ../src/utils/pactl.c:208
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -1600,13 +2595,22 @@ msgid ""
 "Default Source: %s\n"
 "Cookie: %04x:%04x\n"
 msgstr ""
+"????? ??????: %s\n"
+"????? ???????????: %s\n"
+"????? ??????????: %s\n"
+"?????? ??????????: %s\n"
+"????????????? ??????????? ?????????: %s\n"
+"????????????? ?????????? ????????: %s\n"
+"?????????????? ??????: %s\n"
+"????????????? ????: %s\n"
+"????????: %04x:%04x\n"
 
-#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:830
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:257 ../src/utils/pactl.c:902 ../src/utils/pactl.c:980
+#, c-format
 msgid "Failed to get sink information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ?????: %s"
 
-#: ../src/utils/pactl.c:270
+#: ../src/utils/pactl.c:283
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -1618,37 +2622,54 @@ msgid ""
 "\tChannel Map: %s\n"
 "\tOwner Module: %u\n"
 "\tMute: %s\n"
-"\tVolume: %s%s%s\n"
+"\tVolume: %s\n"
 "\t        balance %0.2f\n"
-"\tBase Volume: %s%s%s\n"
+"\tBase Volume: %s\n"
 "\tMonitor Source: %s\n"
 "\tLatency: %0.0f usec, configured %0.0f usec\n"
 "\tFlags: %s%s%s%s%s%s%s\n"
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+"?????? #%u\n"
+"\t?????????: %s\n"
+"\t?????: %s\n"
+"\t?????????: %s\n"
+"\t??????: %s\n"
+"\t??????????? ?????????: %s\n"
+"\t?????????? ????????: %s\n"
+"\t??????? ???????: %u\n"
+"\t??????: %s\n"
+"\t??????: %s\n"
+"\t        ????????? %0.2f\n"
+"\t?????? ??????: %s\n"
+"\t???? ??????: %s\n"
+"\t???????? ??????: %0.0f usec, ?????????? %0.0f usec\n"
+"\t???????: %s%s%s%s%s%s%s\n"
+"\t?????????:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430
+#: ../src/utils/pactl.c:327 ../src/utils/pactl.c:433 ../src/utils/pactl.c:594
 #, c-format
 msgid "\tPorts:\n"
-msgstr ""
+msgstr "\t?????:\n"
 
-#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:437
+#: ../src/utils/pactl.c:334 ../src/utils/pactl.c:440
 #, c-format
 msgid "\tActive Port: %s\n"
-msgstr ""
+msgstr "\t?????? ????: %s\n"
 
-#: ../src/utils/pactl.c:331 ../src/utils/pactl.c:443
+#: ../src/utils/pactl.c:340 ../src/utils/pactl.c:446
 #, c-format
 msgid "\tFormats:\n"
-msgstr ""
+msgstr "\t??????:\n"
 
-#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:849
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:364 ../src/utils/pactl.c:922 ../src/utils/pactl.c:995
+#, c-format
 msgid "Failed to get source information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ?????: %s"
 
-#: ../src/utils/pactl.c:383
+#: ../src/utils/pactl.c:390
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -1660,30 +2681,47 @@ msgid ""
 "\tChannel Map: %s\n"
 "\tOwner Module: %u\n"
 "\tMute: %s\n"
-"\tVolume: %s%s%s\n"
+"\tVolume: %s\n"
 "\t        balance %0.2f\n"
-"\tBase Volume: %s%s%s\n"
+"\tBase Volume: %s\n"
 "\tMonitor of Sink: %s\n"
 "\tLatency: %0.0f usec, configured %0.0f usec\n"
 "\tFlags: %s%s%s%s%s%s\n"
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+"???? #%u\n"
+"\t?????????: %s\n"
+"\t?????: %s\n"
+"\t?????????: %s\n"
+"\t??????: %s\n"
+"\t??????????? ?????????: %s\n"
+"\t?????????? ????????: %s\n"
+"\t??????? ???????: %u\n"
+"\t??????: %s\n"
+"\t??????: %s\n"
+"\t        ????????? %0.2f\n"
+"\t?????? ??????: %s\n"
+"\t????? ?????: %s\n"
+"\t???????? ??????: %0.0f usec, ?????????? %0.0f usec\n"
+"\t???????: %s%s%s%s%s%s\n"
+"\t?????????:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:415 ../src/utils/pactl.c:485 ../src/utils/pactl.c:528
-#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:640 ../src/utils/pactl.c:641
-#: ../src/utils/pactl.c:652 ../src/utils/pactl.c:711 ../src/utils/pactl.c:712
-#: ../src/utils/pactl.c:723 ../src/utils/pactl.c:775 ../src/utils/pactl.c:776
-#: ../src/utils/pactl.c:783
+#: ../src/utils/pactl.c:418 ../src/utils/pactl.c:488 ../src/utils/pactl.c:531
+#: ../src/utils/pactl.c:573 ../src/utils/pactl.c:671 ../src/utils/pactl.c:672
+#: ../src/utils/pactl.c:683 ../src/utils/pactl.c:741 ../src/utils/pactl.c:742
+#: ../src/utils/pactl.c:753 ../src/utils/pactl.c:804 ../src/utils/pactl.c:805
+#: ../src/utils/pactl.c:811
 msgid "n/a"
-msgstr ""
+msgstr "?? ?????????"
 
-#: ../src/utils/pactl.c:454
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:457 ../src/utils/pactl.c:861
+#, c-format
 msgid "Failed to get module information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ????????: %s"
 
-#: ../src/utils/pactl.c:477
+#: ../src/utils/pactl.c:480
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -1693,13 +2731,19 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+"??????? #%u\n"
+"\t?????: %s\n"
+"\t??????: %s\n"
+"\t???????? ??????: %s\n"
+"\t?????????:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:496
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:499
+#, c-format
 msgid "Failed to get client information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ??????: %s"
 
-#: ../src/utils/pactl.c:522
+#: ../src/utils/pactl.c:525
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -1708,13 +2752,18 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+"??????? #%u\n"
+"\t??????: %s\n"
+"\t??????? ???????: %s\n"
+"\t?????????:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:539
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:542
+#, c-format
 msgid "Failed to get card information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ??????: %s"
 
-#: ../src/utils/pactl.c:562
+#: ../src/utils/pactl.c:565
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -1724,23 +2773,43 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+"????? #%u\n"
+"\t?????: %s\n"
+"\t??????: %s\n"
+"\t??????? ???????: %s\n"
+"\t?????????:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:576
+#: ../src/utils/pactl.c:581
 #, c-format
 msgid "\tProfiles:\n"
-msgstr ""
+msgstr "\t?????????:\n"
 
-#: ../src/utils/pactl.c:582
+#: ../src/utils/pactl.c:588
 #, c-format
 msgid "\tActive Profile: %s\n"
+msgstr "\t?????? ????????: %s\n"
+
+#: ../src/utils/pactl.c:602
+#, c-format
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
 msgstr ""
+"\t\t\t?????????:\n"
+"\t\t\t\t%s\n"
+
+#: ../src/utils/pactl.c:607
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr "\t\t\t????? ??? ?????????: %s"
 
-#: ../src/utils/pactl.c:593 ../src/utils/pactl.c:868
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:624 ../src/utils/pactl.c:942 ../src/utils/pactl.c:1010
+#, c-format
 msgid "Failed to get sink input information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ??????? ?????: %s"
 
-#: ../src/utils/pactl.c:622
+#: ../src/utils/pactl.c:653
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -1751,9 +2820,9 @@ msgid ""
 "\tSample Specification: %s\n"
 "\tChannel Map: %s\n"
 "\tFormat: %s\n"
+"\tCorked: %s\n"
 "\tMute: %s\n"
 "\tVolume: %s\n"
-"\t        %s\n"
 "\t        balance %0.2f\n"
 "\tBuffer Latency: %0.0f usec\n"
 "\tSink Latency: %0.0f usec\n"
@@ -1761,13 +2830,30 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+"??????? ????? #%u\n"
+"\t??????: %s\n"
+"\t??????? ???????: %s\n"
+"\t???????: %s\n"
+"\t??????: %u\n"
+"\t??????????? ?????????: %s\n"
+"\t?????????? ????????: %s\n"
+"\t?????: %s\n"
+"\tCorked: %s\n"
+"\t??????: %s\n"
+"\t??????: %s\n"
+"\t        ????????? %0.2f\n"
+"\t???????? ?????? ?????????? ??????: %0.0f usec\n"
+"\t???????? ?????? ?????: %0.0f usec\n"
+"\t??????? ???????????????????: %s\n"
+"\t?????????:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:663 ../src/utils/pactl.c:887
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:694 ../src/utils/pactl.c:962 ../src/utils/pactl.c:1025
+#, c-format
 msgid "Failed to get source output information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ?????? ?????: %s"
 
-#: ../src/utils/pactl.c:693
+#: ../src/utils/pactl.c:723
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -1778,9 +2864,9 @@ msgid ""
 "\tSample Specification: %s\n"
 "\tChannel Map: %s\n"
 "\tFormat: %s\n"
+"\tCorked: %s\n"
 "\tMute: %s\n"
 "\tVolume: %s\n"
-"\t        %s\n"
 "\t        balance %0.2f\n"
 "\tBuffer Latency: %0.0f usec\n"
 "\tSource Latency: %0.0f usec\n"
@@ -1788,13 +2874,30 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+"?????? ????? #%u\n"
+"\t??????: %s\n"
+"\t??????? ???????: %s\n"
+"\t???????: %s\n"
+"\t??????: %u\n"
+"\t??????????? ?????????: %s\n"
+"\t?????????? ????????: %s\n"
+"\t?????: %s\n"
+"\tCorked: %s\n"
+"\t??????: %s\n"
+"\t??????: %s\n"
+"\t        ????????? %0.2f\n"
+"\t???????? ?????? ?????????? ??????: %0.0f usec\n"
+"\t???????? ?????? ?????: %0.0f usec\n"
+"\t??????? ???????????????????: %s\n"
+"\t?????????:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:734
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:764
+#, c-format
 msgid "Failed to get sample information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "???????? ????? ??????????? ?????????: %s"
 
-#: ../src/utils/pactl.c:761
+#: ../src/utils/pactl.c:791
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -1802,7 +2905,6 @@ msgid ""
 "\tSample Specification: %s\n"
 "\tChannel Map: %s\n"
 "\tVolume: %s\n"
-"\t        %s\n"
 "\t        balance %0.2f\n"
 "\tDuration: %0.1fs\n"
 "\tSize: %s\n"
@@ -1811,161 +2913,190 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+"?????? #%u\n"
+"\t?????: %s\n"
+"\t??????????? ?????????: %s\n"
+"\t?????????? ????????: %s\n"
+"\t??????: %s\n"
+"\t        ????????? %0.2f\n"
+"\t????????: %0.1fs\n"
+"\t???????: %s\n"
+"\t??????????: %s\n"
+"\t????? ???????: %s\n"
+"\t?????????:\n"
+"\t\t%s\n"
 
-#: ../src/utils/pactl.c:791 ../src/utils/pactl.c:801
+#: ../src/utils/pactl.c:819 ../src/utils/pactl.c:829
 #, c-format
 msgid "Failure: %s"
 msgstr "????????: %s"
 
-#: ../src/utils/pactl.c:915
-#, fuzzy, c-format
-msgid "Failed to set format: invalid format string %s"
-msgstr "???????? ??????? ?????? '%s'."
+#: ../src/utils/pactl.c:868
+#, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "???????? ?????????? ????????: ? ??????? %s ??? ?????????"
 
-#: ../src/utils/pactl.c:954
-#, fuzzy, c-format
-msgid "Failed to upload sample: %s"
-msgstr "???????? ??????? ?????? '%s'."
+#: ../src/utils/pactl.c:886
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel/s supported = %d\n"
+msgstr "???????? ??????? ???????: ???????????? ?? ??????? ???????? ??? %d ???????, "
+"??? ?? ?????????????? ??????? ????? %d\n"
+
+#: ../src/utils/pactl.c:1052
+#, c-format
+msgid "Failed to set format: invalid format string %s"
+msgstr "???????? ??????? ??????: ????? ???????????? ?????? %s"
 
-#: ../src/utils/pactl.c:971
+#: ../src/utils/pactl.c:1095
+#, c-format
+msgid "Failed to upload sample: %s"
+msgstr "???????? ????????? ?????????: %s"
+
+#: ../src/utils/pactl.c:1112
 msgid "Premature end of file"
-msgstr ""
+msgstr "?????? ????? ??? ???????"
 
-#: ../src/utils/pactl.c:991
+#: ../src/utils/pactl.c:1132
 msgid "new"
-msgstr ""
+msgstr "???"
 
-#: ../src/utils/pactl.c:994
+#: ../src/utils/pactl.c:1135
 msgid "change"
-msgstr ""
+msgstr "??????"
 
-#: ../src/utils/pactl.c:997
+#: ../src/utils/pactl.c:1138
 msgid "remove"
-msgstr ""
+msgstr "????????"
 
-#: ../src/utils/pactl.c:1000 ../src/utils/pactl.c:1035
+#: ../src/utils/pactl.c:1141 ../src/utils/pactl.c:1176
 msgid "unknown"
-msgstr ""
+msgstr "???????"
 
-#: ../src/utils/pactl.c:1008
+#: ../src/utils/pactl.c:1149
 msgid "sink"
-msgstr ""
+msgstr "??????"
 
-#: ../src/utils/pactl.c:1011
+#: ../src/utils/pactl.c:1152
 msgid "source"
-msgstr ""
+msgstr "????"
 
-#: ../src/utils/pactl.c:1014
+#: ../src/utils/pactl.c:1155
 msgid "sink-input"
-msgstr ""
+msgstr "??????? ?????"
 
-#: ../src/utils/pactl.c:1017
+#: ../src/utils/pactl.c:1158
 msgid "source-output"
-msgstr ""
+msgstr "?????? ?????"
 
-#: ../src/utils/pactl.c:1020
+#: ../src/utils/pactl.c:1161
 msgid "module"
-msgstr ""
+msgstr "???????"
 
-#: ../src/utils/pactl.c:1023
+#: ../src/utils/pactl.c:1164
 msgid "client"
-msgstr ""
+msgstr "???????"
 
-#: ../src/utils/pactl.c:1026
+#: ../src/utils/pactl.c:1167
 msgid "sample-cache"
-msgstr ""
+msgstr "????? ????? ?????????"
 
-#: ../src/utils/pactl.c:1029 ../src/utils/pactl.c:1032
+#: ../src/utils/pactl.c:1170
 msgid "server"
-msgstr ""
+msgstr "???????????"
 
-#: ../src/utils/pactl.c:1041
+#: ../src/utils/pactl.c:1173
+msgid "card"
+msgstr "?????"
+
+#: ../src/utils/pactl.c:1182
 #, c-format
 msgid "Event '%s' on %s #%u\n"
-msgstr ""
+msgstr "?????? '%s' ??? %s #%u\n"
 
-#: ../src/utils/pactl.c:1258
+#: ../src/utils/pactl.c:1461
 msgid "Got SIGINT, exiting."
-msgstr ""
+msgstr "?????? SIGINT, ??????."
 
-#: ../src/utils/pactl.c:1285
+#: ../src/utils/pactl.c:1488
 msgid "Invalid volume specification"
-msgstr ""
+msgstr "????? ??????????? ???????"
 
-#: ../src/utils/pactl.c:1308
+#: ../src/utils/pactl.c:1511
 msgid "Volume outside permissible range.\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:1319 ../src/utils/pactl.c:1320
-#: ../src/utils/pactl.c:1321 ../src/utils/pactl.c:1322
-#: ../src/utils/pactl.c:1323 ../src/utils/pactl.c:1324
-#: ../src/utils/pactl.c:1325 ../src/utils/pactl.c:1326
-#: ../src/utils/pactl.c:1327 ../src/utils/pactl.c:1328
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1330
-#: ../src/utils/pactl.c:1331 ../src/utils/pactl.c:1332
-#: ../src/utils/pactl.c:1333 ../src/utils/pactl.c:1334
-#: ../src/utils/pactl.c:1335 ../src/utils/pactl.c:1336
-#: ../src/utils/pactl.c:1337
+msgstr "? ?????? ????? ?????????? ????????.\n"
+
+#: ../src/utils/pactl.c:1524
+#| msgid "Invalid volume specification"
+msgid "Invalid number of volume specifications.\n"
+msgstr "?????? ??????? ???????????? ???????.\n"
+
+#: ../src/utils/pactl.c:1536
+#| msgid "Invalid volume specification"
+msgid "Inconsistent volume specification.\n"
+msgstr "???????? ??????????? ???????.\n"
+
+#: ../src/utils/pactl.c:1566 ../src/utils/pactl.c:1567
+#: ../src/utils/pactl.c:1568 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1570 ../src/utils/pactl.c:1571
+#: ../src/utils/pactl.c:1572 ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1574 ../src/utils/pactl.c:1575
+#: ../src/utils/pactl.c:1576 ../src/utils/pactl.c:1577
+#: ../src/utils/pactl.c:1578 ../src/utils/pactl.c:1579
+#: ../src/utils/pactl.c:1580 ../src/utils/pactl.c:1581
+#: ../src/utils/pactl.c:1582 ../src/utils/pactl.c:1583
+#: ../src/utils/pactl.c:1584 ../src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1586
 msgid "[options]"
-msgstr ""
+msgstr "[????????]"
 
-#: ../src/utils/pactl.c:1321
+#: ../src/utils/pactl.c:1568
 msgid "[TYPE]"
-msgstr ""
+msgstr "[?????]"
 
-#: ../src/utils/pactl.c:1323
+#: ../src/utils/pactl.c:1570
 msgid "FILENAME [NAME]"
-msgstr ""
+msgstr "???????????? [?????]"
 
-#: ../src/utils/pactl.c:1324
+#: ../src/utils/pactl.c:1571
 msgid "NAME [SINK]"
-msgstr ""
-
-#: ../src/utils/pactl.c:1325
-msgid "NAME"
-msgstr ""
-
-#: ../src/utils/pactl.c:1326
-msgid "NAME [ARGS ...]"
-msgstr ""
-
-#: ../src/utils/pactl.c:1327
-msgid "#N"
-msgstr ""
-
-#: ../src/utils/pactl.c:1328
-msgid "#N SINK|SOURCE"
-msgstr ""
+msgstr "????? [??????]"
 
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1334
-msgid "NAME|#N 1|0"
-msgstr ""
+#: ../src/utils/pactl.c:1580
+#| msgid "NAME|#N VOLUME"
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "?????| ?????? #? [?????? ...]"
 
-#: ../src/utils/pactl.c:1330
-msgid "CARD PROFILE"
-msgstr ""
-
-#: ../src/utils/pactl.c:1331
-msgid "NAME|#N PORT"
-msgstr ""
+#: ../src/utils/pactl.c:1581
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N ?????? [?????? ...]"
 
-#: ../src/utils/pactl.c:1332
-msgid "NAME|#N VOLUME"
-msgstr ""
+#: ../src/utils/pactl.c:1582
+msgid "NAME|#N 1|0|toggle"
+msgstr "?????|#? 1|0|????????"
 
-#: ../src/utils/pactl.c:1333
-msgid "#N VOLUME"
-msgstr ""
+#: ../src/utils/pactl.c:1583
+msgid "#N 1|0|toggle"
+msgstr "#? 1|0|????????"
 
-#: ../src/utils/pactl.c:1335
-msgid "#N 1|0"
-msgstr ""
-
-#: ../src/utils/pactl.c:1336
+#: ../src/utils/pactl.c:1584
 msgid "#N FORMATS"
+msgstr "?????? #?"
+
+#: ../src/utils/pactl.c:1587
+#, c-format
+msgid ""
+"\n"
+"The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@\n"
+"can be used to specify the default sink, source and monitor.\n"
 msgstr ""
+"\n"
+"?? ?????? ??????? @DEFAULT_SINK@, @DEFAULT_SOURCE@ ??? @DEFAULT_MONITOR@\n"
+"??????? ?? ??????????????? ????????? ??? ????????????? ?????, ???? ??? "
+"?????.\n"
 
-#: ../src/utils/pactl.c:1339
+#: ../src/utils/pactl.c:1590
 #, c-format
 msgid ""
 "\n"
@@ -1977,619 +3108,355 @@ msgid ""
 "  -n, --client-name=NAME                How to call this client on the "
 "server\n"
 msgstr ""
+"\n"
+"  -h, --help                            ???????? ????? ??? ????????\n"
+"      --version                         ???????? ???????\n"
+"\n"
+"  -s, --server=SERVER                   ?? ????? ??? ?????????? ??? ???????\n"
+"  -n, --client-name=NAME                ??? ?? ?????? ????? ? ??????? ???? "
+"??????????\n"
 
-#: ../src/utils/pactl.c:1380
+#: ../src/utils/pactl.c:1631
 #, c-format
 msgid ""
 "pactl %s\n"
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 msgstr ""
+"pactl %s\n"
+"??????????????? ?? libpulse %s\n"
+"????????? ?? libpulse %s\n"
 
-#: ../src/utils/pactl.c:1439
+#: ../src/utils/pactl.c:1690
 #, c-format
 msgid "Specify nothing, or one of: %s"
-msgstr ""
+msgstr "?????? ??????, ? ??? ??? ??: %s"
 
-#: ../src/utils/pactl.c:1449
+#: ../src/utils/pactl.c:1700
 msgid "Please specify a sample file to load"
-msgstr ""
+msgstr "??????????? ?????? ??? ?????? ????????? ??? ???????"
 
-#: ../src/utils/pactl.c:1462
+#: ../src/utils/pactl.c:1713
 msgid "Failed to open sound file."
 msgstr "???????? ?????????? ??????? ????."
 
-#: ../src/utils/pactl.c:1474
+#: ../src/utils/pactl.c:1725
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
+"?????????????: ???????? ????????????? ???????????? ????????? ??? ??????."
 
-#: ../src/utils/pactl.c:1484
+#: ../src/utils/pactl.c:1735
 msgid "You have to specify a sample name to play"
-msgstr ""
+msgstr "?????? ?? ??????? ??? ????? ????????? ??? ???????????"
 
-#: ../src/utils/pactl.c:1496
+#: ../src/utils/pactl.c:1747
 msgid "You have to specify a sample name to remove"
-msgstr ""
+msgstr "?????? ?? ??????? ??? ????? ????????? ??? ????????"
 
-#: ../src/utils/pactl.c:1505
+#: ../src/utils/pactl.c:1756
 msgid "You have to specify a sink input index and a sink"
-msgstr ""
+msgstr "?????? ?? ??????? ???? ?????? ??????? ????? ??? ???? ?????"
 
-#: ../src/utils/pactl.c:1515
+#: ../src/utils/pactl.c:1766
 msgid "You have to specify a source output index and a source"
-msgstr ""
+msgstr "?????? ?? ??????? ???? ?????? ?????? ????? ??? ??? ????"
 
-#: ../src/utils/pactl.c:1530
+#: ../src/utils/pactl.c:1781
 msgid "You have to specify a module name and arguments."
-msgstr ""
+msgstr "?????? ?? ??????? ??? ????? ???????? ??? ????????."
 
-#: ../src/utils/pactl.c:1550
-msgid "You have to specify a module index"
-msgstr ""
+#: ../src/utils/pactl.c:1801
+msgid "You have to specify a module index or name"
+msgstr "?????? ?? ??????? ???? ?????? ???????? ? ?????"
 
-#: ../src/utils/pactl.c:1560
+#: ../src/utils/pactl.c:1814
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
+"??? ???????? ?? ??????? ????????????? ??? ???? ?????. ?????? ?? ??????? ??? "
+"???? ?????."
+
+#: ../src/utils/pactl.c:1819 ../src/utils/pactl.c:1839
+msgid "Invalid suspend specification."
+msgstr "????? ??????????? ?????????."
 
-#: ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1834
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
+"??? ???????? ?? ??????? ???????????? ??? ??? ?????. ?????? ?? ??????? ??? "
+"???? ?????."
 
-#: ../src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1851
 msgid "You have to specify a card name/index and a profile name"
-msgstr ""
+msgstr "?????? ?? ??????? ??? ?????/?????? ?????? ??? ??? ????? ?????????"
 
-#: ../src/utils/pactl.c:1596
+#: ../src/utils/pactl.c:1862
 msgid "You have to specify a sink name/index and a port name"
-msgstr ""
+msgstr "?????? ?? ??????? ??? ?????/?????? ????? ??? ??? ????? ?????"
+
+#: ../src/utils/pactl.c:1873
+msgid "You have to specify a sink name"
+msgstr "?????? ?? ??????? ??? ????? ?????"
 
-#: ../src/utils/pactl.c:1607
+#: ../src/utils/pactl.c:1883
 msgid "You have to specify a source name/index and a port name"
-msgstr ""
+msgstr "?????? ?? ??????? ??? ?????/?????? ????? ??? ??? ????? ?????"
+
+#: ../src/utils/pactl.c:1894
+msgid "You have to specify a source name"
+msgstr "?????? ?? ??????? ??? ????? ?????"
 
-#: ../src/utils/pactl.c:1618
+#: ../src/utils/pactl.c:1904
 msgid "You have to specify a sink name/index and a volume"
-msgstr ""
+msgstr "?????? ?? ??????? ??? ?????/?????? ????? ??? ??? ??????"
 
-#: ../src/utils/pactl.c:1631
+#: ../src/utils/pactl.c:1917
 msgid "You have to specify a source name/index and a volume"
-msgstr ""
+msgstr "?????? ?? ??????? ??? ?????/?????? ????? ??? ??? ??????"
 
-#: ../src/utils/pactl.c:1644
+#: ../src/utils/pactl.c:1930
 msgid "You have to specify a sink input index and a volume"
-msgstr ""
+msgstr "?????? ?? ??????? ???? ?????? ??????? ????? ??? ??? ??????"
 
-#: ../src/utils/pactl.c:1649
+#: ../src/utils/pactl.c:1935
 msgid "Invalid sink input index"
-msgstr ""
+msgstr "?????? ??????? ??????? ?????"
 
-#: ../src/utils/pactl.c:1660
+#: ../src/utils/pactl.c:1946
 msgid "You have to specify a source output index and a volume"
-msgstr ""
+msgstr "?????? ?? ??????? ???? ?????? ?????? ????? ??? ??? ??????"
 
-#: ../src/utils/pactl.c:1665
+#: ../src/utils/pactl.c:1951
 msgid "Invalid source output index"
-msgstr ""
+msgstr "?????? ??????? ?????? ?????"
 
-#: ../src/utils/pactl.c:1677
+#: ../src/utils/pactl.c:1962
 msgid "You have to specify a sink name/index and a mute boolean"
-msgstr ""
+msgstr "?????? ?? ??????? ???? ??????/????? ????? ??? ??? ???? ????? ???????"
 
-#: ../src/utils/pactl.c:1682 ../src/utils/pactl.c:1699
-#: ../src/utils/pactl.c:1721 ../src/utils/pactl.c:1742
+#: ../src/utils/pactl.c:1967 ../src/utils/pactl.c:1982
+#: ../src/utils/pactl.c:2002 ../src/utils/pactl.c:2020
 msgid "Invalid mute specification"
-msgstr ""
+msgstr "????? ??????????? ???????"
 
-#: ../src/utils/pactl.c:1694
+#: ../src/utils/pactl.c:1977
 msgid "You have to specify a source name/index and a mute boolean"
-msgstr ""
+msgstr "?????? ?? ??????? ??? ?????/?????? ????? ??? ??? ???? ????? ???????"
 
-#: ../src/utils/pactl.c:1711
+#: ../src/utils/pactl.c:1992
 msgid "You have to specify a sink input index and a mute boolean"
-msgstr ""
+msgstr "?????? ?? ??????? ???? ?????? ??????? ????? ??? ??? ???? ????? ???????"
 
-#: ../src/utils/pactl.c:1716
+#: ../src/utils/pactl.c:1997
 msgid "Invalid sink input index specification"
-msgstr ""
+msgstr "????? ??????????? ?????? ??????? ?????"
 
-#: ../src/utils/pactl.c:1732
+#: ../src/utils/pactl.c:2010
 msgid "You have to specify a source output index and a mute boolean"
-msgstr ""
+msgstr "?????? ?? ??????? ???? ?????? ?????? ????? ??? ??? ???? ????? ???????"
 
-#: ../src/utils/pactl.c:1737
-#, fuzzy
+#: ../src/utils/pactl.c:2015
 msgid "Invalid source output index specification"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr "????? ??????????? ?????? ?????? ?????"
 
-#: ../src/utils/pactl.c:1756
+#: ../src/utils/pactl.c:2032
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
+"?????? ?? ??????? ???? ?????? ????? ??? ???? ???????? ?????????? ?? ; ??? "
+"??????????????? ??????"
 
-#: ../src/utils/pactl.c:1772
-msgid "No valid command specified."
+#: ../src/utils/pactl.c:2044
+msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
+"?????? ?? ??????? ??? ?????/?????? ??????, ??? ????? ????? ??? ??? "
+"?????????? ??????????? ??????"
 
-#: ../src/utils/pax11publish.c:61
-#, c-format
-msgid ""
-"%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
-"\n"
-" -d    Show current PulseAudio data attached to X11 display (default)\n"
-" -e    Export local PulseAudio data to X11 display\n"
-" -i    Import PulseAudio data from X11 display to local environment "
-"variables and cookie file.\n"
-" -r    Remove PulseAudio data from X11 display\n"
-msgstr ""
+#: ../src/utils/pactl.c:2051
+msgid "Could not parse latency offset"
+msgstr "??????? ? ??????? ??????????? ??????????? ??????"
 
-#: ../src/utils/pax11publish.c:94
-#, c-format
-msgid "Failed to parse command line.\n"
-msgstr ""
+#: ../src/utils/pactl.c:2063
+msgid "No valid command specified."
+msgstr "??? ???????? ?????? ??????."
 
-#: ../src/utils/pax11publish.c:113
+#: ../src/utils/pasuspender.c:81
 #, c-format
-msgid "Server: %s\n"
-msgstr ""
+msgid "fork(): %s\n"
+msgstr "fork(): %s\n"
 
-#: ../src/utils/pax11publish.c:115
+#: ../src/utils/pasuspender.c:94
 #, c-format
-msgid "Source: %s\n"
-msgstr ""
+msgid "execvp(): %s\n"
+msgstr "execvp(): %s\n"
 
-#: ../src/utils/pax11publish.c:117
+#: ../src/utils/pasuspender.c:113
 #, c-format
-msgid "Sink: %s\n"
-msgstr ""
+msgid "Failure to resume: %s\n"
+msgstr "???????? ?????????: %s\n"
 
-#: ../src/utils/pax11publish.c:119
+#: ../src/utils/pasuspender.c:147
 #, c-format
-msgid "Cookie: %s\n"
-msgstr ""
+msgid "Failure to suspend: %s\n"
+msgstr "???????? ?????????: %s\n"
 
-#: ../src/utils/pax11publish.c:137
+#: ../src/utils/pasuspender.c:172
 #, c-format
-msgid "Failed to parse cookie data\n"
+msgid "WARNING: Sound server is not local, not suspending.\n"
 msgstr ""
+"?????????????: ? ??????????? ???? ??? ????? ???????, ??? ????????????.\n"
 
-#: ../src/utils/pax11publish.c:142
+#: ../src/utils/pasuspender.c:185
 #, c-format
-msgid "Failed to save cookie data\n"
-msgstr ""
+msgid "Connection failure: %s\n"
+msgstr "???????? ????????: %s\n"
 
-#: ../src/utils/pax11publish.c:157
+#: ../src/utils/pasuspender.c:203
 #, c-format
-msgid "Failed to load client configuration file.\n"
-msgstr ""
+msgid "Got SIGINT, exiting.\n"
+msgstr "?????? SIGINT, ??????.\n"
 
-#: ../src/utils/pax11publish.c:162
+#: ../src/utils/pasuspender.c:221
 #, c-format
-msgid "Failed to read environment configuration data.\n"
-msgstr ""
+msgid "WARNING: Child process terminated by signal %u\n"
+msgstr "?????????????: ? ????????? ????????? ???????? ?? ???? %u\n"
 
-#: ../src/utils/pax11publish.c:179
+#: ../src/utils/pasuspender.c:230
 #, c-format
-msgid "Failed to get FQDN.\n"
+msgid ""
+"%s [options] ... \n"
+"\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"  -s, --server=SERVER                   The name of the server to connect "
+"to\n"
+"\n"
 msgstr ""
+"%s [options] ... \n"
+"\n"
+"  -h, --help                            ???????? ??? ????????\n"
+"      --version                         ???????? ???????\n"
+"  -s, --server=SERVER                   ?? ????? ??? ?????????? ??? ???????\n"
+"\n"
 
-#: ../src/utils/pax11publish.c:199
+#: ../src/utils/pasuspender.c:268
 #, c-format
-msgid "Failed to load cookie data\n"
+msgid ""
+"pasuspender %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
 msgstr ""
+"pasuspender %s\n"
+"??????????????? ?? libpulse %s\n"
+"????????? ?? libpulse %s\n"
 
-#: ../src/utils/pax11publish.c:217
+#: ../src/utils/pasuspender.c:297
 #, c-format
-msgid "Not yet implemented.\n"
-msgstr ""
-
-#: ../src/utils/pacmd.c:66
-msgid "No PulseAudio daemon running, or not running as session daemon."
-msgstr ""
+msgid "pa_mainloop_new() failed.\n"
+msgstr "???????? pa_mainloop_new().\n"
 
-#: ../src/utils/pacmd.c:71
+#: ../src/utils/pasuspender.c:310
 #, c-format
-msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
-msgstr ""
+msgid "pa_context_new() failed.\n"
+msgstr "???????? pa_context_new().\n"
 
-#: ../src/utils/pacmd.c:88
+#: ../src/utils/pasuspender.c:322
 #, c-format
-msgid "connect(): %s"
-msgstr "???????(): %s"
-
-#: ../src/utils/pacmd.c:96
-msgid "Failed to kill PulseAudio daemon."
-msgstr ""
-
-#: ../src/utils/pacmd.c:104
-msgid "Daemon not responding."
-msgstr ""
+msgid "pa_mainloop_run() failed.\n"
+msgstr "???????? pa_mainloop_run().\n"
 
-#: ../src/utils/pacmd.c:184
+#: ../src/utils/pax11publish.c:60
 #, c-format
-msgid "poll(): %s"
+msgid ""
+"%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
+"\n"
+" -d    Show current PulseAudio data attached to X11 display (default)\n"
+" -e    Export local PulseAudio data to X11 display\n"
+" -i    Import PulseAudio data from X11 display to local environment "
+"variables and cookie file.\n"
+" -r    Remove PulseAudio data from X11 display\n"
 msgstr ""
+"%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
+"\n"
+" -d    ???????? ????????? ????????? PulseAudio ??? ????? ???????????? ?? "
+"??????? X11 (??????????)\n"
+" -e    ??????? ??????? ????????? PulseAudio ?? ??????? X11\n"
+" -i    ???????? ????????? PulseAudio ??? ??????? X11 ?? ??????? ?????????? "
+"????????????? ??? ??????? ?????????.\n"
+" -r    ???????? ????????? PulseAudio ??? ??????? X11\n"
 
-#: ../src/utils/pacmd.c:195 ../src/utils/pacmd.c:215
+#: ../src/utils/pax11publish.c:93
 #, c-format
-msgid "read(): %s"
-msgstr ""
+msgid "Failed to parse command line.\n"
+msgstr "???????? ???????? ??????? ???????.\n"
 
-#: ../src/utils/pacmd.c:237 ../src/utils/pacmd.c:255
+#: ../src/utils/pax11publish.c:112
 #, c-format
-msgid "write(): %s"
-msgstr ""
-
-#: ../src/pulsecore/lock-autospawn.c:136 ../src/pulsecore/lock-autospawn.c:222
-msgid "Cannot access autospawn lock."
-msgstr ""
+msgid "Server: %s\n"
+msgstr "???????????: %s\n"
 
-#: ../src/modules/alsa/alsa-sink.c:560 ../src/modules/alsa/alsa-sink.c:726
+#: ../src/utils/pax11publish.c:114
 #, c-format
-msgid ""
-"ALSA woke us up to write new data to the device, but there was actually "
-"nothing to write!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
+msgid "Source: %s\n"
+msgstr "????: %s\n"
 
-#: ../src/modules/alsa/alsa-source.c:519 ../src/modules/alsa/alsa-source.c:672
+#: ../src/utils/pax11publish.c:116
 #, c-format
-msgid ""
-"ALSA woke us up to read new data from the device, but there was actually "
-"nothing to read!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
-
-#: ../src/modules/alsa/module-alsa-card.c:167
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2796
-#: ../src/modules/alsa/alsa-mixer.c:3898
-msgid "Off"
-msgstr ""
-
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2738
-msgid "High Fidelity Playback (A2DP)"
-msgstr ""
-
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2752
-msgid "High Fidelity Capture (A2DP)"
-msgstr ""
-
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2767
-msgid "Telephony Duplex (HSP/HFP)"
-msgstr ""
-
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2781
-msgid "Handsfree Gateway"
-msgstr ""
-
-#: ../src/modules/reserve-wrap.c:151
-msgid "PulseAudio Sound Server"
-msgstr ""
-
-#: ../src/modules/module-rygel-media-server.c:510
-#: ../src/modules/module-rygel-media-server.c:548
-#: ../src/modules/module-rygel-media-server.c:903
-msgid "Output Devices"
-msgstr ""
-
-#: ../src/modules/module-rygel-media-server.c:511
-#: ../src/modules/module-rygel-media-server.c:549
-#: ../src/modules/module-rygel-media-server.c:904
-msgid "Input Devices"
-msgstr ""
-
-#: ../src/modules/module-rygel-media-server.c:1056
-msgid "Audio on @HOSTNAME@"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2219
-msgid "Input"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2220
-msgid "Docking Station Input"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2221
-msgid "Docking Station Microphone"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2222
-msgid "Docking Station Line In"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2223 ../src/modules/alsa/alsa-mixer.c:2307
-msgid "Line In"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2224 ../src/modules/alsa/alsa-mixer.c:2302
-msgid "Microphone"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2225 ../src/modules/alsa/alsa-mixer.c:2303
-msgid "Front Microphone"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2226 ../src/modules/alsa/alsa-mixer.c:2304
-msgid "Rear Microphone"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2227
-msgid "External Microphone"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2228 ../src/modules/alsa/alsa-mixer.c:2306
-msgid "Internal Microphone"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2229 ../src/modules/alsa/alsa-mixer.c:2308
-msgid "Radio"
-msgstr "Radio"
-
-#: ../src/modules/alsa/alsa-mixer.c:2230 ../src/modules/alsa/alsa-mixer.c:2309
-msgid "Video"
-msgstr "Video"
-
-#: ../src/modules/alsa/alsa-mixer.c:2231
-msgid "Automatic Gain Control"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2232
-msgid "No Automatic Gain Control"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2233
-msgid "Boost"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2234
-msgid "No Boost"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2235
-msgid "Amplifier"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2236
-msgid "No Amplifier"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2237
-msgid "Bass Boost"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2238
-msgid "No Bass Boost"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2239
-msgid "Speaker"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2240 ../src/modules/alsa/alsa-mixer.c:2311
-msgid "Headphones"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2301
-msgid "Analog Input"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2305
-msgid "Dock Microphone"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2310
-msgid "Analog Output"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2312
-msgid "LFE on Separate Mono Output"
-msgstr "Analog Output (LFE)"
-
-#: ../src/modules/alsa/alsa-mixer.c:2313
-msgid "Line Out"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2314
-msgid "Analog Mono Output"
-msgstr "Analog Mono Output"
-
-#: ../src/modules/alsa/alsa-mixer.c:2315
-#, fuzzy
-msgid "Speakers"
-msgstr "Analog Stereo"
-
-#: ../src/modules/alsa/alsa-mixer.c:2316
-msgid "HDMI / DisplayPort"
-msgstr ""
-
-#: ../src/modules/alsa/alsa-mixer.c:2317
-#, fuzzy
-msgid "Digital Output (S/PDIF)"
-msgstr "Digital Stereo (HDMI)"
-
-#: ../src/modules/alsa/alsa-mixer.c:2318
-#, fuzzy
-msgid "Digital Passthrough (S/PDIF)"
-msgstr "Digital Stereo (HDMI)"
-
-#: ../src/modules/alsa/alsa-mixer.c:3756
-msgid "Analog Mono"
-msgstr "Analog Mono"
-
-#: ../src/modules/alsa/alsa-mixer.c:3757
-msgid "Analog Stereo"
-msgstr "Analog Stereo"
-
-#: ../src/modules/alsa/alsa-mixer.c:3758
-msgid "Analog Surround 2.1"
-msgstr "Analog Surround 2.1"
-
-#: ../src/modules/alsa/alsa-mixer.c:3759
-msgid "Analog Surround 3.0"
-msgstr "Analog Surround 3.0"
-
-#: ../src/modules/alsa/alsa-mixer.c:3760
-msgid "Analog Surround 3.1"
-msgstr "Analog Surround 3.1"
-
-#: ../src/modules/alsa/alsa-mixer.c:3761
-msgid "Analog Surround 4.0"
-msgstr "Analog Surround 4.0"
-
-#: ../src/modules/alsa/alsa-mixer.c:3762
-msgid "Analog Surround 4.1"
-msgstr "Analog Surround 4.1"
-
-#: ../src/modules/alsa/alsa-mixer.c:3763
-msgid "Analog Surround 5.0"
-msgstr "Analog Surround 5.0"
-
-#: ../src/modules/alsa/alsa-mixer.c:3764
-msgid "Analog Surround 5.1"
-msgstr "Analog Surround 5.1"
-
-#: ../src/modules/alsa/alsa-mixer.c:3765
-msgid "Analog Surround 6.0"
-msgstr "Analog Surround 6.0"
-
-#: ../src/modules/alsa/alsa-mixer.c:3766
-msgid "Analog Surround 6.1"
-msgstr "Analog Surround 6.1"
-
-#: ../src/modules/alsa/alsa-mixer.c:3767
-msgid "Analog Surround 7.0"
-msgstr "Analog Surround 7.0"
-
-#: ../src/modules/alsa/alsa-mixer.c:3768
-msgid "Analog Surround 7.1"
-msgstr "Analog Surround 7.1"
-
-#: ../src/modules/alsa/alsa-mixer.c:3769
-msgid "Digital Stereo (IEC958)"
-msgstr "Digital Stereo (IEC958)"
-
-#: ../src/modules/alsa/alsa-mixer.c:3770
-#, fuzzy
-msgid "Digital Passthrough  (IEC958)"
-msgstr "Digital Stereo (IEC958)"
-
-#: ../src/modules/alsa/alsa-mixer.c:3771
-msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr "Digital Surround 4.0 (IEC958/AC3)"
-
-#: ../src/modules/alsa/alsa-mixer.c:3772
-msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr "Digital Surround 5.1 (IEC958/AC3)"
-
-#: ../src/modules/alsa/alsa-mixer.c:3773
-msgid "Digital Stereo (HDMI)"
-msgstr "Digital Stereo (HDMI)"
-
-#: ../src/modules/alsa/alsa-mixer.c:3774
-#, fuzzy
-msgid "Digital Surround 5.1 (HDMI)"
-msgstr "Digital Surround 5.1 (IEC958/AC3)"
-
-#: ../src/modules/alsa/alsa-mixer.c:3895
-msgid "Analog Mono Duplex"
-msgstr "Analog Mono Duplex"
-
-#: ../src/modules/alsa/alsa-mixer.c:3896
-msgid "Analog Stereo Duplex"
-msgstr "Analog Stereo Duplex"
+msgid "Sink: %s\n"
+msgstr "??????: %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3897
-msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Digital Stereo Duplex (IEC958)"
+#: ../src/utils/pax11publish.c:118
+#, c-format
+msgid "Cookie: %s\n"
+msgstr "????????: %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3997
+#: ../src/utils/pax11publish.c:136
 #, c-format
-msgid "%s Output"
-msgstr ""
+msgid "Failed to parse cookie data\n"
+msgstr "???????? ???????? ????????? ?????????\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:4005
+#: ../src/utils/pax11publish.c:141
 #, c-format
-msgid "%s Input"
-msgstr ""
+msgid "Failed to save cookie data\n"
+msgstr "???????? ??????????? ????????? ?????????\n"
 
-#: ../src/modules/echo-cancel/module-echo-cancel.c:63
-msgid ""
-"source_name=<name for the source> source_properties=<properties for the "
-"source> source_master=<name of source to filter> sink_name=<name for the "
-"sink> sink_properties=<properties for the sink> sink_master=<name of sink to "
-"filter> adjust_time=<how often to readjust rates in s> adjust_threshold=<how "
-"much drift to readjust after in ms> format=<sample format> rate=<sample "
-"rate> channels=<number of channels> channel_map=<channel map> "
-"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
-"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
-"loaded automatically> use_volume_sharing=<yes or no> "
-msgstr ""
+#: ../src/utils/pax11publish.c:156
+#, c-format
+msgid "Failed to load client configuration file.\n"
+msgstr "???????? ???????? ??????? ????????? ??????.\n"
 
-#: ../src/modules/module-equalizer-sink.c:72
-msgid "General Purpose Equalizer"
-msgstr ""
+#: ../src/utils/pax11publish.c:161
+#, c-format
+msgid "Failed to read environment configuration data.\n"
+msgstr "???????? ????????? ????????? ??????????? ?????????????.\n"
 
-#: ../src/modules/module-equalizer-sink.c:76
-msgid ""
-"sink_name=<name of the sink> sink_properties=<properties for the sink> "
-"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
-"this module is being loaded automatically> use_volume_sharing=<yes or no> "
-msgstr ""
+#: ../src/utils/pax11publish.c:178
+#, c-format
+msgid "Failed to get FQDN.\n"
+msgstr "???????? ????? FQDN.\n"
 
-#: ../src/modules/module-filter-apply.c:48
-msgid "autoclean=<automatically unload unused filters?>"
-msgstr ""
+#: ../src/utils/pax11publish.c:198
+#, c-format
+msgid "Failed to load cookie data\n"
+msgstr "???????? ???????? ????????? ?????????\n"
 
-#: ../src/tests/resampler-test.c:257
+#: ../src/utils/pax11publish.c:216
 #, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-"-h, --help                            Show this help\n"
-"-v, --verbose                         Print debug messages\n"
-"      --from-rate=SAMPLERATE          From sample rate in Hz (defaults to "
-"44100)\n"
-"      --from-format=SAMPLEFORMAT      From sample type (defaults to s16le)\n"
-"      --from-channels=CHANNELS        From number of channels (defaults to "
-"1)\n"
-"      --to-rate=SAMPLERATE            To sample rate in Hz (defaults to "
-"44100)\n"
-"      --to-format=SAMPLEFORMAT        To sample type (defaults to s16le)\n"
-"      --to-channels=CHANNELS          To number of channels (defaults to 1)\n"
-"      --resample-method=METHOD        Resample method (defaults to auto)\n"
-"      --seconds=SECONDS               From stream duration (defaults to 60)\n"
-"\n"
-"If the formats are not specified, the test performs all formats "
-"combinations,\n"
-"back and forth.\n"
-"\n"
-"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
-"alaw,\n"
-"32le, s32be (defaults to s16ne)\n"
-"\n"
-"See --dump-resample-methods for possible values of resample methods.\n"
-msgstr ""
+msgid "Not yet implemented.\n"
+msgstr "??? ???? ?????????? ?????.\n"
 
-#: ../src/tests/resampler-test.c:356
-#, fuzzy, c-format
-msgid "%s %s\n"
-msgstr "%s %s"
+#~ msgid "PulseAudio Sound System KDE Routing Policy"
+#~ msgstr "? ???????? ???????????? KDE ?????????? ???? PulseAudio"
 
-#: ../src/tests/resampler-test.c:419
-#, c-format
-msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
-msgstr ""
+#~ msgid "Start the PulseAudio Sound System with KDE Routing Policy"
+#~ msgstr ""
+#~ "???????? ??? ?????????? ???? PulseAudio ?? ???????? ???????????? KDE"
+
+#~ msgid "Failed to open configuration file '%s': %s"
+#~ msgstr "???????? ?????????? ??????? ????????? '%s': %s"
 
 #~ msgid "%s+%s"
 #~ msgstr "%s+%s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5a110ca..f425228 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,17 +1,17 @@
 # Brazilian Portuguese translation of pulseaudio
-# Copyright (C) 2013 freedesktop.org
+# Copyright (C) 2014 freedesktop.org
 # This file is distributed under the same license as the pulseaudio package.
 # Fabian Affolter <fab at fedoraproject.org>, 2008.
 # Igor Pires Soares <igor at projetofedora.org>, 2009, 2012.
-# Rafael Ferreira Fontenelle <rafael.f.f1 at gmail.com>, 2013.
+# Rafael Ferreira Fontenelle <rafael.f.f1 at gmail.com>, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
 "product=PulseAudio&keywords=I18N+L10N&component=misc\n"
-"POT-Creation-Date: 2013-10-08 14:25+0000\n"
-"PO-Revision-Date: 2013-10-08 15:31-0300\n"
+"POT-Creation-Date: 2014-06-24 22:12+0000\n"
+"PO-Revision-Date: 2014-07-21 09:26-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1 at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
 "Language: pt_BR\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.5\n"
 
 #: ../src/daemon/caps.c:54
 msgid "Cleaning up privileges."
@@ -67,7 +67,7 @@ msgid ""
 "and\n"
 "                                        this time passed\n"
 "      --log-level[=LEVEL]               Increase or set verbosity level\n"
-"  -v                                    Increase the verbosity level\n"
+"  -v  --verbose                         Increase the verbosity level\n"
 "      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
 "                                        Specify the log target\n"
 "      --log-meta[=BOOL]                 Include code location in log "
@@ -127,7 +127,7 @@ msgstr ""
 "                                        com RLIMIT_NICE elevado)\n"
 "      --realtime[=BOOL]                 Tenta habilitar o escalonamento em\n"
 "                                        tempo real (dispon?vel apenas como\n"
-"                                        root, quando SUID ou com "
+"                                        root quando SUID ou com "
 "RLIMIT_RTPRIO\n"
 "                                        elevado)\n"
 "      --disallow-module-loading[=BOOL]  N?o permite carga/descarga de "
@@ -148,7 +148,7 @@ msgstr ""
 "                                        este tempo foi decorrido\n"
 "      --log-level[=N?VEL]               Aumenta ou define grau de "
 "detalhamento\n"
-"  -v                                    Aumenta o n?vel de detalhamento\n"
+"  -v  --verbose                         Aumenta o n?vel de detalhamento\n"
 "      --log-target={auto,syslog,stderr,file:CAMINHO,newfile:CAMINHO}\n"
 "                                        Especifica o destino do log\n"
 "      --log-meta[=BOOL]                 Inclui a localiza??o do c?digo na\n"
@@ -175,7 +175,7 @@ msgstr ""
 "                                        compartilhada.\n"
 "\n"
 "SCRIPT DE INICIALIZA??O:\n"
-"  -L, --load=\"ARGUMENTOS DO M?DULO\"   Carrega um plug-in especificado com\n"
+"  -L, --load=\"ARGUMENTOS DO M?DULO\"     Carrega um plug-in especificado com\n"
 "                                        o argumento especificado\n"
 "  -F, --file=NOME_DO_ARQUIVO            Executa o script especificado\n"
 "  -C                                    Abre uma linha de comando no TTY em\n"
@@ -220,7 +220,15 @@ msgstr "--disallow-exit espera um argumento booleano"
 msgid "--use-pid-file expects boolean argument"
 msgstr "--use-pid-file espera argumento booleano"
 
-#: ../src/daemon/cmdline.c:326
+#: ../src/daemon/cmdline.c:327
+msgid ""
+"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"Alvo de log inv?lido: use \"syslog\", \"journal\", \"stderr\" ou \"auto\" um "
+"nome de arquivo v?lido \"file:<caminho>\", \"newfile:<caminho>\"."
+
+#: ../src/daemon/cmdline.c:329
 msgid ""
 "Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
 "name 'file:<path>', 'newfile:<path>'."
@@ -228,28 +236,28 @@ msgstr ""
 "Alvo de log inv?lido: use \"syslog\", \"stderr\" ou \"auto\" um nome de "
 "arquivo v?lido \"file:<caminho>\", \"newfile:<caminho>\"."
 
-#: ../src/daemon/cmdline.c:333
+#: ../src/daemon/cmdline.c:337
 msgid "--log-time expects boolean argument"
 msgstr "--log-time espera um argumento booleano"
 
-#: ../src/daemon/cmdline.c:341
+#: ../src/daemon/cmdline.c:345
 msgid "--log-meta expects boolean argument"
 msgstr "--log-meta espera um argumento booleano"
 
-#: ../src/daemon/cmdline.c:361
+#: ../src/daemon/cmdline.c:365
 #, c-format
 msgid "Invalid resample method '%s'."
 msgstr "M?todo de reamostragem inv?lido \"%s\"."
 
-#: ../src/daemon/cmdline.c:368
+#: ../src/daemon/cmdline.c:372
 msgid "--system expects boolean argument"
 msgstr "--system espera argumento booleano"
 
-#: ../src/daemon/cmdline.c:376
+#: ../src/daemon/cmdline.c:380
 msgid "--no-cpu-limit expects boolean argument"
 msgstr "--no-cpu-limit espera argumento booleano"
 
-#: ../src/daemon/cmdline.c:384
+#: ../src/daemon/cmdline.c:388
 msgid "--disable-shm expects boolean argument"
 msgstr "--disable-shm espera argumento booleano"
 
@@ -278,47 +286,47 @@ msgstr "[%s:%u] rlimit inv?lido \"%s\"."
 msgid "[%s:%u] Invalid sample format '%s'."
 msgstr "[%s:%u] Formato de amostragem inv?lido \"%s\"."
 
-#: ../src/daemon/daemon-conf.c:350 ../src/daemon/daemon-conf.c:368
+#: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
 #, c-format
 msgid "[%s:%u] Invalid sample rate '%s'."
 msgstr "[%s:%u] Taxa de amostragem inv?lida \"%s\"."
 
-#: ../src/daemon/daemon-conf.c:391
+#: ../src/daemon/daemon-conf.c:389
 #, c-format
 msgid "[%s:%u] Invalid sample channels '%s'."
 msgstr "[%s:%u] Canais de amostragem inv?lidos \"%s\"."
 
-#: ../src/daemon/daemon-conf.c:408
+#: ../src/daemon/daemon-conf.c:406
 #, c-format
 msgid "[%s:%u] Invalid channel map '%s'."
 msgstr "[%s:%u] Mapa de canais inv?lido \"%s\"."
 
-#: ../src/daemon/daemon-conf.c:425
+#: ../src/daemon/daemon-conf.c:423
 #, c-format
 msgid "[%s:%u] Invalid number of fragments '%s'."
 msgstr "[%s:%u] N?meros de fragmentos inv?lidos \"%s\"."
 
-#: ../src/daemon/daemon-conf.c:442
+#: ../src/daemon/daemon-conf.c:440
 #, c-format
 msgid "[%s:%u] Invalid fragment size '%s'."
 msgstr "[%s:%u] Tamanho de fragmentos inv?lido \"%s\"."
 
-#: ../src/daemon/daemon-conf.c:459
+#: ../src/daemon/daemon-conf.c:457
 #, c-format
 msgid "[%s:%u] Invalid nice level '%s'."
 msgstr "[%s:%u] N?mero de nice inv?lido \"%s\"."
 
-#: ../src/daemon/daemon-conf.c:502
+#: ../src/daemon/daemon-conf.c:500
 #, c-format
 msgid "[%s:%u] Invalid server type '%s'."
 msgstr "[%s:%u] Tipo de servidor inv?lido \"%s\"."
 
-#: ../src/daemon/daemon-conf.c:615
+#: ../src/daemon/daemon-conf.c:613
 #, c-format
 msgid "Failed to open configuration file: %s"
 msgstr "Falha em abrir o arquivo de configura??o: %s"
 
-#: ../src/daemon/daemon-conf.c:631
+#: ../src/daemon/daemon-conf.c:629
 msgid ""
 "The specified default channel map has a different number of channels than "
 "the specified default number of channels."
@@ -326,7 +334,7 @@ msgstr ""
 "O mapa padr?o dos canais especificado tem um n?mero diferente de canais do "
 "que o n?mero de canais padr?o especificado."
 
-#: ../src/daemon/daemon-conf.c:718
+#: ../src/daemon/daemon-conf.c:716
 #, c-format
 msgid "### Read from configuration file: %s ###\n"
 msgstr "### Lido do arquivo de configura??o: %s ###\n"
@@ -393,78 +401,78 @@ msgstr "Falha ao alocar o novo carregador dl."
 msgid "Failed to add bind-now-loader."
 msgstr "Falha ao adicionar o bind-now-loader."
 
-#: ../src/daemon/main.c:139
+#: ../src/daemon/main.c:115
 #, c-format
 msgid "Got signal %s."
 msgstr "Sinal %s recebido."
 
-#: ../src/daemon/main.c:166
+#: ../src/daemon/main.c:142
 msgid "Exiting."
 msgstr "Saindo."
 
-#: ../src/daemon/main.c:184
+#: ../src/daemon/main.c:160
 #, c-format
 msgid "Failed to find user '%s'."
 msgstr "Falha ao localizar o usu?rio \"%s\"."
 
-#: ../src/daemon/main.c:189
+#: ../src/daemon/main.c:165
 #, c-format
 msgid "Failed to find group '%s'."
 msgstr "Falha ao localizar o grupo \"%s\"."
 
-#: ../src/daemon/main.c:193
+#: ../src/daemon/main.c:169
 #, c-format
 msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
 msgstr "Usu?rio \"%s\" (UID %lu) e grupo \"%s\" (GID %lu) localizados."
 
-#: ../src/daemon/main.c:198
+#: ../src/daemon/main.c:174
 #, c-format
 msgid "GID of user '%s' and of group '%s' don't match."
 msgstr "O GID do usu?rio \"%s\" e do grupo \"%s\" n?o combinam."
 
-#: ../src/daemon/main.c:203
+#: ../src/daemon/main.c:179
 #, c-format
 msgid "Home directory of user '%s' is not '%s', ignoring."
 msgstr "O diret?rio pessoal do usu?rio \"%s\" n?o ? \"%s\", ignorando."
 
-#: ../src/daemon/main.c:206 ../src/daemon/main.c:211
+#: ../src/daemon/main.c:182 ../src/daemon/main.c:187
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr "Falha ao criar \"%s\": %s"
 
-#: ../src/daemon/main.c:218
+#: ../src/daemon/main.c:194
 #, c-format
 msgid "Failed to change group list: %s"
 msgstr "Falha ao alterar a lista de grupos: %s"
 
-#: ../src/daemon/main.c:234
+#: ../src/daemon/main.c:210
 #, c-format
 msgid "Failed to change GID: %s"
 msgstr "Falha ao alterar o GID: %s"
 
-#: ../src/daemon/main.c:250
+#: ../src/daemon/main.c:226
 #, c-format
 msgid "Failed to change UID: %s"
 msgstr "Falha ao alterar o UID: %s"
 
-#: ../src/daemon/main.c:271
+#: ../src/daemon/main.c:247
 msgid "Successfully changed user to \""
 msgstr "Usu?rio alterado com sucesso para \""
 
-#: ../src/daemon/main.c:279
+#: ../src/daemon/main.c:255
 msgid "System wide mode unsupported on this platform."
 msgstr "O modo ampliado do sistema n?o tem suporte nessa plataforma."
 
-#: ../src/daemon/main.c:297
+#: ../src/daemon/main.c:273
 #, c-format
 msgid "setrlimit(%s, (%u, %u)) failed: %s"
 msgstr "setrlimit(%s, (%u, %u)) falhou: %s"
 
-#: ../src/daemon/main.c:498
+#: ../src/daemon/main.c:466
 msgid "Failed to parse command line."
 msgstr "Falha ao analisar a linha de comando."
 
-#: ../src/daemon/main.c:537
+#: ../src/daemon/main.c:505
 msgid ""
 "System mode refused for non-root user. Only starting the D-Bus server lookup "
 "service."
@@ -472,21 +480,21 @@ msgstr ""
 "Modo de sistema recusado para usu?rio n?o root. Apenas iniciando o servi?o D-"
 "Bus de procura de servidores."
 
-#: ../src/daemon/main.c:619
+#: ../src/daemon/main.c:587
 msgid "Daemon not running"
 msgstr "O daemon n?o est? em execu??o"
 
-#: ../src/daemon/main.c:621
+#: ../src/daemon/main.c:589
 #, c-format
 msgid "Daemon running as PID %u"
 msgstr "Daemon executando como PID %u"
 
-#: ../src/daemon/main.c:636
+#: ../src/daemon/main.c:604
 #, c-format
 msgid "Failed to kill daemon: %s"
 msgstr "Falha ao encerrar o daemon: %s"
 
-#: ../src/daemon/main.c:665
+#: ../src/daemon/main.c:633
 msgid ""
 "This program is not intended to be run as root (unless --system is "
 "specified)."
@@ -494,20 +502,20 @@ msgstr ""
 "Este programa n?o ? para ser executado como root (a n?o ser que --system "
 "seja especificado)."
 
-#: ../src/daemon/main.c:668
+#: ../src/daemon/main.c:636
 msgid "Root privileges required."
 msgstr "Privil?gios de root requeridos."
 
-#: ../src/daemon/main.c:675
+#: ../src/daemon/main.c:643
 msgid "--start not supported for system instances."
 msgstr "--start n?o tem suporte para inst?ncias de sistemas."
 
-#: ../src/daemon/main.c:715
+#: ../src/daemon/main.c:683
 #, c-format
 msgid "User-configured server at %s, refusing to start/autospawn."
 msgstr "Servidor configurado por usu?rio em %s, recusando in?cio/autogera??o."
 
-#: ../src/daemon/main.c:721
+#: ../src/daemon/main.c:689
 #, c-format
 msgid ""
 "User-configured server at %s, which appears to be local. Probing deeper."
@@ -515,162 +523,162 @@ msgstr ""
 "Servidor configurado por usu?rio em %s, que aparece ser local. Sondando mais "
 "fundo."
 
-#: ../src/daemon/main.c:726
+#: ../src/daemon/main.c:694
 msgid "Running in system mode, but --disallow-exit not set!"
 msgstr "Executando no modo sistema, mas --disallow-exit n?o foi configurado!"
 
-#: ../src/daemon/main.c:729
+#: ../src/daemon/main.c:697
 msgid "Running in system mode, but --disallow-module-loading not set!"
 msgstr ""
 "Executando no modo sistema, mas --disallow-module-loading n?o foi "
 "configurado!"
 
-#: ../src/daemon/main.c:732
+#: ../src/daemon/main.c:700
 msgid "Running in system mode, forcibly disabling SHM mode!"
 msgstr "Executando no modo sistema, desabilitando for?adamente o modo SHM!"
 
-#: ../src/daemon/main.c:737
+#: ../src/daemon/main.c:705
 msgid "Running in system mode, forcibly disabling exit idle time!"
 msgstr ""
 "Executando no modo sistema, desabilitando for?adamente o exit idle time!"
 
-#: ../src/daemon/main.c:765
+#: ../src/daemon/main.c:733
 msgid "Failed to acquire stdio."
 msgstr "Falha em adquirir o stdio."
 
-#: ../src/daemon/main.c:771 ../src/daemon/main.c:838
+#: ../src/daemon/main.c:739 ../src/daemon/main.c:810
 #, c-format
 msgid "pipe() failed: %s"
 msgstr "pipe() falhou: %s"
 
-#: ../src/daemon/main.c:776 ../src/daemon/main.c:843
+#: ../src/daemon/main.c:744 ../src/daemon/main.c:815
 #, c-format
 msgid "fork() failed: %s"
 msgstr "O fork() falhou: %s"
 
-#: ../src/daemon/main.c:791 ../src/daemon/main.c:858 ../src/utils/pacat.c:569
+#: ../src/daemon/main.c:759 ../src/daemon/main.c:830 ../src/utils/pacat.c:569
 #, c-format
 msgid "read() failed: %s"
 msgstr "A opera??o read() falhou: %s"
 
-#: ../src/daemon/main.c:797
+#: ../src/daemon/main.c:765
 msgid "Daemon startup failed."
 msgstr "Falha na partida do daemon."
 
-#: ../src/daemon/main.c:799
+#: ../src/daemon/main.c:767
 msgid "Daemon startup successful."
 msgstr "Os daemons foram iniciados com sucesso."
 
-#: ../src/daemon/main.c:826
+#: ../src/daemon/main.c:798
 #, c-format
 msgid "setsid() failed: %s"
 msgstr "setsid() falhou: %s"
 
-#: ../src/daemon/main.c:911
+#: ../src/daemon/main.c:884
 #, c-format
 msgid "This is PulseAudio %s"
 msgstr "Este ? o PulseAudio %s"
 
-#: ../src/daemon/main.c:912
+#: ../src/daemon/main.c:885
 #, c-format
 msgid "Compilation host: %s"
 msgstr "M?quina da compila??o: %s"
 
-#: ../src/daemon/main.c:913 ../src/tests/resampler-test.c:418
+#: ../src/daemon/main.c:886 ../src/tests/resampler-test.c:418
 #, c-format
 msgid "Compilation CFLAGS: %s"
 msgstr "CFLAGS da compila??o: %s"
 
-#: ../src/daemon/main.c:916
+#: ../src/daemon/main.c:889
 #, c-format
 msgid "Running on host: %s"
 msgstr "Executando no host: %s"
 
-#: ../src/daemon/main.c:919
+#: ../src/daemon/main.c:892
 #, c-format
 msgid "Found %u CPUs."
 msgstr "%u CPUs localizadas."
 
-#: ../src/daemon/main.c:921
+#: ../src/daemon/main.c:894
 #, c-format
 msgid "Page size is %lu bytes"
 msgstr "O tamanho da p?gina ? %lu bytes"
 
-#: ../src/daemon/main.c:924
+#: ../src/daemon/main.c:897
 msgid "Compiled with Valgrind support: yes"
 msgstr "Compilado com suporte do Valgrind: sim"
 
-#: ../src/daemon/main.c:926
+#: ../src/daemon/main.c:899
 msgid "Compiled with Valgrind support: no"
 msgstr "Compilado com suporte do Valgrind: n?o"
 
-#: ../src/daemon/main.c:929
+#: ../src/daemon/main.c:902
 #, c-format
 msgid "Running in valgrind mode: %s"
 msgstr "Executando em modo valgrind: %s"
 
-#: ../src/daemon/main.c:931
+#: ../src/daemon/main.c:904
 #, c-format
 msgid "Running in VM: %s"
 msgstr "Executando na VM: %s"
 
-#: ../src/daemon/main.c:934
+#: ../src/daemon/main.c:907
 msgid "Optimized build: yes"
 msgstr "Build otimizado: sim"
 
-#: ../src/daemon/main.c:936
+#: ../src/daemon/main.c:909
 msgid "Optimized build: no"
 msgstr "Build otimizado: n?o"
 
-#: ../src/daemon/main.c:940
+#: ../src/daemon/main.c:913
 msgid "NDEBUG defined, all asserts disabled."
 msgstr "NDEBUG definido, todas as declara??es desabilitadas."
 
-#: ../src/daemon/main.c:942
+#: ../src/daemon/main.c:915
 msgid "FASTPATH defined, only fast path asserts disabled."
 msgstr ""
 "FASTPATH definido, somente as declara??es do \"fast path\" foram "
 "desabilitadas."
 
-#: ../src/daemon/main.c:944
+#: ../src/daemon/main.c:917
 msgid "All asserts enabled."
 msgstr "Todas as declara??es habilitadas."
 
-#: ../src/daemon/main.c:948
+#: ../src/daemon/main.c:921
 msgid "Failed to get machine ID"
 msgstr "Falha ao obter o ID da m?quina"
 
-#: ../src/daemon/main.c:951
+#: ../src/daemon/main.c:924
 #, c-format
 msgid "Machine ID is %s."
 msgstr "O ID da m?quina ? %s."
 
-#: ../src/daemon/main.c:955
+#: ../src/daemon/main.c:928
 #, c-format
 msgid "Session ID is %s."
 msgstr "O ID da sess?o ? %s."
 
-#: ../src/daemon/main.c:961
+#: ../src/daemon/main.c:934
 #, c-format
 msgid "Using runtime directory %s."
 msgstr "Usando o diret?rio de runtime %s."
 
-#: ../src/daemon/main.c:966
+#: ../src/daemon/main.c:939
 #, c-format
 msgid "Using state directory %s."
 msgstr "Usando o diret?rio de estado %s."
 
-#: ../src/daemon/main.c:969
+#: ../src/daemon/main.c:942
 #, c-format
 msgid "Using modules directory %s."
 msgstr "Usando o diret?rio de m?dulos %s."
 
-#: ../src/daemon/main.c:971
+#: ../src/daemon/main.c:944
 #, c-format
 msgid "Running in system mode: %s"
 msgstr "Executando em modo do sistema: %s"
 
-#: ../src/daemon/main.c:974
+#: ../src/daemon/main.c:947
 msgid ""
 "OK, so you are running PA in system mode. Please note that you most likely "
 "shouldn't be doing that.\n"
@@ -686,15 +694,15 @@ msgstr ""
 "Por favor, leia o http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode para "
 "obter um explica??o sobre porque o modo de sistema ? uma m? ideia."
 
-#: ../src/daemon/main.c:991
+#: ../src/daemon/main.c:964
 msgid "pa_pid_file_create() failed."
 msgstr "pa_pid_file_create() falhou."
 
-#: ../src/daemon/main.c:1001
+#: ../src/daemon/main.c:974
 msgid "Fresh high-resolution timers available! Bon appetit!"
 msgstr "Timers de alta resolu??o fresquinhos dispon?veis! Bon appetit!"
 
-#: ../src/daemon/main.c:1003
+#: ../src/daemon/main.c:976
 msgid ""
 "Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
 "resolution timers enabled!"
@@ -702,28 +710,28 @@ msgstr ""
 "Cara, seu kernel fede! A recomenda??o do chef hoje ? Linux com timers de "
 "alta resolu??o habilitados!"
 
-#: ../src/daemon/main.c:1021
+#: ../src/daemon/main.c:994
 msgid "pa_core_new() failed."
 msgstr "pa_core_new() falhou."
 
-#: ../src/daemon/main.c:1099
+#: ../src/daemon/main.c:1068
 msgid "Failed to initialize daemon."
 msgstr "Falha em iniciar o daemon."
 
-#: ../src/daemon/main.c:1104
+#: ../src/daemon/main.c:1073
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr ""
 "O Daemon iniciou sem qualquer m?dulo carregado, recusando-se a trabalhar."
 
-#: ../src/daemon/main.c:1142
+#: ../src/daemon/main.c:1111
 msgid "Daemon startup complete."
 msgstr "A inicializa??o do daemon foi conclu?da."
 
-#: ../src/daemon/main.c:1148
+#: ../src/daemon/main.c:1117
 msgid "Daemon shutdown initiated."
 msgstr "O encerramento do daemon foi iniciado."
 
-#: ../src/daemon/main.c:1179
+#: ../src/daemon/main.c:1143
 msgid "Daemon terminated."
 msgstr "Daemon terminado."
 
@@ -735,269 +743,261 @@ msgstr "Sistema de som PulseAudio"
 msgid "Start the PulseAudio Sound System"
 msgstr "Iniciar o sistema de som PulseAudio"
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:1
-msgid "PulseAudio Sound System KDE Routing Policy"
-msgstr "Pol?tica de roteamento do KDE para Sistema de som PulseAudio"
-
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:2
-msgid "Start the PulseAudio Sound System with KDE Routing Policy"
-msgstr "Iniciar o sistema de som PulseAudio com pol?tica de roteamento do KDE"
-
-#: ../src/modules/alsa/alsa-mixer.c:2250
+#: ../src/modules/alsa/alsa-mixer.c:2251
 msgid "Input"
 msgstr "Entrada"
 
-#: ../src/modules/alsa/alsa-mixer.c:2251
+#: ../src/modules/alsa/alsa-mixer.c:2252
 msgid "Docking Station Input"
 msgstr "Entrada da base de encaixe"
 
-#: ../src/modules/alsa/alsa-mixer.c:2252
+#: ../src/modules/alsa/alsa-mixer.c:2253
 msgid "Docking Station Microphone"
 msgstr "Microfone de esta??o de base de encaixe"
 
-#: ../src/modules/alsa/alsa-mixer.c:2253
+#: ../src/modules/alsa/alsa-mixer.c:2254
 msgid "Docking Station Line In"
 msgstr "Entrada de linha de esta??o de base de encaixe"
 
-#: ../src/modules/alsa/alsa-mixer.c:2254 ../src/modules/alsa/alsa-mixer.c:2339
+#: ../src/modules/alsa/alsa-mixer.c:2255 ../src/modules/alsa/alsa-mixer.c:2340
 msgid "Line In"
 msgstr "Entrada de linha"
 
-#: ../src/modules/alsa/alsa-mixer.c:2255 ../src/modules/alsa/alsa-mixer.c:2333
-#: ../src/modules/bluetooth/module-bluez4-device.c:2097
-#: ../src/modules/bluetooth/module-bluez5-device.c:1447
+#: ../src/modules/alsa/alsa-mixer.c:2256 ../src/modules/alsa/alsa-mixer.c:2334
+#: ../src/modules/bluetooth/module-bluez4-device.c:2101
+#: ../src/modules/bluetooth/module-bluez5-device.c:1446
 msgid "Microphone"
 msgstr "Microfone"
 
-#: ../src/modules/alsa/alsa-mixer.c:2256 ../src/modules/alsa/alsa-mixer.c:2334
+#: ../src/modules/alsa/alsa-mixer.c:2257 ../src/modules/alsa/alsa-mixer.c:2335
 msgid "Front Microphone"
 msgstr "Microfone frontal"
 
-#: ../src/modules/alsa/alsa-mixer.c:2257 ../src/modules/alsa/alsa-mixer.c:2335
+#: ../src/modules/alsa/alsa-mixer.c:2258 ../src/modules/alsa/alsa-mixer.c:2336
 msgid "Rear Microphone"
 msgstr "Microfone posterior"
 
-#: ../src/modules/alsa/alsa-mixer.c:2258
+#: ../src/modules/alsa/alsa-mixer.c:2259
 msgid "External Microphone"
 msgstr "Microfone externo"
 
-#: ../src/modules/alsa/alsa-mixer.c:2259 ../src/modules/alsa/alsa-mixer.c:2337
+#: ../src/modules/alsa/alsa-mixer.c:2260 ../src/modules/alsa/alsa-mixer.c:2338
 msgid "Internal Microphone"
 msgstr "Microfone interno"
 
-#: ../src/modules/alsa/alsa-mixer.c:2260 ../src/modules/alsa/alsa-mixer.c:2340
+#: ../src/modules/alsa/alsa-mixer.c:2261 ../src/modules/alsa/alsa-mixer.c:2341
 msgid "Radio"
 msgstr "R?dio"
 
-#: ../src/modules/alsa/alsa-mixer.c:2261 ../src/modules/alsa/alsa-mixer.c:2341
+#: ../src/modules/alsa/alsa-mixer.c:2262 ../src/modules/alsa/alsa-mixer.c:2342
 msgid "Video"
 msgstr "V?deo"
 
 # https://pt.wikipedia.org/wiki/Controle_autom%C3%A1tico_de_ganho
-#: ../src/modules/alsa/alsa-mixer.c:2262
+#: ../src/modules/alsa/alsa-mixer.c:2263
 msgid "Automatic Gain Control"
 msgstr "Controle autom?tico de ganho"
 
 # https://pt.wikipedia.org/wiki/Controle_autom%C3%A1tico_de_ganho
-#: ../src/modules/alsa/alsa-mixer.c:2263
+#: ../src/modules/alsa/alsa-mixer.c:2264
 msgid "No Automatic Gain Control"
 msgstr "Sem controle autom?tico de ganho"
 
 # Este contexto de Boost ? "refor?o" no ?udio, e n?o "impulso".
-#: ../src/modules/alsa/alsa-mixer.c:2264
+#: ../src/modules/alsa/alsa-mixer.c:2265
 msgid "Boost"
 msgstr "Refor?o"
 
 # Este contexto de Boost ? "refor?o" no ?udio, e n?o "impulso".
-#: ../src/modules/alsa/alsa-mixer.c:2265
+#: ../src/modules/alsa/alsa-mixer.c:2266
 msgid "No Boost"
 msgstr "Sem refor?o"
 
-#: ../src/modules/alsa/alsa-mixer.c:2266
+#: ../src/modules/alsa/alsa-mixer.c:2267
 msgid "Amplifier"
 msgstr "Amplificador"
 
-#: ../src/modules/alsa/alsa-mixer.c:2267
+#: ../src/modules/alsa/alsa-mixer.c:2268
 msgid "No Amplifier"
 msgstr "Sem amplificador"
 
 # Este contexto de Boost ? "refor?o" no ?udio, e n?o "impulso".
-#: ../src/modules/alsa/alsa-mixer.c:2268
+#: ../src/modules/alsa/alsa-mixer.c:2269
 msgid "Bass Boost"
 msgstr "Refor?o de graves"
 
 # Este contexto de Boost ? "refor?o" no ?udio, e n?o "impulso".
-#: ../src/modules/alsa/alsa-mixer.c:2269
+#: ../src/modules/alsa/alsa-mixer.c:2270
 msgid "No Bass Boost"
 msgstr "Sem refor?o de graves"
 
-#: ../src/modules/alsa/alsa-mixer.c:2270
-#: ../src/modules/bluetooth/module-bluez4-device.c:2102
-#: ../src/modules/bluetooth/module-bluez5-device.c:1454
+#: ../src/modules/alsa/alsa-mixer.c:2271
+#: ../src/modules/bluetooth/module-bluez4-device.c:2106
+#: ../src/modules/bluetooth/module-bluez5-device.c:1453
 msgid "Speaker"
 msgstr "Auto-falante"
 
-#: ../src/modules/alsa/alsa-mixer.c:2271 ../src/modules/alsa/alsa-mixer.c:2343
+#: ../src/modules/alsa/alsa-mixer.c:2272 ../src/modules/alsa/alsa-mixer.c:2344
 msgid "Headphones"
 msgstr "Fones de ouvidos"
 
-#: ../src/modules/alsa/alsa-mixer.c:2332
+#: ../src/modules/alsa/alsa-mixer.c:2333
 msgid "Analog Input"
 msgstr "Entrada anal?gica"
 
-#: ../src/modules/alsa/alsa-mixer.c:2336
+#: ../src/modules/alsa/alsa-mixer.c:2337
 msgid "Dock Microphone"
 msgstr "Microfone de base de encaixe"
 
-#: ../src/modules/alsa/alsa-mixer.c:2338
+#: ../src/modules/alsa/alsa-mixer.c:2339
 msgid "Headset Microphone"
 msgstr "Microfone de headset"
 
-#: ../src/modules/alsa/alsa-mixer.c:2342
+#: ../src/modules/alsa/alsa-mixer.c:2343
 msgid "Analog Output"
 msgstr "Sa?da anal?gica"
 
-#: ../src/modules/alsa/alsa-mixer.c:2344
+#: ../src/modules/alsa/alsa-mixer.c:2345
 msgid "LFE on Separate Mono Output"
 msgstr "Sa?da monof?nica separada em LFE"
 
-#: ../src/modules/alsa/alsa-mixer.c:2345
+#: ../src/modules/alsa/alsa-mixer.c:2346
 msgid "Line Out"
 msgstr "Sa?da de linha"
 
-#: ../src/modules/alsa/alsa-mixer.c:2346
+#: ../src/modules/alsa/alsa-mixer.c:2347
 msgid "Analog Mono Output"
 msgstr "Sa?da anal?gica monof?nica"
 
-#: ../src/modules/alsa/alsa-mixer.c:2347
+#: ../src/modules/alsa/alsa-mixer.c:2348
 msgid "Speakers"
 msgstr "Alto-falantes"
 
-#: ../src/modules/alsa/alsa-mixer.c:2348
+#: ../src/modules/alsa/alsa-mixer.c:2349
 msgid "HDMI / DisplayPort"
 msgstr "HDMI / DisplayPort"
 
-#: ../src/modules/alsa/alsa-mixer.c:2349
+#: ../src/modules/alsa/alsa-mixer.c:2350
 msgid "Digital Output (S/PDIF)"
 msgstr "Sa?da digital (S/PDIF)"
 
-#: ../src/modules/alsa/alsa-mixer.c:2350
+#: ../src/modules/alsa/alsa-mixer.c:2351
 msgid "Digital Input (S/PDIF)"
 msgstr "Entrada digital (S/PDIF)"
 
-#: ../src/modules/alsa/alsa-mixer.c:2351
+#: ../src/modules/alsa/alsa-mixer.c:2352
 msgid "Digital Passthrough (S/PDIF)"
 msgstr "Conversor digital (S/PDIF)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3806
+#: ../src/modules/alsa/alsa-mixer.c:3807
 msgid "Analog Mono"
 msgstr "Monof?nico anal?gico"
 
-#: ../src/modules/alsa/alsa-mixer.c:3807
+#: ../src/modules/alsa/alsa-mixer.c:3808
 msgid "Analog Stereo"
 msgstr "Est?reo anal?gico"
 
-#: ../src/modules/alsa/alsa-mixer.c:3808
+#: ../src/modules/alsa/alsa-mixer.c:3809
 msgid "Analog Surround 2.1"
 msgstr "Surround anal?gico 2.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3809
+#: ../src/modules/alsa/alsa-mixer.c:3810
 msgid "Analog Surround 3.0"
 msgstr "Surround anal?gico 3.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3810
+#: ../src/modules/alsa/alsa-mixer.c:3811
 msgid "Analog Surround 3.1"
 msgstr "Surround anal?gico 3.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3811
+#: ../src/modules/alsa/alsa-mixer.c:3812
 msgid "Analog Surround 4.0"
 msgstr "Surround anal?gico 4.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3812
+#: ../src/modules/alsa/alsa-mixer.c:3813
 msgid "Analog Surround 4.1"
 msgstr "Surround anal?gico 4.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3813
+#: ../src/modules/alsa/alsa-mixer.c:3814
 msgid "Analog Surround 5.0"
 msgstr "Surround anal?gico 5.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3814
+#: ../src/modules/alsa/alsa-mixer.c:3815
 msgid "Analog Surround 5.1"
 msgstr "Surround anal?gico 5.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3815
+#: ../src/modules/alsa/alsa-mixer.c:3816
 msgid "Analog Surround 6.0"
 msgstr "Surround anal?gico 6.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3816
+#: ../src/modules/alsa/alsa-mixer.c:3817
 msgid "Analog Surround 6.1"
 msgstr "Surround anal?gico 6.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3817
+#: ../src/modules/alsa/alsa-mixer.c:3818
 msgid "Analog Surround 7.0"
 msgstr "Surround anal?gico 7.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3818
+#: ../src/modules/alsa/alsa-mixer.c:3819
 msgid "Analog Surround 7.1"
 msgstr "Surround anal?gico 7.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3819
+#: ../src/modules/alsa/alsa-mixer.c:3820
 msgid "Analog 4-channel Input"
 msgstr "Entrada anal?gica de 4 canais"
 
-#: ../src/modules/alsa/alsa-mixer.c:3820
+#: ../src/modules/alsa/alsa-mixer.c:3821
 msgid "Digital Stereo (IEC958)"
 msgstr "Est?reo digital (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3821
+#: ../src/modules/alsa/alsa-mixer.c:3822
 msgid "Digital Passthrough  (IEC958)"
 msgstr "Conversor digital (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3822
+#: ../src/modules/alsa/alsa-mixer.c:3823
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "Surround digital 4.0 (IEC958/AC3)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3823
+#: ../src/modules/alsa/alsa-mixer.c:3824
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "Surround digital 5.1 (IEC958/AC3)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3824
+#: ../src/modules/alsa/alsa-mixer.c:3825
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "Surround digital 5.1 (IEC958/DTS)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3825
+#: ../src/modules/alsa/alsa-mixer.c:3826
 msgid "Digital Stereo (HDMI)"
 msgstr "Est?reo digital (HDMI)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3826
+#: ../src/modules/alsa/alsa-mixer.c:3827
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "Surround digital 5.1 (HDMI)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3955
+#: ../src/modules/alsa/alsa-mixer.c:3956
 msgid "Analog Mono Duplex"
 msgstr "Duplex monof?nico anal?gico"
 
-#: ../src/modules/alsa/alsa-mixer.c:3956
+#: ../src/modules/alsa/alsa-mixer.c:3957
 msgid "Analog Stereo Duplex"
 msgstr "Duplex est?reo anal?gico"
 
-#: ../src/modules/alsa/alsa-mixer.c:3957
+#: ../src/modules/alsa/alsa-mixer.c:3958
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "Duplex est?reo digital (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3958
+#: ../src/modules/alsa/alsa-mixer.c:3959
 #: ../src/modules/alsa/module-alsa-card.c:193
-#: ../src/modules/bluetooth/module-bluez4-device.c:2293
-#: ../src/modules/bluetooth/module-bluez5-device.c:1652
+#: ../src/modules/bluetooth/module-bluez4-device.c:2297
+#: ../src/modules/bluetooth/module-bluez5-device.c:1649
 msgid "Off"
 msgstr "Desligado"
 
-#: ../src/modules/alsa/alsa-mixer.c:4057
+#: ../src/modules/alsa/alsa-mixer.c:4058
 #, c-format
 msgid "%s Output"
 msgstr "Sa?da de %s"
 
-#: ../src/modules/alsa/alsa-mixer.c:4065
+#: ../src/modules/alsa/alsa-mixer.c:4066
 #, c-format
 msgid "%s Input"
 msgstr "Entrada de %s"
@@ -1036,7 +1036,7 @@ msgstr ""
 "N?s fomos acordados com o conjunto POLLIN -- entretanto, a snd_pcm_avail() "
 "subsequente retornou 0 ou outro valor < min_avail."
 
-#: ../src/modules/alsa/alsa-util.c:1128 ../src/modules/alsa/alsa-util.c:1203
+#: ../src/modules/alsa/alsa-util.c:1135 ../src/modules/alsa/alsa-util.c:1210
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
@@ -1049,7 +1049,7 @@ msgstr ""
 "? mais prov?vel que isso seja um erro no driver \"%s\" do ALSA. Por favor, "
 "relate esse problema aos desenvolvedores do ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1178
+#: ../src/modules/alsa/alsa-util.c:1185
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
@@ -1062,7 +1062,7 @@ msgstr ""
 "? mais prov?vel que isso seja um erro no driver \"%s\" do ALSA. Por favor, "
 "relate esse problema aos desenvolvedores do ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1219
+#: ../src/modules/alsa/alsa-util.c:1226
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -1075,7 +1075,7 @@ msgstr ""
 "? mais prov?vel que isso seja um erro no driver \"%s\" do ALSA. Por favor, "
 "relate esse problema aos desenvolvedores do ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1262
+#: ../src/modules/alsa/alsa-util.c:1269
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
@@ -1089,80 +1089,78 @@ msgstr ""
 "relate esse problema aos desenvolvedores do ALSA."
 
 # Fone de ouvido n?o se encaixa como tradu??o aqui, pois h? ou pode haver microfone junto.
-#: ../src/modules/bluetooth/module-bluez4-device.c:2087
-#: ../src/modules/bluetooth/module-bluez5-device.c:1437
+#: ../src/modules/bluetooth/module-bluez4-device.c:2091
+#: ../src/modules/bluetooth/module-bluez5-device.c:1436
 msgid "Headset"
 msgstr "Headset"
 
 # Desconhe?o tradu??o comum para esta palavra.
-#: ../src/modules/bluetooth/module-bluez4-device.c:2092
-#: ../src/modules/bluetooth/module-bluez5-device.c:1442
+#: ../src/modules/bluetooth/module-bluez4-device.c:2096
+#: ../src/modules/bluetooth/module-bluez5-device.c:1441
 msgid "Handsfree"
 msgstr "Handsfree"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2107
-#: ../src/modules/bluetooth/module-bluez5-device.c:1460
+#: ../src/modules/bluetooth/module-bluez4-device.c:2111
+#: ../src/modules/bluetooth/module-bluez5-device.c:1459
 msgid "Headphone"
 msgstr "Fones de ouvido"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2112
-#: ../src/modules/bluetooth/module-bluez5-device.c:1465
+#: ../src/modules/bluetooth/module-bluez4-device.c:2116
+#: ../src/modules/bluetooth/module-bluez5-device.c:1464
 msgid "Portable"
 msgstr "Port?til"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2117
-#: ../src/modules/bluetooth/module-bluez5-device.c:1470
+#: ../src/modules/bluetooth/module-bluez4-device.c:2121
+#: ../src/modules/bluetooth/module-bluez5-device.c:1469
 msgid "Car"
 msgstr "Carro"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2122
-#: ../src/modules/bluetooth/module-bluez5-device.c:1475
+#: ../src/modules/bluetooth/module-bluez4-device.c:2126
+#: ../src/modules/bluetooth/module-bluez5-device.c:1474
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2127
-#: ../src/modules/bluetooth/module-bluez5-device.c:1480
+#: ../src/modules/bluetooth/module-bluez4-device.c:2131
+#: ../src/modules/bluetooth/module-bluez5-device.c:1479
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2135
-#: ../src/modules/bluetooth/module-bluez5-device.c:1432
-#: ../src/modules/bluetooth/module-bluez5-device.c:1448
-#: ../src/modules/bluetooth/module-bluez5-device.c:1486
+#: ../src/modules/bluetooth/module-bluez4-device.c:2139
+#: ../src/modules/bluetooth/module-bluez5-device.c:1431
+#: ../src/modules/bluetooth/module-bluez5-device.c:1447
+#: ../src/modules/bluetooth/module-bluez5-device.c:1485
 msgid "Bluetooth Output"
 msgstr "Sa?da Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2138
-#: ../src/modules/bluetooth/module-bluez5-device.c:1431
-#: ../src/modules/bluetooth/module-bluez5-device.c:1453
-#: ../src/modules/bluetooth/module-bluez5-device.c:1459
-#: ../src/modules/bluetooth/module-bluez5-device.c:1485
+#: ../src/modules/bluetooth/module-bluez4-device.c:2142
+#: ../src/modules/bluetooth/module-bluez5-device.c:1430
+#: ../src/modules/bluetooth/module-bluez5-device.c:1452
+#: ../src/modules/bluetooth/module-bluez5-device.c:1458
+#: ../src/modules/bluetooth/module-bluez5-device.c:1484
 msgid "Bluetooth Input"
 msgstr "Entrada Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2174
+#: ../src/modules/bluetooth/module-bluez4-device.c:2178
 msgid "High Fidelity Playback (A2DP)"
 msgstr "Reprodu??o de alta fidelidade (A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2185
+#: ../src/modules/bluetooth/module-bluez4-device.c:2189
 msgid "High Fidelity Capture (A2DP)"
 msgstr "Captura de alta fidelidade (A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2196
+#: ../src/modules/bluetooth/module-bluez4-device.c:2200
 msgid "Telephony Duplex (HSP/HFP)"
 msgstr "Duplex telef?nico (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2208
+#: ../src/modules/bluetooth/module-bluez4-device.c:2212
 msgid "Handsfree Gateway"
 msgstr "Gateway de handsfree"
 
-#. TODO: Change this profile's name to a2dp_sink, to reflect the remote
-#. * device's role and be consistent with the a2dp source profile
-#: ../src/modules/bluetooth/module-bluez5-device.c:1525
+#: ../src/modules/bluetooth/module-bluez5-device.c:1522
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Reprodu??o de alta fidelidade (Destino A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1536
+#: ../src/modules/bluetooth/module-bluez5-device.c:1533
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Captura de alta fidelidade (Fonte A2DP)"
 
@@ -1272,14 +1270,14 @@ msgstr "?udio em @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
-#: ../src/modules/module-tunnel-sink-new.c:286
-#: ../src/modules/module-tunnel-source-new.c:287
+#: ../src/modules/module-tunnel-sink-new.c:293
+#: ../src/modules/module-tunnel-source-new.c:294
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "T?nel para %s@%s"
 
-#: ../src/modules/module-tunnel-sink-new.c:474
-#: ../src/modules/module-tunnel-source-new.c:477
+#: ../src/modules/module-tunnel-sink-new.c:483
+#: ../src/modules/module-tunnel-source-new.c:485
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "T?nel para %s/%s"
@@ -1306,7 +1304,7 @@ msgstr ""
 msgid "PulseAudio Sound Server"
 msgstr "Servidor de som PulseAudio"
 
-#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:756
+#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:760
 msgid "Mono"
 msgstr "Mono"
 
@@ -1510,84 +1508,103 @@ msgstr "Posterior superior esquerdo"
 msgid "Top Rear Right"
 msgstr "Posterior superior direito"
 
-#: ../src/pulse/channelmap.c:483 ../src/pulse/format.c:122
-#: ../src/pulse/sample.c:169 ../src/pulse/volume.c:297
-#: ../src/pulse/volume.c:323 ../src/pulse/volume.c:343
-#: ../src/pulse/volume.c:375 ../src/pulse/volume.c:415
-#: ../src/pulse/volume.c:434
+#: ../src/pulse/channelmap.c:481 ../src/pulse/format.c:123
+#: ../src/pulse/sample.c:177 ../src/pulse/volume.c:296
+#: ../src/pulse/volume.c:322 ../src/pulse/volume.c:342
+#: ../src/pulse/volume.c:374 ../src/pulse/volume.c:414
+#: ../src/pulse/volume.c:433
 msgid "(invalid)"
 msgstr "(Inv?lido)"
 
-#: ../src/pulse/channelmap.c:760
+#: ../src/pulse/channelmap.c:764
 msgid "Stereo"
 msgstr "Est?reo"
 
-#: ../src/pulse/channelmap.c:765
+#: ../src/pulse/channelmap.c:769
 msgid "Surround 4.0"
 msgstr "Surround 4.0"
 
-#: ../src/pulse/channelmap.c:771
+#: ../src/pulse/channelmap.c:775
 msgid "Surround 4.1"
 msgstr "Surround 4.1"
 
-#: ../src/pulse/channelmap.c:777
+#: ../src/pulse/channelmap.c:781
 msgid "Surround 5.0"
 msgstr "Surround 5.0"
 
-#: ../src/pulse/channelmap.c:783
+#: ../src/pulse/channelmap.c:787
 msgid "Surround 5.1"
 msgstr "Surround 5.1"
 
-#: ../src/pulse/channelmap.c:790
+#: ../src/pulse/channelmap.c:794
 msgid "Surround 7.1"
 msgstr "Surround 7.1"
 
-#: ../src/pulse/client-conf.c:119
-#, c-format
-msgid "Failed to open configuration file '%s': %s"
-msgstr "Falha em abrir o arquivo de configura??o \"%s\": %s"
-
-#: ../src/pulse/client-conf.c:213 ../src/pulse/client-conf-x11.c:95
-msgid "Failed to parse cookie data"
-msgstr "Falha ao analisar os dados do cookie"
-
-#: ../src/pulse/client-conf-x11.c:54 ../src/utils/pax11publish.c:99
+#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:99
 msgid "xcb_connect() failed"
 msgstr "xcb_connect() falhou"
 
-#: ../src/pulse/client-conf-x11.c:59 ../src/utils/pax11publish.c:104
+#: ../src/pulse/client-conf-x11.c:60 ../src/utils/pax11publish.c:104
 msgid "xcb_connection_has_error() returned true"
 msgstr "xcb_connection_has_error() retornou verdadeiro"
 
-#: ../src/pulse/context.c:528
+#: ../src/pulse/client-conf-x11.c:96
+msgid "Failed to parse cookie data"
+msgstr "Falha ao analisar os dados do cookie"
+
+#: ../src/pulse/context.c:522
 msgid "No cookie loaded. Attempting to connect without."
 msgstr "Nenhum cookie foi carregado. Tentativa de conex?o sem eles."
 
-#: ../src/pulse/context.c:609
+#: ../src/pulse/context.c:603
 #, c-format
 msgid "fork(): %s"
 msgstr "fork(): %s"
 
-#: ../src/pulse/context.c:664
+#: ../src/pulse/context.c:658
 #, c-format
 msgid "waitpid(): %s"
 msgstr "waitpid(): %s"
 
-#: ../src/pulse/context.c:1365
+#: ../src/pulse/context.c:1359
 #, c-format
 msgid "Received message for unknown extension '%s'"
 msgstr "Foi recebida uma mensagem para uma extens?o desconhecida \"%s\""
 
-#: ../src/pulsecore/lock-autospawn.c:136 ../src/pulsecore/lock-autospawn.c:222
+#: ../src/pulse/direction.c:39
+msgid "input"
+msgstr "entrada"
+
+#: ../src/pulse/direction.c:41
+msgid "output"
+msgstr "sa?da"
+
+#: ../src/pulse/direction.c:43
+msgid "bidirectional"
+msgstr "bidirecional"
+
+#: ../src/pulse/direction.c:45
+msgid "invalid"
+msgstr "inv?lido"
+
+#: ../src/pulsecore/core-util.h:95
+msgid "yes"
+msgstr "sim"
+
+#: ../src/pulsecore/core-util.h:95
+msgid "no"
+msgstr "n?o"
+
+#: ../src/pulsecore/lock-autospawn.c:143 ../src/pulsecore/lock-autospawn.c:229
 msgid "Cannot access autospawn lock."
 msgstr "N?o foi poss?vel acessar a trava de autogera??o."
 
-#: ../src/pulsecore/log.c:136
+#: ../src/pulsecore/log.c:155
 #, c-format
 msgid "Failed to open target file '%s'."
 msgstr "Falha ao abrir o arquivo alvo \"%s\"."
 
-#: ../src/pulsecore/log.c:159
+#: ../src/pulsecore/log.c:178
 #, c-format
 msgid ""
 "Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
@@ -1595,15 +1612,15 @@ msgstr ""
 "Tentado abrir arquivo alvo \"%s\", \"%s.1\", \"%s.2\" ... \"%s.%d\", mas "
 "tudo falhou."
 
-#: ../src/pulsecore/log.c:580
+#: ../src/pulsecore/log.c:633
 msgid "Invalid log target."
 msgstr "Alvo do log inv?lido."
 
-#: ../src/pulsecore/sink.c:3475
+#: ../src/pulsecore/sink.c:3424
 msgid "Built-in Audio"
 msgstr "?udio interno"
 
-#: ../src/pulsecore/sink.c:3480
+#: ../src/pulsecore/sink.c:3429
 msgid "Modem"
 msgstr "Modem"
 
@@ -1715,27 +1732,27 @@ msgstr "Erro de entrada/sa?da"
 msgid "Device or resource busy"
 msgstr "Dispositivo ou recurso ocupado"
 
-#: ../src/pulse/sample.c:171
+#: ../src/pulse/sample.c:179
 #, c-format
 msgid "%s %uch %uHz"
 msgstr "%s %uch %uHz"
 
-#: ../src/pulse/sample.c:183
+#: ../src/pulse/sample.c:191
 #, c-format
 msgid "%0.1f GiB"
 msgstr "%0.1f GB"
 
-#: ../src/pulse/sample.c:185
+#: ../src/pulse/sample.c:193
 #, c-format
 msgid "%0.1f MiB"
 msgstr "%0.1f MB"
 
-#: ../src/pulse/sample.c:187
+#: ../src/pulse/sample.c:195
 #, c-format
 msgid "%0.1f KiB"
 msgstr "%0.1f KB"
 
-#: ../src/pulse/sample.c:189
+#: ../src/pulse/sample.c:197
 #, c-format
 msgid "%u B"
 msgstr "%u B"
@@ -1867,8 +1884,8 @@ msgstr "Usando especifica??o de amostragem \"%s\", mapa de canais \"%s\"."
 
 #: ../src/utils/pacat.c:359
 #, c-format
-msgid "Connected to device %s (%u, %ssuspended)."
-msgstr "Conectado ao dispositivo %s (%u, %ssuspended)."
+msgid "Connected to device %s (index: %u, suspended: %s)."
+msgstr "Conectado ao dispositivo %s (?ndice: %u, suspenso: %s)."
 
 #: ../src/utils/pacat.c:369
 #, c-format
@@ -1955,7 +1972,7 @@ msgstr "Falha ao definir o fluxo de monitora??o: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() falhou: %s"
 
-#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1388
+#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1455
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Falha na conex?o: %s"
@@ -2024,16 +2041,16 @@ msgid ""
 "                                        (defaults to 2)\n"
 "      --channel-map=CHANNELMAP          Channel map to use instead of the "
 "default\n"
-"      --fix-format                      Take the sample format from the sink "
-"the stream is\n"
+"      --fix-format                      Take the sample format from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
-"      --fix-rate                        Take the sampling rate from the sink "
-"the stream is\n"
+"      --fix-rate                        Take the sampling rate from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
 "      --fix-channels                    Take the number of channels and the "
 "channel map\n"
-"                                        from the sink the stream is being "
-"connected to.\n"
+"                                        from the sink/source the stream is "
+"being connected to.\n"
 "      --no-remix                        Don't upmix or downmix channels.\n"
 "      --no-remap                        Map channels by index instead of "
 "name.\n"
@@ -2048,7 +2065,7 @@ msgid ""
 "      --property=PROPERTY=VALUE         Set the specified property to the "
 "specified value.\n"
 "      --raw                             Record/play raw PCM data.\n"
-"      --passthrough                     passthrough data \n"
+"      --passthrough                     Passthrough data.\n"
 "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
 "      --list-file-formats               List available file formats.\n"
 "      --monitor-stream=INDEX            Record from the sink input with "
@@ -2085,10 +2102,10 @@ msgstr ""
 "      --channel-map=MAPA_DE_CANAIS      Mapeamento de canais a ser usado no\n"
 "                                        lugar do padr?o\n"
 "      --fix-format                      Obt?m o formato da amostragem do\n"
-"                                        destino onde o fluxo est? sendo\n"
-"                                        conectado.\n"
+"                                        destino/fonte onde o fluxo est?\n"
+"                                        sendo conectado.\n"
 "      --fix-rate                        Obt?m a taxa de amostragem do "
-"destino\n"
+"destino/fonte\n"
 "                                        onde o fluxo est? sendo conectado.\n"
 "      --fix-channels                    Obt?m o n?mero de canais e o mapa "
 "de\n"
@@ -2115,7 +2132,7 @@ msgstr ""
 "      --raw                             Grava/reproduz dados PCM n?o "
 "tratados.\n"
 "      --passthrough                     Dados para convers?o.\n"
-"      --file-format[=FORMATO_DO_ARQ.]   Grava/reproduz dados PCM "
+"      --file-format[=FORMATO_ARQUIVO]   Grava/reproduz dados PCM "
 "formatados.\n"
 "      --list-file-formats               Lista formatos de arquivo "
 "dispon?veis.\n"
@@ -2133,7 +2150,7 @@ msgstr ""
 "Compilado com libpulse %s\n"
 "Vinculado com libpulse %s\n"
 
-#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1559
+#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1651
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nome do cliente \"%s\" inv?lido"
@@ -2206,7 +2223,7 @@ msgstr ""
 "Aviso: a especifica??o de amostragem especificada ser? sobrescrita pela "
 "especifica??o do arquivo."
 
-#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1626
+#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1718
 msgid "Failed to determine sample specification from file."
 msgstr "Falha ao determinar a especifica??o de amostragem a partir do arquivo."
 
@@ -2242,7 +2259,7 @@ msgstr "playback"
 msgid "Failed to set media name."
 msgstr "Falha ao definir o nome da m?dia."
 
-#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:1976
+#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:2068
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() falhou."
 
@@ -2250,11 +2267,11 @@ msgstr "pa_mainloop_new() falhou."
 msgid "io_new() failed."
 msgstr "io_new() falhou."
 
-#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:1988
+#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:2080
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() falhou."
 
-#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:1994
+#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:2086
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_new() falhou: %s"
@@ -2263,32 +2280,32 @@ msgstr "pa_context_new() falhou: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() falhou."
 
-#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:1999
+#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:2091
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() falhou."
 
-#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1481
+#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1573
 msgid "NAME [ARGS ...]"
 msgstr "NOME [ARGS ...]"
 
-#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1482
+#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1574
 msgid "NAME|#N"
 msgstr "NOME|#N"
 
-#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1480
-#: ../src/utils/pactl.c:1486
+#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1578
 msgid "NAME"
 msgstr "NOME"
 
-#: ../src/utils/pacmd.c:56 ../src/utils/pactl.c:1488
+#: ../src/utils/pacmd.c:56
 msgid "NAME|#N VOLUME"
 msgstr "NOME|#N VOLUME"
 
-#: ../src/utils/pacmd.c:57 ../src/utils/pactl.c:1489
+#: ../src/utils/pacmd.c:57
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
-#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1484
+#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1576
 msgid "NAME|#N 1|0"
 msgstr "NOME|#N 1|0"
 
@@ -2324,7 +2341,7 @@ msgstr "NOME_DE_CAMINHO"
 msgid "FILENAME SINK|#N"
 msgstr "NOME_DE_ARQUIVO DESTINO|#N"
 
-#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1483
+#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1575
 msgid "#N SINK|SOURCE"
 msgstr "#N DESTINO|FONTE"
 
@@ -2332,15 +2349,15 @@ msgstr "#N DESTINO|FONTE"
 msgid "1|0"
 msgstr "1|0"
 
-#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1485
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1577
 msgid "CARD PROFILE"
 msgstr "PLACA PERFIL"
 
-#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1487
+#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1579
 msgid "NAME|#N PORT"
 msgstr "NOME|#N PORTA"
 
-#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1493
+#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1585
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NOME-PLACA|PLACA-#N PORTA POSI??O"
 
@@ -2419,32 +2436,32 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
-#: ../src/utils/pactl.c:161
+#: ../src/utils/pactl.c:166
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Falha ao obter estat?sticas: %s"
 
-#: ../src/utils/pactl.c:167
+#: ../src/utils/pactl.c:172
 #, c-format
 msgid "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr "Em uso no momento: %u blocos contendo %s bytes no total.\n"
 
-#: ../src/utils/pactl.c:170
+#: ../src/utils/pactl.c:175
 #, c-format
 msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr "Alocado por todo o tempo: %u blocos contendo %s bytes no total.\n"
 
-#: ../src/utils/pactl.c:173
+#: ../src/utils/pactl.c:178
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Tamanho do cache para amostragem: %s\n"
 
-#: ../src/utils/pactl.c:182
+#: ../src/utils/pactl.c:187
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Falha ao obter informa??es do servidor: %s"
 
-#: ../src/utils/pactl.c:187
+#: ../src/utils/pactl.c:192
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2461,7 +2478,7 @@ msgstr ""
 "?ndice do cliente: %u\n"
 "Tamanho de fragmento: %zu\n"
 
-#: ../src/utils/pactl.c:203
+#: ../src/utils/pactl.c:208
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2484,12 +2501,12 @@ msgstr ""
 "Fonte padr?o: %s\n"
 "Cookie: %04x:%04x\n"
 
-#: ../src/utils/pactl.c:252 ../src/utils/pactl.c:878 ../src/utils/pactl.c:952
+#: ../src/utils/pactl.c:257 ../src/utils/pactl.c:902 ../src/utils/pactl.c:980
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Falha ao obter informa??es do destino: %s"
 
-#: ../src/utils/pactl.c:278
+#: ../src/utils/pactl.c:283
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2528,27 +2545,27 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:322 ../src/utils/pactl.c:428 ../src/utils/pactl.c:589
+#: ../src/utils/pactl.c:327 ../src/utils/pactl.c:433 ../src/utils/pactl.c:594
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortas:\n"
 
-#: ../src/utils/pactl.c:329 ../src/utils/pactl.c:435
+#: ../src/utils/pactl.c:334 ../src/utils/pactl.c:440
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPorta ativa: %s\n"
 
-#: ../src/utils/pactl.c:335 ../src/utils/pactl.c:441
+#: ../src/utils/pactl.c:340 ../src/utils/pactl.c:446
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormatos:\n"
 
-#: ../src/utils/pactl.c:359 ../src/utils/pactl.c:897 ../src/utils/pactl.c:967
+#: ../src/utils/pactl.c:364 ../src/utils/pactl.c:922 ../src/utils/pactl.c:995
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Falha ao obter informa??es da fonte: %s"
 
-#: ../src/utils/pactl.c:385
+#: ../src/utils/pactl.c:390
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2587,20 +2604,20 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:413 ../src/utils/pactl.c:483 ../src/utils/pactl.c:526
-#: ../src/utils/pactl.c:568 ../src/utils/pactl.c:666 ../src/utils/pactl.c:667
-#: ../src/utils/pactl.c:678 ../src/utils/pactl.c:736 ../src/utils/pactl.c:737
-#: ../src/utils/pactl.c:748 ../src/utils/pactl.c:799 ../src/utils/pactl.c:800
-#: ../src/utils/pactl.c:806
+#: ../src/utils/pactl.c:418 ../src/utils/pactl.c:488 ../src/utils/pactl.c:531
+#: ../src/utils/pactl.c:573 ../src/utils/pactl.c:671 ../src/utils/pactl.c:672
+#: ../src/utils/pactl.c:683 ../src/utils/pactl.c:741 ../src/utils/pactl.c:742
+#: ../src/utils/pactl.c:753 ../src/utils/pactl.c:804 ../src/utils/pactl.c:805
+#: ../src/utils/pactl.c:811
 msgid "n/a"
 msgstr "n/d"
 
-#: ../src/utils/pactl.c:452 ../src/utils/pactl.c:853
+#: ../src/utils/pactl.c:457 ../src/utils/pactl.c:861
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Falha ao obter informa??es do m?dulo: %s"
 
-#: ../src/utils/pactl.c:475
+#: ../src/utils/pactl.c:480
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2617,12 +2634,12 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:494
+#: ../src/utils/pactl.c:499
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Falha ao obter informa??es do cliente: %s"
 
-#: ../src/utils/pactl.c:520
+#: ../src/utils/pactl.c:525
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2637,12 +2654,12 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:537
+#: ../src/utils/pactl.c:542
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Falha ao obter informa??es da placa: %s"
 
-#: ../src/utils/pactl.c:560
+#: ../src/utils/pactl.c:565
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2659,17 +2676,17 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:576
+#: ../src/utils/pactl.c:581
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tPerfis:\n"
 
-#: ../src/utils/pactl.c:583
+#: ../src/utils/pactl.c:588
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tPerfil ativo: %s\n"
 
-#: ../src/utils/pactl.c:597
+#: ../src/utils/pactl.c:602
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2678,17 +2695,17 @@ msgstr ""
 "\t\t\tPropriedades:\n"
 "\t\t\t\t%s\n"
 
-#: ../src/utils/pactl.c:602
+#: ../src/utils/pactl.c:607
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tParte de perfil/perfis: %s"
 
-#: ../src/utils/pactl.c:619 ../src/utils/pactl.c:916 ../src/utils/pactl.c:982
+#: ../src/utils/pactl.c:624 ../src/utils/pactl.c:942 ../src/utils/pactl.c:1010
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Falha ao obter informa??es da entrada do destino: %s"
 
-#: ../src/utils/pactl.c:648
+#: ../src/utils/pactl.c:653
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2727,12 +2744,12 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:689 ../src/utils/pactl.c:935 ../src/utils/pactl.c:997
+#: ../src/utils/pactl.c:694 ../src/utils/pactl.c:962 ../src/utils/pactl.c:1025
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Falha ao obter informa??es da sa?da da fonte: %s"
 
-#: ../src/utils/pactl.c:718
+#: ../src/utils/pactl.c:723
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2771,12 +2788,12 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:759
+#: ../src/utils/pactl.c:764
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Falha ao obter informa??es sobre a amostragem: %s"
 
-#: ../src/utils/pactl.c:786
+#: ../src/utils/pactl.c:791
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2805,134 +2822,163 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:814 ../src/utils/pactl.c:824
+#: ../src/utils/pactl.c:819 ../src/utils/pactl.c:829
 #, c-format
 msgid "Failure: %s"
 msgstr "Falha: %s"
 
-#: ../src/utils/pactl.c:860
+#: ../src/utils/pactl.c:868
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Falha ao descarregar o m?dulo: m?dulo %s n?o carregado"
 
-#: ../src/utils/pactl.c:1023
+#: ../src/utils/pactl.c:886
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel/s supported = %d\n"
+msgstr ""
+"Falha ao definir volume: Voc? tentou definir volumes para %d canais, havendo "
+"suporte a %d canais\n"
+
+#: ../src/utils/pactl.c:1052
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Falha ao definir formato: string %s de formato inv?lida"
 
-#: ../src/utils/pactl.c:1062
+#: ../src/utils/pactl.c:1095
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Falha ao enviar a amostragem: %s"
 
-#: ../src/utils/pactl.c:1079
+#: ../src/utils/pactl.c:1112
 msgid "Premature end of file"
 msgstr "Fim prematuro do arquivo"
 
-#: ../src/utils/pactl.c:1099
+#: ../src/utils/pactl.c:1132
 msgid "new"
 msgstr "novo"
 
-#: ../src/utils/pactl.c:1102
+#: ../src/utils/pactl.c:1135
 msgid "change"
 msgstr "alterar"
 
-#: ../src/utils/pactl.c:1105
+#: ../src/utils/pactl.c:1138
 msgid "remove"
 msgstr "remover"
 
-#: ../src/utils/pactl.c:1108 ../src/utils/pactl.c:1143
+#: ../src/utils/pactl.c:1141 ../src/utils/pactl.c:1176
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../src/utils/pactl.c:1116
+#: ../src/utils/pactl.c:1149
 msgid "sink"
 msgstr "destino"
 
-#: ../src/utils/pactl.c:1119
+#: ../src/utils/pactl.c:1152
 msgid "source"
 msgstr "fonte"
 
-#: ../src/utils/pactl.c:1122
+#: ../src/utils/pactl.c:1155
 msgid "sink-input"
 msgstr "entrada-destino"
 
-#: ../src/utils/pactl.c:1125
+#: ../src/utils/pactl.c:1158
 msgid "source-output"
 msgstr "sa?da-fonte"
 
-#: ../src/utils/pactl.c:1128
+#: ../src/utils/pactl.c:1161
 msgid "module"
 msgstr "m?dulo"
 
-#: ../src/utils/pactl.c:1131
+#: ../src/utils/pactl.c:1164
 msgid "client"
 msgstr "cliente"
 
-#: ../src/utils/pactl.c:1134
+#: ../src/utils/pactl.c:1167
 msgid "sample-cache"
 msgstr "cache-amostragem"
 
-#: ../src/utils/pactl.c:1137 ../src/utils/pactl.c:1140
+#: ../src/utils/pactl.c:1170
 msgid "server"
 msgstr "servidor"
 
-#: ../src/utils/pactl.c:1149
+#: ../src/utils/pactl.c:1173
+msgid "card"
+msgstr "placa"
+
+#: ../src/utils/pactl.c:1182
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Evento \"%s\" em %s #%u\n"
 
-#: ../src/utils/pactl.c:1394
+#: ../src/utils/pactl.c:1461
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT recebido, saindo."
 
-#: ../src/utils/pactl.c:1421
+#: ../src/utils/pactl.c:1488
 msgid "Invalid volume specification"
 msgstr "Especifica??o de volume inv?lida"
 
-#: ../src/utils/pactl.c:1444
+#: ../src/utils/pactl.c:1511
 msgid "Volume outside permissible range.\n"
 msgstr "Volume fora da faixa admiss?vel.\n"
 
-#: ../src/utils/pactl.c:1474 ../src/utils/pactl.c:1475
-#: ../src/utils/pactl.c:1476 ../src/utils/pactl.c:1477
-#: ../src/utils/pactl.c:1478 ../src/utils/pactl.c:1479
-#: ../src/utils/pactl.c:1480 ../src/utils/pactl.c:1481
-#: ../src/utils/pactl.c:1482 ../src/utils/pactl.c:1483
-#: ../src/utils/pactl.c:1484 ../src/utils/pactl.c:1485
-#: ../src/utils/pactl.c:1486 ../src/utils/pactl.c:1487
-#: ../src/utils/pactl.c:1488 ../src/utils/pactl.c:1489
-#: ../src/utils/pactl.c:1490 ../src/utils/pactl.c:1491
-#: ../src/utils/pactl.c:1492 ../src/utils/pactl.c:1493
-#: ../src/utils/pactl.c:1494
+#: ../src/utils/pactl.c:1524
+msgid "Invalid number of volume specifications.\n"
+msgstr "N?mero de especifica??es de volume inv?lido.\n"
+
+#: ../src/utils/pactl.c:1536
+msgid "Inconsistent volume specification.\n"
+msgstr "Especifica??o de volume inconsistente.\n"
+
+#: ../src/utils/pactl.c:1566 ../src/utils/pactl.c:1567
+#: ../src/utils/pactl.c:1568 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1570 ../src/utils/pactl.c:1571
+#: ../src/utils/pactl.c:1572 ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1574 ../src/utils/pactl.c:1575
+#: ../src/utils/pactl.c:1576 ../src/utils/pactl.c:1577
+#: ../src/utils/pactl.c:1578 ../src/utils/pactl.c:1579
+#: ../src/utils/pactl.c:1580 ../src/utils/pactl.c:1581
+#: ../src/utils/pactl.c:1582 ../src/utils/pactl.c:1583
+#: ../src/utils/pactl.c:1584 ../src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1586
 msgid "[options]"
 msgstr "[op??es]"
 
-#: ../src/utils/pactl.c:1476
+#: ../src/utils/pactl.c:1568
 msgid "[TYPE]"
 msgstr "[TIPO]"
 
-#: ../src/utils/pactl.c:1478
+#: ../src/utils/pactl.c:1570
 msgid "FILENAME [NAME]"
 msgstr "NOME_DE_ARQUIVO [NOME]"
 
-#: ../src/utils/pactl.c:1479
+#: ../src/utils/pactl.c:1571
 msgid "NAME [SINK]"
 msgstr "NOME [DESTINO]"
 
-#: ../src/utils/pactl.c:1490
+#: ../src/utils/pactl.c:1580
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NOME|#N VOLUME [VOLUME ...]"
+
+#: ../src/utils/pactl.c:1581
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLUME [VOLUME ...]"
+
+#: ../src/utils/pactl.c:1582
 msgid "NAME|#N 1|0|toggle"
 msgstr "NOME|#N 1|0|toggle"
 
-#: ../src/utils/pactl.c:1491
+#: ../src/utils/pactl.c:1583
 msgid "#N 1|0|toggle"
 msgstr "#N 1|0|toggle"
 
-#: ../src/utils/pactl.c:1492
+#: ../src/utils/pactl.c:1584
 msgid "#N FORMATS"
 msgstr "#N FORMATOS"
 
-#: ../src/utils/pactl.c:1495
+#: ../src/utils/pactl.c:1587
 #, c-format
 msgid ""
 "\n"
@@ -2944,7 +2990,7 @@ msgstr ""
 "podem ser usados para especificar o destino, a fonte e a monitora??o "
 "padr?o.\n"
 
-#: ../src/utils/pactl.c:1498
+#: ../src/utils/pactl.c:1590
 #, c-format
 msgid ""
 "\n"
@@ -2964,7 +3010,7 @@ msgstr ""
 "  -n, --client-name=NOME                Como chamar este cliente no "
 "servidor\n"
 
-#: ../src/utils/pactl.c:1539
+#: ../src/utils/pactl.c:1631
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2975,60 +3021,60 @@ msgstr ""
 "Compilado com libpulse %s\n"
 "Vinculado com libpulse %s\n"
 
-#: ../src/utils/pactl.c:1598
+#: ../src/utils/pactl.c:1690
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Especifique nada ou uma de: %s"
 
-#: ../src/utils/pactl.c:1608
+#: ../src/utils/pactl.c:1700
 msgid "Please specify a sample file to load"
 msgstr "Por favor, especifique um arquivo de amostragem a ser carregado"
 
-#: ../src/utils/pactl.c:1621
+#: ../src/utils/pactl.c:1713
 msgid "Failed to open sound file."
 msgstr "Falha ao abrir o arquivo de som."
 
-#: ../src/utils/pactl.c:1633
+#: ../src/utils/pactl.c:1725
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Aviso: Falha ao determinar a especifica??o da amostragem a partir do arquivo."
 
-#: ../src/utils/pactl.c:1643
+#: ../src/utils/pactl.c:1735
 msgid "You have to specify a sample name to play"
 msgstr "Voc? deve especificar um nome para amostra a ser reproduzida"
 
-#: ../src/utils/pactl.c:1655
+#: ../src/utils/pactl.c:1747
 msgid "You have to specify a sample name to remove"
 msgstr "Voc? deve especificar um nome para a amostra a ser removida"
 
-#: ../src/utils/pactl.c:1664
+#: ../src/utils/pactl.c:1756
 msgid "You have to specify a sink input index and a sink"
 msgstr "Voc? deve especificar a entrada do destino e um destino"
 
-#: ../src/utils/pactl.c:1674
+#: ../src/utils/pactl.c:1766
 msgid "You have to specify a source output index and a source"
 msgstr "Voc? deve especificar um ?ndice de sa?da da fonte e uma fonte"
 
-#: ../src/utils/pactl.c:1689
+#: ../src/utils/pactl.c:1781
 msgid "You have to specify a module name and arguments."
 msgstr "Voc? deve especificar um nome para o m?dulo e seus argumentos."
 
-#: ../src/utils/pactl.c:1709
+#: ../src/utils/pactl.c:1801
 msgid "You have to specify a module index or name"
 msgstr "Voc? deve especificar um nome ou ?ndice do m?dulo"
 
-#: ../src/utils/pactl.c:1722
+#: ../src/utils/pactl.c:1814
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Voc? n?o pode especificar mais de um destino. Voc? deve especificar um valor "
 "booleano."
 
-#: ../src/utils/pactl.c:1727 ../src/utils/pactl.c:1747
+#: ../src/utils/pactl.c:1819 ../src/utils/pactl.c:1839
 msgid "Invalid suspend specification."
 msgstr "Especifica??o de suspens?o inv?lida."
 
-#: ../src/utils/pactl.c:1742
+#: ../src/utils/pactl.c:1834
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3036,83 +3082,83 @@ msgstr ""
 "Voc? n?o pode especificar mais de uma fonte. Voc? deve especificar um valor "
 "booleano."
 
-#: ../src/utils/pactl.c:1759
+#: ../src/utils/pactl.c:1851
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Voc? deve especificar um nome/?ndice para a placa e um nome de perfil"
 
-#: ../src/utils/pactl.c:1770
+#: ../src/utils/pactl.c:1862
 msgid "You have to specify a sink name/index and a port name"
 msgstr "Voc? deve especificar um nome/?ndice do destino e o nome da porta"
 
-#: ../src/utils/pactl.c:1781
+#: ../src/utils/pactl.c:1873
 msgid "You have to specify a sink name"
 msgstr "Voc? deve especificar um nome de destino"
 
-#: ../src/utils/pactl.c:1791
+#: ../src/utils/pactl.c:1883
 msgid "You have to specify a source name/index and a port name"
 msgstr "Voc? deve especificar um nome/?ndice da fonte e o nome da porta"
 
-#: ../src/utils/pactl.c:1802
+#: ../src/utils/pactl.c:1894
 msgid "You have to specify a source name"
 msgstr "Voc? deve especificar um nome de fonte"
 
-#: ../src/utils/pactl.c:1812
+#: ../src/utils/pactl.c:1904
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Voc? deve especificar um nome/?ndice do destino e um volume"
 
-#: ../src/utils/pactl.c:1825
+#: ../src/utils/pactl.c:1917
 msgid "You have to specify a source name/index and a volume"
 msgstr "Voc? deve especificar um nome/?ndice da fonte e um volume"
 
-#: ../src/utils/pactl.c:1838
+#: ../src/utils/pactl.c:1930
 msgid "You have to specify a sink input index and a volume"
 msgstr "Voc? deve especificar um ?ndice de entrada para o destino e um volume"
 
-#: ../src/utils/pactl.c:1843
+#: ../src/utils/pactl.c:1935
 msgid "Invalid sink input index"
 msgstr "?ndice de entrada de destino inv?lido"
 
-#: ../src/utils/pactl.c:1854
+#: ../src/utils/pactl.c:1946
 msgid "You have to specify a source output index and a volume"
 msgstr "Voc? deve especificar um ?ndice de sa?da da fonte e um volume"
 
-#: ../src/utils/pactl.c:1859
+#: ../src/utils/pactl.c:1951
 msgid "Invalid source output index"
 msgstr "?ndice de sa?da de fonte inv?lido"
 
-#: ../src/utils/pactl.c:1870
+#: ../src/utils/pactl.c:1962
 msgid "You have to specify a sink name/index and a mute boolean"
 msgstr "Voc? deve especificar um nome/?ndice do destino e um booleano do mudo"
 
-#: ../src/utils/pactl.c:1875 ../src/utils/pactl.c:1890
-#: ../src/utils/pactl.c:1910 ../src/utils/pactl.c:1928
+#: ../src/utils/pactl.c:1967 ../src/utils/pactl.c:1982
+#: ../src/utils/pactl.c:2002 ../src/utils/pactl.c:2020
 msgid "Invalid mute specification"
 msgstr "Especifica??o de mudo inv?lida"
 
-#: ../src/utils/pactl.c:1885
+#: ../src/utils/pactl.c:1977
 msgid "You have to specify a source name/index and a mute boolean"
 msgstr "Voc? deve especificar um nome/?ndice da fonte e um booleano do mudo"
 
-#: ../src/utils/pactl.c:1900
+#: ../src/utils/pactl.c:1992
 msgid "You have to specify a sink input index and a mute boolean"
 msgstr ""
 "Voc? deve especificar um ?ndice de entrada para o destino e um booleano do "
 "mudo"
 
-#: ../src/utils/pactl.c:1905
+#: ../src/utils/pactl.c:1997
 msgid "Invalid sink input index specification"
 msgstr "Especifica??o do ?ndice de entrada de destino inv?lida"
 
-#: ../src/utils/pactl.c:1918
+#: ../src/utils/pactl.c:2010
 msgid "You have to specify a source output index and a mute boolean"
 msgstr ""
 "Voc? deve especificar um ?ndice da sa?da da fonte e um booleano do mudo"
 
-#: ../src/utils/pactl.c:1923
+#: ../src/utils/pactl.c:2015
 msgid "Invalid source output index specification"
 msgstr "Especifica??o do ?ndice de sa?da de fonte inv?lida"
 
-#: ../src/utils/pactl.c:1940
+#: ../src/utils/pactl.c:2032
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3120,17 +3166,17 @@ msgstr ""
 "Voc? deve especificar um ?ndice do destino e uma lista separada por ponto-e-"
 "v?rgulas de formatos aceitos"
 
-#: ../src/utils/pactl.c:1952
+#: ../src/utils/pactl.c:2044
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Voc? deve especificar nome/?ndice de uma placa, um nome de porta e uma "
 "mudan?a de lat?ncia"
 
-#: ../src/utils/pactl.c:1959
+#: ../src/utils/pactl.c:2051
 msgid "Could not parse latency offset"
 msgstr "N?o foi poss?vel analisar a mudan?a da lat?ncia"
 
-#: ../src/utils/pactl.c:1971
+#: ../src/utils/pactl.c:2063
 msgid "No valid command specified."
 msgstr "Nenhum comando v?lido especificado."
 
@@ -3275,31 +3321,37 @@ msgstr "Falha ao analisar os dados do cookie\n"
 msgid "Failed to save cookie data\n"
 msgstr "Falha ao salvar os dados do cookie\n"
 
-#: ../src/utils/pax11publish.c:156
-#, c-format
-msgid "Failed to load client configuration file.\n"
-msgstr "Falha ao carregar o arquivo de configura??o do cliente.\n"
-
-#: ../src/utils/pax11publish.c:161
-#, c-format
-msgid "Failed to read environment configuration data.\n"
-msgstr "Falha ao ler os dados de configura??o do ambiente.\n"
-
-#: ../src/utils/pax11publish.c:178
+#: ../src/utils/pax11publish.c:170
 #, c-format
 msgid "Failed to get FQDN.\n"
 msgstr "Falha ao obter FQDN.\n"
 
-#: ../src/utils/pax11publish.c:198
+#: ../src/utils/pax11publish.c:190
 #, c-format
 msgid "Failed to load cookie data\n"
 msgstr "Falha ao carregar os dados do cookie\n"
 
-#: ../src/utils/pax11publish.c:216
+#: ../src/utils/pax11publish.c:208
 #, c-format
 msgid "Not yet implemented.\n"
 msgstr "N?o implementado ainda.\n"
 
+#~ msgid "PulseAudio Sound System KDE Routing Policy"
+#~ msgstr "Pol?tica de roteamento do KDE para Sistema de som PulseAudio"
+
+#~ msgid "Start the PulseAudio Sound System with KDE Routing Policy"
+#~ msgstr ""
+#~ "Iniciar o sistema de som PulseAudio com pol?tica de roteamento do KDE"
+
+#~ msgid "Failed to open configuration file '%s': %s"
+#~ msgstr "Falha em abrir o arquivo de configura??o \"%s\": %s"
+
+#~ msgid "Failed to load client configuration file.\n"
+#~ msgstr "Falha ao carregar o arquivo de configura??o do cliente.\n"
+
+#~ msgid "Failed to read environment configuration data.\n"
+#~ msgstr "Falha ao ler os dados de configura??o do ambiente.\n"
+
 #~ msgid "Successfully dropped root privileges."
 #~ msgstr "Os privil?gios do root foram retirados com sucesso."
 
diff --git a/po/ru.po b/po/ru.po
index 3c44b0c..6ac08f1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 21:08+0400\n"
-"PO-Revision-Date: 2014-01-13 03:33+0200\n"
+"POT-Creation-Date: 2014-05-12 01:28+0400\n"
+"PO-Revision-Date: 2014-05-12 02:33+0400\n"
 "Last-Translator: Alexander Potashev <aspotashev at gmail.com>\n"
 "Language-Team: Russian <kde-russian at lists.kde.ru>\n"
 "Language: ru\n"
@@ -66,7 +66,7 @@ msgid ""
 "and\n"
 "                                        this time passed\n"
 "      --log-level[=LEVEL]               Increase or set verbosity level\n"
-"  -v                                    Increase the verbosity level\n"
+"  -v  --verbose                         Increase the verbosity level\n"
 "      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
 "                                        Specify the log target\n"
 "      --log-meta[=BOOL]                 Include code location in log "
@@ -142,7 +142,7 @@ msgstr ""
 "                                        ?????????? ??????? ???????.\n"
 "      --log-level[=???????]             ???????? ??? ?????????? ???????\n"
 "                                        ??????????? ??????????????.\n"
-"  -v                                    ???????? ??????? ???????????\n"
+"  -v  --verbose                         ???????? ??????? ???????????\n"
 "                                        ??????????????.\n"
 "      --log-target={auto,syslog,stderr,file:????,newfile:????}\n"
 "                                        ?????? ??????\n"
@@ -456,6 +456,7 @@ msgid "Failed to change UID: %s"
 msgstr "?? ??????? ???????? ????????????? ???????????? (UID): %s"
 
 # BUGME: gettext understands only single string constants. --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78564
 #: ../src/daemon/main.c:271
 msgid "Successfully changed user to \""
 msgstr "??????? ??????????? ????? ???????????? ?? ?"
@@ -525,23 +526,27 @@ msgstr ""
 "??????????. ??????? ??????? ????? ??????????."
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/daemon/main.c:726
 msgid "Running in system mode, but --disallow-exit not set!"
 msgstr "??????? ? ????????????? ??????, ?? ?--disallow-exit? ?? ?????."
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/daemon/main.c:729
 msgid "Running in system mode, but --disallow-module-loading not set!"
 msgstr ""
 "??????? ? ????????????? ??????, ?? ?--disallow-module-loading? ?? ?????."
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/daemon/main.c:732
 msgid "Running in system mode, forcibly disabling SHM mode!"
 msgstr ""
 "??????? ? ????????????? ??????, ??????? ????? SHM ????????????? ????????."
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/daemon/main.c:737
 msgid "Running in system mode, forcibly disabling exit idle time!"
 msgstr ""
@@ -641,6 +646,7 @@ msgid "NDEBUG defined, all asserts disabled."
 msgstr "NDEBUG ?????, ??? ???????? ?????????."
 
 # BUGME: Should be "FASTPATH defined, only fast path asserts enabled." --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78568
 #: ../src/daemon/main.c:947
 msgid "FASTPATH defined, only fast path asserts disabled."
 msgstr "FASTPATH ?????, ???????? ?????? ??????? ???????? ?fast path?."
@@ -704,11 +710,13 @@ msgid "pa_pid_file_create() failed."
 msgstr "????????? ?????? ??? ?????????? pa_pid_file_create()."
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/daemon/main.c:1006
 msgid "Fresh high-resolution timers available! Bon appetit!"
 msgstr "???????? ??????? ???????? ??????????."
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/daemon/main.c:1008
 msgid ""
 "Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
@@ -748,14 +756,6 @@ msgstr "???????? ??????? PulseAudio"
 msgid "Start the PulseAudio Sound System"
 msgstr "?????? ???????? ??????? PulseAudio"
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:1
-msgid "PulseAudio Sound System KDE Routing Policy"
-msgstr "???????? ??????? PulseAudio ? ?????????????? ??? KDE"
-
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:2
-msgid "Start the PulseAudio Sound System with KDE Routing Policy"
-msgstr "?????? ???????? ??????? PulseAudio ? ?????????????? ??? KDE"
-
 #: ../src/modules/alsa/alsa-mixer.c:2251
 msgid "Input"
 msgstr "????"
@@ -777,8 +777,8 @@ msgid "Line In"
 msgstr "???????? ????"
 
 #: ../src/modules/alsa/alsa-mixer.c:2256 ../src/modules/alsa/alsa-mixer.c:2334
-#: ../src/modules/bluetooth/module-bluez4-device.c:2097
-#: ../src/modules/bluetooth/module-bluez5-device.c:1447
+#: ../src/modules/bluetooth/module-bluez4-device.c:2101
+#: ../src/modules/bluetooth/module-bluez5-device.c:1451
 msgid "Microphone"
 msgstr "????????"
 
@@ -841,8 +841,8 @@ msgid "No Bass Boost"
 msgstr "??? ???????? ?????"
 
 #: ../src/modules/alsa/alsa-mixer.c:2271
-#: ../src/modules/bluetooth/module-bluez4-device.c:2102
-#: ../src/modules/bluetooth/module-bluez5-device.c:1454
+#: ../src/modules/bluetooth/module-bluez4-device.c:2106
+#: ../src/modules/bluetooth/module-bluez5-device.c:1458
 msgid "Speaker"
 msgstr "???????"
 
@@ -996,8 +996,8 @@ msgstr "???????? ?????? ??????? (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:3959
 #: ../src/modules/alsa/module-alsa-card.c:193
-#: ../src/modules/bluetooth/module-bluez4-device.c:2293
-#: ../src/modules/bluetooth/module-bluez5-device.c:1652
+#: ../src/modules/bluetooth/module-bluez4-device.c:2297
+#: ../src/modules/bluetooth/module-bluez5-device.c:1656
 msgid "Off"
 msgstr "?????????"
 
@@ -1012,6 +1012,7 @@ msgid "%s Input"
 msgstr "%s ????"
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/modules/alsa/alsa-sink.c:570 ../src/modules/alsa/alsa-sink.c:748
 #, c-format
 msgid ""
@@ -1029,6 +1030,7 @@ msgstr ""
 "??? ?????? ????????, ??????? ??? min_avail."
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/modules/alsa/alsa-source.c:529 ../src/modules/alsa/alsa-source.c:681
 #, c-format
 msgid ""
@@ -1045,7 +1047,7 @@ msgstr ""
 "? ????????????? POLLIN, ?????? ??????????? ????? snd_pcm_avail() ?????? 0\n"
 "??? ?????? ????????, ??????? ??? min_avail."
 
-#: ../src/modules/alsa/alsa-util.c:1134 ../src/modules/alsa/alsa-util.c:1209
+#: ../src/modules/alsa/alsa-util.c:1135 ../src/modules/alsa/alsa-util.c:1210
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
@@ -1058,7 +1060,7 @@ msgstr ""
 "????????, ??? ?????? ? ???????? ALSA ?%s?. ??????????, ???????? ?? ???? "
 "???????? ????????????? ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1184
+#: ../src/modules/alsa/alsa-util.c:1185
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
@@ -1071,7 +1073,7 @@ msgstr ""
 "????????, ??? ?????? ? ???????? ALSA ?%s?. ??????????, ???????? ?? ???? "
 "???????? ????????????? ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1225
+#: ../src/modules/alsa/alsa-util.c:1226
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -1084,7 +1086,7 @@ msgstr ""
 "????????, ??? ?????? ? ???????? ALSA ?%s?. ??????????, ???????? ?? ???? "
 "???????? ????????????? ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1268
+#: ../src/modules/alsa/alsa-util.c:1269
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
@@ -1097,80 +1099,80 @@ msgstr ""
 "????????, ??? ?????? ? ???????? ALSA ?%s?. ??????????, ???????? ?? ???? "
 "???????? ????????????? ALSA."
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2087
-#: ../src/modules/bluetooth/module-bluez5-device.c:1437
+#: ../src/modules/bluetooth/module-bluez4-device.c:2091
+#: ../src/modules/bluetooth/module-bluez5-device.c:1441
 msgid "Headset"
 msgstr "?????????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2092
-#: ../src/modules/bluetooth/module-bluez5-device.c:1442
+#: ../src/modules/bluetooth/module-bluez4-device.c:2096
+#: ../src/modules/bluetooth/module-bluez5-device.c:1446
 msgid "Handsfree"
 msgstr "?????-???"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2107
-#: ../src/modules/bluetooth/module-bluez5-device.c:1460
+#: ../src/modules/bluetooth/module-bluez4-device.c:2111
+#: ../src/modules/bluetooth/module-bluez5-device.c:1464
 msgid "Headphone"
 msgstr "???????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2112
-#: ../src/modules/bluetooth/module-bluez5-device.c:1465
+#: ../src/modules/bluetooth/module-bluez4-device.c:2116
+#: ../src/modules/bluetooth/module-bluez5-device.c:1469
 msgid "Portable"
 msgstr "??????????? ???????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2117
-#: ../src/modules/bluetooth/module-bluez5-device.c:1470
+#: ../src/modules/bluetooth/module-bluez4-device.c:2121
+#: ../src/modules/bluetooth/module-bluez5-device.c:1474
 msgid "Car"
 msgstr "????????????? ???????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2122
-#: ../src/modules/bluetooth/module-bluez5-device.c:1475
+#: ../src/modules/bluetooth/module-bluez4-device.c:2126
+#: ../src/modules/bluetooth/module-bluez5-device.c:1479
 msgid "HiFi"
 msgstr "Hi-Fi"
 
 # BUGME: please clarify, does this mean a cell phone? --aspotashev
-#: ../src/modules/bluetooth/module-bluez4-device.c:2127
-#: ../src/modules/bluetooth/module-bluez5-device.c:1480
+#: ../src/modules/bluetooth/module-bluez4-device.c:2131
+#: ../src/modules/bluetooth/module-bluez5-device.c:1484
 msgid "Phone"
 msgstr "???????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2135
-#: ../src/modules/bluetooth/module-bluez5-device.c:1432
-#: ../src/modules/bluetooth/module-bluez5-device.c:1448
-#: ../src/modules/bluetooth/module-bluez5-device.c:1486
+#: ../src/modules/bluetooth/module-bluez4-device.c:2139
+#: ../src/modules/bluetooth/module-bluez5-device.c:1436
+#: ../src/modules/bluetooth/module-bluez5-device.c:1452
+#: ../src/modules/bluetooth/module-bluez5-device.c:1490
 msgid "Bluetooth Output"
 msgstr "????? Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2138
-#: ../src/modules/bluetooth/module-bluez5-device.c:1431
-#: ../src/modules/bluetooth/module-bluez5-device.c:1453
-#: ../src/modules/bluetooth/module-bluez5-device.c:1459
-#: ../src/modules/bluetooth/module-bluez5-device.c:1485
+#: ../src/modules/bluetooth/module-bluez4-device.c:2142
+#: ../src/modules/bluetooth/module-bluez5-device.c:1435
+#: ../src/modules/bluetooth/module-bluez5-device.c:1457
+#: ../src/modules/bluetooth/module-bluez5-device.c:1463
+#: ../src/modules/bluetooth/module-bluez5-device.c:1489
 msgid "Bluetooth Input"
 msgstr "???? Bluetooth"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2174
+#: ../src/modules/bluetooth/module-bluez4-device.c:2178
 msgid "High Fidelity Playback (A2DP)"
 msgstr "??????????????? ???????? ???????? (A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2185
+#: ../src/modules/bluetooth/module-bluez4-device.c:2189
 msgid "High Fidelity Capture (A2DP)"
 msgstr "?????? ???????? ???????? (A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2196
+#: ../src/modules/bluetooth/module-bluez4-device.c:2200
 msgid "Telephony Duplex (HSP/HFP)"
 msgstr "?????????? ????????? (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2208
+#: ../src/modules/bluetooth/module-bluez4-device.c:2212
 msgid "Handsfree Gateway"
 msgstr "???? ???????? ?????? ??? ?????-???"
 
 #. TODO: Change this profile's name to a2dp_sink, to reflect the remote
 #. * device's role and be consistent with the a2dp source profile
-#: ../src/modules/bluetooth/module-bluez5-device.c:1525
+#: ../src/modules/bluetooth/module-bluez5-device.c:1529
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "??????????????? ???????? ???????? (???????? A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1536
+#: ../src/modules/bluetooth/module-bluez5-device.c:1540
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "?????? ???????? ???????? (?????????? A2DP)"
 
@@ -1553,38 +1555,33 @@ msgstr "???????? 5.1"
 msgid "Surround 7.1"
 msgstr "???????? 7.1"
 
-#: ../src/pulse/client-conf.c:119
-#, c-format
-msgid "Failed to open configuration file '%s': %s"
-msgstr "?? ??????? ??????? ???? ???????????? ?%s?: %s"
-
-#: ../src/pulse/client-conf.c:213 ../src/pulse/client-conf-x11.c:95
-msgid "Failed to parse cookie data"
-msgstr "?? ??????? ????????? ?????? cookie"
-
-#: ../src/pulse/client-conf-x11.c:54 ../src/utils/pax11publish.c:99
+#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:99
 msgid "xcb_connect() failed"
 msgstr "????????? ?????? ??? ?????????? pa_context_connect()."
 
-#: ../src/pulse/client-conf-x11.c:59 ../src/utils/pax11publish.c:104
+#: ../src/pulse/client-conf-x11.c:60 ../src/utils/pax11publish.c:104
 msgid "xcb_connection_has_error() returned true"
 msgstr "????? xcb_connection_has_error() ?????? ?true?."
 
-#: ../src/pulse/context.c:528
+#: ../src/pulse/client-conf-x11.c:96
+msgid "Failed to parse cookie data"
+msgstr "?? ??????? ????????? ?????? cookie"
+
+#: ../src/pulse/context.c:529
 msgid "No cookie loaded. Attempting to connect without."
 msgstr "Cookie ?? ?????????. ??????? ??????????? ??? ???."
 
-#: ../src/pulse/context.c:609
+#: ../src/pulse/context.c:610
 #, c-format
 msgid "fork(): %s"
 msgstr "fork(): %s"
 
-#: ../src/pulse/context.c:664
+#: ../src/pulse/context.c:665
 #, c-format
 msgid "waitpid(): %s"
 msgstr "waitpid(): %s"
 
-#: ../src/pulse/context.c:1365
+#: ../src/pulse/context.c:1366
 #, c-format
 msgid "Received message for unknown extension '%s'"
 msgstr "???????? ????????? ??? ???????????? ?????????? ?%s?."
@@ -1612,11 +1609,11 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "???????????? ??????."
 
-#: ../src/pulsecore/sink.c:3483
+#: ../src/pulsecore/sink.c:3428
 msgid "Built-in Audio"
 msgstr "?????????? ?????"
 
-#: ../src/pulsecore/sink.c:3488
+#: ../src/pulsecore/sink.c:3433
 msgid "Modem"
 msgstr "?????"
 
@@ -1657,6 +1654,7 @@ msgid "Timeout"
 msgstr "????? ???????? ???????"
 
 # BUGME: authorization -> authentication? --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78566
 #: ../src/pulse/error.c:49
 msgid "No authorization key"
 msgstr "??? ????? ??????????????"
@@ -1883,11 +1881,12 @@ msgstr "?????????? ??????: maxlength=%u, fragsize=%u"
 msgid "Using sample spec '%s', channel map '%s'."
 msgstr "????????????? ???????? ?%s?, ????? ??????? ?%s?."
 
-# BUGME: word puzzle, "not" is not translatable. --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=76529
 #: ../src/utils/pacat.c:359
 #, c-format
-msgid "Connected to device %s (%u, %ssuspended)."
-msgstr "??????????? ?????????? ? ??????????? %s (%u, %s??????????????)."
+msgid "Connected to device %s (index: %u, suspended: %s)."
+msgstr ""
+"??????????? ?????????? ? ??????????? %s (?????: %u, ??????????????: %s)."
 
 #: ../src/utils/pacat.c:369
 #, c-format
@@ -1920,6 +1919,7 @@ msgid "Stream started.%s"
 msgstr "????? ???????.%s"
 
 # BUGME: word puzzle with "not". --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=76529
 #: ../src/utils/pacat.c:410
 #, c-format
 msgid "Stream moved to device %s (%u, %ssuspended).%s"
@@ -1945,6 +1945,7 @@ msgstr ""
 "????????????? ??????."
 
 # BUGME: remove exclamation --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78563
 #: ../src/utils/pacat.c:442
 msgid "Warning: Received more uncork requests than cork requests!"
 msgstr ""
@@ -1976,7 +1977,7 @@ msgstr "?? ??????? ?????????? ?????????? ?????
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "????????? ?????? ??? ?????????? pa_stream_connect_record(): %s"
 
-#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1388
+#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1455
 #, c-format
 msgid "Connection failure: %s"
 msgstr "?????? ???????????: %s"
@@ -2045,16 +2046,16 @@ msgid ""
 "                                        (defaults to 2)\n"
 "      --channel-map=CHANNELMAP          Channel map to use instead of the "
 "default\n"
-"      --fix-format                      Take the sample format from the sink "
-"the stream is\n"
+"      --fix-format                      Take the sample format from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
-"      --fix-rate                        Take the sampling rate from the sink "
-"the stream is\n"
+"      --fix-rate                        Take the sampling rate from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
 "      --fix-channels                    Take the number of channels and the "
 "channel map\n"
-"                                        from the sink the stream is being "
-"connected to.\n"
+"                                        from the sink/source the stream is "
+"being connected to.\n"
 "      --no-remix                        Don't upmix or downmix channels.\n"
 "      --no-remap                        Map channels by index instead of "
 "name.\n"
@@ -2069,7 +2070,7 @@ msgid ""
 "      --property=PROPERTY=VALUE         Set the specified property to the "
 "specified value.\n"
 "      --raw                             Record/play raw PCM data.\n"
-"      --passthrough                     passthrough data \n"
+"      --passthrough                     Passthrough data.\n"
 "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
 "      --list-file-formats               List available file formats.\n"
 "      --monitor-stream=INDEX            Record from the sink input with "
@@ -2114,14 +2115,16 @@ msgstr ""
 "??????\n"
 "                                        ???????????.\n"
 "      --fix-format                      ???????????? ?????? ???????? ??? ?\n"
-"                                        ??????????????, ? ???????? "
+"                                        ??????????????/?????????, ? ???????? "
 "?????????\n"
 "                                        ?????.\n"
 "      --fix-rate                        ???????????? ??????? ?????????????\n"
-"                                        ??? ? ??????????????, ? ????????\n"
+"                                        ??? ? ??????????????/?????????, ? "
+"????????\n"
 "                                        ????????? ?????.\n"
 "      --fix-channels                    ???????????? ????? ??????? ? ?????\n"
-"                                        ??????? ??? ? ??????????????,\n"
+"                                        ??????? ??? ? "
+"??????????????/?????????,\n"
 "                                        ? ???????? ????????? ?????.\n"
 "      --no-remix                        ?? ?????? ????? ???????.\n"
 "      --no-remap                        ???????????? ?????? ?? ?? ???????,\n"
@@ -2162,7 +2165,7 @@ msgstr ""
 "?????????????? ? libpulse %s\n"
 "???????????? ? libpulse %s\n"
 
-#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1559
+#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1651
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "???????????? ??? ??????? ?%s?."
@@ -2235,7 +2238,7 @@ msgstr ""
 "??????????????: ????????? ???????????? ???????? ????? ???????? ????????????? "
 "?? ?????."
 
-#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1626
+#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1718
 msgid "Failed to determine sample specification from file."
 msgstr "?? ??????? ?????????? ???????????? ???????? ?? ?????."
 
@@ -2271,7 +2274,7 @@ msgstr "???????????????"
 msgid "Failed to set media name."
 msgstr "?? ??????? ?????????? ??? ??????."
 
-#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:1976
+#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:2068
 msgid "pa_mainloop_new() failed."
 msgstr "????????? ?????? ??? ?????????? pa_mainloop_new()."
 
@@ -2279,11 +2282,11 @@ msgstr "????????? ?????? ??? ?????????? pa_mainloop_
 msgid "io_new() failed."
 msgstr "????????? ?????? ??? ?????????? io_new()."
 
-#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:1988
+#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:2080
 msgid "pa_context_new() failed."
 msgstr "????????? ?????? ??? ?????????? pa_context_new()."
 
-#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:1994
+#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:2086
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "????????? ?????? ??? ?????????? pa_context_connect(): %s"
@@ -2292,32 +2295,32 @@ msgstr "????????? ?????? ??? ?????????? pa_context_c
 msgid "pa_context_rttime_new() failed."
 msgstr "????????? ?????? ??? ?????????? pa_context_rttime_new()."
 
-#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:1999
+#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:2091
 msgid "pa_mainloop_run() failed."
 msgstr "????????? ?????? ??? ?????????? pa_mainloop_run()."
 
-#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1481
+#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1573
 msgid "NAME [ARGS ...]"
 msgstr "??? [????????? ...]"
 
-#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1482
+#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1574
 msgid "NAME|#N"
 msgstr "???|?"
 
-#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1480
-#: ../src/utils/pactl.c:1486
+#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1578
 msgid "NAME"
 msgstr "???"
 
-#: ../src/utils/pacmd.c:56 ../src/utils/pactl.c:1488
+#: ../src/utils/pacmd.c:56
 msgid "NAME|#N VOLUME"
 msgstr "???|? ?????????"
 
-#: ../src/utils/pacmd.c:57 ../src/utils/pactl.c:1489
+#: ../src/utils/pacmd.c:57
 msgid "#N VOLUME"
 msgstr "? ?????????"
 
-#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1484
+#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1576
 msgid "NAME|#N 1|0"
 msgstr "???|? 1|0"
 
@@ -2353,7 +2356,7 @@ msgstr "????"
 msgid "FILENAME SINK|#N"
 msgstr "???_????? ?????????????|?"
 
-#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1483
+#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1575
 msgid "#N SINK|SOURCE"
 msgstr "? ?????????????|????????"
 
@@ -2361,15 +2364,15 @@ msgstr "? ?????????????|????????"
 msgid "1|0"
 msgstr "1|0"
 
-#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1485
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1577
 msgid "CARD PROFILE"
 msgstr "????? ???????"
 
-#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1487
+#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1579
 msgid "NAME|#N PORT"
 msgstr "???|? ????"
 
-#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1493
+#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1585
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "???_?????|?_????? ???? ????????"
 
@@ -2378,6 +2381,7 @@ msgid "TARGET"
 msgstr "????"
 
 # BUGME: change "NUMERIC LEVEL" to "NUMERIC-LEVEL", because it's a single argument. --aspotashev
+# https://bugs.freedesktop.org/show_bug.cgi?id=78565
 #: ../src/utils/pacmd.c:78
 msgid "NUMERIC LEVEL"
 msgstr "????????-???????"
@@ -2450,33 +2454,33 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
-#: ../src/utils/pactl.c:161
+#: ../src/utils/pactl.c:166
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "?? ??????? ???????? ??????????: %s"
 
-#: ../src/utils/pactl.c:167
+#: ../src/utils/pactl.c:172
 #, c-format
 msgid "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr "?????? ????????????: %u ??????, ?????????? ? ???????????? %s ????.\n"
 
-#: ../src/utils/pactl.c:170
+#: ../src/utils/pactl.c:175
 #, c-format
 msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr "???????? ?? ??? ?????: %u ??????, ?????????? ? ???????????? %s ????.\n"
 
-#: ../src/utils/pactl.c:173
+#: ../src/utils/pactl.c:178
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "?????? ???? ???????: %s\n"
 
-#: ../src/utils/pactl.c:182
+#: ../src/utils/pactl.c:187
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "?? ??????? ???????? ?????????? ? ???????: %s"
 
 # Tile Size = PA_MEMPOOL_SLOT_SIZE in src/pulsecore/memblock.c. --aspotashev
-#: ../src/utils/pactl.c:187
+#: ../src/utils/pactl.c:192
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2493,7 +2497,7 @@ msgstr ""
 "????? ???????: %u\n"
 "?????? ????? ??????: %zu\n"
 
-#: ../src/utils/pactl.c:203
+#: ../src/utils/pactl.c:208
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2516,12 +2520,12 @@ msgstr ""
 "???????? ?? ?????????: %s\n"
 "Cookie: %04x:%04x\n"
 
-#: ../src/utils/pactl.c:252 ../src/utils/pactl.c:878 ../src/utils/pactl.c:952
+#: ../src/utils/pactl.c:257 ../src/utils/pactl.c:902 ../src/utils/pactl.c:980
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "?? ??????? ???????? ?????????? ?? ??????????????: %s"
 
-#: ../src/utils/pactl.c:278
+#: ../src/utils/pactl.c:283
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2560,27 +2564,27 @@ msgstr ""
 "\t????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:322 ../src/utils/pactl.c:428 ../src/utils/pactl.c:589
+#: ../src/utils/pactl.c:327 ../src/utils/pactl.c:433 ../src/utils/pactl.c:594
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\t?????:\n"
 
-#: ../src/utils/pactl.c:329 ../src/utils/pactl.c:435
+#: ../src/utils/pactl.c:334 ../src/utils/pactl.c:440
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\t???????? ????: %s\n"
 
-#: ../src/utils/pactl.c:335 ../src/utils/pactl.c:441
+#: ../src/utils/pactl.c:340 ../src/utils/pactl.c:446
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\t???????:\n"
 
-#: ../src/utils/pactl.c:359 ../src/utils/pactl.c:897 ../src/utils/pactl.c:967
+#: ../src/utils/pactl.c:364 ../src/utils/pactl.c:922 ../src/utils/pactl.c:995
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "?? ??????? ???????? ?????????? ?? ?????????: %s"
 
-#: ../src/utils/pactl.c:385
+#: ../src/utils/pactl.c:390
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2619,20 +2623,20 @@ msgstr ""
 "\t????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:413 ../src/utils/pactl.c:483 ../src/utils/pactl.c:526
-#: ../src/utils/pactl.c:568 ../src/utils/pactl.c:666 ../src/utils/pactl.c:667
-#: ../src/utils/pactl.c:678 ../src/utils/pactl.c:736 ../src/utils/pactl.c:737
-#: ../src/utils/pactl.c:748 ../src/utils/pactl.c:799 ../src/utils/pactl.c:800
-#: ../src/utils/pactl.c:806
+#: ../src/utils/pactl.c:418 ../src/utils/pactl.c:488 ../src/utils/pactl.c:531
+#: ../src/utils/pactl.c:573 ../src/utils/pactl.c:671 ../src/utils/pactl.c:672
+#: ../src/utils/pactl.c:683 ../src/utils/pactl.c:741 ../src/utils/pactl.c:742
+#: ../src/utils/pactl.c:753 ../src/utils/pactl.c:804 ../src/utils/pactl.c:805
+#: ../src/utils/pactl.c:811
 msgid "n/a"
 msgstr "?/?"
 
-#: ../src/utils/pactl.c:452 ../src/utils/pactl.c:853
+#: ../src/utils/pactl.c:457 ../src/utils/pactl.c:861
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "?? ??????? ???????? ?????????? ? ??????: %s"
 
-#: ../src/utils/pactl.c:475
+#: ../src/utils/pactl.c:480
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2649,12 +2653,12 @@ msgstr ""
 "\t????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:494
+#: ../src/utils/pactl.c:499
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "?? ??????? ???????? ?????????? ? ???????: %s"
 
-#: ../src/utils/pactl.c:520
+#: ../src/utils/pactl.c:525
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2669,12 +2673,12 @@ msgstr ""
 "\t????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:537
+#: ../src/utils/pactl.c:542
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "?? ??????? ???????? ?????????? ? ???????? ?????: %s"
 
-#: ../src/utils/pactl.c:560
+#: ../src/utils/pactl.c:565
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2691,17 +2695,17 @@ msgstr ""
 "\t????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:576
+#: ../src/utils/pactl.c:581
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\t???????:\n"
 
-#: ../src/utils/pactl.c:583
+#: ../src/utils/pactl.c:588
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\t???????? ???????: %s\n"
 
-#: ../src/utils/pactl.c:597
+#: ../src/utils/pactl.c:602
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2710,17 +2714,17 @@ msgstr ""
 "\t\t\t????????:\n"
 "\t\t\t\t%s\n"
 
-#: ../src/utils/pactl.c:602
+#: ../src/utils/pactl.c:607
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\t?????? ? ???????(?): %s"
 
-#: ../src/utils/pactl.c:619 ../src/utils/pactl.c:916 ../src/utils/pactl.c:982
+#: ../src/utils/pactl.c:624 ../src/utils/pactl.c:942 ../src/utils/pactl.c:1010
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "?? ??????? ???????? ?????????? ? ????? ??????????????: %s"
 
-#: ../src/utils/pactl.c:648
+#: ../src/utils/pactl.c:653
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2759,12 +2763,12 @@ msgstr ""
 "\t????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:689 ../src/utils/pactl.c:935 ../src/utils/pactl.c:997
+#: ../src/utils/pactl.c:694 ../src/utils/pactl.c:962 ../src/utils/pactl.c:1025
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "?? ??????? ???????? ?????????? ? ?????? ?????????: %s"
 
-#: ../src/utils/pactl.c:718
+#: ../src/utils/pactl.c:723
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2803,12 +2807,12 @@ msgstr ""
 "\t????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:759
+#: ../src/utils/pactl.c:764
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "?? ??????? ???????? ?????????? ? ???????: %s"
 
-#: ../src/utils/pactl.c:786
+#: ../src/utils/pactl.c:791
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2837,143 +2841,173 @@ msgstr ""
 "\t????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:814 ../src/utils/pactl.c:824
+#: ../src/utils/pactl.c:819 ../src/utils/pactl.c:829
 #, c-format
 msgid "Failure: %s"
 msgstr "????????? ??????: %s"
 
-#: ../src/utils/pactl.c:860
+#: ../src/utils/pactl.c:868
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "?? ??????? ????????? ??????: ?????? ?%s? ?? ????????."
 
-#: ../src/utils/pactl.c:1023
+#: ../src/utils/pactl.c:886
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel/s supported = %d\n"
+msgstr ""
+"?? ??????? ?????? ?????????: ?? ?????????? ?????? ????????? ??? %d ???????, "
+"?? ????? ?????????????? ??????? ?? ????????? ? ????? %d\n"
+
+#: ../src/utils/pactl.c:1052
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "?? ??????? ?????? ??????: ???????????? ?????? ?%s?."
 
-#: ../src/utils/pactl.c:1062
+#: ../src/utils/pactl.c:1095
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "?? ??????? ????????? ????? ? ???: %s"
 
-#: ../src/utils/pactl.c:1079
+#: ../src/utils/pactl.c:1112
 msgid "Premature end of file"
 msgstr "??????????? ????? ?????."
 
-#: ../src/utils/pactl.c:1099
+#: ../src/utils/pactl.c:1132
 msgid "new"
 msgstr "?????????"
 
-#: ../src/utils/pactl.c:1102
+#: ../src/utils/pactl.c:1135
 msgid "change"
 msgstr "?????????"
 
-#: ../src/utils/pactl.c:1105
+#: ../src/utils/pactl.c:1138
 msgid "remove"
 msgstr "????????"
 
-#: ../src/utils/pactl.c:1108 ../src/utils/pactl.c:1143
+#: ../src/utils/pactl.c:1141 ../src/utils/pactl.c:1176
 msgid "unknown"
 msgstr "(??????????)"
 
 # [event-facility] --aspotashev
-#: ../src/utils/pactl.c:1116
+#: ../src/utils/pactl.c:1149
 msgid "sink"
 msgstr "??????????????"
 
 # [event-facility] --aspotashev
-#: ../src/utils/pactl.c:1119
+#: ../src/utils/pactl.c:1152
 msgid "source"
 msgstr "?????????"
 
 # [event-facility] --aspotashev
-#: ../src/utils/pactl.c:1122
+#: ../src/utils/pactl.c:1155
 msgid "sink-input"
 msgstr "????? ??????????????"
 
 # [event-facility] --aspotashev
-#: ../src/utils/pactl.c:1125
+#: ../src/utils/pactl.c:1158
 msgid "source-output"
 msgstr "?????? ?????????"
 
 # [event-facility] --aspotashev
-#: ../src/utils/pactl.c:1128
+#: ../src/utils/pactl.c:1161
 msgid "module"
 msgstr "??????"
 
 # [event-facility] --aspotashev
-#: ../src/utils/pactl.c:1131
+#: ../src/utils/pactl.c:1164
 msgid "client"
 msgstr "???????"
 
 # [event-facility] --aspotashev
-#: ../src/utils/pactl.c:1134
+#: ../src/utils/pactl.c:1167
 msgid "sample-cache"
 msgstr "????????????? ??????"
 
 # [event-facility] --aspotashev
-#: ../src/utils/pactl.c:1137 ../src/utils/pactl.c:1140
+#: ../src/utils/pactl.c:1170
 msgid "server"
 msgstr "???????"
 
+# [event-facility] --aspotashev
+#: ../src/utils/pactl.c:1173
+msgid "card"
+msgstr "?????"
+
 # "??????? [event-type] ? ????????? [event-facility] #N", ??????? ??? ?????? [event-facility] ???? ????? ? ??????????? ??????. --aspotashev
-#: ../src/utils/pactl.c:1149
+#: ../src/utils/pactl.c:1182
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "??????? ?%s? ? ????????? %s ?%u\n"
 
-#: ../src/utils/pactl.c:1394
+#: ../src/utils/pactl.c:1461
 msgid "Got SIGINT, exiting."
 msgstr "??????? ?????? ??? ????????? (SIGINT), ?????."
 
-#: ../src/utils/pactl.c:1421
+#: ../src/utils/pactl.c:1488
 msgid "Invalid volume specification"
 msgstr "???????????? ???????? ?????????."
 
-#: ../src/utils/pactl.c:1444
+#: ../src/utils/pactl.c:1511
 msgid "Volume outside permissible range.\n"
 msgstr "????????? ????????? ??????? ?? ??????? ???????????? ?????????.\n"
 
-#: ../src/utils/pactl.c:1474 ../src/utils/pactl.c:1475
-#: ../src/utils/pactl.c:1476 ../src/utils/pactl.c:1477
-#: ../src/utils/pactl.c:1478 ../src/utils/pactl.c:1479
-#: ../src/utils/pactl.c:1480 ../src/utils/pactl.c:1481
-#: ../src/utils/pactl.c:1482 ../src/utils/pactl.c:1483
-#: ../src/utils/pactl.c:1484 ../src/utils/pactl.c:1485
-#: ../src/utils/pactl.c:1486 ../src/utils/pactl.c:1487
-#: ../src/utils/pactl.c:1488 ../src/utils/pactl.c:1489
-#: ../src/utils/pactl.c:1490 ../src/utils/pactl.c:1491
-#: ../src/utils/pactl.c:1492 ../src/utils/pactl.c:1493
-#: ../src/utils/pactl.c:1494
+#: ../src/utils/pactl.c:1524
+msgid "Invalid number of volume specifications.\n"
+msgstr "???????????? ?????????? ???????? ?????????.\n"
+
+#: ../src/utils/pactl.c:1536
+msgid "Inconsistent volume specification.\n"
+msgstr "??????????????? ??????? ???????? ???????? ?????????.\n"
+
+#: ../src/utils/pactl.c:1566 ../src/utils/pactl.c:1567
+#: ../src/utils/pactl.c:1568 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1570 ../src/utils/pactl.c:1571
+#: ../src/utils/pactl.c:1572 ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1574 ../src/utils/pactl.c:1575
+#: ../src/utils/pactl.c:1576 ../src/utils/pactl.c:1577
+#: ../src/utils/pactl.c:1578 ../src/utils/pactl.c:1579
+#: ../src/utils/pactl.c:1580 ../src/utils/pactl.c:1581
+#: ../src/utils/pactl.c:1582 ../src/utils/pactl.c:1583
+#: ../src/utils/pactl.c:1584 ../src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1586
 msgid "[options]"
 msgstr "[?????????]"
 
-#: ../src/utils/pactl.c:1476
+#: ../src/utils/pactl.c:1568
 msgid "[TYPE]"
 msgstr "[???]"
 
-#: ../src/utils/pactl.c:1478
+#: ../src/utils/pactl.c:1570
 msgid "FILENAME [NAME]"
 msgstr "???_????? [???]"
 
-#: ../src/utils/pactl.c:1479
+#: ../src/utils/pactl.c:1571
 msgid "NAME [SINK]"
 msgstr "??? [?????????????]"
 
-#: ../src/utils/pactl.c:1490
+#: ../src/utils/pactl.c:1580
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "???|? ????????? [????????? ...]"
+
+#: ../src/utils/pactl.c:1581
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "? ????????? [????????? ...]"
+
+#: ../src/utils/pactl.c:1582
 msgid "NAME|#N 1|0|toggle"
 msgstr "???|? 1|0|toggle"
 
-#: ../src/utils/pactl.c:1491
+#: ../src/utils/pactl.c:1583
 msgid "#N 1|0|toggle"
 msgstr "? 1|0|toggle"
 
-#: ../src/utils/pactl.c:1492
+#: ../src/utils/pactl.c:1584
 msgid "#N FORMATS"
 msgstr "? ???????"
 
-#: ../src/utils/pactl.c:1495
+#: ../src/utils/pactl.c:1587
 #, c-format
 msgid ""
 "\n"
@@ -2985,7 +3019,7 @@ msgstr ""
 "????? ???????????? ??? ???????? ??????????????, ????????? ? ????????,\n"
 "???????????? ?? ?????????.\n"
 
-#: ../src/utils/pactl.c:1498
+#: ../src/utils/pactl.c:1590
 #, c-format
 msgid ""
 "\n"
@@ -3006,7 +3040,7 @@ msgstr ""
 "  -n, --client-name=???                 ??? ????? ???????, ??????? ?????\n"
 "                                        ???????????? ???????.\n"
 
-#: ../src/utils/pactl.c:1539
+#: ../src/utils/pactl.c:1631
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3017,60 +3051,60 @@ msgstr ""
 "?????????????? ? libpulse %s\n"
 "???????????? ? libpulse %s\n"
 
-#: ../src/utils/pactl.c:1598
+#: ../src/utils/pactl.c:1690
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "?? ?????????? ?????? ???? ??????? ???? ??: %s"
 
-#: ../src/utils/pactl.c:1608
+#: ../src/utils/pactl.c:1700
 msgid "Please specify a sample file to load"
 msgstr "?????????? ??????? ????, ?? ???????? ????? ???????? ?????."
 
-#: ../src/utils/pactl.c:1621
+#: ../src/utils/pactl.c:1713
 msgid "Failed to open sound file."
 msgstr "?? ??????? ??????? ?????????."
 
-#: ../src/utils/pactl.c:1633
+#: ../src/utils/pactl.c:1725
 msgid "Warning: Failed to determine sample specification from file."
 msgstr "??????????????: ?? ??????? ?????????? ???????????? ???????? ?? ?????."
 
-#: ../src/utils/pactl.c:1643
+#: ../src/utils/pactl.c:1735
 msgid "You have to specify a sample name to play"
 msgstr "?????????? ??????? ??? ?????? ??? ???????????????."
 
-#: ../src/utils/pactl.c:1655
+#: ../src/utils/pactl.c:1747
 msgid "You have to specify a sample name to remove"
 msgstr "?????????? ??????? ??? ?????? ??? ????????."
 
-#: ../src/utils/pactl.c:1664
+#: ../src/utils/pactl.c:1756
 msgid "You have to specify a sink input index and a sink"
 msgstr "?????????? ??????? ????? ????? ?????????????? ? ?????????????."
 
-#: ../src/utils/pactl.c:1674
+#: ../src/utils/pactl.c:1766
 msgid "You have to specify a source output index and a source"
 msgstr "?????????? ??????? ????? ?????? ????????? ? ????????."
 
-#: ../src/utils/pactl.c:1689
+#: ../src/utils/pactl.c:1781
 msgid "You have to specify a module name and arguments."
 msgstr "?????????? ??????? ??? ?????? ? ?????????."
 
-#: ../src/utils/pactl.c:1709
+#: ../src/utils/pactl.c:1801
 msgid "You have to specify a module index or name"
 msgstr "?????????? ??????? ????? ??? ??? ??????."
 
-#: ../src/utils/pactl.c:1722
+#: ../src/utils/pactl.c:1814
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "?????? ????????? ?????? ?????? ??????????????. ?????????? ??????? ?????????? "
 "????????."
 
-#: ../src/utils/pactl.c:1727 ../src/utils/pactl.c:1747
+#: ../src/utils/pactl.c:1819 ../src/utils/pactl.c:1839
 msgid "Invalid suspend specification."
 msgstr ""
 "???????????? ???????? ???????? ????????????, ????????? ?????????? ????????."
 
-#: ../src/utils/pactl.c:1742
+#: ../src/utils/pactl.c:1834
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3078,88 +3112,88 @@ msgstr ""
 "?????? ????????? ?????? ?????? ?????????. ?????????? ??????? ?????????? "
 "????????."
 
-#: ../src/utils/pactl.c:1759
+#: ../src/utils/pactl.c:1851
 msgid "You have to specify a card name/index and a profile name"
 msgstr "?????????? ??????? ??? ??? ????? ???????? ????? ? ??? ???????."
 
-#: ../src/utils/pactl.c:1770
+#: ../src/utils/pactl.c:1862
 msgid "You have to specify a sink name/index and a port name"
 msgstr "?????????? ??????? ??? ??? ????? ?????????????? ? ??? ?????."
 
-#: ../src/utils/pactl.c:1781
+#: ../src/utils/pactl.c:1873
 msgid "You have to specify a sink name"
 msgstr "?????????? ??????? ??? ??????????????."
 
-#: ../src/utils/pactl.c:1791
+#: ../src/utils/pactl.c:1883
 msgid "You have to specify a source name/index and a port name"
 msgstr "?????????? ??????? ??? ??? ????? ????????? ? ??? ?????."
 
-#: ../src/utils/pactl.c:1802
+#: ../src/utils/pactl.c:1894
 msgid "You have to specify a source name"
 msgstr "?????????? ??????? ??? ?????????."
 
-#: ../src/utils/pactl.c:1812
+#: ../src/utils/pactl.c:1904
 msgid "You have to specify a sink name/index and a volume"
 msgstr "?????????? ??????? ??? ??? ????? ?????????????? ? ?????????."
 
-#: ../src/utils/pactl.c:1825
+#: ../src/utils/pactl.c:1917
 msgid "You have to specify a source name/index and a volume"
 msgstr "?????????? ??????? ??? ??? ????? ????????? ? ?????????."
 
-#: ../src/utils/pactl.c:1838
+#: ../src/utils/pactl.c:1930
 msgid "You have to specify a sink input index and a volume"
 msgstr "?????????? ??????? ????? ????? ?????????????? ? ?????????."
 
-#: ../src/utils/pactl.c:1843
+#: ../src/utils/pactl.c:1935
 msgid "Invalid sink input index"
 msgstr "???????????? ????? ????? ??????????????."
 
-#: ../src/utils/pactl.c:1854
+#: ../src/utils/pactl.c:1946
 msgid "You have to specify a source output index and a volume"
 msgstr "?????????? ??????? ????? ?????? ????????? ? ?????????."
 
-#: ../src/utils/pactl.c:1859
+#: ../src/utils/pactl.c:1951
 msgid "Invalid source output index"
 msgstr "???????????? ????? ?????? ?????????."
 
-#: ../src/utils/pactl.c:1870
+#: ../src/utils/pactl.c:1962
 msgid "You have to specify a sink name/index and a mute boolean"
 msgstr ""
 "?????????? ??????? ??? ??? ????? ?????????????? ? ?????????? ???????? "
 "?????????? ?????."
 
-#: ../src/utils/pactl.c:1875 ../src/utils/pactl.c:1890
-#: ../src/utils/pactl.c:1910 ../src/utils/pactl.c:1928
+#: ../src/utils/pactl.c:1967 ../src/utils/pactl.c:1982
+#: ../src/utils/pactl.c:2002 ../src/utils/pactl.c:2020
 msgid "Invalid mute specification"
 msgstr "???????????? ?????????? ???????? ?????????? ?????."
 
-#: ../src/utils/pactl.c:1885
+#: ../src/utils/pactl.c:1977
 msgid "You have to specify a source name/index and a mute boolean"
 msgstr ""
 "?????????? ??????? ??? ??? ????? ????????? ? ?????????? ???????? ?????????? "
 "?????."
 
-#: ../src/utils/pactl.c:1900
+#: ../src/utils/pactl.c:1992
 msgid "You have to specify a sink input index and a mute boolean"
 msgstr ""
 "?????????? ??????? ????? ????? ?????????????? ? ?????????? ???????? "
 "?????????? ?????."
 
-#: ../src/utils/pactl.c:1905
+#: ../src/utils/pactl.c:1997
 msgid "Invalid sink input index specification"
 msgstr "???????????? ????? ????? ??????????????."
 
-#: ../src/utils/pactl.c:1918
+#: ../src/utils/pactl.c:2010
 msgid "You have to specify a source output index and a mute boolean"
 msgstr ""
 "?????????? ??????? ????? ?????? ????????? ? ?????????? ???????? ?????????? "
 "?????."
 
-#: ../src/utils/pactl.c:1923
+#: ../src/utils/pactl.c:2015
 msgid "Invalid source output index specification"
 msgstr "???????????? ????? ?????? ?????????."
 
-#: ../src/utils/pactl.c:1940
+#: ../src/utils/pactl.c:2032
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3167,15 +3201,15 @@ msgstr ""
 "?????????? ??????? ????? ?????????????? ? ??????????? ???????? ?????? "
 "?????????????? ????????."
 
-#: ../src/utils/pactl.c:1952
+#: ../src/utils/pactl.c:2044
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "?????????? ??????? ??? ??? ????? ???????? ?????, ??? ????? ? ????????."
 
-#: ../src/utils/pactl.c:1959
+#: ../src/utils/pactl.c:2051
 msgid "Could not parse latency offset"
 msgstr "???????????? ???????? ????????."
 
-#: ../src/utils/pactl.c:1971
+#: ../src/utils/pactl.c:2063
 msgid "No valid command specified."
 msgstr "??? ??????? ?? ??????? ??? ?? ??????????."
 
@@ -3346,6 +3380,15 @@ msgstr "?? ??????? ????????? ?????? cookie.\n"
 msgid "Not yet implemented.\n"
 msgstr "?? ???????????.\n"
 
+#~ msgid "PulseAudio Sound System KDE Routing Policy"
+#~ msgstr "???????? ??????? PulseAudio ? ?????????????? ??? KDE"
+
+#~ msgid "Start the PulseAudio Sound System with KDE Routing Policy"
+#~ msgstr "?????? ???????? ??????? PulseAudio ? ?????????????? ??? KDE"
+
+#~ msgid "Failed to open configuration file '%s': %s"
+#~ msgstr "?? ??????? ??????? ???? ???????????? ?%s?: %s"
+
 #, fuzzy
 #~ msgid "Successfully dropped root privileges."
 #~ msgstr "???????? ???????? ?????????? ??????????????."
diff --git a/po/el.po b/po/sk.po
similarity index 57%
copy from po/el.po
copy to po/sk.po
index dedd12e..6300aed 100644
--- a/po/el.po
+++ b/po/sk.po
@@ -1,736 +1,1009 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Dimitris Glezos <dimitris at glezos.com>, 2008.
-# Thalia Papoutsaki <saliyath at gmail.com>, 2009, 2012.
+# Slovak translation for PulseAudio.
+# Copyright (C) 2014 PulseAudio's COPYRIGHT HOLDER
+# This file is distributed under the same license as the PulseAudio package.
+# Du?an Kazik <prescott66 at gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 10:10+0000\n"
-"PO-Revision-Date: 2012-01-30 09:53+0000\n"
-"Last-Translator: Thalia Papoutsaki <saliyath at gmail.com>\n"
-"Language-Team: Greek <fedora-trans-el at redhat.com>\n"
-"Language: el\n"
+"Project-Id-Version: PulseAudio master\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
+"product=PulseAudio&keywords=I18N+L10N&component=misc\n"
+"POT-Creation-Date: 2014-09-16 22:25+0000\n"
+"PO-Revision-Date: 2014-10-02 13:41+0100\n"
+"Last-Translator: Du?an Kazik <prescott66 at gmail.com>\n"
+"Language-Team: Slovak <gnome-sk-list at gnome.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KAider 0.1\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1204
+#: ../src/daemon/cmdline.c:113
 #, c-format
 msgid ""
-"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
-"ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"%s [options]\n"
+"\n"
+"COMMANDS:\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"      --dump-conf                       Dump default configuration\n"
+"      --dump-modules                    Dump list of available modules\n"
+"      --dump-resample-methods           Dump available resample methods\n"
+"      --cleanup-shm                     Cleanup stale shared memory "
+"segments\n"
+"      --start                           Start the daemon if it is not "
+"running\n"
+"  -k  --kill                            Kill a running daemon\n"
+"      --check                           Check for a running daemon (only "
+"returns exit code)\n"
+"\n"
+"OPTIONS:\n"
+"      --system[=BOOL]                   Run as system-wide instance\n"
+"  -D, --daemonize[=BOOL]                Daemonize after startup\n"
+"      --fail[=BOOL]                     Quit when startup fails\n"
+"      --high-priority[=BOOL]            Try to set high nice level\n"
+"                                        (only available as root, when SUID "
+"or\n"
+"                                        with elevated RLIMIT_NICE)\n"
+"      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
+"                                        (only available as root, when SUID "
+"or\n"
+"                                        with elevated RLIMIT_RTPRIO)\n"
+"      --disallow-module-loading[=BOOL]  Disallow module user requested "
+"module\n"
+"                                        loading/unloading after startup\n"
+"      --disallow-exit[=BOOL]            Disallow user requested exit\n"
+"      --exit-idle-time=SECS             Terminate the daemon when idle and "
+"this\n"
+"                                        time passed\n"
+"      --scache-idle-time=SECS           Unload autoloaded samples when idle "
+"and\n"
+"                                        this time passed\n"
+"      --log-level[=LEVEL]               Increase or set verbosity level\n"
+"  -v  --verbose                         Increase the verbosity level\n"
+"      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+"                                        Specify the log target\n"
+"      --log-meta[=BOOL]                 Include code location in log "
+"messages\n"
+"      --log-time[=BOOL]                 Include timestamps in log messages\n"
+"      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
+"  -p, --dl-search-path=PATH             Set the search path for dynamic "
+"shared\n"
+"                                        objects (plugins)\n"
+"      --resample-method=METHOD          Use the specified resampling method\n"
+"                                        (See --dump-resample-methods for\n"
+"                                        possible values)\n"
+"      --use-pid-file[=BOOL]             Create a PID file\n"
+"      --no-cpu-limit[=BOOL]             Do not install CPU load limiter on\n"
+"                                        platforms that support it.\n"
+"      --disable-shm[=BOOL]              Disable shared memory support.\n"
+"\n"
+"STARTUP SCRIPT:\n"
+"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module "
+"with\n"
+"                                        the specified argument\n"
+"  -F, --file=FILENAME                   Run the specified script\n"
+"  -C                                    Open a command line on the running "
+"TTY\n"
+"                                        after startup\n"
+"\n"
+"  -n                                    Don't load default script file\n"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-util.c:1179
-#, c-format
-msgid ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
-"%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+#: ../src/daemon/cmdline.c:245
+msgid "--daemonize expects boolean argument"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-util.c:1220
-#, c-format
-msgid ""
-"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
-"%lu.\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+#: ../src/daemon/cmdline.c:253
+msgid "--fail expects boolean argument"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-util.c:1263
-#, c-format
+#: ../src/daemon/cmdline.c:264
 msgid ""
-"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
-"(%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
 msgstr ""
 
-#: ../src/modules/module-always-sink.c:38
-msgid "Always keeps at least one sink loaded even if it's a null one"
+#: ../src/daemon/cmdline.c:276
+msgid "--high-priority expects boolean argument"
 msgstr ""
 
-#: ../src/modules/module-always-sink.c:82
-msgid "Dummy Output"
+#: ../src/daemon/cmdline.c:284
+msgid "--realtime expects boolean argument"
 msgstr ""
 
-#: ../src/modules/module-ladspa-sink.c:48
-msgid "Virtual LADSPA sink"
+#: ../src/daemon/cmdline.c:292
+msgid "--disallow-module-loading expects boolean argument"
+msgstr ""
+
+#: ../src/daemon/cmdline.c:300
+msgid "--disallow-exit expects boolean argument"
+msgstr ""
+
+#: ../src/daemon/cmdline.c:308
+msgid "--use-pid-file expects boolean argument"
 msgstr ""
 
-#: ../src/modules/module-ladspa-sink.c:52
+#: ../src/daemon/cmdline.c:327
 msgid ""
-"sink_name=<name for the sink> sink_properties=<properties for the sink> "
-"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<input channel map> plugin=<ladspa "
-"plugin name> label=<ladspa plugin label> control=<comma separated list of "
-"input control values> input_ladspaport_map=<comma separated list of input "
-"LADSPA port names> output_ladspaport_map=<comma separated list of output "
-"LADSPA port names> "
+"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
 msgstr ""
 
-#: ../src/modules/module-null-sink.c:49
-msgid "Clocked NULL sink"
+#: ../src/daemon/cmdline.c:329
+msgid ""
+"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
+"name 'file:<path>', 'newfile:<path>'."
 msgstr ""
 
-#: ../src/modules/module-null-sink.c:284
-msgid "Null Output"
+#: ../src/daemon/cmdline.c:337
+msgid "--log-time expects boolean argument"
 msgstr ""
 
-#: ../src/pulsecore/sink.c:3349
-msgid "Built-in Audio"
-msgstr "?????????? ????"
+#: ../src/daemon/cmdline.c:345
+msgid "--log-meta expects boolean argument"
+msgstr ""
 
-#: ../src/pulsecore/sink.c:3354
-msgid "Modem"
-msgstr "Modem"
+#: ../src/daemon/cmdline.c:365
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr "Neplatn? met?da prevzorkovania ?%s?."
 
-#: ../src/daemon/ltdl-bind-now.c:127
-msgid "Failed to find original lt_dlopen loader."
+#: ../src/daemon/cmdline.c:372
+msgid "--system expects boolean argument"
+msgstr "Vo?ba --system o?ak?va booleovsk? parameter"
+
+#: ../src/daemon/cmdline.c:380
+msgid "--no-cpu-limit expects boolean argument"
 msgstr ""
 
-#: ../src/daemon/ltdl-bind-now.c:132
-msgid "Failed to allocate new dl loader."
+#: ../src/daemon/cmdline.c:388
+msgid "--disable-shm expects boolean argument"
 msgstr ""
 
-#: ../src/daemon/ltdl-bind-now.c:145
-msgid "Failed to add bind-now-loader."
+#: ../src/daemon/daemon-conf.c:260
+#, c-format
+msgid "[%s:%u] Invalid log target '%s'."
 msgstr ""
 
-#: ../src/daemon/main.c:139
+#: ../src/daemon/daemon-conf.c:275
 #, c-format
-msgid "Got signal %s."
-msgstr "????? ???? ??????? %s."
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr ""
 
-#: ../src/daemon/main.c:166
-msgid "Exiting."
-msgstr "??????."
+#: ../src/daemon/daemon-conf.c:290
+#, c-format
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr ""
 
-#: ../src/daemon/main.c:184
+#: ../src/daemon/daemon-conf.c:312
 #, c-format
-msgid "Failed to find user '%s'."
-msgstr "???????? ??????? ?????? '%s'."
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr ""
 
-#: ../src/daemon/main.c:189
+#: ../src/daemon/daemon-conf.c:332
 #, c-format
-msgid "Failed to find group '%s'."
-msgstr "???????? ??????? ?????? ??????? '%s'."
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr ""
 
-#: ../src/daemon/main.c:193
+#: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
 #, c-format
-msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
+msgid "[%s:%u] Invalid sample rate '%s'."
 msgstr ""
 
-#: ../src/daemon/main.c:198
+#: ../src/daemon/daemon-conf.c:389
 #, c-format
-msgid "GID of user '%s' and of group '%s' don't match."
+msgid "[%s:%u] Invalid sample channels '%s'."
 msgstr ""
 
-#: ../src/daemon/main.c:203
+#: ../src/daemon/daemon-conf.c:406
 #, c-format
-msgid "Home directory of user '%s' is not '%s', ignoring."
+msgid "[%s:%u] Invalid channel map '%s'."
 msgstr ""
 
-#: ../src/daemon/main.c:206 ../src/daemon/main.c:211
+#: ../src/daemon/daemon-conf.c:423
 #, c-format
-msgid "Failed to create '%s': %s"
+msgid "[%s:%u] Invalid number of fragments '%s'."
 msgstr ""
 
-#: ../src/daemon/main.c:218
+#: ../src/daemon/daemon-conf.c:440
 #, c-format
-msgid "Failed to change group list: %s"
+msgid "[%s:%u] Invalid fragment size '%s'."
 msgstr ""
 
-#: ../src/daemon/main.c:234
+#: ../src/daemon/daemon-conf.c:457
 #, c-format
-msgid "Failed to change GID: %s"
+msgid "[%s:%u] Invalid nice level '%s'."
 msgstr ""
 
-#: ../src/daemon/main.c:250
+#: ../src/daemon/daemon-conf.c:500
 #, c-format
-msgid "Failed to change UID: %s"
+msgid "[%s:%u] Invalid server type '%s'."
 msgstr ""
 
-#: ../src/daemon/main.c:269
-msgid "Successfully dropped root privileges."
+#: ../src/daemon/daemon-conf.c:613
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr "Zlyhalo otvorenie konfigura?n?ho s?boru: %s"
+
+#: ../src/daemon/daemon-conf.c:629
+msgid ""
+"The specified default channel map has a different number of channels than "
+"the specified default number of channels."
 msgstr ""
+"Ur?en? predvolen? mapa kan?lov obsahuje odli?n? po?et kan?lov ako je ur?en? "
+"predvolen? po?et kan?lov."
 
-#: ../src/daemon/main.c:277
-msgid "System wide mode unsupported on this platform."
+#: ../src/daemon/daemon-conf.c:716
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr "### ??ta? z konfigura?n?ho s?boru: %s ###\n"
+
+#: ../src/daemon/dumpmodules.c:59
+#, c-format
+msgid "Name: %s\n"
+msgstr "N?zov: %s\n"
+
+#: ../src/daemon/dumpmodules.c:62
+#, c-format
+msgid "No module information available\n"
+msgstr "Nie s? dostupn? ?iadne inform?cie o module\n"
+
+#: ../src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Version: %s\n"
+msgstr "Verzia: %s\n"
+
+#: ../src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Description: %s\n"
+msgstr "Popis: %s\n"
+
+#: ../src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: ../src/daemon/dumpmodules.c:71
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Vyu?itie: %s\n"
+
+#: ../src/daemon/dumpmodules.c:72
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "Na??tan? raz: %s\n"
+
+#: ../src/daemon/dumpmodules.c:74
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
 msgstr ""
 
-#: ../src/daemon/main.c:295
+#: ../src/daemon/dumpmodules.c:78
+#, c-format
+msgid "Path: %s\n"
+msgstr "Cesta: %s\n"
+
+#: ../src/daemon/ltdl-bind-now.c:77
 #, c-format
-msgid "setrlimit(%s, (%u, %u)) failed: %s"
+msgid "Failed to open module %s: %s"
+msgstr "Zlyhalo otvorenie modulu %s: %s"
+
+#: ../src/daemon/ltdl-bind-now.c:128
+msgid "Failed to find original lt_dlopen loader."
 msgstr ""
 
-#: ../src/daemon/main.c:496
-msgid "Failed to parse command line."
+#: ../src/daemon/ltdl-bind-now.c:133
+msgid "Failed to allocate new dl loader."
 msgstr ""
 
-#: ../src/daemon/main.c:529
-msgid ""
-"System mode refused for non-root user. Only starting the D-Bus server lookup "
-"service."
+#: ../src/daemon/ltdl-bind-now.c:146
+msgid "Failed to add bind-now-loader."
+msgstr ""
+
+#: ../src/daemon/main.c:158
+#, c-format
+msgid "Failed to find user '%s'."
+msgstr "Zlyhalo n?jdenie pou??vate?a ?%s?."
+
+#: ../src/daemon/main.c:163
+#, c-format
+msgid "Failed to find group '%s'."
+msgstr "Zlyhalo n?jdenie skupiny ?%s?."
+
+#: ../src/daemon/main.c:172
+#, c-format
+msgid "GID of user '%s' and of group '%s' don't match."
 msgstr ""
 
-#: ../src/daemon/main.c:611
-msgid "Daemon not running"
+#: ../src/daemon/main.c:177
+#, c-format
+msgid "Home directory of user '%s' is not '%s', ignoring."
 msgstr ""
 
-#: ../src/daemon/main.c:613
+#: ../src/daemon/main.c:180 ../src/daemon/main.c:185
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "Zlyhalo vytvorenie ?%s?: %s"
+
+#: ../src/daemon/main.c:192
+#, c-format
+msgid "Failed to change group list: %s"
+msgstr "Zlyhala zmena zoznamu skup?n: %s"
+
+#: ../src/daemon/main.c:208
 #, c-format
-msgid "Daemon running as PID %u"
+msgid "Failed to change GID: %s"
 msgstr ""
 
-#: ../src/daemon/main.c:628
+#: ../src/daemon/main.c:224
 #, c-format
-msgid "Failed to kill daemon: %s"
+msgid "Failed to change UID: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:253
+msgid "System wide mode unsupported on this platform."
+msgstr ""
+
+#: ../src/daemon/main.c:464
+msgid "Failed to parse command line."
+msgstr "Zlyhalo analyzovanie pr?kazov?ho riadku."
+
+#: ../src/daemon/main.c:503
+msgid ""
+"System mode refused for non-root user. Only starting the D-Bus server lookup "
+"service."
 msgstr ""
 
-#: ../src/daemon/main.c:657
+#: ../src/daemon/main.c:602
+#, c-format
+msgid "Failed to kill daemon: %s"
+msgstr "Zlyhalo zabitie slu?by: %s"
+
+#: ../src/daemon/main.c:631
 msgid ""
 "This program is not intended to be run as root (unless --system is "
 "specified)."
 msgstr ""
 
-#: ../src/daemon/main.c:660
+#: ../src/daemon/main.c:634
 msgid "Root privileges required."
-msgstr ""
+msgstr "Vy?aduj? sa privil?gi? spr?vcu"
 
-#: ../src/daemon/main.c:667
+#: ../src/daemon/main.c:641
 msgid "--start not supported for system instances."
-msgstr ""
+msgstr "Vo?ba --start nie je podporovan? pre syst?mov? in?tancie."
 
-#: ../src/daemon/main.c:707
+#: ../src/daemon/main.c:681
 #, c-format
 msgid "User-configured server at %s, refusing to start/autospawn."
 msgstr ""
 
-#: ../src/daemon/main.c:713
+#: ../src/daemon/main.c:687
 #, c-format
 msgid ""
 "User-configured server at %s, which appears to be local. Probing deeper."
 msgstr ""
 
-#: ../src/daemon/main.c:718
+#: ../src/daemon/main.c:692
 msgid "Running in system mode, but --disallow-exit not set!"
 msgstr ""
 
-#: ../src/daemon/main.c:721
+#: ../src/daemon/main.c:695
 msgid "Running in system mode, but --disallow-module-loading not set!"
 msgstr ""
 
-#: ../src/daemon/main.c:724
+#: ../src/daemon/main.c:698
 msgid "Running in system mode, forcibly disabling SHM mode!"
 msgstr ""
 
-#: ../src/daemon/main.c:729
+#: ../src/daemon/main.c:703
 msgid "Running in system mode, forcibly disabling exit idle time!"
 msgstr ""
 
-#: ../src/daemon/main.c:757
+#: ../src/daemon/main.c:736
 msgid "Failed to acquire stdio."
 msgstr ""
 
-#: ../src/daemon/main.c:763 ../src/daemon/main.c:828
+#: ../src/daemon/main.c:742 ../src/daemon/main.c:813
 #, c-format
 msgid "pipe() failed: %s"
 msgstr ""
 
-#: ../src/daemon/main.c:768 ../src/daemon/main.c:833
+#: ../src/daemon/main.c:747 ../src/daemon/main.c:818
 #, c-format
 msgid "fork() failed: %s"
 msgstr ""
 
-#: ../src/daemon/main.c:783 ../src/daemon/main.c:848 ../src/utils/pacat.c:550
+#: ../src/daemon/main.c:762 ../src/daemon/main.c:833 ../src/utils/pacat.c:569
 #, c-format
 msgid "read() failed: %s"
 msgstr ""
 
-#: ../src/daemon/main.c:789
+#: ../src/daemon/main.c:768
 msgid "Daemon startup failed."
-msgstr ""
+msgstr "Zlyhalo spustenie slu?by."
 
-#: ../src/daemon/main.c:791
-msgid "Daemon startup successful."
-msgstr ""
-
-#: ../src/daemon/main.c:816
-#, fuzzy, c-format
+#: ../src/daemon/main.c:801
+#, c-format
 msgid "setsid() failed: %s"
-msgstr "???????? ????????: %s"
+msgstr ""
 
-#: ../src/daemon/main.c:901
-#, c-format
-msgid "This is PulseAudio %s"
-msgstr "???? ????? ?? PulseAudio %s"
+#: ../src/daemon/main.c:924
+msgid "Failed to get machine ID"
+msgstr "Zlyhalo z?skanie identifik?tora stroja"
 
-#: ../src/daemon/main.c:902
-#, c-format
-msgid "Compilation host: %s"
+#: ../src/daemon/main.c:950
+msgid ""
+"OK, so you are running PA in system mode. Please note that you most likely "
+"shouldn't be doing that.\n"
+"If you do it nonetheless then it's your own fault if things don't work as "
+"expected.\n"
+"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
+"explanation why system mode is usually a bad idea."
 msgstr ""
 
-#: ../src/daemon/main.c:903 ../src/tests/resampler-test.c:418
-#, c-format
-msgid "Compilation CFLAGS: %s"
+#: ../src/daemon/main.c:967
+msgid "pa_pid_file_create() failed."
 msgstr ""
 
-#: ../src/daemon/main.c:906
-#, c-format
-msgid "Running on host: %s"
+#: ../src/daemon/main.c:997
+msgid "pa_core_new() failed."
 msgstr ""
 
-#: ../src/daemon/main.c:909
-#, c-format
-msgid "Found %u CPUs."
-msgstr ""
+#: ../src/daemon/main.c:1064
+msgid "Failed to initialize daemon."
+msgstr "Zlyhala inicializ?cia slu?by."
 
-#: ../src/daemon/main.c:911
-#, c-format
-msgid "Page size is %lu bytes"
+#: ../src/daemon/main.c:1069
+msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr ""
 
-#: ../src/daemon/main.c:914
-msgid "Compiled with Valgrind support: yes"
-msgstr ""
+#: ../src/daemon/pulseaudio.desktop.in.h:1
+msgid "PulseAudio Sound System"
+msgstr "Zvukov? syst?m PulseAudio"
 
-#: ../src/daemon/main.c:916
-msgid "Compiled with Valgrind support: no"
-msgstr ""
+#: ../src/daemon/pulseaudio.desktop.in.h:2
+msgid "Start the PulseAudio Sound System"
+msgstr "Spustenie zvukov?ho syst?mu PulseAudio"
 
-#: ../src/daemon/main.c:919
-#, c-format
-msgid "Running in valgrind mode: %s"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2293
+msgid "Input"
+msgstr "Vstup"
 
-#: ../src/daemon/main.c:921
-#, c-format
-msgid "Running in VM: %s"
+#: ../src/modules/alsa/alsa-mixer.c:2294
+msgid "Docking Station Input"
 msgstr ""
 
-#: ../src/daemon/main.c:924
-msgid "Optimized build: yes"
+#: ../src/modules/alsa/alsa-mixer.c:2295
+msgid "Docking Station Microphone"
 msgstr ""
 
-#: ../src/daemon/main.c:926
-msgid "Optimized build: no"
+#: ../src/modules/alsa/alsa-mixer.c:2296
+msgid "Docking Station Line In"
 msgstr ""
 
-#: ../src/daemon/main.c:930
-msgid "NDEBUG defined, all asserts disabled."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2297 ../src/modules/alsa/alsa-mixer.c:2382
+msgid "Line In"
+msgstr "Vstupn? linka"
 
-#: ../src/daemon/main.c:932
-msgid "FASTPATH defined, only fast path asserts disabled."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2376
+#: ../src/modules/bluetooth/module-bluez4-device.c:2101
+#: ../src/modules/bluetooth/module-bluez5-device.c:1635
+msgid "Microphone"
+msgstr "Mikrof?n"
 
-#: ../src/daemon/main.c:934
-msgid "All asserts enabled."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377
+msgid "Front Microphone"
+msgstr "Predn? mikrof?n"
 
-#: ../src/daemon/main.c:938
-msgid "Failed to get machine ID"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378
+msgid "Rear Microphone"
+msgstr "Zadn? mikrof?n"
 
-#: ../src/daemon/main.c:941
-#, c-format
-msgid "Machine ID is %s."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2301
+msgid "External Microphone"
+msgstr "Extern? mikrof?n"
 
-#: ../src/daemon/main.c:945
-#, c-format
-msgid "Session ID is %s."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2302 ../src/modules/alsa/alsa-mixer.c:2380
+msgid "Internal Microphone"
+msgstr "Vstavan? mikrof?n"
 
-#: ../src/daemon/main.c:951
-#, c-format
-msgid "Using runtime directory %s."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2383
+msgid "Radio"
+msgstr "R?dio"
 
-#: ../src/daemon/main.c:956
-#, c-format
-msgid "Using state directory %s."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2384
+msgid "Video"
+msgstr "Video"
 
-#: ../src/daemon/main.c:959
-#, c-format
-msgid "Using modules directory %s."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2305
+msgid "Automatic Gain Control"
+msgstr "Automatick? ovl?danie zosilnenia"
 
-#: ../src/daemon/main.c:961
-#, c-format
-msgid "Running in system mode: %s"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2306
+msgid "No Automatic Gain Control"
+msgstr "Bez automatick?ho ovl?dania zosilnenia"
 
-#: ../src/daemon/main.c:964
-msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely "
-"shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as "
-"expected.\n"
-"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-"explanation why system mode is usually a bad idea."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2307
+msgid "Boost"
+msgstr "Zosilnenie"
 
-#: ../src/daemon/main.c:981
-msgid "pa_pid_file_create() failed."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2308
+msgid "No Boost"
+msgstr "Bez zosilnenia"
 
-#: ../src/daemon/main.c:991
-msgid "Fresh high-resolution timers available! Bon appetit!"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2309
+msgid "Amplifier"
+msgstr "Zosil?ova?"
 
-#: ../src/daemon/main.c:993
-msgid ""
-"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
-"resolution timers enabled!"
-msgstr ""
-"???? ???, ? ??????? ??? ????? ??? ?? ?????! ? ??????? ??? ??? ?????? ????? "
-"Linux ?? ?????????????? ?? high-resolution timers!"
+#: ../src/modules/alsa/alsa-mixer.c:2310
+msgid "No Amplifier"
+msgstr "Bez zosil?ova?a"
 
-#: ../src/daemon/main.c:1011
-msgid "pa_core_new() failed."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2311
+msgid "Bass Boost"
+msgstr "Zosilnenie basov"
 
-#: ../src/daemon/main.c:1087
-msgid "Failed to initialize daemon."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2312
+msgid "No Bass Boost"
+msgstr "Bez zosilnenia basov"
 
-#: ../src/daemon/main.c:1092
-msgid "Daemon startup without any loaded modules, refusing to work."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2313
+#: ../src/modules/bluetooth/module-bluez4-device.c:2106
+#: ../src/modules/bluetooth/module-bluez5-device.c:1642
+msgid "Speaker"
+msgstr "Reproduktor"
 
-#: ../src/daemon/main.c:1130
-msgid "Daemon startup complete."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2314 ../src/modules/alsa/alsa-mixer.c:2386
+msgid "Headphones"
+msgstr "Sl?chadl?"
 
-#: ../src/daemon/main.c:1136
-msgid "Daemon shutdown initiated."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2375
+msgid "Analog Input"
+msgstr "Anal?gov? vstup"
 
-#: ../src/daemon/main.c:1167
-msgid "Daemon terminated."
+#: ../src/modules/alsa/alsa-mixer.c:2379
+msgid "Dock Microphone"
 msgstr ""
 
-#: ../src/daemon/cmdline.c:113
-#, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-"COMMANDS:\n"
-"  -h, --help                            Show this help\n"
-"      --version                         Show version\n"
-"      --dump-conf                       Dump default configuration\n"
-"      --dump-modules                    Dump list of available modules\n"
-"      --dump-resample-methods           Dump available resample methods\n"
-"      --cleanup-shm                     Cleanup stale shared memory "
-"segments\n"
-"      --start                           Start the daemon if it is not "
-"running\n"
-"  -k  --kill                            Kill a running daemon\n"
-"      --check                           Check for a running daemon (only "
-"returns exit code)\n"
-"\n"
-"OPTIONS:\n"
-"      --system[=BOOL]                   Run as system-wide instance\n"
-"  -D, --daemonize[=BOOL]                Daemonize after startup\n"
-"      --fail[=BOOL]                     Quit when startup fails\n"
-"      --high-priority[=BOOL]            Try to set high nice level\n"
-"                                        (only available as root, when SUID "
-"or\n"
-"                                        with elevated RLIMIT_NICE)\n"
-"      --realtime[=BOOL]                 Try to enable realtime scheduling\n"
-"                                        (only available as root, when SUID "
-"or\n"
-"                                        with elevated RLIMIT_RTPRIO)\n"
-"      --disallow-module-loading[=BOOL]  Disallow module user requested "
-"module\n"
-"                                        loading/unloading after startup\n"
-"      --disallow-exit[=BOOL]            Disallow user requested exit\n"
-"      --exit-idle-time=SECS             Terminate the daemon when idle and "
-"this\n"
-"                                        time passed\n"
-"      --scache-idle-time=SECS           Unload autoloaded samples when idle "
-"and\n"
-"                                        this time passed\n"
-"      --log-level[=LEVEL]               Increase or set verbosity level\n"
-"  -v                                    Increase the verbosity level\n"
-"      --log-target={auto,syslog,stderr,file:PATH}\n"
-"                                        Specify the log target\n"
-"      --log-meta[=BOOL]                 Include code location in log "
-"messages\n"
-"      --log-time[=BOOL]                 Include timestamps in log messages\n"
-"      --log-backtrace=FRAMES            Include a backtrace in log messages\n"
-"  -p, --dl-search-path=PATH             Set the search path for dynamic "
-"shared\n"
-"                                        objects (plugins)\n"
-"      --resample-method=METHOD          Use the specified resampling method\n"
-"                                        (See --dump-resample-methods for\n"
-"                                        possible values)\n"
-"      --use-pid-file[=BOOL]             Create a PID file\n"
-"      --no-cpu-limit[=BOOL]             Do not install CPU load limiter on\n"
-"                                        platforms that support it.\n"
-"      --disable-shm[=BOOL]              Disable shared memory support.\n"
-"\n"
-"STARTUP SCRIPT:\n"
-"  -L, --load=\"MODULE ARGUMENTS\"         Load the specified plugin module "
-"with\n"
-"                                        the specified argument\n"
-"  -F, --file=FILENAME                   Run the specified script\n"
-"  -C                                    Open a command line on the running "
-"TTY\n"
-"                                        after startup\n"
-"\n"
-"  -n                                    Don't load default script file\n"
+#: ../src/modules/alsa/alsa-mixer.c:2381
+msgid "Headset Microphone"
 msgstr ""
 
-#: ../src/daemon/cmdline.c:244
-msgid "--daemonize expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2385
+msgid "Analog Output"
+msgstr "Anal?gov? v?stup"
 
-#: ../src/daemon/cmdline.c:251
-msgid "--fail expects boolean argument"
+#: ../src/modules/alsa/alsa-mixer.c:2387
+msgid "LFE on Separate Mono Output"
 msgstr ""
 
-#: ../src/daemon/cmdline.c:261
-msgid ""
-"--log-level expects log level argument (either numeric in range 0..4 or one "
-"of debug, info, notice, warn, error)."
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2388
+msgid "Line Out"
+msgstr "V?stupn? linka"
 
-#: ../src/daemon/cmdline.c:273
-msgid "--high-priority expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2389
+msgid "Analog Mono Output"
+msgstr "Anal?gov? mono v?stup"
 
-#: ../src/daemon/cmdline.c:280
-msgid "--realtime expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2390
+msgid "Speakers"
+msgstr "Reproduktory"
 
-#: ../src/daemon/cmdline.c:287
-msgid "--disallow-module-loading expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2391
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / DisplayPort"
 
-#: ../src/daemon/cmdline.c:294
-msgid "--disallow-exit expects boolean argument"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:2392
+msgid "Digital Output (S/PDIF)"
+msgstr "Digit?lny v?stup (S/PDIF)"
 
-#: ../src/daemon/cmdline.c:301
-msgid "--use-pid-file expects boolean argument"
+#: ../src/modules/alsa/alsa-mixer.c:2393
+msgid "Digital Input (S/PDIF)"
+msgstr "Digit?lny vstup (S/PDIF)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2394
+msgid "Digital Passthrough (S/PDIF)"
+msgstr "Digit?lny prechod (S/PDIF)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3901
+msgid "Analog Mono"
+msgstr "Anal?gov? mono"
+
+#: ../src/modules/alsa/alsa-mixer.c:3902
+msgid "Analog Stereo"
+msgstr "Anal?gov? stereo"
+
+#: ../src/modules/alsa/alsa-mixer.c:3903
+msgid "Multichannel"
+msgstr "Viackan?lov?"
+
+#: ../src/modules/alsa/alsa-mixer.c:3904
+msgid "Analog Surround 2.1"
+msgstr "Anal?gov? priestorov? 2.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3905
+msgid "Analog Surround 3.0"
+msgstr "Anal?gov? priestorov? 3.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3906
+msgid "Analog Surround 3.1"
+msgstr "Anal?gov? priestorov? 3.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3907
+msgid "Analog Surround 4.0"
+msgstr "Anal?gov? priestorov? 4.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3908
+msgid "Analog Surround 4.1"
+msgstr "Anal?gov? priestorov? 4.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3909
+msgid "Analog Surround 5.0"
+msgstr "Anal?gov? priestorov? 5.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3910
+msgid "Analog Surround 5.1"
+msgstr "Anal?gov? priestorov? 5.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3911
+msgid "Analog Surround 6.0"
+msgstr "Anal?gov? priestorov? 6.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3912
+msgid "Analog Surround 6.1"
+msgstr "Anal?gov? priestorov? 6.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3913
+msgid "Analog Surround 7.0"
+msgstr "Anal?gov? priestorov? 7.0"
+
+#: ../src/modules/alsa/alsa-mixer.c:3914
+msgid "Analog Surround 7.1"
+msgstr "Anal?gov? priestorov? 7.1"
+
+#: ../src/modules/alsa/alsa-mixer.c:3915
+msgid "Digital Stereo (IEC958)"
+msgstr "Digit?lne stereo (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3916
+msgid "Digital Passthrough  (IEC958)"
+msgstr "Digit?lny prechod  (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3917
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Digit?lny priestorov? 4.0 (IEC958/AC3)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3918
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Digit?lny priestorov? 5.1 (IEC958/AC3)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3919
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Digit?lny priestorov? 5.1 (IEC958/DTS)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3920
+msgid "Digital Stereo (HDMI)"
+msgstr "Digit?lny stereo (HDMI)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3921
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "Digit?lny priestorov? 5.1 (HDMI)"
+
+#: ../src/modules/alsa/alsa-mixer.c:4052
+msgid "Analog Mono Duplex"
+msgstr "Obojsmern? anal?gov? mono"
+
+#: ../src/modules/alsa/alsa-mixer.c:4053
+msgid "Analog Stereo Duplex"
+msgstr "Obojsmern? anal?gov? stereo"
+
+#: ../src/modules/alsa/alsa-mixer.c:4054
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "Obojsmern? digit?lny stereo (IEC958)"
+
+#: ../src/modules/alsa/alsa-mixer.c:4055
+#: ../src/modules/alsa/module-alsa-card.c:192
+#: ../src/modules/bluetooth/module-bluez4-device.c:2297
+#: ../src/modules/bluetooth/module-bluez5-device.c:1866
+msgid "Off"
+msgstr "Vypnut?"
+
+#: ../src/modules/alsa/alsa-mixer.c:4154
+#, c-format
+msgid "%s Output"
+msgstr "%s v?stup"
+
+#: ../src/modules/alsa/alsa-mixer.c:4162
+#, c-format
+msgid "%s Input"
+msgstr "%s vstup"
+
+#: ../src/modules/alsa/alsa-sink.c:570 ../src/modules/alsa/alsa-sink.c:748
+#, c-format
+msgid ""
+"ALSA woke us up to write new data to the device, but there was actually "
+"nothing to write!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
 msgstr ""
 
-#: ../src/daemon/cmdline.c:318
+#: ../src/modules/alsa/alsa-source.c:529 ../src/modules/alsa/alsa-source.c:681
+#, c-format
 msgid ""
-"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
-"name 'file:<path>'."
+"ALSA woke us up to read new data from the device, but there was actually "
+"nothing to read!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
 msgstr ""
 
-#: ../src/daemon/cmdline.c:325
-msgid "--log-time expects boolean argument"
+#: ../src/modules/alsa/alsa-util.c:1135 ../src/modules/alsa/alsa-util.c:1210
+#, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
 
-#: ../src/daemon/cmdline.c:332
-msgid "--log-meta expects boolean argument"
+#: ../src/modules/alsa/alsa-util.c:1185
+#, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
 
-#: ../src/daemon/cmdline.c:351
+#: ../src/modules/alsa/alsa-util.c:1226
 #, c-format
-msgid "Invalid resample method '%s'."
+msgid ""
+"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
+"%lu.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
 
-#: ../src/daemon/cmdline.c:358
-msgid "--system expects boolean argument"
+#: ../src/modules/alsa/alsa-util.c:1269
+#, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
 msgstr ""
 
-#: ../src/daemon/cmdline.c:365
-msgid "--no-cpu-limit expects boolean argument"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2091
+#: ../src/modules/bluetooth/module-bluez5-device.c:1625
+msgid "Headset"
 msgstr ""
 
-#: ../src/daemon/cmdline.c:372
-msgid "--disable-shm expects boolean argument"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2096
+#: ../src/modules/bluetooth/module-bluez5-device.c:1630
+msgid "Handsfree"
 msgstr ""
 
-#: ../src/daemon/dumpmodules.c:59
-#, c-format
-msgid "Name: %s\n"
-msgstr "?????: %s\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2111
+#: ../src/modules/bluetooth/module-bluez5-device.c:1648
+msgid "Headphone"
+msgstr "Sl?chadlo"
 
-#: ../src/daemon/dumpmodules.c:62
-#, c-format
-msgid "No module information available\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2116
+#: ../src/modules/bluetooth/module-bluez5-device.c:1653
+msgid "Portable"
 msgstr ""
 
-#: ../src/daemon/dumpmodules.c:65
-#, c-format
-msgid "Version: %s\n"
-msgstr "??????: %s\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2121
+#: ../src/modules/bluetooth/module-bluez5-device.c:1658
+msgid "Car"
+msgstr "Automobil"
 
-#: ../src/daemon/dumpmodules.c:67
-#, c-format
-msgid "Description: %s\n"
-msgstr "?????????: %s\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2126
+#: ../src/modules/bluetooth/module-bluez5-device.c:1663
+msgid "HiFi"
+msgstr "HiFi"
 
-#: ../src/daemon/dumpmodules.c:69
-#, c-format
-msgid "Author: %s\n"
-msgstr "??????????: %s\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2131
+#: ../src/modules/bluetooth/module-bluez5-device.c:1668
+msgid "Phone"
+msgstr "Telef?n"
 
-#: ../src/daemon/dumpmodules.c:71
-#, c-format
-msgid "Usage: %s\n"
-msgstr "?????: %s\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2139
+#: ../src/modules/bluetooth/module-bluez5-device.c:1620
+#: ../src/modules/bluetooth/module-bluez5-device.c:1636
+#: ../src/modules/bluetooth/module-bluez5-device.c:1674
+msgid "Bluetooth Output"
+msgstr "V?stup cez Bluetooth"
 
-#: ../src/daemon/dumpmodules.c:72
-#, c-format
-msgid "Load Once: %s\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2142
+#: ../src/modules/bluetooth/module-bluez5-device.c:1619
+#: ../src/modules/bluetooth/module-bluez5-device.c:1641
+#: ../src/modules/bluetooth/module-bluez5-device.c:1647
+#: ../src/modules/bluetooth/module-bluez5-device.c:1673
+msgid "Bluetooth Input"
+msgstr "Vstup cez Bluetooth"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2178
+msgid "High Fidelity Playback (A2DP)"
 msgstr ""
 
-#: ../src/daemon/dumpmodules.c:74
-#, c-format
-msgid "DEPRECATION WARNING: %s\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2189
+msgid "High Fidelity Capture (A2DP)"
 msgstr ""
 
-#: ../src/daemon/dumpmodules.c:78
-#, c-format
-msgid "Path: %s\n"
+#: ../src/modules/bluetooth/module-bluez4-device.c:2200
+msgid "Telephony Duplex (HSP/HFP)"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:275
-#, c-format
-msgid "[%s:%u] Invalid log target '%s'."
+#: ../src/modules/bluetooth/module-bluez4-device.c:2212
+msgid "Handsfree Gateway"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:291
-#, c-format
-msgid "[%s:%u] Invalid log level '%s'."
+#: ../src/modules/bluetooth/module-bluez5-device.c:1711
+msgid "High Fidelity Playback (A2DP Sink)"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:307
-#, c-format
-msgid "[%s:%u] Invalid resample method '%s'."
+#: ../src/modules/bluetooth/module-bluez5-device.c:1722
+msgid "High Fidelity Capture (A2DP Source)"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:330
-#, c-format
-msgid "[%s:%u] Invalid rlimit '%s'."
+#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+msgid "Headset Head Unit (HSP/HFP)"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:351
-#, c-format
-msgid "[%s:%u] Invalid sample format '%s'."
+#: ../src/modules/bluetooth/module-bluez5-device.c:1745
+msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:370 ../src/daemon/daemon-conf.c:389
-#, c-format
-msgid "[%s:%u] Invalid sample rate '%s'."
+#: ../src/modules/echo-cancel/module-echo-cancel.c:63
+msgid ""
+"source_name=<name for the source> source_properties=<properties for the "
+"source> source_master=<name of source to filter> sink_name=<name for the "
+"sink> sink_properties=<properties for the sink> sink_master=<name of sink to "
+"filter> adjust_time=<how often to readjust rates in s> adjust_threshold=<how "
+"much drift to readjust after in ms> format=<sample format> rate=<sample "
+"rate> channels=<number of channels> channel_map=<channel map> "
+"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
+"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
+"loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:413
-#, c-format
-msgid "[%s:%u] Invalid sample channels '%s'."
+#. add on profile
+#: ../src/modules/macosx/module-coreaudio-device.c:756
+msgid "On"
+msgstr "Zapnut?"
+
+#: ../src/modules/module-always-sink.c:38
+msgid "Always keeps at least one sink loaded even if it's a null one"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:431
-#, c-format
-msgid "[%s:%u] Invalid channel map '%s'."
+#: ../src/modules/module-always-sink.c:82
+msgid "Dummy Output"
+msgstr "Fikt?vny v?stup"
+
+#: ../src/modules/module-equalizer-sink.c:72
+msgid "General Purpose Equalizer"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:449
-#, c-format
-msgid "[%s:%u] Invalid number of fragments '%s'."
+#: ../src/modules/module-equalizer-sink.c:76
+msgid ""
+"sink_name=<name of the sink> sink_properties=<properties for the sink> "
+"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
+"this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:467
-#, c-format
-msgid "[%s:%u] Invalid fragment size '%s'."
+#: ../src/modules/module-filter-apply.c:48
+msgid "autoclean=<automatically unload unused filters?>"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:485
-#, c-format
-msgid "[%s:%u] Invalid nice level '%s'."
+#: ../src/modules/module-ladspa-sink.c:53
+msgid "Virtual LADSPA sink"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:528
-#, c-format
-msgid "[%s:%u] Invalid server type '%s'."
+#: ../src/modules/module-ladspa-sink.c:57
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<input channel map> plugin=<ladspa "
+"plugin name> label=<ladspa plugin label> control=<comma separated list of "
+"input control values> input_ladspaport_map=<comma separated list of input "
+"LADSPA port names> output_ladspaport_map=<comma separated list of output "
+"LADSPA port names> "
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:641
-#, c-format
-msgid "Failed to open configuration file: %s"
+#: ../src/modules/module-null-sink.c:49
+msgid "Clocked NULL sink"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:657
-msgid ""
-"The specified default channel map has a different number of channels than "
-"the specified default number of channels."
+#: ../src/modules/module-null-sink.c:280
+msgid "Null Output"
 msgstr ""
 
-#: ../src/daemon/daemon-conf.c:743
-#, c-format
-msgid "### Read from configuration file: %s ###\n"
+#: ../src/modules/module-rygel-media-server.c:510
+#: ../src/modules/module-rygel-media-server.c:548
+#: ../src/modules/module-rygel-media-server.c:907
+msgid "Output Devices"
+msgstr "V?stupn? zariadenia"
+
+#: ../src/modules/module-rygel-media-server.c:511
+#: ../src/modules/module-rygel-media-server.c:549
+#: ../src/modules/module-rygel-media-server.c:908
+msgid "Input Devices"
+msgstr "Vstupn? zariadenia"
+
+#: ../src/modules/module-rygel-media-server.c:1065
+msgid "Audio on @HOSTNAME@"
 msgstr ""
 
-#: ../src/daemon/caps.c:58
-msgid "Cleaning up privileges."
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
+#: ../src/modules/module-tunnel-sink-new.c:299
+#: ../src/modules/module-tunnel-source-new.c:307
+#, c-format
+msgid "Tunnel for %s@%s"
 msgstr ""
 
-#: ../src/daemon/pulseaudio.desktop.in.h:1
-msgid "PulseAudio Sound System"
+#: ../src/modules/module-tunnel-sink-new.c:509
+#: ../src/modules/module-tunnel-source-new.c:518
+#, c-format
+msgid "Tunnel to %s/%s"
 msgstr ""
 
-#: ../src/daemon/pulseaudio.desktop.in.h:2
-msgid "Start the PulseAudio Sound System"
+#: ../src/modules/module-virtual-surround-sink.c:49
+msgid "Virtual surround sink"
 msgstr ""
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:1
-msgid "PulseAudio Sound System KDE Routing Policy"
+#: ../src/modules/module-virtual-surround-sink.c:53
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> "
+"use_volume_sharing=<yes or no> force_flat_volume=<yes or no> hrir=/path/to/"
+"left_hrir.wav "
 msgstr ""
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:2
-msgid "Start the PulseAudio Sound System with KDE Routing Policy"
-msgstr ""
+#: ../src/modules/reserve-wrap.c:151
+msgid "PulseAudio Sound Server"
+msgstr "Zvukov? server PulseAudio"
 
-#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:757
+#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:760
 msgid "Mono"
 msgstr "Mono"
 
 #: ../src/pulse/channelmap.c:107
 msgid "Front Center"
-msgstr ""
+msgstr "Predn? stredov?"
 
 #: ../src/pulse/channelmap.c:108
 msgid "Front Left"
-msgstr ""
+msgstr "Predn? ?av?"
 
 #: ../src/pulse/channelmap.c:109
 msgid "Front Right"
-msgstr ""
+msgstr "Predn? prav?"
 
 #: ../src/pulse/channelmap.c:111
 msgid "Rear Center"
-msgstr ""
+msgstr "Zadn? stredov?"
 
 #: ../src/pulse/channelmap.c:112
 msgid "Rear Left"
-msgstr ""
+msgstr "Zadn? ?av?"
 
 #: ../src/pulse/channelmap.c:113
 msgid "Rear Right"
-msgstr ""
+msgstr "Zadn? prav?"
 
 #: ../src/pulse/channelmap.c:115
 msgid "Subwoofer"
-msgstr ""
+msgstr "Basov? reproduktor"
 
 #: ../src/pulse/channelmap.c:117
 msgid "Front Left-of-center"
@@ -742,214 +1015,301 @@ msgstr ""
 
 #: ../src/pulse/channelmap.c:120
 msgid "Side Left"
-msgstr ""
+msgstr "?av? strana"
 
 #: ../src/pulse/channelmap.c:121
 msgid "Side Right"
-msgstr ""
+msgstr "Prav? strana"
 
 #: ../src/pulse/channelmap.c:123
 msgid "Auxiliary 0"
-msgstr "Auxiliary 0"
+msgstr "Aux 0"
 
 #: ../src/pulse/channelmap.c:124
 msgid "Auxiliary 1"
-msgstr "Auxiliary 1"
+msgstr "Aux 1"
 
 #: ../src/pulse/channelmap.c:125
 msgid "Auxiliary 2"
-msgstr "Auxiliary 2"
+msgstr "Aux 2"
 
 #: ../src/pulse/channelmap.c:126
 msgid "Auxiliary 3"
-msgstr "Auxiliary 3"
+msgstr "Aux 3"
 
 #: ../src/pulse/channelmap.c:127
 msgid "Auxiliary 4"
-msgstr "Auxiliary 4"
+msgstr "Aux 4"
 
 #: ../src/pulse/channelmap.c:128
 msgid "Auxiliary 5"
-msgstr "Auxiliary 5"
+msgstr "Aux 5"
 
 #: ../src/pulse/channelmap.c:129
 msgid "Auxiliary 6"
-msgstr "Auxiliary 6"
+msgstr "Aux 6"
 
 #: ../src/pulse/channelmap.c:130
 msgid "Auxiliary 7"
-msgstr "Auxiliary 7"
+msgstr "Aux 7"
 
 #: ../src/pulse/channelmap.c:131
 msgid "Auxiliary 8"
-msgstr "Auxiliary 8"
+msgstr "Aux 8"
 
 #: ../src/pulse/channelmap.c:132
 msgid "Auxiliary 9"
-msgstr "Auxiliary 9"
+msgstr "Aux 9"
 
 #: ../src/pulse/channelmap.c:133
 msgid "Auxiliary 10"
-msgstr "Auxiliary 10"
+msgstr "Aux 10"
 
 #: ../src/pulse/channelmap.c:134
 msgid "Auxiliary 11"
-msgstr "Auxiliary 11"
+msgstr "Aux 11"
 
 #: ../src/pulse/channelmap.c:135
 msgid "Auxiliary 12"
-msgstr "Auxiliary 12"
+msgstr "Aux 12"
 
 #: ../src/pulse/channelmap.c:136
 msgid "Auxiliary 13"
-msgstr "Auxiliary 13"
+msgstr "Aux 13"
 
 #: ../src/pulse/channelmap.c:137
 msgid "Auxiliary 14"
-msgstr "Auxiliary 14"
+msgstr "Aux 14"
 
 #: ../src/pulse/channelmap.c:138
 msgid "Auxiliary 15"
-msgstr "Auxiliary 15"
+msgstr "Aux 15"
 
 #: ../src/pulse/channelmap.c:139
 msgid "Auxiliary 16"
-msgstr "Auxiliary 16"
+msgstr "Aux 16"
 
 #: ../src/pulse/channelmap.c:140
 msgid "Auxiliary 17"
-msgstr "Auxiliary 17"
+msgstr "Aux 17"
 
 #: ../src/pulse/channelmap.c:141
 msgid "Auxiliary 18"
-msgstr "Auxiliary 18"
+msgstr "Aux 18"
 
 #: ../src/pulse/channelmap.c:142
 msgid "Auxiliary 19"
-msgstr "Auxiliary 19"
+msgstr "Aux 19"
 
 #: ../src/pulse/channelmap.c:143
 msgid "Auxiliary 20"
-msgstr "Auxiliary 20"
+msgstr "Aux 20"
 
 #: ../src/pulse/channelmap.c:144
 msgid "Auxiliary 21"
-msgstr "Auxiliary 21"
+msgstr "Aux 21"
 
 #: ../src/pulse/channelmap.c:145
 msgid "Auxiliary 22"
-msgstr "Auxiliary 22"
+msgstr "Aux 22"
 
 #: ../src/pulse/channelmap.c:146
 msgid "Auxiliary 23"
-msgstr "Auxiliary 23"
+msgstr "Aux 23"
 
 #: ../src/pulse/channelmap.c:147
 msgid "Auxiliary 24"
-msgstr "Auxiliary 24"
+msgstr "Aux 24"
 
 #: ../src/pulse/channelmap.c:148
 msgid "Auxiliary 25"
-msgstr "Auxiliary 25"
+msgstr "Aux 25"
 
 #: ../src/pulse/channelmap.c:149
 msgid "Auxiliary 26"
-msgstr "Auxiliary 26"
+msgstr "Aux 26"
 
 #: ../src/pulse/channelmap.c:150
 msgid "Auxiliary 27"
-msgstr "Auxiliary 27"
+msgstr "Aux 27"
 
 #: ../src/pulse/channelmap.c:151
 msgid "Auxiliary 28"
-msgstr "Auxiliary 28"
+msgstr "Aux 28"
 
 #: ../src/pulse/channelmap.c:152
 msgid "Auxiliary 29"
-msgstr "Auxiliary 29"
+msgstr "Aux 29"
 
 #: ../src/pulse/channelmap.c:153
 msgid "Auxiliary 30"
-msgstr "Auxiliary 30"
+msgstr "Aux 30"
 
 #: ../src/pulse/channelmap.c:154
 msgid "Auxiliary 31"
-msgstr "Auxiliary 31"
+msgstr "Aux 31"
 
 #: ../src/pulse/channelmap.c:156
 msgid "Top Center"
-msgstr ""
+msgstr "Horn? stredov?"
 
 #: ../src/pulse/channelmap.c:158
 msgid "Top Front Center"
-msgstr ""
+msgstr "Horn? predn? stredov?"
 
 #: ../src/pulse/channelmap.c:159
 msgid "Top Front Left"
-msgstr ""
+msgstr "Horn? predn? ?av?"
 
 #: ../src/pulse/channelmap.c:160
 msgid "Top Front Right"
-msgstr ""
+msgstr "Horn? predn? prav?"
 
 #: ../src/pulse/channelmap.c:162
 msgid "Top Rear Center"
-msgstr ""
+msgstr "Horn? zadn? stredov?"
 
 #: ../src/pulse/channelmap.c:163
 msgid "Top Rear Left"
-msgstr ""
+msgstr "Horn? zadn? ?av?"
 
 #: ../src/pulse/channelmap.c:164
 msgid "Top Rear Right"
-msgstr ""
+msgstr "Horn? zadn? prav?"
 
-#: ../src/pulse/channelmap.c:484 ../src/pulse/sample.c:169
-#: ../src/pulse/volume.c:297 ../src/pulse/volume.c:323
-#: ../src/pulse/volume.c:343 ../src/pulse/volume.c:373
-#: ../src/pulse/format.c:125
+#: ../src/pulse/channelmap.c:481 ../src/pulse/format.c:123
+#: ../src/pulse/sample.c:177 ../src/pulse/volume.c:296
+#: ../src/pulse/volume.c:322 ../src/pulse/volume.c:342
+#: ../src/pulse/volume.c:374 ../src/pulse/volume.c:414
+#: ../src/pulse/volume.c:433
 msgid "(invalid)"
-msgstr "(?? ??????)"
+msgstr "(neplatn?)"
 
-#: ../src/pulse/channelmap.c:761
+#: ../src/pulse/channelmap.c:764
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../src/pulse/channelmap.c:766
+#: ../src/pulse/channelmap.c:769
 msgid "Surround 4.0"
-msgstr "Surround 4.0"
+msgstr "Priestorov? 4.0"
 
-#: ../src/pulse/channelmap.c:772
+#: ../src/pulse/channelmap.c:775
 msgid "Surround 4.1"
-msgstr "Surround 4.1"
+msgstr "Priestorov? 4.1"
 
-#: ../src/pulse/channelmap.c:778
+#: ../src/pulse/channelmap.c:781
 msgid "Surround 5.0"
-msgstr "Surround 5.0"
+msgstr "Priestorov? 5.0"
 
-#: ../src/pulse/channelmap.c:784
+#: ../src/pulse/channelmap.c:787
 msgid "Surround 5.1"
-msgstr "Surround 5.1"
+msgstr "Priestorov? 5.1"
 
-#: ../src/pulse/channelmap.c:791
+#: ../src/pulse/channelmap.c:794
 msgid "Surround 7.1"
-msgstr "Surround 7.1"
+msgstr "Priestorov? 7.1"
+
+#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:99
+msgid "xcb_connect() failed"
+msgstr ""
+
+#: ../src/pulse/client-conf-x11.c:60 ../src/utils/pax11publish.c:104
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: ../src/pulse/client-conf-x11.c:96
+msgid "Failed to parse cookie data"
+msgstr ""
+
+#: ../src/pulse/context.c:658
+#, c-format
+msgid "fork(): %s"
+msgstr ""
+
+#: ../src/pulse/context.c:713
+#, c-format
+msgid "waitpid(): %s"
+msgstr ""
+
+#: ../src/pulse/context.c:1414
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr ""
+
+#: ../src/pulse/direction.c:39
+msgid "input"
+msgstr ""
+
+#: ../src/pulse/direction.c:41
+msgid "output"
+msgstr ""
+
+#: ../src/pulse/direction.c:43
+msgid "bidirectional"
+msgstr ""
+
+#: ../src/pulse/direction.c:45
+msgid "invalid"
+msgstr ""
+
+#: ../src/pulsecore/core-util.c:1821
+#, c-format
+msgid ""
+"XDG_RUNTIME_DIR (%s) is not owned by us (uid %d), but by uid %d! (This could "
+"e g happen if you try to connect to a non-root PulseAudio as a root user, "
+"over the native protocol. Don't do that.)"
+msgstr ""
+
+#: ../src/pulsecore/core-util.h:95
+msgid "yes"
+msgstr "?no"
+
+#: ../src/pulsecore/core-util.h:95
+msgid "no"
+msgstr "nie"
+
+#: ../src/pulsecore/lock-autospawn.c:143 ../src/pulsecore/lock-autospawn.c:229
+msgid "Cannot access autospawn lock."
+msgstr ""
+
+#: ../src/pulsecore/log.c:155
+#, c-format
+msgid "Failed to open target file '%s'."
+msgstr ""
+
+#: ../src/pulsecore/log.c:178
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+
+#: ../src/pulsecore/log.c:633
+msgid "Invalid log target."
+msgstr ""
+
+#: ../src/pulsecore/sink.c:3429
+msgid "Built-in Audio"
+msgstr "Vstavan? audio"
+
+#: ../src/pulsecore/sink.c:3434
+msgid "Modem"
+msgstr "Modem"
 
 #: ../src/pulse/error.c:40
 msgid "OK"
-msgstr "???????"
+msgstr "OK"
 
 #: ../src/pulse/error.c:41
 msgid "Access denied"
-msgstr ""
+msgstr "Pr?stup zamietnut?"
 
 #: ../src/pulse/error.c:42
 msgid "Unknown command"
-msgstr ""
+msgstr "Nezn?my pr?kaz"
 
 #: ../src/pulse/error.c:43
 msgid "Invalid argument"
-msgstr ""
+msgstr "Neplatn? parameter"
 
 #: ../src/pulse/error.c:44
 msgid "Entity exists"
@@ -969,15 +1329,15 @@ msgstr ""
 
 #: ../src/pulse/error.c:48
 msgid "Timeout"
-msgstr ""
+msgstr "Vypr?anie ?asu"
 
 #: ../src/pulse/error.c:49
-msgid "No authorization key"
+msgid "No authentication key"
 msgstr ""
 
 #: ../src/pulse/error.c:50
 msgid "Internal error"
-msgstr ""
+msgstr "Intern? chyba"
 
 #: ../src/pulse/error.c:51
 msgid "Connection terminated"
@@ -989,7 +1349,7 @@ msgstr ""
 
 #: ../src/pulse/error.c:53
 msgid "Invalid server"
-msgstr ""
+msgstr "Neplatn? server"
 
 #: ../src/pulse/error.c:54
 msgid "Module initialization failed"
@@ -997,11 +1357,11 @@ msgstr ""
 
 #: ../src/pulse/error.c:55
 msgid "Bad state"
-msgstr ""
+msgstr "Zl? stav"
 
 #: ../src/pulse/error.c:56
 msgid "No data"
-msgstr ""
+msgstr "?iadne ?daje"
 
 #: ../src/pulse/error.c:57
 msgid "Incompatible protocol version"
@@ -1037,246 +1397,249 @@ msgstr ""
 
 #: ../src/pulse/error.c:65
 msgid "Input/Output error"
-msgstr ""
+msgstr "Vstupno/v?stupn? chyba"
 
 #: ../src/pulse/error.c:66
 msgid "Device or resource busy"
-msgstr ""
+msgstr "Zariadenie alebo prostriedok je zanepr?zdnen?"
 
-#: ../src/pulse/sample.c:171
+#: ../src/pulse/sample.c:179
 #, c-format
 msgid "%s %uch %uHz"
-msgstr "%s %uch %uHz"
+msgstr ""
 
-#: ../src/pulse/sample.c:183
+#: ../src/pulse/sample.c:191
 #, c-format
 msgid "%0.1f GiB"
-msgstr "%0.1f GiB"
+msgstr ""
 
-#: ../src/pulse/sample.c:185
+#: ../src/pulse/sample.c:193
 #, c-format
 msgid "%0.1f MiB"
-msgstr "%0.1f MiB"
+msgstr ""
 
-#: ../src/pulse/sample.c:187
+#: ../src/pulse/sample.c:195
 #, c-format
 msgid "%0.1f KiB"
-msgstr "%0.1f KiB"
+msgstr ""
 
-#: ../src/pulse/sample.c:189
+#: ../src/pulse/sample.c:197
 #, c-format
 msgid "%u B"
-msgstr "%u B"
-
-#: ../src/pulse/client-conf-x11.c:54 ../src/utils/pax11publish.c:100
-#, fuzzy
-msgid "xcb_connect() failed"
-msgstr "???????(): %s"
-
-#: ../src/pulse/client-conf-x11.c:59 ../src/utils/pax11publish.c:105
-msgid "xcb_connection_has_error() returned true"
-msgstr ""
-
-#: ../src/pulse/client-conf-x11.c:97
-msgid "Failed to parse cookie data"
 msgstr ""
 
-#: ../src/pulse/client-conf.c:117
+#: ../src/tests/resampler-test.c:257
 #, c-format
-msgid "Failed to open configuration file '%s': %s"
-msgstr ""
-
-#: ../src/pulse/context.c:528
-msgid "No cookie loaded. Attempting to connect without."
+msgid ""
+"%s [options]\n"
+"\n"
+"-h, --help                            Show this help\n"
+"-v, --verbose                         Print debug messages\n"
+"      --from-rate=SAMPLERATE          From sample rate in Hz (defaults to "
+"44100)\n"
+"      --from-format=SAMPLEFORMAT      From sample type (defaults to s16le)\n"
+"      --from-channels=CHANNELS        From number of channels (defaults to "
+"1)\n"
+"      --to-rate=SAMPLERATE            To sample rate in Hz (defaults to "
+"44100)\n"
+"      --to-format=SAMPLEFORMAT        To sample type (defaults to s16le)\n"
+"      --to-channels=CHANNELS          To number of channels (defaults to 1)\n"
+"      --resample-method=METHOD        Resample method (defaults to auto)\n"
+"      --seconds=SECONDS               From stream duration (defaults to 60)\n"
+"\n"
+"If the formats are not specified, the test performs all formats "
+"combinations,\n"
+"back and forth.\n"
+"\n"
+"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
+"alaw,\n"
+"s24le, s24be, s24-32le, s24-32be, s32le, s32be (defaults to s16ne)\n"
+"\n"
+"See --dump-resample-methods for possible values of resample methods.\n"
 msgstr ""
 
-#: ../src/pulse/context.c:675
-#, fuzzy, c-format
-msgid "fork(): %s"
-msgstr "fork(): %s"
-
-#: ../src/pulse/context.c:730
-#, fuzzy, c-format
-msgid "waitpid(): %s"
-msgstr "waitpid(): %s"
-
-#: ../src/pulse/context.c:1431
+#: ../src/tests/resampler-test.c:356
 #, c-format
-msgid "Received message for unknown extension '%s'"
+msgid "%s %s\n"
 msgstr ""
 
-#: ../src/utils/pacat.c:112
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:118
+#, c-format
 msgid "Failed to drain stream: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pacat.c:117
+#: ../src/utils/pacat.c:123
 msgid "Playback stream drained."
 msgstr ""
 
-#: ../src/utils/pacat.c:128
+#: ../src/utils/pacat.c:134
 msgid "Draining connection to server."
 msgstr ""
 
-#: ../src/utils/pacat.c:141
+#: ../src/utils/pacat.c:147
 #, c-format
 msgid "pa_stream_drain(): %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:164
+#: ../src/utils/pacat.c:170
 #, c-format
 msgid "pa_stream_write() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:205
+#: ../src/utils/pacat.c:211
 #, c-format
 msgid "pa_stream_begin_write() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:255 ../src/utils/pacat.c:285
+#: ../src/utils/pacat.c:261 ../src/utils/pacat.c:291
 #, c-format
 msgid "pa_stream_peek() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:325
+#: ../src/utils/pacat.c:341
 msgid "Stream successfully created."
 msgstr ""
 
-#: ../src/utils/pacat.c:328
+#: ../src/utils/pacat.c:344
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:332
+#: ../src/utils/pacat.c:348
 #, c-format
 msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
 msgstr ""
 
-#: ../src/utils/pacat.c:335
+#: ../src/utils/pacat.c:351
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u"
 msgstr ""
 
-#: ../src/utils/pacat.c:339
+#: ../src/utils/pacat.c:355
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'."
 msgstr ""
 
-#: ../src/utils/pacat.c:343
+#: ../src/utils/pacat.c:359
 #, c-format
-msgid "Connected to device %s (%u, %ssuspended)."
+msgid "Connected to device %s (index: %u, suspended: %s)."
 msgstr ""
 
-#: ../src/utils/pacat.c:353
+#: ../src/utils/pacat.c:369
 #, c-format
 msgid "Stream error: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:363
+#: ../src/utils/pacat.c:379
 #, c-format
 msgid "Stream device suspended.%s"
 msgstr ""
 
-#: ../src/utils/pacat.c:365
+#: ../src/utils/pacat.c:381
 #, c-format
 msgid "Stream device resumed.%s"
 msgstr ""
 
-#: ../src/utils/pacat.c:373
+#: ../src/utils/pacat.c:389
 #, c-format
 msgid "Stream underrun.%s"
 msgstr ""
 
-#: ../src/utils/pacat.c:380
+#: ../src/utils/pacat.c:396
 #, c-format
 msgid "Stream overrun.%s"
 msgstr ""
 
-#: ../src/utils/pacat.c:387
+#: ../src/utils/pacat.c:403
 #, c-format
 msgid "Stream started.%s"
 msgstr ""
 
-#: ../src/utils/pacat.c:394
+#: ../src/utils/pacat.c:410
 #, c-format
 msgid "Stream moved to device %s (%u, %ssuspended).%s"
 msgstr ""
 
-#: ../src/utils/pacat.c:394
+#: ../src/utils/pacat.c:410
 msgid "not "
 msgstr ""
 
-#: ../src/utils/pacat.c:401
+#: ../src/utils/pacat.c:417
 #, c-format
 msgid "Stream buffer attributes changed.%s"
 msgstr ""
 
-#: ../src/utils/pacat.c:416
+#: ../src/utils/pacat.c:432
 msgid "Cork request stack is empty: corking stream"
 msgstr ""
 
-#: ../src/utils/pacat.c:422
+#: ../src/utils/pacat.c:438
 msgid "Cork request stack is empty: uncorking stream"
 msgstr ""
 
-#: ../src/utils/pacat.c:426
+#: ../src/utils/pacat.c:442
 msgid "Warning: Received more uncork requests than cork requests!"
 msgstr ""
 
-#: ../src/utils/pacat.c:451
+#: ../src/utils/pacat.c:467
 #, c-format
 msgid "Connection established.%s"
 msgstr ""
 
-#: ../src/utils/pacat.c:454
+#: ../src/utils/pacat.c:470
 #, c-format
 msgid "pa_stream_new() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:492
+#: ../src/utils/pacat.c:508
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:498
+#: ../src/utils/pacat.c:514
+#, c-format
+msgid "Failed to set monitor stream: %s"
+msgstr ""
+
+#: ../src/utils/pacat.c:518
 #, c-format
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1252
+#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1455
 #, c-format
 msgid "Connection failure: %s"
-msgstr "???????? ????????: %s"
+msgstr ""
 
-#: ../src/utils/pacat.c:545
+#: ../src/utils/pacat.c:564
 msgid "Got EOF."
 msgstr ""
 
-#: ../src/utils/pacat.c:582
+#: ../src/utils/pacat.c:601
 #, c-format
 msgid "write() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:603
+#: ../src/utils/pacat.c:622
 msgid "Got signal, exiting."
 msgstr ""
 
-#: ../src/utils/pacat.c:617
-#, fuzzy, c-format
+#: ../src/utils/pacat.c:636
+#, c-format
 msgid "Failed to get latency: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pacat.c:622
+#: ../src/utils/pacat.c:641
 #, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
 msgstr ""
 
-#: ../src/utils/pacat.c:643
+#: ../src/utils/pacat.c:662
 #, c-format
 msgid "pa_stream_update_timing_info() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:653
+#: ../src/utils/pacat.c:672
 #, c-format
 msgid ""
 "%s [options]\n"
@@ -1312,16 +1675,16 @@ msgid ""
 "                                        (defaults to 2)\n"
 "      --channel-map=CHANNELMAP          Channel map to use instead of the "
 "default\n"
-"      --fix-format                      Take the sample format from the sink "
-"the stream is\n"
+"      --fix-format                      Take the sample format from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
-"      --fix-rate                        Take the sampling rate from the sink "
-"the stream is\n"
+"      --fix-rate                        Take the sampling rate from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
 "      --fix-channels                    Take the number of channels and the "
 "channel map\n"
-"                                        from the sink the stream is being "
-"connected to.\n"
+"                                        from the sink/source the stream is "
+"being connected to.\n"
 "      --no-remix                        Don't upmix or downmix channels.\n"
 "      --no-remap                        Map channels by index instead of "
 "name.\n"
@@ -1336,12 +1699,14 @@ msgid ""
 "      --property=PROPERTY=VALUE         Set the specified property to the "
 "specified value.\n"
 "      --raw                             Record/play raw PCM data.\n"
-"      --passthrough                     passthrough data \n"
+"      --passthrough                     Passthrough data.\n"
 "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
 "      --list-file-formats               List available file formats.\n"
+"      --monitor-stream=INDEX            Record from the sink input with "
+"index INDEX.\n"
 msgstr ""
 
-#: ../src/utils/pacat.c:786
+#: ../src/utils/pacat.c:810
 #, c-format
 msgid ""
 "pacat %s\n"
@@ -1349,234 +1714,305 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
-#: ../src/utils/pacat.c:819 ../src/utils/pactl.c:1400
+#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1651
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
 
-#: ../src/utils/pacat.c:834
+#: ../src/utils/pacat.c:858
 #, c-format
 msgid "Invalid stream name '%s'"
 msgstr ""
 
-#: ../src/utils/pacat.c:871
+#: ../src/utils/pacat.c:895
 #, c-format
 msgid "Invalid channel map '%s'"
 msgstr ""
 
-#: ../src/utils/pacat.c:900 ../src/utils/pacat.c:914
+#: ../src/utils/pacat.c:924 ../src/utils/pacat.c:938
 #, c-format
 msgid "Invalid latency specification '%s'"
 msgstr ""
 
-#: ../src/utils/pacat.c:907 ../src/utils/pacat.c:921
+#: ../src/utils/pacat.c:931 ../src/utils/pacat.c:945
 #, c-format
 msgid "Invalid process time specification '%s'"
 msgstr ""
 
-#: ../src/utils/pacat.c:933
+#: ../src/utils/pacat.c:957
 #, c-format
 msgid "Invalid property '%s'"
 msgstr ""
 
-#: ../src/utils/pacat.c:952
+#: ../src/utils/pacat.c:976
 #, c-format
 msgid "Unknown file format %s."
 msgstr ""
 
-#: ../src/utils/pacat.c:971
+#: ../src/utils/pacat.c:991
+msgid "Failed to parse the argument for --monitor-stream"
+msgstr ""
+
+#: ../src/utils/pacat.c:1002
 msgid "Invalid sample specification"
 msgstr ""
 
-#: ../src/utils/pacat.c:981
+#: ../src/utils/pacat.c:1012
 #, c-format
 msgid "open(): %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:986
+#: ../src/utils/pacat.c:1017
 #, c-format
 msgid "dup2(): %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:993
+#: ../src/utils/pacat.c:1024
 msgid "Too many arguments."
 msgstr ""
 
-#: ../src/utils/pacat.c:1004
+#: ../src/utils/pacat.c:1035
 msgid "Failed to generate sample specification for file."
 msgstr ""
 
-#: ../src/utils/pacat.c:1030
+#: ../src/utils/pacat.c:1061
 msgid "Failed to open audio file."
 msgstr ""
 
-#: ../src/utils/pacat.c:1036
+#: ../src/utils/pacat.c:1067
 msgid ""
 "Warning: specified sample specification will be overwritten with "
 "specification from file."
 msgstr ""
 
-#: ../src/utils/pacat.c:1039 ../src/utils/pactl.c:1467
+#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1718
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
-#: ../src/utils/pacat.c:1048
+#: ../src/utils/pacat.c:1079
 msgid "Warning: Failed to determine channel map from file."
 msgstr ""
 
-#: ../src/utils/pacat.c:1059
+#: ../src/utils/pacat.c:1090
 msgid "Channel map doesn't match sample specification"
 msgstr ""
 
-#: ../src/utils/pacat.c:1070
+#: ../src/utils/pacat.c:1101
 msgid "Warning: failed to write channel map to file."
 msgstr ""
 
-#: ../src/utils/pacat.c:1085
+#: ../src/utils/pacat.c:1116
 #, c-format
 msgid ""
 "Opening a %s stream with sample specification '%s' and channel map '%s'."
 msgstr ""
 
-#: ../src/utils/pacat.c:1086
+#: ../src/utils/pacat.c:1117
 msgid "recording"
 msgstr ""
 
-#: ../src/utils/pacat.c:1086
+#: ../src/utils/pacat.c:1117
 msgid "playback"
 msgstr ""
 
-#: ../src/utils/pacat.c:1110
-#, fuzzy
+#: ../src/utils/pacat.c:1141
 msgid "Failed to set media name."
-msgstr "???????? ?????????? ??????? ????."
+msgstr ""
 
-#: ../src/utils/pacat.c:1117 ../src/utils/pactl.c:1777
+#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:2068
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
-#: ../src/utils/pacat.c:1136
+#: ../src/utils/pacat.c:1171
 msgid "io_new() failed."
 msgstr ""
 
-#: ../src/utils/pacat.c:1143 ../src/utils/pactl.c:1789
+#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:2080
 msgid "pa_context_new() failed."
 msgstr ""
 
-#: ../src/utils/pacat.c:1151 ../src/utils/pactl.c:1795
+#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:2086
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
 
-#: ../src/utils/pacat.c:1157
+#: ../src/utils/pacat.c:1192
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
-#: ../src/utils/pacat.c:1164 ../src/utils/pactl.c:1800
+#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:2091
 msgid "pa_mainloop_run() failed."
 msgstr ""
 
-#: ../src/utils/pasuspender.c:79
-#, fuzzy, c-format
-msgid "fork(): %s\n"
-msgstr "fork(): %s\n"
+#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1573
+msgid "NAME [ARGS ...]"
+msgstr ""
 
-#: ../src/utils/pasuspender.c:90
-#, fuzzy, c-format
-msgid "execvp(): %s\n"
-msgstr "execvp(): %s\n"
+#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1574
+msgid "NAME|#N"
+msgstr ""
 
-#: ../src/utils/pasuspender.c:107
-#, c-format
-msgid "Failure to suspend: %s\n"
+#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1578
+msgid "NAME"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:122
-#, c-format
-msgid "Failure to resume: %s\n"
+#: ../src/utils/pacmd.c:56
+msgid "NAME|#N VOLUME"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:145
-#, c-format
-msgid "WARNING: Sound server is not local, not suspending.\n"
+#: ../src/utils/pacmd.c:57
+msgid "#N VOLUME"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:157
-#, c-format
-msgid "Connection failure: %s\n"
+#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1576
+msgid "NAME|#N 1|0"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:174
-#, c-format
-msgid "Got SIGINT, exiting.\n"
+#: ../src/utils/pacmd.c:59
+msgid "#N 1|0"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:192
-#, c-format
-msgid "WARNING: Child process terminated by signal %u\n"
+#: ../src/utils/pacmd.c:60
+msgid "NAME|#N KEY=VALUE"
+msgstr ""
+
+#: ../src/utils/pacmd.c:61
+msgid "#N KEY=VALUE"
+msgstr ""
+
+#: ../src/utils/pacmd.c:63
+msgid "#N"
+msgstr ""
+
+#: ../src/utils/pacmd.c:64
+msgid "NAME SINK|#N"
+msgstr ""
+
+#: ../src/utils/pacmd.c:66 ../src/utils/pacmd.c:67
+msgid "NAME FILENAME"
+msgstr ""
+
+#: ../src/utils/pacmd.c:68
+msgid "PATHNAME"
+msgstr ""
+
+#: ../src/utils/pacmd.c:69
+msgid "FILENAME SINK|#N"
+msgstr ""
+
+#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1575
+msgid "#N SINK|SOURCE"
+msgstr ""
+
+#: ../src/utils/pacmd.c:73 ../src/utils/pacmd.c:79 ../src/utils/pacmd.c:80
+msgid "1|0"
+msgstr ""
+
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1577
+msgid "CARD PROFILE"
+msgstr ""
+
+#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1579
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1585
+msgid "CARD-NAME|CARD-#N PORT OFFSET"
+msgstr ""
+
+#: ../src/utils/pacmd.c:77
+msgid "TARGET"
+msgstr ""
+
+#: ../src/utils/pacmd.c:78
+msgid "NUMERIC LEVEL"
+msgstr ""
+
+#: ../src/utils/pacmd.c:81
+msgid "FRAMES"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:210
+#: ../src/utils/pacmd.c:83
 #, c-format
 msgid ""
-"%s [options] ... \n"
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
-"  -s, --server=SERVER                   The name of the server to connect "
-"to\n"
-"\n"
+"When no command is given pacmd starts in the interactive mode.\n"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:248
+#: ../src/utils/pacmd.c:130
 #, c-format
 msgid ""
-"pasuspender %s\n"
+"pacmd %s\n"
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:277
+#: ../src/utils/pacmd.c:144
+msgid "No PulseAudio daemon running, or not running as session daemon."
+msgstr ""
+
+#: ../src/utils/pacmd.c:149
 #, c-format
-msgid "pa_mainloop_new() failed.\n"
+msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 msgstr ""
 
-#: ../src/utils/pasuspender.c:290
+#: ../src/utils/pacmd.c:166
 #, c-format
-msgid "pa_context_new() failed.\n"
+msgid "connect(): %s"
+msgstr ""
+
+#: ../src/utils/pacmd.c:174
+msgid "Failed to kill PulseAudio daemon."
+msgstr ""
+
+#: ../src/utils/pacmd.c:182
+msgid "Daemon not responding."
 msgstr ""
 
-#: ../src/utils/pasuspender.c:298
+#: ../src/utils/pacmd.c:214 ../src/utils/pacmd.c:323 ../src/utils/pacmd.c:341
 #, c-format
-msgid "pa_mainloop_run() failed.\n"
+msgid "write(): %s"
+msgstr ""
+
+#: ../src/utils/pacmd.c:270
+#, c-format
+msgid "poll(): %s"
+msgstr ""
+
+#: ../src/utils/pacmd.c:281 ../src/utils/pacmd.c:301
+#, c-format
+msgid "read(): %s"
 msgstr ""
 
-#: ../src/utils/pactl.c:150
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:166
+#, c-format
 msgid "Failed to get statistics: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:156
+#: ../src/utils/pactl.c:172
 #, c-format
 msgid "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:159
+#: ../src/utils/pactl.c:175
 #, c-format
 msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:162
+#: ../src/utils/pactl.c:178
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:171
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:187
+#, c-format
 msgid "Failed to get server information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:176
+#: ../src/utils/pactl.c:192
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -1587,7 +2023,7 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:192
+#: ../src/utils/pactl.c:208
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -1601,12 +2037,12 @@ msgid ""
 "Cookie: %04x:%04x\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:830
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:257 ../src/utils/pactl.c:902 ../src/utils/pactl.c:980
+#, c-format
 msgid "Failed to get sink information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:270
+#: ../src/utils/pactl.c:283
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -1618,9 +2054,9 @@ msgid ""
 "\tChannel Map: %s\n"
 "\tOwner Module: %u\n"
 "\tMute: %s\n"
-"\tVolume: %s%s%s\n"
+"\tVolume: %s\n"
 "\t        balance %0.2f\n"
-"\tBase Volume: %s%s%s\n"
+"\tBase Volume: %s\n"
 "\tMonitor Source: %s\n"
 "\tLatency: %0.0f usec, configured %0.0f usec\n"
 "\tFlags: %s%s%s%s%s%s%s\n"
@@ -1628,27 +2064,27 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430
+#: ../src/utils/pactl.c:327 ../src/utils/pactl.c:433 ../src/utils/pactl.c:594
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:437
+#: ../src/utils/pactl.c:334 ../src/utils/pactl.c:440
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:331 ../src/utils/pactl.c:443
+#: ../src/utils/pactl.c:340 ../src/utils/pactl.c:446
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:849
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:364 ../src/utils/pactl.c:922 ../src/utils/pactl.c:995
+#, c-format
 msgid "Failed to get source information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:383
+#: ../src/utils/pactl.c:390
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -1660,9 +2096,9 @@ msgid ""
 "\tChannel Map: %s\n"
 "\tOwner Module: %u\n"
 "\tMute: %s\n"
-"\tVolume: %s%s%s\n"
+"\tVolume: %s\n"
 "\t        balance %0.2f\n"
-"\tBase Volume: %s%s%s\n"
+"\tBase Volume: %s\n"
 "\tMonitor of Sink: %s\n"
 "\tLatency: %0.0f usec, configured %0.0f usec\n"
 "\tFlags: %s%s%s%s%s%s\n"
@@ -1670,20 +2106,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:415 ../src/utils/pactl.c:485 ../src/utils/pactl.c:528
-#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:640 ../src/utils/pactl.c:641
-#: ../src/utils/pactl.c:652 ../src/utils/pactl.c:711 ../src/utils/pactl.c:712
-#: ../src/utils/pactl.c:723 ../src/utils/pactl.c:775 ../src/utils/pactl.c:776
-#: ../src/utils/pactl.c:783
+#: ../src/utils/pactl.c:418 ../src/utils/pactl.c:488 ../src/utils/pactl.c:531
+#: ../src/utils/pactl.c:573 ../src/utils/pactl.c:671 ../src/utils/pactl.c:672
+#: ../src/utils/pactl.c:683 ../src/utils/pactl.c:741 ../src/utils/pactl.c:742
+#: ../src/utils/pactl.c:753 ../src/utils/pactl.c:804 ../src/utils/pactl.c:805
+#: ../src/utils/pactl.c:811
 msgid "n/a"
 msgstr ""
 
-#: ../src/utils/pactl.c:454
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:457 ../src/utils/pactl.c:861
+#, c-format
 msgid "Failed to get module information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:477
+#: ../src/utils/pactl.c:480
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -1694,12 +2130,12 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:496
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:499
+#, c-format
 msgid "Failed to get client information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:522
+#: ../src/utils/pactl.c:525
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -1709,12 +2145,12 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:539
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:542
+#, c-format
 msgid "Failed to get card information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:562
+#: ../src/utils/pactl.c:565
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -1725,22 +2161,34 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:576
+#: ../src/utils/pactl.c:581
 #, c-format
 msgid "\tProfiles:\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:582
+#: ../src/utils/pactl.c:588
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:593 ../src/utils/pactl.c:868
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:602
+#, c-format
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:607
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr ""
+
+#: ../src/utils/pactl.c:624 ../src/utils/pactl.c:942 ../src/utils/pactl.c:1010
+#, c-format
 msgid "Failed to get sink input information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:622
+#: ../src/utils/pactl.c:653
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -1751,9 +2199,9 @@ msgid ""
 "\tSample Specification: %s\n"
 "\tChannel Map: %s\n"
 "\tFormat: %s\n"
+"\tCorked: %s\n"
 "\tMute: %s\n"
 "\tVolume: %s\n"
-"\t        %s\n"
 "\t        balance %0.2f\n"
 "\tBuffer Latency: %0.0f usec\n"
 "\tSink Latency: %0.0f usec\n"
@@ -1762,12 +2210,12 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:663 ../src/utils/pactl.c:887
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:694 ../src/utils/pactl.c:962 ../src/utils/pactl.c:1025
+#, c-format
 msgid "Failed to get source output information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:693
+#: ../src/utils/pactl.c:723
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -1778,9 +2226,9 @@ msgid ""
 "\tSample Specification: %s\n"
 "\tChannel Map: %s\n"
 "\tFormat: %s\n"
+"\tCorked: %s\n"
 "\tMute: %s\n"
 "\tVolume: %s\n"
-"\t        %s\n"
 "\t        balance %0.2f\n"
 "\tBuffer Latency: %0.0f usec\n"
 "\tSource Latency: %0.0f usec\n"
@@ -1789,12 +2237,12 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:734
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:764
+#, c-format
 msgid "Failed to get sample information: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:761
+#: ../src/utils/pactl.c:791
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -1802,7 +2250,6 @@ msgid ""
 "\tSample Specification: %s\n"
 "\tChannel Map: %s\n"
 "\tVolume: %s\n"
-"\t        %s\n"
 "\t        balance %0.2f\n"
 "\tDuration: %0.1fs\n"
 "\tSize: %s\n"
@@ -1812,160 +2259,169 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:791 ../src/utils/pactl.c:801
+#: ../src/utils/pactl.c:819 ../src/utils/pactl.c:829
 #, c-format
 msgid "Failure: %s"
-msgstr "????????: %s"
+msgstr ""
+
+#: ../src/utils/pactl.c:868
+#, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr ""
+
+#: ../src/utils/pactl.c:886
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel/s supported = %d\n"
+msgstr ""
 
-#: ../src/utils/pactl.c:915
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:1052
+#, c-format
 msgid "Failed to set format: invalid format string %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:954
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:1095
+#, c-format
 msgid "Failed to upload sample: %s"
-msgstr "???????? ??????? ?????? '%s'."
+msgstr ""
 
-#: ../src/utils/pactl.c:971
+#: ../src/utils/pactl.c:1112
 msgid "Premature end of file"
 msgstr ""
 
-#: ../src/utils/pactl.c:991
+#: ../src/utils/pactl.c:1132
 msgid "new"
 msgstr ""
 
-#: ../src/utils/pactl.c:994
+#: ../src/utils/pactl.c:1135
 msgid "change"
 msgstr ""
 
-#: ../src/utils/pactl.c:997
+#: ../src/utils/pactl.c:1138
 msgid "remove"
 msgstr ""
 
-#: ../src/utils/pactl.c:1000 ../src/utils/pactl.c:1035
+#: ../src/utils/pactl.c:1141 ../src/utils/pactl.c:1176
 msgid "unknown"
 msgstr ""
 
-#: ../src/utils/pactl.c:1008
+#: ../src/utils/pactl.c:1149
 msgid "sink"
 msgstr ""
 
-#: ../src/utils/pactl.c:1011
+#: ../src/utils/pactl.c:1152
 msgid "source"
 msgstr ""
 
-#: ../src/utils/pactl.c:1014
+#: ../src/utils/pactl.c:1155
 msgid "sink-input"
 msgstr ""
 
-#: ../src/utils/pactl.c:1017
+#: ../src/utils/pactl.c:1158
 msgid "source-output"
 msgstr ""
 
-#: ../src/utils/pactl.c:1020
+#: ../src/utils/pactl.c:1161
 msgid "module"
 msgstr ""
 
-#: ../src/utils/pactl.c:1023
+#: ../src/utils/pactl.c:1164
 msgid "client"
 msgstr ""
 
-#: ../src/utils/pactl.c:1026
+#: ../src/utils/pactl.c:1167
 msgid "sample-cache"
 msgstr ""
 
-#: ../src/utils/pactl.c:1029 ../src/utils/pactl.c:1032
+#: ../src/utils/pactl.c:1170
 msgid "server"
 msgstr ""
 
-#: ../src/utils/pactl.c:1041
+#: ../src/utils/pactl.c:1173
+msgid "card"
+msgstr ""
+
+#: ../src/utils/pactl.c:1182
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1258
+#: ../src/utils/pactl.c:1461
 msgid "Got SIGINT, exiting."
 msgstr ""
 
-#: ../src/utils/pactl.c:1285
+#: ../src/utils/pactl.c:1488
 msgid "Invalid volume specification"
 msgstr ""
 
-#: ../src/utils/pactl.c:1308
+#: ../src/utils/pactl.c:1511
 msgid "Volume outside permissible range.\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1319 ../src/utils/pactl.c:1320
-#: ../src/utils/pactl.c:1321 ../src/utils/pactl.c:1322
-#: ../src/utils/pactl.c:1323 ../src/utils/pactl.c:1324
-#: ../src/utils/pactl.c:1325 ../src/utils/pactl.c:1326
-#: ../src/utils/pactl.c:1327 ../src/utils/pactl.c:1328
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1330
-#: ../src/utils/pactl.c:1331 ../src/utils/pactl.c:1332
-#: ../src/utils/pactl.c:1333 ../src/utils/pactl.c:1334
-#: ../src/utils/pactl.c:1335 ../src/utils/pactl.c:1336
-#: ../src/utils/pactl.c:1337
-msgid "[options]"
-msgstr ""
-
-#: ../src/utils/pactl.c:1321
-msgid "[TYPE]"
-msgstr ""
-
-#: ../src/utils/pactl.c:1323
-msgid "FILENAME [NAME]"
-msgstr ""
-
-#: ../src/utils/pactl.c:1324
-msgid "NAME [SINK]"
+#: ../src/utils/pactl.c:1524
+msgid "Invalid number of volume specifications.\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1325
-msgid "NAME"
+#: ../src/utils/pactl.c:1536
+msgid "Inconsistent volume specification.\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1326
-msgid "NAME [ARGS ...]"
-msgstr ""
+#: ../src/utils/pactl.c:1566 ../src/utils/pactl.c:1567
+#: ../src/utils/pactl.c:1568 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1570 ../src/utils/pactl.c:1571
+#: ../src/utils/pactl.c:1572 ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1574 ../src/utils/pactl.c:1575
+#: ../src/utils/pactl.c:1576 ../src/utils/pactl.c:1577
+#: ../src/utils/pactl.c:1578 ../src/utils/pactl.c:1579
+#: ../src/utils/pactl.c:1580 ../src/utils/pactl.c:1581
+#: ../src/utils/pactl.c:1582 ../src/utils/pactl.c:1583
+#: ../src/utils/pactl.c:1584 ../src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1586
+msgid "[options]"
+msgstr "[vo?by]"
 
-#: ../src/utils/pactl.c:1327
-msgid "#N"
-msgstr ""
+#: ../src/utils/pactl.c:1568
+msgid "[TYPE]"
+msgstr "[TYP]"
 
-#: ../src/utils/pactl.c:1328
-msgid "#N SINK|SOURCE"
+#: ../src/utils/pactl.c:1570
+msgid "FILENAME [NAME]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1334
-msgid "NAME|#N 1|0"
+#: ../src/utils/pactl.c:1571
+msgid "NAME [SINK]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1330
-msgid "CARD PROFILE"
+#: ../src/utils/pactl.c:1580
+msgid "NAME|#N VOLUME [VOLUME ...]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1331
-msgid "NAME|#N PORT"
+#: ../src/utils/pactl.c:1581
+msgid "#N VOLUME [VOLUME ...]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1332
-msgid "NAME|#N VOLUME"
+#: ../src/utils/pactl.c:1582
+msgid "NAME|#N 1|0|toggle"
 msgstr ""
 
-#: ../src/utils/pactl.c:1333
-msgid "#N VOLUME"
+#: ../src/utils/pactl.c:1583
+msgid "#N 1|0|toggle"
 msgstr ""
 
-#: ../src/utils/pactl.c:1335
-msgid "#N 1|0"
+#: ../src/utils/pactl.c:1584
+msgid "#N FORMATS"
 msgstr ""
 
-#: ../src/utils/pactl.c:1336
-msgid "#N FORMATS"
+#: ../src/utils/pactl.c:1587
+#, c-format
+msgid ""
+"\n"
+"The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@\n"
+"can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1339
+#: ../src/utils/pactl.c:1590
 #, c-format
 msgid ""
 "\n"
@@ -1977,625 +2433,308 @@ msgid ""
 "  -n, --client-name=NAME                How to call this client on the "
 "server\n"
 msgstr ""
-
-#: ../src/utils/pactl.c:1380
-#, c-format
-msgid ""
-"pactl %s\n"
-"Compiled with libpulse %s\n"
-"Linked with libpulse %s\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:1439
-#, c-format
-msgid "Specify nothing, or one of: %s"
-msgstr ""
-
-#: ../src/utils/pactl.c:1449
-msgid "Please specify a sample file to load"
-msgstr ""
-
-#: ../src/utils/pactl.c:1462
-msgid "Failed to open sound file."
-msgstr "???????? ?????????? ??????? ????."
-
-#: ../src/utils/pactl.c:1474
-msgid "Warning: Failed to determine sample specification from file."
-msgstr ""
-
-#: ../src/utils/pactl.c:1484
-msgid "You have to specify a sample name to play"
-msgstr ""
-
-#: ../src/utils/pactl.c:1496
-msgid "You have to specify a sample name to remove"
-msgstr ""
-
-#: ../src/utils/pactl.c:1505
-msgid "You have to specify a sink input index and a sink"
-msgstr ""
-
-#: ../src/utils/pactl.c:1515
-msgid "You have to specify a source output index and a source"
-msgstr ""
-
-#: ../src/utils/pactl.c:1530
-msgid "You have to specify a module name and arguments."
-msgstr ""
-
-#: ../src/utils/pactl.c:1550
-msgid "You have to specify a module index"
-msgstr ""
-
-#: ../src/utils/pactl.c:1560
-msgid ""
-"You may not specify more than one sink. You have to specify a boolean value."
-msgstr ""
-
-#: ../src/utils/pactl.c:1573
-msgid ""
-"You may not specify more than one source. You have to specify a boolean "
-"value."
-msgstr ""
-
-#: ../src/utils/pactl.c:1585
-msgid "You have to specify a card name/index and a profile name"
-msgstr ""
-
-#: ../src/utils/pactl.c:1596
-msgid "You have to specify a sink name/index and a port name"
-msgstr ""
-
-#: ../src/utils/pactl.c:1607
-msgid "You have to specify a source name/index and a port name"
-msgstr ""
-
-#: ../src/utils/pactl.c:1618
-msgid "You have to specify a sink name/index and a volume"
-msgstr ""
-
-#: ../src/utils/pactl.c:1631
-msgid "You have to specify a source name/index and a volume"
-msgstr ""
-
-#: ../src/utils/pactl.c:1644
-msgid "You have to specify a sink input index and a volume"
-msgstr ""
-
-#: ../src/utils/pactl.c:1649
-msgid "Invalid sink input index"
-msgstr ""
-
-#: ../src/utils/pactl.c:1660
-msgid "You have to specify a source output index and a volume"
-msgstr ""
-
-#: ../src/utils/pactl.c:1665
-msgid "Invalid source output index"
-msgstr ""
-
-#: ../src/utils/pactl.c:1677
-msgid "You have to specify a sink name/index and a mute boolean"
-msgstr ""
-
-#: ../src/utils/pactl.c:1682 ../src/utils/pactl.c:1699
-#: ../src/utils/pactl.c:1721 ../src/utils/pactl.c:1742
-msgid "Invalid mute specification"
-msgstr ""
-
-#: ../src/utils/pactl.c:1694
-msgid "You have to specify a source name/index and a mute boolean"
-msgstr ""
-
-#: ../src/utils/pactl.c:1711
-msgid "You have to specify a sink input index and a mute boolean"
-msgstr ""
-
-#: ../src/utils/pactl.c:1716
-msgid "Invalid sink input index specification"
-msgstr ""
-
-#: ../src/utils/pactl.c:1732
-msgid "You have to specify a source output index and a mute boolean"
-msgstr ""
-
-#: ../src/utils/pactl.c:1737
-#, fuzzy
-msgid "Invalid source output index specification"
-msgstr "???????? ??????? ?????? '%s'."
-
-#: ../src/utils/pactl.c:1756
-msgid ""
-"You have to specify a sink index and a semicolon-separated list of supported "
-"formats"
-msgstr ""
-
-#: ../src/utils/pactl.c:1772
-msgid "No valid command specified."
-msgstr ""
-
-#: ../src/utils/pax11publish.c:61
-#, c-format
-msgid ""
-"%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
 "\n"
-" -d    Show current PulseAudio data attached to X11 display (default)\n"
-" -e    Export local PulseAudio data to X11 display\n"
-" -i    Import PulseAudio data from X11 display to local environment "
-"variables and cookie file.\n"
-" -r    Remove PulseAudio data from X11 display\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:94
-#, c-format
-msgid "Failed to parse command line.\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:113
-#, c-format
-msgid "Server: %s\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:115
-#, c-format
-msgid "Source: %s\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:117
-#, c-format
-msgid "Sink: %s\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:119
-#, c-format
-msgid "Cookie: %s\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:137
-#, c-format
-msgid "Failed to parse cookie data\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:142
-#, c-format
-msgid "Failed to save cookie data\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:157
-#, c-format
-msgid "Failed to load client configuration file.\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:162
-#, c-format
-msgid "Failed to read environment configuration data.\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:179
-#, c-format
-msgid "Failed to get FQDN.\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:199
-#, c-format
-msgid "Failed to load cookie data\n"
-msgstr ""
-
-#: ../src/utils/pax11publish.c:217
-#, c-format
-msgid "Not yet implemented.\n"
-msgstr ""
-
-#: ../src/utils/pacmd.c:66
-msgid "No PulseAudio daemon running, or not running as session daemon."
-msgstr ""
-
-#: ../src/utils/pacmd.c:71
-#, c-format
-msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
-msgstr ""
-
-#: ../src/utils/pacmd.c:88
-#, c-format
-msgid "connect(): %s"
-msgstr "???????(): %s"
-
-#: ../src/utils/pacmd.c:96
-msgid "Failed to kill PulseAudio daemon."
-msgstr ""
-
-#: ../src/utils/pacmd.c:104
-msgid "Daemon not responding."
-msgstr ""
-
-#: ../src/utils/pacmd.c:184
-#, c-format
-msgid "poll(): %s"
-msgstr ""
-
-#: ../src/utils/pacmd.c:195 ../src/utils/pacmd.c:215
-#, c-format
-msgid "read(): %s"
-msgstr ""
-
-#: ../src/utils/pacmd.c:237 ../src/utils/pacmd.c:255
-#, c-format
-msgid "write(): %s"
-msgstr ""
-
-#: ../src/pulsecore/lock-autospawn.c:136 ../src/pulsecore/lock-autospawn.c:222
-msgid "Cannot access autospawn lock."
-msgstr ""
-
-#: ../src/modules/alsa/alsa-sink.c:560 ../src/modules/alsa/alsa-sink.c:726
-#, c-format
-msgid ""
-"ALSA woke us up to write new data to the device, but there was actually "
-"nothing to write!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
+"  -h, --help                            Zobraz? tohoto pomocn?ka\n"
+"      --version                         Zobraz? verziu\n"
+"\n"
+"  -s, --server=SERVER                   N?zov servera, na ktor? sa pripoji?\n"
+"  -n, --client-name=N?ZOV                Ako nazva? tohoto klienta na "
+"serveri\n"
 
-#: ../src/modules/alsa/alsa-source.c:519 ../src/modules/alsa/alsa-source.c:672
-#, c-format
-msgid ""
-"ALSA woke us up to read new data from the device, but there was actually "
-"nothing to read!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
+#: ../src/utils/pactl.c:1631
+#, c-format
+msgid ""
+"pactl %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
 msgstr ""
 
-#: ../src/modules/alsa/module-alsa-card.c:167
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2796
-#: ../src/modules/alsa/alsa-mixer.c:3898
-msgid "Off"
+#: ../src/utils/pactl.c:1690
+#, c-format
+msgid "Specify nothing, or one of: %s"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2738
-msgid "High Fidelity Playback (A2DP)"
+#: ../src/utils/pactl.c:1700
+msgid "Please specify a sample file to load"
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2752
-msgid "High Fidelity Capture (A2DP)"
+#: ../src/utils/pactl.c:1713
+msgid "Failed to open sound file."
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2767
-msgid "Telephony Duplex (HSP/HFP)"
+#: ../src/utils/pactl.c:1725
+msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2781
-msgid "Handsfree Gateway"
+#: ../src/utils/pactl.c:1735
+msgid "You have to specify a sample name to play"
 msgstr ""
 
-#: ../src/modules/reserve-wrap.c:151
-msgid "PulseAudio Sound Server"
+#: ../src/utils/pactl.c:1747
+msgid "You have to specify a sample name to remove"
 msgstr ""
 
-#: ../src/modules/module-rygel-media-server.c:510
-#: ../src/modules/module-rygel-media-server.c:548
-#: ../src/modules/module-rygel-media-server.c:903
-msgid "Output Devices"
+#: ../src/utils/pactl.c:1756
+msgid "You have to specify a sink input index and a sink"
 msgstr ""
 
-#: ../src/modules/module-rygel-media-server.c:511
-#: ../src/modules/module-rygel-media-server.c:549
-#: ../src/modules/module-rygel-media-server.c:904
-msgid "Input Devices"
+#: ../src/utils/pactl.c:1766
+msgid "You have to specify a source output index and a source"
 msgstr ""
 
-#: ../src/modules/module-rygel-media-server.c:1056
-msgid "Audio on @HOSTNAME@"
+#: ../src/utils/pactl.c:1781
+msgid "You have to specify a module name and arguments."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2219
-msgid "Input"
+#: ../src/utils/pactl.c:1801
+msgid "You have to specify a module index or name"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2220
-msgid "Docking Station Input"
+#: ../src/utils/pactl.c:1814
+msgid ""
+"You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2221
-msgid "Docking Station Microphone"
+#: ../src/utils/pactl.c:1819 ../src/utils/pactl.c:1839
+msgid "Invalid suspend specification."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2222
-msgid "Docking Station Line In"
+#: ../src/utils/pactl.c:1834
+msgid ""
+"You may not specify more than one source. You have to specify a boolean "
+"value."
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2223 ../src/modules/alsa/alsa-mixer.c:2307
-msgid "Line In"
+#: ../src/utils/pactl.c:1851
+msgid "You have to specify a card name/index and a profile name"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2224 ../src/modules/alsa/alsa-mixer.c:2302
-msgid "Microphone"
+#: ../src/utils/pactl.c:1862
+msgid "You have to specify a sink name/index and a port name"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2225 ../src/modules/alsa/alsa-mixer.c:2303
-msgid "Front Microphone"
+#: ../src/utils/pactl.c:1873
+msgid "You have to specify a sink name"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2226 ../src/modules/alsa/alsa-mixer.c:2304
-msgid "Rear Microphone"
+#: ../src/utils/pactl.c:1883
+msgid "You have to specify a source name/index and a port name"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2227
-msgid "External Microphone"
+#: ../src/utils/pactl.c:1894
+msgid "You have to specify a source name"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2228 ../src/modules/alsa/alsa-mixer.c:2306
-msgid "Internal Microphone"
+#: ../src/utils/pactl.c:1904
+msgid "You have to specify a sink name/index and a volume"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2229 ../src/modules/alsa/alsa-mixer.c:2308
-msgid "Radio"
-msgstr "Radio"
-
-#: ../src/modules/alsa/alsa-mixer.c:2230 ../src/modules/alsa/alsa-mixer.c:2309
-msgid "Video"
-msgstr "Video"
-
-#: ../src/modules/alsa/alsa-mixer.c:2231
-msgid "Automatic Gain Control"
+#: ../src/utils/pactl.c:1917
+msgid "You have to specify a source name/index and a volume"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2232
-msgid "No Automatic Gain Control"
+#: ../src/utils/pactl.c:1930
+msgid "You have to specify a sink input index and a volume"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2233
-msgid "Boost"
+#: ../src/utils/pactl.c:1935
+msgid "Invalid sink input index"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2234
-msgid "No Boost"
+#: ../src/utils/pactl.c:1946
+msgid "You have to specify a source output index and a volume"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2235
-msgid "Amplifier"
+#: ../src/utils/pactl.c:1951
+msgid "Invalid source output index"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2236
-msgid "No Amplifier"
+#: ../src/utils/pactl.c:1962
+msgid "You have to specify a sink name/index and a mute boolean"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2237
-msgid "Bass Boost"
+#: ../src/utils/pactl.c:1967 ../src/utils/pactl.c:1982
+#: ../src/utils/pactl.c:2002 ../src/utils/pactl.c:2020
+msgid "Invalid mute specification"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2238
-msgid "No Bass Boost"
+#: ../src/utils/pactl.c:1977
+msgid "You have to specify a source name/index and a mute boolean"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2239
-msgid "Speaker"
+#: ../src/utils/pactl.c:1992
+msgid "You have to specify a sink input index and a mute boolean"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2240 ../src/modules/alsa/alsa-mixer.c:2311
-msgid "Headphones"
+#: ../src/utils/pactl.c:1997
+msgid "Invalid sink input index specification"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2301
-msgid "Analog Input"
+#: ../src/utils/pactl.c:2010
+msgid "You have to specify a source output index and a mute boolean"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2305
-msgid "Dock Microphone"
+#: ../src/utils/pactl.c:2015
+msgid "Invalid source output index specification"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2310
-msgid "Analog Output"
+#: ../src/utils/pactl.c:2032
+msgid ""
+"You have to specify a sink index and a semicolon-separated list of supported "
+"formats"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2312
-msgid "LFE on Separate Mono Output"
-msgstr "Analog Output (LFE)"
-
-#: ../src/modules/alsa/alsa-mixer.c:2313
-msgid "Line Out"
+#: ../src/utils/pactl.c:2044
+msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2314
-msgid "Analog Mono Output"
-msgstr "Analog Mono Output"
-
-#: ../src/modules/alsa/alsa-mixer.c:2315
-#, fuzzy
-msgid "Speakers"
-msgstr "Analog Stereo"
-
-#: ../src/modules/alsa/alsa-mixer.c:2316
-msgid "HDMI / DisplayPort"
+#: ../src/utils/pactl.c:2051
+msgid "Could not parse latency offset"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2317
-#, fuzzy
-msgid "Digital Output (S/PDIF)"
-msgstr "Digital Stereo (HDMI)"
-
-#: ../src/modules/alsa/alsa-mixer.c:2318
-#, fuzzy
-msgid "Digital Passthrough (S/PDIF)"
-msgstr "Digital Stereo (HDMI)"
-
-#: ../src/modules/alsa/alsa-mixer.c:3756
-msgid "Analog Mono"
-msgstr "Analog Mono"
-
-#: ../src/modules/alsa/alsa-mixer.c:3757
-msgid "Analog Stereo"
-msgstr "Analog Stereo"
-
-#: ../src/modules/alsa/alsa-mixer.c:3758
-msgid "Analog Surround 2.1"
-msgstr "Analog Surround 2.1"
-
-#: ../src/modules/alsa/alsa-mixer.c:3759
-msgid "Analog Surround 3.0"
-msgstr "Analog Surround 3.0"
-
-#: ../src/modules/alsa/alsa-mixer.c:3760
-msgid "Analog Surround 3.1"
-msgstr "Analog Surround 3.1"
-
-#: ../src/modules/alsa/alsa-mixer.c:3761
-msgid "Analog Surround 4.0"
-msgstr "Analog Surround 4.0"
+#: ../src/utils/pactl.c:2063
+msgid "No valid command specified."
+msgstr "Nebol u?en? ?iadny platn? pr?kaz."
 
-#: ../src/modules/alsa/alsa-mixer.c:3762
-msgid "Analog Surround 4.1"
-msgstr "Analog Surround 4.1"
+#: ../src/utils/pasuspender.c:81
+#, c-format
+msgid "fork(): %s\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3763
-msgid "Analog Surround 5.0"
-msgstr "Analog Surround 5.0"
+#: ../src/utils/pasuspender.c:94
+#, c-format
+msgid "execvp(): %s\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3764
-msgid "Analog Surround 5.1"
-msgstr "Analog Surround 5.1"
+#: ../src/utils/pasuspender.c:113
+#, c-format
+msgid "Failure to resume: %s\n"
+msgstr "Zlyhanie pri pokra?ovan?: %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3765
-msgid "Analog Surround 6.0"
-msgstr "Analog Surround 6.0"
+#: ../src/utils/pasuspender.c:147
+#, c-format
+msgid "Failure to suspend: %s\n"
+msgstr "Zlyhanie pri usp?van?: %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3766
-msgid "Analog Surround 6.1"
-msgstr "Analog Surround 6.1"
+#: ../src/utils/pasuspender.c:172
+#, c-format
+msgid "WARNING: Sound server is not local, not suspending.\n"
+msgstr "UPOZORNENIE: Zvukov? server nie je miestny. Neusp?va sa.\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3767
-msgid "Analog Surround 7.0"
-msgstr "Analog Surround 7.0"
+#: ../src/utils/pasuspender.c:185
+#, c-format
+msgid "Connection failure: %s\n"
+msgstr "Zlyhanie pripojenia: %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3768
-msgid "Analog Surround 7.1"
-msgstr "Analog Surround 7.1"
+#: ../src/utils/pasuspender.c:203
+#, c-format
+msgid "Got SIGINT, exiting.\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3769
-msgid "Digital Stereo (IEC958)"
-msgstr "Digital Stereo (IEC958)"
+#: ../src/utils/pasuspender.c:221
+#, c-format
+msgid "WARNING: Child process terminated by signal %u\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3770
-#, fuzzy
-msgid "Digital Passthrough  (IEC958)"
-msgstr "Digital Stereo (IEC958)"
+#: ../src/utils/pasuspender.c:230
+#, c-format
+msgid ""
+"%s [options] ... \n"
+"\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"  -s, --server=SERVER                   The name of the server to connect "
+"to\n"
+"\n"
+msgstr ""
+"%s [vo?by] ... \n"
+"\n"
+"  -h, --help                            Zobraz? tohto pomocn?ka\n"
+"      --version                         Zobraz? verziu\n"
+"  -s, --server=SERVER                   N?zov servera, na ktor? sa pripoji?\n"
+"\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3771
-msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr "Digital Surround 4.0 (IEC958/AC3)"
+#: ../src/utils/pasuspender.c:268
+#, c-format
+msgid ""
+"pasuspender %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3772
-msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr "Digital Surround 5.1 (IEC958/AC3)"
+#: ../src/utils/pasuspender.c:297
+#, c-format
+msgid "pa_mainloop_new() failed.\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3773
-msgid "Digital Stereo (HDMI)"
-msgstr "Digital Stereo (HDMI)"
+#: ../src/utils/pasuspender.c:310
+#, c-format
+msgid "pa_context_new() failed.\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3774
-#, fuzzy
-msgid "Digital Surround 5.1 (HDMI)"
-msgstr "Digital Surround 5.1 (IEC958/AC3)"
+#: ../src/utils/pasuspender.c:322
+#, c-format
+msgid "pa_mainloop_run() failed.\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3895
-msgid "Analog Mono Duplex"
-msgstr "Analog Mono Duplex"
+#: ../src/utils/pax11publish.c:60
+#, c-format
+msgid ""
+"%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
+"\n"
+" -d    Show current PulseAudio data attached to X11 display (default)\n"
+" -e    Export local PulseAudio data to X11 display\n"
+" -i    Import PulseAudio data from X11 display to local environment "
+"variables and cookie file.\n"
+" -r    Remove PulseAudio data from X11 display\n"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3896
-msgid "Analog Stereo Duplex"
-msgstr "Analog Stereo Duplex"
+#: ../src/utils/pax11publish.c:93
+#, c-format
+msgid "Failed to parse command line.\n"
+msgstr "Zlyhalo analyzovanie pr?kazov?ho riadku.\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3897
-msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Digital Stereo Duplex (IEC958)"
+#: ../src/utils/pax11publish.c:112
+#, c-format
+msgid "Server: %s\n"
+msgstr "Server: %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:3997
+#: ../src/utils/pax11publish.c:114
 #, c-format
-msgid "%s Output"
-msgstr ""
+msgid "Source: %s\n"
+msgstr "Zdroj: %s\n"
 
-#: ../src/modules/alsa/alsa-mixer.c:4005
+#: ../src/utils/pax11publish.c:116
 #, c-format
-msgid "%s Input"
+msgid "Sink: %s\n"
 msgstr ""
 
-#: ../src/modules/echo-cancel/module-echo-cancel.c:63
-msgid ""
-"source_name=<name for the source> source_properties=<properties for the "
-"source> source_master=<name of source to filter> sink_name=<name for the "
-"sink> sink_properties=<properties for the sink> sink_master=<name of sink to "
-"filter> adjust_time=<how often to readjust rates in s> adjust_threshold=<how "
-"much drift to readjust after in ms> format=<sample format> rate=<sample "
-"rate> channels=<number of channels> channel_map=<channel map> "
-"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
-"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
-"loaded automatically> use_volume_sharing=<yes or no> "
+#: ../src/utils/pax11publish.c:118
+#, c-format
+msgid "Cookie: %s\n"
 msgstr ""
 
-#: ../src/modules/module-equalizer-sink.c:72
-msgid "General Purpose Equalizer"
+#: ../src/utils/pax11publish.c:136
+#, c-format
+msgid "Failed to parse cookie data\n"
 msgstr ""
 
-#: ../src/modules/module-equalizer-sink.c:76
-msgid ""
-"sink_name=<name of the sink> sink_properties=<properties for the sink> "
-"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
-"this module is being loaded automatically> use_volume_sharing=<yes or no> "
+#: ../src/utils/pax11publish.c:141
+#, c-format
+msgid "Failed to save cookie data\n"
 msgstr ""
 
-#: ../src/modules/module-filter-apply.c:48
-msgid "autoclean=<automatically unload unused filters?>"
+#: ../src/utils/pax11publish.c:170
+#, c-format
+msgid "Failed to get FQDN.\n"
 msgstr ""
 
-#: ../src/tests/resampler-test.c:257
+#: ../src/utils/pax11publish.c:190
 #, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-"-h, --help                            Show this help\n"
-"-v, --verbose                         Print debug messages\n"
-"      --from-rate=SAMPLERATE          From sample rate in Hz (defaults to "
-"44100)\n"
-"      --from-format=SAMPLEFORMAT      From sample type (defaults to s16le)\n"
-"      --from-channels=CHANNELS        From number of channels (defaults to "
-"1)\n"
-"      --to-rate=SAMPLERATE            To sample rate in Hz (defaults to "
-"44100)\n"
-"      --to-format=SAMPLEFORMAT        To sample type (defaults to s16le)\n"
-"      --to-channels=CHANNELS          To number of channels (defaults to 1)\n"
-"      --resample-method=METHOD        Resample method (defaults to auto)\n"
-"      --seconds=SECONDS               From stream duration (defaults to 60)\n"
-"\n"
-"If the formats are not specified, the test performs all formats "
-"combinations,\n"
-"back and forth.\n"
-"\n"
-"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
-"alaw,\n"
-"32le, s32be (defaults to s16ne)\n"
-"\n"
-"See --dump-resample-methods for possible values of resample methods.\n"
+msgid "Failed to load cookie data\n"
 msgstr ""
 
-#: ../src/tests/resampler-test.c:356
-#, fuzzy, c-format
-msgid "%s %s\n"
-msgstr "%s %s"
-
-#: ../src/tests/resampler-test.c:419
+#: ../src/utils/pax11publish.c:208
 #, c-format
-msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
+msgid "Not yet implemented.\n"
 msgstr ""
-
-#~ msgid "%s+%s"
-#~ msgstr "%s+%s"
-
-#~ msgid "%s / %s"
-#~ msgstr "%s / %s"
-
-#~ msgid "Digital Surround 4.0 (IEC958)"
-#~ msgstr "Digital Surround 4.0 (IEC958)"
diff --git a/po/uk.po b/po/uk.po
index 1f94a98..f31bde2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,9 +5,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-11 19:46+0200\n"
-"PO-Revision-Date: 2014-01-13 18:53+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
+"product=PulseAudio&keywords=I18N+L10N&component=misc\n"
+"POT-Creation-Date: 2014-05-30 15:56+0000\n"
+"PO-Revision-Date: 2014-06-23 21:20+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
 "Language-Team: Ukrainian <translation at linux.org.ua>\n"
 "Language: uk\n"
@@ -64,7 +65,7 @@ msgid ""
 "and\n"
 "                                        this time passed\n"
 "      --log-level[=LEVEL]               Increase or set verbosity level\n"
-"  -v                                    Increase the verbosity level\n"
+"  -v  --verbose                         Increase the verbosity level\n"
 "      --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
 "                                        Specify the log target\n"
 "      --log-meta[=BOOL]                 Include code location in log "
@@ -140,7 +141,7 @@ msgstr ""
 "                                        ?????????? ???????? ????????? ????\n"
 "      --log-level[=??????]              ????????? ??? ?????????? ?????? "
 "??????????? ??????\n"
-"  -v                                    ????????? ?????? ??????????? ??????\n"
+"  -v  --verbose                         ????????? ?????? ??????????? ??????\n"
 "      --log-target={auto,syslog,stderr,file:????,newfile:????}\n"
 "                                        ??????? ??????\n"
 "      --log-meta[=BOOL]                 ?????? ???????????? ??? ????? ? ???? "
@@ -220,8 +221,7 @@ msgid ""
 "valid file name 'file:<path>', 'newfile:<path>'."
 msgstr ""
 "?????? ??????? ???????????: ??????? ???????? ?syslog?, ?journal?, ?stderr?, "
-"?auto? ? "
-"????? ????? ????? ?file:<????>? ??? ?newfile:<????>?."
+"?auto? ? ????? ????? ????? ?file:<????>? ??? ?newfile:<????>?."
 
 #: ../src/daemon/cmdline.c:329
 msgid ""
@@ -709,8 +709,8 @@ msgid ""
 "Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
 "resolution timers enabled!"
 msgstr ""
-"??????, ??? ????? ???? ??? ????! ????? ??????? ?????????? Linux ? ??????????? "
-"????????????? ?????????!"
+"??????, ??? ????? ???? ??? ????! ????? ??????? ?????????? Linux ? "
+"??????????? ????????????? ?????????!"
 
 #: ../src/daemon/main.c:1026
 msgid "pa_core_new() failed."
@@ -746,14 +746,6 @@ msgstr "??????? ??????? PulseAudio"
 msgid "Start the PulseAudio Sound System"
 msgstr "????????? ??????? ??????? PulseAudio"
 
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:1
-msgid "PulseAudio Sound System KDE Routing Policy"
-msgstr "??????? ????????????? ???????? ??????? PulseAudio ? KDE"
-
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:2
-msgid "Start the PulseAudio Sound System with KDE Routing Policy"
-msgstr "????????? ??????? ??????? PulseAudio ? ????????? ????????????? KDE"
-
 #: ../src/modules/alsa/alsa-mixer.c:2251
 msgid "Input"
 msgstr "????"
@@ -775,8 +767,8 @@ msgid "Line In"
 msgstr "???????? ????"
 
 #: ../src/modules/alsa/alsa-mixer.c:2256 ../src/modules/alsa/alsa-mixer.c:2334
-#: ../src/modules/bluetooth/module-bluez4-device.c:2097
-#: ../src/modules/bluetooth/module-bluez5-device.c:1447
+#: ../src/modules/bluetooth/module-bluez4-device.c:2101
+#: ../src/modules/bluetooth/module-bluez5-device.c:1451
 msgid "Microphone"
 msgstr "????????"
 
@@ -837,8 +829,8 @@ msgid "No Bass Boost"
 msgstr "??? ??????????"
 
 #: ../src/modules/alsa/alsa-mixer.c:2271
-#: ../src/modules/bluetooth/module-bluez4-device.c:2102
-#: ../src/modules/bluetooth/module-bluez5-device.c:1454
+#: ../src/modules/bluetooth/module-bluez4-device.c:2106
+#: ../src/modules/bluetooth/module-bluez5-device.c:1458
 msgid "Speaker"
 msgstr "???????????"
 
@@ -992,8 +984,8 @@ msgstr "??????? ???????? ?????? (IEC958)"
 
 #: ../src/modules/alsa/alsa-mixer.c:3959
 #: ../src/modules/alsa/module-alsa-card.c:193
-#: ../src/modules/bluetooth/module-bluez4-device.c:2293
-#: ../src/modules/bluetooth/module-bluez5-device.c:1652
+#: ../src/modules/bluetooth/module-bluez4-device.c:2297
+#: ../src/modules/bluetooth/module-bluez5-device.c:1654
 msgid "Off"
 msgstr "????????"
 
@@ -1041,7 +1033,7 @@ msgstr ""
 "?????? ???? ????????? ?? ???????????? POLLIN, ??? ????????? ?????? "
 "snd_pcm_avail() ???????? 0 ??? ???? ???????? < min_avail."
 
-#: ../src/modules/alsa/alsa-util.c:1134 ../src/modules/alsa/alsa-util.c:1209
+#: ../src/modules/alsa/alsa-util.c:1135 ../src/modules/alsa/alsa-util.c:1210
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
@@ -1054,7 +1046,7 @@ msgstr ""
 "????????, ?? ????????? ?? ???? ? ???????? ALSA ?%s?. ???? ?????, ????????? "
 "??? ?? ???? ??????????? ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1184
+#: ../src/modules/alsa/alsa-util.c:1185
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
@@ -1067,7 +1059,7 @@ msgstr ""
 "????????, ?? ????????? ?? ???? ? ???????? ALSA ?%s?. ???? ?????, ????????? "
 "??? ?? ???? ??????????? ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1225
+#: ../src/modules/alsa/alsa-util.c:1226
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -1080,7 +1072,7 @@ msgstr ""
 "????????, ?? ????????? ? ????? ? ???????? ALSA ?%s?. ???? ?????, ????????? "
 "??? ?? ???? ??????????? ALSA."
 
-#: ../src/modules/alsa/alsa-util.c:1268
+#: ../src/modules/alsa/alsa-util.c:1269
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
@@ -1093,79 +1085,77 @@ msgstr ""
 "????????, ?? ????????? ?? ???? ? ???????? ALSA ?%s?. ???? ?????, ????????? "
 "??? ?? ???? ??????????? ALSA."
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2087
-#: ../src/modules/bluetooth/module-bluez5-device.c:1437
+#: ../src/modules/bluetooth/module-bluez4-device.c:2091
+#: ../src/modules/bluetooth/module-bluez5-device.c:1441
 msgid "Headset"
 msgstr "?????????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2092
-#: ../src/modules/bluetooth/module-bluez5-device.c:1442
+#: ../src/modules/bluetooth/module-bluez4-device.c:2096
+#: ../src/modules/bluetooth/module-bluez5-device.c:1446
 msgid "Handsfree"
 msgstr "???????? ??????? ???????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2107
-#: ../src/modules/bluetooth/module-bluez5-device.c:1460
+#: ../src/modules/bluetooth/module-bluez4-device.c:2111
+#: ../src/modules/bluetooth/module-bluez5-device.c:1464
 msgid "Headphone"
 msgstr "?????????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2112
-#: ../src/modules/bluetooth/module-bluez5-device.c:1465
+#: ../src/modules/bluetooth/module-bluez4-device.c:2116
+#: ../src/modules/bluetooth/module-bluez5-device.c:1469
 msgid "Portable"
 msgstr "?????????? ???????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2117
-#: ../src/modules/bluetooth/module-bluez5-device.c:1470
+#: ../src/modules/bluetooth/module-bluez4-device.c:2121
+#: ../src/modules/bluetooth/module-bluez5-device.c:1474
 msgid "Car"
 msgstr "???????????? ???????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2122
-#: ../src/modules/bluetooth/module-bluez5-device.c:1475
+#: ../src/modules/bluetooth/module-bluez4-device.c:2126
+#: ../src/modules/bluetooth/module-bluez5-device.c:1479
 msgid "HiFi"
 msgstr "HiFi"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2127
-#: ../src/modules/bluetooth/module-bluez5-device.c:1480
+#: ../src/modules/bluetooth/module-bluez4-device.c:2131
+#: ../src/modules/bluetooth/module-bluez5-device.c:1484
 msgid "Phone"
 msgstr "???????"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2135
-#: ../src/modules/bluetooth/module-bluez5-device.c:1432
-#: ../src/modules/bluetooth/module-bluez5-device.c:1448
-#: ../src/modules/bluetooth/module-bluez5-device.c:1486
+#: ../src/modules/bluetooth/module-bluez4-device.c:2139
+#: ../src/modules/bluetooth/module-bluez5-device.c:1436
+#: ../src/modules/bluetooth/module-bluez5-device.c:1452
+#: ../src/modules/bluetooth/module-bluez5-device.c:1490
 msgid "Bluetooth Output"
 msgstr "Bluetooth (???????????)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2138
-#: ../src/modules/bluetooth/module-bluez5-device.c:1431
-#: ../src/modules/bluetooth/module-bluez5-device.c:1453
-#: ../src/modules/bluetooth/module-bluez5-device.c:1459
-#: ../src/modules/bluetooth/module-bluez5-device.c:1485
+#: ../src/modules/bluetooth/module-bluez4-device.c:2142
+#: ../src/modules/bluetooth/module-bluez5-device.c:1435
+#: ../src/modules/bluetooth/module-bluez5-device.c:1457
+#: ../src/modules/bluetooth/module-bluez5-device.c:1463
+#: ../src/modules/bluetooth/module-bluez5-device.c:1489
 msgid "Bluetooth Input"
 msgstr "Bluetooth (????)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2174
+#: ../src/modules/bluetooth/module-bluez4-device.c:2178
 msgid "High Fidelity Playback (A2DP)"
 msgstr "??????????? ??????????? (A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2185
+#: ../src/modules/bluetooth/module-bluez4-device.c:2189
 msgid "High Fidelity Capture (A2DP)"
 msgstr "??????????? ?????????? (A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2196
+#: ../src/modules/bluetooth/module-bluez4-device.c:2200
 msgid "Telephony Duplex (HSP/HFP)"
 msgstr "?????????? ??????? (HSP/HFP)"
 
-#: ../src/modules/bluetooth/module-bluez4-device.c:2208
+#: ../src/modules/bluetooth/module-bluez4-device.c:2212
 msgid "Handsfree Gateway"
 msgstr "???????? ??????? ???????"
 
-#. TODO: Change this profile's name to a2dp_sink, to reflect the remote
-#. * device's role and be consistent with the a2dp source profile
-#: ../src/modules/bluetooth/module-bluez5-device.c:1525
+#: ../src/modules/bluetooth/module-bluez5-device.c:1527
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "??????????? ??????????? (??????? A2DP)"
 
-#: ../src/modules/bluetooth/module-bluez5-device.c:1536
+#: ../src/modules/bluetooth/module-bluez5-device.c:1538
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "??????????? ?????????? (??????? A2DP)"
 
@@ -1186,12 +1176,11 @@ msgstr ""
 "sink_properties=<??????????? ????????> sink_master=<????? ???????? ??? "
 "????????????> adjust_time=<??????? ??????????? ?????????? ? ????????> "
 "adjust_threshold=<?????????? ????? ? ??, ??? ???? ????????> format=<?????? "
-"?????> rate=<??????? ?????????????> channels=<????????? ???????> "
+"?????????> rate=<??????? ?????????????> channels=<????????? ???????> "
 "channel_map=<????? ???????> aec_method=<?????????? ???????> "
 "aec_args=<????????? ????? ?????????? ????> save_aec=<?? ???? ????????? ???? "
-"?????????? ???? ?? /tmp> "
-"autoloaded=<?????????, ?? ???? ????????????? ?????? ? ????????????? ??????> "
-"use_volume_sharing=<yes ??? no> "
+"?????????? ???? ?? /tmp> autoloaded=<?????????, ?? ???? ????????????? ?????? "
+"? ????????????? ??????> use_volume_sharing=<yes ??? no> "
 
 #. add on profile
 #: ../src/modules/macosx/module-coreaudio-device.c:756
@@ -1221,7 +1210,7 @@ msgid ""
 msgstr ""
 "sink_name=<????? ????????> sink_properties=<??????????? ????????> "
 "sink_master=<????? ????????, ? ???? ???? ????????? ?????????> format=<?????? "
-"??????> rate=<??????? ???????> channels=<????????? ???????> "
+"?????????> rate=<??????? ???????> channels=<????????? ???????> "
 "channel_map=<????? ???????> autoloaded=<?????????, ?? ???? ????????????? ??? "
 "?????? ? ????????????? ??????> use_volume_sharing=<yes ??? no> "
 
@@ -1244,7 +1233,7 @@ msgid ""
 "LADSPA port names> "
 msgstr ""
 "sink_name=<????? ????????> sink_properties=<??????????? ????????> "
-"master=<????? ???????? ??? ????????????> format=<?????? ??????> "
+"master=<????? ???????? ??? ????????????> format=<?????? ?????????> "
 "rate=<??????? ???????> channels=<????????? ???????> channel_map=<????? "
 "??????? ??????? ?????> plugin=<????? ??????? ladspa> label=<????? ??????? "
 "ladspa> control=<?????????? ?????? ?????? ??????? ??????? ??????????> "
@@ -1303,7 +1292,7 @@ msgid ""
 "left_hrir.wav "
 msgstr ""
 "sink_name=<????? ????????> sink_properties=<??????????? ????????> "
-"master=<????? ???????? ??? ????????????> format=<?????? ??????> "
+"master=<????? ???????? ??? ????????????> format=<?????? ?????????> "
 "rate=<??????? ???????> channels=<????????? ???????> channel_map=<????? "
 "???????> use_volume_sharing=<yes ??? no> force_flat_volume=<yes ??? no> "
 "hrir=/????/??/??????_hrir.wav "
@@ -1312,7 +1301,7 @@ msgstr ""
 msgid "PulseAudio Sound Server"
 msgstr "???????? ?????? PulseAudio"
 
-#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:754
+#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:760
 msgid "Mono"
 msgstr "????"
 
@@ -1524,67 +1513,90 @@ msgstr "??????? ?????? ??????"
 msgid "(invalid)"
 msgstr "(???????????)"
 
-#: ../src/pulse/channelmap.c:758
+#: ../src/pulse/channelmap.c:764
 msgid "Stereo"
 msgstr "??????"
 
-#: ../src/pulse/channelmap.c:763
+#: ../src/pulse/channelmap.c:769
 msgid "Surround 4.0"
 msgstr "??'????? 4.0"
 
-#: ../src/pulse/channelmap.c:769
+#: ../src/pulse/channelmap.c:775
 msgid "Surround 4.1"
 msgstr "??'????? 4.1"
 
-#: ../src/pulse/channelmap.c:775
+#: ../src/pulse/channelmap.c:781
 msgid "Surround 5.0"
 msgstr "??'????? 5.0"
 
-#: ../src/pulse/channelmap.c:781
+#: ../src/pulse/channelmap.c:787
 msgid "Surround 5.1"
 msgstr "??'????? 5.1"
 
-#: ../src/pulse/channelmap.c:788
+#: ../src/pulse/channelmap.c:794
 msgid "Surround 7.1"
 msgstr "??'????? 7.1"
 
-#: ../src/pulse/client-conf.c:119
-#, c-format
-msgid "Failed to open configuration file '%s': %s"
-msgstr "?? ??????? ???????? ???? ???????????? ?%s?: %s"
-
-#: ../src/pulse/client-conf.c:213 ../src/pulse/client-conf-x11.c:95
-msgid "Failed to parse cookie data"
-msgstr "?? ??????? ???????? ???? ????"
-
-#: ../src/pulse/client-conf-x11.c:54 ../src/utils/pax11publish.c:99
+#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:99
 msgid "xcb_connect() failed"
 msgstr "??????? xcb_connect()"
 
-#: ../src/pulse/client-conf-x11.c:59 ../src/utils/pax11publish.c:104
+#: ../src/pulse/client-conf-x11.c:60 ../src/utils/pax11publish.c:104
 msgid "xcb_connection_has_error() returned true"
 msgstr "xcb_connection_has_error() ????????? true"
 
-#: ../src/pulse/context.c:528
+#: ../src/pulse/client-conf-x11.c:96
+msgid "Failed to parse cookie data"
+msgstr "?? ??????? ???????? ???? ????"
+
+#: ../src/pulse/context.c:529
 msgid "No cookie loaded. Attempting to connect without."
 msgstr ""
 "????? ?? ???????????. ???? ???????? ?????? ????????? ?? ?? ???????????."
 
-#: ../src/pulse/context.c:609
+#: ../src/pulse/context.c:610
 #, c-format
 msgid "fork(): %s"
 msgstr "fork(): %s"
 
-#: ../src/pulse/context.c:664
+#: ../src/pulse/context.c:665
 #, c-format
 msgid "waitpid(): %s"
 msgstr "waitpid(): %s"
 
-#: ../src/pulse/context.c:1365
+#: ../src/pulse/context.c:1366
 #, c-format
 msgid "Received message for unknown extension '%s'"
 msgstr "???????? ???????????? ??? ????????? ??????? ?%s?"
 
+#: ../src/pulse/direction.c:39
+#| msgid "Input"
+msgid "input"
+msgstr "????"
+
+#: ../src/pulse/direction.c:41
+#| msgid "%s Output"
+msgid "output"
+msgstr "?????"
+
+#: ../src/pulse/direction.c:43
+msgid "bidirectional"
+msgstr "?????????"
+
+#: ../src/pulse/direction.c:45
+#| msgid "(invalid)"
+msgid "invalid"
+msgstr "???????????"
+
+#: ../src/pulsecore/core-util.h:95
+msgid "yes"
+msgstr "???"
+
+#: ../src/pulsecore/core-util.h:95
+#| msgid "Mono"
+msgid "no"
+msgstr "??"
+
 #: ../src/pulsecore/lock-autospawn.c:143 ../src/pulsecore/lock-autospawn.c:229
 msgid "Cannot access autospawn lock."
 msgstr "?? ??????? ????? ?????????? ????????????? ????????????."
@@ -1599,18 +1611,18 @@ msgstr "?? ??????? ???????? ???? ???????????, ?
 msgid ""
 "Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
 msgstr ""
-"???? ???????? ?????? ???????? ????? ??????????? ?%s?, ?%s.1?, ?%s.2? ... ?%s.%"
-"d?, ??? ??? ???? ??????????? ????????."
+"???? ???????? ?????? ???????? ????? ??????????? ?%s?, ?%s.1?, ?%s.2? ... ?%s."
+"%d?, ??? ??? ???? ??????????? ????????."
 
 #: ../src/pulsecore/log.c:633
 msgid "Invalid log target."
 msgstr "?????????? ?????? ????? ???????."
 
-#: ../src/pulsecore/sink.c:3483
+#: ../src/pulsecore/sink.c:3428
 msgid "Built-in Audio"
 msgstr "????????? ?????"
 
-#: ../src/pulsecore/sink.c:3488
+#: ../src/pulsecore/sink.c:3433
 msgid "Modem"
 msgstr "?????"
 
@@ -1875,8 +1887,9 @@ msgstr "???????????? ????????? ???????????? ?%
 
 #: ../src/utils/pacat.c:359
 #, c-format
-msgid "Connected to device %s (%u, %ssuspended)."
-msgstr "???????? ? ????????? %s (%u, %s ???????????)."
+#| msgid "Connected to device %s (%u, %ssuspended)."
+msgid "Connected to device %s (index: %u, suspended: %s)."
+msgstr "???????? ? ????????? %s (??????: %u, ???????????: %s)."
 
 #: ../src/utils/pacat.c:369
 #, c-format
@@ -1961,7 +1974,7 @@ msgstr "?? ??????? ?????????? ????? ??????????
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "?????? ????????? pa_stream_connect_record() ??????? ???????: %s"
 
-#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1388
+#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1455
 #, c-format
 msgid "Connection failure: %s"
 msgstr "?????? ???????????? ????????? ??????? ???????: %s"
@@ -1996,6 +2009,70 @@ msgstr "??????? pa_stream_update_timing_info(): %s"
 
 #: ../src/utils/pacat.c:672
 #, c-format
+#| msgid ""
+#| "%s [options]\n"
+#| "\n"
+#| "  -h, --help                            Show this help\n"
+#| "      --version                         Show version\n"
+#| "\n"
+#| "  -r, --record                          Create a connection for "
+#| "recording\n"
+#| "  -p, --playback                        Create a connection for playback\n"
+#| "\n"
+#| "  -v, --verbose                         Enable verbose operations\n"
+#| "\n"
+#| "  -s, --server=SERVER                   The name of the server to connect "
+#| "to\n"
+#| "  -d, --device=DEVICE                   The name of the sink/source to "
+#| "connect to\n"
+#| "  -n, --client-name=NAME                How to call this client on the "
+#| "server\n"
+#| "      --stream-name=NAME                How to call this stream on the "
+#| "server\n"
+#| "      --volume=VOLUME                   Specify the initial (linear) "
+#| "volume in range 0...65536\n"
+#| "      --rate=SAMPLERATE                 The sample rate in Hz (defaults "
+#| "to 44100)\n"
+#| "      --format=SAMPLEFORMAT             The sample type, one of s16le, "
+#| "s16be, u8, float32le,\n"
+#| "                                        float32be, ulaw, alaw, s32le, "
+#| "s32be, s24le, s24be,\n"
+#| "                                        s24-32le, s24-32be (defaults to "
+#| "s16ne)\n"
+#| "      --channels=CHANNELS               The number of channels, 1 for "
+#| "mono, 2 for stereo\n"
+#| "                                        (defaults to 2)\n"
+#| "      --channel-map=CHANNELMAP          Channel map to use instead of the "
+#| "default\n"
+#| "      --fix-format                      Take the sample format from the "
+#| "sink the stream is\n"
+#| "                                        being connected to.\n"
+#| "      --fix-rate                        Take the sampling rate from the "
+#| "sink the stream is\n"
+#| "                                        being connected to.\n"
+#| "      --fix-channels                    Take the number of channels and "
+#| "the channel map\n"
+#| "                                        from the sink the stream is being "
+#| "connected to.\n"
+#| "      --no-remix                        Don't upmix or downmix channels.\n"
+#| "      --no-remap                        Map channels by index instead of "
+#| "name.\n"
+#| "      --latency=BYTES                   Request the specified latency in "
+#| "bytes.\n"
+#| "      --process-time=BYTES              Request the specified process "
+#| "time per request in bytes.\n"
+#| "      --latency-msec=MSEC               Request the specified latency in "
+#| "msec.\n"
+#| "      --process-time-msec=MSEC          Request the specified process "
+#| "time per request in msec.\n"
+#| "      --property=PROPERTY=VALUE         Set the specified property to the "
+#| "specified value.\n"
+#| "      --raw                             Record/play raw PCM data.\n"
+#| "      --passthrough                     passthrough data \n"
+#| "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
+#| "      --list-file-formats               List available file formats.\n"
+#| "      --monitor-stream=INDEX            Record from the sink input with "
+#| "index INDEX.\n"
 msgid ""
 "%s [options]\n"
 "\n"
@@ -2030,16 +2107,16 @@ msgid ""
 "                                        (defaults to 2)\n"
 "      --channel-map=CHANNELMAP          Channel map to use instead of the "
 "default\n"
-"      --fix-format                      Take the sample format from the sink "
-"the stream is\n"
+"      --fix-format                      Take the sample format from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
-"      --fix-rate                        Take the sampling rate from the sink "
-"the stream is\n"
+"      --fix-rate                        Take the sampling rate from the sink/"
+"source the stream is\n"
 "                                        being connected to.\n"
 "      --fix-channels                    Take the number of channels and the "
 "channel map\n"
-"                                        from the sink the stream is being "
-"connected to.\n"
+"                                        from the sink/source the stream is "
+"being connected to.\n"
 "      --no-remix                        Don't upmix or downmix channels.\n"
 "      --no-remap                        Map channels by index instead of "
 "name.\n"
@@ -2054,7 +2131,7 @@ msgid ""
 "      --property=PROPERTY=VALUE         Set the specified property to the "
 "specified value.\n"
 "      --raw                             Record/play raw PCM data.\n"
-"      --passthrough                     passthrough data \n"
+"      --passthrough                     Passthrough data.\n"
 "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
 "      --list-file-formats               List available file formats.\n"
 "      --monitor-stream=INDEX            Record from the sink input with "
@@ -2092,7 +2169,8 @@ msgstr ""
 "                                        (?????? ???????? ? 2)\n"
 "      --channel-map=????? ???????       ????? ???????, ??? ???? "
 "??????????????? ??????? ???????\n"
-"      --fix-format                      ?????????? ?????? ????? ? ????????, "
+"      --fix-format                      ?????????? ?????? ????????? ? "
+"????????, "
 "? ???? ????????\n"
 "                                        ?????.\n"
 "      --fix-rate                        ?????????? ???? ???? ??????? "
@@ -2136,7 +2214,7 @@ msgstr ""
 "??????? ? libpulse %s\n"
 "???????? ? libpulse %s\n"
 
-#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1559
+#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1651
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "?????????? ????? ??????? ?%s?"
@@ -2209,7 +2287,7 @@ msgstr ""
 "????????????: ??????? ???????? ???????????? ???? ???????????? ????????????? "
 "? ?????."
 
-#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1626
+#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1718
 msgid "Failed to determine sample specification from file."
 msgstr "?? ??????? ???????? ???? ???? ????????? ???????????? ? ?????."
 
@@ -2244,7 +2322,7 @@ msgstr "???????????"
 msgid "Failed to set media name."
 msgstr "?? ??????? ?????????? ????? ????? ?????."
 
-#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:1976
+#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:2068
 msgid "pa_mainloop_new() failed."
 msgstr "?????? ????????? pa_mainloop_new() ??????????? ???????."
 
@@ -2252,11 +2330,11 @@ msgstr "?????? ????????? pa_mainloop_new() ???????????
 msgid "io_new() failed."
 msgstr "?????? ????????? io_new() ??????????? ???????."
 
-#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:1988
+#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:2080
 msgid "pa_context_new() failed."
 msgstr "?????? ????????? pa_context_new() ??????????? ???????."
 
-#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:1994
+#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:2086
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "?????? ????????? pa_context_connect() ??????????? ???????: %s"
@@ -2265,32 +2343,32 @@ msgstr "?????? ????????? pa_context_connect() ?????????
 msgid "pa_context_rttime_new() failed."
 msgstr "?????? ????????? pa_context_new() ??????????? ???????."
 
-#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:1999
+#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:2091
 msgid "pa_mainloop_run() failed."
 msgstr "?????? ????????? pa_mainloop_run() ??????????? ???????."
 
-#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1481
+#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1573
 msgid "NAME [ARGS ...]"
 msgstr "????? [?????????...]"
 
-#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1482
+#: ../src/utils/pacmd.c:54 ../src/utils/pacmd.c:62 ../src/utils/pactl.c:1574
 msgid "NAME|#N"
 msgstr "?????|?????"
 
-#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1480
-#: ../src/utils/pactl.c:1486
+#: ../src/utils/pacmd.c:55 ../src/utils/pacmd.c:65 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1578
 msgid "NAME"
 msgstr "?????"
 
-#: ../src/utils/pacmd.c:56 ../src/utils/pactl.c:1488
+#: ../src/utils/pacmd.c:56
 msgid "NAME|#N VOLUME"
 msgstr "?????|????? ????????"
 
-#: ../src/utils/pacmd.c:57 ../src/utils/pactl.c:1489
+#: ../src/utils/pacmd.c:57
 msgid "#N VOLUME"
 msgstr "????? ????????"
 
-#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1484
+#: ../src/utils/pacmd.c:58 ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1576
 msgid "NAME|#N 1|0"
 msgstr "?????|????? 1|0"
 
@@ -2326,7 +2404,7 @@ msgstr "????"
 msgid "FILENAME SINK|#N"
 msgstr "?????_????? ???????|#N"
 
-#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1483
+#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1575
 msgid "#N SINK|SOURCE"
 msgstr "????? ???????|???????"
 
@@ -2334,15 +2412,15 @@ msgstr "????? ???????|???????"
 msgid "1|0"
 msgstr "1|0"
 
-#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1485
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1577
 msgid "CARD PROFILE"
 msgstr "??????? ??????"
 
-#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1487
+#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1579
 msgid "NAME|#N PORT"
 msgstr "?????|????? ?????"
 
-#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1493
+#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1585
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "?????-??????|??????? ???? ????"
 
@@ -2422,33 +2500,33 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
-#: ../src/utils/pactl.c:161
+#: ../src/utils/pactl.c:166
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "?? ??????? ???????? ??????????? ????: %s"
 
-#: ../src/utils/pactl.c:167
+#: ../src/utils/pactl.c:172
 #, c-format
 msgid "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr "????? ???????????: %u ??????, ?? ??????? ??????? %s ??????.\n"
 
-#: ../src/utils/pactl.c:170
+#: ../src/utils/pactl.c:175
 #, c-format
 msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr ""
 "???????? ???????? ????????? ???????: %u ??????, ?? ??????? %s ??????.\n"
 
-#: ../src/utils/pactl.c:173
+#: ../src/utils/pactl.c:178
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "?????? ???? ??????????: %s\n"
 
-#: ../src/utils/pactl.c:182
+#: ../src/utils/pactl.c:187
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "?? ??????? ???????? ???? ???? ???????: %s"
 
-#: ../src/utils/pactl.c:187
+#: ../src/utils/pactl.c:192
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2465,7 +2543,7 @@ msgstr ""
 "????? ???????: %u\n"
 "?????? ?????????: %zu\n"
 
-#: ../src/utils/pactl.c:203
+#: ../src/utils/pactl.c:208
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2488,12 +2566,12 @@ msgstr ""
 "?????? ???????: %s\n"
 "????: %04x:%04x\n"
 
-#: ../src/utils/pactl.c:252 ../src/utils/pactl.c:878 ../src/utils/pactl.c:952
+#: ../src/utils/pactl.c:257 ../src/utils/pactl.c:902 ../src/utils/pactl.c:980
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "?? ??????? ???????? ???? ???? ????????: %s"
 
-#: ../src/utils/pactl.c:278
+#: ../src/utils/pactl.c:283
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2532,27 +2610,27 @@ msgstr ""
 "\t???????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:322 ../src/utils/pactl.c:428 ../src/utils/pactl.c:589
+#: ../src/utils/pactl.c:327 ../src/utils/pactl.c:433 ../src/utils/pactl.c:594
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\t?????:\n"
 
-#: ../src/utils/pactl.c:329 ../src/utils/pactl.c:435
+#: ../src/utils/pactl.c:334 ../src/utils/pactl.c:440
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\t???????? ????: %s\n"
 
-#: ../src/utils/pactl.c:335 ../src/utils/pactl.c:441
+#: ../src/utils/pactl.c:340 ../src/utils/pactl.c:446
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\t???????:\n"
 
-#: ../src/utils/pactl.c:359 ../src/utils/pactl.c:897 ../src/utils/pactl.c:967
+#: ../src/utils/pactl.c:364 ../src/utils/pactl.c:922 ../src/utils/pactl.c:995
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "?? ??????? ???????? ???? ???? ???????: %s"
 
-#: ../src/utils/pactl.c:385
+#: ../src/utils/pactl.c:390
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2591,20 +2669,20 @@ msgstr ""
 "\t???????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:413 ../src/utils/pactl.c:483 ../src/utils/pactl.c:526
-#: ../src/utils/pactl.c:568 ../src/utils/pactl.c:666 ../src/utils/pactl.c:667
-#: ../src/utils/pactl.c:678 ../src/utils/pactl.c:736 ../src/utils/pactl.c:737
-#: ../src/utils/pactl.c:748 ../src/utils/pactl.c:799 ../src/utils/pactl.c:800
-#: ../src/utils/pactl.c:806
+#: ../src/utils/pactl.c:418 ../src/utils/pactl.c:488 ../src/utils/pactl.c:531
+#: ../src/utils/pactl.c:573 ../src/utils/pactl.c:671 ../src/utils/pactl.c:672
+#: ../src/utils/pactl.c:683 ../src/utils/pactl.c:741 ../src/utils/pactl.c:742
+#: ../src/utils/pactl.c:753 ../src/utils/pactl.c:804 ../src/utils/pactl.c:805
+#: ../src/utils/pactl.c:811
 msgid "n/a"
 msgstr "?/?"
 
-#: ../src/utils/pactl.c:452 ../src/utils/pactl.c:853
+#: ../src/utils/pactl.c:457 ../src/utils/pactl.c:861
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "?? ??????? ???????? ???? ???? ??????: %s"
 
-#: ../src/utils/pactl.c:475
+#: ../src/utils/pactl.c:480
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2621,12 +2699,12 @@ msgstr ""
 "\t???????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:494
+#: ../src/utils/pactl.c:499
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "?? ??????? ???????? ???? ???? ???????: %s"
 
-#: ../src/utils/pactl.c:520
+#: ../src/utils/pactl.c:525
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2641,12 +2719,12 @@ msgstr ""
 "\t???????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:537
+#: ../src/utils/pactl.c:542
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "?? ??????? ???????? ???? ???? ?????: %s"
 
-#: ../src/utils/pactl.c:560
+#: ../src/utils/pactl.c:565
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2663,17 +2741,17 @@ msgstr ""
 "\t???????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:576
+#: ../src/utils/pactl.c:581
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\t???????:\n"
 
-#: ../src/utils/pactl.c:583
+#: ../src/utils/pactl.c:588
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\t???????? ???????: %s\n"
 
-#: ../src/utils/pactl.c:597
+#: ../src/utils/pactl.c:602
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2682,17 +2760,17 @@ msgstr ""
 "\t\t\t???????????:\n"
 "\t\t\t\t%s\n"
 
-#: ../src/utils/pactl.c:602
+#: ../src/utils/pactl.c:607
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\t??????? ????????: %s"
 
-#: ../src/utils/pactl.c:619 ../src/utils/pactl.c:916 ../src/utils/pactl.c:982
+#: ../src/utils/pactl.c:624 ../src/utils/pactl.c:942 ../src/utils/pactl.c:1010
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "?? ??????? ???????? ?????????? ???? ???????? ?????? ????????: %s"
 
-#: ../src/utils/pactl.c:648
+#: ../src/utils/pactl.c:653
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2731,12 +2809,12 @@ msgstr ""
 "\t???????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:689 ../src/utils/pactl.c:935 ../src/utils/pactl.c:997
+#: ../src/utils/pactl.c:694 ../src/utils/pactl.c:962 ../src/utils/pactl.c:1025
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "?? ??????? ???????? ???? ???? ??????????? ???????: %s"
 
-#: ../src/utils/pactl.c:718
+#: ../src/utils/pactl.c:723
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2775,12 +2853,12 @@ msgstr ""
 "\t???????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:759
+#: ../src/utils/pactl.c:764
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "?? ??????? ???????? ???? ???? ?????????: %s"
 
-#: ../src/utils/pactl.c:786
+#: ../src/utils/pactl.c:791
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2809,134 +2887,166 @@ msgstr ""
 "\t???????????:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:814 ../src/utils/pactl.c:824
+#: ../src/utils/pactl.c:819 ../src/utils/pactl.c:829
 #, c-format
 msgid "Failure: %s"
 msgstr "???????: %s"
 
-#: ../src/utils/pactl.c:860
+#: ../src/utils/pactl.c:868
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "?? ??????? ??????????? ??????: ?????? %s ?? ???????????"
 
-#: ../src/utils/pactl.c:1023
+#: ../src/utils/pactl.c:886
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel/s supported = %d\n"
+msgstr ""
+"?? ??????? ?????????? ????????: ?? ?????????? ?????????? ???????? ??? %d "
+"???????, ???? ??????????? ????????? %d ???????\n"
+
+#: ../src/utils/pactl.c:1052
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "?? ??????? ?????????? ??????: ??????????? ????? ??????? %s"
 
-#: ../src/utils/pactl.c:1062
+#: ../src/utils/pactl.c:1095
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "?? ??????? ??????????? ??????: %s"
 
-#: ../src/utils/pactl.c:1079
+#: ../src/utils/pactl.c:1112
 msgid "Premature end of file"
 msgstr "?????????? ?????????? ?????"
 
-#: ../src/utils/pactl.c:1099
+#: ../src/utils/pactl.c:1132
 msgid "new"
 msgstr "????????"
 
-#: ../src/utils/pactl.c:1102
+#: ../src/utils/pactl.c:1135
 msgid "change"
 msgstr "???????"
 
-#: ../src/utils/pactl.c:1105
+#: ../src/utils/pactl.c:1138
 msgid "remove"
 msgstr "????????"
 
-#: ../src/utils/pactl.c:1108 ../src/utils/pactl.c:1143
+#: ../src/utils/pactl.c:1141 ../src/utils/pactl.c:1176
 msgid "unknown"
 msgstr "?????????"
 
-#: ../src/utils/pactl.c:1116
+#: ../src/utils/pactl.c:1149
 msgid "sink"
 msgstr "???????"
 
-#: ../src/utils/pactl.c:1119
+#: ../src/utils/pactl.c:1152
 msgid "source"
 msgstr "???????"
 
-#: ../src/utils/pactl.c:1122
+#: ../src/utils/pactl.c:1155
 msgid "sink-input"
 msgstr "???? ????????"
 
-#: ../src/utils/pactl.c:1125
+#: ../src/utils/pactl.c:1158
 msgid "source-output"
 msgstr "??????????? ???????"
 
-#: ../src/utils/pactl.c:1128
+#: ../src/utils/pactl.c:1161
 msgid "module"
 msgstr "??????"
 
-#: ../src/utils/pactl.c:1131
+#: ../src/utils/pactl.c:1164
 msgid "client"
 msgstr "??????"
 
-#: ../src/utils/pactl.c:1134
+#: ../src/utils/pactl.c:1167
 msgid "sample-cache"
 msgstr "??? ???????"
 
-#: ../src/utils/pactl.c:1137 ../src/utils/pactl.c:1140
+#: ../src/utils/pactl.c:1170
 msgid "server"
 msgstr "??????"
 
-#: ../src/utils/pactl.c:1149
+#: ../src/utils/pactl.c:1173
+msgid "card"
+msgstr "??????"
+
+#: ../src/utils/pactl.c:1182
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "????? ?%s? ?? %s ?%u\n"
 
-#: ../src/utils/pactl.c:1394
+#: ../src/utils/pactl.c:1461
 msgid "Got SIGINT, exiting."
 msgstr "???????? ?????? SIGINT, ?????????? ??????."
 
-#: ../src/utils/pactl.c:1421
+#: ../src/utils/pactl.c:1488
 msgid "Invalid volume specification"
 msgstr "?????????? ???????????? ????????"
 
-#: ../src/utils/pactl.c:1444
+#: ../src/utils/pactl.c:1511
 msgid "Volume outside permissible range.\n"
 msgstr "???????? ???? ?????? ??????????? ?????????.\n"
 
-#: ../src/utils/pactl.c:1474 ../src/utils/pactl.c:1475
-#: ../src/utils/pactl.c:1476 ../src/utils/pactl.c:1477
-#: ../src/utils/pactl.c:1478 ../src/utils/pactl.c:1479
-#: ../src/utils/pactl.c:1480 ../src/utils/pactl.c:1481
-#: ../src/utils/pactl.c:1482 ../src/utils/pactl.c:1483
-#: ../src/utils/pactl.c:1484 ../src/utils/pactl.c:1485
-#: ../src/utils/pactl.c:1486 ../src/utils/pactl.c:1487
-#: ../src/utils/pactl.c:1488 ../src/utils/pactl.c:1489
-#: ../src/utils/pactl.c:1490 ../src/utils/pactl.c:1491
-#: ../src/utils/pactl.c:1492 ../src/utils/pactl.c:1493
-#: ../src/utils/pactl.c:1494
+#: ../src/utils/pactl.c:1524
+#| msgid "Invalid volume specification"
+msgid "Invalid number of volume specifications.\n"
+msgstr "?????????? ????????? ???????????? ????????.\n"
+
+#: ../src/utils/pactl.c:1536
+#| msgid "Invalid volume specification"
+msgid "Inconsistent volume specification.\n"
+msgstr "????????? ???????????? ????????.\n"
+
+#: ../src/utils/pactl.c:1566 ../src/utils/pactl.c:1567
+#: ../src/utils/pactl.c:1568 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1570 ../src/utils/pactl.c:1571
+#: ../src/utils/pactl.c:1572 ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1574 ../src/utils/pactl.c:1575
+#: ../src/utils/pactl.c:1576 ../src/utils/pactl.c:1577
+#: ../src/utils/pactl.c:1578 ../src/utils/pactl.c:1579
+#: ../src/utils/pactl.c:1580 ../src/utils/pactl.c:1581
+#: ../src/utils/pactl.c:1582 ../src/utils/pactl.c:1583
+#: ../src/utils/pactl.c:1584 ../src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1586
 msgid "[options]"
 msgstr "[?????????]"
 
-#: ../src/utils/pactl.c:1476
+#: ../src/utils/pactl.c:1568
 msgid "[TYPE]"
 msgstr "[???]"
 
-#: ../src/utils/pactl.c:1478
+#: ../src/utils/pactl.c:1570
 msgid "FILENAME [NAME]"
 msgstr "?????_????? [?????]"
 
-#: ../src/utils/pactl.c:1479
+#: ../src/utils/pactl.c:1571
 msgid "NAME [SINK]"
 msgstr "????? [???????]"
 
-#: ../src/utils/pactl.c:1490
+#: ../src/utils/pactl.c:1580
+#| msgid "NAME|#N VOLUME"
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "?????|????? ???????? [???????? ...]"
+
+#: ../src/utils/pactl.c:1581
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "????? ???????? [???????? ...]"
+
+#: ../src/utils/pactl.c:1582
 msgid "NAME|#N 1|0|toggle"
 msgstr "?????|????? 1|0|toggle"
 
-#: ../src/utils/pactl.c:1491
+#: ../src/utils/pactl.c:1583
 msgid "#N 1|0|toggle"
 msgstr "????? 1|0|toggle"
 
-#: ../src/utils/pactl.c:1492
+#: ../src/utils/pactl.c:1584
 msgid "#N FORMATS"
 msgstr "????? ???????"
 
-#: ../src/utils/pactl.c:1495
+#: ../src/utils/pactl.c:1587
 #, c-format
 msgid ""
 "\n"
@@ -2948,7 +3058,7 @@ msgstr ""
 "@DEFAULT_MONITOR@,\n"
 "????? ???????????? ??? ?????????? ???????? ????????, ??????? ?? ????????.\n"
 
-#: ../src/utils/pactl.c:1498
+#: ../src/utils/pactl.c:1590
 #, c-format
 msgid ""
 "\n"
@@ -2967,7 +3077,7 @@ msgstr ""
 "??????????\n"
 "  -n, --client-name=?????               ????? ????? ??????? ?? ???????\n"
 
-#: ../src/utils/pactl.c:1539
+#: ../src/utils/pactl.c:1631
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2978,60 +3088,60 @@ msgstr ""
 "??????? ? libpulse %s\n"
 "???????? ? libpulse %s\n"
 
-#: ../src/utils/pactl.c:1598
+#: ../src/utils/pactl.c:1690
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "?????? ?? ???????? ??? ??????? ???? ? ?????????: %s"
 
-#: ../src/utils/pactl.c:1608
+#: ../src/utils/pactl.c:1700
 msgid "Please specify a sample file to load"
 msgstr "???? ?????, ??????? ???? ????????? ??? ????????????"
 
-#: ../src/utils/pactl.c:1621
+#: ../src/utils/pactl.c:1713
 msgid "Failed to open sound file."
 msgstr "?? ??????? ???????? ???????? ????."
 
-#: ../src/utils/pactl.c:1633
+#: ../src/utils/pactl.c:1725
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "????????????: ?? ??????? ???????? ???? ???? ????????? ???????????? ? ?????."
 
-#: ../src/utils/pactl.c:1643
+#: ../src/utils/pactl.c:1735
 msgid "You have to specify a sample name to play"
 msgstr "??? ???? ??????? ????? ?????????? ?????, ???? ???? ??????????"
 
-#: ../src/utils/pactl.c:1655
+#: ../src/utils/pactl.c:1747
 msgid "You have to specify a sample name to remove"
 msgstr "??? ???? ??????? ????? ?????????? ?????, ???? ???? ????????"
 
-#: ../src/utils/pactl.c:1664
+#: ../src/utils/pactl.c:1756
 msgid "You have to specify a sink input index and a sink"
 msgstr "??? ???? ??????? ????? ???????? ?????? ???????? ????? ? ???????"
 
-#: ../src/utils/pactl.c:1674
+#: ../src/utils/pactl.c:1766
 msgid "You have to specify a source output index and a source"
 msgstr "??? ???? ??????? ????? ??????? ??????????? ? ???????"
 
-#: ../src/utils/pactl.c:1689
+#: ../src/utils/pactl.c:1781
 msgid "You have to specify a module name and arguments."
 msgstr "??? ???? ??????? ????? ?????? ? ?????????."
 
-#: ../src/utils/pactl.c:1709
+#: ../src/utils/pactl.c:1801
 msgid "You have to specify a module index or name"
 msgstr "??? ???? ??????? ????? ??? ????? ??????"
 
-#: ../src/utils/pactl.c:1722
+#: ../src/utils/pactl.c:1814
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "?? ????? ????????? ?????? ?????? ????????. ??? ???? ??????? ????????? "
 "????????."
 
-#: ../src/utils/pactl.c:1727 ../src/utils/pactl.c:1747
+#: ../src/utils/pactl.c:1819 ../src/utils/pactl.c:1839
 msgid "Invalid suspend specification."
 msgstr "?????????? ???????????? ????????????."
 
-#: ../src/utils/pactl.c:1742
+#: ../src/utils/pactl.c:1834
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3039,84 +3149,84 @@ msgstr ""
 "?? ????? ????????? ?????? ?????? ???????. ??? ???? ??????? ????????? "
 "????????."
 
-#: ../src/utils/pactl.c:1759
+#: ../src/utils/pactl.c:1851
 msgid "You have to specify a card name/index and a profile name"
 msgstr "??? ???? ??????? ?????/????? ????? ? ????? ???????"
 
-#: ../src/utils/pactl.c:1770
+#: ../src/utils/pactl.c:1862
 msgid "You have to specify a sink name/index and a port name"
 msgstr "??? ???? ??????? ?????/????? ???????? ? ????? ?????"
 
-#: ../src/utils/pactl.c:1781
+#: ../src/utils/pactl.c:1873
 msgid "You have to specify a sink name"
 msgstr "??? ???? ??????? ????? ????????"
 
-#: ../src/utils/pactl.c:1791
+#: ../src/utils/pactl.c:1883
 msgid "You have to specify a source name/index and a port name"
 msgstr "??? ???? ??????? ?????/????? ??????? ? ????? ?????"
 
-#: ../src/utils/pactl.c:1802
+#: ../src/utils/pactl.c:1894
 msgid "You have to specify a source name"
 msgstr "??? ???? ??????? ????? ???????"
 
-#: ../src/utils/pactl.c:1812
+#: ../src/utils/pactl.c:1904
 msgid "You have to specify a sink name/index and a volume"
 msgstr "??? ???? ??????? ?????/????? ???????? ? ????????"
 
-#: ../src/utils/pactl.c:1825
+#: ../src/utils/pactl.c:1917
 msgid "You have to specify a source name/index and a volume"
 msgstr "??? ???? ??????? ?????/????? ??????? ? ????????"
 
-#: ../src/utils/pactl.c:1838
+#: ../src/utils/pactl.c:1930
 msgid "You have to specify a sink input index and a volume"
 msgstr "??? ???? ??????? ????? ???????? ?????? ???????? ????? ? ????????"
 
-#: ../src/utils/pactl.c:1843
+#: ../src/utils/pactl.c:1935
 msgid "Invalid sink input index"
 msgstr "??????????? ????? ???????? ?????? ???????? ?????"
 
-#: ../src/utils/pactl.c:1854
+#: ../src/utils/pactl.c:1946
 msgid "You have to specify a source output index and a volume"
 msgstr "??? ???? ??????? ????? ?????? ??????????? ? ????????"
 
-#: ../src/utils/pactl.c:1859
+#: ../src/utils/pactl.c:1951
 msgid "Invalid source output index"
 msgstr "??????????? ????? ??????? ???????????"
 
-#: ../src/utils/pactl.c:1870
+#: ../src/utils/pactl.c:1962
 msgid "You have to specify a sink name/index and a mute boolean"
 msgstr ""
 "??? ???? ??????? ?????/????? ???????? ? ?????? ???????? ????????? ?????"
 
-#: ../src/utils/pactl.c:1875 ../src/utils/pactl.c:1890
-#: ../src/utils/pactl.c:1910 ../src/utils/pactl.c:1928
+#: ../src/utils/pactl.c:1967 ../src/utils/pactl.c:1982
+#: ../src/utils/pactl.c:2002 ../src/utils/pactl.c:2020
 msgid "Invalid mute specification"
 msgstr "?????????? ???????????? ????????? ?????"
 
-#: ../src/utils/pactl.c:1885
+#: ../src/utils/pactl.c:1977
 msgid "You have to specify a source name/index and a mute boolean"
 msgstr "??? ???? ??????? ?????/????? ??????? ? ?????? ???????? ????????? ?????"
 
-#: ../src/utils/pactl.c:1900
+#: ../src/utils/pactl.c:1992
 msgid "You have to specify a sink input index and a mute boolean"
 msgstr ""
 "??? ???? ??????? ????? ???????? ?????? ???????? ????? ? ?????? ???????? "
 "????????? ?????"
 
-#: ../src/utils/pactl.c:1905
+#: ../src/utils/pactl.c:1997
 msgid "Invalid sink input index specification"
 msgstr "?????????? ???????????? ?????? ???????? ?????? ???????? ?????"
 
-#: ../src/utils/pactl.c:1918
+#: ../src/utils/pactl.c:2010
 msgid "You have to specify a source output index and a mute boolean"
 msgstr ""
 "??? ???? ??????? ????? ??????? ??????????? ? ?????? ???????? ????????? ?????"
 
-#: ../src/utils/pactl.c:1923
+#: ../src/utils/pactl.c:2015
 msgid "Invalid source output index specification"
 msgstr "?????????? ???????????? ?????? ??????? ???????????"
 
-#: ../src/utils/pactl.c:1940
+#: ../src/utils/pactl.c:2032
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3124,15 +3234,15 @@ msgstr ""
 "??? ???? ??????? ????? ???????? ?? ?????? ????????????? ???????, "
 "????????????? ??????"
 
-#: ../src/utils/pactl.c:1952
+#: ../src/utils/pactl.c:2044
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "??? ???? ??????? ?????/????? ?????, ????? ????? ? ???? ???????????"
 
-#: ../src/utils/pactl.c:1959
+#: ../src/utils/pactl.c:2051
 msgid "Could not parse latency offset"
 msgstr "?? ??????? ???????? ???? ???? ????? ???????????"
 
-#: ../src/utils/pactl.c:1971
+#: ../src/utils/pactl.c:2063
 msgid "No valid command specified."
 msgstr "?? ??????? ????????? ???????."
 
@@ -3304,6 +3414,15 @@ msgstr "?? ??????? ??????????? ???? ????\n"
 msgid "Not yet implemented.\n"
 msgstr "?? ?? ???????????.\n"
 
+#~ msgid "PulseAudio Sound System KDE Routing Policy"
+#~ msgstr "??????? ????????????? ???????? ??????? PulseAudio ? KDE"
+
+#~ msgid "Start the PulseAudio Sound System with KDE Routing Policy"
+#~ msgstr "????????? ??????? ??????? PulseAudio ? ????????? ????????????? KDE"
+
+#~ msgid "Failed to open configuration file '%s': %s"
+#~ msgstr "?? ??????? ???????? ???? ???????????? ?%s?: %s"
+
 #~ msgid "Successfully dropped root privileges."
 #~ msgstr "???????? ??????? ????????? ???? ??????? ??????????? root."
 
diff --git a/pulseaudio.supp b/pulseaudio.supp
new file mode 100644
index 0000000..83f9ad1
--- /dev/null
+++ b/pulseaudio.supp
@@ -0,0 +1,50 @@
+# This file contains error suppression rules for Valgrind. These rules suppress
+# errors in alsa-lib that are caused by Valgrind not handling the
+# SNDRV_CTL_IOCTL_TLV_READ ioctl. More information about the Valgrind bug:
+# http://thread.gmane.org/gmane.comp.debugging.valgrind/11888
+#
+# To use this file, pass the command line option --suppressions=<filename> to
+# Valgrind.
+#
+# If you find new false positives, and want to add new suppressions, the
+# --gen-suppression=all option can be very useful. It prints automatically
+# generated suppression rules that can be copy-pasted here.
+
+{
+        alsa-lib/snd_tlv_get_dB_range
+        Memcheck:Cond
+        fun:snd_tlv_get_dB_range
+}
+
+{
+        alsa-lib/snd_tlv_convert_to_dB
+        Memcheck:Cond
+        fun:snd_tlv_convert_to_dB
+}
+
+{
+        alsa-lib/snd_tlv_convert_from_dB
+        Memcheck:Cond
+        fun:snd_tlv_convert_from_dB
+}
+
+{
+        alsa-lib/set_volume_ops
+        Memcheck:Cond
+        fun:set_volume_ops
+}
+
+{
+        alsa-lib/snd_ctl_hw_elem_write
+        Memcheck:Param
+        ioctl(generic)
+        fun:ioctl
+        fun:snd_ctl_hw_elem_write
+}
+
+{
+        alsa-lib/selem_read
+        Memcheck:Cond
+        fun:bcmp
+        fun:selem_read
+}
diff --git a/shell-completion/pulseaudio-bash-completion.sh b/shell-completion/bash/pulseaudio
similarity index 99%
rename from shell-completion/pulseaudio-bash-completion.sh
rename to shell-completion/bash/pulseaudio
index 43f4a2c..4d7e0b8 100644
--- a/shell-completion/pulseaudio-bash-completion.sh
+++ b/shell-completion/bash/pulseaudio
@@ -179,8 +179,6 @@ _pactl() {
     case $prev in
         list) COMPREPLY=($(compgen -W '${list_types[*]}' -- "$cur")) ;;
 
-        stat) COMPREPLY=($(compgen -W 'short' -- "$cur")) ;;
-
         upload-sample) _filedir ;;
 
         play-sample) ;; # TODO
@@ -492,7 +490,7 @@ _pacat () {
             ;;
     esac
 }
-complete -F _pacat pacat paplay parecord
+complete -F _pacat pacat paplay parec parecord
 
 _pulseaudio()
 {
diff --git a/shell-completion/pulseaudio-zsh-completion.zsh b/shell-completion/zsh/_pulseaudio
similarity index 60%
rename from shell-completion/pulseaudio-zsh-completion.zsh
rename to shell-completion/zsh/_pulseaudio
index abc443a..c7d68f5 100644
--- a/shell-completion/pulseaudio-zsh-completion.zsh
+++ b/shell-completion/zsh/_pulseaudio
@@ -1,13 +1,26 @@
-#compdef pulseaudio pactl pacmd pacat paplay parecord padsp pasuspender
+#compdef pulseaudio pactl pacmd pacat paplay parec parecord padsp pasuspender
+
+_set_remote() {
+    for (( i = 0; i < ${#words[@]}; i++ )) do
+        if [[ ${words[$i]} == -s || ${words[$i]} == --server ]]; then
+            remote="-s ${words[$i+1]}"
+            break;
+        elif [[ ${words[$i]} == --server=* ]]; then
+            remote=${words[$i]}
+        fi
+    done
+}
 
 _devices() {
     local -a _device_list
-    local cmd _device _device_description _remote_cmd
+    local cmd _device _device_description
 
     if [[ $service == pactl  || $service == pacmd ]]; then
         case $words[$((CURRENT - 1))] in
             set-sink-input-*) cmd=('sink-inputs');;
             set-sink-*) cmd=('sinks');;
+            set-default-sink) cmd=('sinks');;
+            set-default-source) cmd=('sources');;
             set-source-output-*) cmd=('source-outputs');;
             set-source-*) cmd=('sources');;
             suspend-sink) cmd=('sinks');;
@@ -23,14 +36,14 @@ _devices() {
             move-source-output) cmd=('sources');;
         esac
 
-    elif [[ $service == (pacat|paplay|parecord) ]]; then
+    elif [[ $service == (pacat|paplay|parec|parecord) ]]; then
         case $words[$((CURRENT))] in
             --device=*)
                 if [[ $words == *(--playback|-p)[[:space:]]* ||
                     $service == paplay ]]; then
                     cmd=('sinks')
                 elif [[ $words == *(--record|-r)[[:space:]]* ||
-                    $service == parecord ]]; then
+                    $service == (parec|parecord) ]]; then
                     cmd=('sources')
                 else
                     cmd=('sinks' 'sources')
@@ -45,7 +58,7 @@ _devices() {
                     $service == paplay ]]; then
                     cmd=('sinks')
                 elif [[ $words == *(--record|-r)[[:space:]]* ||
-                    $service == parecord ]]; then
+                    $service == (parec|parecord) ]]; then
                     cmd=('sources')
                 else
                     cmd=('sinks' 'sources')
@@ -55,15 +68,8 @@ _devices() {
 
     fi
 
-    for (( i = 0; i < ${#words[@]}; i++ )) do
-        if [[ ${words[$i]} == -s ]]; then
-            _remote_cmd="-s ${words[$i+1]}"
-            break;
-        fi
-    done
-
     for target in $cmd; do
-        for device_info in ${(ps:\n\n:)"$(_call_program device_tag "pactl $_remote_cmd list $target 2> /dev/null")"}; do
+        for device_info in ${(ps:\n\n:)"$(_call_program device_tag "pactl $remote list $target 2> /dev/null")"}; do
             for line in ${(f)device_info}; do
                 if [[ $target == (sink-inputs|source-outputs) ]]; then
                     if [[ $line == (Sink*Input|Source*Output)* ]]; then
@@ -98,18 +104,11 @@ _devices() {
 
 _profiles() {
     local -a _profile_list
-    local _current_card _raw_profiles _profile_name _profile_description _remote_cmd
+    local _current_card _raw_profiles _profile_name _profile_description
 
     _current_card=$words[$((CURRENT - 1))]
 
-    for (( i = 0; i < ${#words[@]}; i++ )) do
-        if [[ ${words[$i]} == -s ]]; then
-            _remote_cmd="-s ${words[$i+1]}"
-            break;
-        fi
-    done
-
-    for card in ${(ps:\n\n:)"$(_call_program profiles_tag "pactl $_remote_cmd list cards 2> /dev/null")"}; do
+    for card in ${(ps:\n\n:)"$(_call_program profiles_tag "pactl $remote list cards 2> /dev/null")"}; do
         if [[ $card == *$_current_card* ]]; then
             _raw_profiles=${card##*Profiles:}
             _raw_profiles=${_raw_profiles%%Active Profile:*}
@@ -130,7 +129,7 @@ _profiles() {
 
 _ports() {
     local -a _port_list
-    local _raw_ports _port_name _port_description _current_device _remote_cmd
+    local _raw_ports _port_name _port_description _current_device
 
     case $words[$((CURRENT - 2))] in
         set-sink-port) cmd="sinks";;
@@ -140,14 +139,7 @@ _ports() {
 
     _current_device=$words[$((CURRENT - 1))]
 
-    for (( i = 0; i < ${#words[@]}; i++ )) do
-        if [[ ${words[$i]} == -s ]]; then
-            _remote_cmd="-s ${words[$i+1]}"
-            break;
-        fi
-    done
-
-    for device in ${(ps:\n\n:)"$(_call_program port_tag "pactl $_remote_cmd list $cmd 2> /dev/null")"}; do
+    for device in ${(ps:\n\n:)"$(_call_program port_tag "pactl $remote list $cmd 2> /dev/null")"}; do
         if [[ $device == *Ports:* && $device == *$_current_device* ]]; then
             _raw_ports=${device##*Ports:}
             _raw_ports=${_raw_ports%%Active Port:*}
@@ -168,16 +160,9 @@ _ports() {
 
 _cards(){
     local -a _card_list
-    local _card _cad_name _remote_cmd
+    local _card _cad_name
 
-    for (( i = 0; i < ${#words[@]}; i++ )) do
-        if [[ ${words[$i]} == -s ]]; then
-            _remote_cmd="-s ${words[$i+1]}"
-            break;
-        fi
-    done
-
-    for card_info in ${(ps:\n\n:)"$(_call_program card_tag "pactl $_remote_cmd list cards 2> /dev/null")"}; do
+    for card_info in ${(ps:\n\n:)"$(_call_program card_tag "pactl $remote list cards 2> /dev/null")"}; do
         for line in ${(f)card_info}; do
             if [[ $line == *Name:* ]]; then
                 _card=${line#*: }
@@ -201,16 +186,9 @@ _all_modules(){
 }
 
 _loaded_modules(){
-    local -a _loaded_modules_list _remote_cmd
+    local -a _loaded_modules_list
 
-    for (( i = 0; i < ${#words[@]}; i++ )) do
-        if [[ ${words[$i]} == -s ]]; then
-            _remote_cmd="-s ${words[$i+1]}"
-            break;
-        fi
-    done
-
-    for module in ${(f)"$(_call_program modules_tag "pactl $_remote_cmd list modules short 2> /dev/null")"}; do
+    for module in ${(f)"$(_call_program modules_tag "pactl $remote list modules short 2> /dev/null")"}; do
         _loaded_modules_list+=(${${(ps:\t:)module}[1]}:${${(ps:\t:)module}[2]})
     done
     _describe 'module list' _loaded_modules_list
@@ -226,16 +204,9 @@ _resample_methods() {
 
 _clients() {
     local -a _client_list
-    local _client _client_description _remote_cmd
-
-    for (( i = 0; i < ${#words[@]}; i++ )) do
-        if [[ ${words[$i]} == -s ]]; then
-            _remote_cmd="-s ${words[$i+1]}"
-            break;
-        fi
-    done
+    local _client _client_description
 
-    for client_info in ${(ps:\n\n:)"$(_call_program clients_tag "pactl $_remote_cmd list clients 2> /dev/null")"}; do
+    for client_info in ${(ps:\n\n:)"$(_call_program clients_tag "pactl $remote list clients 2> /dev/null")"}; do
         for line in ${(f)client_info}; do
             if [[ $line == Client[[:space:]]#* ]]; then
                 _client=${line#*\#}
@@ -257,7 +228,11 @@ _pacat_file_formats() {
 }
 
 _pactl_completion() {
+    _set_remote
+
     _pactl_command(){
+        local -a _pactl_commands
+
         _pactl_commands=(
             'help: show help and exit'
             'stat: dump statistics about the PulseAudio daemon'
@@ -273,9 +248,9 @@ _pactl_completion() {
             'move-source-output: move a recording stream to a source'
             'suspend-sink: suspend or resume a sink'
             'suspend-source: suspend or resume a source'
-            'set-card-profile: set a card profile:cards:_cards'
-            'set-sink-default: set the default sink'
-            'set-source-default: set the default source'
+            'set-card-profile: set a card profile'
+            'set-default-sink: set the default sink'
+            'set-default-source: set the default source'
             'set-sink-port: set the sink port of a sink'
             'set-source-port: set the source port of a source'
             'set-port-latency-offset: set a latency offset on a port'
@@ -290,55 +265,243 @@ _pactl_completion() {
             'set-sink-formats: set supported formats of a sink'
             'subscribe: subscribe to events'
         )
+
         _describe 'pactl commands' _pactl_commands
     }
 
-    _pactl_list_commands=(
-        'modules: list loaded modules'
-        'sinks: list available sinks'
-        'sources: list available sources'
-        'sink-inputs: list connected sink inputs'
-        'source-outputs: list connected source outputs'
-        'clients: list connected clients'
-        'samples: list samples'
-        'cards: list available cards'
-    )
+    _pactl_command_parameter() {
+        local _command
+
+        _list_parameter() {
+            local -a _objects;
+
+            _objects=(
+                'modules: list loaded modules'
+                'sinks: list available sinks'
+                'sources: list available sources'
+                'sink-inputs: list connected sink inputs'
+                'source-outputs: list connected source outputs'
+                'clients: list connected clients'
+                'samples: list samples'
+                'cards: list available cards'
+            )
+
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "list".
+                # "pactl list cards short" and "pactl list short cards" are
+                # treated as equivalent by pactl, but here we only support the
+                # first form, so "short" isn't a valid completion.
+                _describe 'objects' _objects
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after "list". As
+                # explained in the previous comment, we only support the
+                # "pactl list cards short" form, so "short" is the only valid
+                # completion here.
+                compadd short
+            fi
+        }
+
+        _play_sample_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "play-sample".
+                # TODO: Implement sample name completion.
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after "play-sample".
+                # TODO: Implement sink name completion.
+            fi
+        }
+
+        _load_module_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "load-module".
+                _all_modules
+            else
+                # We're completing the second or later parameter after
+                # "load-module", i.e. the module arguments.
+                # TODO: Implement module argument completion.
+            fi
+        }
+
+        _move_sink_input_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "move-sink-input".
+                # Even though the function name is "_devices", it actually
+                # completes the sink input index. _devices is magical like
+                # that.
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after
+                # "move-sink-input".
+                _devices
+            fi
+        }
+
+        _move_source_output_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after
+                # "move-source-output". Even though the function name is
+                # "_devices", it actually completes the source output index.
+                # _devices is magical like that.
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after
+                # "move-source-output".
+                _devices
+            fi
+        }
+
+        _suspend_sink_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "suspend-sink".
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after "suspend-sink".
+                compadd true false
+            fi
+        }
+
+        _suspend_source_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "suspend-source".
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after "suspend-source".
+                compadd true false
+            fi
+        }
+
+        _set_card_profile_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after
+                # "set-card-profile".
+                _cards
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after
+                # "set-card-profile".
+                _profiles
+            fi
+        }
+
+        _set_sink_port_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "set-sink-port".
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after "set-sink-port".
+                _ports
+            fi
+        }
+
+        _set_source_port_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "set-source-port".
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after
+                # "set-source-port".
+                _ports
+            fi
+        }
+
+        _set_sink_mute_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "set-sink-mute".
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after "set-sink-mute".
+                compadd true false toggle
+            fi
+        }
+
+        _set_source_mute_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after "set-source-mute".
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after
+                # "set-source-mute".
+                compadd true false toggle
+            fi
+        }
+
+        _set_sink_input_mute_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after
+                # "set-sink-input-mute". Even though the function name is
+                # "_devices", it actually completes the sink input index.
+                # _devices is magical like that.
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after
+                # "set-sink-input-mute".
+                compadd true false toggle
+            fi
+        }
+
+        _set_source_output_mute_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after
+                # "set-source-output-mute". Even though the function name is
+                # "_devices", it actually completes the source output index.
+                # _devices is magical like that.
+                _devices
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after
+                # "set-source-output-mute".
+                compadd true false toggle
+            fi
+        }
+
+        _set_port_latency_offset_parameter() {
+            if ((CURRENT == 2)); then
+                # We're completing the first parameter after
+                # "set-port-latency-offset".
+                _cards
+            elif ((CURRENT == 3)); then
+                # We're completing the second parameter after
+                # "set-port-latency-offset".
+                _ports
+            fi
+        }
+
+        _command=$words[1]
+
+        case $_command in
+            list)                                  _list_parameter;;
+            upload-sample)                         if ((CURRENT == 2)); then _files; fi;;
+            play-sample)                           _play_sample_parameter;;
+            remove-sample)                         ;; # TODO: Implement sample name completion.
+            load-module)                           _load_module_parameter;;
+            unload-module)                         if ((CURRENT == 2)); then _loaded_modules; fi;;
+            move-sink-input)                       _move_sink_input_parameter;;
+            move-source-output)                    _move_source_output_parameter;;
+            suspend-sink)                          _suspend_sink_parameter;;
+            suspend-source)                        _suspend_source_parameter;;
+            set-card-profile)                      _set_card_profile_parameter;;
+            set-default-sink)                      if ((CURRENT == 2)); then _devices; fi;;
+            set-default-source)                    if ((CURRENT == 2)); then _devices; fi;;
+            set-sink-port)                         _set_sink_port_parameter;;
+            set-source-port)                       _set_source_port_parameter;;
+            set-sink-volume)                       if ((CURRENT == 2)); then _devices; fi;;
+            set-source-volume)                     if ((CURRENT == 2)); then _devices; fi;;
+            set-sink-input-volume)                 if ((CURRENT == 2)); then _devices; fi;;
+            set-source-output-volume)              if ((CURRENT == 2)); then _devices; fi;;
+            set-sink-mute)                         _set_sink_mute_parameter;;
+            set-source-mute)                       _set_source_mute_parameter;;
+            set-sink-input-mute)                   _set_sink_input_mute_parameter;;
+            set-source-output-mute)                _set_source_output_mute_parameter;;
+            set-sink-formats)                      if ((CURRENT == 2)); then _devices; fi;;
+            set-port-latency-offset)               _set_port_latency_offset_parameter;;
+        esac
+    }
 
-    _arguments -C \
-        - '(help)' \
-            {-h,--help}'[display this help and exit]' \
+    _arguments -C -S -A '-*' \
+        {-h,--help}'[display help and exit]' \
         '--version[show version and exit]' \
-        - '(server)' \
-            {-s,--server}'[name of server to connect to]:host:_hosts' \
-        - '(name)' \
-            {-n,--client-name}'[client name to use]:name' \
-        '::pactl commands:_pactl_command' \
-
-    case $words[$((CURRENT - 1))] in
-        list) _describe 'pactl list commands' _pactl_list_commands;;
-        stat) compadd short;;
-        set-card-profile) _cards;;
-        set-sink-*) _devices;;
-        set-source-*) _devices;;
-        upload-sample) _files;;
-        load-module) _all_modules;;
-        unload-module) _loaded_modules;;
-        suspend-*) _devices;;
-        move-*) _devices;;
-        set-port-latency-offset) _cards;;
-    esac
-
-    case $words[$((CURRENT - 2))] in
-        set-card-profile) _profiles;;
-        set-(sink|source)-port) _ports;;
-        set-port-latency-offset) _ports;;
-        set-*-mute) compadd true false toggle;;
-        suspend-*) compadd true false;;
-        list) compadd short;;
-        move-*) _devices;;
-        '-s' | '-n') _pactl_command;;
-        --server | --client-*) _pactl_command;;
-    esac
+        {-s,--server=}'[name of server to connect to]:host:_hosts' \
+        {-n,--client-name=}'[client name to use]:name' \
+        '::pactl command:_pactl_command' \
+        '*::pactl command parameter:_pactl_command_parameter'
 }
 
 _pacmd_completion() {
@@ -403,9 +566,8 @@ _pacmd_completion() {
         _describe 'pacmd commands' _pacmd_commands
     }
 
-    _arguments -C \
-        - '(help)' \
-            {-h,--help}'[display this help and exit]' \
+    _arguments -C -S -A "-*" \
+        {-h,--help}'[display help and exit]' \
         '--version[show version and exit]' \
         '::pacmd commands:_pacmd_command' \
 
@@ -438,15 +600,15 @@ _pacmd_completion() {
 }
 
 _pasuspender_completion() {
-    _arguments -C \
-        {-h,--help}'[display this help and exit]' \
+    _arguments -S -A "-*" -C \
+        {-h,--help}'[display help and exit]' \
         '--version[show version and exit]' \
-        {-s,--server}'[name of server to connect to]:host:_hosts' \
+        {-s,--server=}'[name of server to connect to]:host:_hosts' \
 }
 
 _padsp_completion() {
-    _arguments -C \
-        '-h[display this help and exit]' \
+    _arguments -C -S -A "-*" \
+        '-h[display help and exit]' \
         '-s[name of server to connect to]:host:_hosts' \
         '-n[client name to use]:name:' \
         '-m[stream name to use]:name:' \
@@ -459,10 +621,12 @@ _padsp_completion() {
 
 # TODO channel map completion
 _pacat_completion() {
+    _set_remote
+
     _pacat_sample_formats=('s16le' 's16be' 'u8' 'float32le' 'float32be'
         'ulaw' 'alaw' 's32le' 's32be' 's24le' 's24-32le' 's24-32be')
 
-    _arguments -C \
+    _arguments -C -S -A "-*" \
         {-h,--help}'[display this help and exit]' \
         '--version[show version and exit]' \
         {-r,--record}'[create a connection for recording]' \
@@ -535,12 +699,22 @@ _pulseaudio_completion() {
 _pulseaudio() {
     local state line curcontext="$curcontext"
 
+    # Some commands, like pactl and pacat, have an option for specifying the
+    # server address, like "--server=somehost". If that option is set, then the
+    # helper commands that are run as part of the autocompletion need to use
+    # that same option. The option is saved in this variable in _set_remote(),
+    # which is called in the beginning of _pactl_completion() and others. The
+    # autocompletion commands can then find the option in that variable if the
+    # option is set.
+    local remote
+
     case $service in
         pulseaudio) _pulseaudio_completion;;
         pactl) _pactl_completion;;
         pacmd) _pacmd_completion;;
         pacat) _pacat_completion;;
         paplay)_pacat_completion;;
+        parec) _pacat_completion;;
         parecord)_pacat_completion;;
         padsp) _padsp_completion;;
         pasuspender) _pasuspender_completion;;
diff --git a/src/.gitignore b/src/.gitignore
index 80f6f2c..11689a5 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -3,6 +3,8 @@ TAGS
 *.o
 *.la
 *.gcno
+*.trs
+*.log
 .deps
 .libs
 /Makefile
@@ -21,8 +23,8 @@ paplay
 pasuspender
 pax11publish
 pulseaudio
+pulseaudio.service
 start-pulseaudio-x11
-start-pulseaudio-kde
 *-symdef.h
 *-orc-gen.[ch]
 # tests
@@ -35,7 +37,10 @@ close-test
 connect-stress
 cpulimit-test
 cpulimit-test2
-cpu-test
+cpu-sconv-test
+cpu-remap-test
+cpu-mix-test
+cpu-volume-test
 extended-test
 flist-test
 format-test
@@ -51,7 +56,6 @@ mainloop-test-glib
 mcalign-test
 memblockq-test
 memblock-test
-mix-special-test
 mix-test
 once-test
 pacat-simple
@@ -65,6 +69,7 @@ rtstutter
 sig2str-test
 sigbus-test
 smoother-test
+srbchannel-test
 stripnul
 strlist-test
 sync-playback
diff --git a/src/Makefile.am b/src/Makefile.am
index 857fda3..4e60a98 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,11 +46,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/modules \
 	-I$(top_builddir)/src/modules \
 	-DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
-	-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
-AM_CFLAGS = \
-	$(PTHREAD_CFLAGS) \
+	-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" \
 	-DPA_SRCDIR=\"$(abs_srcdir)\" \
 	-DPA_BUILDDIR=\"$(abs_builddir)\"
+AM_CFLAGS = \
+	$(PTHREAD_CFLAGS)
 AM_CXXFLAGS = $(AM_CFLAGS)
 SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO
 
@@ -95,12 +95,12 @@ EXTRA_DIST = \
 		depmod.py \
 		daemon/esdcompat.in \
 		daemon/start-pulseaudio-x11.in \
-		daemon/start-pulseaudio-kde.in \
+		daemon/systemd/user/pulseaudio.service.in \
+		daemon/systemd/user/pulseaudio.socket \
 		utils/padsp.in \
 		utils/qpaeq \
 		modules/module-defs.h.m4 \
 		daemon/pulseaudio.desktop.in \
-		daemon/pulseaudio-kde.desktop.in \
 		map-file \
 		daemon/pulseaudio-system.conf \
 		modules/echo-cancel/adrian-license.txt
@@ -118,8 +118,7 @@ endif
 
 if HAVE_X11
 xdgautostart_in_files = \
-		daemon/pulseaudio.desktop.in \
-		daemon/pulseaudio-kde.desktop.in
+		daemon/pulseaudio.desktop.in
 xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 endif
@@ -172,6 +171,11 @@ else
 pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(IMMEDIATE_LDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
 endif
 
+if HAVE_SYSTEMD_DAEMON
+pulseaudio_CFLAGS += $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS)
+pulseaudio_LDFLAGS += $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS)
+endif
+
 ###################################
 #       Utility programs          #
 ###################################
@@ -192,7 +196,7 @@ endif
 
 if HAVE_X11
 bin_PROGRAMS += pax11publish
-bin_SCRIPTS += start-pulseaudio-x11 start-pulseaudio-kde
+bin_SCRIPTS += start-pulseaudio-x11
 endif
 
 pacat_SOURCES = utils/pacat.c
@@ -220,6 +224,14 @@ pax11publish_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
 pax11publish_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la $(X11_LIBS)
 pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
+if HAVE_SYSTEMD_DAEMON
+
+systemduserunit_DATA = \
+    pulseaudio.service \
+    daemon/systemd/user/pulseaudio.socket
+
+endif
+
 ###################################
 #         Test programs           #
 ###################################
@@ -247,10 +259,12 @@ TESTS_default = \
 		volume-test \
 		mix-test \
 		proplist-test \
-		cpu-test \
+		cpu-mix-test \
+		cpu-remap-test \
+		cpu-sconv-test \
+		cpu-volume-test \
 		lock-autospawn-test \
-		mult-s16-test \
-		mix-special-test
+		mult-s16-test
 
 TESTS_norun = \
 		ipacl-test \
@@ -274,6 +288,7 @@ TESTS_daemon = \
 
 if !OS_IS_WIN32
 TESTS_default += \
+		srbchannel-test \
 		sigbus-test \
 		usergroup-test
 endif
@@ -352,6 +367,11 @@ format_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 format_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
 format_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 
+srbchannel_test_SOURCES = tests/srbchannel-test.c
+srbchannel_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+srbchannel_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+srbchannel_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+
 get_binary_name_test_SOURCES = tests/get-binary-name-test.c
 get_binary_name_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 get_binary_name_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
@@ -507,21 +527,31 @@ proplist_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la li
 proplist_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 proplist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 
-cpu_test_SOURCES = tests/cpu-test.c tests/runtime-test-util.h
-cpu_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
-cpu_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
-cpu_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+cpu_mix_test_SOURCES = tests/cpu-mix-test.c tests/runtime-test-util.h
+cpu_mix_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+cpu_mix_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+cpu_mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+
+cpu_remap_test_SOURCES = tests/cpu-remap-test.c tests/runtime-test-util.h
+cpu_remap_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+cpu_remap_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+cpu_remap_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+
+cpu_sconv_test_SOURCES = tests/cpu-sconv-test.c tests/runtime-test-util.h
+cpu_sconv_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+cpu_sconv_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+cpu_sconv_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+
+cpu_volume_test_SOURCES = tests/cpu-volume-test.c tests/runtime-test-util.h
+cpu_volume_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+cpu_volume_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+cpu_volume_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 
 mult_s16_test_SOURCES = tests/mult-s16-test.c tests/runtime-test-util.h
 mult_s16_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
 mult_s16_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 mult_s16_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 
-mix_special_test_SOURCES = tests/mix-special-test.c tests/runtime-test-util.h
-mix_special_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
-mix_special_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
-mix_special_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
-
 rtstutter_SOURCES = tests/rtstutter.c
 rtstutter_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
 rtstutter_CFLAGS = $(AM_CFLAGS)
@@ -621,6 +651,7 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
 		pulsecore/creds.h \
 		pulsecore/dynarray.c pulsecore/dynarray.h \
 		pulsecore/endianmacros.h \
+		pulsecore/fdsem.c pulsecore/fdsem.h \
 		pulsecore/flist.c pulsecore/flist.h \
 		pulsecore/g711.c pulsecore/g711.h \
 		pulsecore/hashmap.c pulsecore/hashmap.h \
@@ -654,6 +685,7 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
 		pulsecore/queue.c pulsecore/queue.h \
 		pulsecore/random.c pulsecore/random.h \
 		pulsecore/refcnt.h \
+		pulsecore/srbchannel.c pulsecore/srbchannel.h \
 		pulsecore/sample-util.c pulsecore/sample-util.h \
 		pulsecore/shm.c pulsecore/shm.h \
 		pulsecore/bitset.c pulsecore/bitset.h \
@@ -689,9 +721,13 @@ libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS += $(X11_CFLAGS)
 libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS += $(X11_LIBS)
 endif
 
+if HAVE_SYSTEMD_DAEMON
+libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS += $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS)
+libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS += $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS)
+endif
 if HAVE_SYSTEMD_JOURNAL
-libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS += $(JOURNAL_FLAGS)
-libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS += $(JOURNAL_LIBS)
+libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS += $(SYSTEMD_FLAGS) $(SYSTEMDJOURNAL_FLAGS)
+libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS += $(SYSTEMD_LIBS) $(SYSTEMDJOURNAL_LIBS)
 endif
 
 # proplist-util.h uses these header files, but not the library itself!
@@ -749,6 +785,7 @@ pulseinclude_HEADERS = \
 		pulse/channelmap.h \
 		pulse/context.h \
 		pulse/def.h \
+		pulse/direction.h \
 		pulse/error.h \
 		pulse/ext-device-manager.h \
 		pulse/ext-device-restore.h \
@@ -794,6 +831,7 @@ libpulse_la_SOURCES = \
 		pulse/channelmap.c pulse/channelmap.h \
 		pulse/context.c pulse/context.h \
 		pulse/def.h \
+		pulse/direction.c pulse/direction.h \
 		pulse/error.c pulse/error.h \
 		pulse/ext-device-manager.c pulse/ext-device-manager.h \
 		pulse/ext-device-restore.c pulse/ext-device-restore.h \
@@ -881,7 +919,6 @@ libpulsecore_ at PA_MAJORMINOR@_la_SOURCES = \
 		pulsecore/core-scache.c pulsecore/core-scache.h \
 		pulsecore/core-subscribe.c pulsecore/core-subscribe.h \
 		pulsecore/core.c pulsecore/core.h \
-		pulsecore/fdsem.c pulsecore/fdsem.h \
 		pulsecore/hook-list.c pulsecore/hook-list.h \
 		pulsecore/ltdl-helper.c pulsecore/ltdl-helper.h \
 		pulsecore/modargs.c pulsecore/modargs.h \
@@ -895,10 +932,12 @@ libpulsecore_ at PA_MAJORMINOR@_la_SOURCES = \
 		pulsecore/remap.c pulsecore/remap.h \
 		pulsecore/remap_mmx.c pulsecore/remap_sse.c \
 		pulsecore/resampler.c pulsecore/resampler.h \
+		pulsecore/resampler/ffmpeg.c pulsecore/resampler/peaks.c \
+		pulsecore/resampler/trivial.c \
 		pulsecore/rtpoll.c pulsecore/rtpoll.h \
 		pulsecore/stream-util.c pulsecore/stream-util.h \
 		pulsecore/mix.c pulsecore/mix.h \
-		pulsecore/cpu.h \
+		pulsecore/cpu.c pulsecore/cpu.h \
 		pulsecore/cpu-arm.c pulsecore/cpu-arm.h \
 		pulsecore/cpu-x86.c pulsecore/cpu-x86.h \
 		pulsecore/cpu-orc.c pulsecore/cpu-orc.h \
@@ -919,17 +958,19 @@ libpulsecore_ at PA_MAJORMINOR@_la_SOURCES = \
 		pulsecore/thread-mq.c pulsecore/thread-mq.h \
 		pulsecore/database.h
 
-libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS)
+libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS)
 libpulsecore_ at PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
-libpulsecore_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon- at PA_MAJORMINOR@.la libpulse.la libpulsecore-foreign.la
+libpulsecore_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon- at PA_MAJORMINOR@.la libpulse.la libpulsecore-foreign.la
 
 if HAVE_NEON
-noinst_LTLIBRARIES += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la
+noinst_LTLIBRARIES += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la
 libpulsecore_sconv_neon_la_SOURCES = pulsecore/sconv_neon.c
 libpulsecore_sconv_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
 libpulsecore_mix_neon_la_SOURCES = pulsecore/mix_neon.c
 libpulsecore_mix_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
-libpulsecore_ at PA_MAJORMINOR@_la_LIBADD += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la
+libpulsecore_remap_neon_la_SOURCES = pulsecore/remap_neon.c
+libpulsecore_remap_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
+libpulsecore_ at PA_MAJORMINOR@_la_LIBADD += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la
 endif
 
 ORC_SOURCE += pulsecore/svolume
@@ -970,6 +1011,18 @@ if HAVE_SIMPLEDB
 libpulsecore_ at PA_MAJORMINOR@_la_SOURCES += pulsecore/database-simple.c
 endif
 
+if HAVE_SPEEX
+libpulsecore_ at PA_MAJORMINOR@_la_SOURCES += pulsecore/resampler/speex.c
+libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS += $(LIBSPEEX_CFLAGS)
+libpulsecore_ at PA_MAJORMINOR@_la_LIBADD += $(LIBSPEEX_LIBS)
+endif
+
+if HAVE_LIBSAMPLERATE
+libpulsecore_ at PA_MAJORMINOR@_la_SOURCES += pulsecore/resampler/libsamplerate.c
+libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS += $(LIBSAMPLERATE_CFLAGS)
+libpulsecore_ at PA_MAJORMINOR@_la_LIBADD += $(LIBSAMPLERATE_LIBS)
+endif
+
 # We split the foreign code off to not be annoyed by warnings we don't care about
 noinst_LTLIBRARIES += libpulsecore-foreign.la
 
@@ -1197,7 +1250,6 @@ modlibexec_LTLIBRARIES += \
 
 dist_alsaprofilesets_DATA = \
 		modules/alsa/mixer/profile-sets/default.conf \
-		modules/alsa/mixer/profile-sets/extra-hdmi.conf \
 		modules/alsa/mixer/profile-sets/force-speaker.conf \
 		modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf \
 		modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
@@ -1237,7 +1289,6 @@ dist_alsapaths_DATA = \
 		modules/alsa/mixer/paths/analog-output-speaker.conf \
 		modules/alsa/mixer/paths/analog-output-speaker-always.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-lineout.conf \
@@ -1246,7 +1297,11 @@ dist_alsapaths_DATA = \
 		modules/alsa/mixer/paths/hdmi-output-0.conf \
 		modules/alsa/mixer/paths/hdmi-output-1.conf \
 		modules/alsa/mixer/paths/hdmi-output-2.conf \
-		modules/alsa/mixer/paths/hdmi-output-3.conf
+		modules/alsa/mixer/paths/hdmi-output-3.conf \
+		modules/alsa/mixer/paths/hdmi-output-4.conf \
+		modules/alsa/mixer/paths/hdmi-output-5.conf \
+		modules/alsa/mixer/paths/hdmi-output-6.conf \
+		modules/alsa/mixer/paths/hdmi-output-7.conf
 
 endif
 
@@ -1317,7 +1372,7 @@ modlibexec_LTLIBRARIES += \
 		module-udev-detect.la
 endif
 
-if HAVE_SYSTEMD
+if HAVE_SYSTEMD_LOGIN
 modlibexec_LTLIBRARIES += \
 		module-systemd-login.la
 endif
@@ -1348,6 +1403,9 @@ modlibexec_LTLIBRARIES += \
 		module-bluez5-device.la
 endif
 
+# RAOP depends on RTP, and we don't support RTP on Windows, see comment at
+# librtp.la above.
+if !OS_IS_WIN32
 if HAVE_OPENSSL
 modlibexec_LTLIBRARIES += \
 		libraop.la \
@@ -1357,6 +1415,7 @@ modlibexec_LTLIBRARIES += \
 		module-raop-discover.la
 endif
 endif
+endif
 
 if HAVE_DBUS
 if HAVE_FFTW
@@ -2021,8 +2080,8 @@ module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
 module_systemd_login_la_SOURCES = modules/module-systemd-login.c
 module_systemd_login_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_systemd_login_la_LIBADD = $(MODULE_LIBADD) $(SYSTEMD_LIBS)
-module_systemd_login_la_CFLAGS = $(AM_CFLAGS) $(SYSTEMD_CFLAGS)
+module_systemd_login_la_LIBADD = $(MODULE_LIBADD) $(SYSTEMD_LIBS) $(SYSTEMDLOGIN_LIBS)
+module_systemd_login_la_CFLAGS = $(AM_CFLAGS) $(SYSTEMD_CFLAGS) $(SYSTEMDLOGIN_CFLAGS)
 
 # GConf support
 module_gconf_la_SOURCES = modules/gconf/module-gconf.c
@@ -2071,6 +2130,15 @@ libbluez5_util_la_SOURCES = \
 		modules/bluetooth/bluez5-util.c \
 		modules/bluetooth/bluez5-util.h \
 		modules/bluetooth/a2dp-codecs.h
+if HAVE_BLUEZ_5_OFONO_HEADSET
+libbluez5_util_la_SOURCES += \
+		modules/bluetooth/backend-ofono.c
+endif
+if HAVE_BLUEZ_5_NATIVE_HEADSET
+libbluez5_util_la_SOURCES += \
+		modules/bluetooth/backend-native.c
+endif
+
 libbluez5_util_la_LDFLAGS = -avoid-version
 libbluez5_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
 libbluez5_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
@@ -2106,8 +2174,8 @@ module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 #        Some minor stuff         #
 ###################################
 
-CLEANFILES += daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
-DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde
+CLEANFILES += daemon/pulseaudio.desktop
+DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service
 
 if OS_IS_WIN32
 SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp
diff --git a/src/Makefile.in b/src/Makefile.in
index 146f296..82cd592 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -136,11 +136,11 @@ host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/orc.mak $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/src/daemon/esdcompat.in \
 	$(top_srcdir)/src/daemon/start-pulseaudio-x11.in \
-	$(top_srcdir)/src/daemon/start-pulseaudio-kde.in \
 	$(top_srcdir)/src/pulse/client.conf.in \
 	$(top_srcdir)/src/daemon/daemon.conf.in \
 	$(top_srcdir)/src/daemon/default.pa.in \
 	$(top_srcdir)/src/daemon/system.pa.in \
+	$(top_srcdir)/src/daemon/systemd/user/pulseaudio.service.in \
 	$(top_srcdir)/build-aux/depcomp \
 	$(am__dist_alsapaths_DATA_DIST) \
 	$(am__dist_alsaprofilesets_DATA_DIST) \
@@ -154,31 +154,34 @@ bin_PROGRAMS = pulseaudio$(EXEEXT) pacat$(EXEEXT) pactl$(EXEEXT) \
 @HAVE_DBUS_TRUE at am__append_8 = $(DBUS_CFLAGS)
 @HAVE_DBUS_TRUE at am__append_9 = daemon/server-lookup.c daemon/server-lookup.h
 @HAVE_DBUS_TRUE at am__append_10 = $(DBUS_LIBS)
- at OS_IS_WIN32_FALSE@am__append_11 = pasuspender
- at HAVE_AF_UNIX_TRUE@am__append_12 = pacmd
- at HAVE_X11_TRUE@am__append_13 = pax11publish
- at HAVE_X11_TRUE@am__append_14 = start-pulseaudio-x11 start-pulseaudio-kde
- at OS_IS_WIN32_FALSE@am__append_15 = \
+ at HAVE_SYSTEMD_DAEMON_TRUE@am__append_11 = $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS)
+ at HAVE_SYSTEMD_DAEMON_TRUE@am__append_12 = $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS)
+ at OS_IS_WIN32_FALSE@am__append_13 = pasuspender
+ at HAVE_AF_UNIX_TRUE@am__append_14 = pacmd
+ at HAVE_X11_TRUE@am__append_15 = pax11publish
+ at HAVE_X11_TRUE@am__append_16 = start-pulseaudio-x11
+ at OS_IS_WIN32_FALSE@am__append_17 = \
+ at OS_IS_WIN32_FALSE@		srbchannel-test \
 @OS_IS_WIN32_FALSE@		sigbus-test \
 @OS_IS_WIN32_FALSE@		usergroup-test
 
- at OS_IS_DARWIN_FALSE@am__append_16 = \
+ at OS_IS_DARWIN_FALSE@am__append_18 = \
 @OS_IS_DARWIN_FALSE@		once-test
 
- at HAVE_SIGXCPU_TRUE@am__append_17 = \
+ at HAVE_SIGXCPU_TRUE@am__append_19 = \
 @HAVE_SIGXCPU_TRUE@		cpulimit-test \
 @HAVE_SIGXCPU_TRUE@		cpulimit-test2
 
- at HAVE_GLIB20_TRUE@am__append_18 = \
+ at HAVE_GLIB20_TRUE@am__append_20 = \
 @HAVE_GLIB20_TRUE@		mainloop-test-glib
 
- at HAVE_GTK30_TRUE@am__append_19 = \
+ at HAVE_GTK30_TRUE@am__append_21 = \
 @HAVE_GTK30_TRUE@		gtk-test
 
- at HAVE_ALSA_TRUE@am__append_20 = \
+ at HAVE_ALSA_TRUE@am__append_22 = \
 @HAVE_ALSA_TRUE@		alsa-time-test
 
- at HAVE_ALSA_TRUE@am__append_21 = \
+ at HAVE_ALSA_TRUE@am__append_23 = \
 @HAVE_ALSA_TRUE@		alsa-mixer-path-test
 
 @HAVE_TESTS_TRUE at TESTS = $(am__EXEEXT_8)
@@ -189,250 +192,267 @@ bin_PROGRAMS = pulseaudio$(EXEEXT) pacat$(EXEEXT) pactl$(EXEEXT) \
 @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE at check_PROGRAMS =  \
 @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@	$(am__EXEEXT_8) \
 @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@	$(am__EXEEXT_12)
- at OS_IS_WIN32_TRUE@am__append_22 = pulsecore/poll-win32.c pulsecore/poll.h
- at OS_IS_WIN32_FALSE@am__append_23 = pulsecore/poll-posix.c pulsecore/poll.h
- at HAVE_X11_TRUE@am__append_24 = \
+ at OS_IS_WIN32_TRUE@am__append_24 = pulsecore/poll-win32.c pulsecore/poll.h
+ at OS_IS_WIN32_FALSE@am__append_25 = pulsecore/poll-posix.c pulsecore/poll.h
+ at HAVE_X11_TRUE@am__append_26 = \
 @HAVE_X11_TRUE@		pulse/client-conf-x11.c pulse/client-conf-x11.h \
 @HAVE_X11_TRUE@		pulsecore/x11prop.c pulsecore/x11prop.h
 
- at HAVE_X11_TRUE@am__append_25 = $(X11_CFLAGS)
- at HAVE_X11_TRUE@am__append_26 = $(X11_LIBS)
- at HAVE_SYSTEMD_JOURNAL_TRUE@am__append_27 = $(JOURNAL_FLAGS)
- at HAVE_SYSTEMD_JOURNAL_TRUE@am__append_28 = $(JOURNAL_LIBS)
- at OS_IS_WIN32_TRUE@am__append_29 = \
+ at HAVE_X11_TRUE@am__append_27 = $(X11_CFLAGS)
+ at HAVE_X11_TRUE@am__append_28 = $(X11_LIBS)
+ at HAVE_SYSTEMD_DAEMON_TRUE@am__append_29 = $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS)
+ at HAVE_SYSTEMD_DAEMON_TRUE@am__append_30 = $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS)
+ at HAVE_SYSTEMD_JOURNAL_TRUE@am__append_31 = $(SYSTEMD_FLAGS) $(SYSTEMDJOURNAL_FLAGS)
+ at HAVE_SYSTEMD_JOURNAL_TRUE@am__append_32 = $(SYSTEMD_LIBS) $(SYSTEMDJOURNAL_LIBS)
+ at OS_IS_WIN32_TRUE@am__append_33 = \
 @OS_IS_WIN32_TRUE@		pulsecore/mutex-win32.c pulsecore/mutex.h \
 @OS_IS_WIN32_TRUE@		pulsecore/thread-win32.c pulsecore/thread.h \
 @OS_IS_WIN32_TRUE@		pulsecore/semaphore-win32.c pulsecore/semaphore.h
 
- at OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE at am__append_30 = \
+ at OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE at am__append_34 = \
 @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/mutex-posix.c pulsecore/mutex.h \
 @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/thread-posix.c pulsecore/thread.h \
 @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@		pulsecore/semaphore-osx.c pulsecore/semaphore.h
 
- at OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE at am__append_31 = "-I/Developer/Headers/FlatCarbon/"
+ at OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE at am__append_35 = "-I/Developer/Headers/FlatCarbon/"
 #libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS += "-framework CoreServices"
- at OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE at am__append_32 = \
+ at OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE at am__append_36 = \
 @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/mutex-posix.c pulsecore/mutex.h \
 @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/thread-posix.c pulsecore/thread.h \
 @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@		pulsecore/semaphore-posix.c pulsecore/semaphore.h
 
- at HAVE_LIBASYNCNS_TRUE@am__append_33 = $(LIBASYNCNS_CFLAGS)
- at HAVE_LIBASYNCNS_TRUE@am__append_34 = $(LIBASYNCNS_LIBS)
- at OS_IS_WIN32_TRUE@am__append_35 = pulsecore/dllmain.c
- at HAVE_DBUS_TRUE@am__append_36 = \
+ at HAVE_LIBASYNCNS_TRUE@am__append_37 = $(LIBASYNCNS_CFLAGS)
+ at HAVE_LIBASYNCNS_TRUE@am__append_38 = $(LIBASYNCNS_LIBS)
+ at OS_IS_WIN32_TRUE@am__append_39 = pulsecore/dllmain.c
+ at HAVE_DBUS_TRUE@am__append_40 = \
 @HAVE_DBUS_TRUE@		pulsecore/dbus-util.c pulsecore/dbus-util.h \
 @HAVE_DBUS_TRUE@		pulsecore/rtkit.c pulsecore/rtkit.h
 
- at HAVE_DBUS_TRUE@am__append_37 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_38 = $(DBUS_LIBS)
- at HAVE_GLIB20_TRUE@am__append_39 = \
+ at HAVE_DBUS_TRUE@am__append_41 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_42 = $(DBUS_LIBS)
+ at HAVE_GLIB20_TRUE@am__append_43 = \
 @HAVE_GLIB20_TRUE@		pulse/glib-mainloop.h
 
- at HAVE_GLIB20_TRUE@am__append_40 = \
+ at HAVE_GLIB20_TRUE@am__append_44 = \
 @HAVE_GLIB20_TRUE@		libpulse-mainloop-glib.la
 
- at HAVE_DBUS_TRUE@am__append_41 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_42 = $(DBUS_LIBS)
- at HAVE_OSS_WRAPPER_TRUE@am__append_43 = padsp
- at HAVE_OSS_WRAPPER_TRUE@am__append_44 = padsp
- at HAVE_NEON_TRUE@am__append_45 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la
- at HAVE_NEON_TRUE@am__append_46 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la
- at HAVE_ORC_TRUE@am__append_47 = pulsecore/svolume_orc.c
- at HAVE_ORC_TRUE@am__append_48 = $(ORC_CFLAGS)
- at HAVE_ORC_TRUE@am__append_49 = $(ORC_LIBS)
- at HAVE_X11_TRUE@am__append_50 = pulsecore/x11wrap.c pulsecore/x11wrap.h
- at HAVE_X11_TRUE@am__append_51 = $(X11_CFLAGS)
- at HAVE_X11_TRUE@am__append_52 = $(X11_LIBS)
- at HAVE_DBUS_TRUE@am__append_53 = \
+ at HAVE_DBUS_TRUE@am__append_45 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_46 = $(DBUS_LIBS)
+ at HAVE_OSS_WRAPPER_TRUE@am__append_47 = padsp
+ at HAVE_OSS_WRAPPER_TRUE@am__append_48 = padsp
+ at HAVE_NEON_TRUE@am__append_49 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la
+ at HAVE_NEON_TRUE@am__append_50 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la
+ at HAVE_ORC_TRUE@am__append_51 = pulsecore/svolume_orc.c
+ at HAVE_ORC_TRUE@am__append_52 = $(ORC_CFLAGS)
+ at HAVE_ORC_TRUE@am__append_53 = $(ORC_LIBS)
+ at HAVE_X11_TRUE@am__append_54 = pulsecore/x11wrap.c pulsecore/x11wrap.h
+ at HAVE_X11_TRUE@am__append_55 = $(X11_CFLAGS)
+ at HAVE_X11_TRUE@am__append_56 = $(X11_LIBS)
+ at HAVE_DBUS_TRUE@am__append_57 = \
 @HAVE_DBUS_TRUE@		pulsecore/dbus-shared.c pulsecore/dbus-shared.h \
 @HAVE_DBUS_TRUE@		pulsecore/protocol-dbus.c pulsecore/protocol-dbus.h
 
- at HAVE_DBUS_TRUE@am__append_54 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_55 = $(DBUS_LIBS)
- at HAVE_GDBM_TRUE@am__append_56 = pulsecore/database-gdbm.c
- at HAVE_GDBM_TRUE@am__append_57 = $(GDBM_CFLAGS)
- at HAVE_GDBM_TRUE@am__append_58 = $(GDBM_LIBS)
- at HAVE_TDB_TRUE@am__append_59 = pulsecore/database-tdb.c
- at HAVE_TDB_TRUE@am__append_60 = $(TDB_CFLAGS)
- at HAVE_TDB_TRUE@am__append_61 = $(TDB_LIBS)
- at HAVE_SIMPLEDB_TRUE@am__append_62 = pulsecore/database-simple.c
- at HAVE_WEBRTC_TRUE@am__append_63 = libwebrtc-util.la
- at HAVE_ESOUND_TRUE@am__append_64 = \
+ at HAVE_DBUS_TRUE@am__append_58 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_59 = $(DBUS_LIBS)
+ at HAVE_GDBM_TRUE@am__append_60 = pulsecore/database-gdbm.c
+ at HAVE_GDBM_TRUE@am__append_61 = $(GDBM_CFLAGS)
+ at HAVE_GDBM_TRUE@am__append_62 = $(GDBM_LIBS)
+ at HAVE_TDB_TRUE@am__append_63 = pulsecore/database-tdb.c
+ at HAVE_TDB_TRUE@am__append_64 = $(TDB_CFLAGS)
+ at HAVE_TDB_TRUE@am__append_65 = $(TDB_LIBS)
+ at HAVE_SIMPLEDB_TRUE@am__append_66 = pulsecore/database-simple.c
+ at HAVE_SPEEX_TRUE@am__append_67 = pulsecore/resampler/speex.c
+ at HAVE_SPEEX_TRUE@am__append_68 = $(LIBSPEEX_CFLAGS)
+ at HAVE_SPEEX_TRUE@am__append_69 = $(LIBSPEEX_LIBS)
+ at HAVE_LIBSAMPLERATE_TRUE@am__append_70 = pulsecore/resampler/libsamplerate.c
+ at HAVE_LIBSAMPLERATE_TRUE@am__append_71 = $(LIBSAMPLERATE_CFLAGS)
+ at HAVE_LIBSAMPLERATE_TRUE@am__append_72 = $(LIBSAMPLERATE_LIBS)
+ at HAVE_WEBRTC_TRUE@am__append_73 = libwebrtc-util.la
+ at HAVE_ESOUND_TRUE@am__append_74 = \
 @HAVE_ESOUND_TRUE@		libprotocol-esound.la
 
 
 # We need to emulate sendmsg/recvmsg to support this on Win32
- at OS_IS_WIN32_FALSE@am__append_65 = \
+ at OS_IS_WIN32_FALSE@am__append_75 = \
 @OS_IS_WIN32_FALSE@		librtp.la
 
- at HAVE_AVAHI_TRUE@am__append_66 = \
+ at HAVE_AVAHI_TRUE@am__append_76 = \
 @HAVE_AVAHI_TRUE@		libavahi-wrap.la
 
- at HAVE_DBUS_TRUE@am__append_67 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_68 = $(DBUS_LIBS)
+ at HAVE_DBUS_TRUE@am__append_77 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_78 = $(DBUS_LIBS)
 
 ###################################
 #        Plug-in libraries        #
 ###################################
 
 # Serveral module (e.g. libalsa-util.la)
- at HAVE_DBUS_TRUE@am__append_69 = \
+ at HAVE_DBUS_TRUE@am__append_79 = \
 @HAVE_DBUS_TRUE@		module-console-kit.la
 
- at HAVE_ESOUND_TRUE@am__append_70 = \
+ at HAVE_ESOUND_TRUE@am__append_80 = \
 @HAVE_ESOUND_TRUE@		module-esound-protocol-tcp.la \
 @HAVE_ESOUND_TRUE@		module-esound-sink.la
 
 
 # See comment at librtp.la above
- at OS_IS_WIN32_FALSE@am__append_71 = \
+ at OS_IS_WIN32_FALSE@am__append_81 = \
 @OS_IS_WIN32_FALSE@		module-rtp-send.la \
 @OS_IS_WIN32_FALSE@		module-rtp-recv.la
 
- at HAVE_AF_UNIX_TRUE@am__append_72 = \
+ at HAVE_AF_UNIX_TRUE@am__append_82 = \
 @HAVE_AF_UNIX_TRUE@		module-cli-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-simple-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-http-protocol-unix.la \
 @HAVE_AF_UNIX_TRUE@		module-native-protocol-unix.la
 
- at HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE at am__append_73 = \
+ at HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE at am__append_83 = \
 @HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@		module-esound-protocol-unix.la
 
- at HAVE_MKFIFO_TRUE@am__append_74 = \
+ at HAVE_MKFIFO_TRUE@am__append_84 = \
 @HAVE_MKFIFO_TRUE@		module-pipe-sink.la \
 @HAVE_MKFIFO_TRUE@		module-pipe-source.la
 
- at HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE at am__append_75 = \
+ at HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE at am__append_85 = \
 @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@		module-esound-compat-spawnfd.la \
 @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@		module-esound-compat-spawnpid.la
 
- at HAVE_REGEX_TRUE@am__append_76 = \
+ at HAVE_REGEX_TRUE@am__append_86 = \
 @HAVE_REGEX_TRUE@		module-match.la
 
- at HAVE_X11_TRUE@am__append_77 = \
+ at HAVE_X11_TRUE@am__append_87 = \
 @HAVE_X11_TRUE@		module-x11-bell.la \
 @HAVE_X11_TRUE@		module-x11-publish.la \
 @HAVE_X11_TRUE@		module-x11-xsmp.la \
 @HAVE_X11_TRUE@		module-x11-cork-request.la
 
- at HAVE_OSS_OUTPUT_TRUE@am__append_78 = \
+ at HAVE_OSS_OUTPUT_TRUE@am__append_88 = \
 @HAVE_OSS_OUTPUT_TRUE@		liboss-util.la \
 @HAVE_OSS_OUTPUT_TRUE@		module-oss.la
 
- at HAVE_COREAUDIO_TRUE@am__append_79 = \
+ at HAVE_COREAUDIO_TRUE@am__append_89 = \
 @HAVE_COREAUDIO_TRUE@		module-coreaudio-detect.la \
 @HAVE_COREAUDIO_TRUE@		module-coreaudio-device.la
 
 pulselibexec_PROGRAMS = $(am__EXEEXT_14)
- at HAVE_ALSA_TRUE@am__append_80 = \
+ at HAVE_ALSA_TRUE@am__append_90 = \
 @HAVE_ALSA_TRUE@		libalsa-util.la \
 @HAVE_ALSA_TRUE@		module-alsa-sink.la \
 @HAVE_ALSA_TRUE@		module-alsa-source.la \
 @HAVE_ALSA_TRUE@		module-alsa-card.la
 
- at HAVE_SOLARIS_TRUE@am__append_81 = \
+ at HAVE_SOLARIS_TRUE@am__append_91 = \
 @HAVE_SOLARIS_TRUE@		module-solaris.la
 
- at HAVE_AVAHI_TRUE@am__append_82 = \
+ at HAVE_AVAHI_TRUE@am__append_92 = \
 @HAVE_AVAHI_TRUE@		module-zeroconf-publish.la \
 @HAVE_AVAHI_TRUE@		module-zeroconf-discover.la
 
- at HAVE_BONJOUR_TRUE@am__append_83 = \
+ at HAVE_BONJOUR_TRUE@am__append_93 = \
 @HAVE_BONJOUR_TRUE@		module-bonjour-publish.la
 
- at HAVE_LIRC_TRUE@am__append_84 = \
+ at HAVE_LIRC_TRUE@am__append_94 = \
 @HAVE_LIRC_TRUE@		module-lirc.la
 
- at HAVE_XEN_TRUE@am__append_85 = \
+ at HAVE_XEN_TRUE@am__append_95 = \
 @HAVE_XEN_TRUE@		module-xenpv-sink.la
 
- at HAVE_EVDEV_TRUE@am__append_86 = \
+ at HAVE_EVDEV_TRUE@am__append_96 = \
 @HAVE_EVDEV_TRUE@		module-mmkbd-evdev.la
 
- at HAVE_JACK_TRUE@am__append_87 = \
+ at HAVE_JACK_TRUE@am__append_97 = \
 @HAVE_JACK_TRUE@		module-jack-sink.la \
 @HAVE_JACK_TRUE@		module-jack-source.la
 
- at HAVE_DBUS_TRUE@@HAVE_JACK_TRUE at am__append_88 = \
+ at HAVE_DBUS_TRUE@@HAVE_JACK_TRUE at am__append_98 = \
 @HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@		module-jackdbus-detect.la
 
- at HAVE_GCONF_TRUE@am__append_89 = \
+ at HAVE_GCONF_TRUE@am__append_99 = \
 @HAVE_GCONF_TRUE@		module-gconf.la
 
- at HAVE_GCONF_TRUE@am__append_90 = \
+ at HAVE_GCONF_TRUE@am__append_100 = \
 @HAVE_GCONF_TRUE@		gconf-helper
 
- at HAVE_WAVEOUT_TRUE@am__append_91 = \
+ at HAVE_WAVEOUT_TRUE@am__append_101 = \
 @HAVE_WAVEOUT_TRUE@		module-waveout.la
 
- at HAVE_HAL_COMPAT_TRUE@am__append_92 = \
+ at HAVE_HAL_COMPAT_TRUE@am__append_102 = \
 @HAVE_HAL_COMPAT_TRUE@		module-hal-detect.la
 
- at HAVE_UDEV_TRUE@am__append_93 = \
+ at HAVE_UDEV_TRUE@am__append_103 = \
 @HAVE_UDEV_TRUE@		module-udev-detect.la
 
- at HAVE_SYSTEMD_TRUE@am__append_94 = \
- at HAVE_SYSTEMD_TRUE@		module-systemd-login.la
+ at HAVE_SYSTEMD_LOGIN_TRUE@am__append_104 = \
+ at HAVE_SYSTEMD_LOGIN_TRUE@		module-systemd-login.la
 
- at HAVE_DBUS_TRUE@am__append_95 = \
+ at HAVE_DBUS_TRUE@am__append_105 = \
 @HAVE_DBUS_TRUE@		module-rygel-media-server.la \
 @HAVE_DBUS_TRUE@		module-dbus-protocol.la
 
- at HAVE_BLUEZ_TRUE@am__append_96 = \
+ at HAVE_BLUEZ_TRUE@am__append_106 = \
 @HAVE_BLUEZ_TRUE@		module-bluetooth-discover.la \
 @HAVE_BLUEZ_TRUE@		module-bluetooth-policy.la
 
- at HAVE_BLUEZ_4_TRUE@am__append_97 = \
+ at HAVE_BLUEZ_4_TRUE@am__append_107 = \
 @HAVE_BLUEZ_4_TRUE@		libbluez4-util.la \
 @HAVE_BLUEZ_4_TRUE@		module-bluez4-discover.la \
 @HAVE_BLUEZ_4_TRUE@		module-bluez4-device.la
 
- at HAVE_BLUEZ_5_TRUE@am__append_98 = \
+ at HAVE_BLUEZ_5_TRUE@am__append_108 = \
 @HAVE_BLUEZ_5_TRUE@		libbluez5-util.la \
 @HAVE_BLUEZ_5_TRUE@		module-bluez5-discover.la \
 @HAVE_BLUEZ_5_TRUE@		module-bluez5-device.la
 
- at HAVE_OPENSSL_TRUE@am__append_99 = \
- at HAVE_OPENSSL_TRUE@		libraop.la \
- at HAVE_OPENSSL_TRUE@		module-raop-sink.la
 
- at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE at am__append_100 = \
- at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@		module-raop-discover.la
+# RAOP depends on RTP, and we don't support RTP on Windows, see comment at
+# librtp.la above.
+ at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am__append_109 = \
+ at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@		libraop.la \
+ at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@		module-raop-sink.la
 
- at HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE at am__append_101 = \
+ at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am__append_110 = \
+ at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@		module-raop-discover.la
+
+ at HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE at am__append_111 = \
 @HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@		module-equalizer-sink.la
 
- at HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE at am__append_102 = utils/qpaeq
- at HAVE_ESOUND_TRUE@am__append_103 = \
+ at HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE at am__append_112 = utils/qpaeq
+ at HAVE_ESOUND_TRUE@am__append_113 = \
 @HAVE_ESOUND_TRUE@		module-esound-protocol-tcp-symdef.h \
 @HAVE_ESOUND_TRUE@		module-esound-protocol-unix-symdef.h \
 @HAVE_ESOUND_TRUE@		module-esound-compat-spawnfd-symdef.h \
 @HAVE_ESOUND_TRUE@		module-esound-compat-spawnpid-symdef.h \
 @HAVE_ESOUND_TRUE@		module-esound-sink-symdef.h
 
- at HAVE_DBUS_TRUE@am__append_104 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_105 = $(DBUS_LIBS)
- at HAVE_UDEV_TRUE@am__append_106 = modules/udev-util.h modules/udev-util.c
- at HAVE_UDEV_TRUE@am__append_107 = $(UDEV_LIBS)
- at HAVE_UDEV_TRUE@am__append_108 = $(UDEV_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_109 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c
- at HAVE_DBUS_TRUE@am__append_110 = $(DBUS_LIBS)
- at HAVE_DBUS_TRUE@am__append_111 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_112 = $(DBUS_LIBS)
- at HAVE_DBUS_TRUE@am__append_113 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_114 = $(DBUS_LIBS)
- at HAVE_DBUS_TRUE@am__append_115 = $(DBUS_CFLAGS)
- at HAVE_ADRIAN_EC_TRUE@am__append_116 = \
+ at HAVE_DBUS_TRUE@am__append_114 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_115 = $(DBUS_LIBS)
+ at HAVE_UDEV_TRUE@am__append_116 = modules/udev-util.h modules/udev-util.c
+ at HAVE_UDEV_TRUE@am__append_117 = $(UDEV_LIBS)
+ at HAVE_UDEV_TRUE@am__append_118 = $(UDEV_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_119 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c
+ at HAVE_DBUS_TRUE@am__append_120 = $(DBUS_LIBS)
+ at HAVE_DBUS_TRUE@am__append_121 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_122 = $(DBUS_LIBS)
+ at HAVE_DBUS_TRUE@am__append_123 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_124 = $(DBUS_LIBS)
+ at HAVE_DBUS_TRUE@am__append_125 = $(DBUS_CFLAGS)
+ at HAVE_ADRIAN_EC_TRUE@am__append_126 = \
 @HAVE_ADRIAN_EC_TRUE@		modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \
 @HAVE_ADRIAN_EC_TRUE@		modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h
 
- at HAVE_ADRIAN_EC_TRUE@am__append_117 = -DHAVE_ADRIAN_EC=1
- at HAVE_ADRIAN_EC_TRUE@am__append_118 = modules/echo-cancel/adrian-aec
- at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__append_119 = $(ORC_LIBS)
- at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__append_120 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel
- at HAVE_SPEEX_TRUE@am__append_121 = modules/echo-cancel/speex.c
- at HAVE_WEBRTC_TRUE@am__append_122 = -DHAVE_WEBRTC=1
- at HAVE_WEBRTC_TRUE@am__append_123 = libwebrtc-util.la
+ at HAVE_ADRIAN_EC_TRUE@am__append_127 = -DHAVE_ADRIAN_EC=1
+ at HAVE_ADRIAN_EC_TRUE@am__append_128 = modules/echo-cancel/adrian-aec
+ at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__append_129 = $(ORC_LIBS)
+ at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__append_130 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel
+ at HAVE_SPEEX_TRUE@am__append_131 = modules/echo-cancel/speex.c
+ at HAVE_WEBRTC_TRUE@am__append_132 = -DHAVE_WEBRTC=1
+ at HAVE_WEBRTC_TRUE@am__append_133 = libwebrtc-util.la
+ at HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@am__append_134 = \
+ at HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@		modules/bluetooth/backend-ofono.c
+
+ at HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@am__append_135 = \
+ at HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@		modules/bluetooth/backend-native.c
+
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \
@@ -453,9 +473,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = esdcompat start-pulseaudio-x11 \
-	start-pulseaudio-kde client.conf daemon.conf default.pa \
-	system.pa
+CONFIG_CLEAN_FILES = esdcompat start-pulseaudio-x11 client.conf \
+	daemon.conf default.pa system.pa pulseaudio.service
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -490,6 +509,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbuspolicydir)" \
 	"$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" \
 	"$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(pulseconfdir)" \
+	"$(DESTDIR)$(systemduserunitdir)" \
 	"$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(modlibexec_LTLIBRARIES) \
 	$(noinst_LTLIBRARIES) $(padsplib_LTLIBRARIES) \
@@ -559,8 +579,16 @@ libbluez4_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @HAVE_BLUEZ_4_TRUE@	$(modlibexecdir)
 libbluez5_util_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1)
+am__libbluez5_util_la_SOURCES_DIST = modules/bluetooth/bluez5-util.c \
+	modules/bluetooth/bluez5-util.h \
+	modules/bluetooth/a2dp-codecs.h \
+	modules/bluetooth/backend-ofono.c \
+	modules/bluetooth/backend-native.c
+ at HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@am__objects_3 = modules/bluetooth/libbluez5_util_la-backend-ofono.lo
+ at HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@am__objects_4 = modules/bluetooth/libbluez5_util_la-backend-native.lo
 am_libbluez5_util_la_OBJECTS =  \
-	modules/bluetooth/libbluez5_util_la-bluez5-util.lo
+	modules/bluetooth/libbluez5_util_la-bluez5-util.lo \
+	$(am__objects_3) $(am__objects_4)
 libbluez5_util_la_OBJECTS = $(am_libbluez5_util_la_OBJECTS)
 libbluez5_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -672,7 +700,8 @@ libpulse_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	libpulsecommon- at PA_MAJORMINOR@.la $(am__DEPENDENCIES_5)
 am_libpulse_la_OBJECTS = pulse/libpulse_la-channelmap.lo \
-	pulse/libpulse_la-context.lo pulse/libpulse_la-error.lo \
+	pulse/libpulse_la-context.lo pulse/libpulse_la-direction.lo \
+	pulse/libpulse_la-error.lo \
 	pulse/libpulse_la-ext-device-manager.lo \
 	pulse/libpulse_la-ext-device-restore.lo \
 	pulse/libpulse_la-ext-stream-restore.lo \
@@ -712,37 +741,38 @@ am__libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES_DIST =  \
 	pulsecore/core-rtclock.c pulsecore/core-rtclock.h \
 	pulsecore/core-util.c pulsecore/core-util.h pulsecore/creds.h \
 	pulsecore/dynarray.c pulsecore/dynarray.h \
-	pulsecore/endianmacros.h pulsecore/flist.c pulsecore/flist.h \
-	pulsecore/g711.c pulsecore/g711.h pulsecore/hashmap.c \
-	pulsecore/hashmap.h pulsecore/i18n.c pulsecore/i18n.h \
-	pulsecore/idxset.c pulsecore/idxset.h pulsecore/arpa-inet.c \
-	pulsecore/arpa-inet.h pulsecore/iochannel.c \
-	pulsecore/iochannel.h pulsecore/ioline.c pulsecore/ioline.h \
-	pulsecore/ipacl.c pulsecore/ipacl.h pulsecore/llist.h \
-	pulsecore/lock-autospawn.c pulsecore/lock-autospawn.h \
-	pulsecore/log.c pulsecore/log.h pulsecore/ratelimit.c \
-	pulsecore/ratelimit.h pulsecore/macro.h pulsecore/mcalign.c \
-	pulsecore/mcalign.h pulsecore/memblock.c pulsecore/memblock.h \
-	pulsecore/memblockq.c pulsecore/memblockq.h \
-	pulsecore/memchunk.c pulsecore/memchunk.h \
-	pulsecore/native-common.h pulsecore/once.c pulsecore/once.h \
-	pulsecore/packet.c pulsecore/packet.h pulsecore/parseaddr.c \
-	pulsecore/parseaddr.h pulsecore/pdispatch.c \
-	pulsecore/pdispatch.h pulsecore/pid.c pulsecore/pid.h \
-	pulsecore/pipe.c pulsecore/pipe.h pulsecore/memtrap.c \
-	pulsecore/memtrap.h pulsecore/aupdate.c pulsecore/aupdate.h \
-	pulsecore/proplist-util.c pulsecore/proplist-util.h \
-	pulsecore/pstream-util.c pulsecore/pstream-util.h \
-	pulsecore/pstream.c pulsecore/pstream.h pulsecore/queue.c \
-	pulsecore/queue.h pulsecore/random.c pulsecore/random.h \
-	pulsecore/refcnt.h pulsecore/sample-util.c \
-	pulsecore/sample-util.h pulsecore/shm.c pulsecore/shm.h \
-	pulsecore/bitset.c pulsecore/bitset.h \
-	pulsecore/socket-client.c pulsecore/socket-client.h \
-	pulsecore/socket-server.c pulsecore/socket-server.h \
-	pulsecore/socket-util.c pulsecore/socket-util.h \
-	pulsecore/strbuf.c pulsecore/strbuf.h pulsecore/strlist.c \
-	pulsecore/strlist.h pulsecore/svolume_c.c \
+	pulsecore/endianmacros.h pulsecore/fdsem.c pulsecore/fdsem.h \
+	pulsecore/flist.c pulsecore/flist.h pulsecore/g711.c \
+	pulsecore/g711.h pulsecore/hashmap.c pulsecore/hashmap.h \
+	pulsecore/i18n.c pulsecore/i18n.h pulsecore/idxset.c \
+	pulsecore/idxset.h pulsecore/arpa-inet.c pulsecore/arpa-inet.h \
+	pulsecore/iochannel.c pulsecore/iochannel.h pulsecore/ioline.c \
+	pulsecore/ioline.h pulsecore/ipacl.c pulsecore/ipacl.h \
+	pulsecore/llist.h pulsecore/lock-autospawn.c \
+	pulsecore/lock-autospawn.h pulsecore/log.c pulsecore/log.h \
+	pulsecore/ratelimit.c pulsecore/ratelimit.h pulsecore/macro.h \
+	pulsecore/mcalign.c pulsecore/mcalign.h pulsecore/memblock.c \
+	pulsecore/memblock.h pulsecore/memblockq.c \
+	pulsecore/memblockq.h pulsecore/memchunk.c \
+	pulsecore/memchunk.h pulsecore/native-common.h \
+	pulsecore/once.c pulsecore/once.h pulsecore/packet.c \
+	pulsecore/packet.h pulsecore/parseaddr.c pulsecore/parseaddr.h \
+	pulsecore/pdispatch.c pulsecore/pdispatch.h pulsecore/pid.c \
+	pulsecore/pid.h pulsecore/pipe.c pulsecore/pipe.h \
+	pulsecore/memtrap.c pulsecore/memtrap.h pulsecore/aupdate.c \
+	pulsecore/aupdate.h pulsecore/proplist-util.c \
+	pulsecore/proplist-util.h pulsecore/pstream-util.c \
+	pulsecore/pstream-util.h pulsecore/pstream.c \
+	pulsecore/pstream.h pulsecore/queue.c pulsecore/queue.h \
+	pulsecore/random.c pulsecore/random.h pulsecore/refcnt.h \
+	pulsecore/srbchannel.c pulsecore/srbchannel.h \
+	pulsecore/sample-util.c pulsecore/sample-util.h \
+	pulsecore/shm.c pulsecore/shm.h pulsecore/bitset.c \
+	pulsecore/bitset.h pulsecore/socket-client.c \
+	pulsecore/socket-client.h pulsecore/socket-server.c \
+	pulsecore/socket-server.h pulsecore/socket-util.c \
+	pulsecore/socket-util.h pulsecore/strbuf.c pulsecore/strbuf.h \
+	pulsecore/strlist.c pulsecore/strlist.h pulsecore/svolume_c.c \
 	pulsecore/svolume_arm.c pulsecore/svolume_mmx.c \
 	pulsecore/svolume_sse.c pulsecore/tagstruct.c \
 	pulsecore/tagstruct.h pulsecore/time-smoother.c \
@@ -760,21 +790,21 @@ am__libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES_DIST =  \
 	pulsecore/semaphore-osx.c pulsecore/semaphore-posix.c \
 	pulsecore/dllmain.c pulsecore/dbus-util.c \
 	pulsecore/dbus-util.h pulsecore/rtkit.c pulsecore/rtkit.h
- at OS_IS_WIN32_TRUE@am__objects_3 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-poll-win32.lo
- at OS_IS_WIN32_FALSE@am__objects_4 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-poll-posix.lo
- at HAVE_X11_TRUE@am__objects_5 = pulse/libpulsecommon_ at PA_MAJORMINOR@_la-client-conf-x11.lo \
+ at OS_IS_WIN32_TRUE@am__objects_5 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-poll-win32.lo
+ at OS_IS_WIN32_FALSE@am__objects_6 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-poll-posix.lo
+ at HAVE_X11_TRUE@am__objects_7 = pulse/libpulsecommon_ at PA_MAJORMINOR@_la-client-conf-x11.lo \
 @HAVE_X11_TRUE@	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-x11prop.lo
- at OS_IS_WIN32_TRUE@am__objects_6 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-mutex-win32.lo \
+ at OS_IS_WIN32_TRUE@am__objects_8 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-mutex-win32.lo \
 @OS_IS_WIN32_TRUE@	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-thread-win32.lo \
 @OS_IS_WIN32_TRUE@	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-semaphore-win32.lo
- at OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE at am__objects_7 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-mutex-posix.lo \
+ at OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE at am__objects_9 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-mutex-posix.lo \
 @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-thread-posix.lo \
 @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-semaphore-osx.lo
- at OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE at am__objects_8 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-mutex-posix.lo \
+ at OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE at am__objects_10 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-mutex-posix.lo \
 @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-thread-posix.lo \
 @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-semaphore-posix.lo
- at OS_IS_WIN32_TRUE@am__objects_9 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-dllmain.lo
- at HAVE_DBUS_TRUE@am__objects_10 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-dbus-util.lo \
+ at OS_IS_WIN32_TRUE@am__objects_11 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-dllmain.lo
+ at HAVE_DBUS_TRUE@am__objects_12 = pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-dbus-util.lo \
 @HAVE_DBUS_TRUE@	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-rtkit.lo
 am_libpulsecommon_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	pulse/libpulsecommon_ at PA_MAJORMINOR@_la-client-conf.lo \
@@ -796,6 +826,7 @@ am_libpulsecommon_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-core-rtclock.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-core-util.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-dynarray.lo \
+	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-flist.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-g711.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-hashmap.lo \
@@ -825,6 +856,7 @@ am_libpulsecommon_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-pstream.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-queue.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-random.lo \
+	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-sample-util.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-shm.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-bitset.lo \
@@ -842,9 +874,9 @@ am_libpulsecommon_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-tokenizer.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-usergroup.lo \
 	pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-sndfile-util.lo \
-	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
-	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
-	$(am__objects_9) $(am__objects_10)
+	$(am__objects_5) $(am__objects_6) $(am__objects_7) \
+	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
+	$(am__objects_11) $(am__objects_12)
 libpulsecommon_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	$(am_libpulsecommon_ at PA_MAJORMINOR@_la_OBJECTS)
 libpulsecommon_ at PA_MAJORMINOR@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -854,14 +886,16 @@ libpulsecommon_ at PA_MAJORMINOR@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 @HAVE_ORC_TRUE at am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
 @HAVE_GDBM_TRUE at am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
 @HAVE_TDB_TRUE at am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
+ at HAVE_SPEEX_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
+ at HAVE_LIBSAMPLERATE_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
 libpulsecore_ at PA_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	libpulsecommon- at PA_MAJORMINOR@.la libpulse.la \
-	libpulsecore-foreign.la $(am__append_46) $(am__DEPENDENCIES_7) \
+	libpulsecore-foreign.la $(am__append_50) $(am__DEPENDENCIES_7) \
 	$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_8) \
-	$(am__DEPENDENCIES_9)
+	$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
+	$(am__DEPENDENCIES_11)
 am__libpulsecore_ at PA_MAJORMINOR@_la_SOURCES_DIST =  \
 	pulsecore/asyncmsgq.c pulsecore/asyncmsgq.h pulsecore/asyncq.c \
 	pulsecore/asyncq.h pulsecore/auth-cookie.c \
@@ -871,22 +905,24 @@ am__libpulsecore_ at PA_MAJORMINOR@_la_SOURCES_DIST =  \
 	pulsecore/card.c pulsecore/card.h pulsecore/core-scache.c \
 	pulsecore/core-scache.h pulsecore/core-subscribe.c \
 	pulsecore/core-subscribe.h pulsecore/core.c pulsecore/core.h \
-	pulsecore/fdsem.c pulsecore/fdsem.h pulsecore/hook-list.c \
-	pulsecore/hook-list.h pulsecore/ltdl-helper.c \
-	pulsecore/ltdl-helper.h pulsecore/modargs.c \
-	pulsecore/modargs.h pulsecore/modinfo.c pulsecore/modinfo.h \
-	pulsecore/module.c pulsecore/module.h pulsecore/msgobject.c \
-	pulsecore/msgobject.h pulsecore/namereg.c pulsecore/namereg.h \
-	pulsecore/object.c pulsecore/object.h \
-	pulsecore/play-memblockq.c pulsecore/play-memblockq.h \
-	pulsecore/play-memchunk.c pulsecore/play-memchunk.h \
-	pulsecore/remap.c pulsecore/remap.h pulsecore/remap_mmx.c \
-	pulsecore/remap_sse.c pulsecore/resampler.c \
-	pulsecore/resampler.h pulsecore/rtpoll.c pulsecore/rtpoll.h \
-	pulsecore/stream-util.c pulsecore/stream-util.h \
-	pulsecore/mix.c pulsecore/mix.h pulsecore/cpu.h \
-	pulsecore/cpu-arm.c pulsecore/cpu-arm.h pulsecore/cpu-x86.c \
-	pulsecore/cpu-x86.h pulsecore/cpu-orc.c pulsecore/cpu-orc.h \
+	pulsecore/hook-list.c pulsecore/hook-list.h \
+	pulsecore/ltdl-helper.c pulsecore/ltdl-helper.h \
+	pulsecore/modargs.c pulsecore/modargs.h pulsecore/modinfo.c \
+	pulsecore/modinfo.h pulsecore/module.c pulsecore/module.h \
+	pulsecore/msgobject.c pulsecore/msgobject.h \
+	pulsecore/namereg.c pulsecore/namereg.h pulsecore/object.c \
+	pulsecore/object.h pulsecore/play-memblockq.c \
+	pulsecore/play-memblockq.h pulsecore/play-memchunk.c \
+	pulsecore/play-memchunk.h pulsecore/remap.c pulsecore/remap.h \
+	pulsecore/remap_mmx.c pulsecore/remap_sse.c \
+	pulsecore/resampler.c pulsecore/resampler.h \
+	pulsecore/resampler/ffmpeg.c pulsecore/resampler/peaks.c \
+	pulsecore/resampler/trivial.c pulsecore/rtpoll.c \
+	pulsecore/rtpoll.h pulsecore/stream-util.c \
+	pulsecore/stream-util.h pulsecore/mix.c pulsecore/mix.h \
+	pulsecore/cpu.c pulsecore/cpu.h pulsecore/cpu-arm.c \
+	pulsecore/cpu-arm.h pulsecore/cpu-x86.c pulsecore/cpu-x86.h \
+	pulsecore/cpu-orc.c pulsecore/cpu-orc.h \
 	pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \
 	pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \
 	pulsecore/sconv_sse.c pulsecore/sconv.c pulsecore/sconv.h \
@@ -904,14 +940,18 @@ am__libpulsecore_ at PA_MAJORMINOR@_la_SOURCES_DIST =  \
 	pulsecore/x11wrap.h pulsecore/dbus-shared.c \
 	pulsecore/dbus-shared.h pulsecore/protocol-dbus.c \
 	pulsecore/protocol-dbus.h pulsecore/database-gdbm.c \
-	pulsecore/database-tdb.c pulsecore/database-simple.c
- at HAVE_ORC_TRUE@am__objects_11 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-svolume_orc.lo
- at HAVE_X11_TRUE@am__objects_12 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-x11wrap.lo
- at HAVE_DBUS_TRUE@am__objects_13 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-dbus-shared.lo \
+	pulsecore/database-tdb.c pulsecore/database-simple.c \
+	pulsecore/resampler/speex.c \
+	pulsecore/resampler/libsamplerate.c
+ at HAVE_ORC_TRUE@am__objects_13 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-svolume_orc.lo
+ at HAVE_X11_TRUE@am__objects_14 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-x11wrap.lo
+ at HAVE_DBUS_TRUE@am__objects_15 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-dbus-shared.lo \
 @HAVE_DBUS_TRUE@	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-protocol-dbus.lo
- at HAVE_GDBM_TRUE@am__objects_14 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-gdbm.lo
- at HAVE_TDB_TRUE@am__objects_15 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-tdb.lo
- at HAVE_SIMPLEDB_TRUE@am__objects_16 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-simple.lo
+ at HAVE_GDBM_TRUE@am__objects_16 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-gdbm.lo
+ at HAVE_TDB_TRUE@am__objects_17 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-tdb.lo
+ at HAVE_SIMPLEDB_TRUE@am__objects_18 = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-simple.lo
+ at HAVE_SPEEX_TRUE@am__objects_19 = pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-speex.lo
+ at HAVE_LIBSAMPLERATE_TRUE@am__objects_20 = pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.lo
 am_libpulsecore_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-asyncmsgq.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-asyncq.lo \
@@ -923,7 +963,6 @@ am_libpulsecore_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-core-scache.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-core-subscribe.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-core.lo \
-	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-ltdl-helper.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-modargs.lo \
@@ -938,9 +977,13 @@ am_libpulsecore_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-remap_mmx.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-remap_sse.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-resampler.lo \
+	pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.lo \
+	pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-peaks.lo \
+	pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-trivial.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-rtpoll.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-stream-util.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-mix.lo \
+	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu-x86.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu-orc.lo \
@@ -959,8 +1002,9 @@ am_libpulsecore_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-source.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-start-child.lo \
 	pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-thread-mq.lo \
-	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
-	$(am__objects_14) $(am__objects_15) $(am__objects_16)
+	$(am__objects_13) $(am__objects_14) $(am__objects_15) \
+	$(am__objects_16) $(am__objects_17) $(am__objects_18) \
+	$(am__objects_19) $(am__objects_20)
 @HAVE_ORC_TRUE at nodist_libpulsecore_@PA_MAJORMINOR at _la_OBJECTS = pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-svolume-orc-gen.lo
 libpulsecore_ at PA_MAJORMINOR@_la_OBJECTS =  \
 	$(am_libpulsecore_ at PA_MAJORMINOR@_la_OBJECTS) \
@@ -988,6 +1032,16 @@ libpulsecore_mix_neon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(libpulsecore_mix_neon_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @HAVE_NEON_TRUE at am_libpulsecore_mix_neon_la_rpath =
+libpulsecore_remap_neon_la_LIBADD =
+am__libpulsecore_remap_neon_la_SOURCES_DIST = pulsecore/remap_neon.c
+ at HAVE_NEON_TRUE@am_libpulsecore_remap_neon_la_OBJECTS = pulsecore/libpulsecore_remap_neon_la-remap_neon.lo
+libpulsecore_remap_neon_la_OBJECTS =  \
+	$(am_libpulsecore_remap_neon_la_OBJECTS)
+libpulsecore_remap_neon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libpulsecore_remap_neon_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+ at HAVE_NEON_TRUE@am_libpulsecore_remap_neon_la_rpath =
 libpulsecore_sconv_neon_la_LIBADD =
 am__libpulsecore_sconv_neon_la_SOURCES_DIST = pulsecore/sconv_neon.c
 @HAVE_NEON_TRUE at am_libpulsecore_sconv_neon_la_OBJECTS = pulsecore/libpulsecore_sconv_neon_la-sconv_neon.lo
@@ -1016,7 +1070,8 @@ libraop_la_OBJECTS = $(am_libraop_la_OBJECTS)
 libraop_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libraop_la_CFLAGS) \
 	$(CFLAGS) $(libraop_la_LDFLAGS) $(LDFLAGS) -o $@
- at HAVE_OPENSSL_TRUE@am_libraop_la_rpath = -rpath $(modlibexecdir)
+ at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am_libraop_la_rpath = -rpath \
+ at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@	$(modlibexecdir)
 librtp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	libpulsecore- at PA_MAJORMINOR@.la \
 	libpulsecommon- at PA_MAJORMINOR@.la libpulse.la
@@ -1302,22 +1357,22 @@ module_device_restore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(module_device_restore_la_CFLAGS) $(CFLAGS) \
 	$(module_device_restore_la_LDFLAGS) $(LDFLAGS) -o $@
- at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__DEPENDENCIES_10 =  \
+ at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__DEPENDENCIES_12 =  \
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@	$(am__DEPENDENCIES_1)
 module_echo_cancel_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10) $(am__append_123)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_12) $(am__append_133)
 am__module_echo_cancel_la_SOURCES_DIST =  \
 	modules/echo-cancel/module-echo-cancel.c \
 	modules/echo-cancel/null.c modules/echo-cancel/echo-cancel.h \
 	modules/echo-cancel/adrian-aec.c \
 	modules/echo-cancel/adrian-aec.h modules/echo-cancel/adrian.c \
 	modules/echo-cancel/adrian.h modules/echo-cancel/speex.c
- at HAVE_ADRIAN_EC_TRUE@am__objects_17 = modules/echo-cancel/module_echo_cancel_la-adrian-aec.lo \
+ at HAVE_ADRIAN_EC_TRUE@am__objects_21 = modules/echo-cancel/module_echo_cancel_la-adrian-aec.lo \
 @HAVE_ADRIAN_EC_TRUE@	modules/echo-cancel/module_echo_cancel_la-adrian.lo
- at HAVE_SPEEX_TRUE@am__objects_18 = modules/echo-cancel/module_echo_cancel_la-speex.lo
+ at HAVE_SPEEX_TRUE@am__objects_22 = modules/echo-cancel/module_echo_cancel_la-speex.lo
 am_module_echo_cancel_la_OBJECTS = modules/echo-cancel/module_echo_cancel_la-module-echo-cancel.lo \
 	modules/echo-cancel/module_echo_cancel_la-null.lo \
-	$(am__objects_17) $(am__objects_18)
+	$(am__objects_21) $(am__objects_22)
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at nodist_module_echo_cancel_la_OBJECTS = modules/echo-cancel/module_echo_cancel_la-adrian-aec-orc-gen.lo
 module_echo_cancel_la_OBJECTS = $(am_module_echo_cancel_la_OBJECTS) \
 	$(nodist_module_echo_cancel_la_OBJECTS)
@@ -1631,8 +1686,9 @@ module_raop_discover_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(module_raop_discover_la_CFLAGS) $(CFLAGS) \
 	$(module_raop_discover_la_LDFLAGS) $(LDFLAGS) -o $@
- at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE at am_module_raop_discover_la_rpath =  \
- at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@	-rpath $(modlibexecdir)
+ at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am_module_raop_discover_la_rpath =  \
+ at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@	-rpath \
+ at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@	$(modlibexecdir)
 module_raop_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_3) librtp.la \
 	libraop.la
 am_module_raop_sink_la_OBJECTS =  \
@@ -1642,8 +1698,8 @@ module_raop_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(module_raop_sink_la_CFLAGS) $(CFLAGS) \
 	$(module_raop_sink_la_LDFLAGS) $(LDFLAGS) -o $@
- at HAVE_OPENSSL_TRUE@am_module_raop_sink_la_rpath = -rpath \
- at HAVE_OPENSSL_TRUE@	$(modlibexecdir)
+ at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am_module_raop_sink_la_rpath =  \
+ at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@	-rpath $(modlibexecdir)
 module_remap_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_module_remap_sink_la_OBJECTS = modules/module-remap-sink.lo
 module_remap_sink_la_OBJECTS = $(am_module_remap_sink_la_OBJECTS)
@@ -1797,7 +1853,7 @@ module_switch_on_port_available_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(module_switch_on_port_available_la_LDFLAGS) $(LDFLAGS) -o $@
 module_systemd_login_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_module_systemd_login_la_OBJECTS =  \
 	modules/module_systemd_login_la-module-systemd-login.lo
 module_systemd_login_la_OBJECTS =  \
@@ -1806,8 +1862,8 @@ module_systemd_login_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(module_systemd_login_la_CFLAGS) $(CFLAGS) \
 	$(module_systemd_login_la_LDFLAGS) $(LDFLAGS) -o $@
- at HAVE_SYSTEMD_TRUE@am_module_systemd_login_la_rpath = -rpath \
- at HAVE_SYSTEMD_TRUE@	$(modlibexecdir)
+ at HAVE_SYSTEMD_LOGIN_TRUE@am_module_systemd_login_la_rpath = -rpath \
+ at HAVE_SYSTEMD_LOGIN_TRUE@	$(modlibexecdir)
 module_tunnel_sink_new_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_module_tunnel_sink_new_la_OBJECTS =  \
 	modules/module-tunnel-sink-new.lo
@@ -1977,7 +2033,8 @@ module_zeroconf_publish_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @OS_IS_WIN32_FALSE at am__EXEEXT_1 = pasuspender$(EXEEXT)
 @HAVE_AF_UNIX_TRUE at am__EXEEXT_2 = pacmd$(EXEEXT)
 @HAVE_X11_TRUE at am__EXEEXT_3 = pax11publish$(EXEEXT)
- at OS_IS_WIN32_FALSE@am__EXEEXT_4 = sigbus-test$(EXEEXT) \
+ at OS_IS_WIN32_FALSE@am__EXEEXT_4 = srbchannel-test$(EXEEXT) \
+ at OS_IS_WIN32_FALSE@	sigbus-test$(EXEEXT) \
 @OS_IS_WIN32_FALSE@	usergroup-test$(EXEEXT)
 @OS_IS_DARWIN_FALSE at am__EXEEXT_5 = once-test$(EXEEXT)
 @HAVE_GLIB20_TRUE at am__EXEEXT_6 = mainloop-test-glib$(EXEEXT)
@@ -1992,8 +2049,9 @@ am__EXEEXT_8 = mainloop-test$(EXEEXT) strlist-test$(EXEEXT) \
 	rtpoll-test$(EXEEXT) resampler-test$(EXEEXT) \
 	smoother-test$(EXEEXT) thread-test$(EXEEXT) \
 	volume-test$(EXEEXT) mix-test$(EXEEXT) proplist-test$(EXEEXT) \
-	cpu-test$(EXEEXT) lock-autospawn-test$(EXEEXT) \
-	mult-s16-test$(EXEEXT) mix-special-test$(EXEEXT) \
+	cpu-mix-test$(EXEEXT) cpu-remap-test$(EXEEXT) \
+	cpu-sconv-test$(EXEEXT) cpu-volume-test$(EXEEXT) \
+	lock-autospawn-test$(EXEEXT) mult-s16-test$(EXEEXT) \
 	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
 	$(am__EXEEXT_7)
 @HAVE_SIGXCPU_TRUE at am__EXEEXT_9 = cpulimit-test$(EXEEXT) \
@@ -2071,14 +2129,44 @@ connect_stress_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(connect_stress_CFLAGS) $(CFLAGS) $(connect_stress_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_cpu_test_OBJECTS = tests/cpu_test-cpu-test.$(OBJEXT)
-cpu_test_OBJECTS = $(am_cpu_test_OBJECTS)
-cpu_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+am_cpu_mix_test_OBJECTS = tests/cpu_mix_test-cpu-mix-test.$(OBJEXT)
+cpu_mix_test_OBJECTS = $(am_cpu_mix_test_OBJECTS)
+cpu_mix_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	libpulsecore- at PA_MAJORMINOR@.la libpulse.la \
 	libpulsecommon- at PA_MAJORMINOR@.la
-cpu_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(cpu_test_CFLAGS) \
-	$(CFLAGS) $(cpu_test_LDFLAGS) $(LDFLAGS) -o $@
+cpu_mix_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(cpu_mix_test_CFLAGS) \
+	$(CFLAGS) $(cpu_mix_test_LDFLAGS) $(LDFLAGS) -o $@
+am_cpu_remap_test_OBJECTS =  \
+	tests/cpu_remap_test-cpu-remap-test.$(OBJEXT)
+cpu_remap_test_OBJECTS = $(am_cpu_remap_test_OBJECTS)
+cpu_remap_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	libpulsecore- at PA_MAJORMINOR@.la libpulse.la \
+	libpulsecommon- at PA_MAJORMINOR@.la
+cpu_remap_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(cpu_remap_test_CFLAGS) $(CFLAGS) $(cpu_remap_test_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_cpu_sconv_test_OBJECTS =  \
+	tests/cpu_sconv_test-cpu-sconv-test.$(OBJEXT)
+cpu_sconv_test_OBJECTS = $(am_cpu_sconv_test_OBJECTS)
+cpu_sconv_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	libpulsecore- at PA_MAJORMINOR@.la libpulse.la \
+	libpulsecommon- at PA_MAJORMINOR@.la
+cpu_sconv_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(cpu_sconv_test_CFLAGS) $(CFLAGS) $(cpu_sconv_test_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_cpu_volume_test_OBJECTS =  \
+	tests/cpu_volume_test-cpu-volume-test.$(OBJEXT)
+cpu_volume_test_OBJECTS = $(am_cpu_volume_test_OBJECTS)
+cpu_volume_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	libpulsecore- at PA_MAJORMINOR@.la libpulse.la \
+	libpulsecommon- at PA_MAJORMINOR@.la
+cpu_volume_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(cpu_volume_test_CFLAGS) $(CFLAGS) $(cpu_volume_test_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_cpulimit_test_OBJECTS =  \
 	tests/cpulimit_test-cpulimit-test.$(OBJEXT) \
 	daemon/cpulimit_test-cpulimit.$(OBJEXT)
@@ -2106,20 +2194,20 @@ am__echo_cancel_test_SOURCES_DIST =  \
 	modules/echo-cancel/adrian-aec.c \
 	modules/echo-cancel/adrian-aec.h modules/echo-cancel/adrian.c \
 	modules/echo-cancel/adrian.h modules/echo-cancel/speex.c
- at HAVE_ADRIAN_EC_TRUE@am__objects_19 = modules/echo-cancel/echo_cancel_test-adrian-aec.$(OBJEXT) \
+ at HAVE_ADRIAN_EC_TRUE@am__objects_23 = modules/echo-cancel/echo_cancel_test-adrian-aec.$(OBJEXT) \
 @HAVE_ADRIAN_EC_TRUE@	modules/echo-cancel/echo_cancel_test-adrian.$(OBJEXT)
- at HAVE_SPEEX_TRUE@am__objects_20 = modules/echo-cancel/echo_cancel_test-speex.$(OBJEXT)
-am__objects_21 = modules/echo-cancel/echo_cancel_test-module-echo-cancel.$(OBJEXT) \
+ at HAVE_SPEEX_TRUE@am__objects_24 = modules/echo-cancel/echo_cancel_test-speex.$(OBJEXT)
+am__objects_25 = modules/echo-cancel/echo_cancel_test-module-echo-cancel.$(OBJEXT) \
 	modules/echo-cancel/echo_cancel_test-null.$(OBJEXT) \
-	$(am__objects_19) $(am__objects_20)
-am_echo_cancel_test_OBJECTS = $(am__objects_21)
- at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__objects_22 = modules/echo-cancel/echo_cancel_test-adrian-aec-orc-gen.$(OBJEXT)
-nodist_echo_cancel_test_OBJECTS = $(am__objects_22)
+	$(am__objects_23) $(am__objects_24)
+am_echo_cancel_test_OBJECTS = $(am__objects_25)
+ at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__objects_26 = modules/echo-cancel/echo_cancel_test-adrian-aec-orc-gen.$(OBJEXT)
+nodist_echo_cancel_test_OBJECTS = $(am__objects_26)
 echo_cancel_test_OBJECTS = $(am_echo_cancel_test_OBJECTS) \
 	$(nodist_echo_cancel_test_OBJECTS)
-am__DEPENDENCIES_11 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_10) $(am__append_123)
-echo_cancel_test_DEPENDENCIES = $(am__DEPENDENCIES_11)
+am__DEPENDENCIES_13 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_12) $(am__append_133)
+echo_cancel_test_DEPENDENCIES = $(am__DEPENDENCIES_13)
 echo_cancel_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(echo_cancel_test_CFLAGS) $(CFLAGS) \
@@ -2227,12 +2315,12 @@ mainloop_test_DEPENDENCIES = $(am__DEPENDENCIES_2) libpulse.la \
 mainloop_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mainloop_test_CFLAGS) \
 	$(CFLAGS) $(mainloop_test_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_23 = tests/mainloop_test_glib-mainloop-test.$(OBJEXT)
-am_mainloop_test_glib_OBJECTS = $(am__objects_23)
+am__objects_27 = tests/mainloop_test_glib-mainloop-test.$(OBJEXT)
+am_mainloop_test_glib_OBJECTS = $(am__objects_27)
 mainloop_test_glib_OBJECTS = $(am_mainloop_test_glib_OBJECTS)
-am__DEPENDENCIES_12 = $(am__DEPENDENCIES_2) libpulse.la \
+am__DEPENDENCIES_14 = $(am__DEPENDENCIES_2) libpulse.la \
 	libpulsecommon- at PA_MAJORMINOR@.la
-mainloop_test_glib_DEPENDENCIES = $(am__DEPENDENCIES_12) \
+mainloop_test_glib_DEPENDENCIES = $(am__DEPENDENCIES_14) \
 	$(am__DEPENDENCIES_1) libpulse-mainloop-glib.la
 mainloop_test_glib_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -2265,16 +2353,6 @@ memblockq_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(memblockq_test_CFLAGS) $(CFLAGS) $(memblockq_test_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_mix_special_test_OBJECTS =  \
-	tests/mix_special_test-mix-special-test.$(OBJEXT)
-mix_special_test_OBJECTS = $(am_mix_special_test_OBJECTS)
-mix_special_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	libpulsecore- at PA_MAJORMINOR@.la libpulse.la \
-	libpulsecommon- at PA_MAJORMINOR@.la
-mix_special_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(mix_special_test_CFLAGS) $(CFLAGS) \
-	$(mix_special_test_LDFLAGS) $(LDFLAGS) -o $@
 am_mix_test_OBJECTS = tests/mix_test-mix-test.$(OBJEXT)
 mix_test_OBJECTS = $(am_mix_test_OBJECTS)
 mix_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -2364,7 +2442,7 @@ am__pulseaudio_SOURCES_DIST = daemon/caps.c daemon/caps.h \
 	daemon/dumpmodules.c daemon/dumpmodules.h \
 	daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h daemon/main.c \
 	daemon/server-lookup.c daemon/server-lookup.h
- at HAVE_DBUS_TRUE@am__objects_24 =  \
+ at HAVE_DBUS_TRUE@am__objects_28 =  \
 @HAVE_DBUS_TRUE@	daemon/pulseaudio-server-lookup.$(OBJEXT)
 am_pulseaudio_OBJECTS = daemon/pulseaudio-caps.$(OBJEXT) \
 	daemon/pulseaudio-cmdline.$(OBJEXT) \
@@ -2372,7 +2450,7 @@ am_pulseaudio_OBJECTS = daemon/pulseaudio-caps.$(OBJEXT) \
 	daemon/pulseaudio-daemon-conf.$(OBJEXT) \
 	daemon/pulseaudio-dumpmodules.$(OBJEXT) \
 	daemon/pulseaudio-ltdl-bind-now.$(OBJEXT) \
-	daemon/pulseaudio-main.$(OBJEXT) $(am__objects_24)
+	daemon/pulseaudio-main.$(OBJEXT) $(am__objects_28)
 pulseaudio_OBJECTS = $(am_pulseaudio_OBJECTS)
 pulseaudio_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(pulseaudio_CFLAGS) \
@@ -2444,6 +2522,15 @@ smoother_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 smoother_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(smoother_test_CFLAGS) \
 	$(CFLAGS) $(smoother_test_LDFLAGS) $(LDFLAGS) -o $@
+am_srbchannel_test_OBJECTS =  \
+	tests/srbchannel_test-srbchannel-test.$(OBJEXT)
+srbchannel_test_OBJECTS = $(am_srbchannel_test_OBJECTS)
+srbchannel_test_DEPENDENCIES = $(am__DEPENDENCIES_2) libpulse.la \
+	libpulsecommon- at PA_MAJORMINOR@.la
+srbchannel_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(srbchannel_test_CFLAGS) $(CFLAGS) $(srbchannel_test_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_stripnul_OBJECTS = tests/stripnul-stripnul.$(OBJEXT)
 stripnul_OBJECTS = $(am_stripnul_OBJECTS)
 stripnul_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -2577,6 +2664,7 @@ SOURCES = $(libalsa_util_la_SOURCES) $(libavahi_wrap_la_SOURCES) \
 	$(nodist_libpulsecore_ at PA_MAJORMINOR@_la_SOURCES) \
 	$(libpulsecore_foreign_la_SOURCES) \
 	$(libpulsecore_mix_neon_la_SOURCES) \
+	$(libpulsecore_remap_neon_la_SOURCES) \
 	$(libpulsecore_sconv_neon_la_SOURCES) \
 	$(libpulsedsp_la_SOURCES) $(libraop_la_SOURCES) \
 	$(librtp_la_SOURCES) $(libwebrtc_util_la_SOURCES) \
@@ -2666,18 +2754,19 @@ SOURCES = $(libalsa_util_la_SOURCES) $(libavahi_wrap_la_SOURCES) \
 	$(alsa_mixer_path_test_SOURCES) $(alsa_time_test_SOURCES) \
 	$(asyncmsgq_test_SOURCES) $(asyncq_test_SOURCES) \
 	$(channelmap_test_SOURCES) $(close_test_SOURCES) \
-	$(connect_stress_SOURCES) $(cpu_test_SOURCES) \
-	$(cpulimit_test_SOURCES) $(cpulimit_test2_SOURCES) \
-	$(echo_cancel_test_SOURCES) $(nodist_echo_cancel_test_SOURCES) \
-	$(extended_test_SOURCES) $(flist_test_SOURCES) \
-	$(format_test_SOURCES) $(gconf_helper_SOURCES) \
-	$(get_binary_name_test_SOURCES) $(gtk_test_SOURCES) \
-	$(hook_list_test_SOURCES) $(interpol_test_SOURCES) \
-	$(ipacl_test_SOURCES) $(lo_latency_test_SOURCES) \
-	$(lock_autospawn_test_SOURCES) $(mainloop_test_SOURCES) \
-	$(mainloop_test_glib_SOURCES) $(mcalign_test_SOURCES) \
-	$(memblock_test_SOURCES) $(memblockq_test_SOURCES) \
-	$(mix_special_test_SOURCES) $(mix_test_SOURCES) \
+	$(connect_stress_SOURCES) $(cpu_mix_test_SOURCES) \
+	$(cpu_remap_test_SOURCES) $(cpu_sconv_test_SOURCES) \
+	$(cpu_volume_test_SOURCES) $(cpulimit_test_SOURCES) \
+	$(cpulimit_test2_SOURCES) $(echo_cancel_test_SOURCES) \
+	$(nodist_echo_cancel_test_SOURCES) $(extended_test_SOURCES) \
+	$(flist_test_SOURCES) $(format_test_SOURCES) \
+	$(gconf_helper_SOURCES) $(get_binary_name_test_SOURCES) \
+	$(gtk_test_SOURCES) $(hook_list_test_SOURCES) \
+	$(interpol_test_SOURCES) $(ipacl_test_SOURCES) \
+	$(lo_latency_test_SOURCES) $(lock_autospawn_test_SOURCES) \
+	$(mainloop_test_SOURCES) $(mainloop_test_glib_SOURCES) \
+	$(mcalign_test_SOURCES) $(memblock_test_SOURCES) \
+	$(memblockq_test_SOURCES) $(mix_test_SOURCES) \
 	$(mult_s16_test_SOURCES) $(once_test_SOURCES) $(pacat_SOURCES) \
 	$(pacat_simple_SOURCES) $(pacmd_SOURCES) $(pactl_SOURCES) \
 	$(parec_simple_SOURCES) $(pasuspender_SOURCES) \
@@ -2686,14 +2775,14 @@ SOURCES = $(libalsa_util_la_SOURCES) $(libavahi_wrap_la_SOURCES) \
 	$(remix_test_SOURCES) $(resampler_test_SOURCES) \
 	$(rtpoll_test_SOURCES) $(rtstutter_SOURCES) \
 	$(sig2str_test_SOURCES) $(sigbus_test_SOURCES) \
-	$(smoother_test_SOURCES) $(stripnul_SOURCES) \
-	$(strlist_test_SOURCES) $(sync_playback_SOURCES) \
-	$(thread_mainloop_test_SOURCES) $(thread_test_SOURCES) \
-	$(usergroup_test_SOURCES) $(utf8_test_SOURCES) \
-	$(volume_test_SOURCES)
+	$(smoother_test_SOURCES) $(srbchannel_test_SOURCES) \
+	$(stripnul_SOURCES) $(strlist_test_SOURCES) \
+	$(sync_playback_SOURCES) $(thread_mainloop_test_SOURCES) \
+	$(thread_test_SOURCES) $(usergroup_test_SOURCES) \
+	$(utf8_test_SOURCES) $(volume_test_SOURCES)
 DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(libavahi_wrap_la_SOURCES) $(libbluez4_util_la_SOURCES) \
-	$(libbluez5_util_la_SOURCES) $(libcli_la_SOURCES) \
+	$(am__libbluez5_util_la_SOURCES_DIST) $(libcli_la_SOURCES) \
 	$(liblo_test_util_la_SOURCES) $(liboss_util_la_SOURCES) \
 	$(libprotocol_cli_la_SOURCES) \
 	$(am__libprotocol_esound_la_SOURCES_DIST) \
@@ -2706,6 +2795,7 @@ DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(am__libpulsecore_ at PA_MAJORMINOR@_la_SOURCES_DIST) \
 	$(libpulsecore_foreign_la_SOURCES) \
 	$(am__libpulsecore_mix_neon_la_SOURCES_DIST) \
+	$(am__libpulsecore_remap_neon_la_SOURCES_DIST) \
 	$(am__libpulsecore_sconv_neon_la_SOURCES_DIST) \
 	$(libpulsedsp_la_SOURCES) $(libraop_la_SOURCES) \
 	$(librtp_la_SOURCES) $(am__libwebrtc_util_la_SOURCES_DIST) \
@@ -2794,17 +2884,18 @@ DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(alsa_mixer_path_test_SOURCES) $(alsa_time_test_SOURCES) \
 	$(asyncmsgq_test_SOURCES) $(asyncq_test_SOURCES) \
 	$(channelmap_test_SOURCES) $(close_test_SOURCES) \
-	$(connect_stress_SOURCES) $(cpu_test_SOURCES) \
-	$(cpulimit_test_SOURCES) $(cpulimit_test2_SOURCES) \
-	$(am__echo_cancel_test_SOURCES_DIST) $(extended_test_SOURCES) \
-	$(flist_test_SOURCES) $(format_test_SOURCES) \
-	$(gconf_helper_SOURCES) $(get_binary_name_test_SOURCES) \
-	$(gtk_test_SOURCES) $(hook_list_test_SOURCES) \
-	$(interpol_test_SOURCES) $(ipacl_test_SOURCES) \
-	$(lo_latency_test_SOURCES) $(lock_autospawn_test_SOURCES) \
-	$(mainloop_test_SOURCES) $(mainloop_test_glib_SOURCES) \
-	$(mcalign_test_SOURCES) $(memblock_test_SOURCES) \
-	$(memblockq_test_SOURCES) $(mix_special_test_SOURCES) \
+	$(connect_stress_SOURCES) $(cpu_mix_test_SOURCES) \
+	$(cpu_remap_test_SOURCES) $(cpu_sconv_test_SOURCES) \
+	$(cpu_volume_test_SOURCES) $(cpulimit_test_SOURCES) \
+	$(cpulimit_test2_SOURCES) $(am__echo_cancel_test_SOURCES_DIST) \
+	$(extended_test_SOURCES) $(flist_test_SOURCES) \
+	$(format_test_SOURCES) $(gconf_helper_SOURCES) \
+	$(get_binary_name_test_SOURCES) $(gtk_test_SOURCES) \
+	$(hook_list_test_SOURCES) $(interpol_test_SOURCES) \
+	$(ipacl_test_SOURCES) $(lo_latency_test_SOURCES) \
+	$(lock_autospawn_test_SOURCES) $(mainloop_test_SOURCES) \
+	$(mainloop_test_glib_SOURCES) $(mcalign_test_SOURCES) \
+	$(memblock_test_SOURCES) $(memblockq_test_SOURCES) \
 	$(mix_test_SOURCES) $(mult_s16_test_SOURCES) \
 	$(once_test_SOURCES) $(pacat_SOURCES) $(pacat_simple_SOURCES) \
 	$(pacmd_SOURCES) $(pactl_SOURCES) $(parec_simple_SOURCES) \
@@ -2814,10 +2905,11 @@ DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
 	$(resampler_test_SOURCES) $(rtpoll_test_SOURCES) \
 	$(rtstutter_SOURCES) $(sig2str_test_SOURCES) \
 	$(sigbus_test_SOURCES) $(smoother_test_SOURCES) \
-	$(stripnul_SOURCES) $(strlist_test_SOURCES) \
-	$(sync_playback_SOURCES) $(thread_mainloop_test_SOURCES) \
-	$(thread_test_SOURCES) $(usergroup_test_SOURCES) \
-	$(utf8_test_SOURCES) $(volume_test_SOURCES)
+	$(srbchannel_test_SOURCES) $(stripnul_SOURCES) \
+	$(strlist_test_SOURCES) $(sync_playback_SOURCES) \
+	$(thread_mainloop_test_SOURCES) $(thread_test_SOURCES) \
+	$(usergroup_test_SOURCES) $(utf8_test_SOURCES) \
+	$(volume_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -2845,7 +2937,6 @@ am__dist_alsapaths_DATA_DIST =  \
 	modules/alsa/mixer/paths/analog-output-speaker.conf \
 	modules/alsa/mixer/paths/analog-output-speaker-always.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-lineout.conf \
@@ -2854,10 +2945,13 @@ am__dist_alsapaths_DATA_DIST =  \
 	modules/alsa/mixer/paths/hdmi-output-0.conf \
 	modules/alsa/mixer/paths/hdmi-output-1.conf \
 	modules/alsa/mixer/paths/hdmi-output-2.conf \
-	modules/alsa/mixer/paths/hdmi-output-3.conf
+	modules/alsa/mixer/paths/hdmi-output-3.conf \
+	modules/alsa/mixer/paths/hdmi-output-4.conf \
+	modules/alsa/mixer/paths/hdmi-output-5.conf \
+	modules/alsa/mixer/paths/hdmi-output-6.conf \
+	modules/alsa/mixer/paths/hdmi-output-7.conf
 am__dist_alsaprofilesets_DATA_DIST =  \
 	modules/alsa/mixer/profile-sets/default.conf \
-	modules/alsa/mixer/profile-sets/extra-hdmi.conf \
 	modules/alsa/mixer/profile-sets/force-speaker.conf \
 	modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf \
 	modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
@@ -2873,9 +2967,9 @@ am__dist_udevrules_DATA_DIST =  \
 	modules/alsa/mixer/profile-sets/90-pulseaudio.rules
 DATA = $(dbuspolicy_DATA) $(dist_alsapaths_DATA) \
 	$(dist_alsaprofilesets_DATA) $(dist_udevrules_DATA) \
-	$(pulseconf_DATA) $(xdgautostart_DATA)
+	$(pulseconf_DATA) $(systemduserunit_DATA) $(xdgautostart_DATA)
 am__pulseinclude_HEADERS_DIST = pulse/cdecl.h pulse/channelmap.h \
-	pulse/context.h pulse/def.h pulse/error.h \
+	pulse/context.h pulse/def.h pulse/direction.h pulse/error.h \
 	pulse/ext-device-manager.h pulse/ext-device-restore.h \
 	pulse/ext-stream-restore.h pulse/format.h pulse/gccmacro.h \
 	pulse/introspect.h pulse/mainloop-api.h \
@@ -3098,6 +3192,8 @@ AUTOMAKE = @AUTOMAKE@
 AVAHI_CFLAGS = @AVAHI_CFLAGS@
 AVAHI_LIBS = @AVAHI_LIBS@
 AWK = @AWK@
+BLUEZ_CFLAGS = @BLUEZ_CFLAGS@
+BLUEZ_LIBS = @BLUEZ_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -3145,13 +3241,16 @@ HAVE_AVAHI = @HAVE_AVAHI@
 HAVE_BLUEZ = @HAVE_BLUEZ@
 HAVE_BLUEZ_4 = @HAVE_BLUEZ_4@
 HAVE_BLUEZ_5 = @HAVE_BLUEZ_5@
+HAVE_BLUEZ_5_NATIVE_HEADSET = @HAVE_BLUEZ_5_NATIVE_HEADSET@
+HAVE_BLUEZ_5_OFONO_HEADSET = @HAVE_BLUEZ_5_OFONO_HEADSET@
 HAVE_DBUS = @HAVE_DBUS@
 HAVE_GLIB20 = @HAVE_GLIB20@
 HAVE_MKFIFO = @HAVE_MKFIFO@
 HAVE_NEON = @HAVE_NEON@
 HAVE_OSS_OUTPUT = @HAVE_OSS_OUTPUT@
-HAVE_SYSTEMD = @HAVE_SYSTEMD@
+HAVE_SYSTEMD_DAEMON = @HAVE_SYSTEMD_DAEMON@
 HAVE_SYSTEMD_JOURNAL = @HAVE_SYSTEMD_JOURNAL@
+HAVE_SYSTEMD_LOGIN = @HAVE_SYSTEMD_LOGIN@
 HAVE_SYS_RESOURCE_H = @HAVE_SYS_RESOURCE_H@
 HAVE_UDEV = @HAVE_UDEV@
 HAVE_WAVEOUT = @HAVE_WAVEOUT@
@@ -3174,8 +3273,6 @@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JACK_CFLAGS = @JACK_CFLAGS@
 JACK_LIBS = @JACK_LIBS@
-JOURNAL_CFLAGS = @JOURNAL_CFLAGS@
-JOURNAL_LIBS = @JOURNAL_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBASYNCNS_CFLAGS = @LIBASYNCNS_CFLAGS@
@@ -3242,6 +3339,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PA_ACCESS_GROUP = @PA_ACCESS_GROUP@
 PA_API_VERSION = @PA_API_VERSION@
 PA_BINARY = @PA_BINARY@
+PA_DEFAULT_AUTOSPAWN = @PA_DEFAULT_AUTOSPAWN@
 PA_DEFAULT_CONFIG_DIR = @PA_DEFAULT_CONFIG_DIR@
 PA_DLSEARCHPATH = @PA_DLSEARCHPATH@
 PA_INCDIR = @PA_INCDIR@
@@ -3275,6 +3373,12 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STOW = @STOW@
 STRIP = @STRIP@
+SYSTEMDDAEMON_CFLAGS = @SYSTEMDDAEMON_CFLAGS@
+SYSTEMDDAEMON_LIBS = @SYSTEMDDAEMON_LIBS@
+SYSTEMDJOURNAL_CFLAGS = @SYSTEMDJOURNAL_CFLAGS@
+SYSTEMDJOURNAL_LIBS = @SYSTEMDJOURNAL_LIBS@
+SYSTEMDLOGIN_CFLAGS = @SYSTEMDLOGIN_CFLAGS@
+SYSTEMDLOGIN_LIBS = @SYSTEMDLOGIN_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TDB_CFLAGS = @TDB_CFLAGS@
@@ -3347,11 +3451,13 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemduserunitdir = @systemduserunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udevrulesdir = @udevrulesdir@
+zshcompletiondir = @zshcompletiondir@
 pulseincludedir = $(includedir)/pulse
 pulsecoreincludedir = $(includedir)/pulsecore
 pulselibexecdir = $(libexecdir)/pulse
@@ -3368,10 +3474,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/modules \
 	-I$(top_builddir)/src/modules \
 	-DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
-	-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
+	-DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\" \
+	-DPA_SRCDIR=\"$(abs_srcdir)\" \
+	-DPA_BUILDDIR=\"$(abs_builddir)\"
 
-AM_CFLAGS = $(PTHREAD_CFLAGS) -DPA_SRCDIR=\"$(abs_srcdir)\" \
-	-DPA_BUILDDIR=\"$(abs_builddir)\" $(am__append_1)
+AM_CFLAGS = $(PTHREAD_CFLAGS) $(am__append_1)
 AM_CXXFLAGS = $(AM_CFLAGS) $(am__append_2)
 SERVER_CFLAGS = -D__INCLUDED_FROM_PULSE_AUDIO
 AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
@@ -3390,9 +3497,10 @@ MODULE_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_
 EXTRA_DIST = pulse/client.conf.in pulse/version.h.in \
 	daemon/daemon.conf.in daemon/default.pa.in daemon/system.pa.in \
 	depmod.py daemon/esdcompat.in daemon/start-pulseaudio-x11.in \
-	daemon/start-pulseaudio-kde.in utils/padsp.in utils/qpaeq \
-	modules/module-defs.h.m4 daemon/pulseaudio.desktop.in \
-	daemon/pulseaudio-kde.desktop.in map-file \
+	daemon/systemd/user/pulseaudio.service.in \
+	daemon/systemd/user/pulseaudio.socket utils/padsp.in \
+	utils/qpaeq modules/module-defs.h.m4 \
+	daemon/pulseaudio.desktop.in map-file \
 	daemon/pulseaudio-system.conf \
 	modules/echo-cancel/adrian-license.txt $(addsuffix \
 	.orc,$(ORC_SOURCE)) $(SYMDEF_FILES)
@@ -3406,8 +3514,7 @@ pulseconf_DATA = \
 @HAVE_DBUS_TRUE@		daemon/pulseaudio-system.conf
 
 @HAVE_X11_TRUE at xdgautostart_in_files = \
- at HAVE_X11_TRUE@		daemon/pulseaudio.desktop.in \
- at HAVE_X11_TRUE@		daemon/pulseaudio-kde.desktop.in
+ at HAVE_X11_TRUE@		daemon/pulseaudio.desktop.in
 
 @HAVE_X11_TRUE at xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
 
@@ -3419,8 +3526,8 @@ BUILT_SOURCES = $(am__append_6) $(SYMDEF_FILES) builddirs
 ###################################
 #        Some minor stuff         #
 ###################################
-CLEANFILES = $(am__append_7) $(am__append_44) \
-	daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop
+CLEANFILES = $(am__append_7) $(am__append_48) \
+	daemon/pulseaudio.desktop
 @HAVE_ORC_TRUE at ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE))
 @HAVE_ORC_TRUE at ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE))
 @HAVE_ORC_TRUE at orcc_v_gen = $(orcc_v_gen_$(V))
@@ -3429,13 +3536,14 @@ CLEANFILES = $(am__append_7) $(am__append_44) \
 @HAVE_ORC_TRUE at cp_v_gen = $(cp_v_gen_$(V))
 @HAVE_ORC_TRUE at cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY))
 @HAVE_ORC_TRUE at cp_v_gen_0 = @echo "  CP     $@";
-ORC_SOURCE = pulsecore/svolume $(am__append_118)
+ORC_SOURCE = pulsecore/svolume $(am__append_128)
 pulseaudio_SOURCES = daemon/caps.c daemon/caps.h daemon/cmdline.c \
 	daemon/cmdline.h daemon/cpulimit.c daemon/cpulimit.h \
 	daemon/daemon-conf.c daemon/daemon-conf.h daemon/dumpmodules.c \
 	daemon/dumpmodules.h daemon/ltdl-bind-now.c \
 	daemon/ltdl-bind-now.h daemon/main.c $(am__append_9)
-pulseaudio_CFLAGS = $(AM_CFLAGS) $(CAP_CFLAGS) $(am__append_8)
+pulseaudio_CFLAGS = $(AM_CFLAGS) $(CAP_CFLAGS) $(am__append_8) \
+	$(am__append_11)
 pulseaudio_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la \
 	libpulsecommon- at PA_MAJORMINOR@.la libpulse.la $(LIBLTDL) \
 	$(CAP_LIBS) $(am__append_10)
@@ -3443,14 +3551,20 @@ pulseaudio_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la \
 pulseaudio_DEPENDENCIES = libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la $(PREOPEN_LIBS)
 @PREOPEN_MODS_FALSE at PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
 @PREOPEN_MODS_TRUE at PREOPEN_LIBS = $(PREOPEN_MODS)
- at FORCE_PREOPEN_FALSE@pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(IMMEDIATE_LDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
- at FORCE_PREOPEN_TRUE@pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(IMMEDIATE_LDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
+ at FORCE_PREOPEN_FALSE@pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) \
+ at FORCE_PREOPEN_FALSE@	$(IMMEDIATE_LDFLAGS) -dlopen force \
+ at FORCE_PREOPEN_FALSE@	$(foreach f,$(PREOPEN_LIBS),-dlopen $(f)) \
+ at FORCE_PREOPEN_FALSE@	$(am__append_12)
+ at FORCE_PREOPEN_TRUE@pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) \
+ at FORCE_PREOPEN_TRUE@	$(IMMEDIATE_LDFLAGS) -dlpreopen force \
+ at FORCE_PREOPEN_TRUE@	$(foreach f,$(PREOPEN_LIBS),-dlpreopen \
+ at FORCE_PREOPEN_TRUE@	$(f)) $(am__append_12)
 
 ###################################
 #       Utility programs          #
 ###################################
-bin_SCRIPTS = esdcompat $(am__append_14) $(am__append_43) \
-	$(am__append_102)
+bin_SCRIPTS = esdcompat $(am__append_16) $(am__append_47) \
+	$(am__append_112)
 pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
 pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -3471,26 +3585,30 @@ pax11publish_SOURCES = utils/pax11publish.c
 pax11publish_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
 pax11publish_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la $(X11_LIBS)
 pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+ at HAVE_SYSTEMD_DAEMON_TRUE@systemduserunit_DATA = \
+ at HAVE_SYSTEMD_DAEMON_TRUE@    pulseaudio.service \
+ at HAVE_SYSTEMD_DAEMON_TRUE@    daemon/systemd/user/pulseaudio.socket
+
 
 ###################################
 #         Test programs           #
 ###################################
 
 # We split the foreign code off to not be annoyed by warnings we don't care about
-noinst_LTLIBRARIES = liblo-test-util.la $(am__append_45) \
+noinst_LTLIBRARIES = liblo-test-util.la $(am__append_49) \
 	libpulsecore-foreign.la
 TESTS_default = mainloop-test strlist-test close-test memblockq-test \
 	channelmap-test thread-mainloop-test utf8-test format-test \
 	get-binary-name-test hook-list-test memblock-test asyncq-test \
 	asyncmsgq-test queue-test rtpoll-test resampler-test \
 	smoother-test thread-test volume-test mix-test proplist-test \
-	cpu-test lock-autospawn-test mult-s16-test mix-special-test \
-	$(am__append_15) $(am__append_16) $(am__append_18) \
-	$(am__append_21)
+	cpu-mix-test cpu-remap-test cpu-sconv-test cpu-volume-test \
+	lock-autospawn-test mult-s16-test $(am__append_17) \
+	$(am__append_18) $(am__append_20) $(am__append_23)
 TESTS_norun = ipacl-test mcalign-test pacat-simple parec-simple \
 	flist-test remix-test rtstutter sig2str-test stripnul \
-	echo-cancel-test lo-latency-test $(am__append_17) \
-	$(am__append_19) $(am__append_20)
+	echo-cancel-test lo-latency-test $(am__append_19) \
+	$(am__append_21) $(am__append_22)
 
 # These tests need a running pulseaudio daemon
 TESTS_daemon = \
@@ -3517,6 +3635,10 @@ format_test_SOURCES = tests/format-test.c
 format_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 format_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
 format_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+srbchannel_test_SOURCES = tests/srbchannel-test.c
+srbchannel_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+srbchannel_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+srbchannel_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 get_binary_name_test_SOURCES = tests/get-binary-name-test.c
 get_binary_name_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 get_binary_name_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
@@ -3641,18 +3763,26 @@ proplist_test_SOURCES = tests/proplist-test.c
 proplist_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
 proplist_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 proplist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
-cpu_test_SOURCES = tests/cpu-test.c tests/runtime-test-util.h
-cpu_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
-cpu_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
-cpu_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+cpu_mix_test_SOURCES = tests/cpu-mix-test.c tests/runtime-test-util.h
+cpu_mix_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+cpu_mix_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+cpu_mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+cpu_remap_test_SOURCES = tests/cpu-remap-test.c tests/runtime-test-util.h
+cpu_remap_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+cpu_remap_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+cpu_remap_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+cpu_sconv_test_SOURCES = tests/cpu-sconv-test.c tests/runtime-test-util.h
+cpu_sconv_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+cpu_sconv_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+cpu_sconv_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+cpu_volume_test_SOURCES = tests/cpu-volume-test.c tests/runtime-test-util.h
+cpu_volume_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+cpu_volume_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+cpu_volume_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 mult_s16_test_SOURCES = tests/mult-s16-test.c tests/runtime-test-util.h
 mult_s16_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
 mult_s16_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
 mult_s16_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
-mix_special_test_SOURCES = tests/mix-special-test.c tests/runtime-test-util.h
-mix_special_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
-mix_special_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
-mix_special_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
 rtstutter_SOURCES = tests/rtstutter.c
 rtstutter_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
 rtstutter_CFLAGS = $(AM_CFLAGS)
@@ -3730,10 +3860,11 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = pulse/client-conf.c \
 	pulsecore/core-rtclock.h pulsecore/core-util.c \
 	pulsecore/core-util.h pulsecore/creds.h pulsecore/dynarray.c \
 	pulsecore/dynarray.h pulsecore/endianmacros.h \
-	pulsecore/flist.c pulsecore/flist.h pulsecore/g711.c \
-	pulsecore/g711.h pulsecore/hashmap.c pulsecore/hashmap.h \
-	pulsecore/i18n.c pulsecore/i18n.h pulsecore/idxset.c \
-	pulsecore/idxset.h pulsecore/arpa-inet.c pulsecore/arpa-inet.h \
+	pulsecore/fdsem.c pulsecore/fdsem.h pulsecore/flist.c \
+	pulsecore/flist.h pulsecore/g711.c pulsecore/g711.h \
+	pulsecore/hashmap.c pulsecore/hashmap.h pulsecore/i18n.c \
+	pulsecore/i18n.h pulsecore/idxset.c pulsecore/idxset.h \
+	pulsecore/arpa-inet.c pulsecore/arpa-inet.h \
 	pulsecore/iochannel.c pulsecore/iochannel.h pulsecore/ioline.c \
 	pulsecore/ioline.h pulsecore/ipacl.c pulsecore/ipacl.h \
 	pulsecore/llist.h pulsecore/lock-autospawn.c \
@@ -3753,6 +3884,7 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = pulse/client-conf.c \
 	pulsecore/pstream-util.h pulsecore/pstream.c \
 	pulsecore/pstream.h pulsecore/queue.c pulsecore/queue.h \
 	pulsecore/random.c pulsecore/random.h pulsecore/refcnt.h \
+	pulsecore/srbchannel.c pulsecore/srbchannel.h \
 	pulsecore/sample-util.c pulsecore/sample-util.h \
 	pulsecore/shm.c pulsecore/shm.h pulsecore/bitset.c \
 	pulsecore/bitset.h pulsecore/socket-client.c \
@@ -3766,27 +3898,29 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = pulse/client-conf.c \
 	pulsecore/time-smoother.h pulsecore/tokenizer.c \
 	pulsecore/tokenizer.h pulsecore/usergroup.c \
 	pulsecore/usergroup.h pulsecore/sndfile-util.c \
-	pulsecore/sndfile-util.h pulsecore/socket.h $(am__append_22) \
-	$(am__append_23) $(am__append_24) $(am__append_29) \
-	$(am__append_30) $(am__append_32) $(am__append_35) \
-	$(am__append_36)
+	pulsecore/sndfile-util.h pulsecore/socket.h $(am__append_24) \
+	$(am__append_25) $(am__append_26) $(am__append_33) \
+	$(am__append_34) $(am__append_36) $(am__append_39) \
+	$(am__append_40)
 
 # proplist-util.h uses these header files, but not the library itself!
 libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) \
-	$(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS) $(am__append_25) \
-	$(am__append_27) $(GLIB20_CFLAGS) $(GTK30_CFLAGS) \
-	$(am__append_31) $(am__append_33) $(am__append_37)
+	$(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS) $(am__append_27) \
+	$(am__append_29) $(am__append_31) $(GLIB20_CFLAGS) \
+	$(GTK30_CFLAGS) $(am__append_35) $(am__append_37) \
+	$(am__append_41)
 libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) \
-	-avoid-version $(am__append_26) $(am__append_28)
+	-avoid-version $(am__append_28) $(am__append_30) \
+	$(am__append_32)
 libpulsecommon_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) \
 	$(LIBJSON_LIBS) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
-	$(LIBSNDFILE_LIBS) $(am__append_34) $(am__append_38)
+	$(LIBSNDFILE_LIBS) $(am__append_38) $(am__append_42)
 
 ###################################
 #         Client library          #
 ###################################
 pulseinclude_HEADERS = pulse/cdecl.h pulse/channelmap.h \
-	pulse/context.h pulse/def.h pulse/error.h \
+	pulse/context.h pulse/def.h pulse/direction.h pulse/error.h \
 	pulse/ext-device-manager.h pulse/ext-device-restore.h \
 	pulse/ext-stream-restore.h pulse/format.h pulse/gccmacro.h \
 	pulse/introspect.h pulse/mainloop-api.h \
@@ -3795,12 +3929,12 @@ pulseinclude_HEADERS = pulse/cdecl.h pulse/channelmap.h \
 	pulse/sample.h pulse/scache.h pulse/simple.h pulse/stream.h \
 	pulse/subscribe.h pulse/thread-mainloop.h pulse/timeval.h \
 	pulse/utf8.h pulse/util.h pulse/version.h pulse/volume.h \
-	pulse/xmalloc.h $(am__append_39)
+	pulse/xmalloc.h $(am__append_43)
 
 ###################################
 #      Daemon core library        #
 ###################################
-lib_LTLIBRARIES = libpulse.la libpulse-simple.la $(am__append_40) \
+lib_LTLIBRARIES = libpulse.la libpulse-simple.la $(am__append_44) \
 	libpulsecore- at PA_MAJORMINOR@.la
 
 # Public interface
@@ -3809,6 +3943,7 @@ libpulse_la_SOURCES = \
 		pulse/channelmap.c pulse/channelmap.h \
 		pulse/context.c pulse/context.h \
 		pulse/def.h \
+		pulse/direction.c pulse/direction.h \
 		pulse/error.c pulse/error.h \
 		pulse/ext-device-manager.c pulse/ext-device-manager.h \
 		pulse/ext-device-restore.c pulse/ext-device-restore.h \
@@ -3835,10 +3970,10 @@ libpulse_la_SOURCES = \
 		pulse/volume.c pulse/volume.h \
 		pulse/xmalloc.c pulse/xmalloc.h
 
-libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(am__append_41)
+libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(am__append_45)
 libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) \
 	$(LIBJSON_LIBS) libpulsecommon- at PA_MAJORMINOR@.la \
-	$(am__append_42)
+	$(am__append_46)
 libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
 libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
 libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
@@ -3871,27 +4006,28 @@ libpulsecore_ at PA_MAJORMINOR@_la_SOURCES = pulsecore/asyncmsgq.c \
 	pulsecore/client.h pulsecore/card.c pulsecore/card.h \
 	pulsecore/core-scache.c pulsecore/core-scache.h \
 	pulsecore/core-subscribe.c pulsecore/core-subscribe.h \
-	pulsecore/core.c pulsecore/core.h pulsecore/fdsem.c \
-	pulsecore/fdsem.h pulsecore/hook-list.c pulsecore/hook-list.h \
-	pulsecore/ltdl-helper.c pulsecore/ltdl-helper.h \
-	pulsecore/modargs.c pulsecore/modargs.h pulsecore/modinfo.c \
-	pulsecore/modinfo.h pulsecore/module.c pulsecore/module.h \
-	pulsecore/msgobject.c pulsecore/msgobject.h \
-	pulsecore/namereg.c pulsecore/namereg.h pulsecore/object.c \
-	pulsecore/object.h pulsecore/play-memblockq.c \
-	pulsecore/play-memblockq.h pulsecore/play-memchunk.c \
-	pulsecore/play-memchunk.h pulsecore/remap.c pulsecore/remap.h \
-	pulsecore/remap_mmx.c pulsecore/remap_sse.c \
-	pulsecore/resampler.c pulsecore/resampler.h pulsecore/rtpoll.c \
-	pulsecore/rtpoll.h pulsecore/stream-util.c \
+	pulsecore/core.c pulsecore/core.h pulsecore/hook-list.c \
+	pulsecore/hook-list.h pulsecore/ltdl-helper.c \
+	pulsecore/ltdl-helper.h pulsecore/modargs.c \
+	pulsecore/modargs.h pulsecore/modinfo.c pulsecore/modinfo.h \
+	pulsecore/module.c pulsecore/module.h pulsecore/msgobject.c \
+	pulsecore/msgobject.h pulsecore/namereg.c pulsecore/namereg.h \
+	pulsecore/object.c pulsecore/object.h \
+	pulsecore/play-memblockq.c pulsecore/play-memblockq.h \
+	pulsecore/play-memchunk.c pulsecore/play-memchunk.h \
+	pulsecore/remap.c pulsecore/remap.h pulsecore/remap_mmx.c \
+	pulsecore/remap_sse.c pulsecore/resampler.c \
+	pulsecore/resampler.h pulsecore/resampler/ffmpeg.c \
+	pulsecore/resampler/peaks.c pulsecore/resampler/trivial.c \
+	pulsecore/rtpoll.c pulsecore/rtpoll.h pulsecore/stream-util.c \
 	pulsecore/stream-util.h pulsecore/mix.c pulsecore/mix.h \
-	pulsecore/cpu.h pulsecore/cpu-arm.c pulsecore/cpu-arm.h \
-	pulsecore/cpu-x86.c pulsecore/cpu-x86.h pulsecore/cpu-orc.c \
-	pulsecore/cpu-orc.h pulsecore/sconv-s16be.c \
-	pulsecore/sconv-s16be.h pulsecore/sconv-s16le.c \
-	pulsecore/sconv-s16le.h pulsecore/sconv_sse.c \
-	pulsecore/sconv.c pulsecore/sconv.h pulsecore/shared.c \
-	pulsecore/shared.h pulsecore/sink-input.c \
+	pulsecore/cpu.c pulsecore/cpu.h pulsecore/cpu-arm.c \
+	pulsecore/cpu-arm.h pulsecore/cpu-x86.c pulsecore/cpu-x86.h \
+	pulsecore/cpu-orc.c pulsecore/cpu-orc.h \
+	pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \
+	pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \
+	pulsecore/sconv_sse.c pulsecore/sconv.c pulsecore/sconv.h \
+	pulsecore/shared.c pulsecore/shared.h pulsecore/sink-input.c \
 	pulsecore/sink-input.h pulsecore/sink.c pulsecore/sink.h \
 	pulsecore/device-port.c pulsecore/device-port.h \
 	pulsecore/sioman.c pulsecore/sioman.h \
@@ -3900,26 +4036,28 @@ libpulsecore_ at PA_MAJORMINOR@_la_SOURCES = pulsecore/asyncmsgq.c \
 	pulsecore/source-output.c pulsecore/source-output.h \
 	pulsecore/source.c pulsecore/source.h pulsecore/start-child.c \
 	pulsecore/start-child.h pulsecore/thread-mq.c \
-	pulsecore/thread-mq.h pulsecore/database.h $(am__append_47) \
-	$(am__append_50) $(am__append_53) $(am__append_56) \
-	$(am__append_59) $(am__append_62)
+	pulsecore/thread-mq.h pulsecore/database.h $(am__append_51) \
+	$(am__append_54) $(am__append_57) $(am__append_60) \
+	$(am__append_63) $(am__append_66) $(am__append_67) \
+	$(am__append_70)
 libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
-	$(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) \
-	$(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) $(am__append_48) \
-	$(am__append_51) $(am__append_54) $(am__append_57) \
-	$(am__append_60)
+	$(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) $(am__append_52) \
+	$(am__append_55) $(am__append_58) $(am__append_61) \
+	$(am__append_64) $(am__append_68) $(am__append_71)
 libpulsecore_ at PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
-	$(am__append_52)
+	$(am__append_56)
 libpulsecore_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) \
-	$(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) \
-	$(WINSOCK_LIBS) $(LTLIBICONV) \
+	$(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
 	libpulsecommon- at PA_MAJORMINOR@.la libpulse.la \
-	libpulsecore-foreign.la $(am__append_46) $(am__append_49) \
-	$(am__append_55) $(am__append_58) $(am__append_61)
+	libpulsecore-foreign.la $(am__append_50) $(am__append_53) \
+	$(am__append_59) $(am__append_62) $(am__append_65) \
+	$(am__append_69) $(am__append_72)
 @HAVE_NEON_TRUE at libpulsecore_sconv_neon_la_SOURCES = pulsecore/sconv_neon.c
 @HAVE_NEON_TRUE at libpulsecore_sconv_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
 @HAVE_NEON_TRUE at libpulsecore_mix_neon_la_SOURCES = pulsecore/mix_neon.c
 @HAVE_NEON_TRUE at libpulsecore_mix_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
+ at HAVE_NEON_TRUE@libpulsecore_remap_neon_la_SOURCES = pulsecore/remap_neon.c
+ at HAVE_NEON_TRUE@libpulsecore_remap_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
 @HAVE_ORC_TRUE at nodist_libpulsecore_@PA_MAJORMINOR at _la_SOURCES = pulsecore/svolume-orc-gen.c pulsecore/svolume-orc-gen.h
 libpulsecore_foreign_la_SOURCES = \
 		pulsecore/ffmpeg/resample2.c pulsecore/ffmpeg/avcodec.h pulsecore/ffmpeg/dsputil.h
@@ -3936,8 +4074,8 @@ libpulsecore_foreign_la_CFLAGS = $(AM_CFLAGS) $(FOREIGN_CFLAGS)
 ### the head, and not the other way!
 modlibexec_LTLIBRARIES = libcli.la libprotocol-cli.la \
 	libprotocol-simple.la libprotocol-http.la \
-	libprotocol-native.la $(am__append_63) $(am__append_64) \
-	$(am__append_65) $(am__append_66) $(am__append_69) \
+	libprotocol-native.la $(am__append_73) $(am__append_74) \
+	$(am__append_75) $(am__append_76) $(am__append_79) \
 	module-cli.la module-cli-protocol-tcp.la \
 	module-simple-protocol-tcp.la module-null-sink.la \
 	module-null-source.la module-sine-source.la module-detect.la \
@@ -3958,17 +4096,17 @@ modlibexec_LTLIBRARIES = libcli.la libprotocol-cli.la \
 	module-virtual-source.la module-virtual-surround-sink.la \
 	module-switch-on-connect.la module-switch-on-port-available.la \
 	module-filter-apply.la module-filter-heuristics.la \
-	module-role-ducking.la $(am__append_70) $(am__append_71) \
-	$(am__append_72) $(am__append_73) $(am__append_74) \
-	$(am__append_75) $(am__append_76) $(am__append_77) \
-	$(am__append_78) $(am__append_79) $(am__append_80) \
-	$(am__append_81) $(am__append_82) $(am__append_83) \
-	$(am__append_84) $(am__append_85) $(am__append_86) \
-	$(am__append_87) $(am__append_88) $(am__append_89) \
+	module-role-ducking.la $(am__append_80) $(am__append_81) \
+	$(am__append_82) $(am__append_83) $(am__append_84) \
+	$(am__append_85) $(am__append_86) $(am__append_87) \
+	$(am__append_88) $(am__append_89) $(am__append_90) \
 	$(am__append_91) $(am__append_92) $(am__append_93) \
 	$(am__append_94) $(am__append_95) $(am__append_96) \
 	$(am__append_97) $(am__append_98) $(am__append_99) \
-	$(am__append_100) $(am__append_101)
+	$(am__append_101) $(am__append_102) $(am__append_103) \
+	$(am__append_104) $(am__append_105) $(am__append_106) \
+	$(am__append_107) $(am__append_108) $(am__append_109) \
+	$(am__append_110) $(am__append_111)
 libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h
 libprotocol_simple_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la
@@ -3983,11 +4121,11 @@ libprotocol_http_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 libprotocol_http_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la
 libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h
 libprotocol_native_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
-	$(am__append_67)
+	$(am__append_77)
 libprotocol_native_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 libprotocol_native_la_LIBADD = $(AM_LIBADD) \
 	libpulsecore- at PA_MAJORMINOR@.la \
-	libpulsecommon- at PA_MAJORMINOR@.la libpulse.la $(am__append_68)
+	libpulsecommon- at PA_MAJORMINOR@.la libpulse.la $(am__append_78)
 @HAVE_ESOUND_TRUE at libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h
 @HAVE_ESOUND_TRUE at libprotocol_esound_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 @HAVE_ESOUND_TRUE at libprotocol_esound_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la
@@ -4015,7 +4153,6 @@ libavahi_wrap_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
 libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la
 @HAVE_ALSA_TRUE at dist_alsaprofilesets_DATA = \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/default.conf \
- at HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/extra-hdmi.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/force-speaker.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
@@ -4053,7 +4190,6 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore- at PA_MAJORMIN
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-speaker.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-speaker-always.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output.conf.common \
- at HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-headphones.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-headphones-2.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/analog-output-lineout.conf \
@@ -4062,7 +4198,11 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore- at PA_MAJORMIN
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-0.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-1.conf \
 @HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-2.conf \
- at HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-3.conf
+ at HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-3.conf \
+ at HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-4.conf \
+ at HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-5.conf \
+ at HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-6.conf \
+ at HAVE_ALSA_TRUE@		modules/alsa/mixer/paths/hdmi-output-7.conf
 
 
 # These are generated by an M4 script
@@ -4119,7 +4259,7 @@ SYMDEF_FILES = module-cli-symdef.h module-cli-protocol-tcp-symdef.h \
 	module-switch-on-connect-symdef.h \
 	module-switch-on-port-available-symdef.h \
 	module-filter-apply-symdef.h module-filter-heuristics-symdef.h \
-	$(am__append_103)
+	$(am__append_113)
 
 # Simple protocol
 module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
@@ -4254,10 +4394,10 @@ module_remap_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_remap_source_la_LIBADD = $(MODULE_LIBADD)
 module_ladspa_sink_la_SOURCES = modules/module-ladspa-sink.c modules/ladspa.h
 module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH=\"$(libdir)/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa\" \
-	$(AM_CFLAGS) $(SERVER_CFLAGS) $(am__append_104)
+	$(AM_CFLAGS) $(SERVER_CFLAGS) $(am__append_114)
 module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL) \
-	$(am__append_105)
+	$(am__append_115)
 module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c
 module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(DBUS_CFLAGS) $(FFTW_CFLAGS)
 module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -4341,12 +4481,12 @@ libalsa_util_la_SOURCES = modules/alsa/alsa-util.c \
 	modules/alsa/alsa-mixer.h modules/alsa/alsa-sink.c \
 	modules/alsa/alsa-sink.h modules/alsa/alsa-source.c \
 	modules/alsa/alsa-source.h modules/reserve-wrap.c \
-	modules/reserve-wrap.h $(am__append_106) $(am__append_109)
+	modules/reserve-wrap.h $(am__append_116) $(am__append_119)
 libalsa_util_la_LDFLAGS = -avoid-version
 libalsa_util_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) \
-	$(am__append_107) $(am__append_110)
+	$(am__append_117) $(am__append_120)
 libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
-	$(ASOUNDLIB_CFLAGS) $(am__append_108) $(am__append_111)
+	$(ASOUNDLIB_CFLAGS) $(am__append_118) $(am__append_121)
 module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c
 module_alsa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_alsa_sink_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
@@ -4453,15 +4593,15 @@ module_device_manager_la_CFLAGS = $(AM_CFLAGS)
 module_device_restore_la_SOURCES = modules/module-device-restore.c
 module_device_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_device_restore_la_LIBADD = $(MODULE_LIBADD) \
-	libprotocol-native.la $(am__append_112)
-module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_113)
+	libprotocol-native.la $(am__append_122)
+module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_123)
 
 # Stream volume/muted/device restore module
 module_stream_restore_la_SOURCES = modules/module-stream-restore.c
 module_stream_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_stream_restore_la_LIBADD = $(MODULE_LIBADD) \
-	libprotocol-native.la $(am__append_114)
-module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_115)
+	libprotocol-native.la $(am__append_124)
+module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_125)
 
 # Card profile restore module
 module_card_restore_la_SOURCES = modules/module-card-restore.c
@@ -4503,13 +4643,13 @@ module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS)
 module_echo_cancel_la_SOURCES =  \
 	modules/echo-cancel/module-echo-cancel.c \
 	modules/echo-cancel/null.c modules/echo-cancel/echo-cancel.h \
-	$(am__append_116) $(am__append_121)
+	$(am__append_126) $(am__append_131)
 module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS) \
-	$(am__append_119) $(am__append_123)
+	$(am__append_129) $(am__append_133)
 module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
-	$(LIBSPEEX_CFLAGS) $(am__append_117) $(am__append_120) \
-	$(am__append_122)
+	$(LIBSPEEX_CFLAGS) $(am__append_127) $(am__append_130) \
+	$(am__append_132)
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at nodist_module_echo_cancel_la_SOURCES = \
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@		modules/echo-cancel/adrian-aec-orc-gen.c \
 @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@		modules/echo-cancel/adrian-aec-orc-gen.h
@@ -4559,8 +4699,8 @@ module_console_kit_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
 module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 module_systemd_login_la_SOURCES = modules/module-systemd-login.c
 module_systemd_login_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_systemd_login_la_LIBADD = $(MODULE_LIBADD) $(SYSTEMD_LIBS)
-module_systemd_login_la_CFLAGS = $(AM_CFLAGS) $(SYSTEMD_CFLAGS)
+module_systemd_login_la_LIBADD = $(MODULE_LIBADD) $(SYSTEMD_LIBS) $(SYSTEMDLOGIN_LIBS)
+module_systemd_login_la_CFLAGS = $(AM_CFLAGS) $(SYSTEMD_CFLAGS) $(SYSTEMDLOGIN_CFLAGS)
 
 # GConf support
 module_gconf_la_SOURCES = modules/gconf/module-gconf.c
@@ -4603,11 +4743,10 @@ module_bluez4_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SBC_LIBS) libbl
 module_bluez4_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS)
 
 # Bluetooth BlueZ 5 sink / source
-libbluez5_util_la_SOURCES = \
-		modules/bluetooth/bluez5-util.c \
-		modules/bluetooth/bluez5-util.h \
-		modules/bluetooth/a2dp-codecs.h
-
+libbluez5_util_la_SOURCES = modules/bluetooth/bluez5-util.c \
+	modules/bluetooth/bluez5-util.h \
+	modules/bluetooth/a2dp-codecs.h $(am__append_134) \
+	$(am__append_135)
 libbluez5_util_la_LDFLAGS = -avoid-version
 libbluez5_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
 libbluez5_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
@@ -4635,7 +4774,7 @@ module_rygel_media_server_la_SOURCES = modules/module-rygel-media-server.c
 module_rygel_media_server_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_rygel_media_server_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libprotocol-http.la
 module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 start-pulseaudio-kde
+DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service
 @OS_IS_WIN32_FALSE at SYMLINK_PROGRAM = ln -sf
 @OS_IS_WIN32_TRUE at SYMLINK_PROGRAM = cd $(DESTDIR)$(bindir) && cp
 
@@ -4691,8 +4830,6 @@ esdcompat: $(top_builddir)/config.status $(top_srcdir)/src/daemon/esdcompat.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 start-pulseaudio-x11: $(top_builddir)/config.status $(top_srcdir)/src/daemon/start-pulseaudio-x11.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-start-pulseaudio-kde: $(top_builddir)/config.status $(top_srcdir)/src/daemon/start-pulseaudio-kde.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 client.conf: $(top_builddir)/config.status $(top_srcdir)/src/pulse/client.conf.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 daemon.conf: $(top_builddir)/config.status $(top_srcdir)/src/daemon/daemon.conf.in
@@ -4701,6 +4838,8 @@ default.pa: $(top_builddir)/config.status $(top_srcdir)/src/daemon/default.pa.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 system.pa: $(top_builddir)/config.status $(top_srcdir)/src/daemon/system.pa.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+pulseaudio.service: $(top_builddir)/config.status $(top_srcdir)/src/daemon/systemd/user/pulseaudio.service.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -4916,6 +5055,12 @@ libbluez4-util.la: $(libbluez4_util_la_OBJECTS) $(libbluez4_util_la_DEPENDENCIES
 modules/bluetooth/libbluez5_util_la-bluez5-util.lo:  \
 	modules/bluetooth/$(am__dirstamp) \
 	modules/bluetooth/$(DEPDIR)/$(am__dirstamp)
+modules/bluetooth/libbluez5_util_la-backend-ofono.lo:  \
+	modules/bluetooth/$(am__dirstamp) \
+	modules/bluetooth/$(DEPDIR)/$(am__dirstamp)
+modules/bluetooth/libbluez5_util_la-backend-native.lo:  \
+	modules/bluetooth/$(am__dirstamp) \
+	modules/bluetooth/$(DEPDIR)/$(am__dirstamp)
 
 libbluez5-util.la: $(libbluez5_util_la_OBJECTS) $(libbluez5_util_la_DEPENDENCIES) $(EXTRA_libbluez5_util_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libbluez5_util_la_LINK) $(am_libbluez5_util_la_rpath) $(libbluez5_util_la_OBJECTS) $(libbluez5_util_la_LIBADD) $(LIBS)
@@ -4993,6 +5138,8 @@ pulse/libpulse_la-channelmap.lo: pulse/$(am__dirstamp) \
 	pulse/$(DEPDIR)/$(am__dirstamp)
 pulse/libpulse_la-context.lo: pulse/$(am__dirstamp) \
 	pulse/$(DEPDIR)/$(am__dirstamp)
+pulse/libpulse_la-direction.lo: pulse/$(am__dirstamp) \
+	pulse/$(DEPDIR)/$(am__dirstamp)
 pulse/libpulse_la-error.lo: pulse/$(am__dirstamp) \
 	pulse/$(DEPDIR)/$(am__dirstamp)
 pulse/libpulse_la-ext-device-manager.lo: pulse/$(am__dirstamp) \
@@ -5078,6 +5225,8 @@ pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-core-util.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-dynarray.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
+pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.lo:  \
+	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-flist.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-g711.lo:  \
@@ -5136,6 +5285,8 @@ pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-queue.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-random.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
+pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.lo:  \
+	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-sample-util.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-shm.lo:  \
@@ -5221,8 +5372,6 @@ pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-core-subscribe.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-core.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
-pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.lo:  \
-	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-ltdl-helper.lo:  \
@@ -5251,12 +5400,29 @@ pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-remap_sse.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-resampler.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
+pulsecore/resampler/$(am__dirstamp):
+	@$(MKDIR_P) pulsecore/resampler
+	@: > pulsecore/resampler/$(am__dirstamp)
+pulsecore/resampler/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) pulsecore/resampler/$(DEPDIR)
+	@: > pulsecore/resampler/$(DEPDIR)/$(am__dirstamp)
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.lo:  \
+	pulsecore/resampler/$(am__dirstamp) \
+	pulsecore/resampler/$(DEPDIR)/$(am__dirstamp)
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-peaks.lo:  \
+	pulsecore/resampler/$(am__dirstamp) \
+	pulsecore/resampler/$(DEPDIR)/$(am__dirstamp)
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-trivial.lo:  \
+	pulsecore/resampler/$(am__dirstamp) \
+	pulsecore/resampler/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-rtpoll.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-stream-util.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-mix.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
+pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu.lo:  \
+	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu-x86.lo:  \
@@ -5307,6 +5473,12 @@ pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-tdb.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-simple.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-speex.lo:  \
+	pulsecore/resampler/$(am__dirstamp) \
+	pulsecore/resampler/$(DEPDIR)/$(am__dirstamp)
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.lo:  \
+	pulsecore/resampler/$(am__dirstamp) \
+	pulsecore/resampler/$(DEPDIR)/$(am__dirstamp)
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-svolume-orc-gen.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 
@@ -5329,6 +5501,11 @@ pulsecore/libpulsecore_mix_neon_la-mix_neon.lo:  \
 
 libpulsecore_mix_neon.la: $(libpulsecore_mix_neon_la_OBJECTS) $(libpulsecore_mix_neon_la_DEPENDENCIES) $(EXTRA_libpulsecore_mix_neon_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libpulsecore_mix_neon_la_LINK) $(am_libpulsecore_mix_neon_la_rpath) $(libpulsecore_mix_neon_la_OBJECTS) $(libpulsecore_mix_neon_la_LIBADD) $(LIBS)
+pulsecore/libpulsecore_remap_neon_la-remap_neon.lo:  \
+	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
+
+libpulsecore_remap_neon.la: $(libpulsecore_remap_neon_la_OBJECTS) $(libpulsecore_remap_neon_la_DEPENDENCIES) $(EXTRA_libpulsecore_remap_neon_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libpulsecore_remap_neon_la_LINK) $(am_libpulsecore_remap_neon_la_rpath) $(libpulsecore_remap_neon_la_OBJECTS) $(libpulsecore_remap_neon_la_LIBADD) $(LIBS)
 pulsecore/libpulsecore_sconv_neon_la-sconv_neon.lo:  \
 	pulsecore/$(am__dirstamp) pulsecore/$(DEPDIR)/$(am__dirstamp)
 
@@ -6125,12 +6302,30 @@ tests/connect_stress-connect-stress.$(OBJEXT): tests/$(am__dirstamp) \
 connect-stress$(EXEEXT): $(connect_stress_OBJECTS) $(connect_stress_DEPENDENCIES) $(EXTRA_connect_stress_DEPENDENCIES) 
 	@rm -f connect-stress$(EXEEXT)
 	$(AM_V_CCLD)$(connect_stress_LINK) $(connect_stress_OBJECTS) $(connect_stress_LDADD) $(LIBS)
-tests/cpu_test-cpu-test.$(OBJEXT): tests/$(am__dirstamp) \
+tests/cpu_mix_test-cpu-mix-test.$(OBJEXT): tests/$(am__dirstamp) \
+	tests/$(DEPDIR)/$(am__dirstamp)
+
+cpu-mix-test$(EXEEXT): $(cpu_mix_test_OBJECTS) $(cpu_mix_test_DEPENDENCIES) $(EXTRA_cpu_mix_test_DEPENDENCIES) 
+	@rm -f cpu-mix-test$(EXEEXT)
+	$(AM_V_CCLD)$(cpu_mix_test_LINK) $(cpu_mix_test_OBJECTS) $(cpu_mix_test_LDADD) $(LIBS)
+tests/cpu_remap_test-cpu-remap-test.$(OBJEXT): tests/$(am__dirstamp) \
+	tests/$(DEPDIR)/$(am__dirstamp)
+
+cpu-remap-test$(EXEEXT): $(cpu_remap_test_OBJECTS) $(cpu_remap_test_DEPENDENCIES) $(EXTRA_cpu_remap_test_DEPENDENCIES) 
+	@rm -f cpu-remap-test$(EXEEXT)
+	$(AM_V_CCLD)$(cpu_remap_test_LINK) $(cpu_remap_test_OBJECTS) $(cpu_remap_test_LDADD) $(LIBS)
+tests/cpu_sconv_test-cpu-sconv-test.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 
-cpu-test$(EXEEXT): $(cpu_test_OBJECTS) $(cpu_test_DEPENDENCIES) $(EXTRA_cpu_test_DEPENDENCIES) 
-	@rm -f cpu-test$(EXEEXT)
-	$(AM_V_CCLD)$(cpu_test_LINK) $(cpu_test_OBJECTS) $(cpu_test_LDADD) $(LIBS)
+cpu-sconv-test$(EXEEXT): $(cpu_sconv_test_OBJECTS) $(cpu_sconv_test_DEPENDENCIES) $(EXTRA_cpu_sconv_test_DEPENDENCIES) 
+	@rm -f cpu-sconv-test$(EXEEXT)
+	$(AM_V_CCLD)$(cpu_sconv_test_LINK) $(cpu_sconv_test_OBJECTS) $(cpu_sconv_test_LDADD) $(LIBS)
+tests/cpu_volume_test-cpu-volume-test.$(OBJEXT):  \
+	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
+
+cpu-volume-test$(EXEEXT): $(cpu_volume_test_OBJECTS) $(cpu_volume_test_DEPENDENCIES) $(EXTRA_cpu_volume_test_DEPENDENCIES) 
+	@rm -f cpu-volume-test$(EXEEXT)
+	$(AM_V_CCLD)$(cpu_volume_test_LINK) $(cpu_volume_test_OBJECTS) $(cpu_volume_test_LDADD) $(LIBS)
 tests/cpulimit_test-cpulimit-test.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 daemon/$(am__dirstamp):
@@ -6272,12 +6467,6 @@ tests/memblockq_test-memblockq-test.$(OBJEXT): tests/$(am__dirstamp) \
 memblockq-test$(EXEEXT): $(memblockq_test_OBJECTS) $(memblockq_test_DEPENDENCIES) $(EXTRA_memblockq_test_DEPENDENCIES) 
 	@rm -f memblockq-test$(EXEEXT)
 	$(AM_V_CCLD)$(memblockq_test_LINK) $(memblockq_test_OBJECTS) $(memblockq_test_LDADD) $(LIBS)
-tests/mix_special_test-mix-special-test.$(OBJEXT):  \
-	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-
-mix-special-test$(EXEEXT): $(mix_special_test_OBJECTS) $(mix_special_test_DEPENDENCIES) $(EXTRA_mix_special_test_DEPENDENCIES) 
-	@rm -f mix-special-test$(EXEEXT)
-	$(AM_V_CCLD)$(mix_special_test_LINK) $(mix_special_test_OBJECTS) $(mix_special_test_LDADD) $(LIBS)
 tests/mix_test-mix-test.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 
@@ -6412,6 +6601,12 @@ tests/smoother_test-smoother-test.$(OBJEXT): tests/$(am__dirstamp) \
 smoother-test$(EXEEXT): $(smoother_test_OBJECTS) $(smoother_test_DEPENDENCIES) $(EXTRA_smoother_test_DEPENDENCIES) 
 	@rm -f smoother-test$(EXEEXT)
 	$(AM_V_CCLD)$(smoother_test_LINK) $(smoother_test_OBJECTS) $(smoother_test_LDADD) $(LIBS)
+tests/srbchannel_test-srbchannel-test.$(OBJEXT):  \
+	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
+
+srbchannel-test$(EXEEXT): $(srbchannel_test_OBJECTS) $(srbchannel_test_DEPENDENCIES) $(EXTRA_srbchannel_test_DEPENDENCIES) 
+	@rm -f srbchannel-test$(EXEEXT)
+	$(AM_V_CCLD)$(srbchannel_test_LINK) $(srbchannel_test_OBJECTS) $(srbchannel_test_LDADD) $(LIBS)
 tests/stripnul-stripnul.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 
@@ -6531,6 +6726,8 @@ mostlyclean-compile:
 	-rm -f pulsecore/*.lo
 	-rm -f pulsecore/ffmpeg/*.$(OBJEXT)
 	-rm -f pulsecore/ffmpeg/*.lo
+	-rm -f pulsecore/resampler/*.$(OBJEXT)
+	-rm -f pulsecore/resampler/*.lo
 	-rm -f tests/*.$(OBJEXT)
 	-rm -f tests/*.lo
 	-rm -f utils/*.$(OBJEXT)
@@ -6628,6 +6825,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at modules/alsa/$(DEPDIR)/module_alsa_sink_la-module-alsa-sink.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at modules/alsa/$(DEPDIR)/module_alsa_source_la-module-alsa-source.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at modules/bluetooth/$(DEPDIR)/libbluez4_util_la-bluez4-util.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at modules/bluetooth/$(DEPDIR)/libbluez5_util_la-backend-native.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at modules/bluetooth/$(DEPDIR)/libbluez5_util_la-backend-ofono.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at modules/bluetooth/$(DEPDIR)/libbluez5_util_la-bluez5-util.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at modules/bluetooth/$(DEPDIR)/module_bluetooth_discover_la-module-bluetooth-discover.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at modules/bluetooth/$(DEPDIR)/module_bluetooth_policy_la-module-bluetooth-policy.Plo at am__quote@
@@ -6687,6 +6886,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at modules/xen/$(DEPDIR)/module_xenpv_sink_la-module-xenpv-sink.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-channelmap.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-context.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-direction.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-error.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-ext-device-manager.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-ext-device-restore.Plo at am__quote@
@@ -6739,6 +6939,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-dbus-util.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-dllmain.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-dynarray.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-flist.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-g711.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-hashmap.Plo at am__quote@
@@ -6780,6 +6981,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-socket-client.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-socket-server.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-socket-util.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-strbuf.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-strlist.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-svolume_arm.Plo at am__quote@
@@ -6806,12 +7008,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu-orc.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu-x86.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-database-gdbm.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-database-simple.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-database-tdb.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-dbus-shared.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-device-port.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-ltdl-helper.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-mix.Plo at am__quote@
@@ -6848,6 +7050,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-thread-mq.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-x11wrap.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_mix_neon_la-mix_neon.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_remap_neon_la-remap_neon.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/libpulsecore_sconv_neon_la-sconv_neon.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/mime-type.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/protocol-cli.Plo at am__quote@
@@ -6855,6 +7058,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/protocol-http.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/$(DEPDIR)/protocol-simple.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at pulsecore/ffmpeg/$(DEPDIR)/libpulsecore_foreign_la-resample2.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-peaks.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-speex.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-trivial.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/alsa_mixer_path_test-alsa-mixer-path-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/alsa_time_test-alsa-time-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/asyncmsgq_test-asyncmsgq-test.Po at am__quote@
@@ -6862,7 +7070,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/channelmap_test-channelmap-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/close_test-close-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/connect_stress-connect-stress.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpu_test-cpu-test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpu_remap_test-cpu-remap-test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpu_sconv_test-cpu-sconv-test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpu_volume_test-cpu-volume-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpulimit_test-cpulimit-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpulimit_test2-cpulimit-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/extended_test-extended-test.Po at am__quote@
@@ -6881,7 +7092,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/mcalign_test-mcalign-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/memblock_test-memblock-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/memblockq_test-memblockq-test.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/mix_special_test-mix-special-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/mix_test-mix-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/mult_s16_test-mult-s16-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/once_test-once-test.Po at am__quote@
@@ -6896,6 +7106,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/sig2str_test-sig2str-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/sigbus_test-sigbus-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/smoother_test-smoother-test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/srbchannel_test-srbchannel-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/stripnul-stripnul.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/strlist_test-strlist-test.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/sync_playback-sync-playback.Po at am__quote@
@@ -7019,6 +7230,20 @@ modules/bluetooth/libbluez5_util_la-bluez5-util.lo: modules/bluetooth/bluez5-uti
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbluez5_util_la_CFLAGS) $(CFLAGS) -c -o modules/bluetooth/libbluez5_util_la-bluez5-util.lo `test -f 'modules/bluetooth/bluez5-util.c' || echo '$(srcdir)/'`modules/bluetooth/bluez5-util.c
 
+modules/bluetooth/libbluez5_util_la-backend-ofono.lo: modules/bluetooth/backend-ofono.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbluez5_util_la_CFLAGS) $(CFLAGS) -MT modules/bluetooth/libbluez5_util_la-backend-ofono.lo -MD -MP -MF modules/bluetooth/$(DEPDIR)/libbluez5_util_la-backend-ofono.Tpo -c -o modules/bluetooth/libbluez5_util_la-backend-ofono.lo `test -f 'modules/bluetooth/backend-ofono.c' || echo '$(srcdir)/'`modules/blu [...]
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/bluetooth/$(DEPDIR)/libbluez5_util_la-backend-ofono.Tpo modules/bluetooth/$(DEPDIR)/libbluez5_util_la-backend-ofono.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/bluetooth/backend-ofono.c' object='modules/bluetooth/libbluez5_util_la-backend-ofono.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbluez5_util_la_CFLAGS) $(CFLAGS) -c -o modules/bluetooth/libbluez5_util_la-backend-ofono.lo `test -f 'modules/bluetooth/backend-ofono.c' || echo '$(srcdir)/'`modules/bluetooth/backend-ofono.c
+
+modules/bluetooth/libbluez5_util_la-backend-native.lo: modules/bluetooth/backend-native.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbluez5_util_la_CFLAGS) $(CFLAGS) -MT modules/bluetooth/libbluez5_util_la-backend-native.lo -MD -MP -MF modules/bluetooth/$(DEPDIR)/libbluez5_util_la-backend-native.Tpo -c -o modules/bluetooth/libbluez5_util_la-backend-native.lo `test -f 'modules/bluetooth/backend-native.c' || echo '$(srcdir)/'`modules [...]
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) modules/bluetooth/$(DEPDIR)/libbluez5_util_la-backend-native.Tpo modules/bluetooth/$(DEPDIR)/libbluez5_util_la-backend-native.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='modules/bluetooth/backend-native.c' object='modules/bluetooth/libbluez5_util_la-backend-native.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbluez5_util_la_CFLAGS) $(CFLAGS) -c -o modules/bluetooth/libbluez5_util_la-backend-native.lo `test -f 'modules/bluetooth/backend-native.c' || echo '$(srcdir)/'`modules/bluetooth/backend-native.c
+
 pulsecore/libprotocol_native_la-protocol-native.lo: pulsecore/protocol-native.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libprotocol_native_la_CFLAGS) $(CFLAGS) -MT pulsecore/libprotocol_native_la-protocol-native.lo -MD -MP -MF pulsecore/$(DEPDIR)/libprotocol_native_la-protocol-native.Tpo -c -o pulsecore/libprotocol_native_la-protocol-native.lo `test -f 'pulsecore/protocol-native.c' || echo '$(srcdir)/'`pulsecore/protocol- [...]
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libprotocol_native_la-protocol-native.Tpo pulsecore/$(DEPDIR)/libprotocol_native_la-protocol-native.Plo
@@ -7054,6 +7279,13 @@ pulse/libpulse_la-context.lo: pulse/context.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_la_CFLAGS) $(CFLAGS) -c -o pulse/libpulse_la-context.lo `test -f 'pulse/context.c' || echo '$(srcdir)/'`pulse/context.c
 
+pulse/libpulse_la-direction.lo: pulse/direction.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_la_CFLAGS) $(CFLAGS) -MT pulse/libpulse_la-direction.lo -MD -MP -MF pulse/$(DEPDIR)/libpulse_la-direction.Tpo -c -o pulse/libpulse_la-direction.lo `test -f 'pulse/direction.c' || echo '$(srcdir)/'`pulse/direction.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulse/$(DEPDIR)/libpulse_la-direction.Tpo pulse/$(DEPDIR)/libpulse_la-direction.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulse/direction.c' object='pulse/libpulse_la-direction.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_la_CFLAGS) $(CFLAGS) -c -o pulse/libpulse_la-direction.lo `test -f 'pulse/direction.c' || echo '$(srcdir)/'`pulse/direction.c
+
 pulse/libpulse_la-error.lo: pulse/error.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulse_la_CFLAGS) $(CFLAGS) -MT pulse/libpulse_la-error.lo -MD -MP -MF pulse/$(DEPDIR)/libpulse_la-error.Tpo -c -o pulse/libpulse_la-error.lo `test -f 'pulse/error.c' || echo '$(srcdir)/'`pulse/error.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulse/$(DEPDIR)/libpulse_la-error.Tpo pulse/$(DEPDIR)/libpulse_la-error.Plo
@@ -7341,6 +7573,13 @@ pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-dynarray.lo: pulsecore/dynarray.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-dynarray.lo `test -f 'pulsecore/dynarray.c' || echo '$(srcdir)/'`pulsecore/dynarray.c
 
+pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.lo: pulsecore/fdsem.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.Tpo -c -o pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.lo `test -f 'pulsecore/fdsem.c' || echo '$(srcdir)/'`pulsecore/fdsem.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.Tpo pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/fdsem.c' object='pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-fdsem.lo `test -f 'pulsecore/fdsem.c' || echo '$(srcdir)/'`pulsecore/fdsem.c
+
 pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-flist.lo: pulsecore/flist.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-flist.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-flist.Tpo -c -o pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-flist.lo `test -f 'pulsecore/flist.c' || echo '$(srcdir)/'`pulsecore/flist.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-flist.Tpo pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-flist.Plo
@@ -7544,6 +7783,13 @@ pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-random.lo: pulsecore/random.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-random.lo `test -f 'pulsecore/random.c' || echo '$(srcdir)/'`pulsecore/random.c
 
+pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.lo: pulsecore/srbchannel.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.Tpo -c -o pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.lo `test -f 'pulsecore/srbchannel.c' || echo '$(s [...]
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.Tpo pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/srbchannel.c' object='pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-srbchannel.lo `test -f 'pulsecore/srbchannel.c' || echo '$(srcdir)/'`pulsecore/srbchannel.c
+
 pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-sample-util.lo: pulsecore/sample-util.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-sample-util.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-sample-util.Tpo -c -o pulsecore/libpulsecommon_ at PA_MAJORMINOR@_la-sample-util.lo `test -f 'pulsecore/sample-util.c' || echo  [...]
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-sample-util.Tpo pulsecore/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-sample-util.Plo
@@ -7831,13 +8077,6 @@ pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-core.lo: pulsecore/core.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-core.lo `test -f 'pulsecore/core.c' || echo '$(srcdir)/'`pulsecore/core.c
 
-pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.lo: pulsecore/fdsem.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.Tpo -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.lo `test -f 'pulsecore/fdsem.c' || echo '$(srcdir)/'`pulsecore/fdsem.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.Tpo pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/fdsem.c' object='pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-fdsem.lo `test -f 'pulsecore/fdsem.c' || echo '$(srcdir)/'`pulsecore/fdsem.c
-
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.lo: pulsecore/hook-list.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.Tpo -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.lo `test -f 'pulsecore/hook-list.c' || echo '$(srcdir)/'`pul [...]
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.Tpo pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-hook-list.Plo
@@ -7936,6 +8175,27 @@ pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-resampler.lo: pulsecore/resampler.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-resampler.lo `test -f 'pulsecore/resampler.c' || echo '$(srcdir)/'`pulsecore/resampler.c
 
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.lo: pulsecore/resampler/ffmpeg.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.lo -MD -MP -MF pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.Tpo -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.lo `test -f 'pulsecore/resampler/ffmpeg [...]
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.Tpo pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/resampler/ffmpeg.c' object='pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-ffmpeg.lo `test -f 'pulsecore/resampler/ffmpeg.c' || echo '$(srcdir)/'`pulsecore/resampler/ffmpeg.c
+
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-peaks.lo: pulsecore/resampler/peaks.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-peaks.lo -MD -MP -MF pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-peaks.Tpo -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-peaks.lo `test -f 'pulsecore/resampler/peaks.c'  [...]
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-peaks.Tpo pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-peaks.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/resampler/peaks.c' object='pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-peaks.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-peaks.lo `test -f 'pulsecore/resampler/peaks.c' || echo '$(srcdir)/'`pulsecore/resampler/peaks.c
+
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-trivial.lo: pulsecore/resampler/trivial.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-trivial.lo -MD -MP -MF pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-trivial.Tpo -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-trivial.lo `test -f 'pulsecore/resampler/tri [...]
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-trivial.Tpo pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-trivial.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/resampler/trivial.c' object='pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-trivial.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-trivial.lo `test -f 'pulsecore/resampler/trivial.c' || echo '$(srcdir)/'`pulsecore/resampler/trivial.c
+
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-rtpoll.lo: pulsecore/rtpoll.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-rtpoll.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-rtpoll.Tpo -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-rtpoll.lo `test -f 'pulsecore/rtpoll.c' || echo '$(srcdir)/'`pulsecore/rtpoll.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-rtpoll.Tpo pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-rtpoll.Plo
@@ -7957,6 +8217,13 @@ pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-mix.lo: pulsecore/mix.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-mix.lo `test -f 'pulsecore/mix.c' || echo '$(srcdir)/'`pulsecore/mix.c
 
+pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu.lo: pulsecore/cpu.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu.Tpo -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu.lo `test -f 'pulsecore/cpu.c' || echo '$(srcdir)/'`pulsecore/cpu.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu.Tpo pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/cpu.c' object='pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu.lo `test -f 'pulsecore/cpu.c' || echo '$(srcdir)/'`pulsecore/cpu.c
+
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.lo: pulsecore/cpu-arm.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.Tpo -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.lo `test -f 'pulsecore/cpu-arm.c' || echo '$(srcdir)/'`pulsecore/c [...]
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.Tpo pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-cpu-arm.Plo
@@ -8132,6 +8399,20 @@ pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-simple.lo: pulsecore/database
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-database-simple.lo `test -f 'pulsecore/database-simple.c' || echo '$(srcdir)/'`pulsecore/database-simple.c
 
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-speex.lo: pulsecore/resampler/speex.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-speex.lo -MD -MP -MF pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-speex.Tpo -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-speex.lo `test -f 'pulsecore/resampler/speex.c'  [...]
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-speex.Tpo pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-speex.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/resampler/speex.c' object='pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-speex.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-speex.lo `test -f 'pulsecore/resampler/speex.c' || echo '$(srcdir)/'`pulsecore/resampler/speex.c
+
+pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.lo: pulsecore/resampler/libsamplerate.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.lo -MD -MP -MF pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.Tpo -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.lo `test -f 'pulse [...]
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.Tpo pulsecore/resampler/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/resampler/libsamplerate.c' object='pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulsecore/resampler/libpulsecore_ at PA_MAJORMINOR@_la-libsamplerate.lo `test -f 'pulsecore/resampler/libsamplerate.c' || echo '$(srcdir)/'`pulsecore/resampler/libsamplerate.c
+
 pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-svolume-orc-gen.lo: pulsecore/svolume-orc-gen.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-svolume-orc-gen.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-svolume-orc-gen.Tpo -c -o pulsecore/libpulsecore_ at PA_MAJORMINOR@_la-svolume-orc-gen.lo `test -f 'pulsecore/svolume-orc-gen.c'  [...]
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-svolume-orc-gen.Tpo pulsecore/$(DEPDIR)/libpulsecore_ at PA_MAJORMINOR@_la-svolume-orc-gen.Plo
@@ -8153,6 +8434,13 @@ pulsecore/libpulsecore_mix_neon_la-mix_neon.lo: pulsecore/mix_neon.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_mix_neon_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecore_mix_neon_la-mix_neon.lo `test -f 'pulsecore/mix_neon.c' || echo '$(srcdir)/'`pulsecore/mix_neon.c
 
+pulsecore/libpulsecore_remap_neon_la-remap_neon.lo: pulsecore/remap_neon.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_remap_neon_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecore_remap_neon_la-remap_neon.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecore_remap_neon_la-remap_neon.Tpo -c -o pulsecore/libpulsecore_remap_neon_la-remap_neon.lo `test -f 'pulsecore/remap_neon.c' || echo '$(srcdir)/'`pulsecore/remap_neon.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecore_remap_neon_la-remap_neon.Tpo pulsecore/$(DEPDIR)/libpulsecore_remap_neon_la-remap_neon.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulsecore/remap_neon.c' object='pulsecore/libpulsecore_remap_neon_la-remap_neon.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_remap_neon_la_CFLAGS) $(CFLAGS) -c -o pulsecore/libpulsecore_remap_neon_la-remap_neon.lo `test -f 'pulsecore/remap_neon.c' || echo '$(srcdir)/'`pulsecore/remap_neon.c
+
 pulsecore/libpulsecore_sconv_neon_la-sconv_neon.lo: pulsecore/sconv_neon.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecore_sconv_neon_la_CFLAGS) $(CFLAGS) -MT pulsecore/libpulsecore_sconv_neon_la-sconv_neon.lo -MD -MP -MF pulsecore/$(DEPDIR)/libpulsecore_sconv_neon_la-sconv_neon.Tpo -c -o pulsecore/libpulsecore_sconv_neon_la-sconv_neon.lo `test -f 'pulsecore/sconv_neon.c' || echo '$(srcdir)/'`pulsecore/sconv_neon.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) pulsecore/$(DEPDIR)/libpulsecore_sconv_neon_la-sconv_neon.Tpo pulsecore/$(DEPDIR)/libpulsecore_sconv_neon_la-sconv_neon.Plo
@@ -8846,19 +9134,61 @@ tests/connect_stress-connect-stress.obj: tests/connect-stress.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(connect_stress_CFLAGS) $(CFLAGS) -c -o tests/connect_stress-connect-stress.obj `if test -f 'tests/connect-stress.c'; then $(CYGPATH_W) 'tests/connect-stress.c'; else $(CYGPATH_W) '$(srcdir)/tests/connect-stress.c'; fi`
 
-tests/cpu_test-cpu-test.o: tests/cpu-test.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_test_CFLAGS) $(CFLAGS) -MT tests/cpu_test-cpu-test.o -MD -MP -MF tests/$(DEPDIR)/cpu_test-cpu-test.Tpo -c -o tests/cpu_test-cpu-test.o `test -f 'tests/cpu-test.c' || echo '$(srcdir)/'`tests/cpu-test.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_test-cpu-test.Tpo tests/$(DEPDIR)/cpu_test-cpu-test.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-test.c' object='tests/cpu_test-cpu-test.o' libtool=no @AMDEPBACKSLASH@
+tests/cpu_mix_test-cpu-mix-test.o: tests/cpu-mix-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_mix_test_CFLAGS) $(CFLAGS) -MT tests/cpu_mix_test-cpu-mix-test.o -MD -MP -MF tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Tpo -c -o tests/cpu_mix_test-cpu-mix-test.o `test -f 'tests/cpu-mix-test.c' || echo '$(srcdir)/'`tests/cpu-mix-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Tpo tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-mix-test.c' object='tests/cpu_mix_test-cpu-mix-test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_test-cpu-test.o `test -f 'tests/cpu-test.c' || echo '$(srcdir)/'`tests/cpu-test.c
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_mix_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_mix_test-cpu-mix-test.o `test -f 'tests/cpu-mix-test.c' || echo '$(srcdir)/'`tests/cpu-mix-test.c
 
-tests/cpu_test-cpu-test.obj: tests/cpu-test.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_test_CFLAGS) $(CFLAGS) -MT tests/cpu_test-cpu-test.obj -MD -MP -MF tests/$(DEPDIR)/cpu_test-cpu-test.Tpo -c -o tests/cpu_test-cpu-test.obj `if test -f 'tests/cpu-test.c'; then $(CYGPATH_W) 'tests/cpu-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-test.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_test-cpu-test.Tpo tests/$(DEPDIR)/cpu_test-cpu-test.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-test.c' object='tests/cpu_test-cpu-test.obj' libtool=no @AMDEPBACKSLASH@
+tests/cpu_mix_test-cpu-mix-test.obj: tests/cpu-mix-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_mix_test_CFLAGS) $(CFLAGS) -MT tests/cpu_mix_test-cpu-mix-test.obj -MD -MP -MF tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Tpo -c -o tests/cpu_mix_test-cpu-mix-test.obj `if test -f 'tests/cpu-mix-test.c'; then $(CYGPATH_W) 'tests/cpu-mix-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-mix-test.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Tpo tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-mix-test.c' object='tests/cpu_mix_test-cpu-mix-test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_test-cpu-test.obj `if test -f 'tests/cpu-test.c'; then $(CYGPATH_W) 'tests/cpu-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-test.c'; fi`
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_mix_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_mix_test-cpu-mix-test.obj `if test -f 'tests/cpu-mix-test.c'; then $(CYGPATH_W) 'tests/cpu-mix-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-mix-test.c'; fi`
+
+tests/cpu_remap_test-cpu-remap-test.o: tests/cpu-remap-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_remap_test_CFLAGS) $(CFLAGS) -MT tests/cpu_remap_test-cpu-remap-test.o -MD -MP -MF tests/$(DEPDIR)/cpu_remap_test-cpu-remap-test.Tpo -c -o tests/cpu_remap_test-cpu-remap-test.o `test -f 'tests/cpu-remap-test.c' || echo '$(srcdir)/'`tests/cpu-remap-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_remap_test-cpu-remap-test.Tpo tests/$(DEPDIR)/cpu_remap_test-cpu-remap-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-remap-test.c' object='tests/cpu_remap_test-cpu-remap-test.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_remap_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_remap_test-cpu-remap-test.o `test -f 'tests/cpu-remap-test.c' || echo '$(srcdir)/'`tests/cpu-remap-test.c
+
+tests/cpu_remap_test-cpu-remap-test.obj: tests/cpu-remap-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_remap_test_CFLAGS) $(CFLAGS) -MT tests/cpu_remap_test-cpu-remap-test.obj -MD -MP -MF tests/$(DEPDIR)/cpu_remap_test-cpu-remap-test.Tpo -c -o tests/cpu_remap_test-cpu-remap-test.obj `if test -f 'tests/cpu-remap-test.c'; then $(CYGPATH_W) 'tests/cpu-remap-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-remap-test.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_remap_test-cpu-remap-test.Tpo tests/$(DEPDIR)/cpu_remap_test-cpu-remap-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-remap-test.c' object='tests/cpu_remap_test-cpu-remap-test.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_remap_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_remap_test-cpu-remap-test.obj `if test -f 'tests/cpu-remap-test.c'; then $(CYGPATH_W) 'tests/cpu-remap-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-remap-test.c'; fi`
+
+tests/cpu_sconv_test-cpu-sconv-test.o: tests/cpu-sconv-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_sconv_test_CFLAGS) $(CFLAGS) -MT tests/cpu_sconv_test-cpu-sconv-test.o -MD -MP -MF tests/$(DEPDIR)/cpu_sconv_test-cpu-sconv-test.Tpo -c -o tests/cpu_sconv_test-cpu-sconv-test.o `test -f 'tests/cpu-sconv-test.c' || echo '$(srcdir)/'`tests/cpu-sconv-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_sconv_test-cpu-sconv-test.Tpo tests/$(DEPDIR)/cpu_sconv_test-cpu-sconv-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-sconv-test.c' object='tests/cpu_sconv_test-cpu-sconv-test.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_sconv_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_sconv_test-cpu-sconv-test.o `test -f 'tests/cpu-sconv-test.c' || echo '$(srcdir)/'`tests/cpu-sconv-test.c
+
+tests/cpu_sconv_test-cpu-sconv-test.obj: tests/cpu-sconv-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_sconv_test_CFLAGS) $(CFLAGS) -MT tests/cpu_sconv_test-cpu-sconv-test.obj -MD -MP -MF tests/$(DEPDIR)/cpu_sconv_test-cpu-sconv-test.Tpo -c -o tests/cpu_sconv_test-cpu-sconv-test.obj `if test -f 'tests/cpu-sconv-test.c'; then $(CYGPATH_W) 'tests/cpu-sconv-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-sconv-test.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_sconv_test-cpu-sconv-test.Tpo tests/$(DEPDIR)/cpu_sconv_test-cpu-sconv-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-sconv-test.c' object='tests/cpu_sconv_test-cpu-sconv-test.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_sconv_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_sconv_test-cpu-sconv-test.obj `if test -f 'tests/cpu-sconv-test.c'; then $(CYGPATH_W) 'tests/cpu-sconv-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-sconv-test.c'; fi`
+
+tests/cpu_volume_test-cpu-volume-test.o: tests/cpu-volume-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_volume_test_CFLAGS) $(CFLAGS) -MT tests/cpu_volume_test-cpu-volume-test.o -MD -MP -MF tests/$(DEPDIR)/cpu_volume_test-cpu-volume-test.Tpo -c -o tests/cpu_volume_test-cpu-volume-test.o `test -f 'tests/cpu-volume-test.c' || echo '$(srcdir)/'`tests/cpu-volume-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_volume_test-cpu-volume-test.Tpo tests/$(DEPDIR)/cpu_volume_test-cpu-volume-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-volume-test.c' object='tests/cpu_volume_test-cpu-volume-test.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_volume_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_volume_test-cpu-volume-test.o `test -f 'tests/cpu-volume-test.c' || echo '$(srcdir)/'`tests/cpu-volume-test.c
+
+tests/cpu_volume_test-cpu-volume-test.obj: tests/cpu-volume-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_volume_test_CFLAGS) $(CFLAGS) -MT tests/cpu_volume_test-cpu-volume-test.obj -MD -MP -MF tests/$(DEPDIR)/cpu_volume_test-cpu-volume-test.Tpo -c -o tests/cpu_volume_test-cpu-volume-test.obj `if test -f 'tests/cpu-volume-test.c'; then $(CYGPATH_W) 'tests/cpu-volume-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-volume-test.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_volume_test-cpu-volume-test.Tpo tests/$(DEPDIR)/cpu_volume_test-cpu-volume-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cpu-volume-test.c' object='tests/cpu_volume_test-cpu-volume-test.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_volume_test_CFLAGS) $(CFLAGS) -c -o tests/cpu_volume_test-cpu-volume-test.obj `if test -f 'tests/cpu-volume-test.c'; then $(CYGPATH_W) 'tests/cpu-volume-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/cpu-volume-test.c'; fi`
 
 tests/cpulimit_test-cpulimit-test.o: tests/cpulimit-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpulimit_test_CFLAGS) $(CFLAGS) -MT tests/cpulimit_test-cpulimit-test.o -MD -MP -MF tests/$(DEPDIR)/cpulimit_test-cpulimit-test.Tpo -c -o tests/cpulimit_test-cpulimit-test.o `test -f 'tests/cpulimit-test.c' || echo '$(srcdir)/'`tests/cpulimit-test.c
@@ -9224,20 +9554,6 @@ tests/memblockq_test-memblockq-test.obj: tests/memblockq-test.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(memblockq_test_CFLAGS) $(CFLAGS) -c -o tests/memblockq_test-memblockq-test.obj `if test -f 'tests/memblockq-test.c'; then $(CYGPATH_W) 'tests/memblockq-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/memblockq-test.c'; fi`
 
-tests/mix_special_test-mix-special-test.o: tests/mix-special-test.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mix_special_test_CFLAGS) $(CFLAGS) -MT tests/mix_special_test-mix-special-test.o -MD -MP -MF tests/$(DEPDIR)/mix_special_test-mix-special-test.Tpo -c -o tests/mix_special_test-mix-special-test.o `test -f 'tests/mix-special-test.c' || echo '$(srcdir)/'`tests/mix-special-test.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/mix_special_test-mix-special-test.Tpo tests/$(DEPDIR)/mix_special_test-mix-special-test.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/mix-special-test.c' object='tests/mix_special_test-mix-special-test.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mix_special_test_CFLAGS) $(CFLAGS) -c -o tests/mix_special_test-mix-special-test.o `test -f 'tests/mix-special-test.c' || echo '$(srcdir)/'`tests/mix-special-test.c
-
-tests/mix_special_test-mix-special-test.obj: tests/mix-special-test.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mix_special_test_CFLAGS) $(CFLAGS) -MT tests/mix_special_test-mix-special-test.obj -MD -MP -MF tests/$(DEPDIR)/mix_special_test-mix-special-test.Tpo -c -o tests/mix_special_test-mix-special-test.obj `if test -f 'tests/mix-special-test.c'; then $(CYGPATH_W) 'tests/mix-special-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/mix-special-test.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/mix_special_test-mix-special-test.Tpo tests/$(DEPDIR)/mix_special_test-mix-special-test.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/mix-special-test.c' object='tests/mix_special_test-mix-special-test.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mix_special_test_CFLAGS) $(CFLAGS) -c -o tests/mix_special_test-mix-special-test.obj `if test -f 'tests/mix-special-test.c'; then $(CYGPATH_W) 'tests/mix-special-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/mix-special-test.c'; fi`
-
 tests/mix_test-mix-test.o: tests/mix-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mix_test_CFLAGS) $(CFLAGS) -MT tests/mix_test-mix-test.o -MD -MP -MF tests/$(DEPDIR)/mix_test-mix-test.Tpo -c -o tests/mix_test-mix-test.o `test -f 'tests/mix-test.c' || echo '$(srcdir)/'`tests/mix-test.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/mix_test-mix-test.Tpo tests/$(DEPDIR)/mix_test-mix-test.Po
@@ -9616,6 +9932,20 @@ tests/smoother_test-smoother-test.obj: tests/smoother-test.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(smoother_test_CFLAGS) $(CFLAGS) -c -o tests/smoother_test-smoother-test.obj `if test -f 'tests/smoother-test.c'; then $(CYGPATH_W) 'tests/smoother-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/smoother-test.c'; fi`
 
+tests/srbchannel_test-srbchannel-test.o: tests/srbchannel-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(srbchannel_test_CFLAGS) $(CFLAGS) -MT tests/srbchannel_test-srbchannel-test.o -MD -MP -MF tests/$(DEPDIR)/srbchannel_test-srbchannel-test.Tpo -c -o tests/srbchannel_test-srbchannel-test.o `test -f 'tests/srbchannel-test.c' || echo '$(srcdir)/'`tests/srbchannel-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/srbchannel_test-srbchannel-test.Tpo tests/$(DEPDIR)/srbchannel_test-srbchannel-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/srbchannel-test.c' object='tests/srbchannel_test-srbchannel-test.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(srbchannel_test_CFLAGS) $(CFLAGS) -c -o tests/srbchannel_test-srbchannel-test.o `test -f 'tests/srbchannel-test.c' || echo '$(srcdir)/'`tests/srbchannel-test.c
+
+tests/srbchannel_test-srbchannel-test.obj: tests/srbchannel-test.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(srbchannel_test_CFLAGS) $(CFLAGS) -MT tests/srbchannel_test-srbchannel-test.obj -MD -MP -MF tests/$(DEPDIR)/srbchannel_test-srbchannel-test.Tpo -c -o tests/srbchannel_test-srbchannel-test.obj `if test -f 'tests/srbchannel-test.c'; then $(CYGPATH_W) 'tests/srbchannel-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/srbchannel-test.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/srbchannel_test-srbchannel-test.Tpo tests/$(DEPDIR)/srbchannel_test-srbchannel-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/srbchannel-test.c' object='tests/srbchannel_test-srbchannel-test.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(srbchannel_test_CFLAGS) $(CFLAGS) -c -o tests/srbchannel_test-srbchannel-test.obj `if test -f 'tests/srbchannel-test.c'; then $(CYGPATH_W) 'tests/srbchannel-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/srbchannel-test.c'; fi`
+
 tests/stripnul-stripnul.o: tests/stripnul.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stripnul_CFLAGS) $(CFLAGS) -MT tests/stripnul-stripnul.o -MD -MP -MF tests/$(DEPDIR)/stripnul-stripnul.Tpo -c -o tests/stripnul-stripnul.o `test -f 'tests/stripnul.c' || echo '$(srcdir)/'`tests/stripnul.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/stripnul-stripnul.Tpo tests/$(DEPDIR)/stripnul-stripnul.Po
@@ -9780,6 +10110,7 @@ clean-libtool:
 	-rm -rf pulse/.libs pulse/_libs
 	-rm -rf pulsecore/.libs pulsecore/_libs
 	-rm -rf pulsecore/ffmpeg/.libs pulsecore/ffmpeg/_libs
+	-rm -rf pulsecore/resampler/.libs pulsecore/resampler/_libs
 	-rm -rf tests/.libs tests/_libs
 	-rm -rf utils/.libs utils/_libs
 install-dbuspolicyDATA: $(dbuspolicy_DATA)
@@ -9887,6 +10218,27 @@ uninstall-pulseconfDATA:
 	@list='$(pulseconf_DATA)'; test -n "$(pulseconfdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pulseconfdir)'; $(am__uninstall_files_from_dir)
+install-systemduserunitDATA: $(systemduserunit_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(systemduserunit_DATA)'; test -n "$(systemduserunitdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(systemduserunitdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(systemduserunitdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemduserunitdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(systemduserunitdir)" || exit $$?; \
+	done
+
+uninstall-systemduserunitDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(systemduserunit_DATA)'; test -n "$(systemduserunitdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(systemduserunitdir)'; $(am__uninstall_files_from_dir)
 install-xdgautostartDATA: $(xdgautostart_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(xdgautostart_DATA)'; test -n "$(xdgautostartdir)" || list=; \
@@ -10270,9 +10622,30 @@ proplist-test.log: proplist-test$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-cpu-test.log: cpu-test$(EXEEXT)
-	@p='cpu-test$(EXEEXT)'; \
-	b='cpu-test'; \
+cpu-mix-test.log: cpu-mix-test$(EXEEXT)
+	@p='cpu-mix-test$(EXEEXT)'; \
+	b='cpu-mix-test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+cpu-remap-test.log: cpu-remap-test$(EXEEXT)
+	@p='cpu-remap-test$(EXEEXT)'; \
+	b='cpu-remap-test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+cpu-sconv-test.log: cpu-sconv-test$(EXEEXT)
+	@p='cpu-sconv-test$(EXEEXT)'; \
+	b='cpu-sconv-test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+cpu-volume-test.log: cpu-volume-test$(EXEEXT)
+	@p='cpu-volume-test$(EXEEXT)'; \
+	b='cpu-volume-test'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -10291,9 +10664,9 @@ mult-s16-test.log: mult-s16-test$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-mix-special-test.log: mix-special-test$(EXEEXT)
-	@p='mix-special-test$(EXEEXT)'; \
-	b='mix-special-test'; \
+srbchannel-test.log: srbchannel-test$(EXEEXT)
+	@p='srbchannel-test$(EXEEXT)'; \
+	b='srbchannel-test'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -10388,7 +10761,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
 install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" "$(DESTDIR)$(padsplibdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(modlibexecdir)" "$(DESTDIR)$(padsplibdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pulselibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(alsapathsdir)" "$(DESTDIR)$(alsaprofilesetsdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(pulseconfdir)" "$(DESTDIR)$(systemduserunitdir)" "$(DESTDIR)$(xdgautostartdir)" "$(DESTDIR)$(pulseincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -10456,6 +10829,8 @@ distclean-generic:
 	-rm -f pulsecore/$(am__dirstamp)
 	-rm -f pulsecore/ffmpeg/$(DEPDIR)/$(am__dirstamp)
 	-rm -f pulsecore/ffmpeg/$(am__dirstamp)
+	-rm -f pulsecore/resampler/$(DEPDIR)/$(am__dirstamp)
+	-rm -f pulsecore/resampler/$(am__dirstamp)
 	-rm -f tests/$(DEPDIR)/$(am__dirstamp)
 	-rm -f tests/$(am__dirstamp)
 	-rm -f utils/$(DEPDIR)/$(am__dirstamp)
@@ -10475,7 +10850,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
 	clean-pulselibexecPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) modules/xen/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
+	-rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) modules/xen/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -10495,7 +10870,8 @@ info-am:
 install-data-am: install-dbuspolicyDATA install-dist_alsapathsDATA \
 	install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \
 	install-padsplibLTLIBRARIES install-pulseconfDATA \
-	install-pulseincludeHEADERS install-xdgautostartDATA
+	install-pulseincludeHEADERS install-systemduserunitDATA \
+	install-xdgautostartDATA
 
 install-dvi: install-dvi-am
 
@@ -10527,7 +10903,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) modules/xen/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
+	-rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) modules/xen/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -10551,7 +10927,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-modlibexecLTLIBRARIES uninstall-padsplibLTLIBRARIES \
 	uninstall-pkglibLTLIBRARIES uninstall-pulseconfDATA \
 	uninstall-pulseincludeHEADERS uninstall-pulselibexecPROGRAMS \
-	uninstall-xdgautostartDATA
+	uninstall-systemduserunitDATA uninstall-xdgautostartDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: all check check-am install install-am install-exec-am \
@@ -10576,19 +10952,21 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 	install-ps install-ps-am install-pulseconfDATA \
 	install-pulseincludeHEADERS install-pulselibexecPROGRAMS \
-	install-strip install-xdgautostartDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	recheck tags tags-am uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-dbuspolicyDATA uninstall-dist_alsapathsDATA \
+	install-strip install-systemduserunitDATA \
+	install-xdgautostartDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-binSCRIPTS uninstall-dbuspolicyDATA \
+	uninstall-dist_alsapathsDATA \
 	uninstall-dist_alsaprofilesetsDATA \
 	uninstall-dist_udevrulesDATA uninstall-hook \
 	uninstall-libLTLIBRARIES uninstall-modlibexecLTLIBRARIES \
 	uninstall-padsplibLTLIBRARIES uninstall-pkglibLTLIBRARIES \
 	uninstall-pulseconfDATA uninstall-pulseincludeHEADERS \
-	uninstall-pulselibexecPROGRAMS uninstall-xdgautostartDATA
+	uninstall-pulselibexecPROGRAMS uninstall-systemduserunitDATA \
+	uninstall-xdgautostartDATA
 
 @HAVE_X11_TRUE@@INTLTOOL_DESKTOP_RULE@
 
diff --git a/src/daemon/.gitignore b/src/daemon/.gitignore
index 54e4299..0efa55b 100644
--- a/src/daemon/.gitignore
+++ b/src/daemon/.gitignore
@@ -1,3 +1,2 @@
 org.pulseaudio.policy
 pulseaudio.desktop
-pulseaudio-kde.desktop
diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 669d6e2..9471d3b 100644
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -51,7 +51,7 @@ void pa_drop_root(void) {
     uid_t uid;
     gid_t gid;
 
-    pa_log_debug(_("Cleaning up privileges."));
+    pa_log_debug("Cleaning up privileges.");
     uid = getuid();
     gid = getgid();
 
@@ -86,9 +86,10 @@ void pa_drop_caps(void) {
     pa_assert_se(cap_clear(caps) == 0);
     pa_assert_se(cap_set_proc(caps) == 0);
     pa_assert_se(cap_free(caps) == 0);
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     /* FreeBSD doesn't have this functionality, even though sys/capability.h is
-     * available. See https://bugs.freedesktop.org/show_bug.cgi?id=73967 */
+     * available. See https://bugs.freedesktop.org/show_bug.cgi?id=72580 */
+    pa_log_warn("FreeBSD cannot drop extra capabilities, implementation needed.");
 #else
 #error "Don't know how to do capabilities on your system.  Please send a patch."
 #endif /* __linux__ */
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 68579c5..2ffc61f 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -323,7 +323,7 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
 
             case ARG_LOG_TARGET:
                 if (pa_daemon_conf_set_log_target(conf, optarg) < 0) {
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
                     pa_log(_("Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a valid file name 'file:<path>', 'newfile:<path>'."));
 #else
                     pa_log(_("Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file name 'file:<path>', 'newfile:<path>'."));
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index ce777a6..b7a85aa 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -139,7 +139,7 @@ static const pa_daemon_conf default_conf = {
    ,.rlimit_rtprio = { .value = 9, .is_set = true }    /* One below JACK's default for the server */
 #endif
 #ifdef RLIMIT_RTTIME
-   ,.rlimit_rttime = { .value = PA_USEC_PER_SEC, .is_set = true }
+   ,.rlimit_rttime = { .value = 200*PA_USEC_PER_MSEC, .is_set = true } /* rtkit's limit is 200 ms */
 #endif
 #endif
 };
@@ -345,8 +345,7 @@ static int parse_sample_rate(pa_config_parser_state *state) {
 
     c = state->data;
 
-    if (pa_atou(state->rvalue, &r) < 0 || !pa_sample_rate_valid(r) ||
-        !((r % 4000 == 0) || (r % 11025 == 0))) {
+    if (pa_atou(state->rvalue, &r) < 0 || !pa_sample_rate_valid(r)) {
         pa_log(_("[%s:%u] Invalid sample rate '%s'."), state->filename, state->lineno, state->rvalue);
         return -1;
     }
@@ -363,8 +362,7 @@ static int parse_alternate_sample_rate(pa_config_parser_state *state) {
 
     c = state->data;
 
-    if (pa_atou(state->rvalue, &r) < 0 || !pa_sample_rate_valid(r) ||
-        !((r % 4000==0) || (r % 11025 == 0))) {
+    if (pa_atou(state->rvalue, &r) < 0 || !pa_sample_rate_valid(r)) {
         pa_log(_("[%s:%u] Invalid sample rate '%s'."), state->filename, state->lineno, state->rvalue);
         return -1;
     }
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 2089058..5b20130 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -75,7 +75,7 @@ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
 ; rlimit-msgqueue = -1
 ; rlimit-nice = 31
 ; rlimit-rtprio = 9
-; rlimit-rttime = 1000000
+; rlimit-rttime = 200000
 ])dnl
 
 ; default-sample-format = s16le
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 4e77ae9..536c405 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -27,10 +27,10 @@ ifelse(@OS_IS_WIN32@, 1, [dnl
 load-sample x11-bell %WINDIR%\Media\ding.wav
 load-sample-dir-lazy %WINDIR%\Media\*.wav
 ], [dnl
-#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
-#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
-#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
-#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
+#load-sample-lazy x11-bell /usr/share/sounds/freedesktop/stereo/bell.oga
+#load-sample-lazy pulse-hotplug /usr/share/sounds/freedesktop/stereo/device-added.oga
+#load-sample-lazy pulse-coldplug /usr/share/sounds/freedesktop/stereo/device-added.oga
+#load-sample-lazy pulse-access /usr/share/sounds/freedesktop/stereo/message.oga
 ])dnl
 
 .fail
@@ -176,7 +176,7 @@ ifelse(@HAVE_X11@, 1, [dnl
 # can be shared by multiple sessions.
 
 ### Load X11 bell module
-#load-module module-x11-bell sample=bell-windowing-system
+#load-module module-x11-bell sample=x11-bell
 
 ### Register ourselves in the X11 session manager
 #load-module module-x11-xsmp
diff --git a/src/daemon/main.c b/src/daemon/main.c
index e01371e..d41554f 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -58,10 +58,11 @@
 #include <dbus/dbus.h>
 #endif
 
-#include <pulse/client-conf.h>
-#ifdef HAVE_X11
-#include <pulse/client-conf-x11.h>
+#ifdef HAVE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
 #endif
+
+#include <pulse/client-conf.h>
 #include <pulse/mainloop.h>
 #include <pulse/mainloop-signal.h>
 #include <pulse/timeval.h>
@@ -89,9 +90,7 @@
 #ifdef HAVE_DBUS
 #include <pulsecore/dbus-shared.h>
 #endif
-#include <pulsecore/cpu-arm.h>
-#include <pulsecore/cpu-x86.h>
-#include <pulsecore/cpu-orc.h>
+#include <pulsecore/cpu.h>
 
 #include "cmdline.h"
 #include "cpulimit.h"
@@ -114,29 +113,8 @@ int deny_severity = LOG_WARNING;
 int __padsp_disabled__ = 7;
 #endif
 
-#ifdef OS_IS_WIN32
-
-static void message_cb(pa_mainloop_api*a, pa_time_event*e, const struct timeval *tv, void *userdata) {
-    MSG msg;
-    struct timeval tvnext;
-
-    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
-        if (msg.message == WM_QUIT)
-            raise(SIGTERM);
-        else {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-    }
-
-    pa_timeval_add(pa_gettimeofday(&tvnext), 100000);
-    a->time_restart(e, &tvnext);
-}
-
-#endif
-
 static void signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
-    pa_log_info(_("Got signal %s."), pa_sig2str(sig));
+    pa_log_info("Got signal %s.", pa_sig2str(sig));
 
     switch (sig) {
 #ifdef SIGUSR1
@@ -163,7 +141,7 @@ static void signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void
         case SIGINT:
         case SIGTERM:
         default:
-            pa_log_info(_("Exiting."));
+            pa_log_info("Exiting.");
             m->quit(m, 1);
             break;
     }
@@ -190,7 +168,7 @@ static int change_user(void) {
         return -1;
     }
 
-    pa_log_info(_("Found user '%s' (UID %lu) and group '%s' (GID %lu)."),
+    pa_log_info("Found user '%s' (UID %lu) and group '%s' (GID %lu).",
                 PA_SYSTEM_USER, (unsigned long) pw->pw_uid,
                 PA_SYSTEM_GROUP, (unsigned long) gr->gr_gid);
 
@@ -268,7 +246,7 @@ static int change_user(void) {
     if (!getenv("PULSE_STATE_PATH"))
         pa_set_env("PULSE_STATE_PATH", PA_SYSTEM_STATE_PATH);
 
-    pa_log_info(_("Successfully changed user to \"" PA_SYSTEM_USER "\"."));
+    pa_log_info("Successfully changed user to \"" PA_SYSTEM_USER "\".");
 
     return 0;
 }
@@ -294,7 +272,7 @@ static int set_one_rlimit(const pa_rlimit *r, int resource, const char *name) {
     rl.rlim_cur = rl.rlim_max = r->value;
 
     if (setrlimit(resource, &rl) < 0) {
-        pa_log_info(_("setrlimit(%s, (%u, %u)) failed: %s"), name, (unsigned) r->value, (unsigned) r->value, pa_cstrerror(errno));
+        pa_log_info("setrlimit(%s, (%u, %u)) failed: %s", name, (unsigned) r->value, (unsigned) r->value, pa_cstrerror(errno));
         return -1;
     }
 
@@ -346,11 +324,7 @@ static char *check_configured_address(void) {
     char *default_server = NULL;
     pa_client_conf *c = pa_client_conf_new();
 
-    pa_client_conf_load(c, NULL);
-#ifdef HAVE_X11
-    pa_client_conf_from_x11(c, NULL);
-#endif
-    pa_client_conf_env(c);
+    pa_client_conf_load(c, true, true);
 
     if (c->default_server && *c->default_server)
         default_server = pa_xstrdup(c->default_server);
@@ -404,16 +378,12 @@ int main(int argc, char *argv[]) {
     int r = 0, retval = 1, d = 0;
     bool valid_pid_file = false;
     bool ltdl_init = false;
-    int passed_fd = -1;
+    int n_fds = 0, *passed_fds = NULL;
     const char *e;
 #ifdef HAVE_FORK
     int daemon_pipe[2] = { -1, -1 };
     int daemon_pipe2[2] = { -1, -1 };
 #endif
-#ifdef OS_IS_WIN32
-    pa_time_event *win32_timer;
-    struct timeval win32_tv;
-#endif
     int autospawn_fd = -1;
     bool autospawn_locked = false;
 #ifdef HAVE_DBUS
@@ -465,11 +435,28 @@ int main(int argc, char *argv[]) {
     }
 #endif
 
-    if ((e = getenv("PULSE_PASSED_FD"))) {
-        passed_fd = atoi(e);
+#ifdef HAVE_SYSTEMD_DAEMON
+    n_fds = sd_listen_fds(0);
+    if (n_fds > 0) {
+        int i = n_fds;
 
-        if (passed_fd <= 2)
-            passed_fd = -1;
+        passed_fds = pa_xnew(int, n_fds+2);
+        passed_fds[n_fds] = passed_fds[n_fds+1] = -1;
+        while (i--)
+            passed_fds[i] = SD_LISTEN_FDS_START + i;
+    }
+#endif
+
+    if (!passed_fds) {
+        n_fds = 0;
+        passed_fds = pa_xnew(int, 2);
+        passed_fds[0] = passed_fds[1] = -1;
+    }
+
+    if ((e = getenv("PULSE_PASSED_FD"))) {
+        int passed_fd = atoi(e);
+        if (passed_fd > 2)
+            passed_fds[n_fds] = passed_fd;
     }
 
     /* We might be autospawned, in which case have no idea in which
@@ -478,7 +465,8 @@ int main(int argc, char *argv[]) {
 
     pa_reset_personality();
     pa_drop_root();
-    pa_close_all(passed_fd, -1);
+    pa_close_allv(passed_fds);
+    pa_xfree(passed_fds);
     pa_reset_sigs(-1);
     pa_unblock_sigs(-1);
     pa_reset_priority();
@@ -616,9 +604,9 @@ int main(int argc, char *argv[]) {
             }
 
             if (pa_pid_file_check_running(&pid, "pulseaudio") < 0)
-                pa_log_info(_("Daemon not running"));
+                pa_log_info("Daemon not running");
             else {
-                pa_log_info(_("Daemon running as PID %u"), pid);
+                pa_log_info("Daemon running as PID %u", pid);
                 retval = 0;
             }
 
@@ -743,6 +731,10 @@ int main(int argc, char *argv[]) {
          * first take the autospawn lock to make things
          * synchronous. */
 
+        /* This locking and thread synchronisation code doesn't work reliably
+         * on kFreeBSD (Debian bug #705435), or in upstream FreeBSD ports
+         * (bug reference: ports/128947, patched in SVN r231972). */
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
         if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
             pa_log("Failed to initialize autospawn lock");
             goto finish;
@@ -754,6 +746,7 @@ int main(int argc, char *argv[]) {
         }
 
         autospawn_locked = true;
+#endif
     }
 
     if (conf->daemonize) {
@@ -796,7 +789,7 @@ int main(int argc, char *argv[]) {
             if (retval)
                 pa_log(_("Daemon startup failed."));
             else
-                pa_log_info(_("Daemon startup successful."));
+                pa_log_info("Daemon startup successful.");
 
             goto finish;
         }
@@ -817,7 +810,7 @@ int main(int argc, char *argv[]) {
 #endif
 
         if (!conf->log_target) {
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
             pa_log_target target = { .type = PA_LOG_JOURNAL, .file = NULL };
 #else
             pa_log_target target = { .type = PA_LOG_SYSLOG, .file = NULL };
@@ -913,67 +906,71 @@ int main(int argc, char *argv[]) {
 
     pa_set_env_and_record("PULSE_SYSTEM", conf->system_instance ? "1" : "0");
 
-    pa_log_info(_("This is PulseAudio %s"), PACKAGE_VERSION);
-    pa_log_debug(_("Compilation host: %s"), CANONICAL_HOST);
-    pa_log_debug(_("Compilation CFLAGS: %s"), PA_CFLAGS);
+    pa_log_info("This is PulseAudio %s", PACKAGE_VERSION);
+    pa_log_debug("Compilation host: %s", CANONICAL_HOST);
+    pa_log_debug("Compilation CFLAGS: %s", PA_CFLAGS);
+
+#ifdef HAVE_LIBSAMPLERATE
+    pa_log_warn("Compiled with DEPRECATED libsamplerate support!");
+#endif
 
     s = pa_uname_string();
-    pa_log_debug(_("Running on host: %s"), s);
+    pa_log_debug("Running on host: %s", s);
     pa_xfree(s);
 
-    pa_log_debug(_("Found %u CPUs."), pa_ncpus());
+    pa_log_debug("Found %u CPUs.", pa_ncpus());
 
-    pa_log_info(_("Page size is %lu bytes"), (unsigned long) PA_PAGE_SIZE);
+    pa_log_info("Page size is %lu bytes", (unsigned long) PA_PAGE_SIZE);
 
 #ifdef HAVE_VALGRIND_MEMCHECK_H
-    pa_log_debug(_("Compiled with Valgrind support: yes"));
+    pa_log_debug("Compiled with Valgrind support: yes");
 #else
-    pa_log_debug(_("Compiled with Valgrind support: no"));
+    pa_log_debug("Compiled with Valgrind support: no");
 #endif
 
-    pa_log_debug(_("Running in valgrind mode: %s"), pa_yes_no(pa_in_valgrind()));
+    pa_log_debug("Running in valgrind mode: %s", pa_yes_no(pa_in_valgrind()));
 
-    pa_log_debug(_("Running in VM: %s"), pa_yes_no(pa_running_in_vm()));
+    pa_log_debug("Running in VM: %s", pa_yes_no(pa_running_in_vm()));
 
 #ifdef __OPTIMIZE__
-    pa_log_debug(_("Optimized build: yes"));
+    pa_log_debug("Optimized build: yes");
 #else
-    pa_log_debug(_("Optimized build: no"));
+    pa_log_debug("Optimized build: no");
 #endif
 
 #ifdef NDEBUG
-    pa_log_debug(_("NDEBUG defined, all asserts disabled."));
+    pa_log_debug("NDEBUG defined, all asserts disabled.");
 #elif defined(FASTPATH)
-    pa_log_debug(_("FASTPATH defined, only fast path asserts disabled."));
+    pa_log_debug("FASTPATH defined, only fast path asserts disabled.");
 #else
-    pa_log_debug(_("All asserts enabled."));
+    pa_log_debug("All asserts enabled.");
 #endif
 
     if (!(s = pa_machine_id())) {
         pa_log(_("Failed to get machine ID"));
         goto finish;
     }
-    pa_log_info(_("Machine ID is %s."), s);
+    pa_log_info("Machine ID is %s.", s);
     pa_xfree(s);
 
     if ((s = pa_session_id())) {
-        pa_log_info(_("Session ID is %s."), s);
+        pa_log_info("Session ID is %s.", s);
         pa_xfree(s);
     }
 
     if (!(s = pa_get_runtime_dir()))
         goto finish;
-    pa_log_info(_("Using runtime directory %s."), s);
+    pa_log_info("Using runtime directory %s.", s);
     pa_xfree(s);
 
     if (!(s = pa_get_state_dir()))
         goto finish;
-    pa_log_info(_("Using state directory %s."), s);
+    pa_log_info("Using state directory %s.", s);
     pa_xfree(s);
 
-    pa_log_info(_("Using modules directory %s."), conf->dl_search_path);
+    pa_log_info("Using modules directory %s.", conf->dl_search_path);
 
-    pa_log_info(_("Running in system mode: %s"), pa_yes_no(pa_in_system_mode()));
+    pa_log_info("Running in system mode: %s", pa_yes_no(pa_in_system_mode()));
 
     if (pa_in_system_mode())
         pa_log_warn(_("OK, so you are running PA in system mode. Please note that you most likely shouldn't be doing that.\n"
@@ -1003,9 +1000,9 @@ int main(int argc, char *argv[]) {
     pa_disable_sigpipe();
 
     if (pa_rtclock_hrtimer())
-        pa_log_info(_("Fresh high-resolution timers available! Bon appetit!"));
+        pa_log_info("Fresh high-resolution timers available! Bon appetit!");
     else
-        pa_log_info(_("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"));
+        pa_log_info("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!");
 
     if (conf->lock_memory) {
 #if defined(HAVE_SYS_MMAN_H) && !defined(__ANDROID__)
@@ -1038,25 +1035,18 @@ int main(int argc, char *argv[]) {
     c->scache_idle_time = conf->scache_idle_time;
     c->resample_method = conf->resample_method;
     c->realtime_priority = conf->realtime_priority;
-    c->realtime_scheduling = !!conf->realtime_scheduling;
-    c->disable_remixing = !!conf->disable_remixing;
-    c->disable_lfe_remixing = !!conf->disable_lfe_remixing;
-    c->deferred_volume = !!conf->deferred_volume;
-    c->running_as_daemon = !!conf->daemonize;
+    c->realtime_scheduling = conf->realtime_scheduling;
+    c->disable_remixing = conf->disable_remixing;
+    c->disable_lfe_remixing = conf->disable_lfe_remixing;
+    c->deferred_volume = conf->deferred_volume;
+    c->running_as_daemon = conf->daemonize;
     c->disallow_exit = conf->disallow_exit;
     c->flat_volumes = conf->flat_volumes;
 #ifdef HAVE_DBUS
     c->server_type = conf->local_server_type;
 #endif
 
-    c->cpu_info.cpu_type = PA_CPU_UNDEFINED;
-    if (!getenv("PULSE_NO_SIMD")) {
-        if (pa_cpu_init_x86(&(c->cpu_info.flags.x86)))
-            c->cpu_info.cpu_type = PA_CPU_X86;
-        if (pa_cpu_init_arm(&(c->cpu_info.flags.arm)))
-            c->cpu_info.cpu_type = PA_CPU_ARM;
-        pa_cpu_init_orc(c->cpu_info);
-    }
+    pa_cpu_init(&c->cpu_info);
 
     pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0);
     pa_signal_new(SIGINT, signal_callback, c);
@@ -1071,10 +1061,6 @@ int main(int argc, char *argv[]) {
     pa_signal_new(SIGHUP, signal_callback, c);
 #endif
 
-#ifdef OS_IS_WIN32
-    win32_timer = pa_mainloop_get_api(mainloop)->time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&win32_tv), message_cb, NULL);
-#endif
-
     if (!conf->no_cpu_limit)
         pa_assert_se(pa_cpu_limit_init(pa_mainloop_get_api(mainloop)) == 0);
 
@@ -1121,7 +1107,7 @@ int main(int argc, char *argv[]) {
 
     /* We completed the initial module loading, so let's disable it
      * from now on, if requested */
-    c->disallow_module_loading = !!conf->disallow_module_loading;
+    c->disallow_module_loading = conf->disallow_module_loading;
 
 #ifdef HAVE_DBUS
     if (!conf->system_instance) {
@@ -1144,13 +1130,13 @@ int main(int argc, char *argv[]) {
     }
 #endif
 
-    pa_log_info(_("Daemon startup complete."));
+    pa_log_info("Daemon startup complete.");
 
     retval = 0;
     if (pa_mainloop_run(mainloop, &retval) < 0)
         goto finish;
 
-    pa_log_info(_("Daemon shutdown initiated."));
+    pa_log_info("Daemon shutdown initiated.");
 
 finish:
 #ifdef HAVE_DBUS
@@ -1169,11 +1155,6 @@ finish:
         pa_autospawn_lock_done(false);
     }
 
-#ifdef OS_IS_WIN32
-    if (mainloop && win32_timer)
-        pa_mainloop_get_api(mainloop)->time_free(win32_timer);
-#endif
-
     if (c) {
         /* Ensure all the modules/samples are unloaded when the core is still ref'ed,
          * as unlink callback hooks in modules may need the core to be ref'ed */
@@ -1181,7 +1162,7 @@ finish:
         pa_scache_free_all(c);
 
         pa_core_unref(c);
-        pa_log_info(_("Daemon terminated."));
+        pa_log_info("Daemon terminated.");
     }
 
     if (!conf->no_cpu_limit)
diff --git a/src/daemon/pulseaudio-kde.desktop.in b/src/daemon/pulseaudio-kde.desktop.in
deleted file mode 100644
index f0bfa8f..0000000
--- a/src/daemon/pulseaudio-kde.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-_Name=PulseAudio Sound System KDE Routing Policy
-_Comment=Start the PulseAudio Sound System with KDE Routing Policy
-Exec=start-pulseaudio-kde
-Terminal=false
-Type=Application
-Categories=
-GenericName=
-OnlyShowIn=KDE;
diff --git a/src/daemon/pulseaudio.desktop.in b/src/daemon/pulseaudio.desktop.in
index ce99382..06cde27 100644
--- a/src/daemon/pulseaudio.desktop.in
+++ b/src/daemon/pulseaudio.desktop.in
@@ -8,3 +8,4 @@ Type=Application
 Categories=
 GenericName=
 X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
index 82c8851..c281530 100644
--- a/src/daemon/server-lookup.c
+++ b/src/daemon/server-lookup.c
@@ -115,7 +115,6 @@ finish:
 
 enum get_address_result_t {
     SUCCESS,
-    FAILED_TO_LOAD_CLIENT_CONF,
     SERVER_FROM_TYPE_FAILED
 };
 
@@ -126,10 +125,7 @@ static enum get_address_result_t get_address(pa_server_type_t server_type, char
 
     *address = NULL;
 
-    if (pa_client_conf_load(conf, NULL) < 0) {
-        r = FAILED_TO_LOAD_CLIENT_CONF;
-        goto finish;
-    }
+    pa_client_conf_load(conf, false, false);
 
     if (conf->default_dbus_server)
         *address = pa_xstrdup(conf->default_dbus_server);
@@ -180,18 +176,6 @@ static DBusHandlerResult handle_get_address(DBusConnection *conn, DBusMessage *m
             r = DBUS_HANDLER_RESULT_HANDLED;
             goto finish;
 
-        case FAILED_TO_LOAD_CLIENT_CONF:
-            if (!(reply = dbus_message_new_error(msg, "org.pulseaudio.ClientConfLoadError", "Failed to load client.conf."))) {
-                r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-                goto finish;
-            }
-            if (!dbus_connection_send(conn, reply, NULL)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            r = DBUS_HANDLER_RESULT_HANDLED;
-            goto finish;
-
         case SERVER_FROM_TYPE_FAILED:
             if (!(reply = dbus_message_new_error(msg, DBUS_ERROR_FAILED, "PulseAudio internal error: get_dbus_server_from_type() failed."))) {
                 r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@ -398,18 +382,6 @@ static DBusHandlerResult handle_get_all(DBusConnection *conn, DBusMessage *msg,
             r = DBUS_HANDLER_RESULT_HANDLED;
             goto finish;
 
-        case FAILED_TO_LOAD_CLIENT_CONF:
-            if (!(reply = dbus_message_new_error(msg, "org.pulseaudio.ClientConfLoadError", "Failed to load client.conf."))) {
-                r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-                goto finish;
-            }
-            if (!dbus_connection_send(conn, reply, NULL)) {
-                r = DBUS_HANDLER_RESULT_NEED_MEMORY;
-                goto finish;
-            }
-            r = DBUS_HANDLER_RESULT_HANDLED;
-            goto finish;
-
         case SERVER_FROM_TYPE_FAILED:
             if (!(reply = dbus_message_new_error(msg, DBUS_ERROR_FAILED, "PulseAudio internal error: get_dbus_server_from_type() failed."))) {
                 r = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
diff --git a/src/daemon/start-pulseaudio-kde.in b/src/daemon/start-pulseaudio-kde.in
deleted file mode 100755
index c319e7d..0000000
--- a/src/daemon/start-pulseaudio-kde.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
-
-set -e
-
-[ -z "$PULSE_SERVER" ]
-
- at PA_BINARY@ --start "$@"
-
-if [ x"$DISPLAY" != x ] ; then
-
-    @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
-
-fi
diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
index 391a6d3..63ed740 100755
--- a/src/daemon/start-pulseaudio-x11.in
+++ b/src/daemon/start-pulseaudio-x11.in
@@ -19,13 +19,15 @@
 
 set -e
 
- at PA_BINARY@ --start "$@"
-
 if [ x"$DISPLAY" != x ] ; then
 
     @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
     @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null
 
+    if [ x"$KDE_FULL_SESSION" = x"true" ]; then
+       @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
+    fi
+
     if [ x"$SESSION_MANAGER" != x ] ; then
 	@PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null
     fi
diff --git a/src/daemon/systemd/user/pulseaudio.service.in b/src/daemon/systemd/user/pulseaudio.service.in
new file mode 100644
index 0000000..e08ff1e
--- /dev/null
+++ b/src/daemon/systemd/user/pulseaudio.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=Sound Service
+
+[Service]
+ExecStart=@PA_BINARY@ --daemonize=no
+Restart=on-failure
+
+[Install]
+Also=pulseaudio.socket
+WantedBy=default.target
diff --git a/src/daemon/systemd/user/pulseaudio.socket b/src/daemon/systemd/user/pulseaudio.socket
new file mode 100644
index 0000000..332ece8
--- /dev/null
+++ b/src/daemon/systemd/user/pulseaudio.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Sound System
+
+[Socket]
+Priority=6
+Backlog=5
+ListenStream=%t/pulse/native
+
+[Install]
+WantedBy=sockets.target
diff --git a/src/map-file b/src/map-file
index fbad1a4..5159829 100644
--- a/src/map-file
+++ b/src/map-file
@@ -146,6 +146,8 @@ pa_cvolume_set_position;
 pa_cvolume_snprint;
 pa_cvolume_snprint_verbose;
 pa_cvolume_valid;
+pa_direction_to_string;
+pa_direction_valid;
 pa_encoding_to_string;
 pa_ext_device_manager_delete;
 pa_ext_device_manager_enable_role_device_priority_routing;
@@ -328,6 +330,7 @@ pa_stream_update_sample_rate;
 pa_stream_update_timing_info;
 pa_stream_writable_size;
 pa_stream_write;
+pa_stream_write_ext_free;
 pa_strerror;
 pa_sw_cvolume_divide;
 pa_sw_cvolume_divide_scalar;
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 99de0ec..b5d6276 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -50,6 +50,58 @@
 #include "alsa-mixer.h"
 #include "alsa-util.h"
 
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+/* These macros are workarounds for a bug in valgrind, which is not handling the
+ * ALSA TLV syscalls correctly. See
+ * http://valgrind.10908.n7.nabble.com/Missing-ioctl-for-SNDRV-CTL-IOCTL-TLV-READ-td42711.html */
+
+static inline int vgfix_get_capture_dB(snd_mixer_elem_t *a, snd_mixer_selem_channel_id_t b, long *c) {
+    int r = snd_mixer_selem_get_capture_dB(a, b, c);
+    VALGRIND_MAKE_MEM_DEFINED(c, sizeof(*c));
+    return r;
+}
+
+static inline int vgfix_get_playback_dB(snd_mixer_elem_t *a, snd_mixer_selem_channel_id_t b, long *c) {
+    int r = snd_mixer_selem_get_playback_dB(a, b, c);
+    VALGRIND_MAKE_MEM_DEFINED(c, sizeof(*c));
+    return r;
+}
+
+static inline int vgfix_ask_capture_vol_dB(snd_mixer_elem_t *a, long b, long *c) {
+    int r = snd_mixer_selem_ask_capture_vol_dB(a, b, c);
+    VALGRIND_MAKE_MEM_DEFINED(c, sizeof(*c));
+    return r;
+}
+
+static inline int vgfix_ask_playback_vol_dB(snd_mixer_elem_t *a, long b, long *c) {
+    int r = snd_mixer_selem_ask_playback_vol_dB(a, b, c);
+    VALGRIND_MAKE_MEM_DEFINED(c, sizeof(*c));
+    return r;
+}
+
+static inline int vgfix_get_capture_dB_range(snd_mixer_elem_t *a, long *b, long *c) {
+    int r = snd_mixer_selem_get_capture_dB_range(a, b, c);
+    VALGRIND_MAKE_MEM_DEFINED(b, sizeof(*b));
+    VALGRIND_MAKE_MEM_DEFINED(c, sizeof(*c));
+    return r;
+}
+
+static inline int vgfix_get_playback_dB_range(snd_mixer_elem_t *a, long *b, long *c) {
+    int r = snd_mixer_selem_get_playback_dB_range(a, b, c);
+    VALGRIND_MAKE_MEM_DEFINED(b, sizeof(*b));
+    VALGRIND_MAKE_MEM_DEFINED(c, sizeof(*c));
+    return r;
+}
+
+#define snd_mixer_selem_get_capture_dB(a, b, c) vgfix_get_capture_dB(a, b, c)
+#define snd_mixer_selem_get_playback_dB(a, b, c) vgfix_get_playback_dB(a, b, c)
+#define snd_mixer_selem_ask_capture_vol_dB(a, b, c) vgfix_ask_capture_vol_dB(a, b, c)
+#define snd_mixer_selem_ask_playback_vol_dB(a, b, c) vgfix_ask_playback_vol_dB(a, b, c)
+#define snd_mixer_selem_get_capture_dB_range(a, b, c) vgfix_get_capture_dB_range(a, b, c)
+#define snd_mixer_selem_get_playback_dB_range(a, b, c) vgfix_get_playback_dB_range(a, b, c)
+
+#endif
+
 static int setting_select(pa_alsa_setting *s, snd_mixer_t *m);
 
 struct description_map {
@@ -1001,10 +1053,6 @@ static int element_set_volume(pa_alsa_element *e, snd_mixer_t *m, const pa_chann
             if (r < 0)
                 continue;
 
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-            VALGRIND_MAKE_MEM_DEFINED(&value, sizeof(value));
-#endif
-
             f = from_alsa_dB(value);
 
         } else {
@@ -1517,11 +1565,6 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
                 }
 
                 if (e->has_dB) {
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-                    VALGRIND_MAKE_MEM_DEFINED(&min_dB, sizeof(min_dB));
-                    VALGRIND_MAKE_MEM_DEFINED(&max_dB, sizeof(max_dB));
-#endif
-
                     e->min_dB = ((double) min_dB) / 100.0;
                     e->max_dB = ((double) max_dB) / 100.0;
 
@@ -1682,12 +1725,11 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
     return 0;
 }
 
-static int jack_probe(pa_alsa_jack *j, snd_hctl_t *h) {
-    pa_assert(h);
+static int jack_probe(pa_alsa_jack *j, snd_mixer_t *m) {
     pa_assert(j);
     pa_assert(j->path);
 
-    j->has_control = pa_alsa_find_jack(h, j->alsa_name) != NULL;
+    j->has_control = pa_alsa_mixer_find(m, j->alsa_name, 0) != NULL;
 
     if (j->has_control) {
         if (j->required_absent != PA_ALSA_REQUIRED_IGNORE)
@@ -2615,7 +2657,7 @@ static void path_create_settings(pa_alsa_path *p) {
     element_create_settings(p->elements, NULL);
 }
 
-int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, snd_hctl_t *hctl, bool ignore_dB) {
+int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, bool ignore_dB) {
     pa_alsa_element *e;
     pa_alsa_jack *j;
     double min_dB[PA_CHANNEL_POSITION_MAX], max_dB[PA_CHANNEL_POSITION_MAX];
@@ -2635,7 +2677,7 @@ int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, snd_hctl_t *hctl, bool i
     pa_log_debug("Probing path '%s'", p->name);
 
     PA_LLIST_FOREACH(j, p->jacks) {
-        if (jack_probe(j, hctl) < 0) {
+        if (jack_probe(j, m) < 0) {
             p->supported = false;
             pa_log_debug("Probe of jack '%s' failed.", j->alsa_name);
             return -1;
@@ -3113,8 +3155,7 @@ static bool element_is_subset(pa_alsa_element *a, pa_alsa_element *b, snd_mixer_
             else if (a->volume_use == PA_ALSA_VOLUME_MERGE)
                 a_limit = a->volume_limit;
             else
-                /* This should never be reached */
-                pa_assert(false);
+                pa_assert_not_reached();
 
             if (a_limit > b->volume_limit)
                 return false;
@@ -3218,21 +3259,21 @@ static void path_set_condense(pa_alsa_path_set *ps, snd_mixer_t *m) {
             }
 
             /* Compare the elements of each set... */
-            ea = p->elements;
-            eb = p2->elements;
+            PA_LLIST_FOREACH(ea, p->elements) {
+                bool found_matching_element = false;
 
-            while (is_subset) {
-                if (!ea && !eb)
+                if (!is_subset)
                     break;
-                else if ((ea && !eb) || (!ea && eb))
-                    is_subset = false;
-                else if (pa_streq(ea->alsa_name, eb->alsa_name)) {
-                    if (element_is_subset(ea, eb, m)) {
-                        ea = ea->next;
-                        eb = eb->next;
-                    } else
-                        is_subset = false;
-                } else
+
+                PA_LLIST_FOREACH(eb, p2->elements) {
+                    if (pa_streq(ea->alsa_name, eb->alsa_name)) {
+                        found_matching_element = true;
+                        is_subset = element_is_subset(ea, eb, m);
+                        break;
+                    }
+                }
+
+                if (!found_matching_element)
                     is_subset = false;
             }
 
@@ -3368,6 +3409,7 @@ pa_alsa_mapping *pa_alsa_mapping_get(pa_alsa_profile_set *ps, const char *name)
 
     m = pa_xnew0(pa_alsa_mapping, 1);
     m->profile_set = ps;
+    m->exact_channels = true;
     m->name = pa_xstrdup(name);
     pa_sample_spec_init(&m->sample_spec);
     pa_channel_map_init(&m->channel_map);
@@ -3485,6 +3527,30 @@ static int mapping_parse_paths(pa_config_parser_state *state) {
     return 0;
 }
 
+static int mapping_parse_exact_channels(pa_config_parser_state *state) {
+    pa_alsa_profile_set *ps;
+    pa_alsa_mapping *m;
+    int b;
+
+    pa_assert(state);
+
+    ps = state->userdata;
+
+    if (!(m = pa_alsa_mapping_get(ps, state->section))) {
+        pa_log("[%s:%u] %s invalid in section %s", state->filename, state->lineno, state->lvalue, state->section);
+        return -1;
+    }
+
+    if ((b = pa_parse_boolean(state->rvalue)) < 0) {
+        pa_log("[%s:%u] %s has invalid value '%s'", state->filename, state->lineno, state->lvalue, state->section);
+        return -1;
+    }
+
+    m->exact_channels = b;
+
+    return 0;
+}
+
 static int mapping_parse_element(pa_config_parser_state *state) {
     pa_alsa_profile_set *ps;
     pa_alsa_mapping *m;
@@ -3586,6 +3652,34 @@ static int mapping_parse_priority(pa_config_parser_state *state) {
     return 0;
 }
 
+static int mapping_parse_fallback(pa_config_parser_state *state) {
+    pa_alsa_profile_set *ps;
+    pa_alsa_profile *p;
+    pa_alsa_mapping *m;
+    int k;
+
+    pa_assert(state);
+
+    ps = state->userdata;
+
+    if ((k = pa_parse_boolean(state->rvalue)) < 0) {
+        pa_log("[%s:%u] Fallback invalid of '%s'", state->filename, state->lineno, state->section);
+        return -1;
+    }
+
+    if ((m = pa_alsa_mapping_get(ps, state->section)))
+        m->fallback = k;
+    else if ((p = profile_get(ps, state->section)))
+        p->fallback_input = p->fallback_output = k;
+    else {
+        pa_log("[%s:%u] Section name %s invalid.", state->filename, state->lineno, state->section);
+        return -1;
+    }
+
+    return 0;
+}
+
+
 static int profile_parse_mappings(pa_config_parser_state *state) {
     pa_alsa_profile_set *ps;
     pa_alsa_profile *p;
@@ -3756,7 +3850,6 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile,
     snd_pcm_t *pcm_handle;
     pa_alsa_path_set *ps;
     snd_mixer_t *mixer_handle;
-    snd_hctl_t *hctl_handle;
 
     if (direction == PA_ALSA_DIRECTION_OUTPUT) {
         if (m->output_path_set)
@@ -3775,15 +3868,15 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile,
 
     pa_assert(pcm_handle);
 
-    mixer_handle = pa_alsa_open_mixer_for_pcm(pcm_handle, NULL, &hctl_handle);
-    if (!mixer_handle || !hctl_handle) {
-         /* Cannot open mixer, remove all entries */
+    mixer_handle = pa_alsa_open_mixer_for_pcm(pcm_handle, NULL);
+    if (!mixer_handle) {
+        /* Cannot open mixer, remove all entries */
         pa_hashmap_remove_all(ps->paths);
         return;
     }
 
     PA_HASHMAP_FOREACH(p, ps->paths, state) {
-        if (pa_alsa_path_probe(p, mixer_handle, hctl_handle, m->profile_set->ignore_dB) < 0) {
+        if (pa_alsa_path_probe(p, mixer_handle, m->profile_set->ignore_dB) < 0) {
             pa_hashmap_remove(ps->paths, p);
         }
     }
@@ -3806,6 +3899,7 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) {
     static const struct description_map well_known_descriptions[] = {
         { "analog-mono",            N_("Analog Mono") },
         { "analog-stereo",          N_("Analog Stereo") },
+        { "multichannel",           N_("Multichannel") },
         { "analog-surround-21",     N_("Analog Surround 2.1") },
         { "analog-surround-30",     N_("Analog Surround 3.0") },
         { "analog-surround-31",     N_("Analog Surround 3.1") },
@@ -3817,7 +3911,6 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) {
         { "analog-surround-61",     N_("Analog Surround 6.1") },
         { "analog-surround-70",     N_("Analog Surround 7.0") },
         { "analog-surround-71",     N_("Analog Surround 7.1") },
-        { "analog-4-channel-input", N_("Analog 4-channel Input") },
         { "iec958-stereo",          N_("Digital Stereo (IEC958)") },
         { "iec958-passthrough",     N_("Digital Passthrough  (IEC958)") },
         { "iec958-ac3-surround-40", N_("Digital Surround 4.0 (IEC958/AC3)") },
@@ -3914,12 +4007,14 @@ static void profile_set_add_auto_pair(
         p->output_mappings = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
         pa_idxset_put(p->output_mappings, m, NULL);
         p->priority += m->priority * 100;
+        p->fallback_output = m->fallback;
     }
 
     if (n) {
         p->input_mappings = pa_idxset_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
         pa_idxset_put(p->input_mappings, n, NULL);
         p->priority += n->priority;
+        p->fallback_input = n->fallback;
     }
 
     pa_hashmap_put(ps->profiles, p->name, p);
@@ -4156,10 +4251,12 @@ pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel
         { "element-input",          mapping_parse_element,        NULL, NULL },
         { "element-output",         mapping_parse_element,        NULL, NULL },
         { "direction",              mapping_parse_direction,      NULL, NULL },
+        { "exact-channels",         mapping_parse_exact_channels, NULL, NULL },
 
         /* Shared by [Mapping ...] and [Profile ...] */
         { "description",            mapping_parse_description,    NULL, NULL },
         { "priority",               mapping_parse_priority,       NULL, NULL },
+        { "fallback",               mapping_parse_fallback,       NULL, NULL },
 
         /* [Profile ...] */
         { "input-mappings",         profile_parse_mappings,       NULL, NULL },
@@ -4264,10 +4361,12 @@ static void profile_finalize_probing(pa_alsa_profile *to_be_finalized, pa_alsa_p
 static snd_pcm_t* mapping_open_pcm(pa_alsa_mapping *m,
                                    const pa_sample_spec *ss,
                                    const char *dev_id,
+                                   bool exact_channels,
                                    int mode,
                                    unsigned default_n_fragments,
                                    unsigned default_fragment_size_msec) {
 
+    snd_pcm_t* handle;
     pa_sample_spec try_ss = *ss;
     pa_channel_map try_map = m->channel_map;
     snd_pcm_uframes_t try_period_size, try_buffer_size;
@@ -4279,10 +4378,17 @@ static snd_pcm_t* mapping_open_pcm(pa_alsa_mapping *m,
         pa_frame_size(&try_ss);
     try_buffer_size = default_n_fragments * try_period_size;
 
-    return pa_alsa_open_by_template(
+    handle = pa_alsa_open_by_template(
                               m->device_strings, dev_id, NULL, &try_ss,
                               &try_map, mode, &try_period_size,
-                              &try_buffer_size, 0, NULL, NULL, true);
+                              &try_buffer_size, 0, NULL, NULL, exact_channels);
+    if (handle && !exact_channels && m->channel_map.channels != try_map.channels) {
+        char buf[PA_CHANNEL_MAP_SNPRINT_MAX];
+        pa_log_debug("Channel map for mapping '%s' permanently changed to '%s'", m->name,
+                     pa_channel_map_snprint(buf, sizeof(buf), &try_map));
+        m->channel_map = try_map;
+    }
+    return handle;
 }
 
 static void paths_drop_unused(pa_hashmap* h, pa_hashmap *keep) {
@@ -4296,14 +4402,30 @@ static void paths_drop_unused(pa_hashmap* h, pa_hashmap *keep) {
 
     p = pa_hashmap_iterate(h, &state, &key);
     while (p) {
-        if (pa_hashmap_get(keep, p) == NULL) {
-            pa_hashmap_remove(h, key);
-            pa_alsa_path_free(p);
-        }
+        if (pa_hashmap_get(keep, p) == NULL)
+            pa_hashmap_remove_and_free(h, key);
         p = pa_hashmap_iterate(h, &state, &key);
     }
 }
 
+static int add_profiles_to_probe(
+        pa_alsa_profile **list,
+        pa_hashmap *profiles,
+        bool fallback_output,
+        bool fallback_input) {
+
+    int i = 0;
+    void *state;
+    pa_alsa_profile *p;
+    PA_HASHMAP_FOREACH(p, profiles, state)
+        if (p->fallback_input == fallback_input && p->fallback_output == fallback_output) {
+            *list = p;
+            list++;
+            i++;
+        }
+    return i;
+}
+
 void pa_alsa_profile_set_probe(
         pa_alsa_profile_set *ps,
         const char *dev_id,
@@ -4311,8 +4433,10 @@ void pa_alsa_profile_set_probe(
         unsigned default_n_fragments,
         unsigned default_fragment_size_msec) {
 
-    void *state;
+    bool found_output = false, found_input = false;
+
     pa_alsa_profile *p, *last = NULL;
+    pa_alsa_profile **pp, **probe_order;
     pa_alsa_mapping *m;
     pa_hashmap *broken_inputs, *broken_outputs, *used_paths;
 
@@ -4326,9 +4450,22 @@ void pa_alsa_profile_set_probe(
     broken_inputs = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
     broken_outputs = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
     used_paths = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+    pp = probe_order = pa_xnew0(pa_alsa_profile *, pa_hashmap_size(ps->profiles) + 1);
 
-    PA_HASHMAP_FOREACH(p, ps->profiles, state) {
+    pp += add_profiles_to_probe(pp, ps->profiles, false, false);
+    pp += add_profiles_to_probe(pp, ps->profiles, false, true);
+    pp += add_profiles_to_probe(pp, ps->profiles, true, false);
+    pp += add_profiles_to_probe(pp, ps->profiles, true, true);
+
+    for (pp = probe_order; *pp; pp++) {
         uint32_t idx;
+        p = *pp;
+
+        /* Skip if fallback and already found something */
+        if (found_input && p->fallback_input)
+            continue;
+        if (found_output && p->fallback_output)
+            continue;
 
         /* Skip if this is already marked that it is supported (i.e. from the config file) */
         if (!p->supported) {
@@ -4367,7 +4504,7 @@ void pa_alsa_profile_set_probe(
                         continue;
 
                     pa_log_debug("Checking for playback on %s (%s)", m->description, m->name);
-                    if (!(m->output_pcm = mapping_open_pcm(m, ss, dev_id,
+                    if (!(m->output_pcm = mapping_open_pcm(m, ss, dev_id, m->exact_channels,
                                                            SND_PCM_STREAM_PLAYBACK,
                                                            default_n_fragments,
                                                            default_fragment_size_msec))) {
@@ -4388,7 +4525,7 @@ void pa_alsa_profile_set_probe(
                         continue;
 
                     pa_log_debug("Checking for recording on %s (%s)", m->description, m->name);
-                    if (!(m->input_pcm = mapping_open_pcm(m, ss, dev_id,
+                    if (!(m->input_pcm = mapping_open_pcm(m, ss, dev_id, m->exact_channels,
                                                           SND_PCM_STREAM_CAPTURE,
                                                           default_n_fragments,
                                                           default_fragment_size_msec))) {
@@ -4412,13 +4549,17 @@ void pa_alsa_profile_set_probe(
 
         if (p->output_mappings)
             PA_IDXSET_FOREACH(m, p->output_mappings, idx)
-                if (m->output_pcm)
+                if (m->output_pcm) {
+                    found_output |= !p->fallback_output;
                     mapping_paths_probe(m, p, PA_ALSA_DIRECTION_OUTPUT, used_paths);
+                }
 
         if (p->input_mappings)
             PA_IDXSET_FOREACH(m, p->input_mappings, idx)
-                if (m->input_pcm)
+                if (m->input_pcm) {
+                    found_input |= !p->fallback_input;
                     mapping_paths_probe(m, p, PA_ALSA_DIRECTION_INPUT, used_paths);
+                }
     }
 
     /* Clean up */
@@ -4431,6 +4572,7 @@ void pa_alsa_profile_set_probe(
     pa_hashmap_free(broken_inputs);
     pa_hashmap_free(broken_outputs);
     pa_hashmap_free(used_paths);
+    pa_xfree(probe_order);
 
     ps->probed = true;
 }
@@ -4468,17 +4610,13 @@ void pa_alsa_profile_set_drop_unsupported(pa_alsa_profile_set *ps) {
     void *state;
 
     PA_HASHMAP_FOREACH(p, ps->profiles, state) {
-        if (!p->supported) {
-            pa_hashmap_remove(ps->profiles, p->name);
-            profile_free(p);
-        }
+        if (!p->supported)
+            pa_hashmap_remove_and_free(ps->profiles, p->name);
     }
 
     PA_HASHMAP_FOREACH(m, ps->mappings, state) {
-        if (m->supported <= 0) {
-            pa_hashmap_remove(ps->mappings, m->name);
-            mapping_free(m);
-        }
+        if (m->supported <= 0)
+            pa_hashmap_remove_and_free(ps->mappings, m->name);
     }
 }
 
diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
index 995a34b..7e6300e 100644
--- a/src/modules/alsa/alsa-mixer.h
+++ b/src/modules/alsa/alsa-mixer.h
@@ -164,7 +164,7 @@ struct pa_alsa_jack {
     char *alsa_name; /* E g "Headphone Jack" */
     bool has_control; /* is the jack itself present? */
     bool plugged_in; /* is this jack currently plugged in? */
-    snd_hctl_elem_t *hctl_elem; /* Jack detection handle */
+    snd_mixer_elem_t *melem; /* Jack detection handle */
     pa_available_t state_unplugged, state_plugged;
 
     pa_alsa_required_t required;
@@ -226,7 +226,7 @@ void pa_alsa_element_dump(pa_alsa_element *e);
 
 pa_alsa_path *pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa_direction_t direction);
 pa_alsa_path *pa_alsa_path_synthesize(const char *element, pa_alsa_direction_t direction);
-int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, snd_hctl_t *hctl, bool ignore_dB);
+int pa_alsa_path_probe(pa_alsa_path *p, snd_mixer_t *m, bool ignore_dB);
 void pa_alsa_path_dump(pa_alsa_path *p);
 int pa_alsa_path_get_volume(pa_alsa_path *p, snd_mixer_t *m, const pa_channel_map *cm, pa_cvolume *v);
 int pa_alsa_path_get_mute(pa_alsa_path *path, snd_mixer_t *m, bool *muted);
@@ -264,6 +264,8 @@ struct pa_alsa_mapping {
     pa_alsa_path_set *output_path_set;
 
     unsigned supported;
+    bool exact_channels:1;
+    bool fallback:1;
 
     /* Temporarily used during probing */
     snd_pcm_t *input_pcm;
@@ -284,6 +286,8 @@ struct pa_alsa_profile {
     unsigned priority;
 
     bool supported:1;
+    bool fallback_input:1;
+    bool fallback_output:1;
 
     char **input_mapping_names;
     char **output_mapping_names;
@@ -331,7 +335,7 @@ void pa_alsa_profile_set_free(pa_alsa_profile_set *s);
 void pa_alsa_profile_set_dump(pa_alsa_profile_set *s);
 void pa_alsa_profile_set_drop_unsupported(pa_alsa_profile_set *s);
 
-snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device, snd_hctl_t **hctl);
+snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device);
 
 pa_alsa_fdlist *pa_alsa_fdlist_new(void);
 void pa_alsa_fdlist_free(pa_alsa_fdlist *fdl);
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index ccf1137..e256bbd 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -127,6 +127,8 @@ struct userdata {
         watermark_dec_threshold,
         rewind_safeguard;
 
+    snd_pcm_uframes_t frames_per_block;
+
     pa_usec_t watermark_dec_not_before;
     pa_usec_t min_latency_ref;
     pa_usec_t tsched_watermark_usec;
@@ -619,8 +621,7 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, bool polled, bo
             }
 
             /* Make sure that if these memblocks need to be copied they will fit into one slot */
-            if (frames > pa_mempool_block_size_max(u->core->mempool)/u->frame_size)
-                frames = pa_mempool_block_size_max(u->core->mempool)/u->frame_size;
+            frames = PA_MIN(frames, u->frames_per_block);
 
             if (!after_avail && frames == 0)
                 break;
@@ -630,7 +631,7 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, bool polled, bo
 
             /* Check these are multiples of 8 bit */
             pa_assert((areas[0].first & 7) == 0);
-            pa_assert((areas[0].step & 7)== 0);
+            pa_assert((areas[0].step & 7) == 0);
 
             /* We assume a single interleaved memory buffer */
             pa_assert((areas[0].first >> 3) == 0);
@@ -648,7 +649,7 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, bool polled, bo
 
             if (PA_UNLIKELY((sframes = snd_pcm_mmap_commit(u->pcm_handle, offset, frames)) < 0)) {
 
-                if (!after_avail && (int) sframes == -EAGAIN)
+                if ((int) sframes == -EAGAIN)
                     break;
 
                 if ((r = try_recover(u, "snd_pcm_mmap_commit", (int) sframes)) == 0)
@@ -1395,18 +1396,17 @@ static void sink_write_volume_cb(pa_sink *s) {
     }
 }
 
-static void sink_get_mute_cb(pa_sink *s) {
+static int sink_get_mute_cb(pa_sink *s, bool *mute) {
     struct userdata *u = s->userdata;
-    bool b;
 
     pa_assert(u);
     pa_assert(u->mixer_path);
     pa_assert(u->mixer_handle);
 
-    if (pa_alsa_path_get_mute(u->mixer_path, u->mixer_handle, &b) < 0)
-        return;
+    if (pa_alsa_path_get_mute(u->mixer_path, u->mixer_handle, mute) < 0)
+        return -1;
 
-    s->muted = b;
+    return 0;
 }
 
 static void sink_set_mute_cb(pa_sink *s) {
@@ -1797,7 +1797,7 @@ static void thread_func(void *userdata) {
             pa_rtpoll_set_timer_disabled(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (rtpoll_sleep > 0) {
@@ -1887,12 +1887,10 @@ static void set_sink_name(pa_sink_new_data *data, pa_modargs *ma, const char *de
 }
 
 static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char *element, bool ignore_dB) {
-    snd_hctl_t *hctl;
-
     if (!mapping && !element)
         return;
 
-    if (!(u->mixer_handle = pa_alsa_open_mixer_for_pcm(u->pcm_handle, &u->control_device, &hctl))) {
+    if (!(u->mixer_handle = pa_alsa_open_mixer_for_pcm(u->pcm_handle, &u->control_device))) {
         pa_log_info("Failed to find a working mixer device.");
         return;
     }
@@ -1902,7 +1900,7 @@ static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char
         if (!(u->mixer_path = pa_alsa_path_synthesize(element, PA_ALSA_DIRECTION_OUTPUT)))
             goto fail;
 
-        if (pa_alsa_path_probe(u->mixer_path, u->mixer_handle, hctl, ignore_dB) < 0)
+        if (pa_alsa_path_probe(u->mixer_path, u->mixer_handle, ignore_dB) < 0)
             goto fail;
 
         pa_log_debug("Probed mixer path %s:", u->mixer_path->name);
@@ -2278,7 +2276,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
             pa_proplist_sets(data.proplist, key, pa_proplist_gets(mapping->proplist, key));
     }
 
-    pa_alsa_init_description(data.proplist);
+    pa_alsa_init_description(data.proplist, card);
 
     if (u->control_device)
         pa_alsa_init_proplist_ctl(data.proplist, u->control_device);
@@ -2331,6 +2329,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
     pa_sink_set_rtpoll(u->sink, u->rtpoll);
 
     u->frame_size = frame_size;
+    u->frames_per_block = pa_mempool_block_size_max(m->core->mempool) / frame_size;
     u->fragment_size = frag_size = (size_t) (period_frames * frame_size);
     u->hwbuf_size = buffer_size = (size_t) (buffer_frames * frame_size);
     pa_cvolume_mute(&u->hardware_volume, u->sink->sample_spec.channels);
@@ -2390,8 +2389,12 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
         if (u->sink->set_mute)
             u->sink->set_mute(u->sink);
     } else {
-        if (u->sink->get_mute)
-            u->sink->get_mute(u->sink);
+        if (u->sink->get_mute) {
+            bool mute;
+
+            if (u->sink->get_mute(u->sink, &mute) >= 0)
+                pa_sink_set_mute(u->sink, mute, false);
+        }
     }
 
     if ((data.volume_is_set || data.muted_is_set) && u->sink->write_volume)
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 2e93e0f..111c517 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -116,6 +116,8 @@ struct userdata {
         watermark_inc_threshold,
         watermark_dec_threshold;
 
+    snd_pcm_uframes_t frames_per_block;
+
     pa_usec_t watermark_dec_not_before;
     pa_usec_t min_latency_ref;
     pa_usec_t tsched_watermark_usec;
@@ -576,8 +578,7 @@ static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec, bool polled, boo
             }
 
             /* Make sure that if these memblocks need to be copied they will fit into one slot */
-            if (frames > pa_mempool_block_size_max(u->core->mempool)/u->frame_size)
-                frames = pa_mempool_block_size_max(u->core->mempool)/u->frame_size;
+            frames = PA_MIN(frames, u->frames_per_block);
 
             if (!after_avail && frames == 0)
                 break;
@@ -587,7 +588,7 @@ static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec, bool polled, boo
 
             /* Check these are multiples of 8 bit */
             pa_assert((areas[0].first & 7) == 0);
-            pa_assert((areas[0].step & 7)== 0);
+            pa_assert((areas[0].step & 7) == 0);
 
             /* We assume a single interleaved memory buffer */
             pa_assert((areas[0].first >> 3) == 0);
@@ -1277,18 +1278,17 @@ static void source_write_volume_cb(pa_source *s) {
     }
 }
 
-static void source_get_mute_cb(pa_source *s) {
+static int source_get_mute_cb(pa_source *s, bool *mute) {
     struct userdata *u = s->userdata;
-    bool b;
 
     pa_assert(u);
     pa_assert(u->mixer_path);
     pa_assert(u->mixer_handle);
 
-    if (pa_alsa_path_get_mute(u->mixer_path, u->mixer_handle, &b) < 0)
-        return;
+    if (pa_alsa_path_get_mute(u->mixer_path, u->mixer_handle, mute) < 0)
+        return -1;
 
-    s->muted = b;
+    return 0;
 }
 
 static void source_set_mute_cb(pa_source *s) {
@@ -1516,7 +1516,7 @@ static void thread_func(void *userdata) {
             pa_rtpoll_set_timer_disabled(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (rtpoll_sleep > 0) {
@@ -1605,12 +1605,10 @@ static void set_source_name(pa_source_new_data *data, pa_modargs *ma, const char
 }
 
 static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char *element, bool ignore_dB) {
-    snd_hctl_t *hctl;
-
     if (!mapping && !element)
         return;
 
-    if (!(u->mixer_handle = pa_alsa_open_mixer_for_pcm(u->pcm_handle, &u->control_device, &hctl))) {
+    if (!(u->mixer_handle = pa_alsa_open_mixer_for_pcm(u->pcm_handle, &u->control_device))) {
         pa_log_info("Failed to find a working mixer device.");
         return;
     }
@@ -1620,7 +1618,7 @@ static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char
         if (!(u->mixer_path = pa_alsa_path_synthesize(element, PA_ALSA_DIRECTION_INPUT)))
             goto fail;
 
-        if (pa_alsa_path_probe(u->mixer_path, u->mixer_handle, hctl, ignore_dB) < 0)
+        if (pa_alsa_path_probe(u->mixer_path, u->mixer_handle, ignore_dB) < 0)
             goto fail;
 
         pa_log_debug("Probed mixer path %s:", u->mixer_path->name);
@@ -1984,7 +1982,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
             pa_proplist_sets(data.proplist, key, pa_proplist_gets(mapping->proplist, key));
     }
 
-    pa_alsa_init_description(data.proplist);
+    pa_alsa_init_description(data.proplist, card);
 
     if (u->control_device)
         pa_alsa_init_proplist_ctl(data.proplist, u->control_device);
@@ -2036,6 +2034,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
     pa_source_set_rtpoll(u->source, u->rtpoll);
 
     u->frame_size = frame_size;
+    u->frames_per_block = pa_mempool_block_size_max(m->core->mempool) / frame_size;
     u->fragment_size = frag_size = (size_t) (period_frames * frame_size);
     u->hwbuf_size = buffer_size = (size_t) (buffer_frames * frame_size);
     pa_cvolume_mute(&u->hardware_volume, u->source->sample_spec.channels);
@@ -2088,8 +2087,12 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
         if (u->source->set_mute)
             u->source->set_mute(u->source);
     } else {
-        if (u->source->get_mute)
-            u->source->get_mute(u->source);
+        if (u->source->get_mute) {
+            bool mute;
+
+            if (u->source->get_mute(u->source, &mute) >= 0)
+                pa_source_set_mute(u->source, mute, false);
+        }
     }
 
     if ((data.volume_is_set || data.muted_is_set) && u->source->write_volume)
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 23522c7..6c848a9 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -1426,21 +1426,20 @@ static void profile_finalize_probing(pa_alsa_profile *p) {
 static void ucm_mapping_jack_probe(pa_alsa_mapping *m) {
     snd_pcm_t *pcm_handle;
     snd_mixer_t *mixer_handle;
-    snd_hctl_t *hctl_handle;
     pa_alsa_ucm_mapping_context *context = &m->ucm_context;
     pa_alsa_ucm_device *dev;
     uint32_t idx;
 
     pcm_handle = m->direction == PA_ALSA_DIRECTION_OUTPUT ? m->output_pcm : m->input_pcm;
-    mixer_handle = pa_alsa_open_mixer_for_pcm(pcm_handle, NULL, &hctl_handle);
-    if (!mixer_handle || !hctl_handle)
+    mixer_handle = pa_alsa_open_mixer_for_pcm(pcm_handle, NULL);
+    if (!mixer_handle)
         return;
 
     PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
         pa_alsa_jack *jack;
         jack = m->direction == PA_ALSA_DIRECTION_OUTPUT ? dev->output_jack : dev->input_jack;
         pa_assert (jack);
-        jack->has_control = pa_alsa_find_jack(hctl_handle, jack->alsa_name) != NULL;
+        jack->has_control = pa_alsa_mixer_find(mixer_handle, jack->alsa_name, 0) != NULL;
         pa_log_info("UCM jack %s has_control=%d", jack->name, jack->has_control);
     }
 
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 73b1332..4131cff 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -184,7 +184,8 @@ static int set_buffer_size(snd_pcm_t *pcm_handle, snd_pcm_hw_params_t *hwparams,
 }
 
 /* Set the hardware parameters of the given ALSA device. Returns the
- * selected fragment settings in *buffer_size and *period_size. If tsched mode can be enabled */
+ * selected fragment settings in *buffer_size and *period_size. Determine
+ * whether mmap and tsched mode can be enabled. */
 int pa_alsa_set_hw_params(
         snd_pcm_t *pcm_handle,
         pa_sample_spec *ss,
@@ -263,7 +264,7 @@ int pa_alsa_set_hw_params(
             else
                 pa_log_info("Trying to disable ALSA period wakeups, using timers only");
         } else
-            pa_log_info("cannot disable ALSA period wakeups");
+            pa_log_info("Cannot disable ALSA period wakeups");
     }
 #endif
 
@@ -327,6 +328,7 @@ int pa_alsa_set_hw_params(
                 goto success;
             }
 
+            snd_pcm_hw_params_copy(hwparams_copy, hwparams);
             /* Second try: set period size first, followed by buffer size */
             if (set_period_size(pcm_handle, hwparams_copy, _period_size) >= 0 &&
                 set_buffer_size(pcm_handle, hwparams_copy, _buffer_size) >= 0 &&
@@ -868,11 +870,11 @@ void pa_alsa_refcnt_dec(void) {
     }
 }
 
-bool pa_alsa_init_description(pa_proplist *p) {
+bool pa_alsa_init_description(pa_proplist *p, pa_card *card) {
     const char *d, *k;
     pa_assert(p);
 
-    if (pa_device_init_description(p))
+    if (pa_device_init_description(p, card))
         return true;
 
     if (!(d = pa_proplist_gets(p, "alsa.card_name")))
@@ -1456,32 +1458,72 @@ bool pa_alsa_may_tsched(bool want) {
     return true;
 }
 
-snd_hctl_elem_t* pa_alsa_find_jack(snd_hctl_t *hctl, const char* jack_name) {
-    snd_ctl_elem_id_t *id;
+#define SND_MIXER_ELEM_PULSEAUDIO (SND_MIXER_ELEM_LAST + 10)
+
+snd_mixer_elem_t *pa_alsa_mixer_find(snd_mixer_t *mixer, const char *name, unsigned int device) {
+    snd_mixer_elem_t *elem;
 
-    snd_ctl_elem_id_alloca(&id);
-    snd_ctl_elem_id_clear(id);
-    snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_CARD);
-    snd_ctl_elem_id_set_name(id, jack_name);
+    for (elem = snd_mixer_first_elem(mixer); elem; elem = snd_mixer_elem_next(elem)) {
+        snd_hctl_elem_t *helem;
+        if (snd_mixer_elem_get_type(elem) != SND_MIXER_ELEM_PULSEAUDIO)
+            continue;
+        helem = snd_mixer_elem_get_private(elem);
+        if (!pa_streq(snd_hctl_elem_get_name(helem), name))
+            continue;
+        if (snd_hctl_elem_get_device(helem) != device)
+            continue;
+        return elem;
+    }
+    return NULL;
+}
 
-    return snd_hctl_find_elem(hctl, id);
+static int mixer_class_compare(const snd_mixer_elem_t *c1, const snd_mixer_elem_t *c2)
+{
+    /* Dummy compare function */
+    return c1 == c2 ? 0 : (c1 > c2 ? 1 : -1);
 }
 
-snd_hctl_elem_t* pa_alsa_find_eld_ctl(snd_hctl_t *hctl, int device) {
-    snd_ctl_elem_id_t *id;
+static int mixer_class_event(snd_mixer_class_t *class, unsigned int mask,
+			snd_hctl_elem_t *helem, snd_mixer_elem_t *melem)
+{
+    int err;
+    const char *name = snd_hctl_elem_get_name(helem);
+    if (mask & SND_CTL_EVENT_MASK_ADD) {
+        snd_ctl_elem_iface_t iface = snd_hctl_elem_get_interface(helem);
+        if (iface == SND_CTL_ELEM_IFACE_CARD || iface == SND_CTL_ELEM_IFACE_PCM) {
+            snd_mixer_elem_t *new_melem;
+
+            /* Put the hctl pointer as our private data - it will be useful for callbacks */
+            if ((err = snd_mixer_elem_new(&new_melem, SND_MIXER_ELEM_PULSEAUDIO, 0, helem, NULL)) < 0) {
+                pa_log_warn("snd_mixer_elem_new failed: %s", pa_alsa_strerror(err));
+                return 0;
+            }
 
-    /* See if we can find the ELD control */
-    snd_ctl_elem_id_alloca(&id);
-    snd_ctl_elem_id_clear(id);
-    snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_PCM);
-    snd_ctl_elem_id_set_name(id, "ELD");
-    snd_ctl_elem_id_set_device(id, device);
+            if ((err = snd_mixer_elem_attach(new_melem, helem)) < 0) {
+                pa_log_warn("snd_mixer_elem_attach failed: %s", pa_alsa_strerror(err));
+		snd_mixer_elem_free(melem);
+                return 0;
+            }
 
-    return snd_hctl_find_elem(hctl, id);
+            if ((err = snd_mixer_elem_add(new_melem, class)) < 0) {
+                pa_log_warn("snd_mixer_elem_add failed: %s", pa_alsa_strerror(err));
+                return 0;
+            }
+        }
+    }
+    else if (mask & SND_CTL_EVENT_MASK_VALUE) {
+        snd_mixer_elem_value(melem); /* Calls the element callback */
+        return 0;
+    }
+    else
+        pa_log_info("Got an unknown mixer class event for %s: mask 0x%x\n", name, mask);
+
+    return 0;
 }
 
-static int prepare_mixer(snd_mixer_t *mixer, const char *dev, snd_hctl_t **hctl) {
+static int prepare_mixer(snd_mixer_t *mixer, const char *dev) {
     int err;
+    snd_mixer_class_t *class;
 
     pa_assert(mixer);
     pa_assert(dev);
@@ -1491,12 +1533,18 @@ static int prepare_mixer(snd_mixer_t *mixer, const char *dev, snd_hctl_t **hctl)
         return -1;
     }
 
-    /* Note: The hctl handle returned should not be freed.
-       It is closed/freed by alsa-lib on snd_mixer_close/free */
-    if (hctl && (err = snd_mixer_get_hctl(mixer, dev, hctl)) < 0) {
-        pa_log_info("Unable to get hctl of mixer %s: %s", dev, pa_alsa_strerror(err));
+    if (snd_mixer_class_malloc(&class)) {
+        pa_log_info("Failed to allocate mixer class for %s", dev);
         return -1;
     }
+    snd_mixer_class_set_event(class, mixer_class_event);
+    snd_mixer_class_set_compare(class, mixer_class_compare);
+    if ((err = snd_mixer_class_register(class, mixer)) < 0) {
+        pa_log_info("Unable register mixer class for %s: %s", dev, pa_alsa_strerror(err));
+        snd_mixer_class_free(class);
+        return -1;
+    }
+    /* From here on, the mixer class is deallocated by alsa on snd_mixer_close/free. */
 
     if ((err = snd_mixer_selem_register(mixer, NULL, NULL)) < 0) {
         pa_log_warn("Unable to register mixer: %s", pa_alsa_strerror(err));
@@ -1512,7 +1560,7 @@ static int prepare_mixer(snd_mixer_t *mixer, const char *dev, snd_hctl_t **hctl)
     return 0;
 }
 
-snd_mixer_t *pa_alsa_open_mixer(int alsa_card_index, char **ctl_device, snd_hctl_t **hctl) {
+snd_mixer_t *pa_alsa_open_mixer(int alsa_card_index, char **ctl_device) {
     int err;
     snd_mixer_t *m;
     char *md;
@@ -1526,7 +1574,7 @@ snd_mixer_t *pa_alsa_open_mixer(int alsa_card_index, char **ctl_device, snd_hctl
 
     /* Then, try by card index */
     md = pa_sprintf_malloc("hw:%i", alsa_card_index);
-    if (prepare_mixer(m, md, hctl) >= 0) {
+    if (prepare_mixer(m, md) >= 0) {
 
         if (ctl_device)
             *ctl_device = md;
@@ -1542,7 +1590,7 @@ snd_mixer_t *pa_alsa_open_mixer(int alsa_card_index, char **ctl_device, snd_hctl
     return NULL;
 }
 
-snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device, snd_hctl_t **hctl) {
+snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device) {
     int err;
     snd_mixer_t *m;
     const char *dev;
@@ -1558,7 +1606,7 @@ snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device, snd_h
 
     /* First, try by name */
     if ((dev = snd_pcm_name(pcm)))
-        if (prepare_mixer(m, dev, hctl) >= 0) {
+        if (prepare_mixer(m, dev) >= 0) {
             if (ctl_device)
                 *ctl_device = pa_xstrdup(dev);
 
@@ -1575,7 +1623,7 @@ snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device, snd_h
             md = pa_sprintf_malloc("hw:%i", card_idx);
 
             if (!dev || !pa_streq(dev, md))
-                if (prepare_mixer(m, md, hctl) >= 0) {
+                if (prepare_mixer(m, md) >= 0) {
 
                     if (ctl_device)
                         *ctl_device = md;
@@ -1593,25 +1641,19 @@ snd_mixer_t *pa_alsa_open_mixer_for_pcm(snd_pcm_t *pcm, char **ctl_device, snd_h
     return NULL;
 }
 
-int pa_alsa_get_hdmi_eld(snd_hctl_t *hctl, int device, pa_hdmi_eld *eld) {
+int pa_alsa_get_hdmi_eld(snd_hctl_elem_t *elem, pa_hdmi_eld *eld) {
 
     /* The ELD format is specific to HDA Intel sound cards and defined in the
        HDA specification: http://www.intel.com/content/www/us/en/standards/high-definition-audio-specification.html */
     int err;
-    snd_hctl_elem_t *elem;
     snd_ctl_elem_info_t *info;
     snd_ctl_elem_value_t *value;
     uint8_t *elddata;
     unsigned int eldsize, mnl;
+    unsigned int device;
 
     pa_assert(eld != NULL);
-
-    /* See if we can find the ELD control */
-    elem = pa_alsa_find_eld_ctl(hctl, device);
-    if (elem == NULL) {
-        pa_log_debug("No ELD info control found (for device=%d)", device);
-        return -1;
-    }
+    pa_assert(elem != NULL);
 
     /* Does it have any contents? */
     snd_ctl_elem_info_alloca(&info);
@@ -1622,6 +1664,7 @@ int pa_alsa_get_hdmi_eld(snd_hctl_t *hctl, int device, pa_hdmi_eld *eld) {
         return -1;
     }
 
+    device = snd_hctl_elem_get_device(elem);
     eldsize = snd_ctl_elem_info_get_count(info);
     elddata = (unsigned char *) snd_ctl_elem_value_get_bytes(value);
     if (elddata == NULL || eldsize == 0) {
diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
index 0e3ae69..fb47940 100644
--- a/src/modules/alsa/alsa-util.h
+++ b/src/modules/alsa/alsa-util.h
@@ -118,7 +118,7 @@ void pa_alsa_init_proplist_pcm_info(pa_core *c, pa_proplist *p, snd_pcm_info_t *
 void pa_alsa_init_proplist_card(pa_core *c, pa_proplist *p, int card);
 void pa_alsa_init_proplist_pcm(pa_core *c, pa_proplist *p, snd_pcm_t *pcm);
 void pa_alsa_init_proplist_ctl(pa_proplist *p, const char *name);
-bool pa_alsa_init_description(pa_proplist *p);
+bool pa_alsa_init_description(pa_proplist *p, pa_card *card);
 
 int pa_alsa_recover_from_poll(snd_pcm_t *pcm, int revents);
 
@@ -142,16 +142,15 @@ const char* pa_alsa_strerror(int errnum);
 
 bool pa_alsa_may_tsched(bool want);
 
-snd_hctl_elem_t* pa_alsa_find_jack(snd_hctl_t *hctl, const char* jack_name);
-snd_hctl_elem_t* pa_alsa_find_eld_ctl(snd_hctl_t *hctl, int device);
+snd_mixer_elem_t *pa_alsa_mixer_find(snd_mixer_t *mixer, const char *name, unsigned int device);
 
-snd_mixer_t *pa_alsa_open_mixer(int alsa_card_index, char **ctl_device, snd_hctl_t **hctl);
+snd_mixer_t *pa_alsa_open_mixer(int alsa_card_index, char **ctl_device);
 
 typedef struct pa_hdmi_eld pa_hdmi_eld;
 struct pa_hdmi_eld {
     char monitor_name[17];
 };
 
-int pa_alsa_get_hdmi_eld(snd_hctl_t *hctl, int device, pa_hdmi_eld *eld);
+int pa_alsa_get_hdmi_eld(snd_hctl_elem_t *elem, pa_hdmi_eld *eld);
 
 #endif
diff --git a/src/modules/alsa/mixer/paths/analog-input.conf b/src/modules/alsa/mixer/paths/analog-input.conf
index c8f8e3c..356b07c 100644
--- a/src/modules/alsa/mixer/paths/analog-input.conf
+++ b/src/modules/alsa/mixer/paths/analog-input.conf
@@ -61,6 +61,21 @@ required-absent = any
 [Element Rear Mic Boost]
 required-absent = any
 
+[Element Headset]
+required-absent = any
+
+[Element Headset Mic]
+required-absent = any
+
+[Element Headset Mic Boost]
+required-absent = any
+
+[Element Headphone Mic]
+required-absent = any
+
+[Element Headphone Mic Boost]
+required-absent = any
+
 [Element Line]
 required-absent = any
 
diff --git a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
deleted file mode 100644
index 2b68117..0000000
--- a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; Path for mixers that have a 'Desktop Speaker' control
-;
-; See analog-output.conf.common for an explanation on the directives
-
-[General]
-priority = 101
-description-key = analog-output-speaker
-
-[Properties]
-device.icon_name = audio-speakers
-
-[Element Hardware Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master]
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Master Mono]
-switch = off
-volume = off
-
-; This profile path is intended to control the desktop speaker, not
-; the headphones. But it should not hurt if we leave the headphone
-; jack enabled nonetheless.
-[Element Headphone]
-switch = mute
-volume = zero
-
-[Element Headphone2]
-switch = mute
-volume = zero
-
-[Element Speaker]
-switch = off
-volume = off
-
-[Element Desktop Speaker]
-required = any
-switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
-
-[Element Front]
-switch = mute
-volume = merge
-override-map.1 = all-front
-override-map.2 = front-left,front-right
-
-[Element Rear]
-switch = mute
-volume = merge
-override-map.1 = all-rear
-override-map.2 = rear-left,rear-right
-
-[Element Surround]
-switch = mute
-volume = merge
-override-map.1 = all-rear
-override-map.2 = rear-left,rear-right
-
-[Element Side]
-switch = mute
-volume = merge
-override-map.1 = all-side
-override-map.2 = side-left,side-right
-
-[Element Center]
-switch = mute
-volume = merge
-override-map.1 = all-center
-override-map.2 = all-center,all-center
-
-[Element LFE]
-switch = mute
-volume = merge
-override-map.1 = lfe
-override-map.2 = lfe,lfe
-
-.include analog-output.conf.common
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
index 74c467a..e29331b 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -48,6 +48,14 @@ volume = off
 switch = mute
 volume = zero
 
+[Element Headphone+LO]
+switch = mute
+volume = zero
+
+[Element Speaker+LO]
+switch = off
+volume = off
+
 [Element Headphone2]
 required = any
 switch = mute
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 89d794f..1ef17cf 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -25,6 +25,14 @@ description-key = analog-output-headphones
 [Properties]
 device.icon_name = audio-headphones
 
+[Jack Dock Headphone]
+required-any = any
+
+[Jack Dock Headphone Phantom]
+required-any = any
+state.plugged = unknown
+state.unplugged = unknown
+
 [Jack Front Headphone]
 required-any = any
 
@@ -61,6 +69,17 @@ override-map.2 = all-left,all-right
 switch = off
 volume = off
 
+[Element Speaker+LO]
+switch = off
+volume = off
+
+[Element Headphone+LO]
+required-any = any
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Headphone]
 required-any = any
 switch = mute
@@ -77,6 +96,7 @@ override-map.2 = all-left,all-right
 
 [Element Line HP Swap]
 switch = on
+required-any = any
 
 ; This profile path is intended to control the first headphones, not
 ; the second headphones. But it should not hurt if we leave the second
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index d5e24b1..a110c26 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -26,6 +26,10 @@ state.plugged = unknown
 state.unplugged = unknown
 required-any = any
 
+[Jack Headphone]
+state.plugged = no
+state.unplugged = unknown
+
 [Jack Line Out Front]
 required-any = any
 
@@ -76,12 +80,27 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+[Element Speaker+LO]
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+required-any = any
+
+[Element Headphone+LO]
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+required-any = any
+
 [Element Master Mono]
 switch = off
 volume = off
 
 [Element Line HP Swap]
 switch = off
+required-any = any
 
 ; This profile path is intended to control the default output, not the
 ; headphones. But it should not hurt if we leave the headphone jack
diff --git a/src/modules/alsa/mixer/paths/analog-output-mono.conf b/src/modules/alsa/mixer/paths/analog-output-mono.conf
index 87b5081..589d4ce 100644
--- a/src/modules/alsa/mixer/paths/analog-output-mono.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-mono.conf
@@ -45,6 +45,10 @@ override-map.2 = all-left,all-right
 switch = mute
 volume = zero
 
+[Element Headphone+LO]
+switch = mute
+volume = zero
+
 [Element Headphone2]
 switch = mute
 volume = zero
@@ -55,6 +59,12 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+[Element Speaker+LO]
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Desktop Speaker]
 switch = off
 volume = off
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
index c511813..645d05b 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -61,6 +61,16 @@ volume = zero
 switch = mute
 volume = zero
 
+[Element Headphone+LO]
+switch = off
+volume = off
+
+[Element Speaker+LO]
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Speaker]
 switch = mute
 volume = merge
@@ -68,8 +78,10 @@ override-map.1 = all
 override-map.2 = all-left,all-right
 
 [Element Desktop Speaker]
-switch = off
-volume = off
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
 
 [Element Front]
 switch = mute
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index d79fad1..a5bf452 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -29,6 +29,10 @@ device.icon_name = audio-speakers
 state.plugged = no
 state.unplugged = unknown
 
+[Jack Dock Headphone]
+state.plugged = no
+state.unplugged = unknown
+
 [Jack Front Headphone]
 state.plugged = no
 state.unplugged = unknown
@@ -69,6 +73,17 @@ volume = off
 switch = off
 volume = off
 
+[Element Headphone+LO]
+switch = off
+volume = off
+
+[Element Speaker+LO]
+required-any = any
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Speaker]
 required-any = any
 switch = mute
@@ -77,8 +92,11 @@ override-map.1 = all
 override-map.2 = all-left,all-right
 
 [Element Desktop Speaker]
-switch = off
-volume = off
+required-any = any
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
 
 [Element Front]
 switch = mute
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
index 3a552c9..4f9cc53 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf
+++ b/src/modules/alsa/mixer/paths/analog-output.conf
@@ -22,14 +22,6 @@
 [General]
 priority = 99
 
-[Jack Line Out]
-state.plugged = unknown
-state.unplugged = unknown
-
-[Jack Line Out Phantom]
-state.plugged = unknown
-state.unplugged = unknown
-
 [Element Hardware Master]
 switch = mute
 volume = merge
@@ -46,28 +38,6 @@ override-map.2 = all-left,all-right
 switch = off
 volume = off
 
-[Element Line HP Swap]
-switch = off
-
-; This profile path is intended to control the default output, not the
-; headphones. But it should not hurt if we leave the headphone jack
-; enabled nonetheless.
-[Element Headphone]
-switch = mute
-volume = zero
-
-[Element Headphone2]
-switch = mute
-volume = zero
-
-[Element Speaker]
-switch = mute
-volume = off
-
-[Element Desktop Speaker]
-switch = mute
-volume = off
-
 [Element Front]
 switch = mute
 volume = merge
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-4.conf b/src/modules/alsa/mixer/paths/hdmi-output-4.conf
new file mode 100644
index 0000000..d61ec75
--- /dev/null
+++ b/src/modules/alsa/mixer/paths/hdmi-output-4.conf
@@ -0,0 +1,10 @@
+[General]
+description = HDMI / DisplayPort 5
+priority = 55
+eld-device = 10
+
+[Properties]
+device.icon_name = video-display
+
+[Jack HDMI/DP,pcm=10]
+required = ignore
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-5.conf b/src/modules/alsa/mixer/paths/hdmi-output-5.conf
new file mode 100644
index 0000000..02c15e8
--- /dev/null
+++ b/src/modules/alsa/mixer/paths/hdmi-output-5.conf
@@ -0,0 +1,10 @@
+[General]
+description = HDMI / DisplayPort 6
+priority = 54
+eld-device = 11
+
+[Properties]
+device.icon_name = video-display
+
+[Jack HDMI/DP,pcm=11]
+required = ignore
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-6.conf b/src/modules/alsa/mixer/paths/hdmi-output-6.conf
new file mode 100644
index 0000000..188a1ad
--- /dev/null
+++ b/src/modules/alsa/mixer/paths/hdmi-output-6.conf
@@ -0,0 +1,10 @@
+[General]
+description = HDMI / DisplayPort 7
+priority = 53
+eld-device = 12
+
+[Properties]
+device.icon_name = video-display
+
+[Jack HDMI/DP,pcm=12]
+required = ignore
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-7.conf b/src/modules/alsa/mixer/paths/hdmi-output-7.conf
new file mode 100644
index 0000000..80f4e37
--- /dev/null
+++ b/src/modules/alsa/mixer/paths/hdmi-output-7.conf
@@ -0,0 +1,10 @@
+[General]
+description = HDMI / DisplayPort 8
+priority = 52
+eld-device = 13
+
+[Properties]
+device.icon_name = video-display
+
+[Jack HDMI/DP,pcm=13]
+required = ignore
diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
index 560ff1c..b34b90b 100644
--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
@@ -23,10 +23,6 @@ SUBSYSTEMS=="usb", GOTO="pulseaudio_check_usb"
 
 SUBSYSTEMS=="platform", DRIVERS=="thinkpad_acpi", ENV{PULSE_IGNORE}="1"
 
-# NVidia and Intel HDAs often have more than one HDMI codec/port on the same card
-ATTRS{vendor}=="0x10de", ENV{PULSE_PROFILE_SET}="extra-hdmi.conf"
-ATTRS{vendor}=="0x8086", ENV{PULSE_PROFILE_SET}="extra-hdmi.conf"
-
 # Force enable speaker and internal mic for some laptops
 # This should only be necessary for kernels 3.3, 3.4 and 3.5 (as they are lacking the phantom jack kctls).
 # Acer AOA150
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index 9326245..2d2ced7 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -55,6 +55,9 @@
 ; priority = ...
 ; direction = any | input | output          # Only useful for?
 ;
+; exact-channels = yes | no                 # If no, and the exact number of channels is not supported,
+;                                           # allow device to be opened with another channel count
+; fallback = no | yes                       # This mapping will only be considered if all non-fallback mappings fail
 ; [Profile id]
 ; input-mappings = ...                      # Lists mappings for sources on this profile, those mapping must be
 ;                                           # defined in this file too
@@ -66,6 +69,7 @@
 ;                                           # will be assumed as working without probing. Makes initialization
 ;                                           # a bit faster but only works if the card is really known well.
 ;
+; fallback = no | yes                       # This profile will only be considered if all non-fallback profiles fail
 ; [DecibelFix element]                      # Decibel fixes can be used to work around missing or incorrect dB
 ;                                           # information from alsa. A decibel fix is a table that maps volume steps
 ;                                           # to decibel values for one volume element. The "element" part in the
@@ -101,42 +105,49 @@ auto-profiles = yes
 [Mapping analog-mono]
 device-strings = hw:%f
 channel-map = mono
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headset-mic
-priority = 1
+priority = 2
 
 [Mapping analog-stereo]
 device-strings = front:%f hw:%f
 channel-map = left,right
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2
+paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
 priority = 10
 
+[Mapping analog-surround-21]
+device-strings = surround21:%f
+channel-map = front-left,front-right,lfe
+paths-output = analog-output analog-output-speaker
+priority = 8
+direction = output
+
 [Mapping analog-surround-40]
 device-strings = surround40:%f
 channel-map = front-left,front-right,rear-left,rear-right
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker
 priority = 7
 direction = output
 
 [Mapping analog-surround-41]
 device-strings = surround41:%f
 channel-map = front-left,front-right,rear-left,rear-right,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker
 priority = 8
 direction = output
 
 [Mapping analog-surround-50]
 device-strings = surround50:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker
 priority = 7
 direction = output
 
 [Mapping analog-surround-51]
 device-strings = surround51:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker
 priority = 8
 direction = output
 
@@ -144,19 +155,10 @@ direction = output
 device-strings = surround71:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
 description = Analog Surround 7.1
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker
 priority = 7
 direction = output
 
-[Mapping analog-4-channel-input]
-# Alsa doesn't currently provide any better device name than "hw" for 4-channel
-# input. If this causes trouble at some point, then we will need to get a new
-# device name standardized in alsa.
-device-strings = hw:%f
-channel-map = aux0,aux1,aux2,aux3
-priority = 1
-direction = input
-
 [Mapping iec958-stereo]
 device-strings = iec958:%f
 channel-map = left,right
@@ -186,11 +188,267 @@ priority = 3
 direction = output
 
 [Mapping hdmi-stereo]
+description = Digital Stereo (HDMI)
 device-strings = hdmi:%f
+paths-output = hdmi-output-0
 channel-map = left,right
 priority = 4
 direction = output
+
+[Mapping hdmi-surround]
+description = Digital Surround 5.1 (HDMI)
+device-strings = hdmi:%f
 paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 3
+direction = output
+
+[Mapping hdmi-surround71]
+description = Digital Surround 7.1 (HDMI)
+device-strings = hdmi:%f
+paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 3
+direction = output
+
+[Mapping hdmi-dts-surround]
+description = Digital Surround 5.1 (HDMI/DTS)
+device-strings = dcahdmi:%f
+paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-stereo-extra1]
+description = Digital Stereo (HDMI 2)
+device-strings = hdmi:%f,1
+paths-output = hdmi-output-1
+channel-map = left,right
+priority = 2
+direction = output
+
+[Mapping hdmi-surround-extra1]
+description = Digital Surround 5.1 (HDMI 2)
+device-strings = hdmi:%f,1
+paths-output = hdmi-output-1
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-surround71-extra1]
+description = Digital Surround 7.1 (HDMI 2)
+device-strings = hdmi:%f,1
+paths-output = hdmi-output-1
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 1
+direction = output
+
+[Mapping hdmi-dts-surround-extra1]
+description = Digital Surround 5.1 (HDMI 2/DTS)
+device-strings = dcahdmi:%f,1
+paths-output = hdmi-output-1
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-stereo-extra2]
+description = Digital Stereo (HDMI 3)
+device-strings = hdmi:%f,2
+paths-output = hdmi-output-2
+channel-map = left,right
+priority = 2
+direction = output
+
+[Mapping hdmi-surround-extra2]
+description = Digital Surround 5.1 (HDMI 3)
+device-strings = hdmi:%f,2
+paths-output = hdmi-output-2
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-surround71-extra2]
+description = Digital Surround 7.1 (HDMI 3)
+device-strings = hdmi:%f,2
+paths-output = hdmi-output-2
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 1
+direction = output
+
+[Mapping hdmi-dts-surround-extra2]
+description = Digital Surround 5.1 (HDMI 3/DTS)
+device-strings = dcahdmi:%f,2
+paths-output = hdmi-output-2
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-stereo-extra3]
+description = Digital Stereo (HDMI 4)
+device-strings = hdmi:%f,3
+paths-output = hdmi-output-3
+channel-map = left,right
+priority = 2
+direction = output
+
+[Mapping hdmi-surround-extra3]
+description = Digital Surround 5.1 (HDMI 4)
+device-strings = hdmi:%f,3
+paths-output = hdmi-output-3
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-surround71-extra3]
+description = Digital Surround 7.1 (HDMI 4)
+device-strings = hdmi:%f,3
+paths-output = hdmi-output-3
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 1
+direction = output
+
+[Mapping hdmi-dts-surround-extra3]
+description = Digital Surround 5.1 (HDMI 4/DTS)
+device-strings = dcahdmi:%f,3
+paths-output = hdmi-output-3
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-stereo-extra4]
+description = Digital Stereo (HDMI 5)
+device-strings = hdmi:%f,4
+paths-output = hdmi-output-4
+channel-map = left,right
+priority = 2
+direction = output
+
+[Mapping hdmi-surround-extra4]
+description = Digital Surround 5.1 (HDMI 5)
+device-strings = hdmi:%f,4
+paths-output = hdmi-output-4
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-surround71-extra4]
+description = Digital Surround 7.1 (HDMI 5)
+device-strings = hdmi:%f,4
+paths-output = hdmi-output-4
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 1
+direction = output
+
+[Mapping hdmi-dts-surround-extra4]
+description = Digital Surround 5.1 (HDMI 5/DTS)
+device-strings = dcahdmi:%f,4
+paths-output = hdmi-output-4
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-stereo-extra5]
+description = Digital Stereo (HDMI 6)
+device-strings = hdmi:%f,5
+paths-output = hdmi-output-5
+channel-map = left,right
+priority = 2
+direction = output
+
+[Mapping hdmi-surround-extra5]
+description = Digital Surround 5.1 (HDMI 6)
+device-strings = hdmi:%f,5
+paths-output = hdmi-output-5
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-surround71-extra5]
+description = Digital Surround 7.1 (HDMI 6)
+device-strings = hdmi:%f,5
+paths-output = hdmi-output-5
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 1
+direction = output
+
+[Mapping hdmi-dts-surround-extra5]
+description = Digital Surround 5.1 (HDMI 6/DTS)
+device-strings = dcahdmi:%f,5
+paths-output = hdmi-output-5
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-stereo-extra6]
+description = Digital Stereo (HDMI 7)
+device-strings = hdmi:%f,6
+paths-output = hdmi-output-6
+channel-map = left,right
+priority = 2
+direction = output
+
+[Mapping hdmi-surround-extra6]
+description = Digital Surround 5.1 (HDMI 7)
+device-strings = hdmi:%f,6
+paths-output = hdmi-output-6
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-surround71-extra6]
+description = Digital Surround 7.1 (HDMI 7)
+device-strings = hdmi:%f,6
+paths-output = hdmi-output-6
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 1
+direction = output
+
+[Mapping hdmi-dts-surround-extra6]
+description = Digital Surround 5.1 (HDMI 7/DTS)
+device-strings = dcahdmi:%f,6
+paths-output = hdmi-output-6
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-stereo-extra7]
+description = Digital Stereo (HDMI 8)
+device-strings = hdmi:%f,7
+paths-output = hdmi-output-7
+channel-map = left,right
+priority = 2
+direction = output
+
+[Mapping hdmi-surround-extra7]
+description = Digital Surround 5.1 (HDMI 8)
+device-strings = hdmi:%f,7
+paths-output = hdmi-output-7
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping hdmi-surround71-extra7]
+description = Digital Surround 7.1 (HDMI 8)
+device-strings = hdmi:%f,7
+paths-output = hdmi-output-7
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 1
+direction = output
+
+[Mapping hdmi-dts-surround-extra7]
+description = Digital Surround 5.1 (HDMI 8/DTS)
+device-strings = dcahdmi:%f,7
+paths-output = hdmi-output-7
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
+
+[Mapping multichannel]
+device-strings = hw:%f
+channel-map = left,right,rear-left,rear-right
+exact-channels = false
+fallback = yes
+priority = 1
 
 ; An example for defining multiple-sink profiles
 #[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
diff --git a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
deleted file mode 100644
index 96652f8..0000000
--- a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
+++ /dev/null
@@ -1,164 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-; This is a profile for Nvidia and Intel cards - some cards have four HDMI codecs,
-; and which ones are working seems to vary a lot between GPU boards. In addition,
-; Nvidia and Intel make southbridges as well, so we need to keep the existing
-; analog profiles.
-; (And by not adding all these extra profiles to default.conf, we make sure
-; there is no performance hit for non-Nvidia/Intel cards.)
-
-[General]
-auto-profiles = yes
-
-[Mapping analog-mono]
-device-strings = hw:%f
-channel-map = mono
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
-paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headset-mic
-priority = 1
-
-[Mapping analog-stereo]
-device-strings = front:%f hw:%f
-channel-map = left,right
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2
-paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
-priority = 10
-
-[Mapping analog-surround-40]
-device-strings = surround40:%f
-channel-map = front-left,front-right,rear-left,rear-right
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
-priority = 7
-direction = output
-
-[Mapping analog-surround-41]
-device-strings = surround41:%f
-channel-map = front-left,front-right,rear-left,rear-right,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
-priority = 8
-direction = output
-
-[Mapping analog-surround-50]
-device-strings = surround50:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
-priority = 7
-direction = output
-
-[Mapping analog-surround-51]
-device-strings = surround51:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
-priority = 8
-direction = output
-
-[Mapping analog-surround-71]
-device-strings = surround71:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-description = Analog Surround 7.1
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker
-priority = 7
-direction = output
-
-[Mapping iec958-stereo]
-device-strings = iec958:%f
-channel-map = left,right
-paths-input = iec958-stereo-input
-paths-output = iec958-stereo-output
-priority = 5
-
-[Mapping iec958-ac3-surround-40]
-device-strings = a52:%f
-channel-map = front-left,front-right,rear-left,rear-right
-priority = 2
-direction = output
-
-[Mapping iec958-ac3-surround-51]
-device-strings = a52:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 3
-direction = output
-
-[Mapping iec958-dts-surround-51]
-device-strings = dca:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 3
-direction = output
-
-[Mapping hdmi-stereo]
-device-strings = hdmi:%f
-description = Digital Stereo (HDMI)
-paths-output = hdmi-output-0
-channel-map = left,right
-priority = 4
-direction = output
-
-[Mapping hdmi-surround]
-description = Digital Surround 5.1 (HDMI)
-device-strings = hdmi:%f
-paths-output = hdmi-output-0
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 3
-direction = output
-
-[Mapping hdmi-stereo-extra1]
-description = Digital Stereo (HDMI)
-device-strings = hdmi:%f,1
-paths-output = hdmi-output-1
-channel-map = left,right
-priority = 2
-direction = output
-
-[Mapping hdmi-surround-extra1]
-description = Digital Surround 5.1 (HDMI)
-device-strings = hdmi:%f,1
-paths-output = hdmi-output-1
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 1
-direction = output
-
-[Mapping hdmi-stereo-extra2]
-description = Digital Stereo (HDMI)
-device-strings = hdmi:%f,2
-paths-output = hdmi-output-2
-channel-map = left,right
-priority = 2
-direction = output
-
-[Mapping hdmi-surround-extra2]
-description = Digital Surround 5.1 (HDMI)
-device-strings = hdmi:%f,2
-paths-output = hdmi-output-2
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 1
-direction = output
-
-[Mapping hdmi-stereo-extra3]
-description = Digital Stereo (HDMI)
-device-strings = hdmi:%f,3
-paths-output = hdmi-output-3
-channel-map = left,right
-priority = 2
-direction = output
-
-[Mapping hdmi-surround-extra3]
-description = Digital Surround 5.1 (HDMI)
-device-strings = hdmi:%f,3
-paths-output = hdmi-output-3
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 1
-direction = output
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
index 66b18b3..b9bb44f 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
@@ -24,42 +24,49 @@ auto-profiles = yes
 [Mapping analog-mono]
 device-strings = hw:%f
 channel-map = mono
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-headphones analog-output-headphones-2 analog-output-mono
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic-always analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
 priority = 1
 
 [Mapping analog-stereo]
 device-strings = front:%f hw:%f
 channel-map = left,right
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-headphones analog-output-headphones-2 analog-output-mono
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic-always analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
 priority = 10
 
+[Mapping analog-surround-21]
+device-strings = surround21:%f
+channel-map = front-left,front-right,lfe
+paths-output = analog-output analog-output-speaker-always
+priority = 8
+direction = output
+
 [Mapping analog-surround-40]
 device-strings = surround40:%f
 channel-map = front-left,front-right,rear-left,rear-right
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 7
 direction = output
 
 [Mapping analog-surround-41]
 device-strings = surround41:%f
 channel-map = front-left,front-right,rear-left,rear-right,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 8
 direction = output
 
 [Mapping analog-surround-50]
 device-strings = surround50:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 7
 direction = output
 
 [Mapping analog-surround-51]
 device-strings = surround51:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 8
 direction = output
 
@@ -67,7 +74,7 @@ direction = output
 device-strings = surround71:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
 description = Analog Surround 7.1
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 7
 direction = output
 
@@ -109,11 +116,36 @@ priority = 3
 direction = output
 
 [Mapping hdmi-stereo]
+description = Digital Stereo (HDMI)
 device-strings = hdmi:%f
+paths-output = hdmi-output-0
 channel-map = left,right
 priority = 4
 direction = output
+
+[Mapping hdmi-surround]
+description = Digital Surround 5.1 (HDMI)
+device-strings = hdmi:%f
+paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 3
+direction = output
+
+[Mapping hdmi-surround71]
+description = Digital Surround 7.1 (HDMI)
+device-strings = hdmi:%f
+paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 3
+direction = output
+
+[Mapping hdmi-dts-surround]
+description = Digital Surround 5.1 (HDMI/DTS)
+device-strings = dcahdmi:%f
 paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
 
 ; An example for defining multiple-sink profiles
 #[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker.conf b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
index 7c5c1b8..cbcaff1 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
@@ -23,42 +23,49 @@ auto-profiles = yes
 [Mapping analog-mono]
 device-strings = hw:%f
 channel-map = mono
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-headphones analog-output-headphones-2 analog-output-mono
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
 priority = 1
 
 [Mapping analog-stereo]
 device-strings = front:%f hw:%f
 channel-map = left,right
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-headphones analog-output-headphones-2 analog-output-mono
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
 priority = 10
 
+[Mapping analog-surround-21]
+device-strings = surround21:%f
+channel-map = front-left,front-right,lfe
+paths-output = analog-output analog-output-speaker-always
+priority = 8
+direction = output
+
 [Mapping analog-surround-40]
 device-strings = surround40:%f
 channel-map = front-left,front-right,rear-left,rear-right
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 7
 direction = output
 
 [Mapping analog-surround-41]
 device-strings = surround41:%f
 channel-map = front-left,front-right,rear-left,rear-right,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 8
 direction = output
 
 [Mapping analog-surround-50]
 device-strings = surround50:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 7
 direction = output
 
 [Mapping analog-surround-51]
 device-strings = surround51:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 8
 direction = output
 
@@ -66,7 +73,7 @@ direction = output
 device-strings = surround71:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
 description = Analog Surround 7.1
-paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
 priority = 7
 direction = output
 
@@ -108,11 +115,36 @@ priority = 3
 direction = output
 
 [Mapping hdmi-stereo]
+description = Digital Stereo (HDMI)
 device-strings = hdmi:%f
+paths-output = hdmi-output-0
 channel-map = left,right
 priority = 4
 direction = output
+
+[Mapping hdmi-surround]
+description = Digital Surround 5.1 (HDMI)
+device-strings = hdmi:%f
+paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 3
+direction = output
+
+[Mapping hdmi-surround71]
+description = Digital Surround 7.1 (HDMI)
+device-strings = hdmi:%f
+paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+priority = 3
+direction = output
+
+[Mapping hdmi-dts-surround]
+description = Digital Surround 5.1 (HDMI/DTS)
+device-strings = dcahdmi:%f
 paths-output = hdmi-output-0
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+priority = 1
+direction = output
 
 ; An example for defining multiple-sink profiles
 #[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index cf54c0f..fc9a772 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -111,7 +111,6 @@ struct userdata {
     int alsa_card_index;
 
     snd_mixer_t *mixer_handle;
-    snd_hctl_t *hctl_handle;
     pa_hashmap *jacks;
     pa_alsa_fdlist *mixer_fdl;
 
@@ -336,22 +335,34 @@ static void report_port_state(pa_device_port *p, struct userdata *u) {
 
         cpa = jack->plugged_in ? jack->state_plugged : jack->state_unplugged;
 
-        /* "Yes" and "no" trumphs "unknown" if we have more than one jack */
-        if (cpa == PA_AVAILABLE_UNKNOWN)
-            continue;
+        if (cpa == PA_AVAILABLE_NO) {
+          /* If a plugged-in jack causes the availability to go to NO, it
+           * should override all other availability information (like a
+           * blacklist) so set and bail */
+          if (jack->plugged_in) {
+            pa = cpa;
+            break;
+          }
 
-        if ((cpa == PA_AVAILABLE_NO && pa == PA_AVAILABLE_YES) ||
-            (pa == PA_AVAILABLE_NO && cpa == PA_AVAILABLE_YES))
-            pa_log_warn("Availability of port '%s' is inconsistent!", p->name);
-        else
+          /* If the current availablility is unknown go the more precise no,
+           * but otherwise don't change state */
+          if (pa == PA_AVAILABLE_UNKNOWN)
             pa = cpa;
+        } else if (cpa == PA_AVAILABLE_YES) {
+          /* Output is available through at least one jack, so go to that
+           * level of availability. We still need to continue iterating through
+           * the jacks in case a jack is plugged in that forces the state to no
+           */
+          pa = cpa;
+        }
     }
 
     pa_device_port_set_available(p, pa);
 }
 
-static int report_jack_state(snd_hctl_elem_t *elem, unsigned int mask) {
-    struct userdata *u = snd_hctl_elem_get_callback_private(elem);
+static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
+    struct userdata *u = snd_mixer_elem_get_callback_private(melem);
+    snd_hctl_elem_t *elem = snd_mixer_elem_get_private(melem);
     snd_ctl_elem_value_t *elem_value;
     bool plugged_in;
     void *state;
@@ -374,7 +385,7 @@ static int report_jack_state(snd_hctl_elem_t *elem, unsigned int mask) {
     pa_log_debug("Jack '%s' is now %s", pa_strnull(snd_hctl_elem_get_name(elem)), plugged_in ? "plugged in" : "unplugged");
 
     PA_HASHMAP_FOREACH(jack, u->jacks, state)
-        if (jack->hctl_elem == elem) {
+        if (jack->melem == melem) {
             jack->plugged_in = plugged_in;
             if (u->use_ucm) {
                 pa_assert(u->card->ports);
@@ -403,8 +414,9 @@ static pa_device_port* find_port_with_eld_device(pa_hashmap *ports, int device)
     return NULL;
 }
 
-static int hdmi_eld_changed(snd_hctl_elem_t *elem, unsigned int mask) {
-    struct userdata *u = snd_hctl_elem_get_callback_private(elem);
+static int hdmi_eld_changed(snd_mixer_elem_t *melem, unsigned int mask) {
+    struct userdata *u = snd_mixer_elem_get_callback_private(melem);
+    snd_hctl_elem_t *elem = snd_mixer_elem_get_private(melem);
     int device = snd_hctl_elem_get_device(elem);
     const char *old_monitor_name;
     pa_device_port *p;
@@ -420,7 +432,7 @@ static int hdmi_eld_changed(snd_hctl_elem_t *elem, unsigned int mask) {
         return 0;
     }
 
-    if (pa_alsa_get_hdmi_eld(u->hctl_handle, device, &eld) < 0)
+    if (pa_alsa_get_hdmi_eld(elem, &eld) < 0)
         memset(&eld, 0, sizeof(eld));
 
     old_monitor_name = pa_proplist_gets(p->proplist, PA_PROP_DEVICE_PRODUCT_NAME);
@@ -442,12 +454,12 @@ static void init_eld_ctls(struct userdata *u) {
     void *state;
     pa_device_port *port;
 
-    if (!u->hctl_handle)
+    if (!u->mixer_handle)
         return;
 
     PA_HASHMAP_FOREACH(port, u->card->ports, state) {
         pa_alsa_port_data *data = PA_DEVICE_PORT_DATA(port);
-        snd_hctl_elem_t* hctl_elem;
+        snd_mixer_elem_t* melem;
         int device;
 
         pa_assert(data->path);
@@ -455,15 +467,14 @@ static void init_eld_ctls(struct userdata *u) {
         if (device < 0)
             continue;
 
-        hctl_elem = pa_alsa_find_eld_ctl(u->hctl_handle, device);
-        if (!hctl_elem) {
-            pa_log_debug("No ELD device found for port %s.", port->name);
-            continue;
+        melem = pa_alsa_mixer_find(u->mixer_handle, "ELD", device);
+        if (melem) {
+            snd_mixer_elem_set_callback(melem, hdmi_eld_changed);
+            snd_mixer_elem_set_callback_private(melem, u);
+            hdmi_eld_changed(melem, 0);
         }
-
-        snd_hctl_elem_set_callback_private(hctl_elem, u);
-        snd_hctl_elem_set_callback(hctl_elem, hdmi_eld_changed);
-        hdmi_eld_changed(hctl_elem, 0);
+        else
+            pa_log_debug("No ELD device found for port %s.", port->name);
     }
 }
 
@@ -500,22 +511,22 @@ static void init_jacks(struct userdata *u) {
 
     u->mixer_fdl = pa_alsa_fdlist_new();
 
-    u->mixer_handle = pa_alsa_open_mixer(u->alsa_card_index, NULL, &u->hctl_handle);
-    if (u->mixer_handle && pa_alsa_fdlist_set_handle(u->mixer_fdl, NULL, u->hctl_handle, u->core->mainloop) >= 0) {
+    u->mixer_handle = pa_alsa_open_mixer(u->alsa_card_index, NULL);
+    if (u->mixer_handle && pa_alsa_fdlist_set_handle(u->mixer_fdl, u->mixer_handle, NULL, u->core->mainloop) >= 0) {
         PA_HASHMAP_FOREACH(jack, u->jacks, state) {
-            jack->hctl_elem = pa_alsa_find_jack(u->hctl_handle, jack->alsa_name);
-            if (!jack->hctl_elem) {
+            jack->melem = pa_alsa_mixer_find(u->mixer_handle, jack->alsa_name, 0);
+            if (!jack->melem) {
                 pa_log_warn("Jack '%s' seems to have disappeared.", jack->alsa_name);
                 jack->has_control = false;
                 continue;
             }
-            snd_hctl_elem_set_callback_private(jack->hctl_elem, u);
-            snd_hctl_elem_set_callback(jack->hctl_elem, report_jack_state);
-            report_jack_state(jack->hctl_elem, 0);
+            snd_mixer_elem_set_callback(jack->melem, report_jack_state);
+            snd_mixer_elem_set_callback_private(jack->melem, u);
+            report_jack_state(jack->melem, 0);
         }
 
     } else
-        pa_log("Failed to open hctl/mixer for jack detection");
+        pa_log("Failed to open mixer for jack detection");
 
 }
 
@@ -704,7 +715,7 @@ int pa__init(pa_module *m) {
     pa_alsa_init_proplist_card(m->core, data.proplist, u->alsa_card_index);
 
     pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, u->device_id);
-    pa_alsa_init_description(data.proplist);
+    pa_alsa_init_description(data.proplist, NULL);
     set_card_name(&data, u->modargs, u->device_id);
 
     /* We need to give pa_modargs_get_value_boolean() a pointer to a local
diff --git a/src/modules/bluetooth/backend-native.c b/src/modules/bluetooth/backend-native.c
new file mode 100644
index 0000000..e15db3d
--- /dev/null
+++ b/src/modules/bluetooth/backend-native.c
@@ -0,0 +1,501 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2014 Wim Taymans <wim.taymans at gmail.com>
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulsecore/shared.h>
+#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/dbus-shared.h>
+#include <pulsecore/log.h>
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/sco.h>
+
+#include "bluez5-util.h"
+
+struct pa_bluetooth_backend {
+  pa_core *core;
+  pa_dbus_connection *connection;
+  pa_bluetooth_discovery *discovery;
+
+  PA_LLIST_HEAD(pa_dbus_pending, pending);
+};
+
+struct transport_rfcomm {
+    int rfcomm_fd;
+    pa_io_event *rfcomm_io;
+    pa_mainloop_api *mainloop;
+};
+
+#define BLUEZ_SERVICE "org.bluez"
+#define BLUEZ_MEDIA_TRANSPORT_INTERFACE BLUEZ_SERVICE ".MediaTransport1"
+
+#define BLUEZ_ERROR_NOT_SUPPORTED "org.bluez.Error.NotSupported"
+
+#define BLUEZ_PROFILE_MANAGER_INTERFACE BLUEZ_SERVICE ".ProfileManager1"
+#define BLUEZ_PROFILE_INTERFACE BLUEZ_SERVICE ".Profile1"
+
+#define HSP_AG_PROFILE "/Profile/HSPAGProfile"
+
+#define PROFILE_INTROSPECT_XML                                          \
+    DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                           \
+    "<node>"                                                            \
+    " <interface name=\"" BLUEZ_PROFILE_INTERFACE "\">"                 \
+    "  <method name=\"Release\">"                                       \
+    "  </method>"                                                       \
+    "  <method name=\"RequestDisconnection\">"                          \
+    "   <arg name=\"device\" direction=\"in\" type=\"o\"/>"             \
+    "  </method>"                                                       \
+    "  <method name=\"NewConnection\">"                                 \
+    "   <arg name=\"device\" direction=\"in\" type=\"o\"/>"             \
+    "   <arg name=\"fd\" direction=\"in\" type=\"h\"/>"                 \
+    "   <arg name=\"opts\" direction=\"in\" type=\"a{sv}\"/>"           \
+    "  </method>"                                                       \
+    " </interface>"                                                     \
+    " <interface name=\"org.freedesktop.DBus.Introspectable\">"         \
+    "  <method name=\"Introspect\">"                                    \
+    "   <arg name=\"data\" type=\"s\" direction=\"out\"/>"              \
+    "  </method>"                                                       \
+    " </interface>"                                                     \
+    "</node>"
+
+static pa_dbus_pending* send_and_add_to_pending(pa_bluetooth_backend *backend, DBusMessage *m,
+        DBusPendingCallNotifyFunction func, void *call_data) {
+
+    pa_dbus_pending *p;
+    DBusPendingCall *call;
+
+    pa_assert(backend);
+    pa_assert(m);
+
+    pa_assert_se(dbus_connection_send_with_reply(pa_dbus_connection_get(backend->connection), m, &call, -1));
+
+    p = pa_dbus_pending_new(pa_dbus_connection_get(backend->connection), m, call, backend, call_data);
+    PA_LLIST_PREPEND(pa_dbus_pending, backend->pending, p);
+    dbus_pending_call_set_notify(call, func, p, NULL);
+
+    return p;
+}
+
+static int bluez5_sco_acquire_cb(pa_bluetooth_transport *t, bool optional, size_t *imtu, size_t *omtu) {
+    pa_bluetooth_device *d = t->device;
+    struct sockaddr_sco addr;
+    int err, i;
+    int sock;
+    bdaddr_t src;
+    bdaddr_t dst;
+    const char *src_addr, *dst_addr;
+
+    src_addr = d->adapter->address;
+    dst_addr = d->address;
+
+    /* don't use ba2str to avoid -lbluetooth */
+    for (i = 5; i >= 0; i--, src_addr += 3)
+        src.b[i] = strtol(src_addr, NULL, 16);
+    for (i = 5; i >= 0; i--, dst_addr += 3)
+        dst.b[i] = strtol(dst_addr, NULL, 16);
+
+    sock = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);
+    if (sock < 0) {
+        pa_log_error("socket(SEQPACKET, SCO) %s", pa_cstrerror(errno));
+        return -1;
+    }
+
+    memset(&addr, 0, sizeof(addr));
+    addr.sco_family = AF_BLUETOOTH;
+    bacpy(&addr.sco_bdaddr, &src);
+
+    if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+        pa_log_error("bind(): %s", pa_cstrerror(errno));
+        goto fail_close;
+    }
+
+    memset(&addr, 0, sizeof(addr));
+    addr.sco_family = AF_BLUETOOTH;
+    bacpy(&addr.sco_bdaddr, &dst);
+
+    pa_log_info ("doing connect\n");
+    err = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
+    if (err < 0 && !(errno == EAGAIN || errno == EINPROGRESS)) {
+        pa_log_error("connect(): %s", pa_cstrerror(errno));
+        goto fail_close;
+    }
+
+    /* The "48" below is hardcoded until we get meaningful MTU values exposed
+     * by the kernel */
+
+    if (imtu)
+        *imtu = 48;
+
+    if (omtu)
+        *omtu = 48;
+
+    return sock;
+
+fail_close:
+    close(sock);
+    return -1;
+}
+
+static void bluez5_sco_release_cb(pa_bluetooth_transport *t) {
+    pa_log_info("Transport %s released", t->path);
+    /* device will close the SCO socket for us */
+}
+
+static void register_profile_reply(DBusPendingCall *pending, void *userdata) {
+    DBusMessage *r;
+    pa_dbus_pending *p;
+    pa_bluetooth_backend *b;
+    char *profile;
+
+    pa_assert(pending);
+    pa_assert_se(p = userdata);
+    pa_assert_se(b = p->context_data);
+    pa_assert_se(profile = p->call_data);
+    pa_assert_se(r = dbus_pending_call_steal_reply(pending));
+
+    if (dbus_message_is_error(r, BLUEZ_ERROR_NOT_SUPPORTED)) {
+        pa_log_info("Couldn't register profile %s because it is disabled in BlueZ", profile);
+        goto finish;
+    }
+
+    if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
+        pa_log_error(BLUEZ_PROFILE_MANAGER_INTERFACE ".RegisterProfile() failed: %s: %s", dbus_message_get_error_name(r),
+                     pa_dbus_get_error_message(r));
+        goto finish;
+    }
+
+finish:
+    dbus_message_unref(r);
+
+    PA_LLIST_REMOVE(pa_dbus_pending, b->pending, p);
+    pa_dbus_pending_free(p);
+
+    pa_xfree(profile);
+}
+
+static void register_profile(pa_bluetooth_backend *b, const char *profile, const char *uuid) {
+    DBusMessage *m;
+    DBusMessageIter i, d;
+
+    pa_log_debug("Registering Profile %s", profile);
+
+    pa_assert_se(m = dbus_message_new_method_call(BLUEZ_SERVICE, "/org/bluez", BLUEZ_PROFILE_MANAGER_INTERFACE, "RegisterProfile"));
+
+    dbus_message_iter_init_append(m, &i);
+    dbus_message_iter_append_basic(&i, DBUS_TYPE_OBJECT_PATH, &profile);
+    dbus_message_iter_append_basic(&i, DBUS_TYPE_STRING, &uuid);
+    dbus_message_iter_open_container(&i, DBUS_TYPE_ARRAY, DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_STRING_AS_STRING
+            DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &d);
+    dbus_message_iter_close_container(&i, &d);
+
+    send_and_add_to_pending(b, m, register_profile_reply, pa_xstrdup(profile));
+}
+
+static void rfcomm_io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) {
+    pa_bluetooth_transport *t = userdata;
+
+    pa_assert(io);
+    pa_assert(t);
+
+    if (events & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR)) {
+        pa_log_info("Lost RFCOMM connection.");
+        goto fail;
+    }
+
+    if (events & PA_IO_EVENT_INPUT) {
+        char buf[512];
+        ssize_t len;
+        int gain;
+
+        len = read(fd, buf, 511);
+        buf[len] = 0;
+        pa_log_debug("RFCOMM << %s", buf);
+
+        if (sscanf(buf, "AT+VGS=%d", &gain) == 1) {
+          t->speaker_gain = gain;
+          pa_hook_fire(pa_bluetooth_discovery_hook(t->device->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_SPEAKER_GAIN_CHANGED), t);
+
+        } else if (sscanf(buf, "AT+VGM=%d", &gain) == 1) {
+          t->microphone_gain = gain;
+          pa_hook_fire(pa_bluetooth_discovery_hook(t->device->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_MICROPHONE_GAIN_CHANGED), t);
+        }
+
+        pa_log_debug("RFCOMM >> OK");
+
+        len = write(fd, "\r\nOK\r\n", 6);
+
+        /* we ignore any errors, it's not critical and real errors should
+         * be caught with the HANGUP and ERROR events handled above */
+        if (len < 0)
+            pa_log_error("RFCOMM write error: %s", pa_cstrerror(errno));
+    }
+
+    return;
+
+fail:
+    pa_bluetooth_transport_unlink(t);
+    pa_bluetooth_transport_free(t);
+    return;
+}
+
+static void transport_destroy(pa_bluetooth_transport *t) {
+    struct transport_rfcomm *trfc = t->userdata;
+
+    trfc->mainloop->io_free(trfc->rfcomm_io);
+
+    shutdown(trfc->rfcomm_fd, SHUT_RDWR);
+    close (trfc->rfcomm_fd);
+
+    pa_xfree(trfc);
+}
+
+static void set_speaker_gain(pa_bluetooth_transport *t, uint16_t gain) {
+    struct transport_rfcomm *trfc = t->userdata;
+    char buf[512];
+    ssize_t len, written;
+
+    if (t->speaker_gain == gain)
+      return;
+
+    t->speaker_gain = gain;
+
+    len = sprintf(buf, "\r\n+VGS=%d\r\n", gain);
+    pa_log_debug("RFCOMM >> +VGS=%d", gain);
+
+    written = write(trfc->rfcomm_fd, buf, len);
+
+    if (written != len)
+        pa_log_error("RFCOMM write error: %s", pa_cstrerror(errno));
+}
+
+static void set_microphone_gain(pa_bluetooth_transport *t, uint16_t gain) {
+    struct transport_rfcomm *trfc = t->userdata;
+    char buf[512];
+    ssize_t len, written;
+
+    if (t->microphone_gain == gain)
+      return;
+
+    t->microphone_gain = gain;
+
+    len = sprintf(buf, "\r\n+VGM=%d\r\n", gain);
+    pa_log_debug("RFCOMM >> +VGM=%d", gain);
+
+    written = write (trfc->rfcomm_fd, buf, len);
+
+    if (written != len)
+        pa_log_error("RFCOMM write error: %s", pa_cstrerror(errno));
+}
+
+static DBusMessage *profile_new_connection(DBusConnection *conn, DBusMessage *m, void *userdata) {
+    pa_bluetooth_backend *b = userdata;
+    pa_bluetooth_device *d;
+    pa_bluetooth_transport *t;
+    pa_bluetooth_profile_t p;
+    DBusMessage *r;
+    int fd;
+    const char *sender, *path, PA_UNUSED *handler;
+    DBusMessageIter arg_i;
+    char *pathfd;
+    struct transport_rfcomm *trfc;
+
+    if (!dbus_message_iter_init(m, &arg_i) || !pa_streq(dbus_message_get_signature(m), "oha{sv}")) {
+        pa_log_error("Invalid signature found in NewConnection");
+        goto fail;
+    }
+
+    handler = dbus_message_get_path(m);
+    pa_assert(pa_streq(handler, HSP_AG_PROFILE));
+
+    pa_assert(dbus_message_iter_get_arg_type(&arg_i) == DBUS_TYPE_OBJECT_PATH);
+    dbus_message_iter_get_basic(&arg_i, &path);
+
+    d = pa_bluetooth_discovery_get_device_by_path(b->discovery, path);
+    if (d == NULL) {
+        pa_log_error("Device doesnt exist for %s", path);
+        goto fail;
+    }
+
+    pa_assert_se(dbus_message_iter_next(&arg_i));
+
+    pa_assert(dbus_message_iter_get_arg_type(&arg_i) == DBUS_TYPE_UNIX_FD);
+    dbus_message_iter_get_basic(&arg_i, &fd);
+
+    pa_log_debug("dbus: NewConnection path=%s, fd=%d", path, fd);
+
+    sender = dbus_message_get_sender(m);
+
+    p = PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT;
+    pathfd = pa_sprintf_malloc ("%s/fd%d", path, fd);
+    d->transports[p] = t = pa_bluetooth_transport_new(d, sender, pathfd, p, NULL, 0);
+    pa_xfree(pathfd);
+
+    t->acquire = bluez5_sco_acquire_cb;
+    t->release = bluez5_sco_release_cb;
+    t->destroy = transport_destroy;
+    t->set_speaker_gain = set_speaker_gain;
+    t->set_microphone_gain = set_microphone_gain;
+
+    trfc = pa_xnew0(struct transport_rfcomm, 1);
+    trfc->rfcomm_fd = fd;
+    trfc->mainloop = b->core->mainloop;
+    trfc->rfcomm_io = trfc->mainloop->io_new(b->core->mainloop, fd, PA_IO_EVENT_INPUT|PA_IO_EVENT_HANGUP,
+        rfcomm_io_callback, t);
+    t->userdata =  trfc;
+
+    pa_bluetooth_transport_put(t);
+
+    pa_log_debug("Transport %s available for profile %s", t->path, pa_bluetooth_profile_to_string(t->profile));
+
+    pa_assert_se(r = dbus_message_new_method_return(m));
+
+    return r;
+
+fail:
+    pa_assert_se(r = dbus_message_new_error(m, "org.bluez.Error.InvalidArguments", "Unable to handle new connection"));
+    return r;
+}
+
+static DBusMessage *profile_request_disconnection(DBusConnection *conn, DBusMessage *m, void *userdata) {
+    DBusMessage *r;
+
+    pa_assert_se(r = dbus_message_new_method_return(m));
+
+    return r;
+}
+
+static DBusHandlerResult profile_handler(DBusConnection *c, DBusMessage *m, void *userdata) {
+    pa_bluetooth_backend *b = userdata;
+    DBusMessage *r = NULL;
+    const char *path, *interface, *member;
+
+    pa_assert(b);
+
+    path = dbus_message_get_path(m);
+    interface = dbus_message_get_interface(m);
+    member = dbus_message_get_member(m);
+
+    pa_log_debug("dbus: path=%s, interface=%s, member=%s", path, interface, member);
+
+    if (!pa_streq(path, HSP_AG_PROFILE))
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) {
+        const char *xml = PROFILE_INTROSPECT_XML;
+
+        pa_assert_se(r = dbus_message_new_method_return(m));
+        pa_assert_se(dbus_message_append_args(r, DBUS_TYPE_STRING, &xml, DBUS_TYPE_INVALID));
+
+    } else if (dbus_message_is_method_call(m, BLUEZ_PROFILE_INTERFACE, "Release")) {
+    } else if (dbus_message_is_method_call(m, BLUEZ_PROFILE_INTERFACE, "RequestDisconnection")) {
+        r = profile_request_disconnection(c, m, userdata);
+    } else if (dbus_message_is_method_call(m, BLUEZ_PROFILE_INTERFACE, "NewConnection"))
+        r = profile_new_connection(c, m, userdata);
+    else
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    if (r) {
+        pa_assert_se(dbus_connection_send(pa_dbus_connection_get(b->connection), r, NULL));
+        dbus_message_unref(r);
+    }
+
+    return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static void profile_init(pa_bluetooth_backend *b, pa_bluetooth_profile_t profile) {
+    static const DBusObjectPathVTable vtable_profile = {
+        .message_function = profile_handler,
+    };
+    const char *object_name;
+    const char *uuid;
+
+    pa_assert(b);
+
+    switch (profile) {
+        case PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT:
+            object_name = HSP_AG_PROFILE;
+            uuid = PA_BLUETOOTH_UUID_HSP_AG;
+            break;
+        default:
+            pa_assert_not_reached();
+            break;
+    }
+
+    pa_assert_se(dbus_connection_register_object_path(pa_dbus_connection_get(b->connection), object_name, &vtable_profile, b));
+    register_profile(b, object_name, uuid);
+}
+
+static void profile_done(pa_bluetooth_backend *b, pa_bluetooth_profile_t profile) {
+    pa_assert(b);
+
+    switch (profile) {
+        case PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT:
+            dbus_connection_unregister_object_path(pa_dbus_connection_get(b->connection), HSP_AG_PROFILE);
+            break;
+        default:
+            pa_assert_not_reached();
+            break;
+    }
+}
+
+pa_bluetooth_backend *pa_bluetooth_native_backend_new(pa_core *c, pa_bluetooth_discovery *y) {
+    pa_bluetooth_backend *backend;
+    DBusError err;
+
+    pa_log_debug("Bluetooth Headset Backend API support using the native backend");
+
+    backend = pa_xnew0(pa_bluetooth_backend, 1);
+    backend->core = c;
+
+    dbus_error_init(&err);
+    if (!(backend->connection = pa_dbus_bus_get(c, DBUS_BUS_SYSTEM, &err))) {
+        pa_log("Failed to get D-Bus connection: %s", err.message);
+        dbus_error_free(&err);
+        pa_xfree(backend);
+        return NULL;
+    }
+
+    backend->discovery = y;
+
+    profile_init(backend, PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT);
+
+    return backend;
+}
+
+void pa_bluetooth_native_backend_free(pa_bluetooth_backend *backend) {
+    pa_assert(backend);
+
+    pa_dbus_free_pending_list(&backend->pending);
+
+    profile_done(backend, PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT);
+
+    pa_dbus_connection_unref(backend->connection);
+
+    pa_xfree(backend);
+}
diff --git a/src/modules/bluetooth/backend-ofono.c b/src/modules/bluetooth/backend-ofono.c
new file mode 100644
index 0000000..1f0c80f
--- /dev/null
+++ b/src/modules/bluetooth/backend-ofono.c
@@ -0,0 +1,665 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2013 Jo?o Paulo Rechi Vita
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <poll.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/dbus-shared.h>
+#include <pulsecore/shared.h>
+#include <pulsecore/core-error.h>
+
+#include "bluez5-util.h"
+
+#define HFP_AUDIO_CODEC_CVSD    0x01
+#define HFP_AUDIO_CODEC_MSBC    0x02
+
+#define OFONO_SERVICE "org.ofono"
+#define HF_AUDIO_AGENT_INTERFACE OFONO_SERVICE ".HandsfreeAudioAgent"
+#define HF_AUDIO_MANAGER_INTERFACE OFONO_SERVICE ".HandsfreeAudioManager"
+
+#define HF_AUDIO_AGENT_PATH "/HandsfreeAudioAgent"
+
+#define HF_AUDIO_AGENT_XML                                          \
+    DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                       \
+    "<node>"                                                        \
+    "  <interface name=\"org.freedesktop.DBus.Introspectable\">"    \
+    "    <method name=\"Introspect\">"                              \
+    "      <arg direction=\"out\" type=\"s\" />"                    \
+    "    </method>"                                                 \
+    "  </interface>"                                                \
+    "  <interface name=\"org.ofono.HandsfreeAudioAgent\">"          \
+    "    <method name=\"Release\">"                                 \
+    "    </method>"                                                 \
+    "    <method name=\"NewConnection\">"                           \
+    "      <arg direction=\"in\"  type=\"o\" name=\"card_path\" />" \
+    "      <arg direction=\"in\"  type=\"h\" name=\"sco_fd\" />"    \
+    "      <arg direction=\"in\"  type=\"y\" name=\"codec\" />"     \
+    "    </method>"                                                 \
+    "  </interface>"                                                \
+    "</node>"
+
+struct hf_audio_card {
+    pa_bluetooth_backend *backend;
+    char *path;
+    char *remote_address;
+    char *local_address;
+
+    int fd;
+    uint8_t codec;
+
+    pa_bluetooth_transport *transport;
+};
+
+struct pa_bluetooth_backend {
+    pa_core *core;
+    pa_bluetooth_discovery *discovery;
+    pa_dbus_connection *connection;
+    pa_hashmap *cards;
+    char *ofono_bus_id;
+
+    PA_LLIST_HEAD(pa_dbus_pending, pending);
+};
+
+static pa_dbus_pending* hf_dbus_send_and_add_to_pending(pa_bluetooth_backend *backend, DBusMessage *m,
+                                                    DBusPendingCallNotifyFunction func, void *call_data) {
+    pa_dbus_pending *p;
+    DBusPendingCall *call;
+
+    pa_assert(backend);
+    pa_assert(m);
+
+    pa_assert_se(dbus_connection_send_with_reply(pa_dbus_connection_get(backend->connection), m, &call, -1));
+
+    p = pa_dbus_pending_new(pa_dbus_connection_get(backend->connection), m, call, backend, call_data);
+    PA_LLIST_PREPEND(pa_dbus_pending, backend->pending, p);
+    dbus_pending_call_set_notify(call, func, p, NULL);
+
+    return p;
+}
+
+static struct hf_audio_card *hf_audio_card_new(pa_bluetooth_backend *backend, const char *path) {
+    struct hf_audio_card *card = pa_xnew0(struct hf_audio_card, 1);
+
+    card->path = pa_xstrdup(path);
+    card->backend = backend;
+    card->fd = -1;
+
+    return card;
+}
+
+static void hf_audio_card_free(struct hf_audio_card *card) {
+    pa_assert(card);
+
+    if (card->transport)
+        pa_bluetooth_transport_free(card->transport);
+
+    pa_xfree(card->path);
+    pa_xfree(card->remote_address);
+    pa_xfree(card->local_address);
+    pa_xfree(card);
+}
+
+static int socket_accept(int sock)
+{
+    char c;
+    struct pollfd pfd;
+
+    if (sock < 0)
+        return -ENOTCONN;
+
+    memset(&pfd, 0, sizeof(pfd));
+    pfd.fd = sock;
+    pfd.events = POLLOUT;
+
+    if (poll(&pfd, 1, 0) < 0)
+        return -errno;
+
+    /*
+     * If socket already writable then it is not in defer setup state,
+     * otherwise it needs to be read to authorize the connection.
+     */
+    if ((pfd.revents & POLLOUT))
+        return 0;
+
+    /* Enable socket by reading 1 byte */
+    if (read(sock, &c, 1) < 0)
+        return -errno;
+
+    return 0;
+}
+
+static int hf_audio_agent_transport_acquire(pa_bluetooth_transport *t, bool optional, size_t *imtu, size_t *omtu) {
+    struct hf_audio_card *card = t->userdata;
+    int err;
+
+    pa_assert(card);
+
+    if (!optional) {
+        DBusMessage *m;
+
+        pa_assert_se(m = dbus_message_new_method_call(t->owner, t->path, "org.ofono.HandsfreeAudioCard", "Connect"));
+        pa_assert_se(dbus_connection_send(pa_dbus_connection_get(card->backend->connection), m, NULL));
+
+        return -1;
+    }
+
+    /* The correct block size should take into account the SCO MTU from
+     * the Bluetooth adapter and (for adapters in the USB bus) the MxPS
+     * value from the Isoc USB endpoint in use by btusb and should be
+     * made available to userspace by the Bluetooth kernel subsystem.
+     * Meanwhile the empiric value 48 will be used. */
+    if (imtu)
+        *imtu = 48;
+    if (omtu)
+        *omtu = 48;
+
+    t->codec = card->codec;
+
+    err = socket_accept(card->fd);
+    if (err < 0) {
+        pa_log_error("Deferred setup failed on fd %d: %s", card->fd, pa_cstrerror(-err));
+        return -1;
+    }
+
+    return card->fd;
+}
+
+static void hf_audio_agent_transport_release(pa_bluetooth_transport *t) {
+    struct hf_audio_card *card = t->userdata;
+
+    pa_assert(card);
+
+    if (t->state <= PA_BLUETOOTH_TRANSPORT_STATE_IDLE) {
+        pa_log_info("Transport %s already released", t->path);
+        return;
+    }
+
+    if (card->fd < 0)
+        return;
+
+    /* shutdown to make sure connection is dropped immediately */
+    shutdown(card->fd, SHUT_RDWR);
+    close(card->fd);
+    card->fd = -1;
+}
+
+static void hf_audio_agent_card_found(pa_bluetooth_backend *backend, const char *path, DBusMessageIter *props_i) {
+    DBusMessageIter i, value_i;
+    const char *key, *value;
+    struct hf_audio_card *card;
+    pa_bluetooth_device *d;
+
+    pa_assert(backend);
+    pa_assert(path);
+    pa_assert(props_i);
+
+    pa_log_debug("New HF card found: %s", path);
+
+    card = hf_audio_card_new(backend, path);
+
+    while (dbus_message_iter_get_arg_type(props_i) != DBUS_TYPE_INVALID) {
+        char c;
+
+        dbus_message_iter_recurse(props_i, &i);
+
+        dbus_message_iter_get_basic(&i, &key);
+        dbus_message_iter_next(&i);
+        dbus_message_iter_recurse(&i, &value_i);
+
+        if ((c = dbus_message_iter_get_arg_type(&value_i)) != DBUS_TYPE_STRING) {
+            pa_log_error("Invalid properties for %s: expected 's', received '%c'", path, c);
+            goto fail;
+        }
+
+        dbus_message_iter_get_basic(&value_i, &value);
+
+        if (pa_streq(key, "RemoteAddress")) {
+            pa_xfree(card->remote_address);
+            card->remote_address = pa_xstrdup(value);
+        } else if (pa_streq(key, "LocalAddress")) {
+            pa_xfree(card->local_address);
+            card->local_address = pa_xstrdup(value);
+        }
+
+        pa_log_debug("%s: %s", key, value);
+
+        dbus_message_iter_next(props_i);
+    }
+
+    d = pa_bluetooth_discovery_get_device_by_address(backend->discovery, card->remote_address, card->local_address);
+    if (!d) {
+        pa_log_error("Device doesnt exist for %s", path);
+        goto fail;
+    }
+
+    card->transport = pa_bluetooth_transport_new(d, backend->ofono_bus_id, path, PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY, NULL, 0);
+    card->transport->acquire = hf_audio_agent_transport_acquire;
+    card->transport->release = hf_audio_agent_transport_release;
+    card->transport->userdata = card;
+
+    pa_bluetooth_transport_put(card->transport);
+    pa_hashmap_put(backend->cards, card->path, card);
+
+    return;
+
+fail:
+    hf_audio_card_free(card);
+}
+
+static void hf_audio_agent_card_removed(pa_bluetooth_backend *backend, const char *path) {
+    struct hf_audio_card *card;
+
+    pa_assert(backend);
+    pa_assert(path);
+
+    pa_log_debug("HF card removed: %s", path);
+
+    card = pa_hashmap_remove(backend->cards, path);
+    if (!card)
+        return;
+
+    hf_audio_card_free(card);
+}
+
+static void hf_audio_agent_get_cards_reply(DBusPendingCall *pending, void *userdata) {
+    DBusMessage *r;
+    pa_dbus_pending *p;
+    pa_bluetooth_backend *backend;
+    DBusMessageIter i, array_i, struct_i, props_i;
+
+    pa_assert_se(p = userdata);
+    pa_assert_se(backend = p->context_data);
+    pa_assert_se(r = dbus_pending_call_steal_reply(pending));
+
+    if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
+        pa_log_error("Failed to get a list of handsfree audio cards from ofono: %s: %s",
+                     dbus_message_get_error_name(r), pa_dbus_get_error_message(r));
+        goto finish;
+    }
+
+    if (!dbus_message_iter_init(r, &i) || !pa_streq(dbus_message_get_signature(r), "a(oa{sv})")) {
+        pa_log_error("Invalid arguments in GetCards() reply");
+        goto finish;
+    }
+
+    dbus_message_iter_recurse(&i, &array_i);
+    while (dbus_message_iter_get_arg_type(&array_i) != DBUS_TYPE_INVALID) {
+        const char *path;
+
+        dbus_message_iter_recurse(&array_i, &struct_i);
+        dbus_message_iter_get_basic(&struct_i, &path);
+        dbus_message_iter_next(&struct_i);
+
+        dbus_message_iter_recurse(&struct_i, &props_i);
+
+        hf_audio_agent_card_found(backend, path, &props_i);
+
+        dbus_message_iter_next(&array_i);
+    }
+
+finish:
+    dbus_message_unref(r);
+
+    PA_LLIST_REMOVE(pa_dbus_pending, backend->pending, p);
+    pa_dbus_pending_free(p);
+}
+
+static void hf_audio_agent_get_cards(pa_bluetooth_backend *hf) {
+    DBusMessage *m;
+
+    pa_assert(hf);
+
+    pa_assert_se(m = dbus_message_new_method_call(OFONO_SERVICE, "/", HF_AUDIO_MANAGER_INTERFACE, "GetCards"));
+    hf_dbus_send_and_add_to_pending(hf, m, hf_audio_agent_get_cards_reply, NULL);
+}
+
+static void ofono_bus_id_destroy(pa_bluetooth_backend *backend) {
+    pa_hashmap_remove_all(backend->cards);
+
+    if (backend->ofono_bus_id) {
+        pa_xfree(backend->ofono_bus_id);
+        backend->ofono_bus_id = NULL;
+        pa_bluetooth_discovery_set_ofono_running(backend->discovery, false);
+    }
+}
+
+static void hf_audio_agent_register_reply(DBusPendingCall *pending, void *userdata) {
+    DBusMessage *r;
+    pa_dbus_pending *p;
+    pa_bluetooth_backend *backend;
+
+    pa_assert_se(p = userdata);
+    pa_assert_se(backend = p->context_data);
+    pa_assert_se(r = dbus_pending_call_steal_reply(pending));
+
+    if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
+        pa_log_error("Failed to register as a handsfree audio agent with ofono: %s: %s",
+                     dbus_message_get_error_name(r), pa_dbus_get_error_message(r));
+        goto finish;
+    }
+
+    backend->ofono_bus_id = pa_xstrdup(dbus_message_get_sender(r));
+
+    hf_audio_agent_get_cards(backend);
+
+finish:
+    dbus_message_unref(r);
+
+    PA_LLIST_REMOVE(pa_dbus_pending, backend->pending, p);
+    pa_dbus_pending_free(p);
+
+    pa_bluetooth_discovery_set_ofono_running(backend->discovery, backend->ofono_bus_id != NULL);
+}
+
+static void hf_audio_agent_register(pa_bluetooth_backend *hf) {
+    DBusMessage *m;
+    uint8_t codecs[2];
+    const uint8_t *pcodecs = codecs;
+    int ncodecs = 0;
+    const char *path = HF_AUDIO_AGENT_PATH;
+
+    pa_assert(hf);
+
+    pa_assert_se(m = dbus_message_new_method_call(OFONO_SERVICE, "/", HF_AUDIO_MANAGER_INTERFACE, "Register"));
+
+    codecs[ncodecs++] = HFP_AUDIO_CODEC_CVSD;
+
+    pa_assert_se(dbus_message_append_args(m, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &pcodecs, ncodecs,
+                                          DBUS_TYPE_INVALID));
+
+    hf_dbus_send_and_add_to_pending(hf, m, hf_audio_agent_register_reply, NULL);
+}
+
+static void hf_audio_agent_unregister(pa_bluetooth_backend *backend) {
+    DBusMessage *m;
+    const char *path = HF_AUDIO_AGENT_PATH;
+
+    pa_assert(backend);
+    pa_assert(backend->connection);
+
+    if (backend->ofono_bus_id) {
+        pa_assert_se(m = dbus_message_new_method_call(backend->ofono_bus_id, "/", HF_AUDIO_MANAGER_INTERFACE, "Unregister"));
+        pa_assert_se(dbus_message_append_args(m, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID));
+        pa_assert_se(dbus_connection_send(pa_dbus_connection_get(backend->connection), m, NULL));
+
+        ofono_bus_id_destroy(backend);
+    }
+}
+
+static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *data) {
+    const char *sender;
+    DBusError err;
+    pa_bluetooth_backend *backend = data;
+
+    pa_assert(bus);
+    pa_assert(m);
+    pa_assert(backend);
+
+    sender = dbus_message_get_sender(m);
+    if (!pa_safe_streq(backend->ofono_bus_id, sender) && !pa_streq("org.freedesktop.DBus", sender))
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    dbus_error_init(&err);
+
+    if (dbus_message_is_signal(m, "org.freedesktop.DBus", "NameOwnerChanged")) {
+        const char *name, *old_owner, *new_owner;
+
+        if (!dbus_message_get_args(m, &err,
+                                   DBUS_TYPE_STRING, &name,
+                                   DBUS_TYPE_STRING, &old_owner,
+                                   DBUS_TYPE_STRING, &new_owner,
+                                   DBUS_TYPE_INVALID)) {
+            pa_log_error("Failed to parse org.freedesktop.DBus.NameOwnerChanged: %s", err.message);
+            goto fail;
+        }
+
+        if (pa_streq(name, OFONO_SERVICE)) {
+
+            if (old_owner && *old_owner) {
+                pa_log_debug("oFono disappeared");
+                ofono_bus_id_destroy(backend);
+            }
+
+            if (new_owner && *new_owner) {
+                pa_log_debug("oFono appeared");
+                hf_audio_agent_register(backend);
+            }
+        }
+
+    } else if (dbus_message_is_signal(m, "org.ofono.HandsfreeAudioManager", "CardAdded")) {
+        const char *p;
+        DBusMessageIter arg_i, props_i;
+
+        if (!dbus_message_iter_init(m, &arg_i) || !pa_streq(dbus_message_get_signature(m), "oa{sv}")) {
+            pa_log_error("Failed to parse org.ofono.HandsfreeAudioManager.CardAdded");
+            goto fail;
+        }
+
+        dbus_message_iter_get_basic(&arg_i, &p);
+
+        pa_assert_se(dbus_message_iter_next(&arg_i));
+        pa_assert(dbus_message_iter_get_arg_type(&arg_i) == DBUS_TYPE_ARRAY);
+
+        dbus_message_iter_recurse(&arg_i, &props_i);
+
+        hf_audio_agent_card_found(backend, p, &props_i);
+    } else if (dbus_message_is_signal(m, "org.ofono.HandsfreeAudioManager", "CardRemoved")) {
+        const char *p;
+
+        if (!dbus_message_get_args(m, &err, DBUS_TYPE_OBJECT_PATH, &p, DBUS_TYPE_INVALID)) {
+            pa_log_error("Failed to parse org.ofono.HandsfreeAudioManager.CardRemoved: %s", err.message);
+            goto fail;
+        }
+
+        hf_audio_agent_card_removed(backend, p);
+    }
+
+fail:
+    dbus_error_free(&err);
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static DBusMessage *hf_audio_agent_release(DBusConnection *c, DBusMessage *m, void *data) {
+    DBusMessage *r;
+    const char *sender;
+    pa_bluetooth_backend *backend = data;
+
+    pa_assert(backend);
+
+    sender = dbus_message_get_sender(m);
+    if (!pa_safe_streq(backend->ofono_bus_id, sender)) {
+        pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.NotAllowed", "Operation is not allowed by this sender"));
+        return r;
+    }
+
+    pa_log_debug("HF audio agent has been unregistered by oFono (%s)", backend->ofono_bus_id);
+
+    ofono_bus_id_destroy(backend);
+
+    pa_assert_se(r = dbus_message_new_method_return(m));
+
+    return r;
+}
+
+static DBusMessage *hf_audio_agent_new_connection(DBusConnection *c, DBusMessage *m, void *data) {
+    DBusMessage *r;
+    const char *sender, *path;
+    int fd;
+    uint8_t codec;
+    struct hf_audio_card *card;
+    pa_bluetooth_backend *backend = data;
+
+    pa_assert(backend);
+
+    sender = dbus_message_get_sender(m);
+    if (!pa_safe_streq(backend->ofono_bus_id, sender)) {
+        pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.NotAllowed", "Operation is not allowed by this sender"));
+        return r;
+    }
+
+    if (dbus_message_get_args(m, NULL,
+                              DBUS_TYPE_OBJECT_PATH, &path,
+                              DBUS_TYPE_UNIX_FD, &fd,
+                              DBUS_TYPE_BYTE, &codec,
+                              DBUS_TYPE_INVALID) == FALSE) {
+        pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.InvalidArguments", "Invalid arguments in method call"));
+        return r;
+    }
+
+    card = pa_hashmap_get(backend->cards, path);
+
+    if (!card || codec != HFP_AUDIO_CODEC_CVSD || card->transport->state == PA_BLUETOOTH_TRANSPORT_STATE_PLAYING) {
+        pa_log_warn("New audio connection invalid arguments (path=%s fd=%d, codec=%d)", path, fd, codec);
+        pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.InvalidArguments", "Invalid arguments in method call"));
+        return r;
+    }
+
+    pa_log_debug("New audio connection on card %s (fd=%d, codec=%d)", path, fd, codec);
+
+    card->fd = fd;
+    card->transport->codec = codec;
+
+    pa_bluetooth_transport_set_state(card->transport, PA_BLUETOOTH_TRANSPORT_STATE_PLAYING);
+
+    pa_assert_se(r = dbus_message_new_method_return(m));
+
+    return r;
+}
+
+static DBusHandlerResult hf_audio_agent_handler(DBusConnection *c, DBusMessage *m, void *data) {
+    pa_bluetooth_backend *backend = data;
+    DBusMessage *r = NULL;
+    const char *path, *interface, *member;
+
+    pa_assert(backend);
+
+    path = dbus_message_get_path(m);
+    interface = dbus_message_get_interface(m);
+    member = dbus_message_get_member(m);
+
+    if (!pa_streq(path, HF_AUDIO_AGENT_PATH))
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    pa_log_debug("dbus: path=%s, interface=%s, member=%s", path, interface, member);
+
+    if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) {
+        const char *xml = HF_AUDIO_AGENT_XML;
+
+        pa_assert_se(r = dbus_message_new_method_return(m));
+        pa_assert_se(dbus_message_append_args(r, DBUS_TYPE_STRING, &xml, DBUS_TYPE_INVALID));
+
+    } else if (dbus_message_is_method_call(m, HF_AUDIO_AGENT_INTERFACE, "NewConnection"))
+        r = hf_audio_agent_new_connection(c, m, data);
+    else if (dbus_message_is_method_call(m, HF_AUDIO_AGENT_INTERFACE, "Release"))
+        r = hf_audio_agent_release(c, m, data);
+    else
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    if (r) {
+        pa_assert_se(dbus_connection_send(pa_dbus_connection_get(backend->connection), r, NULL));
+        dbus_message_unref(r);
+    }
+
+    return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+pa_bluetooth_backend *pa_bluetooth_ofono_backend_new(pa_core *c, pa_bluetooth_discovery *y) {
+    pa_bluetooth_backend *backend;
+    DBusError err;
+    static const DBusObjectPathVTable vtable_hf_audio_agent = {
+        .message_function = hf_audio_agent_handler,
+    };
+
+    pa_assert(c);
+
+    backend = pa_xnew0(pa_bluetooth_backend, 1);
+    backend->core = c;
+    backend->discovery = y;
+    backend->cards = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL,
+                                         (pa_free_cb_t) hf_audio_card_free);
+
+    dbus_error_init(&err);
+
+    if (!(backend->connection = pa_dbus_bus_get(c, DBUS_BUS_SYSTEM, &err))) {
+        pa_log("Failed to get D-Bus connection: %s", err.message);
+        dbus_error_free(&err);
+        pa_xfree(backend);
+        return NULL;
+    }
+
+    /* dynamic detection of handsfree audio cards */
+    if (!dbus_connection_add_filter(pa_dbus_connection_get(backend->connection), filter_cb, backend, NULL)) {
+        pa_log_error("Failed to add filter function");
+        pa_dbus_connection_unref(backend->connection);
+        pa_xfree(backend);
+        return NULL;
+    }
+
+    if (pa_dbus_add_matches(pa_dbus_connection_get(backend->connection), &err,
+            "type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',"
+            "arg0='" OFONO_SERVICE "'",
+            "type='signal',sender='" OFONO_SERVICE "',interface='" HF_AUDIO_MANAGER_INTERFACE "',member='CardAdded'",
+            "type='signal',sender='" OFONO_SERVICE "',interface='" HF_AUDIO_MANAGER_INTERFACE "',member='CardRemoved'",
+            NULL) < 0) {
+        pa_log("Failed to add oFono D-Bus matches: %s", err.message);
+        dbus_connection_remove_filter(pa_dbus_connection_get(backend->connection), filter_cb, backend);
+        pa_dbus_connection_unref(backend->connection);
+        pa_xfree(backend);
+        return NULL;
+    }
+
+    pa_assert_se(dbus_connection_register_object_path(pa_dbus_connection_get(backend->connection), HF_AUDIO_AGENT_PATH,
+                                                      &vtable_hf_audio_agent, backend));
+
+    hf_audio_agent_register(backend);
+
+    return backend;
+}
+
+void pa_bluetooth_ofono_backend_free(pa_bluetooth_backend *backend) {
+    pa_assert(backend);
+
+    pa_dbus_free_pending_list(&backend->pending);
+
+    hf_audio_agent_unregister(backend);
+
+    dbus_connection_unregister_object_path(pa_dbus_connection_get(backend->connection), HF_AUDIO_AGENT_PATH);
+
+    pa_dbus_remove_matches(pa_dbus_connection_get(backend->connection),
+            "type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',"
+            "arg0='" OFONO_SERVICE "'",
+            "type='signal',sender='" OFONO_SERVICE "',interface='" HF_AUDIO_MANAGER_INTERFACE "',member='CardAdded'",
+            "type='signal',sender='" OFONO_SERVICE "',interface='" HF_AUDIO_MANAGER_INTERFACE "',member='CardRemoved'",
+            NULL);
+
+    dbus_connection_remove_filter(pa_dbus_connection_get(backend->connection), filter_cb, backend);
+
+    pa_dbus_connection_unref(backend->connection);
+
+    pa_hashmap_free(backend->cards);
+
+    pa_xfree(backend);
+}
diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
index 7eecc18..6894e83 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -87,6 +87,8 @@ struct pa_bluetooth_discovery {
     pa_hashmap *devices;
     pa_hashmap *transports;
 
+    int headset_backend;
+    pa_bluetooth_backend *ofono_backend, *native_backend;
     PA_LLIST_HEAD(pa_dbus_pending, pending);
 };
 
@@ -148,8 +150,6 @@ pa_bluetooth_transport *pa_bluetooth_transport_new(pa_bluetooth_device *d, const
         memcpy(t->config, config, size);
     }
 
-    pa_assert_se(pa_hashmap_put(d->discovery->transports, t->path, t) >= 0);
-
     return t;
 }
 
@@ -166,7 +166,7 @@ static const char *transport_state_to_string(pa_bluetooth_transport_state_t stat
     return "invalid";
 }
 
-static void transport_state_changed(pa_bluetooth_transport *t, pa_bluetooth_transport_state_t state) {
+void pa_bluetooth_transport_set_state(pa_bluetooth_transport *t, pa_bluetooth_transport_state_t state) {
     bool old_any_connected;
 
     pa_assert(t);
@@ -180,8 +180,6 @@ static void transport_state_changed(pa_bluetooth_transport *t, pa_bluetooth_tran
                  t->path, transport_state_to_string(t->state), transport_state_to_string(state));
 
     t->state = state;
-    if (state == PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED)
-        t->device->transports[t->profile] = NULL;
 
     pa_hook_fire(&t->device->discovery->hooks[PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED], t);
 
@@ -190,13 +188,28 @@ static void transport_state_changed(pa_bluetooth_transport *t, pa_bluetooth_tran
 }
 
 void pa_bluetooth_transport_put(pa_bluetooth_transport *t) {
-    transport_state_changed(t, PA_BLUETOOTH_TRANSPORT_STATE_IDLE);
+    pa_assert(t);
+
+    t->device->transports[t->profile] = t;
+    pa_assert_se(pa_hashmap_put(t->device->discovery->transports, t->path, t) >= 0);
+    pa_bluetooth_transport_set_state(t, PA_BLUETOOTH_TRANSPORT_STATE_IDLE);
 }
 
-void pa_bluetooth_transport_free(pa_bluetooth_transport *t) {
+void pa_bluetooth_transport_unlink(pa_bluetooth_transport *t) {
     pa_assert(t);
 
+    pa_bluetooth_transport_set_state(t, PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED);
     pa_hashmap_remove(t->device->discovery->transports, t->path);
+    t->device->transports[t->profile] = NULL;
+}
+
+void pa_bluetooth_transport_free(pa_bluetooth_transport *t) {
+    pa_assert(t);
+
+    if (t->destroy)
+        t->destroy(t);
+    pa_bluetooth_transport_unlink(t);
+
     pa_xfree(t->owner);
     pa_xfree(t->path);
     pa_xfree(t->config);
@@ -278,7 +291,7 @@ bool pa_bluetooth_device_any_transport_connected(const pa_bluetooth_device *d) {
 
     pa_assert(d);
 
-    if (d->device_info_valid != 1)
+    if (!d->valid)
         return false;
 
     for (i = 0; i < PA_BLUETOOTH_PROFILE_COUNT; i++)
@@ -327,7 +340,7 @@ static void parse_transport_property(pa_bluetooth_transport *t, DBusMessageIter
                     return;
                 }
 
-                transport_state_changed(t, state);
+                pa_bluetooth_transport_set_state(t, state);
             }
 
             break;
@@ -378,9 +391,8 @@ pa_bluetooth_device* pa_bluetooth_discovery_get_device_by_path(pa_bluetooth_disc
     pa_assert(PA_REFCNT_VALUE(y) > 0);
     pa_assert(path);
 
-    if ((d = pa_hashmap_get(y->devices, path)))
-        if (d->device_info_valid == 1)
-            return d;
+    if ((d = pa_hashmap_get(y->devices, path)) && d->valid)
+        return d;
 
     return NULL;
 }
@@ -395,7 +407,7 @@ pa_bluetooth_device* pa_bluetooth_discovery_get_device_by_address(pa_bluetooth_d
     pa_assert(local);
 
     while ((d = pa_hashmap_iterate(y->devices, &state, NULL)))
-        if (d->device_info_valid == 1 && pa_streq(d->address, remote) && pa_streq(d->adapter->address, local))
+        if (d->valid && pa_streq(d->address, remote) && pa_streq(d->adapter->address, local))
             return d;
 
     return NULL;
@@ -412,15 +424,12 @@ static void device_free(pa_bluetooth_device *d) {
         if (!(t = d->transports[i]))
             continue;
 
-        transport_state_changed(t, PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED);
         pa_bluetooth_transport_free(t);
     }
 
     if (d->uuids)
         pa_hashmap_free(d->uuids);
 
-    d->discovery = NULL;
-    d->adapter = NULL;
     pa_xfree(d->path);
     pa_xfree(d->alias);
     pa_xfree(d->address);
@@ -439,22 +448,54 @@ static void device_remove(pa_bluetooth_discovery *y, const char *path) {
     }
 }
 
-static void set_device_info_valid(pa_bluetooth_device *device, int valid) {
+static void device_set_valid(pa_bluetooth_device *device, bool valid) {
     bool old_any_connected;
 
     pa_assert(device);
-    pa_assert(valid == -1 || valid == 0 || valid == 1);
 
-    if (valid == device->device_info_valid)
+    if (valid == device->valid)
         return;
 
     old_any_connected = pa_bluetooth_device_any_transport_connected(device);
-    device->device_info_valid = valid;
+    device->valid = valid;
 
     if (pa_bluetooth_device_any_transport_connected(device) != old_any_connected)
         pa_hook_fire(&device->discovery->hooks[PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED], device);
 }
 
+static void device_update_valid(pa_bluetooth_device *d) {
+    pa_assert(d);
+
+    if (!d->properties_received) {
+        pa_assert(!d->valid);
+        return;
+    }
+
+    /* Check if mandatory properties are set. */
+    if (!d->address || !d->adapter_path || !d->alias) {
+        device_set_valid(d, false);
+        return;
+    }
+
+    if (!d->adapter || !d->adapter->valid) {
+        device_set_valid(d, false);
+        return;
+    }
+
+    device_set_valid(d, true);
+}
+
+static void device_set_adapter(pa_bluetooth_device *device, pa_bluetooth_adapter *adapter) {
+    pa_assert(device);
+
+    if (adapter == device->adapter)
+        return;
+
+    device->adapter = adapter;
+
+    device_update_valid(device);
+}
+
 static pa_bluetooth_adapter* adapter_create(pa_bluetooth_discovery *y, const char *path) {
     pa_bluetooth_adapter *a;
 
@@ -478,10 +519,8 @@ static void adapter_free(pa_bluetooth_adapter *a) {
     pa_assert(a->discovery);
 
     PA_HASHMAP_FOREACH(d, a->discovery->devices, state)
-        if (d->adapter == a) {
-            set_device_info_valid(d, -1);
-            d->adapter = NULL;
-        }
+        if (d->adapter == a)
+            device_set_adapter(d, NULL);
 
     pa_xfree(a->path);
     pa_xfree(a->address);
@@ -499,7 +538,7 @@ static void adapter_remove(pa_bluetooth_discovery *y, const char *path) {
     }
 }
 
-static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bool is_property_change) {
+static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i) {
     const char *key;
     DBusMessageIter variant_i;
 
@@ -524,7 +563,7 @@ static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bo
                 d->alias = pa_xstrdup(value);
                 pa_log_debug("%s: %s", key, value);
             } else if (pa_streq(key, "Address")) {
-                if (is_property_change) {
+                if (d->properties_received) {
                     pa_log_warn("Device property 'Address' expected to be constant but changed for %s, ignoring", d->path);
                     return;
                 }
@@ -547,7 +586,7 @@ static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bo
 
             if (pa_streq(key, "Adapter")) {
 
-                if (is_property_change) {
+                if (d->properties_received) {
                     pa_log_warn("Device property 'Adapter' expected to be constant but changed for %s, ignoring", d->path);
                     return;
                 }
@@ -558,11 +597,6 @@ static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bo
                 }
 
                 d->adapter_path = pa_xstrdup(value);
-
-                d->adapter = pa_hashmap_get(d->discovery->adapters, value);
-                if (!d->adapter)
-                    pa_log_info("Device %s: 'Adapter' property references an unknown adapter %s.", d->path, value);
-
                 pa_log_debug("%s: %s", key, value);
             }
 
@@ -612,7 +646,7 @@ static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bo
     }
 }
 
-static int parse_device_properties(pa_bluetooth_device *d, DBusMessageIter *i, bool is_property_change) {
+static void parse_device_properties(pa_bluetooth_device *d, DBusMessageIter *i) {
     DBusMessageIter element_i;
 
     dbus_message_iter_recurse(i, &element_i);
@@ -621,23 +655,16 @@ static int parse_device_properties(pa_bluetooth_device *d, DBusMessageIter *i, b
         DBusMessageIter dict_i;
 
         dbus_message_iter_recurse(&element_i, &dict_i);
-        parse_device_property(d, &dict_i, is_property_change);
+        parse_device_property(d, &dict_i);
         dbus_message_iter_next(&element_i);
     }
 
-    if (!d->address || !d->adapter_path || !d->alias) {
-        pa_log_error("Non-optional information missing for device %s", d->path);
-        set_device_info_valid(d, -1);
-        return -1;
-    }
+    if (!d->properties_received) {
+        d->properties_received = true;
 
-    if (!is_property_change && d->adapter)
-        set_device_info_valid(d, 1);
-
-    /* If d->adapter is NULL, device_info_valid will be left as 0, and updated
-     * after all interfaces have been parsed. */
-
-    return 0;
+        if (!d->address || !d->adapter_path || !d->alias)
+            pa_log_error("Non-optional information missing for device %s", d->path);
+    }
 }
 
 static void parse_adapter_properties(pa_bluetooth_adapter *a, DBusMessageIter *i, bool is_property_change) {
@@ -676,6 +703,7 @@ static void parse_adapter_properties(pa_bluetooth_adapter *a, DBusMessageIter *i
 
             dbus_message_iter_get_basic(&variant_i, &value);
             a->address = pa_xstrdup(value);
+            a->valid = true;
         }
 
         dbus_message_iter_next(&element_i);
@@ -781,7 +809,7 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa
             pa_bluetooth_adapter *a;
 
             if ((a = pa_hashmap_get(y->adapters, path))) {
-                pa_log_error("Found duplicated D-Bus path for device %s", path);
+                pa_log_error("Found duplicated D-Bus path for adapter %s", path);
                 return;
             } else
                 a = adapter_create(y, path);
@@ -789,7 +817,8 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa
             pa_log_debug("Adapter %s found", path);
 
             parse_adapter_properties(a, &iface_i, false);
-            if (!a->address)
+
+            if (!a->valid)
                 return;
 
             register_endpoint(y, path, A2DP_SOURCE_ENDPOINT, PA_BLUETOOTH_UUID_A2DP_SOURCE);
@@ -798,7 +827,7 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa
         } else if (pa_streq(interface, BLUEZ_DEVICE_INTERFACE)) {
 
             if ((d = pa_hashmap_get(y->devices, path))) {
-                if (d->device_info_valid != 0) {
+                if (d->properties_received) {
                     pa_log_error("Found duplicated D-Bus path for device %s", path);
                     return;
                 }
@@ -807,7 +836,7 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa
 
             pa_log_debug("Device %s found", d->path);
 
-            parse_device_properties(d, &iface_i, false);
+            parse_device_properties(d, &iface_i);
 
         } else
             pa_log_debug("Unknown interface %s found, skipping", interface);
@@ -816,22 +845,38 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa
     }
 
     PA_HASHMAP_FOREACH(d, y->devices, state) {
-        if (d->device_info_valid != 0)
-            continue;
+        if (d->properties_received && !d->tried_to_link_with_adapter) {
+            if (d->adapter_path) {
+                device_set_adapter(d, pa_hashmap_get(d->discovery->adapters, d->adapter_path));
 
-        if (!d->adapter && d->adapter_path) {
-            d->adapter = pa_hashmap_get(d->discovery->adapters, d->adapter_path);
-            if (!d->adapter || !d->adapter->address) {
-                pa_log_error("Device %s is child of nonexistent or corrupted adapter %s", d->path, d->adapter_path);
-                set_device_info_valid(d, -1);
-            } else
-                set_device_info_valid(d, 1);
+                if (!d->adapter)
+                    pa_log("Device %s points to a nonexistent adapter %s.", d->path, d->adapter_path);
+                else if (!d->adapter->valid)
+                    pa_log("Device %s points to an invalid adapter %s.", d->path, d->adapter_path);
+            }
+
+            d->tried_to_link_with_adapter = true;
         }
     }
 
     return;
 }
 
+void pa_bluetooth_discovery_set_ofono_running(pa_bluetooth_discovery *y, bool is_running) {
+    pa_assert(y);
+
+    pa_log_debug("oFono is running: %s", pa_yes_no(is_running));
+    if (y->headset_backend != HEADSET_BACKEND_AUTO)
+        return;
+
+    if (is_running && y->native_backend) {
+        pa_bluetooth_native_backend_free(y->native_backend);
+        y->native_backend = NULL;
+    }
+    else if (!is_running && !y->native_backend)
+        y->native_backend = pa_bluetooth_native_backend_new(y->core, y);
+}
+
 static void get_managed_objects_reply(DBusPendingCall *pending, void *userdata) {
     pa_dbus_pending *p;
     pa_bluetooth_discovery *y;
@@ -870,6 +915,11 @@ static void get_managed_objects_reply(DBusPendingCall *pending, void *userdata)
 
     y->objects_listed = true;
 
+    if (!y->ofono_backend && y->headset_backend != HEADSET_BACKEND_NATIVE)
+        y->ofono_backend = pa_bluetooth_ofono_backend_new(y->core, y);
+    if (!y->ofono_backend && !y->native_backend && y->headset_backend != HEADSET_BACKEND_OFONO)
+        y->native_backend = pa_bluetooth_native_backend_new(y->core, y);
+
 finish:
     dbus_message_unref(r);
 
@@ -922,6 +972,14 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
                 pa_hashmap_remove_all(y->devices);
                 pa_hashmap_remove_all(y->adapters);
                 y->objects_listed = false;
+                if (y->ofono_backend) {
+                    pa_bluetooth_ofono_backend_free(y->ofono_backend);
+                    y->ofono_backend = NULL;
+                }
+                if (y->native_backend) {
+                    pa_bluetooth_native_backend_free(y->native_backend);
+                    y->native_backend = NULL;
+                }
             }
 
             if (new_owner && *new_owner) {
@@ -1019,12 +1077,10 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
             }
 
-            if (d->device_info_valid != 1) {
-                pa_log_warn("Properties changed in a device which information is unknown or invalid");
+            if (!d->properties_received)
                 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-            }
 
-            parse_device_properties(d, &arg_i, true);
+            parse_device_properties(d, &arg_i);
         } else if (pa_streq(iface, BLUEZ_MEDIA_TRANSPORT_INTERFACE)) {
             pa_bluetooth_transport *t;
 
@@ -1093,6 +1149,10 @@ const char *pa_bluetooth_profile_to_string(pa_bluetooth_profile_t profile) {
             return "a2dp_sink";
         case PA_BLUETOOTH_PROFILE_A2DP_SOURCE:
             return "a2dp_source";
+        case PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT:
+            return "headset_head_unit";
+        case PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY:
+            return "headset_audio_gateway";
         case PA_BLUETOOTH_PROFILE_OFF:
             return "off";
     }
@@ -1228,12 +1288,12 @@ static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage
     }
 
     if ((d = pa_hashmap_get(y->devices, dev_path))) {
-        if (d->device_info_valid == -1) {
+        if (!d->valid) {
             pa_log_error("Information about device %s is invalid", dev_path);
             goto fail2;
         }
     } else {
-        /* InterfacesAdded signal is probably on it's way, device_info_valid is kept as 0. */
+        /* InterfacesAdded signal is probably on its way, device_info_valid is kept as 0. */
         pa_log_warn("SetConfiguration() received for unknown device %s", dev_path);
         d = device_create(y, dev_path);
     }
@@ -1249,7 +1309,7 @@ static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage
     pa_assert_se(dbus_connection_send(pa_dbus_connection_get(y->connection), r, NULL));
     dbus_message_unref(r);
 
-    d->transports[p] = t = pa_bluetooth_transport_new(d, sender, path, p, config, size);
+    t = pa_bluetooth_transport_new(d, sender, path, p, config, size);
     t->acquire = bluez5_transport_acquire_cb;
     t->release = bluez5_transport_release_cb;
     pa_bluetooth_transport_put(t);
@@ -1412,7 +1472,6 @@ static DBusMessage *endpoint_clear_configuration(DBusConnection *conn, DBusMessa
 
     if ((t = pa_hashmap_get(y->transports, path))) {
         pa_log_debug("Clearing transport %s profile %s", t->path, pa_bluetooth_profile_to_string(t->profile));
-        transport_state_changed(t, PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED);
         pa_bluetooth_transport_free(t);
     }
 
@@ -1513,7 +1572,7 @@ static void endpoint_done(pa_bluetooth_discovery *y, pa_bluetooth_profile_t prof
     }
 }
 
-pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
+pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c, int headset_backend) {
     pa_bluetooth_discovery *y;
     DBusError err;
     DBusConnection *conn;
@@ -1522,6 +1581,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
     y = pa_xnew0(pa_bluetooth_discovery, 1);
     PA_REFCNT_INIT(y);
     y->core = c;
+    y->headset_backend = headset_backend;
     y->adapters = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL,
                                       (pa_free_cb_t) adapter_free);
     y->devices = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL,
@@ -1611,6 +1671,11 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
         pa_hashmap_free(y->transports);
     }
 
+    if (y->ofono_backend)
+        pa_bluetooth_ofono_backend_free(y->ofono_backend);
+    if (y->native_backend)
+        pa_bluetooth_native_backend_free(y->native_backend);
+
     if (y->connection) {
 
         if (y->matches_added)
diff --git a/src/modules/bluetooth/bluez5-util.h b/src/modules/bluetooth/bluez5-util.h
index bbc5b71..9a6488d 100644
--- a/src/modules/bluetooth/bluez5-util.h
+++ b/src/modules/bluetooth/bluez5-util.h
@@ -26,21 +26,30 @@
 
 #define PA_BLUETOOTH_UUID_A2DP_SOURCE "0000110a-0000-1000-8000-00805f9b34fb"
 #define PA_BLUETOOTH_UUID_A2DP_SINK   "0000110b-0000-1000-8000-00805f9b34fb"
+#define PA_BLUETOOTH_UUID_HSP_HS      "00001108-0000-1000-8000-00805f9b34fb"
+#define PA_BLUETOOTH_UUID_HSP_AG      "00001112-0000-1000-8000-00805f9b34fb"
+#define PA_BLUETOOTH_UUID_HFP_HF      "0000111e-0000-1000-8000-00805f9b34fb"
+#define PA_BLUETOOTH_UUID_HFP_AG      "0000111f-0000-1000-8000-00805f9b34fb"
 
 typedef struct pa_bluetooth_transport pa_bluetooth_transport;
 typedef struct pa_bluetooth_device pa_bluetooth_device;
 typedef struct pa_bluetooth_adapter pa_bluetooth_adapter;
 typedef struct pa_bluetooth_discovery pa_bluetooth_discovery;
+typedef struct pa_bluetooth_backend pa_bluetooth_backend;
 
 typedef enum pa_bluetooth_hook {
     PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED,          /* Call data: pa_bluetooth_device */
     PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED,            /* Call data: pa_bluetooth_transport */
+    PA_BLUETOOTH_HOOK_TRANSPORT_MICROPHONE_GAIN_CHANGED,  /* Call data: pa_bluetooth_transport */
+    PA_BLUETOOTH_HOOK_TRANSPORT_SPEAKER_GAIN_CHANGED,     /* Call data: pa_bluetooth_transport */
     PA_BLUETOOTH_HOOK_MAX
 } pa_bluetooth_hook_t;
 
 typedef enum profile {
     PA_BLUETOOTH_PROFILE_A2DP_SINK,
     PA_BLUETOOTH_PROFILE_A2DP_SOURCE,
+    PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT,
+    PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY,
     PA_BLUETOOTH_PROFILE_OFF
 } pa_bluetooth_profile_t;
 #define PA_BLUETOOTH_PROFILE_COUNT PA_BLUETOOTH_PROFILE_OFF
@@ -53,6 +62,9 @@ typedef enum pa_bluetooth_transport_state {
 
 typedef int (*pa_bluetooth_transport_acquire_cb)(pa_bluetooth_transport *t, bool optional, size_t *imtu, size_t *omtu);
 typedef void (*pa_bluetooth_transport_release_cb)(pa_bluetooth_transport *t);
+typedef void (*pa_bluetooth_transport_destroy_cb)(pa_bluetooth_transport *t);
+typedef void (*pa_bluetooth_transport_set_speaker_gain_cb)(pa_bluetooth_transport *t, uint16_t gain);
+typedef void (*pa_bluetooth_transport_set_microphone_gain_cb)(pa_bluetooth_transport *t, uint16_t gain);
 
 struct pa_bluetooth_transport {
     pa_bluetooth_device *device;
@@ -65,10 +77,16 @@ struct pa_bluetooth_transport {
     uint8_t *config;
     size_t config_size;
 
+    uint16_t microphone_gain;
+    uint16_t speaker_gain;
+
     pa_bluetooth_transport_state_t state;
 
     pa_bluetooth_transport_acquire_cb acquire;
     pa_bluetooth_transport_release_cb release;
+    pa_bluetooth_transport_destroy_cb destroy;
+    pa_bluetooth_transport_set_speaker_gain_cb set_speaker_gain;
+    pa_bluetooth_transport_set_microphone_gain_cb set_microphone_gain;
     void *userdata;
 };
 
@@ -76,7 +94,9 @@ struct pa_bluetooth_device {
     pa_bluetooth_discovery *discovery;
     pa_bluetooth_adapter *adapter;
 
-    int device_info_valid;      /* 0: no results yet; 1: good results; -1: bad results ... */
+    bool properties_received;
+    bool tried_to_link_with_adapter;
+    bool valid;
 
     /* Device information */
     char *path;
@@ -93,12 +113,36 @@ struct pa_bluetooth_adapter {
     pa_bluetooth_discovery *discovery;
     char *path;
     char *address;
+
+    bool valid;
 };
 
+#ifdef HAVE_BLUEZ_5_OFONO_HEADSET
+pa_bluetooth_backend *pa_bluetooth_ofono_backend_new(pa_core *c, pa_bluetooth_discovery *y);
+void pa_bluetooth_ofono_backend_free(pa_bluetooth_backend *b);
+#else
+static inline pa_bluetooth_backend *pa_bluetooth_ofono_backend_new(pa_core *c, pa_bluetooth_discovery *y) {
+    return NULL;
+}
+static inline void pa_bluetooth_ofono_backend_free(pa_bluetooth_backend *b) {}
+#endif
+
+#ifdef HAVE_BLUEZ_5_NATIVE_HEADSET
+pa_bluetooth_backend *pa_bluetooth_native_backend_new(pa_core *c, pa_bluetooth_discovery *y);
+void pa_bluetooth_native_backend_free(pa_bluetooth_backend *b);
+#else
+static inline pa_bluetooth_backend *pa_bluetooth_native_backend_new(pa_core *c, pa_bluetooth_discovery *y) {
+    return NULL;
+}
+static inline void pa_bluetooth_native_backend_free(pa_bluetooth_backend *b) {}
+#endif
+
 pa_bluetooth_transport *pa_bluetooth_transport_new(pa_bluetooth_device *d, const char *owner, const char *path,
                                                    pa_bluetooth_profile_t p, const uint8_t *config, size_t size);
 
+void pa_bluetooth_transport_set_state(pa_bluetooth_transport *t, pa_bluetooth_transport_state_t state);
 void pa_bluetooth_transport_put(pa_bluetooth_transport *t);
+void pa_bluetooth_transport_unlink(pa_bluetooth_transport *t);
 void pa_bluetooth_transport_free(pa_bluetooth_transport *t);
 
 bool pa_bluetooth_device_any_transport_connected(const pa_bluetooth_device *d);
@@ -110,7 +154,12 @@ pa_hook* pa_bluetooth_discovery_hook(pa_bluetooth_discovery *y, pa_bluetooth_hoo
 
 const char *pa_bluetooth_profile_to_string(pa_bluetooth_profile_t profile);
 
-pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *core);
+#define HEADSET_BACKEND_OFONO 0
+#define HEADSET_BACKEND_NATIVE 1
+#define HEADSET_BACKEND_AUTO 2
+
+pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *core, int headset_backend);
 pa_bluetooth_discovery* pa_bluetooth_discovery_ref(pa_bluetooth_discovery *y);
 void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y);
+void pa_bluetooth_discovery_set_ofono_running(pa_bluetooth_discovery *y, bool is_running);
 #endif
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 0bcfcf9..b54d573 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -33,6 +33,9 @@ PA_MODULE_AUTHOR("Jo?o Paulo Rechi Vita");
 PA_MODULE_DESCRIPTION("Detect available Bluetooth daemon and load the corresponding discovery module");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(true);
+PA_MODULE_USAGE(
+    "headset=ofono|native|auto (bluez 5 only)"
+);
 
 struct userdata {
     uint32_t bluez5_module_idx;
@@ -50,7 +53,7 @@ int pa__init(pa_module* m) {
     u->bluez4_module_idx = PA_INVALID_INDEX;
 
     if (pa_module_exists("module-bluez5-discover")) {
-        mm = pa_module_load(m->core, "module-bluez5-discover",  NULL);
+        mm = pa_module_load(m->core, "module-bluez5-discover", m->argument);
         if (mm)
             u->bluez5_module_idx = mm->index;
     }
diff --git a/src/modules/bluetooth/module-bluetooth-policy.c b/src/modules/bluetooth/module-bluetooth-policy.c
index 06f9f1c..860868f 100644
--- a/src/modules/bluetooth/module-bluetooth-policy.c
+++ b/src/modules/bluetooth/module-bluetooth-policy.c
@@ -41,17 +41,19 @@ PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(true);
 PA_MODULE_USAGE(
         "a2dp_source=<Handle a2dp_source card profile (sink role)?> "
-        "hfgw=<Handle hfgw card profile (headset role)?>");
+        "ag=<Handle headset_audio_gateway card profile (headset role)?> "
+        "hfgw=<Handle hfgw card profile (headset role)?> DEPRECATED");
 
 static const char* const valid_modargs[] = {
     "a2dp_source",
+    "ag",
     "hfgw",
     NULL
 };
 
 struct userdata {
     bool enable_a2dp_source;
-    bool enable_hfgw;
+    bool enable_ag;
     pa_hook_slot *source_put_slot;
     pa_hook_slot *sink_put_slot;
     pa_hook_slot *profile_available_changed_slot;
@@ -79,9 +81,10 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
     if (!s)
         return PA_HOOK_OK;
 
-    if (u->enable_a2dp_source && pa_streq(s, "a2dp_source")) /* A2DP profile (we're doing sink role) */
+    if (u->enable_a2dp_source && pa_streq(s, "a2dp_source"))
         role = "music";
-    else if (u->enable_hfgw && pa_streq(s, "hfgw")) /* HFP profile (we're doing headset role) */
+    /* TODO: remove hfgw when we remove BlueZ 4 support */
+    else if (u->enable_ag && (pa_streq(s, "hfgw") || pa_streq(s, "headset_audio_gateway")))
         role = "phone";
     else {
         pa_log_debug("Profile %s cannot be selected for loopback", s);
@@ -89,7 +92,8 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
     }
 
     /* Load module-loopback */
-    args = pa_sprintf_malloc("source=\"%s\" source_dont_move=\"true\" sink_input_properties=\"media.role=%s\"", source->name, role);
+    args = pa_sprintf_malloc("source=\"%s\" source_dont_move=\"true\" sink_input_properties=\"media.role=%s\"", source->name,
+                             role);
     (void) pa_module_load(c, "module-loopback", args);
     pa_xfree(args);
 
@@ -118,7 +122,8 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void *
     if (!s)
         return PA_HOOK_OK;
 
-    if (u->enable_hfgw && pa_streq(s, "hfgw")) /* HFP profile (we're doing headset role) */
+    /* TODO: remove hfgw when we remove BlueZ 4 support */
+    if (u->enable_ag && (pa_streq(s, "hfgw") || pa_streq(s, "headset_audio_gateway")))
         role = "phone";
     else {
         pa_log_debug("Profile %s cannot be selected for loopback", s);
@@ -126,7 +131,8 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void *
     }
 
     /* Load module-loopback */
-    args = pa_sprintf_malloc("sink=\"%s\" sink_dont_move=\"true\" source_output_properties=\"media.role=%s\"", sink->name, role);
+    args = pa_sprintf_malloc("sink=\"%s\" sink_dont_move=\"true\" source_output_properties=\"media.role=%s\"", sink->name,
+                             role);
     (void) pa_module_load(c, "module-loopback", args);
     pa_xfree(args);
 
@@ -137,12 +143,9 @@ static pa_card_profile *find_best_profile(pa_card *card) {
     void *state;
     pa_card_profile *profile;
     pa_card_profile *result = card->active_profile;
-    pa_card_profile *off;
-
-    pa_assert_se(off = pa_hashmap_get(card->profiles, "off"));
 
     PA_HASHMAP_FOREACH(profile, card->profiles, state) {
-        if (profile->available == PA_AVAILABLE_NO || profile == off)
+        if (profile->available == PA_AVAILABLE_NO)
             continue;
 
         if (result == NULL ||
@@ -151,7 +154,7 @@ static pa_card_profile *find_best_profile(pa_card *card) {
             result = profile;
     }
 
-    return result ? result : off;
+    return result;
 }
 
 static pa_hook_result_t profile_available_hook_callback(pa_core *c, pa_card_profile *profile, void *userdata) {
@@ -170,7 +173,9 @@ static pa_hook_result_t profile_available_hook_callback(pa_core *c, pa_card_prof
         return PA_HOOK_OK;
 
     /* Do not automatically switch profiles for headsets, just in case */
-    if (pa_streq(profile->name, "hsp") || pa_streq(profile->name, "a2dp"))
+    /* TODO: remove a2dp and hsp when we remove BlueZ 4 support */
+    if (pa_streq(profile->name, "hsp") || pa_streq(profile->name, "a2dp") || pa_streq(profile->name, "a2dp_sink") ||
+        pa_streq(profile->name, "headset_head_unit"))
         return PA_HOOK_OK;
 
     is_active_profile = card->active_profile == profile;
@@ -233,15 +238,21 @@ int pa__init(pa_module *m) {
         goto fail;
     }
 
-    u->enable_hfgw = true;
-    if (pa_modargs_get_value_boolean(ma, "hfgw", &u->enable_hfgw) < 0) {
+    u->enable_ag = true;
+    if (pa_modargs_get_value_boolean(ma, "hfgw", &u->enable_ag) < 0) {
         pa_log("Failed to parse hfgw argument.");
         goto fail;
     }
+    if (pa_modargs_get_value_boolean(ma, "ag", &u->enable_ag) < 0) {
+        pa_log("Failed to parse ag argument.");
+        goto fail;
+    }
 
-    u->source_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_NORMAL, (pa_hook_cb_t) source_put_hook_callback, u);
+    u->source_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_NORMAL,
+                                         (pa_hook_cb_t) source_put_hook_callback, u);
 
-    u->sink_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_NORMAL, (pa_hook_cb_t) sink_put_hook_callback, u);
+    u->sink_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_NORMAL,
+                                       (pa_hook_cb_t) sink_put_hook_callback, u);
 
     u->profile_available_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED],
                                                         PA_HOOK_NORMAL, (pa_hook_cb_t) profile_available_hook_callback, u);
diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c
index 83e603f..aa0e037 100644
--- a/src/modules/bluetooth/module-bluez4-device.c
+++ b/src/modules/bluetooth/module-bluez4-device.c
@@ -881,6 +881,7 @@ static int a2dp_process_push(struct userdata *u) {
         void *d;
         ssize_t l;
         size_t to_write, to_decode;
+        size_t total_written = 0;
 
         a2dp_prepare_buffer(u);
 
@@ -907,17 +908,12 @@ static int a2dp_process_push(struct userdata *u) {
 
         pa_assert((size_t) l <= a2dp->buffer_size);
 
-        u->read_index += (uint64_t) l;
-
         /* TODO: get timestamp from rtp */
         if (!found_tstamp) {
             /* pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!"); */
             tstamp = pa_rtclock_now();
         }
 
-        pa_smoother_put(u->read_smoother, tstamp, pa_bytes_to_usec(u->read_index, &u->sample_spec));
-        pa_smoother_resume(u->read_smoother, tstamp, true);
-
         p = (uint8_t*) a2dp->buffer + sizeof(*header) + sizeof(*payload);
         to_decode = l - sizeof(*header) - sizeof(*payload);
 
@@ -937,12 +933,14 @@ static int a2dp_process_push(struct userdata *u) {
                 pa_log_error("SBC decoding error (%li)", (long) decoded);
                 pa_memblock_release(memchunk.memblock);
                 pa_memblock_unref(memchunk.memblock);
-                return -1;
+                return 0;
             }
 
 /*             pa_log_debug("SBC: decoded: %lu; written: %lu", (unsigned long) decoded, (unsigned long) written); */
 /*             pa_log_debug("SBC: frame_length: %lu; codesize: %lu", (unsigned long) a2dp->frame_length, (unsigned long) a2dp->codesize); */
 
+            total_written += written;
+
             /* Reset frame length, it can be changed due to bitpool change */
             a2dp->frame_length = sbc_get_frame_length(&a2dp->sbc);
 
@@ -958,6 +956,10 @@ static int a2dp_process_push(struct userdata *u) {
             to_write -= written;
         }
 
+        u->read_index += (uint64_t) total_written;
+        pa_smoother_put(u->read_smoother, tstamp, pa_bytes_to_usec(u->read_index, &u->sample_spec));
+        pa_smoother_resume(u->read_smoother, tstamp, true);
+
         memchunk.length -= to_write;
 
         pa_memblock_release(memchunk.memblock);
@@ -1039,10 +1041,12 @@ static void thread_func(void *userdata) {
                 if (n_read < 0)
                     goto io_fail;
 
-                /* We just read something, so we are supposed to write something, too */
-                pending_read_bytes += n_read;
-                do_write += pending_read_bytes / u->write_block_size;
-                pending_read_bytes = pending_read_bytes % u->write_block_size;
+                if (n_read > 0) {
+                    /* We just read something, so we are supposed to write something, too */
+                    pending_read_bytes += n_read;
+                    do_write += pending_read_bytes / u->write_block_size;
+                    pending_read_bytes = pending_read_bytes % u->write_block_size;
+                }
             }
         }
 
@@ -1147,7 +1151,7 @@ static void thread_func(void *userdata) {
             pollfd->events = (short) (((u->sink && PA_SINK_IS_LINKED(u->sink->thread_info.state) && !writable) ? POLLOUT : 0) |
                                       (u->source && PA_SOURCE_IS_LINKED(u->source->thread_info.state) ? POLLIN : 0));
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0) {
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0) {
             pa_log_debug("pa_rtpoll_run failed with: %d", ret);
             goto fail;
         }
@@ -1367,7 +1371,7 @@ static void source_set_volume_cb(pa_source *s) {
 }
 
 /* Run from main thread */
-static char *get_name(const char *type, pa_modargs *ma, const char *device_id, bool *namereg_fail) {
+static char *get_name(const char *type, pa_modargs *ma, const char *device_id, const char *profile, bool *namereg_fail) {
     char *t;
     const char *n;
 
@@ -1392,7 +1396,10 @@ static char *get_name(const char *type, pa_modargs *ma, const char *device_id, b
         *namereg_fail = false;
     }
 
-    return pa_sprintf_malloc("bluez_%s.%s", type, n);
+    if (profile)
+        return pa_sprintf_malloc("bluez_%s.%s.%s", type, n, profile);
+    else
+        return pa_sprintf_malloc("bluez_%s.%s", type, n);
 }
 
 static int sco_over_pcm_state_update(struct userdata *u, bool changed) {
@@ -1563,7 +1570,7 @@ static int add_sink(struct userdata *u) {
         if (u->profile == PA_BLUEZ4_PROFILE_HSP)
             pa_proplist_sets(data.proplist, PA_PROP_DEVICE_INTENDED_ROLES, "phone");
         data.card = u->card;
-        data.name = get_name("sink", u->modargs, u->address, &b);
+        data.name = get_name("sink", u->modargs, u->address, pa_bluez4_profile_to_string(u->profile), &b);
         data.namereg_fail = b;
 
         if (pa_modargs_get_proplist(u->modargs, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) {
@@ -1634,7 +1641,7 @@ static int add_source(struct userdata *u) {
             pa_proplist_sets(data.proplist, PA_PROP_DEVICE_INTENDED_ROLES, "phone");
 
         data.card = u->card;
-        data.name = get_name("source", u->modargs, u->address, &b);
+        data.name = get_name("source", u->modargs, u->address, pa_bluez4_profile_to_string(u->profile), &b);
         data.namereg_fail = b;
 
         if (pa_modargs_get_proplist(u->modargs, "source_properties", data.proplist, PA_UPDATE_REPLACE) < 0) {
@@ -2263,7 +2270,7 @@ static int add_card(struct userdata *u) {
     pa_proplist_sets(data.proplist, "bluez.path", device->path);
     pa_proplist_setf(data.proplist, "bluez.class", "0x%06x", (unsigned) device->class);
     pa_proplist_sets(data.proplist, "bluez.alias", device->alias);
-    data.name = get_name("card", u->modargs, device->address, &b);
+    data.name = get_name("card", u->modargs, device->address, NULL, &b);
     data.namereg_fail = b;
 
     if (pa_modargs_get_proplist(u->modargs, "card_properties", data.proplist, PA_UPDATE_REPLACE) < 0) {
diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
index 287e763..e6a8071 100644
--- a/src/modules/bluetooth/module-bluez5-device.c
+++ b/src/modules/bluetooth/module-bluez5-device.c
@@ -33,6 +33,7 @@
 #include <pulse/timeval.h>
 
 #include <pulsecore/core-error.h>
+#include <pulsecore/core-rtclock.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/i18n.h>
 #include <pulsecore/module.h>
@@ -59,10 +60,13 @@ PA_MODULE_USAGE("path=<device object path>");
 
 #define MAX_PLAYBACK_CATCH_UP_USEC (100 * PA_USEC_PER_MSEC)
 #define FIXED_LATENCY_PLAYBACK_A2DP (25 * PA_USEC_PER_MSEC)
+#define FIXED_LATENCY_PLAYBACK_SCO (125 * PA_USEC_PER_MSEC)
 #define FIXED_LATENCY_RECORD_A2DP   (25 * PA_USEC_PER_MSEC)
+#define FIXED_LATENCY_RECORD_SCO    (25 * PA_USEC_PER_MSEC)
 
 #define BITPOOL_DEC_LIMIT 32
 #define BITPOOL_DEC_STEP 5
+#define HSP_MAX_GAIN 15
 
 static const char* const valid_modargs[] = {
     "path",
@@ -71,6 +75,7 @@ static const char* const valid_modargs[] = {
 
 enum {
     BLUETOOTH_MESSAGE_IO_THREAD_FAILED,
+    BLUETOOTH_MESSAGE_STREAM_FD_HUP,
     BLUETOOTH_MESSAGE_MAX
 };
 
@@ -99,6 +104,8 @@ struct userdata {
 
     pa_hook_slot *device_connection_changed_slot;
     pa_hook_slot *transport_state_changed_slot;
+    pa_hook_slot *transport_speaker_gain_changed_slot;
+    pa_hook_slot *transport_microphone_gain_changed_slot;
 
     pa_bluetooth_discovery *discovery;
     pa_bluetooth_device *device;
@@ -235,6 +242,157 @@ static void connect_ports(struct userdata *u, void *new_data, pa_direction_t dir
 }
 
 /* Run from IO thread */
+static int sco_process_render(struct userdata *u) {
+    ssize_t l;
+    pa_memchunk memchunk;
+
+    pa_assert(u);
+    pa_assert(u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT ||
+                u->profile == PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY);
+    pa_assert(u->sink);
+
+    pa_sink_render_full(u->sink, u->write_block_size, &memchunk);
+
+    pa_assert(memchunk.length == u->write_block_size);
+
+    for (;;) {
+        const void *p;
+
+        /* Now write that data to the socket. The socket is of type
+         * SEQPACKET, and we generated the data of the MTU size, so this
+         * should just work. */
+
+        p = (const uint8_t *) pa_memblock_acquire_chunk(&memchunk);
+        l = pa_write(u->stream_fd, p, memchunk.length, &u->stream_write_type);
+        pa_memblock_release(memchunk.memblock);
+
+        pa_assert(l != 0);
+
+        if (l > 0)
+            break;
+
+        if (errno == EINTR)
+            /* Retry right away if we got interrupted */
+            continue;
+        else if (errno == EAGAIN)
+            /* Hmm, apparently the socket was not writable, give up for now */
+            return 0;
+
+        pa_log_error("Failed to write data to SCO socket: %s", pa_cstrerror(errno));
+        return -1;
+    }
+
+    pa_assert((size_t) l <= memchunk.length);
+
+    if ((size_t) l != memchunk.length) {
+        pa_log_error("Wrote memory block to socket only partially! %llu written, wanted to write %llu.",
+                    (unsigned long long) l,
+                    (unsigned long long) memchunk.length);
+        return -1;
+    }
+
+    u->write_index += (uint64_t) memchunk.length;
+    pa_memblock_unref(memchunk.memblock);
+
+    return 1;
+}
+
+/* Run from IO thread */
+static int sco_process_push(struct userdata *u) {
+    ssize_t l;
+    pa_memchunk memchunk;
+    struct cmsghdr *cm;
+    struct msghdr m;
+    bool found_tstamp = false;
+    pa_usec_t tstamp = 0;
+
+    pa_assert(u);
+    pa_assert(u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT ||
+                u->profile == PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY);
+    pa_assert(u->source);
+    pa_assert(u->read_smoother);
+
+    memchunk.memblock = pa_memblock_new(u->core->mempool, u->read_block_size);
+    memchunk.index = memchunk.length = 0;
+
+    for (;;) {
+        void *p;
+        uint8_t aux[1024];
+        struct iovec iov;
+
+        pa_zero(m);
+        pa_zero(aux);
+        pa_zero(iov);
+
+        m.msg_iov = &iov;
+        m.msg_iovlen = 1;
+        m.msg_control = aux;
+        m.msg_controllen = sizeof(aux);
+
+        p = pa_memblock_acquire(memchunk.memblock);
+        iov.iov_base = p;
+        iov.iov_len = pa_memblock_get_length(memchunk.memblock);
+        l = recvmsg(u->stream_fd, &m, 0);
+        pa_memblock_release(memchunk.memblock);
+
+        if (l > 0)
+            break;
+
+        if (l < 0 && errno == EINTR)
+            /* Retry right away if we got interrupted */
+            continue;
+
+        pa_memblock_unref(memchunk.memblock);
+
+        if (l < 0 && errno == EAGAIN)
+            /* Hmm, apparently the socket was not readable, give up for now. */
+            return 0;
+
+        pa_log_error("Failed to read data from SCO socket: %s", l < 0 ? pa_cstrerror(errno) : "EOF");
+        return -1;
+    }
+
+    pa_assert((size_t) l <= pa_memblock_get_length(memchunk.memblock));
+
+    /* In some rare occasions, we might receive packets of a very strange
+     * size. This could potentially be possible if the SCO packet was
+     * received partially over-the-air, or more probably due to hardware
+     * issues in our Bluetooth adapter. In these cases, in order to avoid
+     * an assertion failure due to unaligned data, just discard the whole
+     * packet */
+    if (!pa_frame_aligned(l, &u->sample_spec)) {
+        pa_log_warn("SCO packet received of unaligned size: %zu", l);
+        pa_memblock_unref(memchunk.memblock);
+        return -1;
+    }
+
+    memchunk.length = (size_t) l;
+    u->read_index += (uint64_t) l;
+
+    for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm))
+        if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SO_TIMESTAMP) {
+            struct timeval *tv = (struct timeval*) CMSG_DATA(cm);
+            pa_rtclock_from_wallclock(tv);
+            tstamp = pa_timeval_load(tv);
+            found_tstamp = true;
+            break;
+        }
+
+    if (!found_tstamp) {
+        pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!");
+        tstamp = pa_rtclock_now();
+    }
+
+    pa_smoother_put(u->read_smoother, tstamp, pa_bytes_to_usec(u->read_index, &u->sample_spec));
+    pa_smoother_resume(u->read_smoother, tstamp, true);
+
+    pa_source_post(u->source, &memchunk);
+    pa_memblock_unref(memchunk.memblock);
+
+    return l;
+}
+
+/* Run from IO thread */
 static void a2dp_prepare_buffer(struct userdata *u) {
     size_t min_buffer_size = PA_MAX(u->read_link_mtu, u->write_link_mtu);
 
@@ -402,6 +560,7 @@ static int a2dp_process_push(struct userdata *u) {
         void *d;
         ssize_t l;
         size_t to_write, to_decode;
+        size_t total_written = 0;
 
         a2dp_prepare_buffer(u);
 
@@ -428,17 +587,12 @@ static int a2dp_process_push(struct userdata *u) {
 
         pa_assert((size_t) l <= sbc_info->buffer_size);
 
-        u->read_index += (uint64_t) l;
-
         /* TODO: get timestamp from rtp */
         if (!found_tstamp) {
             /* pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!"); */
             tstamp = pa_rtclock_now();
         }
 
-        pa_smoother_put(u->read_smoother, tstamp, pa_bytes_to_usec(u->read_index, &u->sample_spec));
-        pa_smoother_resume(u->read_smoother, tstamp, true);
-
         p = (uint8_t*) sbc_info->buffer + sizeof(*header) + sizeof(*payload);
         to_decode = l - sizeof(*header) - sizeof(*payload);
 
@@ -458,9 +612,11 @@ static int a2dp_process_push(struct userdata *u) {
                 pa_log_error("SBC decoding error (%li)", (long) decoded);
                 pa_memblock_release(memchunk.memblock);
                 pa_memblock_unref(memchunk.memblock);
-                return -1;
+                return 0;
             }
 
+            total_written += written;
+
             /* Reset frame length, it can be changed due to bitpool change */
             sbc_info->frame_length = sbc_get_frame_length(&sbc_info->sbc);
 
@@ -476,6 +632,10 @@ static int a2dp_process_push(struct userdata *u) {
             to_write -= written;
         }
 
+        u->read_index += (uint64_t) total_written;
+        pa_smoother_put(u->read_smoother, tstamp, pa_bytes_to_usec(u->read_index, &u->sample_spec));
+        pa_smoother_resume(u->read_smoother, tstamp, true);
+
         memchunk.length -= to_write;
 
         pa_memblock_release(memchunk.memblock);
@@ -608,24 +768,31 @@ static void transport_release(struct userdata *u) {
 
 /* Run from I/O thread */
 static void transport_config_mtu(struct userdata *u) {
-    u->read_block_size =
-        (u->read_link_mtu - sizeof(struct rtp_header) - sizeof(struct rtp_payload))
-        / u->sbc_info.frame_length * u->sbc_info.codesize;
+    if (u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT || u->profile == PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY) {
+        u->read_block_size = u->read_link_mtu;
+        u->write_block_size = u->write_link_mtu;
+    } else {
+        u->read_block_size =
+            (u->read_link_mtu - sizeof(struct rtp_header) - sizeof(struct rtp_payload))
+            / u->sbc_info.frame_length * u->sbc_info.codesize;
 
-    u->write_block_size =
-        (u->write_link_mtu - sizeof(struct rtp_header) - sizeof(struct rtp_payload))
-        / u->sbc_info.frame_length * u->sbc_info.codesize;
+        u->write_block_size =
+            (u->write_link_mtu - sizeof(struct rtp_header) - sizeof(struct rtp_payload))
+            / u->sbc_info.frame_length * u->sbc_info.codesize;
+    }
 
     if (u->sink) {
         pa_sink_set_max_request_within_thread(u->sink, u->write_block_size);
         pa_sink_set_fixed_latency_within_thread(u->sink,
-                                                FIXED_LATENCY_PLAYBACK_A2DP +
+                                                (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SINK ?
+                                                 FIXED_LATENCY_PLAYBACK_A2DP : FIXED_LATENCY_PLAYBACK_SCO) +
                                                 pa_bytes_to_usec(u->write_block_size, &u->sample_spec));
     }
 
     if (u->source)
         pa_source_set_fixed_latency_within_thread(u->source,
-                                                  FIXED_LATENCY_RECORD_A2DP +
+                                                  (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SOURCE ?
+                                                   FIXED_LATENCY_RECORD_A2DP : FIXED_LATENCY_RECORD_SCO) +
                                                   pa_bytes_to_usec(u->read_block_size, &u->sample_spec));
 }
 
@@ -739,6 +906,40 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
 }
 
 /* Run from main thread */
+static void source_set_volume_cb(pa_source *s) {
+    uint16_t gain;
+    pa_volume_t volume;
+    struct userdata *u;
+
+    pa_assert(s);
+    pa_assert(s->core);
+
+    u = s->userdata;
+
+    pa_assert(u);
+    pa_assert(u->source == s);
+    pa_assert(u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT);
+
+    if (u->transport->set_microphone_gain == NULL)
+      return;
+
+    gain = (pa_cvolume_max(&s->real_volume) * HSP_MAX_GAIN) / PA_VOLUME_NORM;
+
+    if (gain > HSP_MAX_GAIN)
+        gain = HSP_MAX_GAIN;
+
+    volume = (pa_volume_t) (gain * PA_VOLUME_NORM / HSP_MAX_GAIN);
+
+    /* increment volume by one to correct rounding errors */
+    if (volume < PA_VOLUME_NORM)
+        volume++;
+
+    pa_cvolume_set(&s->real_volume, u->sample_spec.channels, volume);
+
+    u->transport->set_microphone_gain(u->transport, gain);
+}
+
+/* Run from main thread */
 static int add_source(struct userdata *u) {
     pa_source_new_data data;
 
@@ -752,15 +953,19 @@ static int add_source(struct userdata *u) {
     data.namereg_fail = false;
     pa_proplist_sets(data.proplist, "bluetooth.protocol", pa_bluetooth_profile_to_string(u->profile));
     pa_source_new_data_set_sample_spec(&data, &u->sample_spec);
+    if (u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT)
+        pa_proplist_sets(data.proplist, PA_PROP_DEVICE_INTENDED_ROLES, "phone");
 
     connect_ports(u, &data, PA_DIRECTION_INPUT);
 
     if (!u->transport_acquired)
         switch (u->profile) {
             case PA_BLUETOOTH_PROFILE_A2DP_SOURCE:
+            case PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY:
                 data.suspend_cause = PA_SUSPEND_USER;
                 break;
             case PA_BLUETOOTH_PROFILE_A2DP_SINK:
+            case PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT:
             case PA_BLUETOOTH_PROFILE_OFF:
                 pa_assert_not_reached();
                 break;
@@ -776,6 +981,10 @@ static int add_source(struct userdata *u) {
     u->source->userdata = u;
     u->source->parent.process_msg = source_process_msg;
 
+    if (u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT) {
+        pa_source_set_set_volume_callback(u->source, source_set_volume_cb);
+        u->source->n_volume_steps = 16;
+    }
     return 0;
 }
 
@@ -854,6 +1063,40 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
 }
 
 /* Run from main thread */
+static void sink_set_volume_cb(pa_sink *s) {
+    uint16_t gain;
+    pa_volume_t volume;
+    struct userdata *u;
+
+    pa_assert(s);
+    pa_assert(s->core);
+
+    u = s->userdata;
+
+    pa_assert(u);
+    pa_assert(u->sink == s);
+    pa_assert(u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT);
+
+    if (u->transport->set_speaker_gain == NULL)
+      return;
+
+    gain = (pa_cvolume_max(&s->real_volume) * HSP_MAX_GAIN) / PA_VOLUME_NORM;
+
+    if (gain > HSP_MAX_GAIN)
+        gain = HSP_MAX_GAIN;
+
+    volume = (pa_volume_t) (gain * PA_VOLUME_NORM / HSP_MAX_GAIN);
+
+    /* increment volume by one to correct rounding errors */
+    if (volume < PA_VOLUME_NORM)
+        volume++;
+
+    pa_cvolume_set(&s->real_volume, u->sample_spec.channels, volume);
+
+    u->transport->set_speaker_gain(u->transport, gain);
+}
+
+/* Run from main thread */
 static int add_sink(struct userdata *u) {
     pa_sink_new_data data;
 
@@ -867,14 +1110,20 @@ static int add_sink(struct userdata *u) {
     data.namereg_fail = false;
     pa_proplist_sets(data.proplist, "bluetooth.protocol", pa_bluetooth_profile_to_string(u->profile));
     pa_sink_new_data_set_sample_spec(&data, &u->sample_spec);
+    if (u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT)
+        pa_proplist_sets(data.proplist, PA_PROP_DEVICE_INTENDED_ROLES, "phone");
 
     connect_ports(u, &data, PA_DIRECTION_OUTPUT);
 
     if (!u->transport_acquired)
         switch (u->profile) {
+            case PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY:
+                data.suspend_cause = PA_SUSPEND_USER;
+                break;
             case PA_BLUETOOTH_PROFILE_A2DP_SINK:
                 /* Profile switch should have failed */
             case PA_BLUETOOTH_PROFILE_A2DP_SOURCE:
+            case PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT:
             case PA_BLUETOOTH_PROFILE_OFF:
                 pa_assert_not_reached();
                 break;
@@ -890,116 +1139,126 @@ static int add_sink(struct userdata *u) {
     u->sink->userdata = u;
     u->sink->parent.process_msg = sink_process_msg;
 
+    if (u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT) {
+        pa_sink_set_set_volume_callback(u->sink, sink_set_volume_cb);
+        u->sink->n_volume_steps = 16;
+    }
     return 0;
 }
 
 /* Run from main thread */
 static void transport_config(struct userdata *u) {
-    sbc_info_t *sbc_info = &u->sbc_info;
-    a2dp_sbc_t *config;
+    if (u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT || u->profile == PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY) {
+        u->sample_spec.format = PA_SAMPLE_S16LE;
+        u->sample_spec.channels = 1;
+        u->sample_spec.rate = 8000;
+    } else {
+        sbc_info_t *sbc_info = &u->sbc_info;
+        a2dp_sbc_t *config;
 
-    pa_assert(u->transport);
+        pa_assert(u->transport);
 
-    u->sample_spec.format = PA_SAMPLE_S16LE;
-    config = (a2dp_sbc_t *) u->transport->config;
+        u->sample_spec.format = PA_SAMPLE_S16LE;
+        config = (a2dp_sbc_t *) u->transport->config;
 
-    if (sbc_info->sbc_initialized)
-        sbc_reinit(&sbc_info->sbc, 0);
-    else
-        sbc_init(&sbc_info->sbc, 0);
-    sbc_info->sbc_initialized = true;
+        if (sbc_info->sbc_initialized)
+            sbc_reinit(&sbc_info->sbc, 0);
+        else
+            sbc_init(&sbc_info->sbc, 0);
+        sbc_info->sbc_initialized = true;
 
-    switch (config->frequency) {
-        case SBC_SAMPLING_FREQ_16000:
-            sbc_info->sbc.frequency = SBC_FREQ_16000;
-            u->sample_spec.rate = 16000U;
-            break;
-        case SBC_SAMPLING_FREQ_32000:
-            sbc_info->sbc.frequency = SBC_FREQ_32000;
-            u->sample_spec.rate = 32000U;
-            break;
-        case SBC_SAMPLING_FREQ_44100:
-            sbc_info->sbc.frequency = SBC_FREQ_44100;
-            u->sample_spec.rate = 44100U;
-            break;
-        case SBC_SAMPLING_FREQ_48000:
-            sbc_info->sbc.frequency = SBC_FREQ_48000;
-            u->sample_spec.rate = 48000U;
-            break;
-        default:
-            pa_assert_not_reached();
-    }
+        switch (config->frequency) {
+            case SBC_SAMPLING_FREQ_16000:
+                sbc_info->sbc.frequency = SBC_FREQ_16000;
+                u->sample_spec.rate = 16000U;
+                break;
+            case SBC_SAMPLING_FREQ_32000:
+                sbc_info->sbc.frequency = SBC_FREQ_32000;
+                u->sample_spec.rate = 32000U;
+                break;
+            case SBC_SAMPLING_FREQ_44100:
+                sbc_info->sbc.frequency = SBC_FREQ_44100;
+                u->sample_spec.rate = 44100U;
+                break;
+            case SBC_SAMPLING_FREQ_48000:
+                sbc_info->sbc.frequency = SBC_FREQ_48000;
+                u->sample_spec.rate = 48000U;
+                break;
+            default:
+                pa_assert_not_reached();
+        }
 
-    switch (config->channel_mode) {
-        case SBC_CHANNEL_MODE_MONO:
-            sbc_info->sbc.mode = SBC_MODE_MONO;
-            u->sample_spec.channels = 1;
-            break;
-        case SBC_CHANNEL_MODE_DUAL_CHANNEL:
-            sbc_info->sbc.mode = SBC_MODE_DUAL_CHANNEL;
-            u->sample_spec.channels = 2;
-            break;
-        case SBC_CHANNEL_MODE_STEREO:
-            sbc_info->sbc.mode = SBC_MODE_STEREO;
-            u->sample_spec.channels = 2;
-            break;
-        case SBC_CHANNEL_MODE_JOINT_STEREO:
-            sbc_info->sbc.mode = SBC_MODE_JOINT_STEREO;
-            u->sample_spec.channels = 2;
-            break;
-        default:
-            pa_assert_not_reached();
-    }
+        switch (config->channel_mode) {
+            case SBC_CHANNEL_MODE_MONO:
+                sbc_info->sbc.mode = SBC_MODE_MONO;
+                u->sample_spec.channels = 1;
+                break;
+            case SBC_CHANNEL_MODE_DUAL_CHANNEL:
+                sbc_info->sbc.mode = SBC_MODE_DUAL_CHANNEL;
+                u->sample_spec.channels = 2;
+                break;
+            case SBC_CHANNEL_MODE_STEREO:
+                sbc_info->sbc.mode = SBC_MODE_STEREO;
+                u->sample_spec.channels = 2;
+                break;
+            case SBC_CHANNEL_MODE_JOINT_STEREO:
+                sbc_info->sbc.mode = SBC_MODE_JOINT_STEREO;
+                u->sample_spec.channels = 2;
+                break;
+            default:
+                pa_assert_not_reached();
+        }
 
-    switch (config->allocation_method) {
-        case SBC_ALLOCATION_SNR:
-            sbc_info->sbc.allocation = SBC_AM_SNR;
-            break;
-        case SBC_ALLOCATION_LOUDNESS:
-            sbc_info->sbc.allocation = SBC_AM_LOUDNESS;
-            break;
-        default:
-            pa_assert_not_reached();
-    }
+        switch (config->allocation_method) {
+            case SBC_ALLOCATION_SNR:
+                sbc_info->sbc.allocation = SBC_AM_SNR;
+                break;
+            case SBC_ALLOCATION_LOUDNESS:
+                sbc_info->sbc.allocation = SBC_AM_LOUDNESS;
+                break;
+            default:
+                pa_assert_not_reached();
+        }
 
-    switch (config->subbands) {
-        case SBC_SUBBANDS_4:
-            sbc_info->sbc.subbands = SBC_SB_4;
-            break;
-        case SBC_SUBBANDS_8:
-            sbc_info->sbc.subbands = SBC_SB_8;
-            break;
-        default:
-            pa_assert_not_reached();
-    }
+        switch (config->subbands) {
+            case SBC_SUBBANDS_4:
+                sbc_info->sbc.subbands = SBC_SB_4;
+                break;
+            case SBC_SUBBANDS_8:
+                sbc_info->sbc.subbands = SBC_SB_8;
+                break;
+            default:
+                pa_assert_not_reached();
+        }
 
-    switch (config->block_length) {
-        case SBC_BLOCK_LENGTH_4:
-            sbc_info->sbc.blocks = SBC_BLK_4;
-            break;
-        case SBC_BLOCK_LENGTH_8:
-            sbc_info->sbc.blocks = SBC_BLK_8;
-            break;
-        case SBC_BLOCK_LENGTH_12:
-            sbc_info->sbc.blocks = SBC_BLK_12;
-            break;
-        case SBC_BLOCK_LENGTH_16:
-            sbc_info->sbc.blocks = SBC_BLK_16;
-            break;
-        default:
-            pa_assert_not_reached();
-    }
+        switch (config->block_length) {
+            case SBC_BLOCK_LENGTH_4:
+                sbc_info->sbc.blocks = SBC_BLK_4;
+                break;
+            case SBC_BLOCK_LENGTH_8:
+                sbc_info->sbc.blocks = SBC_BLK_8;
+                break;
+            case SBC_BLOCK_LENGTH_12:
+                sbc_info->sbc.blocks = SBC_BLK_12;
+                break;
+            case SBC_BLOCK_LENGTH_16:
+                sbc_info->sbc.blocks = SBC_BLK_16;
+                break;
+            default:
+                pa_assert_not_reached();
+        }
 
-    sbc_info->min_bitpool = config->min_bitpool;
-    sbc_info->max_bitpool = config->max_bitpool;
+        sbc_info->min_bitpool = config->min_bitpool;
+        sbc_info->max_bitpool = config->max_bitpool;
 
-    /* Set minimum bitpool for source to get the maximum possible block_size */
-    sbc_info->sbc.bitpool = u->profile == PA_BLUETOOTH_PROFILE_A2DP_SINK ? sbc_info->max_bitpool : sbc_info->min_bitpool;
-    sbc_info->codesize = sbc_get_codesize(&sbc_info->sbc);
-    sbc_info->frame_length = sbc_get_frame_length(&sbc_info->sbc);
+        /* Set minimum bitpool for source to get the maximum possible block_size */
+        sbc_info->sbc.bitpool = u->profile == PA_BLUETOOTH_PROFILE_A2DP_SINK ? sbc_info->max_bitpool : sbc_info->min_bitpool;
+        sbc_info->codesize = sbc_get_codesize(&sbc_info->sbc);
+        sbc_info->frame_length = sbc_get_frame_length(&sbc_info->sbc);
 
-    pa_log_info("SBC parameters: allocation=%u, subbands=%u, blocks=%u, bitpool=%u",
-                sbc_info->sbc.allocation, sbc_info->sbc.subbands, sbc_info->sbc.blocks, sbc_info->sbc.bitpool);
+        pa_log_info("SBC parameters: allocation=%u, subbands=%u, blocks=%u, bitpool=%u",
+                    sbc_info->sbc.allocation, sbc_info->sbc.subbands, sbc_info->sbc.blocks, sbc_info->sbc.bitpool);
+    }
 }
 
 /* Run from main thread */
@@ -1019,7 +1278,7 @@ static int setup_transport(struct userdata *u) {
 
     u->transport = t;
 
-    if (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SOURCE)
+    if (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SOURCE || u->profile == PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY)
         transport_acquire(u, true); /* In case of error, the sink/sources will be created suspended */
     else if (transport_acquire(u, false) < 0)
         return -1; /* We need to fail here until the interactions with module-suspend-on-idle and alike get improved */
@@ -1030,6 +1289,19 @@ static int setup_transport(struct userdata *u) {
 }
 
 /* Run from main thread */
+static pa_direction_t get_profile_direction(pa_bluetooth_profile_t p) {
+    static const pa_direction_t profile_direction[] = {
+        [PA_BLUETOOTH_PROFILE_A2DP_SINK] = PA_DIRECTION_OUTPUT,
+        [PA_BLUETOOTH_PROFILE_A2DP_SOURCE] = PA_DIRECTION_INPUT,
+        [PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT] = PA_DIRECTION_INPUT | PA_DIRECTION_OUTPUT,
+        [PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY] = PA_DIRECTION_INPUT | PA_DIRECTION_OUTPUT,
+        [PA_BLUETOOTH_PROFILE_OFF] = 0
+    };
+
+    return profile_direction[p];
+}
+
+/* Run from main thread */
 static int init_profile(struct userdata *u) {
     int r = 0;
     pa_assert(u);
@@ -1040,11 +1312,11 @@ static int init_profile(struct userdata *u) {
 
     pa_assert(u->transport);
 
-    if (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SINK)
+    if (get_profile_direction (u->profile) & PA_DIRECTION_OUTPUT)
         if (add_sink(u) < 0)
             r = -1;
 
-    if (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SOURCE)
+    if (get_profile_direction (u->profile) & PA_DIRECTION_INPUT)
         if (add_source(u) < 0)
             r = -1;
 
@@ -1079,6 +1351,24 @@ static void thread_func(void *userdata) {
 
         pollfd = u->rtpoll_item ? pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL) : NULL;
 
+        if (pollfd && (pollfd->revents & ~(POLLOUT|POLLIN))) {
+            pa_log_info("FD error: %s%s%s%s",
+                        pollfd->revents & POLLERR ? "POLLERR " :"",
+                        pollfd->revents & POLLHUP ? "POLLHUP " :"",
+                        pollfd->revents & POLLPRI ? "POLLPRI " :"",
+                        pollfd->revents & POLLNVAL ? "POLLNVAL " :"");
+
+            if (pollfd->revents & POLLHUP) {
+                pollfd = NULL;
+                teardown_stream(u);
+                do_write = 0;
+                pending_read_bytes = 0;
+                writable = false;
+                pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(u->msg), BLUETOOTH_MESSAGE_STREAM_FD_HUP, NULL, 0, NULL, NULL);
+            } else
+                goto fail;
+        }
+
         if (u->source && PA_SOURCE_IS_LINKED(u->source->thread_info.state)) {
 
             /* We should send two blocks to the device before we expect
@@ -1090,15 +1380,20 @@ static void thread_func(void *userdata) {
             if (pollfd && (pollfd->revents & POLLIN)) {
                 int n_read;
 
-                n_read = a2dp_process_push(u);
+                if (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SOURCE)
+                    n_read = a2dp_process_push(u);
+                else
+                    n_read = sco_process_push(u);
 
                 if (n_read < 0)
-                    goto io_fail;
+                    goto fail;
 
-                /* We just read something, so we are supposed to write something, too */
-                pending_read_bytes += n_read;
-                do_write += pending_read_bytes / u->write_block_size;
-                pending_read_bytes = pending_read_bytes % u->write_block_size;
+                if (n_read > 0) {
+                    /* We just read something, so we are supposed to write something, too */
+                    pending_read_bytes += n_read;
+                    do_write += pending_read_bytes / u->write_block_size;
+                    pending_read_bytes = pending_read_bytes % u->write_block_size;
+                }
             }
         }
 
@@ -1159,8 +1454,13 @@ static void thread_func(void *userdata) {
                     if (u->write_index <= 0)
                         u->started_at = pa_rtclock_now();
 
-                    if ((n_written = a2dp_process_render(u)) < 0)
-                        goto io_fail;
+                    if (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SINK) {
+                        if ((n_written = a2dp_process_render(u)) < 0)
+                            goto fail;
+                    } else {
+                        if ((n_written = sco_process_render(u)) < 0)
+                            goto fail;
+                    }
 
                     if (n_written == 0)
                         pa_log("Broken kernel: we got EAGAIN on write() after POLLOUT!");
@@ -1198,7 +1498,7 @@ static void thread_func(void *userdata) {
             pollfd->events = (short) (((u->sink && PA_SINK_IS_LINKED(u->sink->thread_info.state) && !writable) ? POLLOUT : 0) |
                                       (u->source && PA_SOURCE_IS_LINKED(u->source->thread_info.state) ? POLLIN : 0));
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0) {
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0) {
             pa_log_debug("pa_rtpoll_run failed with: %d", ret);
             goto fail;
         }
@@ -1207,30 +1507,6 @@ static void thread_func(void *userdata) {
             transport_release(u);
             goto finish;
         }
-
-        pollfd = u->rtpoll_item ? pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL) : NULL;
-
-        if (pollfd && (pollfd->revents & ~(POLLOUT|POLLIN))) {
-            pa_log_info("FD error: %s%s%s%s",
-                        pollfd->revents & POLLERR ? "POLLERR " :"",
-                        pollfd->revents & POLLHUP ? "POLLHUP " :"",
-                        pollfd->revents & POLLPRI ? "POLLPRI " :"",
-                        pollfd->revents & POLLNVAL ? "POLLNVAL " :"");
-            goto io_fail;
-        }
-
-        continue;
-
-io_fail:
-        /* In case of HUP, just tear down the streams */
-        if (!pollfd || (pollfd->revents & POLLHUP) == 0)
-            goto fail;
-
-        do_write = 0;
-        pending_read_bytes = 0;
-        writable = false;
-
-        teardown_stream(u);
     }
 
 fail:
@@ -1360,17 +1636,6 @@ static char *cleanup_name(const char *name) {
 }
 
 /* Run from main thread */
-static pa_direction_t get_profile_direction(pa_bluetooth_profile_t p) {
-    static const pa_direction_t profile_direction[] = {
-        [PA_BLUETOOTH_PROFILE_A2DP_SINK] = PA_DIRECTION_OUTPUT,
-        [PA_BLUETOOTH_PROFILE_A2DP_SOURCE] = PA_DIRECTION_INPUT,
-        [PA_BLUETOOTH_PROFILE_OFF] = 0
-    };
-
-    return profile_direction[p];
-}
-
-/* Run from main thread */
 static pa_available_t get_port_availability(struct userdata *u, pa_direction_t direction) {
     pa_available_t result = PA_AVAILABLE_NO;
     unsigned i;
@@ -1520,9 +1785,7 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
     pa_assert_se(output_port = pa_hashmap_get(ports, u->output_port_name));
 
     if (pa_streq(uuid, PA_BLUETOOTH_UUID_A2DP_SINK)) {
-	/* TODO: Change this profile's name to a2dp_sink, to reflect the remote
-         * device's role and be consistent with the a2dp source profile */
-        cp = pa_card_profile_new("a2dp", _("High Fidelity Playback (A2DP Sink)"), sizeof(pa_bluetooth_profile_t));
+        cp = pa_card_profile_new("a2dp_sink", _("High Fidelity Playback (A2DP Sink)"), sizeof(pa_bluetooth_profile_t));
         cp->priority = 10;
         cp->n_sinks = 1;
         cp->n_sources = 0;
@@ -1543,10 +1806,38 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
 
         p = PA_CARD_PROFILE_DATA(cp);
         *p = PA_BLUETOOTH_PROFILE_A2DP_SOURCE;
+    } else if (pa_streq(uuid, PA_BLUETOOTH_UUID_HSP_HS) || pa_streq(uuid, PA_BLUETOOTH_UUID_HFP_HF)) {
+        cp = pa_card_profile_new("headset_head_unit", _("Headset Head Unit (HSP/HFP)"), sizeof(pa_bluetooth_profile_t));
+        cp->priority = 20;
+        cp->n_sinks = 1;
+        cp->n_sources = 1;
+        cp->max_sink_channels = 1;
+        cp->max_source_channels = 1;
+        pa_hashmap_put(input_port->profiles, cp->name, cp);
+        pa_hashmap_put(output_port->profiles, cp->name, cp);
+
+        p = PA_CARD_PROFILE_DATA(cp);
+        *p = PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT;
+    } else if (pa_streq(uuid, PA_BLUETOOTH_UUID_HSP_AG) || pa_streq(uuid, PA_BLUETOOTH_UUID_HFP_AG)) {
+        cp = pa_card_profile_new("headset_audio_gateway", _("Headset Audio Gateway (HSP/HFP)"), sizeof(pa_bluetooth_profile_t));
+        cp->priority = 20;
+        cp->n_sinks = 1;
+        cp->n_sources = 1;
+        cp->max_sink_channels = 1;
+        cp->max_source_channels = 1;
+        pa_hashmap_put(input_port->profiles, cp->name, cp);
+        pa_hashmap_put(output_port->profiles, cp->name, cp);
+
+        p = PA_CARD_PROFILE_DATA(cp);
+        *p = PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY;
     }
 
-    if (cp && u->device->transports[*p])
-        cp->available = transport_state_to_availability(u->device->transports[*p]->state);
+    if (cp) {
+        if (u->device->transports[*p])
+            cp->available = transport_state_to_availability(u->device->transports[*p]->state);
+        else
+            cp->available = PA_AVAILABLE_NO;
+    }
 
     return cp;
 }
@@ -1680,10 +1971,8 @@ static void handle_transport_state_change(struct userdata *u, struct pa_bluetoot
 
     pa_assert(u);
     pa_assert(t);
+    pa_assert_se(cp = pa_hashmap_get(u->card->profiles, pa_bluetooth_profile_to_string(t->profile)));
 
-    /* Update profile availability */
-    if (!(cp = pa_hashmap_get(u->card->profiles, pa_bluetooth_profile_to_string(t->profile))))
-        return;
     pa_card_profile_set_available(cp, transport_state_to_availability(t->state));
 
     /* Update port availability */
@@ -1765,17 +2054,69 @@ static pa_hook_result_t transport_state_changed_cb(pa_bluetooth_discovery *y, pa
     return PA_HOOK_OK;
 }
 
+static pa_hook_result_t transport_speaker_gain_changed_cb(pa_bluetooth_discovery *y, pa_bluetooth_transport *t, struct userdata *u) {
+    pa_volume_t volume;
+    pa_cvolume v;
+    uint16_t gain;
+
+    pa_assert(t);
+    pa_assert(u);
+
+    if (t != u->transport)
+      return PA_HOOK_OK;
+
+    gain = t->speaker_gain;
+    volume = (pa_volume_t) (gain * PA_VOLUME_NORM / HSP_MAX_GAIN);
+
+    /* increment volume by one to correct rounding errors */
+    if (volume < PA_VOLUME_NORM)
+        volume++;
+
+    pa_cvolume_set(&v, u->sample_spec.channels, volume);
+    pa_sink_volume_changed(u->sink, &v);
+
+    return PA_HOOK_OK;
+}
+
+static pa_hook_result_t transport_microphone_gain_changed_cb(pa_bluetooth_discovery *y, pa_bluetooth_transport *t, struct userdata *u) {
+    pa_volume_t volume;
+    pa_cvolume v;
+    uint16_t gain;
+
+    pa_assert(t);
+    pa_assert(u);
+
+    if (t != u->transport)
+      return PA_HOOK_OK;
+
+    gain = t->microphone_gain;
+    volume = (pa_volume_t) (gain * PA_VOLUME_NORM / HSP_MAX_GAIN);
+
+    /* increment volume by one to correct rounding errors */
+    if (volume < PA_VOLUME_NORM)
+        volume++;
+
+    pa_cvolume_set(&v, u->sample_spec.channels, volume);
+    pa_source_volume_changed(u->source, &v);
+
+    return PA_HOOK_OK;
+}
+
 /* Run from main thread context */
 static int device_process_msg(pa_msgobject *obj, int code, void *data, int64_t offset, pa_memchunk *chunk) {
-    struct bluetooth_msg *u = BLUETOOTH_MSG(obj);
+    struct bluetooth_msg *m = BLUETOOTH_MSG(obj);
+    struct userdata *u = m->card->userdata;
 
     switch (code) {
         case BLUETOOTH_MESSAGE_IO_THREAD_FAILED:
-            if (u->card->module->unload_requested)
+            if (m->card->module->unload_requested)
                 break;
 
             pa_log_debug("Switching the profile to off due to IO thread failure.");
-            pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
+            pa_assert_se(pa_card_set_profile(m->card, pa_hashmap_get(m->card->profiles, "off"), false) >= 0);
+            break;
+        case BLUETOOTH_MESSAGE_STREAM_FD_HUP:
+            pa_bluetooth_transport_set_state(u->transport, PA_BLUETOOTH_TRANSPORT_STATE_IDLE);
             break;
     }
 
@@ -1825,6 +2166,13 @@ int pa__init(pa_module* m) {
         pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED),
                         PA_HOOK_NORMAL, (pa_hook_cb_t) transport_state_changed_cb, u);
 
+    u->transport_speaker_gain_changed_slot =
+        pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_SPEAKER_GAIN_CHANGED), PA_HOOK_NORMAL, (pa_hook_cb_t) transport_speaker_gain_changed_cb, u);
+
+    u->transport_microphone_gain_changed_slot =
+        pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_MICROPHONE_GAIN_CHANGED), PA_HOOK_NORMAL, (pa_hook_cb_t) transport_microphone_gain_changed_cb, u);
+
+
     if (add_card(u) < 0)
         goto fail;
 
@@ -1877,6 +2225,12 @@ void pa__done(pa_module *m) {
     if (u->transport_state_changed_slot)
         pa_hook_slot_free(u->transport_state_changed_slot);
 
+    if (u->transport_speaker_gain_changed_slot)
+        pa_hook_slot_free(u->transport_speaker_gain_changed_slot);
+
+    if (u->transport_microphone_gain_changed_slot)
+        pa_hook_slot_free(u->transport_microphone_gain_changed_slot);
+
     if (u->sbc_info.buffer)
         pa_xfree(u->sbc_info.buffer);
 
diff --git a/src/modules/bluetooth/module-bluez5-discover.c b/src/modules/bluetooth/module-bluez5-discover.c
index 0b7bf49..570cdba 100644
--- a/src/modules/bluetooth/module-bluez5-discover.c
+++ b/src/modules/bluetooth/module-bluez5-discover.c
@@ -27,6 +27,7 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/module.h>
+#include <pulsecore/modargs.h>
 #include <pulsecore/shared.h>
 
 #include "bluez5-util.h"
@@ -37,6 +38,14 @@ PA_MODULE_AUTHOR("Jo?o Paulo Rechi Vita");
 PA_MODULE_DESCRIPTION("Detect available BlueZ 5 Bluetooth audio devices and load BlueZ 5 Bluetooth audio drivers");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(true);
+PA_MODULE_USAGE(
+    "headset=ofono|native|auto"
+);
+
+static const char* const valid_modargs[] = {
+    "headset",
+    NULL
+};
 
 struct userdata {
     pa_module *module;
@@ -83,26 +92,54 @@ static pa_hook_result_t device_connection_changed_cb(pa_bluetooth_discovery *y,
     return PA_HOOK_OK;
 }
 
+#ifdef HAVE_BLUEZ_5_NATIVE_HEADSET
+const char *default_headset_backend = "native";
+#else
+const char *default_headset_backend = "ofono";
+#endif
+
 int pa__init(pa_module *m) {
     struct userdata *u;
+    pa_modargs *ma;
+    const char *headset_str;
+    int headset_backend;
 
     pa_assert(m);
 
+    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
+        pa_log("failed to parse module arguments.");
+        goto fail;
+    }
+
+    pa_assert_se(headset_str = pa_modargs_get_value(ma, "headset", default_headset_backend));
+    if (pa_streq(headset_str, "ofono"))
+        headset_backend = HEADSET_BACKEND_OFONO;
+    else if (pa_streq(headset_str, "native"))
+        headset_backend = HEADSET_BACKEND_NATIVE;
+    else if (pa_streq(headset_str, "auto"))
+        headset_backend = HEADSET_BACKEND_AUTO;
+    else {
+        pa_log("headset parameter must be either ofono, native or auto (found %s)", headset_str);
+        goto fail;
+    }
+
     m->userdata = u = pa_xnew0(struct userdata, 1);
     u->module = m;
     u->core = m->core;
     u->loaded_device_paths = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
 
-    if (!(u->discovery = pa_bluetooth_discovery_get(u->core)))
+    if (!(u->discovery = pa_bluetooth_discovery_get(u->core, headset_backend)))
         goto fail;
 
     u->device_connection_changed_slot =
         pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED),
                         PA_HOOK_NORMAL, (pa_hook_cb_t) device_connection_changed_cb, u);
 
+    pa_modargs_free(ma);
     return 0;
 
 fail:
+    pa_modargs_free(ma);
     pa__done(m);
     return -1;
 }
diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c
index c7853cc..90f862e 100644
--- a/src/modules/dbus/iface-core.c
+++ b/src/modules/dbus/iface-core.c
@@ -544,8 +544,7 @@ static void handle_set_default_sample_rate(DBusConnection *conn, DBusMessage *ms
 
     dbus_message_iter_get_basic(iter, &default_sample_rate);
 
-    if (!pa_sample_rate_valid(default_sample_rate) ||
-        !((default_sample_rate % 4000 == 0) || (default_sample_rate % 11025 == 0)))  {
+    if (!pa_sample_rate_valid(default_sample_rate)) {
         pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid sample rate.");
         return;
     }
@@ -579,8 +578,7 @@ static void handle_set_alternate_sample_rate(DBusConnection *conn, DBusMessage *
 
     dbus_message_iter_get_basic(iter, &alternate_sample_rate);
 
-    if (!pa_sample_rate_valid(alternate_sample_rate) ||
-        !((alternate_sample_rate % 4000 == 0) || (alternate_sample_rate % 11025 == 0))) {
+    if (!pa_sample_rate_valid(alternate_sample_rate)) {
         pa_dbus_send_error(conn, msg, DBUS_ERROR_INVALID_ARGS, "Invalid sample rate.");
         return;
     }
diff --git a/src/modules/dbus/iface-device.c b/src/modules/dbus/iface-device.c
index 34b370b..4469b78 100644
--- a/src/modules/dbus/iface-device.c
+++ b/src/modules/dbus/iface-device.c
@@ -725,7 +725,9 @@ static void handle_get_active_port(DBusConnection *conn, DBusMessage *msg, void
 static void handle_set_active_port(DBusConnection *conn, DBusMessage *msg, DBusMessageIter *iter, void *userdata) {
     pa_dbusiface_device *d = userdata;
     const char *new_active_path;
-    pa_dbusiface_device_port *new_active;
+    pa_dbusiface_device_port *port;
+    void *state;
+    pa_dbusiface_device_port *new_active = NULL;
     int r;
 
     pa_assert(conn);
@@ -747,7 +749,14 @@ static void handle_set_active_port(DBusConnection *conn, DBusMessage *msg, DBusM
 
     dbus_message_iter_get_basic(iter, &new_active_path);
 
-    if (!(new_active = pa_hashmap_get(d->ports, new_active_path))) {
+    PA_HASHMAP_FOREACH(port, d->ports, state) {
+        if (pa_streq(pa_dbusiface_device_port_get_path(port), new_active_path)) {
+            new_active = port;
+            break;
+        }
+    }
+
+    if (!new_active) {
         pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND, "No such port: %s", new_active_path);
         return;
     }
@@ -1248,7 +1257,7 @@ pa_dbusiface_device *pa_dbusiface_device_new_source(pa_dbusiface_core *core, pa_
     d->volume = *pa_source_get_volume(source, false);
     d->mute = pa_source_get_mute(source, false);
     d->source_state = pa_source_get_state(source);
-    d->ports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+    d->ports = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) pa_dbusiface_device_port_free);
     d->next_port_index = 0;
     d->active_port = source->active_port;
     d->proplist = pa_proplist_copy(source->proplist);
diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
index 1cff95e..4cbcd74 100644
--- a/src/modules/dbus/iface-stream.c
+++ b/src/modules/dbus/iface-stream.c
@@ -765,7 +765,7 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
             }
         }
 
-        new_mute = pa_sink_input_get_mute(s->sink_input);
+        new_mute = s->sink_input->muted;
 
         if (s->mute != new_mute) {
             s->mute = new_mute;
@@ -861,7 +861,7 @@ pa_dbusiface_stream *pa_dbusiface_stream_new_playback(pa_dbusiface_core *core, p
     else
         pa_cvolume_init(&s->volume);
 
-    s->mute = pa_sink_input_get_mute(sink_input);
+    s->mute = sink_input->muted;
     s->proplist = pa_proplist_copy(sink_input->proplist);
     s->dbus_protocol = pa_dbus_protocol_get(sink_input->core);
     s->subscription = pa_subscription_new(sink_input->core, PA_SUBSCRIPTION_MASK_SINK_INPUT, subscription_cb, s);
diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index fbdb3b3..eed4830 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -168,7 +168,7 @@ static const pa_echo_canceller ec_table[] = {
  *    capture and playback samples, we perform a resync. This adjusts the
  *    position in the playback memblock to the requested sample. Quick
  *    adjustments include moving the playback samples before the capture
- *    samples (because else the echo canceler does not work) or when the
+ *    samples (because else the echo canceller does not work) or when the
  *    playback pointer drifts too far away.
  *
  * 2) periodically check the difference between capture and playback. We use a
@@ -224,7 +224,7 @@ struct userdata {
     pa_source *source;
     bool source_auto_desc;
     pa_source_output *source_output;
-    pa_memblockq *source_memblockq; /* echo canceler needs fixed sized chunks */
+    pa_memblockq *source_memblockq; /* echo canceller needs fixed sized chunks */
     size_t source_skip;
 
     pa_sink *sink;
@@ -362,7 +362,7 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
 
     if (diff_time < 0) {
         /* recording before playback, we need to adjust quickly. The echo
-         * canceler does not work in this case. */
+         * canceller does not work in this case. */
         pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->source_output), SOURCE_OUTPUT_MESSAGE_APPLY_DIFF_TIME,
             NULL, diff_time, NULL, NULL);
         /*new_rate = base_rate - ((pa_usec_to_bytes(-diff_time, &u->source_output->sample_spec) / fs) * PA_USEC_PER_SEC) / u->adjust_time;*/
@@ -475,7 +475,7 @@ static int source_set_state_cb(pa_source *s, pa_source_state_t state) {
 
     if (state == PA_SOURCE_RUNNING) {
         /* restart timer when both sink and source are active */
-        if (IS_ACTIVE(u) && u->adjust_time)
+        if ((pa_sink_get_state(u->sink) == PA_SINK_RUNNING) && u->adjust_time)
             pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
 
         pa_atomic_store(&u->request_resync, 1);
@@ -500,7 +500,7 @@ static int sink_set_state_cb(pa_sink *s, pa_sink_state_t state) {
 
     if (state == PA_SINK_RUNNING) {
         /* restart timer when both sink and source are active */
-        if (IS_ACTIVE(u) && u->adjust_time)
+        if ((pa_source_get_state(u->source) == PA_SOURCE_RUNNING) && u->adjust_time)
             pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
 
         pa_atomic_store(&u->request_resync, 1);
@@ -646,20 +646,6 @@ static void sink_set_mute_cb(pa_sink *s) {
     pa_sink_input_set_mute(u->sink_input, s->muted, s->save_muted);
 }
 
-/* Called from main context */
-static void source_get_mute_cb(pa_source *s) {
-    struct userdata *u;
-
-    pa_source_assert_ref(s);
-    pa_assert_se(u = s->userdata);
-
-    if (!PA_SOURCE_IS_LINKED(pa_source_get_state(s)) ||
-        !PA_SOURCE_OUTPUT_IS_LINKED(pa_source_output_get_state(u->source_output)))
-        return;
-
-    pa_source_output_get_mute(u->source_output);
-}
-
 /* Called from source I/O thread context. */
 static void apply_diff_time(struct userdata *u, int64_t diff_time) {
     int64_t diff;
@@ -1573,14 +1559,14 @@ uint32_t pa_echo_canceller_blocksize_power2(unsigned rate, unsigned ms) {
     unsigned nframes = (rate * ms) / 1000;
     uint32_t y = 1 << ((8 * sizeof(uint32_t)) - 2);
 
-    assert(rate >= 4000);
-    assert(ms >= 1);
+    pa_assert(rate >= 4000);
+    pa_assert(ms >= 1);
 
     /* nframes should be a power of 2, round down to nearest power of two */
     while (y > nframes)
         y >>= 1;
 
-    assert(y >= 1);
+    pa_assert(y >= 1);
     return y;
 }
 
@@ -1810,7 +1796,6 @@ int pa__init(pa_module*m) {
     u->source->parent.process_msg = source_process_msg_cb;
     u->source->set_state = source_set_state_cb;
     u->source->update_requested_latency = source_update_requested_latency_cb;
-    pa_source_set_get_mute_callback(u->source, source_get_mute_cb);
     pa_source_set_set_mute_callback(u->source, source_set_mute_cb);
     if (!u->use_volume_sharing) {
         pa_source_set_get_volume_callback(u->source, source_get_volume_cb);
diff --git a/src/modules/gconf/gconf-helper.c b/src/modules/gconf/gconf-helper.c
index fbd8cfd..3c1180c 100644
--- a/src/modules/gconf/gconf-helper.c
+++ b/src/modules/gconf/gconf-helper.c
@@ -99,7 +99,9 @@ int main(int argc, char *argv[]) {
     GConfClient *client;
     GSList *modules, *m;
 
+#if !GLIB_CHECK_VERSION(2,36,0)
     g_type_init();
+#endif
 
     if (!(client = gconf_client_get_default()))
         goto fail;
diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index dee15af..d791b00 100644
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -284,16 +284,11 @@ static int handle_event(struct userdata *u) {
 
             case '-': {
                 char *name;
-                struct module_info *m;
 
                 if (!(name = read_string(u)))
                     goto fail;
 
-                if ((m = pa_hashmap_get(u->module_infos, name))) {
-                    pa_hashmap_remove(u->module_infos, name);
-                    module_info_free(m);
-                }
-
+                pa_hashmap_remove_and_free(u->module_infos, name);
                 pa_xfree(name);
 
                 break;
diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c
index ab97758..3c8e201 100644
--- a/src/modules/jack/module-jack-sink.c
+++ b/src/modules/jack/module-jack-sink.c
@@ -60,7 +60,7 @@
 
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("JACK Sink");
-PA_MODULE_LOAD_ONCE(true);
+PA_MODULE_LOAD_ONCE(false);
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_USAGE(
         "sink_name=<name for the sink> "
@@ -232,7 +232,7 @@ static void thread_func(void *userdata) {
         if (PA_UNLIKELY(u->sink->thread_info.rewind_requested))
             pa_sink_process_rewind(u->sink, 0);
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/jack/module-jack-source.c b/src/modules/jack/module-jack-source.c
index 5d9668b..1352d43 100644
--- a/src/modules/jack/module-jack-source.c
+++ b/src/modules/jack/module-jack-source.c
@@ -51,7 +51,7 @@
 PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("JACK Source");
 PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(true);
+PA_MODULE_LOAD_ONCE(false);
 PA_MODULE_USAGE(
         "source_name=<name for the source> "
         "source_properties=<properties for the source> "
@@ -198,7 +198,7 @@ static void thread_func(void *userdata) {
     for (;;) {
         int ret;
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/macosx/module-coreaudio-device.c b/src/modules/macosx/module-coreaudio-device.c
index 7b3a002..d100acd 100644
--- a/src/modules/macosx/module-coreaudio-device.c
+++ b/src/modules/macosx/module-coreaudio-device.c
@@ -678,7 +678,7 @@ static void thread_func(void *userdata) {
                 pa_sink_process_rewind(ca_sink->pa_sink, 0);
         }
 
-        ret = pa_rtpoll_run(u->rtpoll, true);
+        ret = pa_rtpoll_run(u->rtpoll);
 
         if (ret < 0)
             goto fail;
diff --git a/src/modules/module-card-restore.c b/src/modules/module-card-restore.c
index 5b02602..681acca 100644
--- a/src/modules/module-card-restore.c
+++ b/src/modules/module-card-restore.c
@@ -269,8 +269,10 @@ static struct entry* entry_read(struct userdata *u, const char *name) {
 
     pa_zero(data);
 
-    if (!pa_database_get(u->database, &key, &data))
-        goto fail;
+    if (!pa_database_get(u->database, &key, &data)) {
+        pa_log_debug("Database contains no data for key: %s", name);
+        return NULL;
+    }
 
     t = pa_tagstruct_new(data.data, data.size);
     e = entry_new();
diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
index deabceb..4ebbc3f 100644
--- a/src/modules/module-combine-sink.c
+++ b/src/modules/module-combine-sink.c
@@ -104,7 +104,8 @@ struct output {
 
     /* For communication of the stream parameters to the sink thread */
     pa_atomic_t max_request;
-    pa_atomic_t requested_latency;
+    pa_atomic_t max_latency;
+    pa_atomic_t min_latency;
 
     PA_LLIST_FIELDS(struct output);
 };
@@ -131,6 +132,8 @@ struct userdata {
     pa_resample_method_t resample_method;
 
     pa_usec_t block_usec;
+    pa_usec_t default_min_latency;
+    pa_usec_t default_max_latency;
 
     pa_idxset* outputs; /* managed in main context */
 
@@ -150,11 +153,12 @@ enum {
     SINK_MESSAGE_NEED,
     SINK_MESSAGE_UPDATE_LATENCY,
     SINK_MESSAGE_UPDATE_MAX_REQUEST,
-    SINK_MESSAGE_UPDATE_REQUESTED_LATENCY
+    SINK_MESSAGE_UPDATE_LATENCY_RANGE
 };
 
 enum {
     SINK_INPUT_MESSAGE_POST = PA_SINK_INPUT_MESSAGE_MAX,
+    SINK_INPUT_MESSAGE_SET_REQUESTED_LATENCY
 };
 
 static void output_disable(struct output *o);
@@ -331,7 +335,7 @@ static void thread_func(void *userdata) {
         }
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0) {
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0) {
             pa_log_info("pa_rtpoll_run() = %i", ret);
             goto fail;
         }
@@ -469,35 +473,44 @@ static void sink_input_update_max_request_cb(pa_sink_input *i, size_t nbytes) {
         return;
 
     pa_atomic_store(&o->max_request, (int) nbytes);
+    pa_log_debug("Sink input update max request %lu", (unsigned long) nbytes);
     pa_asyncmsgq_post(o->outq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_UPDATE_MAX_REQUEST, NULL, 0, NULL, NULL);
 }
 
 /* Called from thread context */
-static void sink_input_update_sink_requested_latency_cb(pa_sink_input *i) {
+static void sink_input_update_sink_latency_range_cb(pa_sink_input *i) {
     struct output *o;
-    pa_usec_t c;
+    pa_usec_t min, max, fix;
 
     pa_assert(i);
 
     pa_sink_input_assert_ref(i);
     pa_assert_se(o = i->userdata);
 
-    c = pa_sink_get_requested_latency_within_thread(i->sink);
-
-    if (c == (pa_usec_t) -1)
-        c = i->sink->thread_info.max_latency;
+    fix = i->sink->thread_info.fixed_latency;
+    if (fix > 0) {
+        min = fix;
+        max = fix;
+    } else {
+        min = i->sink->thread_info.min_latency;
+        max = i->sink->thread_info.max_latency;
+    }
 
-    if (pa_atomic_load(&o->requested_latency) == (int) c)
+    if ((pa_atomic_load(&o->min_latency) == (int) min) &&
+        (pa_atomic_load(&o->max_latency) == (int) max))
         return;
 
-    pa_atomic_store(&o->requested_latency, (int) c);
-    pa_asyncmsgq_post(o->outq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_UPDATE_REQUESTED_LATENCY, NULL, 0, NULL, NULL);
+    pa_atomic_store(&o->min_latency, (int) min);
+    pa_atomic_store(&o->max_latency, (int) max);
+    pa_log_debug("Sink input update latency range %lu %lu", (unsigned long) min, (unsigned long) max);
+    pa_asyncmsgq_post(o->outq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_UPDATE_LATENCY_RANGE, NULL, 0, NULL, NULL);
 }
 
 /* Called from I/O thread context */
 static void sink_input_attach_cb(pa_sink_input *i) {
     struct output *o;
-    pa_usec_t c;
+    pa_usec_t fix, min, max;
+    size_t nbytes;
 
     pa_sink_input_assert_ref(i);
     pa_assert_se(o = i->userdata);
@@ -517,13 +530,24 @@ static void sink_input_attach_cb(pa_sink_input *i) {
 
     pa_sink_input_request_rewind(i, 0, false, true, true);
 
-    pa_atomic_store(&o->max_request, (int) pa_sink_input_get_max_request(i));
+    nbytes = pa_sink_input_get_max_request(i);
+    pa_atomic_store(&o->max_request, (int) nbytes);
+    pa_log_debug("attach max request %lu", (unsigned long) nbytes);
 
-    c = pa_sink_get_requested_latency_within_thread(i->sink);
-    pa_atomic_store(&o->requested_latency, (int) (c == (pa_usec_t) -1 ? 0 : c));
+    fix = i->sink->thread_info.fixed_latency;
+    if (fix > 0) {
+        min = max = fix;
+    } else {
+        min = i->sink->thread_info.min_latency;
+        max = i->sink->thread_info.max_latency;
+    }
+    pa_atomic_store(&o->min_latency, (int) min);
+    pa_atomic_store(&o->max_latency, (int) max);
+    pa_log_debug("attach latency range %lu %lu", (unsigned long) min, (unsigned long) max);
 
-    pa_asyncmsgq_post(o->outq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_UPDATE_MAX_REQUEST, NULL, 0, NULL, NULL);
-    pa_asyncmsgq_post(o->outq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_UPDATE_REQUESTED_LATENCY, NULL, 0, NULL, NULL);
+    /* We register the output. That means that the sink will start to pass data to
+     * this output. */
+    pa_asyncmsgq_send(o->userdata->sink->asyncmsgq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_ADD_OUTPUT, o, 0, NULL);
 }
 
 /* Called from I/O thread context */
@@ -533,6 +557,10 @@ static void sink_input_detach_cb(pa_sink_input *i) {
     pa_sink_input_assert_ref(i);
     pa_assert_se(o = i->userdata);
 
+    /* We unregister the output. That means that the sink doesn't
+     * pass any further data to this output */
+    pa_asyncmsgq_send(o->userdata->sink->asyncmsgq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_REMOVE_OUTPUT, o, 0, NULL);
+
     if (o->inq_rtpoll_item_read) {
         pa_rtpoll_item_free(o->inq_rtpoll_item_read);
         o->inq_rtpoll_item_read = NULL;
@@ -542,6 +570,7 @@ static void sink_input_detach_cb(pa_sink_input *i) {
         pa_rtpoll_item_free(o->outq_rtpoll_item_write);
         o->outq_rtpoll_item_write = NULL;
     }
+
 }
 
 /* Called from main context */
@@ -580,6 +609,14 @@ static int sink_input_process_msg(pa_msgobject *obj, int code, void *data, int64
                 pa_memblockq_flush_write(o->memblockq, true);
 
             return 0;
+
+        case SINK_INPUT_MESSAGE_SET_REQUESTED_LATENCY: {
+            pa_usec_t latency = (pa_usec_t) offset;
+
+            pa_sink_input_set_requested_latency_within_thread(o->sink_input, latency);
+
+            return 0;
+        }
     }
 
     return pa_sink_input_process_msg(obj, code, data, offset, chunk);
@@ -610,7 +647,7 @@ static void unsuspend(struct userdata *u) {
     PA_IDXSET_FOREACH(o, u->outputs, idx)
         output_enable(o);
 
-    if (!u->time_event)
+    if (!u->time_event && u->adjust_time > 0)
         u->time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
 
     pa_log_info("Resumed successfully...");
@@ -671,31 +708,47 @@ static void update_max_request(struct userdata *u) {
     if (max_request <= 0)
         max_request = pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec);
 
+    pa_log_debug("Sink update max request %lu", (unsigned long) max_request);
     pa_sink_set_max_request_within_thread(u->sink, max_request);
 }
 
 /* Called from IO context */
-static void update_fixed_latency(struct userdata *u) {
-    pa_usec_t fixed_latency = 0;
+static void update_latency_range(struct userdata *u) {
+    pa_usec_t min_latency = 0, max_latency = (pa_usec_t) -1;
     struct output *o;
 
     pa_assert(u);
     pa_sink_assert_io_context(u->sink);
 
-    /* Collects the requested_latency values of all streams and sets
-     * the largest one as fixed_latency locally */
-
+    /* Collects the latency_range values of all streams and sets
+     * the max of min and min of max locally */
     PA_LLIST_FOREACH(o, u->thread_info.active_outputs) {
-        pa_usec_t rl = (size_t) pa_atomic_load(&o->requested_latency);
+        pa_usec_t min = (size_t) pa_atomic_load(&o->min_latency);
+        pa_usec_t max = (size_t) pa_atomic_load(&o->max_latency);
 
-        if (rl > fixed_latency)
-            fixed_latency = rl;
+        if (min > min_latency)
+            min_latency = min;
+        if (max_latency == (pa_usec_t) -1 || max < max_latency)
+            max_latency = max;
     }
+    if (max_latency == (pa_usec_t) -1) {
+        /* No outputs, use default limits. */
+        min_latency = u->default_min_latency;
+        max_latency = u->default_max_latency;
+    }
+
+    /* As long as we don't support rewinding, we should limit the max latency
+     * to a conservative value. */
+    if (max_latency > u->default_max_latency)
+        max_latency = u->default_max_latency;
 
-    if (fixed_latency <= 0)
-        fixed_latency = u->block_usec;
+    /* Never ever try to set lower max latency than min latency, it just
+     * doesn't make sense. */
+    if (max_latency < min_latency)
+        max_latency = min_latency;
 
-    pa_sink_set_fixed_latency_within_thread(u->sink, fixed_latency);
+    pa_log_debug("Sink update latency range %" PRIu64 " %" PRIu64, min_latency, max_latency);
+    pa_sink_set_latency_range_within_thread(u->sink, min_latency, max_latency);
 }
 
 /* Called from thread context of the io thread */
@@ -735,6 +788,28 @@ static void output_remove_within_thread(struct output *o) {
     }
 }
 
+/* Called from sink I/O thread context */
+static void sink_update_requested_latency(pa_sink *s) {
+    struct userdata *u;
+    struct output *o;
+
+    pa_sink_assert_ref(s);
+    pa_assert_se(u = s->userdata);
+
+    u->block_usec = pa_sink_get_requested_latency_within_thread(s);
+
+    if (u->block_usec == (pa_usec_t) -1)
+        u->block_usec = s->thread_info.max_latency;
+
+    pa_log_debug("Sink update requested latency %0.2f", (double) u->block_usec / PA_USEC_PER_MSEC);
+
+    /* Just hand this one over to all sink_inputs */
+    PA_LLIST_FOREACH(o, u->thread_info.active_outputs) {
+        pa_asyncmsgq_post(o->inq, PA_MSGOBJECT(o->sink_input), SINK_INPUT_MESSAGE_SET_REQUESTED_LATENCY, NULL, u->block_usec, NULL, NULL);
+    }
+}
+
+
 /* Called from thread context of the io thread */
 static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
     struct userdata *u = PA_SINK(o)->userdata;
@@ -773,13 +848,13 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
         case SINK_MESSAGE_ADD_OUTPUT:
             output_add_within_thread(data);
             update_max_request(u);
-            update_fixed_latency(u);
+            update_latency_range(u);
             return 0;
 
         case SINK_MESSAGE_REMOVE_OUTPUT:
             output_remove_within_thread(data);
             update_max_request(u);
-            update_fixed_latency(u);
+            update_latency_range(u);
             return 0;
 
         case SINK_MESSAGE_NEED:
@@ -805,9 +880,10 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
             update_max_request(u);
             break;
 
-        case SINK_MESSAGE_UPDATE_REQUESTED_LATENCY:
-            update_fixed_latency(u);
+        case SINK_MESSAGE_UPDATE_LATENCY_RANGE:
+            update_latency_range(u);
             break;
+
 }
 
     return pa_sink_process_msg(o, code, data, offset, chunk);
@@ -849,6 +925,7 @@ static void update_description(struct userdata *u) {
 }
 
 static int output_create_sink_input(struct output *o) {
+    struct userdata *u;
     pa_sink_input_new_data data;
 
     pa_assert(o);
@@ -856,18 +933,20 @@ static int output_create_sink_input(struct output *o) {
     if (o->sink_input)
         return 0;
 
+    u = o->userdata;
+
     pa_sink_input_new_data_init(&data);
     pa_sink_input_new_data_set_sink(&data, o->sink, false);
     data.driver = __FILE__;
     pa_proplist_setf(data.proplist, PA_PROP_MEDIA_NAME, "Simultaneous output on %s", pa_strnull(pa_proplist_gets(o->sink->proplist, PA_PROP_DEVICE_DESCRIPTION)));
     pa_proplist_sets(data.proplist, PA_PROP_MEDIA_ROLE, "filter");
-    pa_sink_input_new_data_set_sample_spec(&data, &o->userdata->sink->sample_spec);
-    pa_sink_input_new_data_set_channel_map(&data, &o->userdata->sink->channel_map);
-    data.module = o->userdata->module;
-    data.resample_method = o->userdata->resample_method;
+    pa_sink_input_new_data_set_sample_spec(&data, &u->sink->sample_spec);
+    pa_sink_input_new_data_set_channel_map(&data, &u->sink->channel_map);
+    data.module = u->module;
+    data.resample_method = u->resample_method;
     data.flags = PA_SINK_INPUT_VARIABLE_RATE|PA_SINK_INPUT_DONT_MOVE|PA_SINK_INPUT_NO_CREATE_ON_SUSPEND;
 
-    pa_sink_input_new(&o->sink_input, o->userdata->core, &data);
+    pa_sink_input_new(&o->sink_input, u->core, &data);
 
     pa_sink_input_new_data_done(&data);
 
@@ -879,13 +958,13 @@ static int output_create_sink_input(struct output *o) {
     o->sink_input->process_rewind = sink_input_process_rewind_cb;
     o->sink_input->update_max_rewind = sink_input_update_max_rewind_cb;
     o->sink_input->update_max_request = sink_input_update_max_request_cb;
-    o->sink_input->update_sink_requested_latency = sink_input_update_sink_requested_latency_cb;
+    o->sink_input->update_sink_latency_range = sink_input_update_sink_latency_range_cb;
     o->sink_input->attach = sink_input_attach_cb;
     o->sink_input->detach = sink_input_detach_cb;
     o->sink_input->kill = sink_input_kill_cb;
     o->sink_input->userdata = o;
 
-    pa_sink_input_set_requested_latency(o->sink_input, BLOCK_USEC);
+    pa_sink_input_set_requested_latency(o->sink_input, pa_sink_get_requested_latency(u->sink));
 
     return 0;
 }
@@ -965,18 +1044,10 @@ static void output_enable(struct output *o) {
     if (output_create_sink_input(o) >= 0) {
 
         if (pa_sink_get_state(o->sink) != PA_SINK_INIT) {
-
-            /* First we register the output. That means that the sink
-             * will start to pass data to this output. */
-            pa_asyncmsgq_send(o->userdata->sink->asyncmsgq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_ADD_OUTPUT, o, 0, NULL);
-
-            /* Then we enable the sink input. That means that the sink
+            /* Enable the sink input. That means that the sink
              * is now asked for new data. */
             pa_sink_input_put(o->sink_input);
-
-        } else
-            /* Hmm the sink is not yet started, do things right here */
-            output_add_within_thread(o);
+        }
     }
 
     o->ignore_state_change = false;
@@ -989,14 +1060,10 @@ static void output_disable(struct output *o) {
     if (!o->sink_input)
         return;
 
-    /* First we disable the sink input. That means that the sink is
+    /* We disable the sink input. That means that the sink is
      * not asked for new data anymore  */
     pa_sink_input_unlink(o->sink_input);
 
-    /* Then we unregister the output. That means that the sink doesn't
-     * pass any further data to this output */
-    pa_asyncmsgq_send(o->userdata->sink->asyncmsgq, PA_MSGOBJECT(o->userdata->sink), SINK_MESSAGE_REMOVE_OUTPUT, o, 0, NULL);
-
     /* Now deallocate the stream */
     pa_sink_input_unref(o->sink_input);
     o->sink_input = NULL;
@@ -1143,6 +1210,7 @@ int pa__init(pa_module*m) {
     uint32_t idx;
     pa_sink_new_data data;
     uint32_t adjust_time_sec;
+    size_t nbytes;
 
     pa_assert(m);
 
@@ -1271,7 +1339,7 @@ int pa__init(pa_module*m) {
         pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Simultaneous Output");
     }
 
-    u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY);
+    u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY|PA_SINK_DYNAMIC_LATENCY);
     pa_sink_new_data_done(&data);
 
     if (!u->sink) {
@@ -1281,13 +1349,20 @@ int pa__init(pa_module*m) {
 
     u->sink->parent.process_msg = sink_process_msg;
     u->sink->set_state = sink_set_state;
+    u->sink->update_requested_latency = sink_update_requested_latency;
     u->sink->userdata = u;
 
     pa_sink_set_rtpoll(u->sink, u->rtpoll);
     pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
 
-    u->block_usec = BLOCK_USEC;
-    pa_sink_set_max_request(u->sink, pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec));
+    nbytes = pa_usec_to_bytes(BLOCK_USEC, &u->sink->sample_spec);
+    pa_sink_set_max_request(u->sink, nbytes);
+    pa_sink_set_latency_range(u->sink, 0, BLOCK_USEC);
+    /* pulse clamps the range, get the real values */
+    u->default_min_latency = u->sink->thread_info.min_latency;
+    u->default_max_latency = u->sink->thread_info.max_latency;
+    u->block_usec = u->sink->thread_info.max_latency;
+
 
     if (!u->automatic) {
         const char*split_state;
diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
index 825fced..c8a35d4 100644
--- a/src/modules/module-console-kit.c
+++ b/src/modules/module-console-kit.c
@@ -144,12 +144,10 @@ static void free_session(struct session *session) {
 }
 
 static void remove_session(struct userdata *u, const char *id) {
-    struct session *session;
-
-    if (!(session = pa_hashmap_remove(u->sessions, id)))
-        return;
+    pa_assert(u);
+    pa_assert(id);
 
-    free_session(session);
+    pa_hashmap_remove_and_free(u->sessions, id);
 }
 
 static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, void *userdata) {
@@ -242,7 +240,7 @@ static int get_session_list(struct userdata *u) {
         if ((at = dbus_message_iter_get_arg_type(&sub)) == DBUS_TYPE_INVALID)
             break;
 
-        assert(at == DBUS_TYPE_OBJECT_PATH);
+        pa_assert(at == DBUS_TYPE_OBJECT_PATH);
         dbus_message_iter_get_basic(&sub, &id);
 
         add_session(u, id);
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
index d86c158..9621f3e 100644
--- a/src/modules/module-device-manager.c
+++ b/src/modules/module-device-manager.c
@@ -502,7 +502,7 @@ static inline struct entry *load_or_initialize_entry(struct userdata *u, struct
         entry->description = pa_xstrdup(old->description);
         entry->icon = pa_xstrdup(old->icon);
     } else {
-        /* This is a new device, so make sure we write it's priority list correctly */
+        /* This is a new device, so make sure we write its priority list correctly */
         role_indexes_t max_priority;
         pa_datum key;
         bool done;
@@ -1328,7 +1328,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
                 }
 
                 pa_hashmap_free(h);
-                pa_log_error("Client specified an unknown device in it's reorder list.");
+                pa_log_error("Client specified an unknown device in its reorder list.");
                 goto fail;
             }
             entry_free(e);
diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c
index 0490677..cb42207 100644
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -233,8 +233,10 @@ static struct entry* entry_read(struct userdata *u, const char *name) {
 
     pa_zero(data);
 
-    if (!pa_database_get(u->database, &key, &data))
-        goto fail;
+    if (!pa_database_get(u->database, &key, &data)) {
+        pa_log_debug("Database contains no data for key: %s", name);
+        return NULL;
+    }
 
     t = pa_tagstruct_new(data.data, data.size);
     e = entry_new();
@@ -477,7 +479,7 @@ fail:
     }
 #endif
 
-    pa_log_debug("Database contains invalid data for key: %s", name);
+    pa_log_debug("Database contains no (or invalid) data for key: %s", name);
 
     pa_xfree(name);
 
@@ -791,9 +793,10 @@ static pa_hook_result_t sink_fixate_hook_callback(pa_core *c, pa_sink_new_data *
         if (u->restore_muted && e->muted_valid) {
 
             if (!new_data->muted_is_set) {
-                pa_log_info("Restoring mute state for sink %s.", new_data->name);
                 pa_sink_new_data_set_muted(new_data, e->muted);
                 new_data->save_muted = true;
+                pa_log_info("Restoring mute state for sink %s: %smuted", new_data->name,
+                            new_data->muted ? "" : "un");
             } else
                 pa_log_debug("Not restoring mute state for sink %s, because already set.", new_data->name);
         }
@@ -932,9 +935,10 @@ static pa_hook_result_t source_fixate_hook_callback(pa_core *c, pa_source_new_da
         if (u->restore_muted && e->muted_valid) {
 
             if (!new_data->muted_is_set) {
-                pa_log_info("Restoring mute state for source %s.", new_data->name);
                 pa_source_new_data_set_muted(new_data, e->muted);
                 new_data->save_muted = true;
+                pa_log_info("Restoring mute state for source %s: %smuted", new_data->name,
+                            new_data->muted ? "" : "un");
             } else
                 pa_log_debug("Not restoring mute state for source %s, because already set.", new_data->name);
         }
@@ -1319,8 +1323,10 @@ void pa__done(pa_module*m) {
     if (u->connection_unlink_hook_slot)
         pa_hook_slot_free(u->connection_unlink_hook_slot);
 
-    if (u->save_time_event)
+    if (u->save_time_event) {
         u->core->mainloop->time_free(u->save_time_event);
+        pa_database_sync(u->database);
+    }
 
     if (u->database)
         pa_database_close(u->database);
diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c
index bcaaecd..811bbc2 100644
--- a/src/modules/module-equalizer-sink.c
+++ b/src/modules/module-equalizer-sink.c
@@ -1619,7 +1619,7 @@ void dbus_done(struct userdata *u) {
 
     pa_assert_se(sink_list=pa_shared_get(u->sink->core,SINKLIST));
     pa_idxset_remove_by_data(sink_list,u,&dummy);
-    if (pa_idxset_size(sink_list)==0) {
+    if (pa_idxset_size(sink_list) == 0) {
         pa_dbus_protocol_unregister_extension(u->dbus_protocol, EXTNAME);
         pa_dbus_protocol_remove_interface(u->dbus_protocol, MANAGER_PATH, manager_info.name);
         pa_shared_remove(u->sink->core, EQDB);
diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 8b74ea4..2410062 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -307,7 +307,7 @@ static void thread_func(void *userdata) {
             pollfd->events = (short) (PA_SINK_IS_OPENED(u->sink->thread_info.state) ? POLLOUT : 0);
         }
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
@@ -527,6 +527,8 @@ int pa__init(pa_module*m) {
     const char *espeaker;
     uint32_t key;
     pa_sink_new_data data;
+    char *cookie_path;
+    int r;
 
     pa_assert(m);
 
@@ -620,9 +622,18 @@ int pa__init(pa_module*m) {
 
     pa_socket_client_set_callback(u->client, on_connection, u);
 
+    cookie_path = pa_xstrdup(pa_modargs_get_value(ma, "cookie", NULL));
+    if (!cookie_path) {
+        if (pa_append_to_home_dir(".esd_auth", &cookie_path) < 0)
+            goto fail;
+    }
+
     /* Prepare the initial request */
     u->write_data = pa_xmalloc(u->write_length = ESD_KEY_LEN + sizeof(int32_t));
-    if (pa_authkey_load_auto(pa_modargs_get_value(ma, "cookie", ".esd_auth"), true, u->write_data, ESD_KEY_LEN) < 0) {
+
+    r = pa_authkey_load(cookie_path, true, u->write_data, ESD_KEY_LEN);
+    pa_xfree(cookie_path);
+    if (r < 0) {
         pa_log("Failed to load cookie");
         goto fail;
     }
diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
index 9ab7eb9..0b04f0f 100644
--- a/src/modules/module-mmkbd-evdev.c
+++ b/src/modules/module-mmkbd-evdev.c
@@ -256,8 +256,11 @@ void pa__done(pa_module*m) {
     if (u->io)
         m->core->mainloop->io_free(u->io);
 
-    if (u->fd >= 0)
-        pa_assert_se(pa_close(u->fd) == 0);
+    if (u->fd >= 0) {
+        int r = pa_close(u->fd);
+        if (r < 0) /* https://bugs.freedesktop.org/show_bug.cgi?id=80867 */
+            pa_log("Closing fd failed: %s", pa_cstrerror(errno));
+    }
 
     pa_xfree(u->sink_name);
     pa_xfree(u);
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index c038b6c..c6493a7 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -226,7 +226,7 @@ static void thread_func(void *userdata) {
             pa_rtpoll_set_timer_disabled(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/module-null-source.c b/src/modules/module-null-source.c
index e3e0167..b852f37 100644
--- a/src/modules/module-null-source.c
+++ b/src/modules/module-null-source.c
@@ -159,7 +159,7 @@ static void thread_func(void *userdata) {
             pa_rtpoll_set_timer_disabled(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 4d82cc3..3404022 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -196,7 +196,7 @@ static void thread_func(void *userdata) {
         /* Hmm, nothing to do. Let's sleep */
         pollfd->events = (short) (u->sink->thread_info.state == PA_SINK_RUNNING ? POLLOUT : 0);
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index 36e8732..d8d9443 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -184,7 +184,7 @@ static void thread_func(void *userdata) {
         /* Hmm, nothing to do. Let's sleep */
         pollfd->events = (short) (u->source->thread_info.state == PA_SOURCE_RUNNING ? POLLIN : 0);
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index 3218a01..118351e 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -120,14 +120,17 @@
 #  endif
 
 #  if defined(HAVE_CREDS) && !defined(USE_TCP_SOCKETS)
-#    define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-group", "auth-group-enable",
+#    define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-group", "auth-group-enable", "srbchannel",
 #    define AUTH_USAGE "auth-group=<system group to allow access> auth-group-enable=<enable auth by UNIX group?> "
+#    define SRB_USAGE "srbchannel=<enable shared ringbuffer communication channel?> "
 #  elif defined(USE_TCP_SOCKETS)
 #    define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl",
 #    define AUTH_USAGE "auth-ip-acl=<IP address ACL to allow access> "
+#    define SRB_USAGE
 #  else
 #    define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON
 #    define AUTH_USAGE
+#    define SRB_USAGE
 #    endif
 
   PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION);
@@ -135,6 +138,7 @@
                   "auth-cookie=<path to cookie file> "
                   "auth-cookie-enabled=<enable cookie authentication?> "
                   AUTH_USAGE
+                  SRB_USAGE
                   SOCKET_USAGE);
 #elif defined(USE_PROTOCOL_ESOUND)
 #  include <pulsecore/protocol-esound.h>
diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c
index 7035a35..f456be0 100644
--- a/src/modules/module-rescue-streams.c
+++ b/src/modules/module-rescue-streams.c
@@ -52,9 +52,56 @@ struct userdata {
         *source_output_move_fail_slot;
 };
 
+static pa_source* find_source_from_port(pa_core *c, pa_device_port *port) {
+    pa_source *target;
+    uint32_t idx;
+    void *state;
+    pa_device_port *p;
+
+    if (!port)
+        return NULL;
+
+    PA_IDXSET_FOREACH(target, c->sources, idx)
+        PA_HASHMAP_FOREACH(p, target->ports, state)
+            if (port == p)
+                return target;
+
+    return NULL;
+}
+
+static pa_sink* find_sink_from_port(pa_core *c, pa_device_port *port) {
+    pa_sink *target;
+    uint32_t idx;
+    void *state;
+    pa_device_port *p;
+
+    if (!port)
+        return NULL;
+
+    PA_IDXSET_FOREACH(target, c->sinks, idx)
+        PA_HASHMAP_FOREACH(p, target->ports, state)
+            if (port == p)
+                return target;
+
+    return NULL;
+}
+
+static void build_group_ports(pa_hashmap *g_ports, pa_hashmap *s_ports) {
+    void *state;
+    pa_device_port *p;
+
+    if (!g_ports || !s_ports)
+        return;
+
+    PA_HASHMAP_FOREACH(p, s_ports, state)
+        pa_hashmap_put(g_ports, p, p);
+}
+
 static pa_sink* find_evacuation_sink(pa_core *c, pa_sink_input *i, pa_sink *skip) {
-    pa_sink *target, *def;
+    pa_sink *target, *def, *fb_sink = NULL;
     uint32_t idx;
+    pa_hashmap *all_ports;
+    pa_device_port *best_port;
 
     pa_assert(c);
     pa_assert(i);
@@ -64,6 +111,8 @@ static pa_sink* find_evacuation_sink(pa_core *c, pa_sink_input *i, pa_sink *skip
     if (def && def != skip && pa_sink_input_may_move_to(i, def))
         return def;
 
+    all_ports = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+
     PA_IDXSET_FOREACH(target, c->sinks, idx) {
         if (target == def)
             continue;
@@ -74,12 +123,28 @@ static pa_sink* find_evacuation_sink(pa_core *c, pa_sink_input *i, pa_sink *skip
         if (!PA_SINK_IS_LINKED(pa_sink_get_state(target)))
             continue;
 
-        if (pa_sink_input_may_move_to(i, target))
-            return target;
+        if (!pa_sink_input_may_move_to(i, target))
+            continue;
+
+        if (!fb_sink)
+            fb_sink = target;
+
+        build_group_ports(all_ports, target->ports);
     }
 
-    pa_log_debug("No evacuation sink found.");
-    return NULL;
+    best_port = pa_device_port_find_best(all_ports);
+
+    pa_hashmap_free(all_ports);
+
+    if (best_port)
+        target = find_sink_from_port(c, best_port);
+    else
+        target = fb_sink;
+
+    if (!target)
+	pa_log_debug("No evacuation sink found.");
+
+    return target;
 }
 
 static pa_hook_result_t sink_unlink_hook_callback(pa_core *c, pa_sink *sink, void* userdata) {
@@ -141,8 +206,10 @@ static pa_hook_result_t sink_input_move_fail_hook_callback(pa_core *c, pa_sink_i
 }
 
 static pa_source* find_evacuation_source(pa_core *c, pa_source_output *o, pa_source *skip) {
-    pa_source *target, *def;
+    pa_source *target, *def, *fb_source = NULL;
     uint32_t idx;
+    pa_hashmap *all_ports;
+    pa_device_port *best_port;
 
     pa_assert(c);
     pa_assert(o);
@@ -152,6 +219,8 @@ static pa_source* find_evacuation_source(pa_core *c, pa_source_output *o, pa_sou
     if (def && def != skip && pa_source_output_may_move_to(o, def))
         return def;
 
+    all_ports = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+
     PA_IDXSET_FOREACH(target, c->sources, idx) {
         if (target == def)
             continue;
@@ -165,12 +234,28 @@ static pa_source* find_evacuation_source(pa_core *c, pa_source_output *o, pa_sou
         if (!PA_SOURCE_IS_LINKED(pa_source_get_state(target)))
             continue;
 
-        if (pa_source_output_may_move_to(o, target))
-            return target;
+        if (!pa_source_output_may_move_to(o, target))
+            continue;
+
+        if (!fb_source)
+            fb_source = target;
+
+        build_group_ports(all_ports, target->ports);
     }
 
-    pa_log_debug("No evacuation source found.");
-    return NULL;
+    best_port = pa_device_port_find_best(all_ports);
+
+    pa_hashmap_free(all_ports);
+
+    if (best_port)
+        target = find_source_from_port(c, best_port);
+    else
+        target = fb_source;
+
+    if (!target)
+        pa_log_debug("No evacuation source found.");
+
+    return target;
 }
 
 static pa_hook_result_t source_unlink_hook_callback(pa_core *c, pa_source *source, void* userdata) {
diff --git a/src/modules/module-role-cork.c b/src/modules/module-role-cork.c
index 6573cd6..8ca2109 100644
--- a/src/modules/module-role-cork.c
+++ b/src/modules/module-role-cork.c
@@ -102,7 +102,7 @@ static inline void apply_cork_to_sink(struct userdata *u, pa_sink *s, pa_sink_in
     pa_sink_assert_ref(s);
 
     for (j = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx)); j; j = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx))) {
-        bool corked, muted, corked_here;
+        bool corked, corked_here;
         const char *role;
 
         if (j == ignore)
@@ -119,10 +119,9 @@ static inline void apply_cork_to_sink(struct userdata *u, pa_sink *s, pa_sink_in
             continue;
 
         corked = (pa_sink_input_get_state(j) == PA_SINK_INPUT_CORKED);
-        muted = pa_sink_input_get_mute(j);
         corked_here = !!pa_hashmap_get(u->cork_state, j);
 
-        if (cork && !corked && !muted) {
+        if (cork && !corked && !j->muted) {
             pa_log_debug("Found a '%s' stream that should be corked/muted.", cork_role);
             if (!corked_here)
                 pa_hashmap_put(u->cork_state, j, PA_INT_TO_PTR(1));
@@ -131,9 +130,9 @@ static inline void apply_cork_to_sink(struct userdata *u, pa_sink *s, pa_sink_in
         } else if (!cork) {
             pa_hashmap_remove(u->cork_state, j);
 
-            if (corked_here && (corked || muted)) {
+            if (corked_here && (corked || j->muted)) {
                 pa_log_debug("Found a '%s' stream that should be uncorked/unmuted.", cork_role);
-                if (muted)
+                if (j->muted)
                     pa_sink_input_set_mute(j, false, false);
                 if (corked)
                     pa_sink_input_send_event(j, PA_STREAM_EVENT_REQUEST_UNCORK, NULL);
diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c
index 338fedb..1d755f1 100644
--- a/src/modules/module-sine-source.c
+++ b/src/modules/module-sine-source.c
@@ -178,7 +178,7 @@ static void thread_func(void *userdata) {
             pa_rtpoll_set_timer_disabled(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index b4fa734..e5df90b 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -495,7 +495,7 @@ static void sink_set_volume(pa_sink *s) {
         AUDIO_INITINFO(&info);
 
         info.play.gain = pa_cvolume_max(&s->real_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
-        assert(info.play.gain <= AUDIO_MAX_GAIN);
+        pa_assert(info.play.gain <= AUDIO_MAX_GAIN);
 
         if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
             if (errno == EINVAL)
@@ -530,7 +530,7 @@ static void source_set_volume(pa_source *s) {
         AUDIO_INITINFO(&info);
 
         info.play.gain = pa_cvolume_max(&s->real_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
-        assert(info.play.gain <= AUDIO_MAX_GAIN);
+        pa_assert(info.play.gain <= AUDIO_MAX_GAIN);
 
         if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
             if (errno == EINVAL)
@@ -564,25 +564,30 @@ static void sink_set_mute(pa_sink *s) {
     if (u->fd >= 0) {
         AUDIO_INITINFO(&info);
 
-        info.output_muted = !!s->muted;
+        info.output_muted = s->muted;
 
         if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0)
             pa_log("AUDIO_SETINFO: %s", pa_cstrerror(errno));
     }
 }
 
-static void sink_get_mute(pa_sink *s) {
+static int sink_get_mute(pa_sink *s, bool *mute) {
     struct userdata *u = s->userdata;
     audio_info_t info;
 
     pa_assert(u);
 
-    if (u->fd >= 0) {
-        if (ioctl(u->fd, AUDIO_GETINFO, &info) < 0)
-            pa_log("AUDIO_SETINFO: %s", pa_cstrerror(errno));
-        else
-            s->muted = !!info.output_muted;
+    if (u->fd < 0)
+        return -1;
+
+    if (ioctl(u->fd, AUDIO_GETINFO, &info) < 0) {
+        pa_log("AUDIO_GETINFO: %s", pa_cstrerror(errno));
+        return -1;
     }
+
+    *mute = info.output_muted;
+
+    return 0;
 }
 
 static void process_rewind(struct userdata *u) {
@@ -778,7 +783,7 @@ static void thread_func(void *userdata) {
         }
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
@@ -812,7 +817,7 @@ finish:
 static void sig_callback(pa_mainloop_api *api, pa_signal_event*e, int sig, void *userdata) {
     struct userdata *u = userdata;
 
-    assert(u);
+    pa_assert(u);
 
     pa_log_debug("caught signal");
 
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index 9689e79..06ab543 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -949,8 +949,7 @@ static void handle_entry_remove(DBusConnection *conn, DBusMessage *msg, void *us
     send_entry_removed_signal(de);
     trigger_save(de->userdata);
 
-    pa_assert_se(pa_hashmap_remove(de->userdata->dbus_entries, de->entry_name));
-    dbus_entry_free(de);
+    pa_assert_se(pa_hashmap_remove_and_free(de->userdata->dbus_entries, de->entry_name) >= 0);
 
     pa_dbus_send_empty_reply(conn, msg);
 }
@@ -1300,7 +1299,7 @@ static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint3
         }
 
         if (sink_input->save_muted) {
-            entry->muted = pa_sink_input_get_mute(sink_input);
+            entry->muted = sink_input->muted;
             entry->muted_valid = true;
 
             mute_updated = !created_new_entry && (!old->muted_valid || entry->muted != old->muted);
@@ -1350,7 +1349,7 @@ static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint3
         }
 
         if (source_output->save_muted) {
-            entry->muted = pa_source_output_get_mute(source_output);
+            entry->muted = source_output->muted;
             entry->muted_valid = true;
 
             mute_updated = !created_new_entry && (!old->muted_valid || entry->muted != old->muted);
@@ -1832,7 +1831,6 @@ static int fill_db(struct userdata *u, const char *filename) {
         *d = 0;
         if (pa_atod(v, &db) >= 0) {
             if (db <= 0.0) {
-                pa_datum key, data;
                 struct entry e;
 
                 pa_zero(e);
@@ -1841,13 +1839,7 @@ static int fill_db(struct userdata *u, const char *filename) {
                 pa_cvolume_set(&e.volume, 1, pa_sw_volume_from_dB(db));
                 pa_channel_map_init_mono(&e.channel_map);
 
-                key.data = (void *) ln;
-                key.size = strlen(ln);
-
-                data.data = (void *) &e;
-                data.size = sizeof(e);
-
-                if (pa_database_set(u->database, &key, &data, false) == 0)
+                if (entry_write(u, ln, &e, false))
                     pa_log_debug("Setting %s to %0.2f dB.", ln, db);
             } else
                 pa_log_warn("[%s:%u] Positive dB values are not allowed, not setting entry %s.", fn, n, ln);
@@ -1912,7 +1904,7 @@ static void entry_apply(struct userdata *u, const char *name, struct entry *e) {
                        removed the sink element from the rule. */
                     si->save_sink = false;
                     /* This is cheating a bit. The sink input itself has not changed
-                       but the rules governing it's routing have, so we fire this event
+                       but the rules governing its routing have, so we fire this event
                        such that other routing modules (e.g. module-device-manager)
                        will pick up the change and reapply their routing */
                     pa_subscription_post(si->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, si->index);
@@ -1960,7 +1952,7 @@ static void entry_apply(struct userdata *u, const char *name, struct entry *e) {
                        removed the source element from the rule. */
                     so->save_source = false;
                     /* This is cheating a bit. The source output itself has not changed
-                       but the rules governing it's routing have, so we fire this event
+                       but the rules governing its routing have, so we fire this event
                        such that other routing modules (e.g. module-device-manager)
                        will pick up the change and reapply their routing */
                     pa_subscription_post(so->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, so->index);
@@ -2099,7 +2091,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
 
                 PA_HASHMAP_FOREACH(de, u->dbus_entries, state) {
                     send_entry_removed_signal(de);
-                    dbus_entry_free(pa_hashmap_remove(u->dbus_entries, de->entry_name));
+                    pa_hashmap_remove_and_free(u->dbus_entries, de->entry_name);
                 }
 #endif
                 pa_database_clear(u->database);
@@ -2213,7 +2205,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
 #ifdef HAVE_DBUS
                 if ((de = pa_hashmap_get(u->dbus_entries, name))) {
                     send_entry_removed_signal(de);
-                    dbus_entry_free(pa_hashmap_remove(u->dbus_entries, name));
+                    pa_hashmap_remove_and_free(u->dbus_entries, name);
                 }
 #endif
 
diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
index 15cbf95..6fbe640 100644
--- a/src/modules/module-suspend-on-idle.c
+++ b/src/modules/module-suspend-on-idle.c
@@ -396,14 +396,11 @@ static void device_info_free(struct device_info *d) {
 }
 
 static pa_hook_result_t device_unlink_hook_cb(pa_core *c, pa_object *o, struct userdata *u) {
-    struct device_info *d;
-
     pa_assert(c);
     pa_object_assert_ref(o);
     pa_assert(u);
 
-    if ((d = pa_hashmap_remove(u->device_infos, o)))
-        device_info_free(d);
+    pa_hashmap_remove_and_free(u->device_infos, o);
 
     return PA_HOOK_OK;
 }
diff --git a/src/modules/module-switch-on-connect.c b/src/modules/module-switch-on-connect.c
index d9275d3..559db9f 100644
--- a/src/modules/module-switch-on-connect.c
+++ b/src/modules/module-switch-on-connect.c
@@ -38,11 +38,15 @@
 #include "module-switch-on-connect-symdef.h"
 
 PA_MODULE_AUTHOR("Michael Terry");
-PA_MODULE_DESCRIPTION("When a sink/source is added, switch to it");
+PA_MODULE_DESCRIPTION("When a sink/source is added, switch to it or conditionally switch to it");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(true);
+PA_MODULE_USAGE(
+        "only_from_unavailable=<boolean, only switch from unavailable ports> "
+);
 
 static const char* const valid_modargs[] = {
+    "only_from_unavailable",
     NULL,
 };
 
@@ -50,6 +54,7 @@ struct userdata {
     pa_hook_slot
         *sink_put_slot,
         *source_put_slot;
+    bool only_from_unavailable;
 };
 
 static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void* userdata) {
@@ -57,9 +62,11 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void*
     uint32_t idx;
     pa_sink *def;
     const char *s;
+    struct userdata *u = userdata;
 
     pa_assert(c);
     pa_assert(sink);
+    pa_assert(userdata);
 
     /* Don't want to run during startup or shutdown */
     if (c->state != PA_CORE_RUNNING)
@@ -77,6 +84,10 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void*
     if (def == sink)
         return PA_HOOK_OK;
 
+    if (u->only_from_unavailable)
+        if (!def->active_port || def->active_port->available != PA_AVAILABLE_NO)
+            return PA_HOOK_OK;
+
     /* Actually do the switch to the new sink */
     pa_namereg_set_default_sink(c, sink);
 
@@ -106,9 +117,11 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
     uint32_t idx;
     pa_source *def;
     const char *s;
+    struct userdata *u = userdata;
 
     pa_assert(c);
     pa_assert(source);
+    pa_assert(userdata);
 
     /* Don't want to run during startup or shutdown */
     if (c->state != PA_CORE_RUNNING)
@@ -130,6 +143,10 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
     if (def == source)
         return PA_HOOK_OK;
 
+    if (u->only_from_unavailable)
+        if (!def->active_port || def->active_port->available != PA_AVAILABLE_NO)
+            return PA_HOOK_OK;
+
     /* Actually do the switch to the new source */
     pa_namereg_set_default_source(c, source);
 
@@ -165,14 +182,27 @@ int pa__init(pa_module*m) {
         return -1;
     }
 
-    m->userdata = u = pa_xnew(struct userdata, 1);
+    m->userdata = u = pa_xnew0(struct userdata, 1);
 
     /* A little bit later than module-rescue-streams... */
     u->sink_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE+30, (pa_hook_cb_t) sink_put_hook_callback, u);
     u->source_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE+20, (pa_hook_cb_t) source_put_hook_callback, u);
 
+    if (pa_modargs_get_value_boolean(ma, "only_from_unavailable", &u->only_from_unavailable) < 0) {
+	pa_log("Failed to get a boolean value for only_from_unavailable.");
+	goto fail;
+    }
+
     pa_modargs_free(ma);
     return 0;
+
+fail:
+    if (ma)
+        pa_modargs_free(ma);
+
+    pa__done(m);
+
+    return -1;
 }
 
 void pa__done(pa_module*m) {
diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c
index 2c7ad17..7397bcc 100644
--- a/src/modules/module-switch-on-port-available.c
+++ b/src/modules/module-switch-on-port-available.c
@@ -36,21 +36,6 @@ struct userdata {
      pa_hook_slot *source_new_slot;
 };
 
-static pa_device_port* find_best_port(pa_hashmap *ports) {
-    void *state;
-    pa_device_port* port, *result = NULL;
-
-    PA_HASHMAP_FOREACH(port, ports, state) {
-        if (result == NULL ||
-            result->available == PA_AVAILABLE_NO ||
-            (port->available != PA_AVAILABLE_NO && port->priority > result->priority)) {
-            result = port;
-        }
-    }
-
-    return result;
-}
-
 static bool profile_good_for_output(pa_card_profile *profile) {
     pa_sink *sink;
     uint32_t idx;
@@ -153,7 +138,6 @@ static void find_sink_and_source(pa_card *card, pa_device_port *port, pa_sink **
 }
 
 static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port *port, void* userdata) {
-    uint32_t state;
     pa_card* card;
     pa_sink *sink;
     pa_source *source;
@@ -162,17 +146,18 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port
     if (port->available == PA_AVAILABLE_UNKNOWN)
         return PA_HOOK_OK;
 
-    pa_log_debug("finding port %s", port->name);
-
-    PA_IDXSET_FOREACH(card, c->cards, state)
-        if (port == pa_hashmap_get(card->ports, port->name))
-            break;
+    card = port->card;
 
     if (!card) {
-        pa_log_warn("Did not find port %s in array of cards", port->name);
+        pa_log_warn("Port %s does not have a card", port->name);
         return PA_HOOK_OK;
     }
 
+    if (pa_idxset_size(card->sinks) == 0 && pa_idxset_size(card->sources) == 0)
+        /* This card is not initialized yet. We'll handle it in
+           sink_new / source_new callbacks later. */
+        return PA_HOOK_OK;
+
     find_sink_and_source(card, port, &sink, &source);
 
     is_active_profile = card->active_profile == pa_hashmap_get(port->profiles, card->active_profile->name);
@@ -203,7 +188,7 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port
 
     if (port->available == PA_AVAILABLE_NO) {
         if (sink) {
-            pa_device_port *p2 = find_best_port(sink->ports);
+            pa_device_port *p2 = pa_device_port_find_best(sink->ports);
 
             if (p2 && p2->available != PA_AVAILABLE_NO)
                 pa_sink_set_port(sink, p2->name, false);
@@ -213,7 +198,7 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port
         }
 
         if (source) {
-            pa_device_port *p2 = find_best_port(source->ports);
+            pa_device_port *p2 = pa_device_port_find_best(source->ports);
 
             if (p2 && p2->available != PA_AVAILABLE_NO)
                 pa_source_set_port(source, p2->name, false);
@@ -259,7 +244,7 @@ static pa_device_port *new_sink_source(pa_hashmap *ports, const char *name) {
     if (p->available != PA_AVAILABLE_NO)
         return NULL;
 
-    pa_assert_se(p = find_best_port(ports));
+    pa_assert_se(p = pa_device_port_find_best(ports));
     return p;
 }
 
@@ -279,8 +264,7 @@ static pa_hook_result_t source_new_hook_callback(pa_core *c, pa_source_new_data
     pa_device_port *p = new_sink_source(new_data->ports, new_data->active_port);
 
     if (p) {
-        pa_log_debug("Switching initial port for source '%s' to '%s'", new_data->name,
-                     new_data->active_port);
+        pa_log_debug("Switching initial port for source '%s' to '%s'", new_data->name, p->name);
         pa_source_new_data_set_port(new_data, p->name);
     }
     return PA_HOOK_OK;
diff --git a/src/modules/module-tunnel-sink-new.c b/src/modules/module-tunnel-sink-new.c
index 484e538..7d3bd99 100644
--- a/src/modules/module-tunnel-sink-new.c
+++ b/src/modules/module-tunnel-sink-new.c
@@ -60,6 +60,7 @@ PA_MODULE_USAGE(
         "cookie=<cookie file path>"
         );
 
+#define MAX_LATENCY_USEC (200 * PA_USEC_PER_MSEC)
 #define TUNNEL_THREAD_FAILED_MAINLOOP 1
 
 static void stream_state_cb(pa_stream *stream, void *userdata);
@@ -102,6 +103,16 @@ static const char* const valid_modargs[] = {
     NULL,
 };
 
+static void cork_stream(struct userdata *u, bool cork) {
+    pa_operation *operation;
+
+    pa_assert(u);
+    pa_assert(u->stream);
+
+    if ((operation = pa_stream_cork(u->stream, cork, NULL, NULL)))
+        pa_operation_unref(operation);
+}
+
 static void reset_bufferattr(pa_buffer_attr *bufferattr) {
     pa_assert(bufferattr);
     bufferattr->fragsize = (uint32_t) -1;
@@ -171,41 +182,34 @@ static void thread_func(void *userdata) {
         if (u->connected &&
                 pa_stream_get_state(u->stream) == PA_STREAM_READY &&
                 PA_SINK_IS_LINKED(u->sink->thread_info.state)) {
-            /* TODO: Cork the stream when the sink is suspended. */
-
-            if (pa_stream_is_corked(u->stream)) {
-                pa_operation *operation;
-                if ((operation = pa_stream_cork(u->stream, 0, NULL, NULL)))
-                    pa_operation_unref(operation);
-            } else {
-                size_t writable;
-
-                writable = pa_stream_writable_size(u->stream);
-                if (writable > 0) {
-                    pa_memchunk memchunk;
-                    const void *p;
-
-                    pa_sink_render_full(u->sink, writable, &memchunk);
-
-                    pa_assert(memchunk.length > 0);
-
-                    /* we have new data to write */
-                    p = pa_memblock_acquire(memchunk.memblock);
-                    /* TODO: Use pa_stream_begin_write() to reduce copying. */
-                    ret = pa_stream_write(u->stream,
-                                          (uint8_t*) p + memchunk.index,
-                                          memchunk.length,
-                                          NULL,     /**< A cleanup routine for the data or NULL to request an internal copy */
-                                          0,        /** offset */
-                                          PA_SEEK_RELATIVE);
-                    pa_memblock_release(memchunk.memblock);
-                    pa_memblock_unref(memchunk.memblock);
-
-                    if (ret != 0) {
-                        pa_log_error("Could not write data into the stream ... ret = %i", ret);
-                        u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
-                    }
+            size_t writable;
+
+            writable = pa_stream_writable_size(u->stream);
+            if (writable > 0) {
+                pa_memchunk memchunk;
+                const void *p;
+
+                pa_sink_render_full(u->sink, writable, &memchunk);
+
+                pa_assert(memchunk.length > 0);
+
+                /* we have new data to write */
+                p = pa_memblock_acquire(memchunk.memblock);
+                /* TODO: Use pa_stream_begin_write() to reduce copying. */
+                ret = pa_stream_write(u->stream,
+                                      (uint8_t*) p + memchunk.index,
+                                      memchunk.length,
+                                      NULL,     /**< A cleanup routine for the data or NULL to request an internal copy */
+                                      0,        /** offset */
+                                      PA_SEEK_RELATIVE);
+                pa_memblock_release(memchunk.memblock);
+                pa_memblock_unref(memchunk.memblock);
+
+                if (ret != 0) {
+                    pa_log_error("Could not write data into the stream ... ret = %i", ret);
+                    u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
                 }
+
             }
         }
     }
@@ -244,6 +248,9 @@ static void stream_state_cb(pa_stream *stream, void *userdata) {
             pa_log_debug("Stream terminated.");
             break;
         case PA_STREAM_READY:
+            if (PA_SINK_IS_OPENED(u->sink->thread_info.state))
+                cork_stream(u, false);
+
             /* Only call our requested_latency_cb when requested_latency
              * changed between PA_STREAM_CREATING -> PA_STREAM_READY, because
              * we don't want to override the initial tlength set by the server
@@ -313,7 +320,7 @@ static void context_state_cb(pa_context *c, void *userdata) {
             }
 
             requested_latency = pa_sink_get_requested_latency_within_thread(u->sink);
-            if (requested_latency == (uint32_t) -1)
+            if (requested_latency == (pa_usec_t) -1)
                 requested_latency = u->sink->thread_info.max_latency;
 
             reset_bufferattr(&bufferattr);
@@ -415,6 +422,26 @@ static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t of
             *((pa_usec_t*) data) = remote_latency;
             return 0;
         }
+        case PA_SINK_MESSAGE_SET_STATE:
+            if (!u->stream || pa_stream_get_state(u->stream) != PA_STREAM_READY)
+                break;
+
+            switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {
+                case PA_SINK_SUSPENDED: {
+                    cork_stream(u, true);
+                    break;
+                }
+                case PA_SINK_IDLE:
+                case PA_SINK_RUNNING: {
+                    cork_stream(u, false);
+                    break;
+                }
+                case PA_SINK_INVALID_STATE:
+                case PA_SINK_INIT:
+                case PA_SINK_UNLINKED:
+                    break;
+            }
+            break;
     }
     return pa_sink_process_msg(o, code, data, offset, chunk);
 }
@@ -499,6 +526,7 @@ int pa__init(pa_module *m) {
     u->sink->userdata = u;
     u->sink->parent.process_msg = sink_process_msg_cb;
     u->sink->update_requested_latency = sink_update_requested_latency_cb;
+    pa_sink_set_latency_range(u->sink, 0, MAX_LATENCY_USEC);
 
     /* set thread message queue */
     pa_sink_set_asyncmsgq(u->sink, u->thread_mq->inq);
diff --git a/src/modules/module-tunnel-source-new.c b/src/modules/module-tunnel-source-new.c
index d2e2d6c..c6580eb 100644
--- a/src/modules/module-tunnel-source-new.c
+++ b/src/modules/module-tunnel-source-new.c
@@ -101,6 +101,16 @@ static const char* const valid_modargs[] = {
     NULL,
 };
 
+static void cork_stream(struct userdata *u, bool cork) {
+    pa_operation *operation;
+
+    pa_assert(u);
+    pa_assert(u->stream);
+
+    if ((operation = pa_stream_cork(u->stream, cork, NULL, NULL)))
+        pa_operation_unref(operation);
+}
+
 static void reset_bufferattr(pa_buffer_attr *bufferattr) {
     pa_assert(bufferattr);
     bufferattr->fragsize = (uint32_t) -1;
@@ -142,8 +152,8 @@ static void read_new_samples(struct userdata *u) {
 
     readable = pa_stream_readable_size(u->stream);
     while (readable > 0) {
-        size_t read = 0;
-        if (PA_UNLIKELY(pa_stream_peek(u->stream, &p, &read) != 0)) {
+        size_t nbytes = 0;
+        if (PA_UNLIKELY(pa_stream_peek(u->stream, &p, &nbytes) != 0)) {
             pa_log("pa_stream_peek() failed: %s", pa_strerror(pa_context_errno(u->context)));
             u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
             return;
@@ -151,14 +161,14 @@ static void read_new_samples(struct userdata *u) {
 
         if (PA_LIKELY(p)) {
             /* we have valid data */
-            memchunk.memblock = pa_memblock_new_fixed(u->module->core->mempool, (void *) p, read, true);
-            memchunk.length = read;
+            memchunk.memblock = pa_memblock_new_fixed(u->module->core->mempool, (void *) p, nbytes, true);
+            memchunk.length = nbytes;
             memchunk.index = 0;
 
             pa_source_post(u->source, &memchunk);
             pa_memblock_unref_fixed(memchunk.memblock);
         } else {
-            size_t bytes_to_generate = read;
+            size_t bytes_to_generate = nbytes;
 
             /* we have a hole. generate silence */
             memchunk = u->source->silence;
@@ -176,7 +186,7 @@ static void read_new_samples(struct userdata *u) {
         }
 
         pa_stream_drop(u->stream);
-        readable -= read;
+        readable -= nbytes;
     }
 }
 
@@ -262,6 +272,9 @@ static void stream_state_cb(pa_stream *stream, void *userdata) {
             pa_log_debug("Stream terminated.");
             break;
         case PA_STREAM_READY:
+            if (PA_SOURCE_IS_OPENED(u->source->thread_info.state))
+                cork_stream(u, false);
+
             /* Only call our requested_latency_cb when requested_latency
              * changed between PA_STREAM_CREATING -> PA_STREAM_READY, because
              * we don't want to override the initial fragsize set by the server
@@ -325,7 +338,7 @@ static void context_state_cb(pa_context *c, void *userdata) {
             if (pa_stream_connect_record(u->stream,
                                          u->remote_source_name,
                                          &bufferattr,
-                                         PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_DONT_MOVE|PA_STREAM_AUTO_TIMING_UPDATE) < 0) {
+                                         PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_DONT_MOVE|PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_START_CORKED) < 0) {
                 pa_log_debug("Could not create stream: %s", pa_strerror(pa_context_errno(u->context)));
                 u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
             }
@@ -417,6 +430,26 @@ static int source_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t
 
             return 0;
         }
+        case PA_SOURCE_MESSAGE_SET_STATE:
+            if (!u->stream || pa_stream_get_state(u->stream) != PA_STREAM_READY)
+                break;
+
+            switch ((pa_source_state_t) PA_PTR_TO_UINT(data)) {
+                case PA_SOURCE_SUSPENDED: {
+                    cork_stream(u, true);
+                    break;
+                }
+                case PA_SOURCE_IDLE:
+                case PA_SOURCE_RUNNING: {
+                    cork_stream(u, false);
+                    break;
+                }
+                case PA_SOURCE_INVALID_STATE:
+                case PA_SOURCE_INIT:
+                case PA_SOURCE_UNLINKED:
+                    break;
+            }
+            break;
     }
     return pa_source_process_msg(o, code, data, offset, chunk);
 }
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 1ddfd25..bef6ae8 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -304,9 +304,9 @@ static void command_suspended(pa_pdispatch *pd,  uint32_t command,  uint32_t tag
     pa_log_debug("Server reports device suspend.");
 
 #ifdef TUNNEL_SINK
-    pa_asyncmsgq_send(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_REMOTE_SUSPEND, PA_UINT32_TO_PTR(!!suspended), 0, NULL);
+    pa_asyncmsgq_send(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_REMOTE_SUSPEND, PA_UINT32_TO_PTR(suspended), 0, NULL);
 #else
-    pa_asyncmsgq_send(u->source->asyncmsgq, PA_MSGOBJECT(u->source), SOURCE_MESSAGE_REMOTE_SUSPEND, PA_UINT32_TO_PTR(!!suspended), 0, NULL);
+    pa_asyncmsgq_send(u->source->asyncmsgq, PA_MSGOBJECT(u->source), SOURCE_MESSAGE_REMOTE_SUSPEND, PA_UINT32_TO_PTR(suspended), 0, NULL);
 #endif
 
     request_latency(u);
@@ -337,9 +337,9 @@ static void command_moved(pa_pdispatch *pd,  uint32_t command,  uint32_t tag, pa
     pa_log_debug("Server reports a stream move.");
 
 #ifdef TUNNEL_SINK
-    pa_asyncmsgq_send(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_REMOTE_SUSPEND, PA_UINT32_TO_PTR(!!suspended), 0, NULL);
+    pa_asyncmsgq_send(u->sink->asyncmsgq, PA_MSGOBJECT(u->sink), SINK_MESSAGE_REMOTE_SUSPEND, PA_UINT32_TO_PTR(suspended), 0, NULL);
 #else
-    pa_asyncmsgq_send(u->source->asyncmsgq, PA_MSGOBJECT(u->source), SOURCE_MESSAGE_REMOTE_SUSPEND, PA_UINT32_TO_PTR(!!suspended), 0, NULL);
+    pa_asyncmsgq_send(u->source->asyncmsgq, PA_MSGOBJECT(u->source), SOURCE_MESSAGE_REMOTE_SUSPEND, PA_UINT32_TO_PTR(suspended), 0, NULL);
 #endif
 
     request_latency(u);
@@ -457,7 +457,7 @@ static void stream_cork(struct userdata *u, bool cork) {
 #endif
     pa_tagstruct_putu32(t, u->ctag++);
     pa_tagstruct_putu32(t, u->channel);
-    pa_tagstruct_put_boolean(t, !!cork);
+    pa_tagstruct_put_boolean(t, cork);
     pa_pstream_send_tagstruct(u->pstream, t);
 
     request_latency(u);
@@ -717,7 +717,7 @@ static void thread_func(void *userdata) {
             pa_sink_process_rewind(u->sink, 0);
 #endif
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
@@ -1251,7 +1251,7 @@ static void sink_input_info_cb(pa_pdispatch *pd, uint32_t command,  uint32_t tag
 
     pa_assert(u->sink);
 
-    if ((u->version < 11 || !!mute == !!u->sink->muted) &&
+    if ((u->version < 11 || mute == u->sink->muted) &&
         pa_cvolume_equal(&volume, &u->sink->real_volume))
         return;
 
@@ -1780,14 +1780,14 @@ static void pstream_die_callback(pa_pstream *p, void *userdata) {
 }
 
 /* Called from main context */
-static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_creds *creds, void *userdata) {
+static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_cmsg_ancil_data *ancil_data, void *userdata) {
     struct userdata *u = userdata;
 
     pa_assert(p);
     pa_assert(packet);
     pa_assert(u);
 
-    if (pa_pdispatch_run(u->pdispatch, packet, creds, u) < 0) {
+    if (pa_pdispatch_run(u->pdispatch, packet, ancil_data, u) < 0) {
         pa_log("Invalid packet");
         pa_module_unload_request(u->module, true);
         return;
@@ -1906,7 +1906,7 @@ static void sink_set_mute(pa_sink *sink) {
     pa_tagstruct_putu32(t, PA_COMMAND_SET_SINK_INPUT_MUTE);
     pa_tagstruct_putu32(t, u->ctag++);
     pa_tagstruct_putu32(t, u->device_index);
-    pa_tagstruct_put_boolean(t, !!sink->muted);
+    pa_tagstruct_put_boolean(t, sink->muted);
     pa_pstream_send_tagstruct(u->pstream, t);
 }
 
@@ -1997,7 +1997,7 @@ int pa__init(pa_module*m) {
 #endif
 
         /* Figure out the cookie the same way a normal client would */
-        if (cookie_path)
+        if (!cookie_path)
             cookie_path = getenv(ENV_COOKIE_FILE);
 
 #ifdef HAVE_X11
diff --git a/src/modules/module-virtual-surround-sink.c b/src/modules/module-virtual-surround-sink.c
index 1d6cfc6..34f23fd 100644
--- a/src/modules/module-virtual-surround-sink.c
+++ b/src/modules/module-virtual-surround-sink.c
@@ -519,6 +519,45 @@ static pa_channel_position_t mirror_channel(pa_channel_position_t channel) {
     }
 }
 
+static void normalize_hrir(struct userdata *u) {
+    /* normalize hrir to avoid audible clipping
+     *
+     * The following heuristic tries to avoid audible clipping. It cannot avoid
+     * clipping in the worst case though, because the scaling factor would
+     * become too large resulting in a too quiet signal.
+     * The idea of the heuristic is to avoid clipping when a single click is
+     * played back on all channels. The scaling factor describes the additional
+     * factor that is necessary to avoid clipping for "normal" signals.
+     *
+     * This algorithm doesn't pretend to be perfect, it's just something that
+     * appears to work (not too quiet, no audible clipping) on the material that
+     * it has been tested on. If you find a real-world example where this
+     * algorithm results in audible clipping, please write a patch that adjusts
+     * the scaling factor constants or improves the algorithm (or if you can't
+     * write a patch, at least report the problem to the PulseAudio mailing list
+     * or bug tracker). */
+
+    const float scaling_factor = 2.5;
+
+    float hrir_sum, hrir_max;
+    unsigned i, j;
+
+    hrir_max = 0;
+    for (i = 0; i < u->hrir_samples; i++) {
+        hrir_sum = 0;
+        for (j = 0; j < u->hrir_channels; j++)
+            hrir_sum += fabs(u->hrir_data[i * u->hrir_channels + j]);
+
+        if (hrir_sum > hrir_max)
+            hrir_max = hrir_sum;
+    }
+
+    for (i = 0; i < u->hrir_samples; i++) {
+        for (j = 0; j < u->hrir_channels; j++)
+            u->hrir_data[i * u->hrir_channels + j] /= hrir_max * scaling_factor;
+    }
+}
+
 int pa__init(pa_module*m) {
     struct userdata *u;
     pa_sample_spec ss, sink_input_ss;
@@ -533,7 +572,6 @@ int pa__init(pa_module*m) {
 
     const char *hrir_file;
     unsigned i, j, found_channel_left, found_channel_right;
-    float hrir_sum, hrir_max;
     float *hrir_data;
 
     pa_sample_spec hrir_ss;
@@ -758,22 +796,7 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
-    /* normalize hrir to avoid clipping */
-    hrir_max = 0;
-    for (i = 0; i < u->hrir_samples; i++) {
-        hrir_sum = 0;
-        for (j = 0; j < u->hrir_channels; j++)
-            hrir_sum += fabs(u->hrir_data[i * u->hrir_channels + j]);
-
-        if (hrir_sum > hrir_max)
-            hrir_max = hrir_sum;
-    }
-    if (hrir_max > 1) {
-        for (i = 0; i < u->hrir_samples; i++) {
-            for (j = 0; j < u->hrir_channels; j++)
-                u->hrir_data[i * u->hrir_channels + j] /= hrir_max * 1.2;
-        }
-    }
+    normalize_hrir(u);
 
     /* create mapping between hrir and input */
     u->mapping_left = (unsigned *) pa_xnew0(unsigned, u->channels);
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index b274271..c420d4a 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -276,7 +276,7 @@ static void thread_func(void *userdata) {
             pa_rtpoll_set_timer_disabled(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index 0110e1d..aa9e891 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -141,6 +141,9 @@ struct userdata {
     pa_hook_slot *sink_new_slot, *source_new_slot, *sink_unlink_slot, *source_unlink_slot, *sink_changed_slot, *source_changed_slot;
 
     pa_native_protocol *native;
+
+    bool shutting_down; /* Used in the main thread. */
+    bool client_freed; /* Used in the Avahi thread. */
 };
 
 /* Runs in PA mainloop context */
@@ -373,10 +376,8 @@ static void publish_service(pa_mainloop_api *api PA_GCC_UNUSED, void *service) {
 finish:
 
     /* Remove this service */
-    if (r < 0) {
-        pa_hashmap_remove(s->userdata->services, s->key);
-        service_free(s);
-    }
+    if (r < 0)
+        pa_hashmap_remove_and_free(s->userdata->services, s->key);
 
     avahi_string_list_free(txt);
 }
@@ -467,16 +468,11 @@ static pa_hook_result_t device_new_or_changed_cb(pa_core *c, pa_object *o, struc
 
 /* Runs in PA mainloop context */
 static pa_hook_result_t device_unlink_cb(pa_core *c, pa_object *o, struct userdata *u) {
-    struct service *s;
-
     pa_assert(c);
     pa_object_assert_ref(o);
 
     pa_threaded_mainloop_lock(u->mainloop);
-
-    if ((s = pa_hashmap_remove(u->services, o)))
-        service_free(s);
-
+    pa_hashmap_remove_and_free(u->services, o);
     pa_threaded_mainloop_unlock(u->mainloop);
 
     return PA_HOOK_OK;
@@ -638,6 +634,11 @@ static void unpublish_all_services(struct userdata *u, bool rem) {
 static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
     struct userdata *u = (struct userdata *) data;
 
+    pa_assert(u);
+
+    if (u->shutting_down)
+        return 0;
+
     switch (code) {
         case AVAHI_MESSAGE_PUBLISH_ALL:
             publish_all_services(u);
@@ -647,10 +648,6 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs
             pa_module_unload(u->core, u->module, true);
             break;
 
-        case AVAHI_MESSAGE_SHUTDOWN_COMPLETE:
-            /* pa__done() is waiting for this */
-            break;
-
         default:
             pa_assert_not_reached();
     }
@@ -704,6 +701,16 @@ static void create_client(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
     struct userdata *u = (struct userdata *) userdata;
     int error;
 
+    /* create_client() and client_free() are called via defer events. If the
+     * two defer events are created very quickly one after another, we can't
+     * assume that the defer event that runs create_client() will be dispatched
+     * before the defer event that runs client_free() (at the time of writing,
+     * pa_mainloop actually always dispatches queued defer events in reverse
+     * creation order). For that reason we must be prepared for the case where
+     * client_free() has already been called. */
+    if (u->client_freed)
+        return;
+
     pa_thread_mq_install(&u->thread_mq);
 
     if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) {
@@ -730,7 +737,7 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
-    m->userdata = u = pa_xnew(struct userdata, 1);
+    m->userdata = u = pa_xnew0(struct userdata, 1);
     u->core = m->core;
     u->module = m;
     u->native = pa_native_protocol_get(u->core);
@@ -754,8 +761,6 @@ int pa__init(pa_module*m) {
     u->source_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u);
     u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) device_unlink_cb, u);
 
-    u->main_entry_group = NULL;
-
     un = pa_get_user_name_malloc();
     hn = pa_get_host_name_malloc();
     u->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s@%s", un, hn), AVAHI_LABEL_MAX-1);
@@ -797,7 +802,9 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
     if (u->avahi_poll)
         pa_avahi_poll_free(u->avahi_poll);
 
-    pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, NULL, 0, NULL, NULL);
+    pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL);
+
+    u->client_freed = true;
 }
 
 void pa__done(pa_module*m) {
@@ -807,7 +814,11 @@ void pa__done(pa_module*m) {
     if (!(u = m->userdata))
         return;
 
+    u->shutting_down = true;
+
+    pa_threaded_mainloop_lock(u->mainloop);
     pa_mainloop_api_once(u->api, client_free, u);
+    pa_threaded_mainloop_unlock(u->mainloop);
     pa_asyncmsgq_wait_for(u->thread_mq.outq, AVAHI_MESSAGE_SHUTDOWN_COMPLETE);
 
     pa_threaded_mainloop_stop(u->mainloop);
diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
index d661bde..2926f67 100644
--- a/src/modules/oss/module-oss.c
+++ b/src/modules/oss/module-oss.c
@@ -1131,7 +1131,7 @@ static void thread_func(void *userdata) {
         }
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c
index 2d08645..c510efd 100644
--- a/src/modules/raop/module-raop-sink.c
+++ b/src/modules/raop/module-raop-sink.c
@@ -466,7 +466,7 @@ static void thread_func(void *userdata) {
             pollfd->events = POLLOUT; /*PA_SINK_IS_OPENED(u->sink->thread_info.state)  ? POLLOUT : 0;*/
         }
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
@@ -518,15 +518,17 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
-    ss = m->core->default_sample_spec;
+    ss.format = PA_SAMPLE_S16NE;
+    ss.channels = 2;
+    ss.rate = m->core->default_sample_spec.rate;
     if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
         pa_log("invalid sample format specification");
         goto fail;
     }
 
-    if ((/*ss.format != PA_SAMPLE_U8 &&*/ ss.format != PA_SAMPLE_S16NE) ||
+    if ((ss.format != PA_SAMPLE_S16NE) ||
         (ss.channels > 2)) {
-        pa_log("sample type support is limited to mono/stereo and U8 or S16NE sample data");
+        pa_log("sample type support is limited to mono/stereo and S16NE sample data");
         goto fail;
     }
 
diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c
index 5bb0bb4..7a6d009 100644
--- a/src/modules/raop/raop_client.c
+++ b/src/modules/raop/raop_client.c
@@ -372,14 +372,19 @@ pa_raop_client* pa_raop_client_new(pa_core *core, const char* host) {
     pa_assert(core);
     pa_assert(host);
 
-    if (pa_parse_address(host, &a) < 0 || a.type == PA_PARSED_ADDRESS_UNIX)
+    if (pa_parse_address(host, &a) < 0)
         return NULL;
 
+    if (a.type == PA_PARSED_ADDRESS_UNIX) {
+        pa_xfree(a.path_or_host);
+        return NULL;
+    }
+
     c = pa_xnew0(pa_raop_client, 1);
     c->core = core;
     c->fd = -1;
 
-    c->host = pa_xstrdup(a.path_or_host);
+    c->host = a.path_or_host;
     if (a.port)
         c->port = a.port;
     else
diff --git a/src/modules/rtp/headerlist.c b/src/modules/rtp/headerlist.c
index 11e076e..3ed4062 100644
--- a/src/modules/rtp/headerlist.c
+++ b/src/modules/rtp/headerlist.c
@@ -129,16 +129,10 @@ const char *pa_headerlist_gets(pa_headerlist *p, const char *key) {
 }
 
 int pa_headerlist_remove(pa_headerlist *p, const char *key) {
-    struct header *hdr;
-
     pa_assert(p);
     pa_assert(key);
 
-    if (!(hdr = pa_hashmap_remove(MAKE_HASHMAP(p), key)))
-        return -1;
-
-    header_free(hdr);
-    return 0;
+    return pa_hashmap_remove_and_free(MAKE_HASHMAP(p), key);
 }
 
 const char *pa_headerlist_iterate(pa_headerlist *p, void **state) {
diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index 9dc2feb..e1b6929 100644
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -190,8 +190,7 @@ static void sink_input_kill(pa_sink_input* i) {
     pa_sink_input_assert_ref(i);
     pa_assert_se(s = i->userdata);
 
-    pa_hashmap_remove(s->userdata->by_origin, s->sdp_info.origin);
-    session_free(s);
+    pa_hashmap_remove_and_free(s->userdata->by_origin, s->sdp_info.origin);
 }
 
 /* Called from IO context */
@@ -647,10 +646,7 @@ static void sap_event_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_event
         return;
 
     if (goodbye) {
-
-        if ((s = pa_hashmap_remove(u->by_origin, info.origin)))
-            session_free(s);
-
+        pa_hashmap_remove_and_free(u->by_origin, info.origin);
         pa_sdp_info_destroy(&info);
     } else {
 
@@ -687,10 +683,8 @@ static void check_death_event_cb(pa_mainloop_api *m, pa_time_event *t, const str
 
         k = pa_atomic_load(&s->timestamp);
 
-        if (k + DEATH_TIMEOUT < now.tv_sec) {
-            pa_hashmap_remove(u->by_origin, s->sdp_info.origin);
-            session_free(s);
-        }
+        if (k + DEATH_TIMEOUT < now.tv_sec)
+            pa_hashmap_remove_and_free(u->by_origin, s->sdp_info.origin);
     }
 
     /* Restart timer */
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index 0cc595b..7347f78 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -398,7 +398,7 @@ int pa__init(pa_module*m) {
 #endif
     }
 
-    j = !!loop;
+    j = loop;
     if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &j, sizeof(j)) < 0 ||
         setsockopt(sap_fd, IPPROTO_IP, IP_MULTICAST_LOOP, &j, sizeof(j)) < 0) {
         pa_log("IP_MULTICAST_LOOP failed: %s", pa_cstrerror(errno));
diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
index 570737e..7b75e0e 100644
--- a/src/modules/rtp/rtp.c
+++ b/src/modules/rtp/rtp.c
@@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
         goto fail;
     }
 
-    if (size <= 0)
-        return 0;
+    if (size <= 0) {
+        /* size can be 0 due to any of the following reasons:
+         *
+         * 1. Somebody sent us a perfectly valid zero-length UDP packet.
+         * 2. Somebody sent us a UDP packet with a bad CRC.
+         *
+         * It is unknown whether size can actually be less than zero.
+         *
+         * In the first case, the packet has to be read out, otherwise the
+         * kernel will tell us again and again about it, thus preventing
+         * reception of any further packets. So let's just read it out
+         * now and discard it later, when comparing the number of bytes
+         * received (0) with the number of bytes wanted (1, see below).
+         *
+         * In the second case, recvmsg() will fail, thus allowing us to
+         * return the error.
+         *
+         * Just to avoid passing zero-sized memchunks and NULL pointers to
+         * recvmsg(), let's force allocation of at least one byte by setting
+         * size to 1.
+         */
+        size = 1;
+    }
 
     if (c->memchunk.length < (unsigned) size) {
         size_t l;
diff --git a/src/modules/xen/module-xenpv-sink.c b/src/modules/xen/module-xenpv-sink.c
index 9dbd660..aa8c417 100644
--- a/src/modules/xen/module-xenpv-sink.c
+++ b/src/modules/xen/module-xenpv-sink.c
@@ -353,7 +353,7 @@ static void thread_func(void *userdata) {
 
         pollfd->events = (short) (u->sink->thread_info.state == PA_SINK_RUNNING ? POLLOUT : 0);
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
             goto fail;
 
         if (ret == 0)
diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c
index 72e4130..e1b173a 100644
--- a/src/pulse/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -536,6 +536,12 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) {
         map.map[0] = PA_CHANNEL_POSITION_LEFT;
         map.map[1] = PA_CHANNEL_POSITION_RIGHT;
         goto finish;
+    } else if (pa_streq(s, "surround-21")) {
+        map.channels = 3;
+        map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+        map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+        map.map[2] = PA_CHANNEL_POSITION_LFE;
+        goto finish;
     } else if (pa_streq(s, "surround-40")) {
         map.channels = 4;
         map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c
index 8d0c612..0036e4a 100644
--- a/src/pulse/client-conf-x11.c
+++ b/src/pulse/client-conf-x11.c
@@ -37,14 +37,15 @@
 
 #include "client-conf-x11.h"
 
-int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
+int pa_client_conf_from_x11(pa_client_conf *c) {
+    const char *dname;
     xcb_connection_t *xcb = NULL;
     int ret = -1, screen = 0;
     char t[1024];
 
     pa_assert(c);
 
-    if (!dname && !(dname = getenv("DISPLAY")))
+    if (!(dname = getenv("DISPLAY")))
         goto finish;
 
     if (*dname == 0)
@@ -91,10 +92,12 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
     }
 
     if (pa_x11_get_prop(xcb, screen, "PULSE_COOKIE", t, sizeof(t))) {
-        if (pa_client_conf_load_cookie_from_hex(c, t) < 0) {
+        if (pa_parsehex(t, c->cookie_from_x11, sizeof(c->cookie_from_x11)) != sizeof(c->cookie_from_x11)) {
             pa_log(_("Failed to parse cookie data"));
             goto finish;
         }
+
+        c->cookie_from_x11_valid = true;
     }
 
     ret = 0;
diff --git a/src/pulse/client-conf-x11.h b/src/pulse/client-conf-x11.h
index dca9f0d..3d1dea0 100644
--- a/src/pulse/client-conf-x11.h
+++ b/src/pulse/client-conf-x11.h
@@ -24,8 +24,8 @@
 
 #include "client-conf.h"
 
-/* Load client configuration data from the specified X11 display,
- * overwriting the current settings in *c */
-int pa_client_conf_from_x11(pa_client_conf *c, const char *display);
+/* Load client configuration data from X11, overwriting the current settings in
+ * *c. */
+int pa_client_conf_from_x11(pa_client_conf *c);
 
 #endif
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index ee0271b..80ddae0 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -40,6 +40,10 @@
 
 #include "client-conf.h"
 
+#ifdef HAVE_X11
+#include <pulse/client-conf-x11.h>
+#endif
+
 #define DEFAULT_CLIENT_CONFIG_FILE PA_DEFAULT_CONFIG_DIR PA_PATH_SEP "client.conf"
 #define DEFAULT_CLIENT_CONFIG_FILE_USER "client.conf"
 
@@ -57,23 +61,26 @@ static const pa_client_conf default_conf = {
     .default_source = NULL,
     .default_server = NULL,
     .default_dbus_server = NULL,
+    .cookie_file_from_env = NULL,
+    .cookie_from_x11_valid = false,
+    .cookie_file_from_application = NULL,
+    .cookie_file_from_client_conf = NULL,
+#ifdef HAVE_SYSTEMD_DAEMON
+    .autospawn = false,
+#else
     .autospawn = true,
+#endif
     .disable_shm = false,
-    .cookie_file = NULL,
-    .cookie_valid = false,
     .shm_size = 0,
     .auto_connect_localhost = false,
     .auto_connect_display = false
 };
 
-static int parse_cookie_file(pa_client_conf* c);
-
 pa_client_conf *pa_client_conf_new(void) {
     pa_client_conf *c = pa_xmemdup(&default_conf, sizeof(default_conf));
 
     c->daemon_binary = pa_xstrdup(PA_BINARY);
     c->extra_arguments = pa_xstrdup("--log-target=syslog");
-    c->cookie_file = NULL;
 
     return c;
 }
@@ -86,64 +93,13 @@ void pa_client_conf_free(pa_client_conf *c) {
     pa_xfree(c->default_source);
     pa_xfree(c->default_server);
     pa_xfree(c->default_dbus_server);
-    pa_xfree(c->cookie_file);
+    pa_xfree(c->cookie_file_from_env);
+    pa_xfree(c->cookie_file_from_application);
+    pa_xfree(c->cookie_file_from_client_conf);
     pa_xfree(c);
 }
 
-int pa_client_conf_load(pa_client_conf *c, const char *filename) {
-    FILE *f = NULL;
-    char *fn = NULL;
-    int r = -1;
-
-    /* Prepare the configuration parse table */
-    pa_config_item table[] = {
-        { "daemon-binary",          pa_config_parse_string,   &c->daemon_binary, NULL },
-        { "extra-arguments",        pa_config_parse_string,   &c->extra_arguments, NULL },
-        { "default-sink",           pa_config_parse_string,   &c->default_sink, NULL },
-        { "default-source",         pa_config_parse_string,   &c->default_source, NULL },
-        { "default-server",         pa_config_parse_string,   &c->default_server, NULL },
-        { "default-dbus-server",    pa_config_parse_string,   &c->default_dbus_server, NULL },
-        { "autospawn",              pa_config_parse_bool,     &c->autospawn, NULL },
-        { "cookie-file",            pa_config_parse_string,   &c->cookie_file, NULL },
-        { "disable-shm",            pa_config_parse_bool,     &c->disable_shm, NULL },
-        { "enable-shm",             pa_config_parse_not_bool, &c->disable_shm, NULL },
-        { "shm-size-bytes",         pa_config_parse_size,     &c->shm_size, NULL },
-        { "auto-connect-localhost", pa_config_parse_bool,     &c->auto_connect_localhost, NULL },
-        { "auto-connect-display",   pa_config_parse_bool,     &c->auto_connect_display, NULL },
-        { NULL,                     NULL,                     NULL, NULL },
-    };
-
-    if (filename) {
-
-        if (!(f = pa_fopen_cloexec(filename, "r"))) {
-            pa_log(_("Failed to open configuration file '%s': %s"), fn, pa_cstrerror(errno));
-            goto finish;
-        }
-
-        fn = pa_xstrdup(fn);
-
-    } else {
-
-        if (!(f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn)))
-            if (errno != ENOENT)
-                goto finish;
-    }
-
-    r = f ? pa_config_parse(fn, f, table, NULL, NULL) : 0;
-
-    if (!r)
-        r = parse_cookie_file(c);
-
-finish:
-    pa_xfree(fn);
-
-    if (f)
-        fclose(f);
-
-    return r;
-}
-
-int pa_client_conf_env(pa_client_conf *c) {
+static void load_env(pa_client_conf *c) {
     char *e;
 
     if ((e = getenv(ENV_DEFAULT_SINK))) {
@@ -169,73 +125,120 @@ int pa_client_conf_env(pa_client_conf *c) {
         c->daemon_binary = pa_xstrdup(e);
     }
 
-    if ((e = getenv(ENV_COOKIE_FILE))) {
-        return pa_client_conf_load_cookie_from_file(c, e);
+    if ((e = getenv(ENV_COOKIE_FILE)) && *e) {
+        pa_xfree(c->cookie_file_from_env);
+        c->cookie_file_from_env = pa_xstrdup(e);
+    }
+}
+
+void pa_client_conf_load(pa_client_conf *c, bool load_from_x11, bool load_from_env) {
+    FILE *f = NULL;
+    char *fn = NULL;
+
+    /* Prepare the configuration parse table */
+    pa_config_item table[] = {
+        { "daemon-binary",          pa_config_parse_string,   &c->daemon_binary, NULL },
+        { "extra-arguments",        pa_config_parse_string,   &c->extra_arguments, NULL },
+        { "default-sink",           pa_config_parse_string,   &c->default_sink, NULL },
+        { "default-source",         pa_config_parse_string,   &c->default_source, NULL },
+        { "default-server",         pa_config_parse_string,   &c->default_server, NULL },
+        { "default-dbus-server",    pa_config_parse_string,   &c->default_dbus_server, NULL },
+        { "autospawn",              pa_config_parse_bool,     &c->autospawn, NULL },
+        { "cookie-file",            pa_config_parse_string,   &c->cookie_file_from_client_conf, NULL },
+        { "disable-shm",            pa_config_parse_bool,     &c->disable_shm, NULL },
+        { "enable-shm",             pa_config_parse_not_bool, &c->disable_shm, NULL },
+        { "shm-size-bytes",         pa_config_parse_size,     &c->shm_size, NULL },
+        { "auto-connect-localhost", pa_config_parse_bool,     &c->auto_connect_localhost, NULL },
+        { "auto-connect-display",   pa_config_parse_bool,     &c->auto_connect_display, NULL },
+        { NULL,                     NULL,                     NULL, NULL },
+    };
+
+    f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn);
+    if (f) {
+        pa_config_parse(fn, f, table, NULL, NULL);
+        pa_xfree(fn);
+        fclose(f);
+    }
+
+    if (load_from_x11) {
+#ifdef HAVE_X11
+        pa_client_conf_from_x11(c);
+#endif
     }
 
-    return 0;
+    if (load_from_env)
+        load_env(c);
 }
 
-static int parse_cookie_file(pa_client_conf* c) {
-    int k;
+int pa_client_conf_load_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie_length) {
+    int r;
+    char *fallback_path;
 
     pa_assert(c);
+    pa_assert(cookie);
+    pa_assert(cookie_length > 0);
 
-    c->cookie_valid = false;
-
-    if (c->cookie_file)
-        k = pa_authkey_load_auto(c->cookie_file, true, c->cookie, sizeof(c->cookie));
-    else {
-        k = pa_authkey_load_auto(PA_NATIVE_COOKIE_FILE, false, c->cookie, sizeof(c->cookie));
+    if (c->cookie_file_from_env) {
+        r = pa_authkey_load(c->cookie_file_from_env, true, cookie, cookie_length);
+        if (r >= 0)
+            return 0;
 
-        if (k < 0) {
-            k = pa_authkey_load_auto(PA_NATIVE_COOKIE_FILE_FALLBACK, false, c->cookie, sizeof(c->cookie));
+        pa_log_warn("Failed to load cookie from %s (configured with environment variable PULSE_COOKIE): %s",
+                    c->cookie_file_from_env, pa_cstrerror(errno));
+    }
 
-            if (k < 0)
-                k = pa_authkey_load_auto(PA_NATIVE_COOKIE_FILE, true, c->cookie, sizeof(c->cookie));
+    if (c->cookie_from_x11_valid) {
+        if (cookie_length == sizeof(c->cookie_from_x11)) {
+            memcpy(cookie, c->cookie_from_x11, cookie_length);
+            return 0;
         }
-    }
 
-    if (k < 0)
-        return k;
+        pa_log_warn("Failed to load cookie from X11 root window property PULSE_COOKIE: size mismatch.");
+    }
 
-    c->cookie_valid = true;
-    return 0;
-}
+    if (c->cookie_file_from_application) {
+        r = pa_authkey_load(c->cookie_file_from_application, true, cookie, cookie_length);
+        if (r >= 0)
+            return 0;
 
-int pa_client_conf_load_cookie_from_hex(pa_client_conf* c, const char *cookie_in_hex) {
-    uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
+        pa_log_warn("Failed to load cookie from %s (configured by the application): %s", c->cookie_file_from_application,
+                    pa_cstrerror(errno));
+    }
 
-    pa_assert(c);
-    pa_assert(cookie_in_hex);
+    if (c->cookie_file_from_client_conf) {
+        r = pa_authkey_load(c->cookie_file_from_client_conf, true, cookie, cookie_length);
+        if (r >= 0)
+            return 0;
 
-    if (pa_parsehex(cookie_in_hex, cookie, sizeof(cookie)) != sizeof(cookie)) {
-        pa_log(_("Failed to parse cookie data"));
-        return -PA_ERR_INVALID;
+        pa_log_warn("Failed to load cookie from %s (configured in client.conf): %s", c->cookie_file_from_client_conf,
+                    pa_cstrerror(errno));
     }
 
-    pa_xfree(c->cookie_file);
-    c->cookie_file = NULL;
+    r = pa_authkey_load(PA_NATIVE_COOKIE_FILE, false, cookie, cookie_length);
+    if (r >= 0)
+        return 0;
 
-    return pa_client_conf_set_cookie(c, cookie, PA_NATIVE_COOKIE_LENGTH);
-}
+    if (pa_append_to_home_dir(PA_NATIVE_COOKIE_FILE_FALLBACK, &fallback_path) > 0) {
+        r = pa_authkey_load(fallback_path, false, cookie, cookie_length);
+        pa_xfree(fallback_path);
+        if (r >= 0)
+            return 0;
+    }
 
-int pa_client_conf_load_cookie_from_file(pa_client_conf *c, const char *cookie_file_path) {
-    pa_assert(c);
-    pa_assert(cookie_file_path);
+    r = pa_authkey_load(PA_NATIVE_COOKIE_FILE, true, cookie, cookie_length);
+    if (r >= 0)
+        return 0;
 
-    pa_xfree(c->cookie_file);
-    c->cookie_file = pa_xstrdup(cookie_file_path);
-    return parse_cookie_file(c);
+    pa_log("Failed to load cookie file from %s: %s", PA_NATIVE_COOKIE_FILE, pa_cstrerror(errno));
+    memset(cookie, 0, cookie_length);
+
+    return -1;
 }
 
-int pa_client_conf_set_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie_size) {
+void pa_client_conf_set_cookie_file_from_application(pa_client_conf *c, const char *cookie_file) {
     pa_assert(c);
-    pa_assert(cookie);
+    pa_assert(!cookie_file || *cookie_file);
 
-    if (cookie_size != PA_NATIVE_COOKIE_LENGTH)
-        return -PA_ERR_INVALID;
-    memcpy(c->cookie, cookie, cookie_size);
-    c->cookie_valid = true;
-    return 0;
+    pa_xfree(c->cookie_file_from_application);
+    c->cookie_file_from_application = pa_xstrdup(cookie_file);
 }
diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index 87d42d8..3c7fd7d 100644
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -28,10 +28,18 @@
 /* A structure containing configuration data for PulseAudio clients. */
 
 typedef struct pa_client_conf {
-    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *default_dbus_server, *cookie_file;
+    char *daemon_binary;
+    char *extra_arguments;
+    char *default_sink;
+    char *default_source;
+    char *default_server;
+    char *default_dbus_server;
+    char *cookie_file_from_env;
+    uint8_t cookie_from_x11[PA_NATIVE_COOKIE_LENGTH];
+    bool cookie_from_x11_valid;
+    char *cookie_file_from_application;
+    char *cookie_file_from_client_conf;
     bool autospawn, disable_shm, auto_connect_localhost, auto_connect_display;
-    uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
-    bool cookie_valid; /* non-zero, when cookie is valid */
     size_t shm_size;
 } pa_client_conf;
 
@@ -39,22 +47,17 @@ typedef struct pa_client_conf {
 pa_client_conf *pa_client_conf_new(void);
 void pa_client_conf_free(pa_client_conf *c);
 
-/* Load the configuration data from the specified file, overwriting
- * the current settings in *c. When the filename is NULL, the
- * default client configuration file name is used. */
-int pa_client_conf_load(pa_client_conf *c, const char *filename);
+/* Load the configuration data from the client configuration file and
+ * optionally from X11 and/or environment variables, overwriting the current
+ * settings in *c. */
+void pa_client_conf_load(pa_client_conf *c, bool load_from_x11, bool load_from_env);
 
-/* Load the configuration data from the environment of the current
-   process, overwriting the current settings in *c. */
-int pa_client_conf_env(pa_client_conf *c);
+/* Load the cookie from the cookie sources specified in the configuration, or
+ * if nothing is specified or none of the sources work, load the cookie from
+ * the default source. If the default source doesn't work either, this function
+ * returns a negative value and initializes the cookie to all-zeroes. */
+int pa_client_conf_load_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie_length);
 
-/* Load cookie data from cookie_file_path into c->cookie */
-int pa_client_conf_load_cookie_from_file(pa_client_conf *c, const char *cookie_file_path);
-
-/* Load cookie data from hexdecimal string into c->cookie */
-int pa_client_conf_load_cookie_from_hex(pa_client_conf *c, const char *cookie_in_hex);
-
-/* Set cookie direct from memory */
-int pa_client_conf_set_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie_size);
+void pa_client_conf_set_cookie_file_from_application(pa_client_conf *c, const char *cookie_file);
 
 #endif
diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in
index 17753b0..446e22a 100644
--- a/src/pulse/client.conf.in
+++ b/src/pulse/client.conf.in
@@ -24,7 +24,7 @@
 ; default-server =
 ; default-dbus-server =
 
-; autospawn = yes
+; autospawn = @PA_DEFAULT_AUTOSPAWN@
 ; daemon-binary = @PA_BINARY@
 ; extra-arguments = --log-target=syslog
 
diff --git a/src/pulse/context.c b/src/pulse/context.c
index b78df27..d5da9b8 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -48,9 +48,6 @@
 #include <pulse/timeval.h>
 #include <pulse/fork-detect.h>
 #include <pulse/client-conf.h>
-#ifdef HAVE_X11
-#include <pulse/client-conf-x11.h>
-#endif
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/i18n.h>
@@ -72,6 +69,8 @@
 #include "context.h"
 
 void pa_command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void pa_command_enable_srbchannel(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void pa_command_disable_srbchannel(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 
 static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
     [PA_COMMAND_REQUEST] = pa_command_request,
@@ -90,7 +89,9 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
     [PA_COMMAND_RECORD_STREAM_EVENT] = pa_command_stream_event,
     [PA_COMMAND_CLIENT_EVENT] = pa_command_client_event,
     [PA_COMMAND_PLAYBACK_BUFFER_ATTR_CHANGED] = pa_command_stream_buffer_attr,
-    [PA_COMMAND_RECORD_BUFFER_ATTR_CHANGED] = pa_command_stream_buffer_attr
+    [PA_COMMAND_RECORD_BUFFER_ATTR_CHANGED] = pa_command_stream_buffer_attr,
+    [PA_COMMAND_ENABLE_SRBCHANNEL] = pa_command_enable_srbchannel,
+    [PA_COMMAND_DISABLE_SRBCHANNEL] = pa_command_disable_srbchannel,
 };
 static void context_free(pa_context *c);
 
@@ -166,11 +167,10 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char *
 #endif
 
     c->conf = pa_client_conf_new();
-    pa_client_conf_load(c->conf, NULL);
-#ifdef HAVE_X11
-    pa_client_conf_from_x11(c->conf, NULL);
-#endif
-    pa_client_conf_env(c->conf);
+    pa_client_conf_load(c->conf, true, true);
+
+    c->srb_template.readfd = -1;
+    c->srb_template.writefd = -1;
 
     if (!(c->mempool = pa_mempool_new(!c->conf->disable_shm, c->conf->shm_size))) {
 
@@ -213,6 +213,11 @@ static void context_unlink(pa_context *c) {
         c->pstream = NULL;
     }
 
+    if (c->srb_template.memblock) {
+        pa_memblock_unref(c->srb_template.memblock);
+        c->srb_template.memblock = NULL;
+    }
+
     if (c->client) {
         pa_socket_client_unref(c->client);
         c->client = NULL;
@@ -323,7 +328,7 @@ static void pstream_die_callback(pa_pstream *p, void *userdata) {
     pa_context_fail(c, PA_ERR_CONNECTIONTERMINATED);
 }
 
-static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_creds *creds, void *userdata) {
+static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_cmsg_ancil_data *ancil_data, void *userdata) {
     pa_context *c = userdata;
 
     pa_assert(p);
@@ -332,12 +337,49 @@ static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_c
 
     pa_context_ref(c);
 
-    if (pa_pdispatch_run(c->pdispatch, packet, creds, c) < 0)
+    if (pa_pdispatch_run(c->pdispatch, packet, ancil_data, c) < 0)
         pa_context_fail(c, PA_ERR_PROTOCOL);
 
     pa_context_unref(c);
 }
 
+static void handle_srbchannel_memblock(pa_context *c, pa_memblock *memblock) {
+    pa_srbchannel *sr;
+    pa_tagstruct *t;
+
+    pa_assert(c);
+
+    /* Memblock sanity check */
+    if (!memblock) {
+        pa_context_fail(c, PA_ERR_PROTOCOL);
+        return;
+    } else if (pa_memblock_is_read_only(memblock)) {
+        pa_context_fail(c, PA_ERR_PROTOCOL);
+        return;
+    } else if (pa_memblock_is_ours(memblock)) {
+        pa_context_fail(c, PA_ERR_PROTOCOL);
+        return;
+    }
+
+    /* Create the srbchannel */
+    c->srb_template.memblock = memblock;
+    pa_memblock_ref(memblock);
+    sr = pa_srbchannel_new_from_template(c->mainloop, &c->srb_template);
+    if (!sr) {
+        pa_context_fail(c, PA_ERR_PROTOCOL);
+        return;
+    }
+
+    /* Ack the enable command */
+    t = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t, PA_COMMAND_ENABLE_SRBCHANNEL);
+    pa_tagstruct_putu32(t, c->srb_setup_tag);
+    pa_pstream_send_tagstruct(c->pstream, t);
+
+    /* ...and switch over */
+    pa_pstream_set_srbchannel(c->pstream, sr);
+}
+
 static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk, void *userdata) {
     pa_context *c = userdata;
     pa_stream *s;
@@ -350,6 +392,12 @@ static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int64_t o
 
     pa_context_ref(c);
 
+    if (c->srb_template.readfd != -1 && c->srb_template.memblock == NULL) {
+        handle_srbchannel_memblock(c, chunk->memblock);
+        pa_context_unref(c);
+        return;
+    }
+
     if ((s = pa_hashmap_get(c->record_streams, PA_UINT32_TO_PTR(channel)))) {
 
         if (chunk->memblock) {
@@ -506,6 +554,7 @@ finish:
 }
 
 static void setup_context(pa_context *c, pa_iochannel *io) {
+    uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
     pa_tagstruct *t;
     uint32_t tag;
 
@@ -524,8 +573,8 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
     pa_assert(!c->pdispatch);
     c->pdispatch = pa_pdispatch_new(c->mainloop, c->use_rtclock, command_table, PA_COMMAND_MAX);
 
-    if (!c->conf->cookie_valid)
-        pa_log_info(_("No cookie loaded. Attempting to connect without."));
+    if (pa_client_conf_load_cookie(c->conf, cookie, sizeof(cookie)) < 0)
+        pa_log_info("No cookie loaded. Attempting to connect without.");
 
     t = pa_tagstruct_command(c, PA_COMMAND_AUTH, &tag);
 
@@ -538,7 +587,7 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
     /* Starting with protocol version 13 we use the MSB of the version
      * tag for informing the other side if we could do SHM or not */
     pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION | (c->do_shm ? 0x80000000U : 0));
-    pa_tagstruct_put_arbitrary(t, c->conf->cookie, sizeof(c->conf->cookie));
+    pa_tagstruct_put_arbitrary(t, cookie, sizeof(cookie));
 
 #ifdef HAVE_CREDS
 {
@@ -782,7 +831,7 @@ static int try_next_connection(pa_context *c) {
         if (!(c->client = pa_socket_client_new_string(c->mainloop, c->use_rtclock, u, PA_NATIVE_DEFAULT_PORT)))
             continue;
 
-        c->is_local = !!pa_socket_client_is_local(c->client);
+        c->is_local = pa_socket_client_is_local(c->client);
         pa_socket_client_set_callback(c->client, on_connection, c);
         break;
     }
@@ -1181,7 +1230,7 @@ int pa_context_is_local(pa_context *c) {
     PA_CHECK_VALIDITY_RETURN_ANY(c, !pa_detect_fork(), PA_ERR_FORKED, -1);
     PA_CHECK_VALIDITY_RETURN_ANY(c, PA_CONTEXT_IS_GOOD(c->state), PA_ERR_BADSTATE, -1);
 
-    return !!c->is_local;
+    return c->is_local;
 }
 
 pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_success_cb_t cb, void *userdata) {
@@ -1368,6 +1417,72 @@ finish:
     pa_context_unref(c);
 }
 
+static void pa_command_enable_srbchannel(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
+    pa_context *c = userdata;
+
+#ifdef HAVE_CREDS
+    const int *fds;
+    int nfd;
+
+    pa_assert(pd);
+    pa_assert(command == PA_COMMAND_ENABLE_SRBCHANNEL);
+    pa_assert(t);
+    pa_assert(c);
+    pa_assert(PA_REFCNT_VALUE(c) >= 1);
+
+    /* Currently only one srb channel is supported, might change in future versions */
+    if (c->srb_template.readfd != -1) {
+        pa_context_fail(c, PA_ERR_PROTOCOL);
+        return;
+    }
+
+    fds = pa_pdispatch_fds(pd, &nfd);
+    if (nfd != 2 || !fds || fds[0] == -1 || fds[1] == -1) {
+        pa_context_fail(c, PA_ERR_PROTOCOL);
+        return;
+    }
+
+    pa_context_ref(c);
+
+    c->srb_template.readfd = fds[0];
+    c->srb_template.writefd = fds[1];
+    c->srb_setup_tag = tag;
+
+    pa_context_unref(c);
+
+#else
+    pa_assert(c);
+    pa_context_fail(c, PA_ERR_PROTOCOL);
+#endif
+}
+
+static void pa_command_disable_srbchannel(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
+    pa_context *c = userdata;
+    pa_tagstruct *t2;
+
+    pa_assert(pd);
+    pa_assert(command == PA_COMMAND_DISABLE_SRBCHANNEL);
+    pa_assert(t);
+    pa_assert(c);
+    pa_assert(PA_REFCNT_VALUE(c) >= 1);
+
+    pa_pstream_set_srbchannel(c->pstream, NULL);
+
+    c->srb_template.readfd = -1;
+    c->srb_template.writefd = -1;
+    if (c->srb_template.memblock) {
+        pa_memblock_unref(c->srb_template.memblock);
+        c->srb_template.memblock = NULL;
+    }
+
+    /* Send disable command back again */
+    t2 = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t2, PA_COMMAND_DISABLE_SRBCHANNEL);
+    pa_tagstruct_putu32(t2, tag);
+    pa_pstream_send_tagstruct(c->pstream, t2);
+}
+
+
 void pa_command_client_event(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     pa_context *c = userdata;
     pa_proplist *pl = NULL;
@@ -1451,11 +1566,13 @@ size_t pa_context_get_tile_size(pa_context *c, const pa_sample_spec *ss) {
 
 int pa_context_load_cookie_from_file(pa_context *c, const char *cookie_file_path) {
     pa_assert(c);
-    pa_assert(cookie_file_path);
     pa_assert(PA_REFCNT_VALUE(c) >= 1);
 
     PA_CHECK_VALIDITY(c, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY(c, c->state == PA_CONTEXT_UNCONNECTED, PA_ERR_BADSTATE);
+    PA_CHECK_VALIDITY(c, !cookie_file_path || *cookie_file_path, PA_ERR_INVALID);
 
-    return pa_client_conf_load_cookie_from_file(c->conf, cookie_file_path);
+    pa_client_conf_set_cookie_file_from_application(c->conf, cookie_file_path);
+
+    return 0;
 }
diff --git a/src/pulse/def.h b/src/pulse/def.h
index d6fa912..ee7404d 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -197,7 +197,7 @@ typedef enum pa_stream_flags {
      * return always monotonically increasing time values on each
      * call. This may confuse applications which cannot deal with time
      * going 'backwards', but has the advantage that bad transport
-     * latency estimations that caused the time to to jump ahead can
+     * latency estimations that caused the time to jump ahead can
      * be corrected quickly, without the need to wait. (Please note
      * that this flag was named PA_STREAM_NOT_MONOTONOUS in releases
      * prior to 0.9.11. The old name is still defined too, for
@@ -464,7 +464,7 @@ typedef enum pa_error_code {
     PA_ERR_CONNECTIONREFUSED,      /**< Connection refused */
     PA_ERR_PROTOCOL,               /**< Protocol error */
     PA_ERR_TIMEOUT,                /**< Timeout */
-    PA_ERR_AUTHKEY,                /**< No authorization key */
+    PA_ERR_AUTHKEY,                /**< No authentication key */
     PA_ERR_INTERNAL,               /**< Internal error */
     PA_ERR_CONNECTIONTERMINATED,   /**< Connection terminated */
     PA_ERR_KILLED,                 /**< Entity killed */
diff --git a/src/pulsecore/cpu.h b/src/pulse/direction.c
similarity index 52%
copy from src/pulsecore/cpu.h
copy to src/pulse/direction.c
index 7fe6f0b..95f5e00 100644
--- a/src/pulsecore/cpu.h
+++ b/src/pulse/direction.c
@@ -1,10 +1,7 @@
-#ifndef foocpuhfoo
-#define foocpuhfoo
-
 /***
   This file is part of PulseAudio.
 
-  Copyright 2010 Arun Raghavan
+  Copyright 2014 Intel Corporation
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
@@ -22,24 +19,28 @@
   USA.
 ***/
 
-#include <pulsecore/cpu-x86.h>
-#include <pulsecore/cpu-arm.h>
+#include "direction.h"
+
+#include <pulsecore/i18n.h>
 
-typedef enum {
-    PA_CPU_UNDEFINED = 0,
-    PA_CPU_X86,
-    PA_CPU_ARM,
-} pa_cpu_type_t;
+int pa_direction_valid(pa_direction_t direction) {
+    if (direction != PA_DIRECTION_INPUT
+            && direction != PA_DIRECTION_OUTPUT
+            && direction != (PA_DIRECTION_INPUT | PA_DIRECTION_OUTPUT))
+        return 0;
 
-typedef struct pa_cpu_info pa_cpu_info;
+    return 1;
+}
 
-struct pa_cpu_info {
-    pa_cpu_type_t cpu_type;
+const char *pa_direction_to_string(pa_direction_t direction) {
+    pa_init_i18n();
 
-    union {
-        pa_cpu_x86_flag_t x86;
-        pa_cpu_arm_flag_t arm;
-    } flags;
-};
+    if (direction == PA_DIRECTION_INPUT)
+        return _("input");
+    if (direction == PA_DIRECTION_OUTPUT)
+        return _("output");
+    if (direction == (PA_DIRECTION_INPUT | PA_DIRECTION_OUTPUT))
+        return _("bidirectional");
 
-#endif /* foocpuhfoo */
+    return _("invalid");
+}
diff --git a/src/pulse/client-conf-x11.h b/src/pulse/direction.h
similarity index 61%
copy from src/pulse/client-conf-x11.h
copy to src/pulse/direction.h
index dca9f0d..127f07a 100644
--- a/src/pulse/client-conf-x11.h
+++ b/src/pulse/direction.h
@@ -1,10 +1,10 @@
-#ifndef fooclientconfx11hfoo
-#define fooclientconfx11hfoo
+#ifndef foodirectionhfoo
+#define foodirectionhfoo
 
 /***
   This file is part of PulseAudio.
 
-  Copyright 2004-2006 Lennart Poettering
+  Copyright 2014 Intel Corporation
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
@@ -22,10 +22,16 @@
   USA.
 ***/
 
-#include "client-conf.h"
+#include <pulse/def.h>
 
-/* Load client configuration data from the specified X11 display,
- * overwriting the current settings in *c */
-int pa_client_conf_from_x11(pa_client_conf *c, const char *display);
+/** \file
+ * Utility functions for \ref pa_direction_t. */
+
+/** Return non-zero if the given value is a valid direction (either input,
+ * output or bidirectional). \since 6.0 */
+int pa_direction_valid(pa_direction_t direction) PA_GCC_CONST;
+
+/** Return a textual representation of the direction. \since 6.0 */
+const char *pa_direction_to_string(pa_direction_t direction);
 
 #endif
diff --git a/src/pulse/error.c b/src/pulse/error.c
index 751d42a..27b8ec4 100644
--- a/src/pulse/error.c
+++ b/src/pulse/error.c
@@ -46,7 +46,7 @@ const char*pa_strerror(int error) {
         [PA_ERR_CONNECTIONREFUSED] = N_("Connection refused"),
         [PA_ERR_PROTOCOL] = N_("Protocol error"),
         [PA_ERR_TIMEOUT] = N_("Timeout"),
-        [PA_ERR_AUTHKEY] = N_("No authorization key"),
+        [PA_ERR_AUTHKEY] = N_("No authentication key"),
         [PA_ERR_INTERNAL] = N_("Internal error"),
         [PA_ERR_CONNECTIONTERMINATED] = N_("Connection terminated"),
         [PA_ERR_KILLED] = N_("Entity killed"),
diff --git a/src/pulse/ext-device-manager.c b/src/pulse/ext-device-manager.c
index 7fbb7de..9158068 100644
--- a/src/pulse/ext-device-manager.c
+++ b/src/pulse/ext-device-manager.c
@@ -225,6 +225,7 @@ pa_operation *pa_ext_device_manager_set_device_description(
     PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
     PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 14, PA_ERR_NOTSUPPORTED);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, *description, PA_ERR_INVALID);
 
     o = pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
 
diff --git a/src/pulse/ext-device-manager.h b/src/pulse/ext-device-manager.h
index 1e41ebd..1ee6830 100644
--- a/src/pulse/ext-device-manager.h
+++ b/src/pulse/ext-device-manager.h
@@ -34,6 +34,9 @@
 
 PA_C_DECL_BEGIN
 
+/* Don't extend this struct! It will break binary compatibility, because
+ * pa_ext_device_manager_info.role_priorities points to an array of structs
+ * instead of an array of pointers to structs. */
 typedef struct pa_ext_device_manager_role_priority_info {
     const char *role;
     uint32_t priority;
diff --git a/src/pulse/format.c b/src/pulse/format.c
index 729c2d2..1aa3377 100644
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -249,7 +249,7 @@ pa_prop_type_t pa_format_info_get_prop_type(const pa_format_info *f, const char
         return PA_PROP_TYPE_INVALID;
 
     o = json_tokener_parse(str);
-    if (is_error(o))
+    if (!o)
         return PA_PROP_TYPE_INVALID;
 
     switch (json_object_get_type(o)) {
@@ -278,25 +278,20 @@ pa_prop_type_t pa_format_info_get_prop_type(const pa_format_info *f, const char
             else
                 type = PA_PROP_TYPE_INVALID;
 
-            json_object_put(o1);
             break;
 
         case json_type_object:
             /* We actually know at this point that it's a int range, but let's
              * confirm. */
-            o1 = json_object_object_get(o, PA_JSON_MIN_KEY);
-            if (!o1) {
+            if (!json_object_object_get_ex(o, PA_JSON_MIN_KEY, NULL)) {
                 type = PA_PROP_TYPE_INVALID;
                 break;
             }
-            json_object_put(o1);
 
-            o1 = json_object_object_get(o, PA_JSON_MAX_KEY);
-            if (!o1) {
+            if (!json_object_object_get_ex(o, PA_JSON_MAX_KEY, NULL)) {
                 type = PA_PROP_TYPE_INVALID;
                 break;
             }
-            json_object_put(o1);
 
             type = PA_PROP_TYPE_INT_RANGE;
             break;
@@ -323,7 +318,7 @@ int pa_format_info_get_prop_int(const pa_format_info *f, const char *key, int *v
         return -PA_ERR_NOENTITY;
 
     o = json_tokener_parse(str);
-    if (is_error(o)) {
+    if (!o) {
         pa_log_debug("Failed to parse format info property '%s'.", key);
         return -PA_ERR_INVALID;
     }
@@ -355,7 +350,7 @@ int pa_format_info_get_prop_int_range(const pa_format_info *f, const char *key,
         return -PA_ERR_NOENTITY;
 
     o = json_tokener_parse(str);
-    if (is_error(o)) {
+    if (!o) {
         pa_log_debug("Failed to parse format info property '%s'.", key);
         return -PA_ERR_INVALID;
     }
@@ -363,17 +358,15 @@ int pa_format_info_get_prop_int_range(const pa_format_info *f, const char *key,
     if (json_object_get_type(o) != json_type_object)
         goto out;
 
-    if (!(o1 = json_object_object_get(o, PA_JSON_MIN_KEY)))
+    if (!json_object_object_get_ex(o, PA_JSON_MIN_KEY, &o1))
         goto out;
 
     *min = json_object_get_int(o1);
-    json_object_put(o1);
 
-    if (!(o1 = json_object_object_get(o, PA_JSON_MAX_KEY)))
+    if (!json_object_object_get_ex(o, PA_JSON_MAX_KEY, &o1))
         goto out;
 
     *max = json_object_get_int(o1);
-    json_object_put(o1);
 
     ret = 0;
 
@@ -400,7 +393,7 @@ int pa_format_info_get_prop_int_array(const pa_format_info *f, const char *key,
         return -PA_ERR_NOENTITY;
 
     o = json_tokener_parse(str);
-    if (is_error(o)) {
+    if (!o) {
         pa_log_debug("Failed to parse format info property '%s'.", key);
         return -PA_ERR_INVALID;
     }
@@ -415,12 +408,10 @@ int pa_format_info_get_prop_int_array(const pa_format_info *f, const char *key,
         o1 = json_object_array_get_idx(o, i);
 
         if (json_object_get_type(o1) != json_type_int) {
-            json_object_put(o1);
             goto out;
         }
 
         (*values)[i] = json_object_get_int(o1);
-        json_object_put(o1);
     }
 
     ret = 0;
@@ -446,7 +437,7 @@ int pa_format_info_get_prop_string(const pa_format_info *f, const char *key, cha
         return -PA_ERR_NOENTITY;
 
     o = json_tokener_parse(str);
-    if (is_error(o)) {
+    if (!o) {
         pa_log_debug("Failed to parse format info property '%s'.", key);
         return -PA_ERR_INVALID;
     }
@@ -478,7 +469,7 @@ int pa_format_info_get_prop_string_array(const pa_format_info *f, const char *ke
         return -PA_ERR_NOENTITY;
 
     o = json_tokener_parse(str);
-    if (is_error(o)) {
+    if (!o) {
         pa_log_debug("Failed to parse format info property '%s'.", key);
         return -PA_ERR_INVALID;
     }
@@ -493,12 +484,10 @@ int pa_format_info_get_prop_string_array(const pa_format_info *f, const char *ke
         o1 = json_object_array_get_idx(o, i);
 
         if (json_object_get_type(o1) != json_type_string) {
-            json_object_put(o1);
             goto out;
         }
 
         (*values)[i] = pa_xstrdup(json_object_get_string(o1));
-        json_object_put(o1);
     }
 
     ret = 0;
@@ -637,11 +626,11 @@ static int pa_format_info_prop_compatible(const char *one, const char *two) {
     int i, ret = 0;
 
     o1 = json_tokener_parse(one);
-    if (is_error(o1))
+    if (!o1)
         goto out;
 
     o2 = json_tokener_parse(two);
-    if (is_error(o2))
+    if (!o2)
         goto out;
 
     /* We don't deal with both values being non-fixed - just because there is no immediate need (FIXME) */
@@ -677,12 +666,12 @@ static int pa_format_info_prop_compatible(const char *one, const char *two) {
             goto out;
         }
 
-        o_min = json_object_object_get(o1, PA_JSON_MIN_KEY);
-        if (!o_min || json_object_get_type(o_min) != json_type_int)
+        if (!json_object_object_get_ex(o1, PA_JSON_MIN_KEY, &o_min) ||
+            json_object_get_type(o_min) != json_type_int)
             goto out;
 
-        o_max = json_object_object_get(o1, PA_JSON_MAX_KEY);
-        if (!o_max || json_object_get_type(o_max) != json_type_int)
+        if (!json_object_object_get_ex(o1, PA_JSON_MAX_KEY, &o_max) ||
+            json_object_get_type(o_max) != json_type_int)
             goto out;
 
         v = json_object_get_int(o2);
diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index c5084d5..fc2b702 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -66,6 +66,9 @@ struct pa_context {
     pa_pstream *pstream;
     pa_pdispatch *pdispatch;
 
+    pa_srbchannel_template srb_template;
+    uint32_t srb_setup_tag;
+
     pa_hashmap *record_streams, *playback_streams;
     PA_LLIST_HEAD(pa_stream, streams);
     PA_LLIST_HEAD(pa_operation, operations);
diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index 2d54fdb..d7696df 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <pulse/context.h>
+#include <pulse/direction.h>
 #include <pulse/xmalloc.h>
 #include <pulse/fork-detect.h>
 
@@ -823,15 +824,14 @@ static int fill_card_port_info(pa_context *context, pa_tagstruct* t, pa_card_inf
             pa_tagstruct_getu32(t, &port->priority) < 0 ||
             pa_tagstruct_getu32(t, &available) < 0 ||
             pa_tagstruct_getu8(t, &direction) < 0 ||
+            !pa_direction_valid(direction) ||
             pa_tagstruct_get_proplist(t, port->proplist) < 0 ||
             pa_tagstruct_getu32(t, &port->n_profiles) < 0) {
 
             return -PA_ERR_PROTOCOL;
         }
 
-        if (available > PA_PORT_AVAILABLE_YES ||
-            direction > PA_DIRECTION_OUTPUT + PA_DIRECTION_INPUT) {
-
+        if (available > PA_PORT_AVAILABLE_YES ) {
             return -PA_ERR_PROTOCOL;
         }
 
diff --git a/src/pulse/mainloop-api.h b/src/pulse/mainloop-api.h
index 600e0e3..d03e0e6 100644
--- a/src/pulse/mainloop-api.h
+++ b/src/pulse/mainloop-api.h
@@ -61,21 +61,21 @@ typedef enum pa_io_event_flags {
 typedef struct pa_io_event pa_io_event;
 /** An IO event callback prototype \since 0.9.3 */
 typedef void (*pa_io_event_cb_t)(pa_mainloop_api*ea, pa_io_event* e, int fd, pa_io_event_flags_t events, void *userdata);
-/** A IO event destroy callback prototype \ since 0.9.3 */
+/** A IO event destroy callback prototype \since 0.9.3 */
 typedef void (*pa_io_event_destroy_cb_t)(pa_mainloop_api*a, pa_io_event *e, void *userdata);
 
 /** An opaque timer event source object */
 typedef struct pa_time_event pa_time_event;
 /** A time event callback prototype \since 0.9.3 */
 typedef void (*pa_time_event_cb_t)(pa_mainloop_api*a, pa_time_event* e, const struct timeval *tv, void *userdata);
-/** A time event destroy callback prototype \ since 0.9.3 */
+/** A time event destroy callback prototype \since 0.9.3 */
 typedef void (*pa_time_event_destroy_cb_t)(pa_mainloop_api*a, pa_time_event *e, void *userdata);
 
 /** An opaque deferred event source object. Events of this type are triggered once in every main loop iteration */
 typedef struct pa_defer_event pa_defer_event;
 /** A defer event callback prototype \since 0.9.3 */
 typedef void (*pa_defer_event_cb_t)(pa_mainloop_api*a, pa_defer_event* e, void *userdata);
-/** A defer event destroy callback prototype \ since 0.9.3 */
+/** A defer event destroy callback prototype \since 0.9.3 */
 typedef void (*pa_defer_event_destroy_cb_t)(pa_mainloop_api*a, pa_defer_event *e, void *userdata);
 
 /** An abstract mainloop API vtable */
@@ -114,9 +114,11 @@ struct pa_mainloop_api {
     void (*quit)(pa_mainloop_api*a, int retval);
 };
 
-/** Run the specified callback function once from the main loop using an anonymous defer event. Note that this performs
- * multiple mainloop operations non-atomically. If, for example, you are using a \ref pa_threaded_mainloop, you will need to
- * take the mainloop lock before this call. */
+/** Run the specified callback function once from the main loop using an
+ * anonymous defer event. If the mainloop runs in a different thread, you need
+ * to follow the mainloop implementation's rules regarding how to safely create
+ * defer events. In particular, if you're using \ref pa_threaded_mainloop, you
+ * must lock the mainloop before calling this function. */
 void pa_mainloop_api_once(pa_mainloop_api*m, void (*callback)(pa_mainloop_api*m, void *userdata), void *userdata);
 
 PA_C_DECL_END
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index 66a1475..c7a5236 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -114,7 +114,6 @@ struct pa_mainloop {
     int retval;
     bool quit:1;
 
-    pa_atomic_t wakeup_requested;
     int wakeup_pipe[2];
     int wakeup_pipe_type;
 
@@ -772,10 +771,8 @@ void pa_mainloop_wakeup(pa_mainloop *m) {
     pa_assert(m);
 
     if (pa_write(m->wakeup_pipe[1], &c, sizeof(c), &m->wakeup_pipe_type) < 0)
-        /* Not much options for recovering from the error. Let's at least log something. */
+        /* Not many options for recovering from the error. Let's at least log something. */
         pa_log("pa_write() failed while trying to wake up the mainloop: %s", pa_cstrerror(errno));
-
-    pa_atomic_store(&m->wakeup_requested, true);
 }
 
 static void clear_wakeup(pa_mainloop *m) {
@@ -783,10 +780,8 @@ static void clear_wakeup(pa_mainloop *m) {
 
     pa_assert(m);
 
-    if (pa_atomic_cmpxchg(&m->wakeup_requested, true, false)) {
-        while (pa_read(m->wakeup_pipe[0], &c, sizeof(c), &m->wakeup_pipe_type) == sizeof(c))
-            ;
-    }
+    while (pa_read(m->wakeup_pipe[0], &c, sizeof(c), &m->wakeup_pipe_type) == sizeof(c))
+        ;
 }
 
 int pa_mainloop_prepare(pa_mainloop *m, int timeout) {
@@ -842,7 +837,7 @@ int pa_mainloop_poll(pa_mainloop *m) {
 
     m->state = STATE_POLLING;
 
-    if (m->n_enabled_defer_events )
+    if (m->n_enabled_defer_events)
         m->poll_func_ret = 0;
     else {
         pa_assert(!m->rebuild_pollfds);
diff --git a/src/pulse/proplist.c b/src/pulse/proplist.c
index 0c2bd60..a5ab7d2 100644
--- a/src/pulse/proplist.c
+++ b/src/pulse/proplist.c
@@ -343,18 +343,15 @@ void pa_proplist_update(pa_proplist *p, pa_update_mode_t mode, const pa_proplist
 }
 
 int pa_proplist_unset(pa_proplist *p, const char *key) {
-    struct property *prop;
-
     pa_assert(p);
     pa_assert(key);
 
     if (!pa_proplist_key_valid(key))
         return -1;
 
-    if (!(prop = pa_hashmap_remove(MAKE_HASHMAP(p), key)))
+    if (pa_hashmap_remove_and_free(MAKE_HASHMAP(p), key) < 0)
         return -2;
 
-    property_free(prop);
     return 0;
 }
 
diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h
index dc3cddc..e55a479 100644
--- a/src/pulse/proplist.h
+++ b/src/pulse/proplist.h
@@ -71,7 +71,7 @@ PA_C_DECL_BEGIN
 /** For streams: the name of a filter that is desired, e.g.\ "echo-cancel" or "equalizer-sink". Differs from PA_PROP_FILTER_WANT in that it forces PulseAudio to apply the filter, regardless of whether PulseAudio thinks it makes sense to do so or not. If this is set, PA_PROP_FILTER_WANT is ignored. In other words, you almost certainly do not want to use this. \since 1.0 */
 #define PA_PROP_FILTER_APPLY                   "filter.apply"
 
-/** For streams: the name of a filter that should specifically suppressed (i.e.\ overrides PA_PROP_FILTER_WANT). Useful for the times that PA_PROP_FILTER_WANT is automatically added (e.g. echo-cancellation for phone streams when $VOIP_APP does it's own, internal AEC) \since 1.0 */
+/** For streams: the name of a filter that should specifically suppressed (i.e.\ overrides PA_PROP_FILTER_WANT). Useful for the times that PA_PROP_FILTER_WANT is automatically added (e.g. echo-cancellation for phone streams when $VOIP_APP does its own, internal AEC) \since 1.0 */
 #define PA_PROP_FILTER_SUPPRESS                "filter.suppress"
 
 /** For event sound streams: XDG event sound name. e.g.\ "message-new-email" (Event sound streams are those with media.role set to "event") */
diff --git a/src/pulse/pulseaudio.h b/src/pulse/pulseaudio.h
index 21b7213..2e270dd 100644
--- a/src/pulse/pulseaudio.h
+++ b/src/pulse/pulseaudio.h
@@ -23,6 +23,7 @@
   USA.
 ***/
 
+#include <pulse/direction.h>
 #include <pulse/mainloop-api.h>
 #include <pulse/sample.h>
 #include <pulse/format.h>
@@ -49,8 +50,8 @@
 
 /** \file
  * Include all libpulse header files at once. The following files are
- * included: \ref mainloop-api.h, \ref sample.h, \ref def.h, \ref
- * context.h, \ref stream.h, \ref introspect.h, \ref subscribe.h, \ref
+ * included: \ref direction.h, \ref mainloop-api.h, \ref sample.h, \ref def.h,
+ * \ref context.h, \ref stream.h, \ref introspect.h, \ref subscribe.h, \ref
  * scache.h, \ref version.h, \ref error.h, \ref channelmap.h, \ref
  * operation.h,\ref volume.h, \ref xmalloc.h, \ref utf8.h, \ref
  * thread-mainloop.h, \ref mainloop.h, \ref util.h, \ref proplist.h,
diff --git a/src/pulse/simple.c b/src/pulse/simple.c
index 1891131..f005cf8 100644
--- a/src/pulse/simple.c
+++ b/src/pulse/simple.c
@@ -454,17 +454,32 @@ unlock_and_fail:
 
 pa_usec_t pa_simple_get_latency(pa_simple *p, int *rerror) {
     pa_usec_t t;
-    int negative;
 
     pa_assert(p);
 
     pa_threaded_mainloop_lock(p->mainloop);
 
     for (;;) {
+        int negative;
+
         CHECK_DEAD_GOTO(p, rerror, unlock_and_fail);
 
-        if (pa_stream_get_latency(p->stream, &t, &negative) >= 0)
+        if (pa_stream_get_latency(p->stream, &t, &negative) >= 0) {
+            pa_usec_t extra = 0;
+
+            if (p->direction == PA_STREAM_RECORD)
+                extra = pa_bytes_to_usec(p->read_length, pa_stream_get_sample_spec(p->stream));
+
+            if (negative) {
+                if (extra > t)
+                    t = extra - t;
+                else
+                    t = 0;
+            } else
+                t += extra;
+
             break;
+        }
 
         CHECK_SUCCESS_GOTO(p, rerror, pa_context_errno(p->context) == PA_ERR_NODATA, unlock_and_fail);
 
@@ -474,7 +489,7 @@ pa_usec_t pa_simple_get_latency(pa_simple *p, int *rerror) {
 
     pa_threaded_mainloop_unlock(p->mainloop);
 
-    return negative ? 0 : t;
+    return t;
 
 unlock_and_fail:
 
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index 8e35c29..f549036 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -1464,11 +1464,12 @@ int pa_stream_cancel_write(
     return 0;
 }
 
-int pa_stream_write(
+int pa_stream_write_ext_free(
         pa_stream *s,
         const void *data,
         size_t length,
         pa_free_cb_t free_cb,
+        void *free_cb_data,
         int64_t offset,
         pa_seek_mode_t seek) {
 
@@ -1486,6 +1487,8 @@ int pa_stream_write(
                       ((data >= s->write_data) &&
                        ((const char*) data + length <= (const char*) s->write_data + pa_memblock_get_length(s->write_memblock))),
                       PA_ERR_INVALID);
+    PA_CHECK_VALIDITY(s->context, offset % pa_frame_size(&s->sample_spec) == 0, PA_ERR_INVALID);
+    PA_CHECK_VALIDITY(s->context, length % pa_frame_size(&s->sample_spec) == 0, PA_ERR_INVALID);
     PA_CHECK_VALIDITY(s->context, !free_cb || !s->write_memblock, PA_ERR_INVALID);
 
     if (s->write_memblock) {
@@ -1519,7 +1522,7 @@ int pa_stream_write(
             chunk.index = 0;
 
             if (free_cb && !pa_pstream_get_shm(s->context->pstream)) {
-                chunk.memblock = pa_memblock_new_user(s->context->mempool, (void*) t_data, t_length, free_cb, 1);
+                chunk.memblock = pa_memblock_new_user(s->context->mempool, (void*) t_data, t_length, free_cb, free_cb_data, 1);
                 chunk.length = t_length;
             } else {
                 void *d;
@@ -1544,7 +1547,7 @@ int pa_stream_write(
         }
 
         if (free_cb && pa_pstream_get_shm(s->context->pstream))
-            free_cb((void*) data);
+            free_cb(free_cb_data);
     }
 
     /* This is obviously wrong since we ignore the seeking index . But
@@ -1591,6 +1594,17 @@ int pa_stream_write(
     return 0;
 }
 
+int pa_stream_write(
+        pa_stream *s,
+        const void *data,
+        size_t length,
+        pa_free_cb_t free_cb,
+        int64_t offset,
+        pa_seek_mode_t seek) {
+
+    return pa_stream_write_ext_free(s, data, length, free_cb, (void*) data, offset, seek);
+}
+
 int pa_stream_peek(pa_stream *s, const void **data, size_t *length) {
     pa_assert(s);
     pa_assert(PA_REFCNT_VALUE(s) >= 1);
diff --git a/src/pulse/stream.h b/src/pulse/stream.h
index 47e0c68..bc17143 100644
--- a/src/pulse/stream.h
+++ b/src/pulse/stream.h
@@ -554,6 +554,17 @@ int pa_stream_write(
         int64_t offset,          /**< Offset for seeking, must be 0 for upload streams */
         pa_seek_mode_t seek      /**< Seek mode, must be PA_SEEK_RELATIVE for upload streams */);
 
+/** Function does exactly the same as pa_stream_write() with the difference
+ *  that free_cb_data is passed to free_cb instead of data. \since 6.0 */
+int pa_stream_write_ext_free(
+        pa_stream *p             /**< The stream to use */,
+        const void *data         /**< The data to write */,
+        size_t nbytes            /**< The length of the data to write in bytes */,
+        pa_free_cb_t free_cb     /**< A cleanup routine for the data or NULL to request an internal copy */,
+        void *free_cb_data       /**< Argument passed to free_cb function */,
+        int64_t offset           /**< Offset for seeking, must be 0 for upload streams */,
+        pa_seek_mode_t seek      /**< Seek mode, must be PA_SEEK_RELATIVE for upload streams */);
+
 /** Read the next fragment from the buffer (for recording streams).
  * If there is data at the current read index, \a data will point to
  * the actual data and \a nbytes will contain the size of the data in
@@ -628,7 +639,7 @@ void pa_stream_set_started_callback(pa_stream *p, pa_stream_notify_cb_t cb, void
 
 /** Set the callback function that is called whenever a latency
  * information update happens. Useful on PA_STREAM_AUTO_TIMING_UPDATE
- * streams only. (Only for playback streams) */
+ * streams only. */
 void pa_stream_set_latency_update_callback(pa_stream *p, pa_stream_notify_cb_t cb, void *userdata);
 
 /** Set the callback function that is called whenever the stream is
diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index 435e9f6..631b6ae 100644
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -97,7 +97,7 @@ pa_threaded_mainloop *pa_threaded_mainloop_new(void) {
 
     pa_init_i18n();
 
-    m = pa_xnew(pa_threaded_mainloop, 1);
+    m = pa_xnew0(pa_threaded_mainloop, 1);
 
     if (!(m->real_mainloop = pa_mainloop_new())) {
         pa_xfree(m);
@@ -107,14 +107,9 @@ pa_threaded_mainloop *pa_threaded_mainloop_new(void) {
     m->mutex = pa_mutex_new(true, true);
     m->cond = pa_cond_new();
     m->accept_cond = pa_cond_new();
-    m->thread = NULL;
-    m->name = NULL;
 
     pa_mainloop_set_poll_func(m->real_mainloop, poll_func, m->mutex);
 
-    m->n_waiting = 0;
-    m->n_waiting_for_accept = 0;
-
     return m;
 }
 
diff --git a/src/pulse/thread-mainloop.h b/src/pulse/thread-mainloop.h
index 8e8cbfe..6a786fc 100644
--- a/src/pulse/thread-mainloop.h
+++ b/src/pulse/thread-mainloop.h
@@ -272,7 +272,7 @@ void pa_threaded_mainloop_stop(pa_threaded_mainloop *m);
  * are executed with this lock held. */
 void pa_threaded_mainloop_lock(pa_threaded_mainloop *m);
 
-/** Unlock the event loop object, inverse of pa_threaded_mainloop_lock() */
+/** Unlock the event loop object, inverse of pa_threaded_mainloop_lock(). */
 void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m);
 
 /** Wait for an event to be signalled by the event loop thread. You
@@ -287,7 +287,7 @@ void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m);
 void pa_threaded_mainloop_wait(pa_threaded_mainloop *m);
 
 /** Signal all threads waiting for a signalling event in
- * pa_threaded_mainloop_wait(). If wait_for_release is non-zero, do
+ * pa_threaded_mainloop_wait(). If wait_for_accept is non-zero, do
  * not return before the signal was accepted by a
  * pa_threaded_mainloop_accept() call. While waiting for that condition
  * the event loop object is unlocked. */
diff --git a/src/pulse/util.c b/src/pulse/util.c
index 6656bc3..d672f53 100644
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -64,6 +64,15 @@
 
 #include "util.h"
 
+#if defined(HAVE_DLADDR) && defined(PA_GCC_WEAKREF)
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+#include <dlfcn.h>
+
+static int _main() PA_GCC_WEAKREF(main);
+#endif
+
 char *pa_get_user_name(char *s, size_t l) {
     const char *p;
     char *name = NULL;
@@ -132,19 +141,23 @@ char *pa_get_host_name(char *s, size_t l) {
 
 char *pa_get_home_dir(char *s, size_t l) {
     char *e;
-#ifdef HAVE_PWD_H
     char *dir;
+#ifdef HAVE_PWD_H
     struct passwd *r;
 #endif
 
     pa_assert(s);
     pa_assert(l > 0);
 
-    if ((e = getenv("HOME")))
-        return pa_strlcpy(s, e, l);
+    if ((e = getenv("HOME"))) {
+        dir = pa_strlcpy(s, e, l);
+        goto finish;
+    }
 
-    if ((e = getenv("USERPROFILE")))
-        return pa_strlcpy(s, e, l);
+    if ((e = getenv("USERPROFILE"))) {
+        dir = pa_strlcpy(s, e, l);
+        goto finish;
+    }
 
 #ifdef HAVE_PWD_H
     errno = 0;
@@ -158,13 +171,21 @@ char *pa_get_home_dir(char *s, size_t l) {
     dir = pa_strlcpy(s, r->pw_dir, l);
 
     pa_getpwuid_free(r);
+#endif /* HAVE_PWD_H */
 
-    return dir;
-#else /* HAVE_PWD_H */
+finish:
+    if (!dir) {
+        errno = ENOENT;
+        return NULL;
+    }
 
-    errno = ENOENT;
-    return NULL;
-#endif
+    if (!pa_is_path_absolute(dir)) {
+        pa_log("Failed to get the home directory, not an absolute path: %s", dir);
+        errno = ENOENT;
+        return NULL;
+    }
+
+    return dir;
 }
 
 char *pa_get_binary_name(char *s, size_t l) {
@@ -181,10 +202,10 @@ char *pa_get_binary_name(char *s, size_t l) {
     }
 #endif
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD_kernel__)
     {
         char *rp;
-        /* This works on Linux only */
+        /* This works on Linux and Debian/kFreeBSD */
 
         if ((rp = pa_readlink("/proc/self/exe"))) {
             pa_strlcpy(s, pa_path_get_filename(rp), l);
@@ -206,6 +227,20 @@ char *pa_get_binary_name(char *s, size_t l) {
     }
 #endif
 
+#if defined(HAVE_DLADDR) && defined(PA_GCC_WEAKREF)
+    {
+        Dl_info info;
+        if(_main) {
+            int err = dladdr(&_main, &info);
+            if (err != 0) {
+                char *p = pa_realpath(info.dli_fname);
+                if (p)
+                    return p;
+            }
+        }
+    }
+#endif
+
 #if defined(HAVE_SYS_PRCTL_H) && defined(PR_GET_NAME)
     {
 
diff --git a/src/pulse/version.h b/src/pulse/version.h
index 4bc647c..d386794 100644
--- a/src/pulse/version.h
+++ b/src/pulse/version.h
@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN
 /** Return the version of the header files. Keep in mind that this is
 a macro and not a function, so it is impossible to get the pointer of
 it. */
-#define pa_get_headers_version() ("5.0.0")
+#define pa_get_headers_version() ("5.99.0")
 
 /** Return the version of the library the current application is
  * linked to. */
@@ -49,13 +49,13 @@ const char* pa_get_library_version(void);
 
 /** The current protocol version. Version 8 relates to Polypaudio
  * 0.8/PulseAudio 0.9. */
-#define PA_PROTOCOL_VERSION 29
+#define PA_PROTOCOL_VERSION 30
 
 /** The major version of PA. \since 0.9.15 */
 #define PA_MAJOR 5
 
 /** The minor version of PA. \since 0.9.15 */
-#define PA_MINOR 0
+#define PA_MINOR 99
 
 /** The micro version of PA (will always be 0 from v1.0 onwards). \since 0.9.15 */
 #define PA_MICRO 0
diff --git a/src/pulse/volume.h b/src/pulse/volume.h
index 7806954..97fc10b 100644
--- a/src/pulse/volume.h
+++ b/src/pulse/volume.h
@@ -216,7 +216,7 @@ char *pa_volume_snprint(char *s, size_t l, pa_volume_t v);
  * any release without warning and without being considered API or ABI
  * breakage. You should not use this definition anywhere where it
  * might become part of an ABI. \since 0.9.15 */
-#define PA_SW_VOLUME_SNPRINT_DB_MAX 10
+#define PA_SW_VOLUME_SNPRINT_DB_MAX 11
 
 /** Pretty print a volume but show dB values. \since 0.9.15 */
 char *pa_sw_volume_snprint_dB(char *s, size_t l, pa_volume_t v);
diff --git a/src/pulsecore/asyncmsgq.c b/src/pulsecore/asyncmsgq.c
index 58cd7ac..2ed550a 100644
--- a/src/pulsecore/asyncmsgq.c
+++ b/src/pulsecore/asyncmsgq.c
@@ -157,8 +157,6 @@ int pa_asyncmsgq_send(pa_asyncmsgq *a, pa_msgobject *object, int code, const voi
     if (!(i.semaphore = pa_flist_pop(PA_STATIC_FLIST_GET(semaphores))))
         i.semaphore = pa_semaphore_new(0);
 
-    pa_assert_se(i.semaphore);
-
     /* This mutex makes the queue multiple-writer safe. This lock is only used on the writing side */
     pa_mutex_lock(a->mutex);
     pa_assert_se(pa_asyncq_push(a->asyncq, &i, true) == 0);
diff --git a/src/pulsecore/aupdate.c b/src/pulsecore/aupdate.c
index 2a7241a..2b2fa87 100644
--- a/src/pulsecore/aupdate.c
+++ b/src/pulsecore/aupdate.c
@@ -79,7 +79,7 @@ unsigned pa_aupdate_read_begin(pa_aupdate *a) {
 }
 
 void pa_aupdate_read_end(pa_aupdate *a) {
-    unsigned n;
+    unsigned PA_UNUSED n;
 
     pa_assert(a);
 
diff --git a/src/pulsecore/auth-cookie.c b/src/pulsecore/auth-cookie.c
index a3d9ca4..09e73ab 100644
--- a/src/pulsecore/auth-cookie.c
+++ b/src/pulsecore/auth-cookie.c
@@ -69,7 +69,7 @@ pa_auth_cookie* pa_auth_cookie_get(pa_core *core, const char *cn, bool create, s
 
     pa_assert_se(pa_shared_set(core, t, c) >= 0);
 
-    if (pa_authkey_load_auto(cn, create, (uint8_t*) c + PA_ALIGN(sizeof(pa_auth_cookie)), size) < 0) {
+    if (pa_authkey_load(cn, create, (uint8_t*) c + PA_ALIGN(sizeof(pa_auth_cookie)), size) < 0) {
         pa_auth_cookie_unref(c);
         return NULL;
     }
diff --git a/src/pulsecore/authkey.c b/src/pulsecore/authkey.c
index 03c0c4b..7f91f16 100644
--- a/src/pulsecore/authkey.c
+++ b/src/pulsecore/authkey.c
@@ -42,7 +42,7 @@
 
 #include "authkey.h"
 
-/* Generate a new authorization key, store it in file fd and return it in *data  */
+/* Generate a new authentication key, store it in file fd and return it in *data  */
 static int generate(int fd, void *ret_data, size_t length) {
     ssize_t r;
 
@@ -70,7 +70,7 @@ static int generate(int fd, void *ret_data, size_t length) {
 #define O_BINARY 0
 #endif
 
-/* Load an authorization cookie from file fn and store it in data. If
+/* Load an authentication cookie from file fn and store it in data. If
  * the cookie file doesn't exist, create it */
 static int load(const char *fn, bool create, void *data, size_t length) {
     int fd = -1;
@@ -131,48 +131,20 @@ finish:
     return ret;
 }
 
-/* Load a cookie from a cookie file. If the file doesn't exist, create it. */
-int pa_authkey_load(const char *path, bool create, void *data, size_t length) {
-    int ret;
-
-    pa_assert(path);
-    pa_assert(data);
-    pa_assert(length > 0);
-
-    if ((ret = load(path, create, data, length)) < 0)
-        pa_log_warn("Failed to load authorization key '%s': %s", path, (ret < 0) ? pa_cstrerror(errno) : "File corrupt");
-
-    return ret;
-}
-
 /* If the specified file path starts with / return it, otherwise
- * return path prepended with home directory */
-static char *normalize_path(const char *fn) {
-
+ * return path prepended with the config home directory. */
+static int normalize_path(const char *fn, char **_r) {
     pa_assert(fn);
+    pa_assert(_r);
 
-#ifndef OS_IS_WIN32
-    if (fn[0] != '/') {
-#else
-    if (strlen(fn) < 3 || !IsCharAlpha(fn[0]) || fn[1] != ':' || fn[2] != '\\') {
-#endif
-        char *homedir, *s;
-
-        if (!(homedir = pa_get_home_dir_malloc()))
-            return NULL;
-
-        s = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", homedir, fn);
-        pa_xfree(homedir);
-
-        return s;
-    }
+    if (!pa_is_path_absolute(fn))
+        return pa_append_to_config_home_dir(fn, _r);
 
-    return pa_xstrdup(fn);
+    *_r = pa_xstrdup(fn);
+    return 0;
 }
 
-/* Load a cookie from a file in the home directory. If the specified
- * path starts with /, use it as absolute path instead. */
-int pa_authkey_load_auto(const char *fn, bool create, void *data, size_t length) {
+int pa_authkey_load(const char *fn, bool create, void *data, size_t length) {
     char *p;
     int ret;
 
@@ -180,10 +152,12 @@ int pa_authkey_load_auto(const char *fn, bool create, void *data, size_t length)
     pa_assert(data);
     pa_assert(length > 0);
 
-    if (!(p = normalize_path(fn)))
-        return -2;
+    if ((ret = normalize_path(fn, &p)) < 0)
+        return ret;
+
+    if ((ret = load(p, create, data, length)) < 0)
+        pa_log_warn("Failed to load authentication key '%s': %s", p, (ret < 0) ? pa_cstrerror(errno) : "File corrupt");
 
-    ret = pa_authkey_load(p, create, data, length);
     pa_xfree(p);
 
     return ret;
@@ -192,7 +166,7 @@ int pa_authkey_load_auto(const char *fn, bool create, void *data, size_t length)
 /* Store the specified cookie in the specified cookie file */
 int pa_authkey_save(const char *fn, const void *data, size_t length) {
     int fd = -1;
-    int unlock = 0, ret = -1;
+    int unlock = 0, ret;
     ssize_t r;
     char *p;
 
@@ -200,11 +174,12 @@ int pa_authkey_save(const char *fn, const void *data, size_t length) {
     pa_assert(data);
     pa_assert(length > 0);
 
-    if (!(p = normalize_path(fn)))
-        return -2;
+    if ((ret = normalize_path(fn, &p)) < 0)
+        return ret;
 
     if ((fd = pa_open_cloexec(p, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
         pa_log_warn("Failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
+        ret = -1;
         goto finish;
     }
 
@@ -212,11 +187,10 @@ int pa_authkey_save(const char *fn, const void *data, size_t length) {
 
     if ((r = pa_loop_write(fd, data, length, NULL)) < 0 || (size_t) r != length) {
         pa_log("Failed to read cookie file '%s': %s", fn, pa_cstrerror(errno));
+        ret = -1;
         goto finish;
     }
 
-    ret = 0;
-
 finish:
 
     if (fd >= 0) {
diff --git a/src/pulsecore/authkey.h b/src/pulsecore/authkey.h
index df62d0c..cadf89d 100644
--- a/src/pulsecore/authkey.h
+++ b/src/pulsecore/authkey.h
@@ -24,8 +24,7 @@
 
 #include <sys/types.h>
 
-int pa_authkey_load(const char *path, bool create, void *data, size_t len);
-int pa_authkey_load_auto(const char *fn, bool create, void *data, size_t length);
+int pa_authkey_load(const char *fn, bool create, void *data, size_t length);
 
 int pa_authkey_save(const char *path, const void *data, size_t length);
 
diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
index 9a29aeb..eca1e60 100644
--- a/src/pulsecore/card.c
+++ b/src/pulsecore/card.c
@@ -201,7 +201,7 @@ pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) {
     c->userdata = NULL;
     c->set_profile = NULL;
 
-    pa_device_init_description(c->proplist);
+    pa_device_init_description(c->proplist, c);
     pa_device_init_icon(c->proplist, true);
     pa_device_init_intended_roles(c->proplist);
 
diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c
index c7db0a6..2992ae8 100644
--- a/src/pulsecore/cli-text.c
+++ b/src/pulsecore/cli-text.c
@@ -536,7 +536,7 @@ char *pa_source_output_list_to_string(pa_core *c) {
             state_table[pa_source_output_get_state(o)],
             o->source->index, o->source->name,
             volume_str,
-            pa_yes_no(pa_source_output_get_mute(o)),
+            pa_yes_no(o->muted),
             (double) pa_source_output_get_latency(o, NULL) / PA_USEC_PER_MSEC,
             clt,
             pa_sample_spec_snprint(ss, sizeof(ss), &o->sample_spec),
@@ -634,7 +634,7 @@ char *pa_sink_input_list_to_string(pa_core *c) {
             state_table[pa_sink_input_get_state(i)],
             i->sink->index, i->sink->name,
             volume_str,
-            pa_yes_no(pa_sink_input_get_mute(i)),
+            pa_yes_no(i->muted),
             (double) pa_sink_input_get_latency(i, NULL) / PA_USEC_PER_MSEC,
             clt,
             pa_sample_spec_snprint(ss, sizeof(ss), &i->sample_spec),
diff --git a/src/pulsecore/conf-parser.c b/src/pulsecore/conf-parser.c
index 200252b..1683d46 100644
--- a/src/pulsecore/conf-parser.c
+++ b/src/pulsecore/conf-parser.c
@@ -175,6 +175,7 @@ int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, pa_p
         pa_log_warn("Failed to open configuration file '%s': %s", filename, pa_cstrerror(errno));
         goto finish;
     }
+    pa_log_debug("Parsing configuration file '%s'", filename);
 
     state.filename = filename;
     state.item_table = t;
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 0d9e354..e9843ef 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -336,37 +336,23 @@ again:
         uid = getuid();
     if (gid == (gid_t) -1)
         gid = getgid();
-    if (fchown(fd, uid, gid) < 0) {
+    if (((st.st_uid != uid) || (st.st_gid != gid)) && fchown(fd, uid, gid) < 0) {
         pa_assert_se(pa_close(fd) >= 0);
         goto fail;
     }
 #endif
 
 #ifdef HAVE_FCHMOD
-    (void) fchmod(fd, m);
+    if (fchmod(fd, m) < 0) {
+        pa_assert_se(pa_close(fd) >= 0);
+        goto fail;
+    };
 #endif
 
     pa_assert_se(pa_close(fd) >= 0);
 }
-#endif
-
-#ifdef HAVE_LSTAT
-    if (lstat(dir, &st) < 0)
-#else
-    if (stat(dir, &st) < 0)
-#endif
-        goto fail;
-
-#ifndef OS_IS_WIN32
-    if (!S_ISDIR(st.st_mode) ||
-        (st.st_uid != uid) ||
-        (st.st_gid != gid) ||
-        ((st.st_mode & 0777) != m)) {
-        errno = EACCES;
-        goto fail;
-    }
 #else
-    pa_log_warn("Secure directory creation not supported on Win32.");
+    pa_log_warn("Secure directory creation not supported on this platform.");
 #endif
 
     return 0;
@@ -1563,16 +1549,6 @@ int pa_unlock_lockfile(const char *fn, int fd) {
     return r;
 }
 
-static char *get_config_home(char *home) {
-    char *t;
-
-    t = getenv("XDG_CONFIG_HOME");
-    if (t)
-        return pa_xstrdup(t);
-
-    return pa_sprintf_malloc("%s" PA_PATH_SEP ".config", home);
-}
-
 static int check_ours(const char *p) {
     struct stat st;
 
@@ -1590,7 +1566,7 @@ static int check_ours(const char *p) {
 }
 
 static char *get_pulse_home(void) {
-    char *h, *ret, *config_home;
+    char *h, *ret;
     int t;
 
     h = pa_get_home_dir_malloc();
@@ -1608,17 +1584,14 @@ static char *get_pulse_home(void) {
 
     /* If the old directory exists, use it. */
     ret = pa_sprintf_malloc("%s" PA_PATH_SEP ".pulse", h);
-    if (access(ret, F_OK) >= 0) {
-        free(h);
+    pa_xfree(h);
+    if (access(ret, F_OK) >= 0)
         return ret;
-    }
     free(ret);
 
     /* Otherwise go for the XDG compliant directory. */
-    config_home = get_config_home(h);
-    free(h);
-    ret = pa_sprintf_malloc("%s" PA_PATH_SEP "pulse", config_home);
-    free(config_home);
+    if (pa_get_config_home_dir(&ret) < 0)
+        return NULL;
 
     return ret;
 }
@@ -1667,6 +1640,60 @@ char *pa_get_home_dir_malloc(void) {
     return homedir;
 }
 
+int pa_append_to_home_dir(const char *path, char **_r) {
+    char *home_dir;
+
+    pa_assert(path);
+    pa_assert(_r);
+
+    home_dir = pa_get_home_dir_malloc();
+    if (!home_dir) {
+        pa_log("Failed to get home directory.");
+        return -PA_ERR_NOENTITY;
+    }
+
+    *_r = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", home_dir, path);
+    pa_xfree(home_dir);
+    return 0;
+}
+
+int pa_get_config_home_dir(char **_r) {
+    const char *e;
+    char *home_dir;
+
+    pa_assert(_r);
+
+    e = getenv("XDG_CONFIG_HOME");
+    if (e && *e) {
+        *_r = pa_sprintf_malloc("%s" PA_PATH_SEP "pulse", e);
+        return 0;
+    }
+
+    home_dir = pa_get_home_dir_malloc();
+    if (!home_dir)
+        return -PA_ERR_NOENTITY;
+
+    *_r = pa_sprintf_malloc("%s" PA_PATH_SEP ".config" PA_PATH_SEP "pulse", home_dir);
+    pa_xfree(home_dir);
+    return 0;
+}
+
+int pa_append_to_config_home_dir(const char *path, char **_r) {
+    int r;
+    char *config_home_dir;
+
+    pa_assert(path);
+    pa_assert(_r);
+
+    r = pa_get_config_home_dir(&config_home_dir);
+    if (r < 0)
+        return r;
+
+    *_r = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", config_home_dir, path);
+    pa_xfree(config_home_dir);
+    return 0;
+}
+
 char *pa_get_binary_name_malloc(void) {
     char *t;
     size_t allocated = 128;
@@ -1789,6 +1816,14 @@ char *pa_get_runtime_dir(void) {
     /* Use the XDG standard for the runtime directory. */
     d = getenv("XDG_RUNTIME_DIR");
     if (d) {
+        struct stat st;
+        if (stat(d, &st) == 0 && st.st_uid != getuid()) {
+            pa_log(_("XDG_RUNTIME_DIR (%s) is not owned by us (uid %d), but by uid %d! "
+                   "(This could e g happen if you try to connect to a non-root PulseAudio as a root user, over the native protocol. Don't do that.)"),
+                   d, getuid(), st.st_uid);
+            goto fail;
+        }
+
         k = pa_sprintf_malloc("%s" PA_PATH_SEP "pulse", d);
 
         if (pa_make_secure_dir(k, m, (uid_t) -1, (gid_t) -1, true) < 0) {
@@ -2824,6 +2859,18 @@ void pa_set_env(const char *key, const char *value) {
 #endif
 }
 
+void pa_unset_env(const char *key) {
+    pa_assert(key);
+
+    /* This is not thread-safe */
+
+#ifdef OS_IS_WIN32
+    SetEnvironmentVariable(key, NULL);
+#else
+    unsetenv(key);
+#endif
+}
+
 void pa_set_env_and_record(const char *key, const char *value) {
     pa_assert(key);
     pa_assert(value);
@@ -2846,11 +2893,7 @@ void pa_unset_env_recorded(void) {
         if (!s)
             break;
 
-#ifdef OS_IS_WIN32
-        SetEnvironmentVariable(s, NULL);
-#else
-        unsetenv(s);
-#endif
+        pa_unset_env(s);
         pa_xfree(s);
     }
 }
@@ -3315,8 +3358,11 @@ int pa_open_cloexec(const char *fn, int flags, mode_t mode) {
         return fd;
 #endif
 
-    if ((fd = open(fn, flags, mode)) < 0)
-        return fd;
+    if ((fd = open(fn, flags, mode)) >= 0)
+        goto finish;
+
+    /* return error */
+    return fd;
 
 finish:
     /* Some implementations might simply ignore O_CLOEXEC if it is not
@@ -3337,8 +3383,11 @@ int pa_socket_cloexec(int domain, int type, int protocol) {
         return fd;
 #endif
 
-    if ((fd = socket(domain, type, protocol)) < 0)
-        return fd;
+    if ((fd = socket(domain, type, protocol)) >= 0)
+        goto finish;
+
+    /* return error */
+    return fd;
 
 finish:
     /* Some implementations might simply ignore SOCK_CLOEXEC if it is
@@ -3360,8 +3409,11 @@ int pa_pipe_cloexec(int pipefd[2]) {
 
 #endif
 
-    if ((r = pipe(pipefd)) < 0)
-        return r;
+    if ((r = pipe(pipefd)) >= 0)
+        goto finish;
+
+    /* return error */
+    return r;
 
 finish:
     pa_make_fd_cloexec(pipefd[0]);
@@ -3382,8 +3434,11 @@ int pa_accept_cloexec(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
 
 #endif
 
-    if ((fd = accept(sockfd, addr, addrlen)) < 0)
-        return fd;
+    if ((fd = accept(sockfd, addr, addrlen)) >= 0)
+        goto finish;
+
+    /* return error */
+    return fd;
 
 finish:
     pa_make_fd_cloexec(fd);
diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index e6cb261..8db56c5 100644
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -35,6 +35,8 @@
 
 #include <pulse/gccmacro.h>
 #include <pulse/volume.h>
+
+#include <pulsecore/i18n.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/socket.h>
 
@@ -90,7 +92,7 @@ int pa_parse_boolean(const char *s) PA_GCC_PURE;
 int pa_parse_volume(const char *s, pa_volume_t *volume);
 
 static inline const char *pa_yes_no(bool b) {
-    return b ? "yes" : "no";
+    return b ? _("yes") : _("no");
 }
 
 static inline const char *pa_strnull(const char *x) {
@@ -136,6 +138,9 @@ char* pa_find_config_file(const char *global, const char *local, const char *env
 char *pa_get_runtime_dir(void);
 char *pa_get_state_dir(void);
 char *pa_get_home_dir_malloc(void);
+int pa_append_to_home_dir(const char *path, char **_r);
+int pa_get_config_home_dir(char **_r);
+int pa_append_to_config_home_dir(const char *path, char **_r);
 char *pa_get_binary_name_malloc(void);
 char *pa_runtime_path(const char *fn);
 char *pa_state_path(const char *fn, bool prepend_machine_id);
@@ -205,6 +210,7 @@ int pa_reset_sigs(int except, ...);
 int pa_reset_sigsv(const int except[]);
 
 void pa_set_env(const char *key, const char *value);
+void pa_unset_env(const char *key);
 void pa_set_env_and_record(const char *key, const char *value);
 void pa_unset_env_recorded(void);
 
diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index e6f2dfc..e461963 100644
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -72,7 +72,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, size_t shm_size) {
 
     if (shared) {
         if (!(pool = pa_mempool_new(shared, shm_size))) {
-            pa_log_warn("failed to allocate shared memory pool. Falling back to a normal memory pool.");
+            pa_log_warn("Failed to allocate shared memory pool. Falling back to a normal memory pool.");
             shared = false;
         }
     }
@@ -127,6 +127,11 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, size_t shm_size) {
     c->mempool = pool;
     pa_silence_cache_init(&c->silence_cache);
 
+    if (shared && !(c->rw_mempool = pa_mempool_new(shared, shm_size)))
+        pa_log_warn("Failed to allocate shared writable memory pool.");
+    if (c->rw_mempool)
+        pa_mempool_set_is_remote_writable(c->rw_mempool, true);
+
     c->exit_event = NULL;
 
     c->exit_idle_time = -1;
@@ -208,6 +213,8 @@ static void core_free(pa_object *o) {
     pa_assert(!c->default_sink);
 
     pa_silence_cache_done(&c->silence_cache);
+    if (c->rw_mempool)
+        pa_mempool_free(c->rw_mempool);
     pa_mempool_free(c->mempool);
 
     for (j = 0; j < PA_CORE_HOOK_MAX; j++)
@@ -254,7 +261,6 @@ void pa_core_maybe_vacuum(pa_core *c) {
 
     if (pa_idxset_isempty(c->sink_inputs) && pa_idxset_isempty(c->source_outputs)) {
         pa_log_debug("Hmm, no streams around, trying to vacuum.");
-        pa_mempool_vacuum(c->mempool);
     } else {
         pa_sink *si;
         pa_source *so;
@@ -271,8 +277,12 @@ void pa_core_maybe_vacuum(pa_core *c) {
                 return;
 
         pa_log_info("All sinks and sources are suspended, vacuuming memory");
-        pa_mempool_vacuum(c->mempool);
     }
+
+    pa_mempool_vacuum(c->mempool);
+
+    if (c->rw_mempool)
+        pa_mempool_vacuum(c->rw_mempool);
 }
 
 pa_time_event* pa_core_rttime_new(pa_core *c, pa_usec_t usec, pa_time_event_cb_t cb, void *userdata) {
diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
index f268e42..1f9df73 100644
--- a/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@ -76,6 +76,8 @@ typedef enum pa_core_hook {
     PA_CORE_HOOK_SINK_PROPLIST_CHANGED,
     PA_CORE_HOOK_SINK_PORT_CHANGED,
     PA_CORE_HOOK_SINK_FLAGS_CHANGED,
+    PA_CORE_HOOK_SINK_VOLUME_CHANGED,
+    PA_CORE_HOOK_SINK_MUTE_CHANGED,
     PA_CORE_HOOK_SOURCE_NEW,
     PA_CORE_HOOK_SOURCE_FIXATE,
     PA_CORE_HOOK_SOURCE_PUT,
@@ -85,6 +87,8 @@ typedef enum pa_core_hook {
     PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED,
     PA_CORE_HOOK_SOURCE_PORT_CHANGED,
     PA_CORE_HOOK_SOURCE_FLAGS_CHANGED,
+    PA_CORE_HOOK_SOURCE_VOLUME_CHANGED,
+    PA_CORE_HOOK_SOURCE_MUTE_CHANGED,
     PA_CORE_HOOK_SINK_INPUT_NEW,
     PA_CORE_HOOK_SINK_INPUT_FIXATE,
     PA_CORE_HOOK_SINK_INPUT_PUT,
@@ -95,6 +99,8 @@ typedef enum pa_core_hook {
     PA_CORE_HOOK_SINK_INPUT_MOVE_FAIL,
     PA_CORE_HOOK_SINK_INPUT_STATE_CHANGED,
     PA_CORE_HOOK_SINK_INPUT_PROPLIST_CHANGED,
+    PA_CORE_HOOK_SINK_INPUT_VOLUME_CHANGED,
+    PA_CORE_HOOK_SINK_INPUT_MUTE_CHANGED,
     PA_CORE_HOOK_SINK_INPUT_SEND_EVENT,
     PA_CORE_HOOK_SOURCE_OUTPUT_NEW,
     PA_CORE_HOOK_SOURCE_OUTPUT_FIXATE,
@@ -106,6 +112,8 @@ typedef enum pa_core_hook {
     PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_FAIL,
     PA_CORE_HOOK_SOURCE_OUTPUT_STATE_CHANGED,
     PA_CORE_HOOK_SOURCE_OUTPUT_PROPLIST_CHANGED,
+    PA_CORE_HOOK_SOURCE_OUTPUT_VOLUME_CHANGED,
+    PA_CORE_HOOK_SOURCE_OUTPUT_MUTE_CHANGED,
     PA_CORE_HOOK_SOURCE_OUTPUT_SEND_EVENT,
     PA_CORE_HOOK_CLIENT_NEW,
     PA_CORE_HOOK_CLIENT_PUT,
@@ -162,7 +170,10 @@ struct pa_core {
     PA_LLIST_HEAD(pa_subscription_event, subscription_event_queue);
     pa_subscription_event *subscription_event_last;
 
-    pa_mempool *mempool;
+    /* The mempool is used for data we write to, it's readonly for the client.
+       The rw_mempool is used for data writable by both server and client (and
+       can be NULL in some cases). */
+    pa_mempool *mempool, *rw_mempool;
     pa_silence_cache silence_cache;
 
     pa_time_event *exit_event;
diff --git a/src/pulsecore/cpu-arm.c b/src/pulsecore/cpu-arm.c
index cce3b91..ad09c87 100644
--- a/src/pulsecore/cpu-arm.c
+++ b/src/pulsecore/cpu-arm.c
@@ -80,10 +80,9 @@ static char *get_cpuinfo(void) {
 #endif /* defined (__arm__) && defined (__linux__) */
 
 void pa_cpu_get_arm_flags(pa_cpu_arm_flag_t *flags) {
-#if defined (__arm__)
-#if defined (__linux__)
+#if defined (__arm__) && defined (__linux__)
     char *cpuinfo, *line;
-    int arch;
+    int arch, part;
 
     /* We need to read the CPU flags from /proc/cpuinfo because there is no user
      * space support to get the CPU features. This only works on linux AFAIK. */
@@ -104,6 +103,7 @@ void pa_cpu_get_arm_flags(pa_cpu_arm_flag_t *flags) {
 
         pa_xfree(line);
     }
+
     /* get the CPU features */
     if ((line = get_cpuinfo_line(cpuinfo, "Features"))) {
         const char *state = NULL;
@@ -122,16 +122,24 @@ void pa_cpu_get_arm_flags(pa_cpu_arm_flag_t *flags) {
             pa_xfree(current);
         }
     }
+
+    /* get the CPU part number */
+    if ((line = get_cpuinfo_line(cpuinfo, "CPU part"))) {
+        part = strtoul(line, NULL, 0);
+        if (part == 0xc08)
+            *flags |= PA_CPU_ARM_CORTEX_A8;
+        pa_xfree(line);
+    }
     pa_xfree(cpuinfo);
 
-    pa_log_info("CPU flags: %s%s%s%s%s%s",
+    pa_log_info("CPU flags: %s%s%s%s%s%s%s",
           (*flags & PA_CPU_ARM_V6) ? "V6 " : "",
           (*flags & PA_CPU_ARM_V7) ? "V7 " : "",
           (*flags & PA_CPU_ARM_VFP) ? "VFP " : "",
           (*flags & PA_CPU_ARM_EDSP) ? "EDSP " : "",
           (*flags & PA_CPU_ARM_NEON) ? "NEON " : "",
-          (*flags & PA_CPU_ARM_VFPV3) ? "VFPV3 " : "");
-#endif
+          (*flags & PA_CPU_ARM_VFPV3) ? "VFPV3 " : "",
+          (*flags & PA_CPU_ARM_CORTEX_A8) ? "Cortex-A8 " : "");
 #endif
 }
 
@@ -142,10 +150,12 @@ bool pa_cpu_init_arm(pa_cpu_arm_flag_t *flags) {
 
     if (*flags & PA_CPU_ARM_V6)
         pa_volume_func_init_arm(*flags);
+
 #ifdef HAVE_NEON
     if (*flags & PA_CPU_ARM_NEON) {
         pa_convert_func_init_neon(*flags);
         pa_mix_func_init_neon(*flags);
+        pa_remap_func_init_neon(*flags);
     }
 #endif
 
diff --git a/src/pulsecore/cpu-arm.h b/src/pulsecore/cpu-arm.h
index 5bc7d3b..4ee7dff 100644
--- a/src/pulsecore/cpu-arm.h
+++ b/src/pulsecore/cpu-arm.h
@@ -36,7 +36,8 @@ typedef enum pa_cpu_arm_flag {
     PA_CPU_ARM_VFP      = (1 << 2),
     PA_CPU_ARM_EDSP     = (1 << 3),
     PA_CPU_ARM_NEON     = (1 << 4),
-    PA_CPU_ARM_VFPV3    = (1 << 5)
+    PA_CPU_ARM_VFPV3    = (1 << 5),
+    PA_CPU_ARM_CORTEX_A8 = (1 << 6),
 } pa_cpu_arm_flag_t;
 
 void pa_cpu_get_arm_flags(pa_cpu_arm_flag_t *flags);
@@ -48,6 +49,7 @@ void pa_volume_func_init_arm(pa_cpu_arm_flag_t flags);
 #ifdef HAVE_NEON
 void pa_convert_func_init_neon(pa_cpu_arm_flag_t flags);
 void pa_mix_func_init_neon(pa_cpu_arm_flag_t flags);
+void pa_remap_func_init_neon(pa_cpu_arm_flag_t flags);
 #endif
 
 #endif /* foocpuarmhfoo */
diff --git a/src/pulsecore/cpu.c b/src/pulsecore/cpu.c
new file mode 100644
index 0000000..e0c110e
--- /dev/null
+++ b/src/pulsecore/cpu.c
@@ -0,0 +1,38 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2014 Peter Meerwald <pmeerw at pmeerw.net>
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "cpu.h"
+#include "cpu-orc.h"
+
+void pa_cpu_init(pa_cpu_info *cpu_info) {
+    cpu_info->cpu_type = PA_CPU_UNDEFINED;
+    /* don't force generic code, used for testing only */
+    cpu_info->force_generic_code = false;
+    if (!getenv("PULSE_NO_SIMD")) {
+        if (pa_cpu_init_x86(&cpu_info->flags.x86))
+            cpu_info->cpu_type = PA_CPU_X86;
+        else if (pa_cpu_init_arm(&cpu_info->flags.arm))
+            cpu_info->cpu_type = PA_CPU_ARM;
+        pa_cpu_init_orc(*cpu_info);
+    }
+
+    pa_remap_func_init(cpu_info);
+    pa_mix_func_init(cpu_info);
+}
diff --git a/src/pulsecore/cpu.h b/src/pulsecore/cpu.h
index 7fe6f0b..03507de 100644
--- a/src/pulsecore/cpu.h
+++ b/src/pulsecore/cpu.h
@@ -40,6 +40,12 @@ struct pa_cpu_info {
         pa_cpu_x86_flag_t x86;
         pa_cpu_arm_flag_t arm;
     } flags;
+    bool force_generic_code;
 };
 
+void pa_cpu_init(pa_cpu_info *cpu_info);
+
+void pa_remap_func_init(const pa_cpu_info *cpu_info);
+void pa_mix_func_init(const pa_cpu_info *cpu_info);
+
 #endif /* foocpuhfoo */
diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h
index aa1d560..43f6166 100644
--- a/src/pulsecore/creds.h
+++ b/src/pulsecore/creds.h
@@ -29,8 +29,12 @@
 #endif
 
 #include <pulsecore/socket.h>
+#include <stdbool.h>
+
+#define MAX_ANCIL_DATA_FDS 2
 
 typedef struct pa_creds pa_creds;
+typedef struct pa_cmsg_ancil_data pa_cmsg_ancil_data;
 
 #if defined(SCM_CREDENTIALS)
 
@@ -41,6 +45,15 @@ struct pa_creds {
     uid_t uid;
 };
 
+/* Struct for handling ancillary data, i e, extra data that can be sent together with a message
+ * over unix pipes. Supports sending and receiving credentials and file descriptors. */
+struct pa_cmsg_ancil_data {
+    pa_creds creds;
+    bool creds_valid;
+    int nfd;
+    int fds[MAX_ANCIL_DATA_FDS];
+};
+
 #else
 #undef HAVE_CREDS
 #endif
diff --git a/src/pulsecore/database-simple.c b/src/pulsecore/database-simple.c
index 562c9ab..155a5fa 100644
--- a/src/pulsecore/database-simple.c
+++ b/src/pulsecore/database-simple.c
@@ -322,18 +322,11 @@ int pa_database_set(pa_database *database, const pa_datum *key, const pa_datum*
 
 int pa_database_unset(pa_database *database, const pa_datum *key) {
     simple_data *db = (simple_data*)database;
-    entry *e;
 
     pa_assert(db);
     pa_assert(key);
 
-    e = pa_hashmap_remove(db->map, key);
-    if (!e)
-        return -1;
-
-    free_entry(e);
-
-    return 0;
+    return pa_hashmap_remove_and_free(db->map, key);
 }
 
 int pa_database_clear(pa_database *database) {
diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c
index 0b65d5c..8cfb117 100644
--- a/src/pulsecore/device-port.c
+++ b/src/pulsecore/device-port.c
@@ -176,3 +176,30 @@ void pa_device_port_set_latency_offset(pa_device_port *p, int64_t offset) {
     pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, p->card->index);
     pa_hook_fire(&core->hooks[PA_CORE_HOOK_PORT_LATENCY_OFFSET_CHANGED], p);
 }
+
+pa_device_port *pa_device_port_find_best(pa_hashmap *ports)
+{
+    void *state;
+    pa_device_port *p, *best = NULL;
+
+    if (!ports)
+        return NULL;
+
+    /* First run: skip unavailable ports */
+    PA_HASHMAP_FOREACH(p, ports, state) {
+        if (p->available == PA_AVAILABLE_NO)
+            continue;
+
+        if (!best || p->priority > best->priority)
+            best = p;
+    }
+
+    /* Second run: if only unavailable ports exist, still suggest a port */
+    if (!best) {
+        PA_HASHMAP_FOREACH(p, ports, state)
+            if (!best || p->priority > best->priority)
+                best = p;
+    }
+
+    return best;
+}
diff --git a/src/pulsecore/device-port.h b/src/pulsecore/device-port.h
index b10d554..ef700ac 100644
--- a/src/pulsecore/device-port.h
+++ b/src/pulsecore/device-port.h
@@ -83,4 +83,6 @@ void pa_device_port_set_available(pa_device_port *p, pa_available_t available);
 
 void pa_device_port_set_latency_offset(pa_device_port *p, int64_t offset);
 
+pa_device_port *pa_device_port_find_best(pa_hashmap *ports);
+
 #endif
diff --git a/src/pulsecore/endianmacros.h b/src/pulsecore/endianmacros.h
index 2b18cf8..2e73136 100644
--- a/src/pulsecore/endianmacros.h
+++ b/src/pulsecore/endianmacros.h
@@ -71,25 +71,32 @@ static inline void PA_WRITE24LE(uint8_t *p, uint32_t u) {
     p[0] = (uint8_t) u;
 }
 
-static inline float PA_FLOAT32_SWAP(float x) {
+static inline float PA_READ_FLOAT32RE(const void *p) {
     union {
         float f;
         uint32_t u;
     } t;
 
-    t.f = x;
-    t.u = PA_UINT32_SWAP(t.u);
+    t.u = PA_UINT32_SWAP(*(uint32_t *) p);
     return t.f;
 }
 
-#define PA_MAYBE_INT16_SWAP(c,x) ((c) ? PA_INT32_SWAP(x) : (x))
-#define PA_MAYBE_UINT16_SWAP(c,x) ((c) ? PA_UINT32_SWAP(x) : (x))
+static inline void PA_WRITE_FLOAT32RE(void *p, float x) {
+    union {
+        float f;
+        uint32_t u;
+    } t;
+
+    t.f = x;
+    *(uint32_t *) p = PA_UINT32_SWAP(t.u);
+}
+
+#define PA_MAYBE_INT16_SWAP(c,x) ((c) ? PA_INT16_SWAP(x) : (x))
+#define PA_MAYBE_UINT16_SWAP(c,x) ((c) ? PA_UINT16_SWAP(x) : (x))
 
 #define PA_MAYBE_INT32_SWAP(c,x) ((c) ? PA_INT32_SWAP(x) : (x))
 #define PA_MAYBE_UINT32_SWAP(c,x) ((c) ? PA_UINT32_SWAP(x) : (x))
 
-#define PA_MAYBE_FLOAT32_SWAP(c,x) ((c) ? PA_FLOAT32_SWAP(x) : (x))
-
 #ifdef WORDS_BIGENDIAN
  #define PA_INT16_FROM_LE(x) PA_INT16_SWAP(x)
  #define PA_INT16_FROM_BE(x) ((int16_t)(x))
@@ -115,9 +122,6 @@ static inline float PA_FLOAT32_SWAP(float x) {
  #define PA_UINT32_TO_LE(x) PA_UINT32_SWAP(x)
  #define PA_UINT32_TO_BE(x) ((uint32_t)(x))
 
- #define PA_FLOAT32_TO_LE(x) PA_FLOAT32_SWAP(x)
- #define PA_FLOAT32_TO_BE(x) ((float) (x))
-
  #define PA_READ24NE(x) PA_READ24BE(x)
  #define PA_WRITE24NE(x,y) PA_WRITE24BE((x),(y))
 
@@ -148,9 +152,6 @@ static inline float PA_FLOAT32_SWAP(float x) {
  #define PA_UINT32_TO_LE(x) ((uint32_t)(x))
  #define PA_UINT32_TO_BE(x) PA_UINT32_SWAP(x)
 
- #define PA_FLOAT32_TO_LE(x) ((float) (x))
- #define PA_FLOAT32_TO_BE(x) PA_FLOAT32_SWAP(x)
-
  #define PA_READ24NE(x) PA_READ24LE(x)
  #define PA_WRITE24NE(x,y) PA_WRITE24LE((x),(y))
 
diff --git a/src/pulsecore/esound.h b/src/pulsecore/esound.h
index 5d6ec95..5fc91db 100644
--- a/src/pulsecore/esound.h
+++ b/src/pulsecore/esound.h
@@ -33,7 +33,7 @@
 /* maximum size we can write().  Otherwise we might overflow */
 #define ESD_MAX_WRITE_SIZE (21 * 4096)
 
-/* length of the authorization key, octets */
+/* length of the authentication key, octets */
 #define ESD_KEY_LEN (16)
 
 /* default port for the EsounD server */
diff --git a/src/pulsecore/fdsem.c b/src/pulsecore/fdsem.c
index ec32461..b153ddd 100644
--- a/src/pulsecore/fdsem.c
+++ b/src/pulsecore/fdsem.c
@@ -100,11 +100,10 @@ pa_fdsem *pa_fdsem_open_shm(pa_fdsem_data *data, int event_fd) {
     return f;
 }
 
-pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data, int* event_fd) {
+pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data) {
     pa_fdsem *f = NULL;
 
     pa_assert(data);
-    pa_assert(event_fd);
 
 #ifdef HAVE_SYS_EVENTFD_H
 
diff --git a/src/pulsecore/fdsem.h b/src/pulsecore/fdsem.h
index a434ac3..1b1a5a5 100644
--- a/src/pulsecore/fdsem.h
+++ b/src/pulsecore/fdsem.h
@@ -28,6 +28,8 @@
  * the best case all functions are lock-free unless sleeping is
  * required.  */
 
+#include <pulsecore/atomic.h>
+
 typedef struct pa_fdsem pa_fdsem;
 
 typedef struct pa_fdsem_data {
@@ -38,7 +40,7 @@ typedef struct pa_fdsem_data {
 
 pa_fdsem *pa_fdsem_new(void);
 pa_fdsem *pa_fdsem_open_shm(pa_fdsem_data *data, int event_fd);
-pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data, int* event_fd);
+pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data);
 void pa_fdsem_free(pa_fdsem *f);
 
 void pa_fdsem_post(pa_fdsem *f);
diff --git a/src/pulsecore/hashmap.c b/src/pulsecore/hashmap.c
index acac1e0..2cc03cb 100644
--- a/src/pulsecore/hashmap.c
+++ b/src/pulsecore/hashmap.c
@@ -207,6 +207,19 @@ void* pa_hashmap_remove(pa_hashmap *h, const void *key) {
     return data;
 }
 
+int pa_hashmap_remove_and_free(pa_hashmap *h, const void *key) {
+    void *data;
+
+    pa_assert(h);
+
+    data = pa_hashmap_remove(h, key);
+
+    if (data && h->value_free_func)
+        h->value_free_func(data);
+
+    return data ? 0 : -1;
+}
+
 void pa_hashmap_remove_all(pa_hashmap *h) {
     pa_assert(h);
 
diff --git a/src/pulsecore/hashmap.h b/src/pulsecore/hashmap.h
index e42732a..8042f7b 100644
--- a/src/pulsecore/hashmap.h
+++ b/src/pulsecore/hashmap.h
@@ -52,6 +52,13 @@ void* pa_hashmap_get(pa_hashmap *h, const void *key);
 /* Returns the data of the entry while removing */
 void* pa_hashmap_remove(pa_hashmap *h, const void *key);
 
+/* Removes the entry and frees the entry data. Returns a negative value if the
+ * entry is not found. FIXME: This function shouldn't be needed.
+ * pa_hashmap_remove() should free the entry data, and the current semantics of
+ * pa_hashmap_remove() should be implemented by a function called
+ * pa_hashmap_steal(). */
+int pa_hashmap_remove_and_free(pa_hashmap *h, const void *key);
+
 /* Remove all entries but don't free the hashmap */
 void pa_hashmap_remove_all(pa_hashmap *h);
 
diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c
index dce6734..93cd0fd 100644
--- a/src/pulsecore/iochannel.c
+++ b/src/pulsecore/iochannel.c
@@ -348,27 +348,73 @@ ssize_t pa_iochannel_write_with_creds(pa_iochannel*io, const void*data, size_t l
     return r;
 }
 
-ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, pa_creds *creds, bool *creds_valid) {
+ssize_t pa_iochannel_write_with_fds(pa_iochannel*io, const void*data, size_t l, int nfd, const int *fds) {
     ssize_t r;
+    int *msgdata;
     struct msghdr mh;
     struct iovec iov;
     union {
         struct cmsghdr hdr;
-        uint8_t data[CMSG_SPACE(sizeof(struct ucred))];
+        uint8_t data[CMSG_SPACE(sizeof(int) * MAX_ANCIL_DATA_FDS)];
     } cmsg;
 
     pa_assert(io);
     pa_assert(data);
     pa_assert(l);
-    pa_assert(io->ifd >= 0);
-    pa_assert(creds);
-    pa_assert(creds_valid);
+    pa_assert(io->ofd >= 0);
+    pa_assert(fds);
+    pa_assert(nfd > 0);
+    pa_assert(nfd <= MAX_ANCIL_DATA_FDS);
 
     pa_zero(iov);
-    iov.iov_base = data;
+    iov.iov_base = (void*) data;
     iov.iov_len = l;
 
     pa_zero(cmsg);
+    cmsg.hdr.cmsg_level = SOL_SOCKET;
+    cmsg.hdr.cmsg_type = SCM_RIGHTS;
+
+    msgdata = (int*) CMSG_DATA(&cmsg.hdr);
+    memcpy(msgdata, fds, nfd * sizeof(int));
+    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int) * nfd);
+
+    pa_zero(mh);
+    mh.msg_iov = &iov;
+    mh.msg_iovlen = 1;
+    mh.msg_control = &cmsg;
+    mh.msg_controllen = sizeof(cmsg);
+
+    if ((r = sendmsg(io->ofd, &mh, MSG_NOSIGNAL)) >= 0) {
+        io->writable = io->hungup = false;
+        enable_events(io);
+    }
+    return r;
+}
+
+ssize_t pa_iochannel_read_with_ancil_data(pa_iochannel*io, void*data, size_t l, pa_cmsg_ancil_data *ancil_data) {
+    ssize_t r;
+    struct msghdr mh;
+    struct iovec iov;
+    union {
+        struct cmsghdr hdr;
+        uint8_t data[CMSG_SPACE(sizeof(struct ucred)) + CMSG_SPACE(sizeof(int) * MAX_ANCIL_DATA_FDS)];
+    } cmsg;
+
+    pa_assert(io);
+    pa_assert(data);
+    pa_assert(l);
+    pa_assert(io->ifd >= 0);
+    pa_assert(ancil_data);
+
+    if (io->ifd_type > 0) {
+        ancil_data->creds_valid = false;
+        ancil_data->nfd = 0;
+        return pa_iochannel_read(io, data, l);
+    }
+
+    iov.iov_base = data;
+    iov.iov_len = l;
+
     pa_zero(mh);
     mh.msg_iov = &iov;
     mh.msg_iovlen = 1;
@@ -378,19 +424,34 @@ ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, pa_cr
     if ((r = recvmsg(io->ifd, &mh, 0)) >= 0) {
         struct cmsghdr *cmh;
 
-        *creds_valid = false;
+        ancil_data->creds_valid = false;
+        ancil_data->nfd = 0;
 
         for (cmh = CMSG_FIRSTHDR(&mh); cmh; cmh = CMSG_NXTHDR(&mh, cmh)) {
 
-            if (cmh->cmsg_level == SOL_SOCKET && cmh->cmsg_type == SCM_CREDENTIALS) {
+            if (cmh->cmsg_level != SOL_SOCKET)
+                continue;
+
+            if (cmh->cmsg_type == SCM_CREDENTIALS) {
                 struct ucred u;
                 pa_assert(cmh->cmsg_len == CMSG_LEN(sizeof(struct ucred)));
                 memcpy(&u, CMSG_DATA(cmh), sizeof(struct ucred));
 
-                creds->gid = u.gid;
-                creds->uid = u.uid;
-                *creds_valid = true;
-                break;
+                ancil_data->creds.gid = u.gid;
+                ancil_data->creds.uid = u.uid;
+                ancil_data->creds_valid = true;
+            }
+            else if (cmh->cmsg_type == SCM_RIGHTS) {
+                int nfd = (cmh->cmsg_len - CMSG_LEN(0)) / sizeof(int);
+                if (nfd > MAX_ANCIL_DATA_FDS) {
+                    int i;
+                    pa_log("Trying to receive too many file descriptors!");
+                    for (i = 0; i < nfd; i++)
+                        pa_close(((int*) CMSG_DATA(cmh))[i]);
+                    continue;
+                }
+                memcpy(ancil_data->fds, CMSG_DATA(cmh), nfd * sizeof(int));
+                ancil_data->nfd = nfd;
             }
         }
 
@@ -398,6 +459,11 @@ ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, pa_cr
         enable_events(io);
     }
 
+    if (r == -1 && errno == ENOTSOCK) {
+        io->ifd_type = 1;
+        return pa_iochannel_read_with_ancil_data(io, data, l, ancil_data);
+    }
+
     return r;
 }
 
@@ -413,7 +479,7 @@ void pa_iochannel_set_callback(pa_iochannel*io, pa_iochannel_cb_t _callback, voi
 void pa_iochannel_set_noclose(pa_iochannel*io, bool b) {
     pa_assert(io);
 
-    io->no_close = !!b;
+    io->no_close = b;
 }
 
 void pa_iochannel_socket_peer_to_string(pa_iochannel*io, char*s, size_t l) {
diff --git a/src/pulsecore/iochannel.h b/src/pulsecore/iochannel.h
index e95f46f..959ee88 100644
--- a/src/pulsecore/iochannel.h
+++ b/src/pulsecore/iochannel.h
@@ -57,8 +57,9 @@ ssize_t pa_iochannel_read(pa_iochannel*io, void*data, size_t l);
 bool pa_iochannel_creds_supported(pa_iochannel *io);
 int pa_iochannel_creds_enable(pa_iochannel *io);
 
+ssize_t pa_iochannel_write_with_fds(pa_iochannel*io, const void*data, size_t l, int nfd, const int *fds);
 ssize_t pa_iochannel_write_with_creds(pa_iochannel*io, const void*data, size_t l, const pa_creds *ucred);
-ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, pa_creds *ucred, bool *creds_valid);
+ssize_t pa_iochannel_read_with_ancil_data(pa_iochannel*io, void*data, size_t l, pa_cmsg_ancil_data *ancil_data);
 #endif
 
 bool pa_iochannel_is_readable(pa_iochannel*io);
diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c
index cf96dce..9e29c78 100644
--- a/src/pulsecore/log.c
+++ b/src/pulsecore/log.c
@@ -40,7 +40,7 @@
 #include <syslog.h>
 #endif
 
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
 #include <systemd/sd-journal.h>
 #endif
 
@@ -96,7 +96,7 @@ static const int level_to_syslog[] = {
 
 /* These are actually equivalent to the syslog ones
  * but we don't want to depend on syslog.h */
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
 static const int level_to_journal[] = {
     [PA_LOG_ERROR]  = 3,
     [PA_LOG_WARN]   = 4,
@@ -145,7 +145,7 @@ int pa_log_set_target(pa_log_target *t) {
     switch (t->type) {
         case PA_LOG_STDERR:
         case PA_LOG_SYSLOG:
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
         case PA_LOG_JOURNAL:
 #endif
         case PA_LOG_NULL:
@@ -488,7 +488,7 @@ void pa_log_levelv_meta(
                 break;
 #endif
 
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
             case PA_LOG_JOURNAL:
                 if (sd_journal_send("MESSAGE=%s", t,
                                 "PRIORITY=%i", level_to_journal[level],
@@ -619,7 +619,7 @@ pa_log_target *pa_log_parse_target(const char *string) {
         t = pa_log_target_new(PA_LOG_STDERR, NULL);
     else if (pa_streq(string, "syslog"))
         t = pa_log_target_new(PA_LOG_SYSLOG, NULL);
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
     else if (pa_streq(string, "journal"))
         t = pa_log_target_new(PA_LOG_JOURNAL, NULL);
 #endif
@@ -647,7 +647,7 @@ char *pa_log_target_to_string(const pa_log_target *t) {
         case PA_LOG_SYSLOG:
             string = pa_xstrdup("syslog");
             break;
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
         case PA_LOG_JOURNAL:
             string = pa_xstrdup("journal");
             break;
diff --git a/src/pulsecore/log.h b/src/pulsecore/log.h
index 5e9611d..65abed9 100644
--- a/src/pulsecore/log.h
+++ b/src/pulsecore/log.h
@@ -35,7 +35,7 @@
 typedef enum pa_log_target_type {
     PA_LOG_STDERR,      /* default */
     PA_LOG_SYSLOG,
-#ifdef HAVE_JOURNAL
+#ifdef HAVE_SYSTEMD_JOURNAL
     PA_LOG_JOURNAL,     /* systemd journal */
 #endif
     PA_LOG_NULL,        /* to /dev/null */
@@ -48,7 +48,7 @@ typedef enum pa_log_level {
     PA_LOG_WARN   = 1,    /* Warning messages */
     PA_LOG_NOTICE = 2,    /* Notice messages */
     PA_LOG_INFO   = 3,    /* Info messages */
-    PA_LOG_DEBUG  = 4,    /* debug message */
+    PA_LOG_DEBUG  = 4,    /* Debug messages */
     PA_LOG_LEVEL_MAX
 } pa_log_level_t;
 
diff --git a/src/pulsecore/macro.h b/src/pulsecore/macro.h
index 4d5e80f..21c3e6c 100644
--- a/src/pulsecore/macro.h
+++ b/src/pulsecore/macro.h
@@ -77,6 +77,12 @@ static inline size_t PA_PAGE_ALIGN(size_t l) {
     return (l + PA_PAGE_SIZE - 1) & ~(PA_PAGE_SIZE - 1);
 }
 
+#if defined(__GNUC__)
+    #define PA_UNUSED __attribute__ ((unused))
+#else
+    #define PA_UNUSED
+#endif
+
 #define PA_ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
 
 #if defined(__GNUC__)
@@ -231,7 +237,7 @@ static inline size_t PA_PAGE_ALIGN(size_t l) {
 #endif
 
 #ifdef NDEBUG
-#define pa_assert_not_reached() pa_nop()
+#define pa_assert_not_reached() abort()
 #else
 #define pa_assert_not_reached()                                         \
     do {                                                                \
diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c
index 9cc02c1..f8b008f 100644
--- a/src/pulsecore/memblock.c
+++ b/src/pulsecore/memblock.c
@@ -83,6 +83,8 @@ struct pa_memblock {
         struct {
             /* If type == PA_MEMBLOCK_USER this points to a function for freeing this memory block */
             pa_free_cb_t free_cb;
+            /* If type == PA_MEMBLOCK_USER this is passed as free_cb argument */
+            void *free_cb_data;
         } user;
 
         struct {
@@ -97,6 +99,7 @@ struct pa_memimport_segment {
     pa_shm memory;
     pa_memtrap *trap;
     unsigned n_blocks;
+    bool writable;
 };
 
 /* A collection of multiple segments */
@@ -146,6 +149,7 @@ struct pa_mempool {
     pa_shm memory;
     size_t block_size;
     unsigned n_blocks;
+    bool is_remote_writable;
 
     pa_atomic_t n_init;
 
@@ -303,6 +307,19 @@ static struct mempool_slot* mempool_slot_by_ptr(pa_mempool *p, void *ptr) {
 }
 
 /* No lock necessary */
+bool pa_mempool_is_remote_writable(pa_mempool *p) {
+    pa_assert(p);
+    return p->is_remote_writable;
+}
+
+/* No lock necessary */
+void pa_mempool_set_is_remote_writable(pa_mempool *p, bool writable) {
+    pa_assert(p);
+    pa_assert(!writable || pa_mempool_is_shared(p));
+    p->is_remote_writable = writable;
+}
+
+/* No lock necessary */
 pa_memblock *pa_memblock_new_pool(pa_mempool *p, size_t length) {
     pa_memblock *b = NULL;
     struct mempool_slot *slot;
@@ -387,7 +404,13 @@ pa_memblock *pa_memblock_new_fixed(pa_mempool *p, void *d, size_t length, bool r
 }
 
 /* No lock necessary */
-pa_memblock *pa_memblock_new_user(pa_mempool *p, void *d, size_t length, pa_free_cb_t free_cb, bool read_only) {
+pa_memblock *pa_memblock_new_user(
+        pa_mempool *p,
+        void *d,
+        size_t length,
+        pa_free_cb_t free_cb,
+        void *free_cb_data,
+        bool read_only) {
     pa_memblock *b;
 
     pa_assert(p);
@@ -410,12 +433,21 @@ pa_memblock *pa_memblock_new_user(pa_mempool *p, void *d, size_t length, pa_free
     pa_atomic_store(&b->please_signal, 0);
 
     b->per_type.user.free_cb = free_cb;
+    b->per_type.user.free_cb_data = free_cb_data;
 
     stat_add(b);
     return b;
 }
 
 /* No lock necessary */
+bool pa_memblock_is_ours(pa_memblock *b) {
+    pa_assert(b);
+    pa_assert(PA_REFCNT_VALUE(b) > 0);
+
+    return b->type != PA_MEMBLOCK_IMPORTED;
+}
+
+/* No lock necessary */
 bool pa_memblock_is_read_only(pa_memblock *b) {
     pa_assert(b);
     pa_assert(PA_REFCNT_VALUE(b) > 0);
@@ -513,7 +545,7 @@ static void memblock_free(pa_memblock *b) {
     switch (b->type) {
         case PA_MEMBLOCK_USER :
             pa_assert(b->per_type.user.free_cb);
-            b->per_type.user.free_cb(pa_atomic_ptr_load(&b->data));
+            b->per_type.user.free_cb(b->per_type.user.free_cb_data);
 
             /* Fall through */
 
@@ -647,6 +679,7 @@ static void memblock_make_local(pa_memblock *b) {
     /* Humm, not enough space in the pool, so lets allocate the memory with malloc() */
     b->per_type.user.free_cb = pa_xfree;
     pa_atomic_ptr_store(&b->data, pa_xmemdup(pa_atomic_ptr_load(&b->data), b->length));
+    b->per_type.user.free_cb_data = pa_atomic_ptr_load(&b->data);
 
     b->type = PA_MEMBLOCK_USER;
     b->read_only = false;
@@ -877,7 +910,7 @@ int pa_mempool_get_shm_id(pa_mempool *p, uint32_t *id) {
 bool pa_mempool_is_shared(pa_mempool *p) {
     pa_assert(p);
 
-    return !!p->memory.shared;
+    return p->memory.shared;
 }
 
 /* For receiving blocks from other nodes */
@@ -905,7 +938,7 @@ pa_memimport* pa_memimport_new(pa_mempool *p, pa_memimport_release_cb_t cb, void
 static void memexport_revoke_blocks(pa_memexport *e, pa_memimport *i);
 
 /* Should be called locked */
-static pa_memimport_segment* segment_attach(pa_memimport *i, uint32_t shm_id) {
+static pa_memimport_segment* segment_attach(pa_memimport *i, uint32_t shm_id, bool writable) {
     pa_memimport_segment* seg;
 
     if (pa_hashmap_size(i->segments) >= PA_MEMIMPORT_SEGMENTS_MAX)
@@ -913,11 +946,12 @@ static pa_memimport_segment* segment_attach(pa_memimport *i, uint32_t shm_id) {
 
     seg = pa_xnew0(pa_memimport_segment, 1);
 
-    if (pa_shm_attach_ro(&seg->memory, shm_id) < 0) {
+    if (pa_shm_attach(&seg->memory, shm_id, writable) < 0) {
         pa_xfree(seg);
         return NULL;
     }
 
+    seg->writable = writable;
     seg->import = i;
     seg->trap = pa_memtrap_add(seg->memory.ptr, seg->memory.size);
 
@@ -973,7 +1007,8 @@ void pa_memimport_free(pa_memimport *i) {
 }
 
 /* Self-locked */
-pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t shm_id, size_t offset, size_t size) {
+pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t shm_id,
+                              size_t offset, size_t size, bool writable) {
     pa_memblock *b = NULL;
     pa_memimport_segment *seg;
 
@@ -990,9 +1025,14 @@ pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t shm_i
         goto finish;
 
     if (!(seg = pa_hashmap_get(i->segments, PA_UINT32_TO_PTR(shm_id))))
-        if (!(seg = segment_attach(i, shm_id)))
+        if (!(seg = segment_attach(i, shm_id, writable)))
             goto finish;
 
+    if (writable != seg->writable) {
+        pa_log("Cannot open segment - writable status changed!");
+        goto finish;
+    }
+
     if (offset+size > seg->memory.size)
         goto finish;
 
@@ -1002,7 +1042,7 @@ pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t shm_i
     PA_REFCNT_INIT(b);
     b->pool = i->pool;
     b->type = PA_MEMBLOCK_IMPORTED;
-    b->read_only = true;
+    b->read_only = !writable;
     b->is_silence = false;
     pa_atomic_ptr_store(&b->data, (uint8_t*) seg->memory.ptr + offset);
     b->length = size;
diff --git a/src/pulsecore/memblock.h b/src/pulsecore/memblock.h
index 502f207..9ce88ca 100644
--- a/src/pulsecore/memblock.h
+++ b/src/pulsecore/memblock.h
@@ -85,10 +85,10 @@ pa_memblock *pa_memblock_new(pa_mempool *, size_t length);
 pa_memblock *pa_memblock_new_pool(pa_mempool *, size_t length);
 
 /* Allocate a new memory block of type PA_MEMBLOCK_USER */
-pa_memblock *pa_memblock_new_user(pa_mempool *, void *data, size_t length, pa_free_cb_t free_cb, bool read_only);
+pa_memblock *pa_memblock_new_user(pa_mempool *, void *data, size_t length, pa_free_cb_t free_cb, void *free_cb_data, bool read_only);
 
 /* A special case of pa_memblock_new_user: take a memory buffer previously allocated with pa_xmalloc()  */
-#define pa_memblock_new_malloced(p,data,length) pa_memblock_new_user(p, data, length, pa_xfree, 0)
+#define pa_memblock_new_malloced(p,data,length) pa_memblock_new_user(p, data, length, pa_xfree, data, 0)
 
 /* Allocate a new memory block of type PA_MEMBLOCK_FIXED */
 pa_memblock *pa_memblock_new_fixed(pa_mempool *, void *data, size_t length, bool read_only);
@@ -104,6 +104,7 @@ function is not multiple caller safe, i.e. needs to be locked
 manually if called from more than one thread at the same time. */
 void pa_memblock_unref_fixed(pa_memblock*b);
 
+bool pa_memblock_is_ours(pa_memblock *b);
 bool pa_memblock_is_read_only(pa_memblock *b);
 bool pa_memblock_is_silence(pa_memblock *b);
 bool pa_memblock_ref_is_one(pa_memblock *b);
@@ -125,12 +126,15 @@ const pa_mempool_stat* pa_mempool_get_stat(pa_mempool *p);
 void pa_mempool_vacuum(pa_mempool *p);
 int pa_mempool_get_shm_id(pa_mempool *p, uint32_t *id);
 bool pa_mempool_is_shared(pa_mempool *p);
+bool pa_mempool_is_remote_writable(pa_mempool *p);
+void pa_mempool_set_is_remote_writable(pa_mempool *p, bool writable);
 size_t pa_mempool_block_size_max(pa_mempool *p);
 
 /* For receiving blocks from other nodes */
 pa_memimport* pa_memimport_new(pa_mempool *p, pa_memimport_release_cb_t cb, void *userdata);
 void pa_memimport_free(pa_memimport *i);
-pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t shm_id, size_t offset, size_t size);
+pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t shm_id,
+                              size_t offset, size_t size, bool writable);
 int pa_memimport_process_revoke(pa_memimport *i, uint32_t block_id);
 
 /* For sending blocks to other nodes */
diff --git a/src/pulsecore/memblockq.c b/src/pulsecore/memblockq.c
index 571107d..16a62da 100644
--- a/src/pulsecore/memblockq.c
+++ b/src/pulsecore/memblockq.c
@@ -287,7 +287,8 @@ int pa_memblockq_push(pa_memblockq* bq, const pa_memchunk *uchunk) {
     pa_assert(uchunk->length > 0);
     pa_assert(uchunk->index + uchunk->length <= pa_memblock_get_length(uchunk->memblock));
 
-    pa_assert_se(uchunk->length % bq->base == 0);
+    pa_assert(uchunk->length % bq->base == 0);
+    pa_assert(uchunk->index % bq->base == 0);
 
     if (!can_push(bq, uchunk->length))
         return -1;
diff --git a/src/pulsecore/memchunk.c b/src/pulsecore/memchunk.c
index 5f8545f..792b4c7 100644
--- a/src/pulsecore/memchunk.c
+++ b/src/pulsecore/memchunk.c
@@ -111,7 +111,7 @@ pa_memchunk* pa_memchunk_memcpy(pa_memchunk *dst, pa_memchunk *src) {
 }
 
 bool pa_memchunk_isset(pa_memchunk *chunk) {
-    assert(chunk);
+    pa_assert(chunk);
 
     return
         chunk->memblock ||
diff --git a/src/pulsecore/memtrap.c b/src/pulsecore/memtrap.c
index 87ea4fe..d04f278 100644
--- a/src/pulsecore/memtrap.c
+++ b/src/pulsecore/memtrap.c
@@ -237,5 +237,8 @@ void pa_memtrap_install(void) {
     sa.sa_flags = SA_RESTART|SA_SIGINFO;
 
     pa_assert_se(sigaction(SIGBUS, &sa, NULL) == 0);
+#ifdef __FreeBSD_kernel__
+    pa_assert_se(sigaction(SIGSEGV, &sa, NULL) == 0);
+#endif
 #endif
 }
diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c
index 4b789a6..c66a2ec 100644
--- a/src/pulsecore/mix.c
+++ b/src/pulsecore/mix.c
@@ -32,6 +32,7 @@
 #include <pulsecore/g711.h>
 #include <pulsecore/endianmacros.h>
 
+#include "cpu.h"
 #include "mix.h"
 
 #define VOLUME_PADDING 32
@@ -445,7 +446,7 @@ static void pa_mix_s24_32re_c(pa_mix_info streams[], unsigned nstreams, unsigned
                 v = (v * cv) >> 16;
                 sum += v;
             }
-            m->ptr = (uint8_t*) m->ptr + 3;
+            m->ptr = (uint8_t*) m->ptr + sizeof(int32_t);
         }
 
         sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
@@ -576,17 +577,14 @@ static void pa_mix_float32re_c(pa_mix_info streams[], unsigned nstreams, unsigne
 
         for (i = 0; i < nstreams; i++) {
             pa_mix_info *m = streams + i;
-            float v, cv = m->linear[channel].f;
+            float cv = m->linear[channel].f;
 
-            if (PA_LIKELY(cv > 0)) {
-                v = PA_FLOAT32_SWAP(*(float*) m->ptr);
-                v *= cv;
-                sum += v;
-            }
+            if (PA_LIKELY(cv > 0))
+                sum += PA_READ_FLOAT32RE(m->ptr) * cv;
             m->ptr = (uint8_t*) m->ptr + sizeof(float);
         }
 
-        *data = PA_FLOAT32_SWAP(sum);
+        PA_WRITE_FLOAT32RE(data, sum);
 
         if (PA_UNLIKELY(++channel >= channels))
             channel = 0;
@@ -609,6 +607,13 @@ static pa_do_mix_func_t do_mix_table[] = {
     [PA_SAMPLE_S24_32RE]  = (pa_do_mix_func_t) pa_mix_s24_32re_c
 };
 
+void pa_mix_func_init(const pa_cpu_info *cpu_info) {
+    if (cpu_info->force_generic_code)
+        do_mix_table[PA_SAMPLE_S16NE] = (pa_do_mix_func_t) pa_mix_generic_s16ne;
+    else
+        do_mix_table[PA_SAMPLE_S16NE] = (pa_do_mix_func_t) pa_mix_s16ne_c;
+}
+
 size_t pa_mix(
         pa_mix_info streams[],
         unsigned nstreams,
@@ -625,19 +630,19 @@ size_t pa_mix(
     pa_assert(data);
     pa_assert(length);
     pa_assert(spec);
+    pa_assert(nstreams > 1);
 
     if (!volume)
         volume = pa_cvolume_reset(&full_volume, spec->channels);
 
-    if (mute || pa_cvolume_is_muted(volume) || nstreams <= 0) {
+    if (mute || pa_cvolume_is_muted(volume)) {
         pa_silence_memory(data, length, spec);
         return length;
     }
 
     for (k = 0; k < nstreams; k++) {
+        pa_assert(length <= streams[k].chunk.length);
         streams[k].ptr = pa_memblock_acquire_chunk(&streams[k].chunk);
-        if (length > streams[k].chunk.length)
-            length = streams[k].chunk.length;
     }
 
     calc_stream_volumes_table[spec->format](streams, nstreams, volume, spec);
@@ -702,10 +707,10 @@ void pa_volume_memchunk(
     if (pa_memblock_is_silence(c->memblock))
         return;
 
-    if (pa_cvolume_channels_equal_to(volume, PA_VOLUME_NORM))
+    if (pa_cvolume_is_norm(volume))
         return;
 
-    if (pa_cvolume_channels_equal_to(volume, PA_VOLUME_MUTED)) {
+    if (pa_cvolume_is_muted(volume)) {
         pa_silence_memchunk(c, spec);
         return;
     }
diff --git a/src/pulsecore/mix_neon.c b/src/pulsecore/mix_neon.c
index ff05ccf..eb02d81 100644
--- a/src/pulsecore/mix_neon.c
+++ b/src/pulsecore/mix_neon.c
@@ -20,6 +20,7 @@
 
 #include <pulsecore/macro.h>
 #include <pulsecore/endianmacros.h>
+#include <pulsecore/sample-util.h>
 
 #include "cpu-arm.h"
 #include "mix.h"
@@ -79,8 +80,136 @@ static void pa_mix_ch2_s16ne_neon(pa_mix_info streams[], unsigned nstreams, uint
     fallback(streams, nstreams, 2, data, length & mask);
 }
 
+/* special case: mix 2 s16ne streams, 1 channel each */
+static void pa_mix2_ch1_s16ne_neon(pa_mix_info streams[], int16_t *data, unsigned length) {
+    const int16_t *ptr0 = streams[0].ptr;
+    const int16_t *ptr1 = streams[1].ptr;
+
+    int32x4_t sv0, sv1;
+    __asm__ __volatile__ (
+        "vdup.s32    %q[sv0], %[lin0]        \n\t"
+        "vdup.s32    %q[sv1], %[lin1]        \n\t"
+        : [sv0] "=w" (sv0), [sv1] "=w" (sv1)
+        : [lin0] "r" (streams[0].linear[0]), [lin1] "r" (streams[1].linear[0])
+        : /* clobber list */
+    );
+
+    length /= sizeof(int16_t);
+    for (; length >= 4; length -= 4) {
+        __asm__ __volatile__ (
+            "vld1.s16    d0, [%[ptr0]]!      \n\t"
+            "vld1.s16    d2, [%[ptr1]]!      \n\t"
+            "vshll.s16   q0, d0, #15         \n\t"
+            "vshll.s16   q1, d2, #15         \n\t"
+            "vqdmulh.s32 q0, q0, %q[sv0]     \n\t"
+            "vqdmulh.s32 q1, q1, %q[sv1]     \n\t"
+            "vqadd.s32   q0, q0, q1          \n\t"
+            "vqmovn.s32  d0, q0              \n\t"
+            "vst1.s16    d0, [%[data]]!      \n\t"
+            : [ptr0] "+r" (ptr0), [ptr1] "+r" (ptr1), [data] "+r" (data)
+            : [sv0] "w" (sv0), [sv1] "w" (sv1)
+            : "memory", "cc", "q0", "q1" /* clobber list */
+        );
+    }
+
+    for (; length > 0; length--) {
+        int32_t sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[0].i);
+        sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[0].i);
+        *data++ = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
+    }
+}
+
+/* special case: mix 2 s16ne streams, 2 channel each */
+static void pa_mix2_ch2_s16ne_neon(pa_mix_info streams[], int16_t *data, unsigned length) {
+    const int16_t *ptr0 = streams[0].ptr;
+    const int16_t *ptr1 = streams[1].ptr;
+
+    int32x4_t sv0, sv1;
+    __asm__ __volatile__ (
+        "vld1.s32 d0, [%[lin0]]              \n\t"
+        "vmov.s32 d1, d0                     \n\t"
+        "vmov.s32 %q[sv0], q0                \n\t"
+        "vld1.s32 d0, [%[lin1]]              \n\t"
+        "vmov.s32 d1, d0                     \n\t"
+        "vmov.s32 %q[sv1], q0                \n\t"
+        : [sv0] "=w" (sv0), [sv1] "=w" (sv1)
+        : [lin0] "r" (streams[0].linear), [lin1] "r" (streams[1].linear)
+        : "q0" /* clobber list */
+    );
+
+    length /= sizeof(int16_t);
+    for (; length >= 4; length -= 4) {
+        __asm__ __volatile__ (
+            "vld1.s16    d0, [%[ptr0]]!      \n\t"
+            "vld1.s16    d2, [%[ptr1]]!      \n\t"
+            "vshll.s16   q0, d0, #15         \n\t"
+            "vshll.s16   q1, d2, #15         \n\t"
+            "vqdmulh.s32 q0, q0, %q[sv0]     \n\t"
+            "vqdmulh.s32 q1, q1, %q[sv1]     \n\t"
+            "vqadd.s32   q0, q0, q1          \n\t"
+            "vqmovn.s32  d0, q0              \n\t"
+            "vst1.s16    d0, [%[data]]!      \n\t"
+            : [ptr0] "+r" (ptr0), [ptr1] "+r" (ptr1), [data] "+r" (data)
+            : [sv0] "w" (sv0), [sv1] "w" (sv1)
+            : "memory", "cc", "q0", "q1" /* clobber list */
+        );
+    }
+
+    if (length > 0) {
+        int32_t sum;
+
+        sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[0].i);
+        sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[0].i);
+        *data++ = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
+
+        sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[1].i);
+        sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[1].i);
+        *data++ = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
+    }
+}
+
+/* special case: mix 2 s16ne streams, 4 channels each */
+static void pa_mix2_ch4_s16ne_neon(pa_mix_info streams[], int16_t *data, unsigned length) {
+    const int16_t *ptr0 = streams[0].ptr;
+    const int16_t *ptr1 = streams[1].ptr;
+
+    int32x4_t sv0, sv1;
+
+    __asm__ __volatile__ (
+        "vld1.s32 %h[sv0], [%[lin0]]         \n\t"
+        "vld1.s32 %h[sv1], [%[lin1]]         \n\t"
+        : [sv0] "=w" (sv0), [sv1] "=w" (sv1)
+        : [lin0] "r" (streams[0].linear), [lin1] "r" (streams[1].linear)
+        : /* clobber list */
+    );
+
+    length /= sizeof(int16_t);
+    for (; length >= 4; length -= 4) {
+        __asm__ __volatile__ (
+            "vld1.s16    d0, [%[ptr0]]!      \n\t"
+            "vld1.s16    d2, [%[ptr1]]!      \n\t"
+            "vshll.s16   q0, d0, #15         \n\t"
+            "vshll.s16   q1, d2, #15         \n\t"
+            "vqdmulh.s32 q0, q0, %q[sv0]     \n\t"
+            "vqdmulh.s32 q1, q1, %q[sv1]     \n\t"
+            "vqadd.s32   q0, q0, q1          \n\t"
+            "vqmovn.s32  d0, q0              \n\t"
+            "vst1.s16    d0, [%[data]]!      \n\t"
+            : [ptr0] "+r" (ptr0), [ptr1] "+r" (ptr1), [data] "+r" (data)
+            : [sv0] "w" (sv0), [sv1] "w" (sv1)
+            : "memory", "cc", "q0", "q1" /* clobber list */
+        );
+    }
+}
+
 static void pa_mix_s16ne_neon(pa_mix_info streams[], unsigned nstreams, unsigned nchannels, void *data, unsigned length) {
-    if (nchannels == 2)
+    if (nstreams == 2 && nchannels == 2)
+        pa_mix2_ch2_s16ne_neon(streams, data, length);
+    else if (nstreams == 2 && nchannels == 4)
+        pa_mix2_ch4_s16ne_neon(streams, data, length);
+    else if (nstreams == 2 && nchannels == 1)
+        pa_mix2_ch1_s16ne_neon(streams, data, length);
+    else if (nchannels == 2)
         pa_mix_ch2_s16ne_neon(streams, nstreams, data, length);
     else
         fallback(streams, nstreams, nchannels, data, length);
diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c
index a9c4e10..01ba5e4 100644
--- a/src/pulsecore/modargs.c
+++ b/src/pulsecore/modargs.c
@@ -418,9 +418,6 @@ int pa_modargs_get_alternate_sample_rate(pa_modargs *ma, uint32_t *alternate_rat
         !pa_sample_rate_valid(*alternate_rate))
         return -1;
 
-    if (!((rate_local % 4000 == 0) || (rate_local % 11025 == 0)))
-        return -1;
-
     *alternate_rate = rate_local;
 
     return 0;
diff --git a/src/pulsecore/native-common.h b/src/pulsecore/native-common.h
index dad82e0..ca1b430 100644
--- a/src/pulsecore/native-common.h
+++ b/src/pulsecore/native-common.h
@@ -176,11 +176,16 @@ enum {
     /* Supported since protocol v27 (3.0) */
     PA_COMMAND_SET_PORT_LATENCY_OFFSET,
 
+    /* Supported since protocol v30 (6.0) */
+    /* BOTH DIRECTIONS */
+    PA_COMMAND_ENABLE_SRBCHANNEL,
+    PA_COMMAND_DISABLE_SRBCHANNEL,
+
     PA_COMMAND_MAX
 };
 
 #define PA_NATIVE_COOKIE_LENGTH 256
-#define PA_NATIVE_COOKIE_FILE ".config/pulse/cookie"
+#define PA_NATIVE_COOKIE_FILE "cookie"
 #define PA_NATIVE_COOKIE_FILE_FALLBACK ".pulse-cookie"
 
 #define PA_NATIVE_DEFAULT_PORT 4713
diff --git a/src/pulsecore/pdispatch.c b/src/pulsecore/pdispatch.c
index 4033240..53284ee 100644
--- a/src/pulsecore/pdispatch.c
+++ b/src/pulsecore/pdispatch.c
@@ -190,6 +190,13 @@ static const char *command_names[PA_COMMAND_MAX] = {
     [PA_COMMAND_SET_SOURCE_OUTPUT_VOLUME] = "SET_SOURCE_OUTPUT_VOLUME",
     [PA_COMMAND_SET_SOURCE_OUTPUT_MUTE] = "SET_SOURCE_OUTPUT_MUTE",
 
+    /* Supported since protocol v27 (3.0) */
+    [PA_COMMAND_SET_PORT_LATENCY_OFFSET] = "SET_PORT_LATENCY_OFFSET",
+
+    /* Supported since protocol v30 (6.0) */
+    /* BOTH DIRECTIONS */
+    [PA_COMMAND_ENABLE_SRBCHANNEL] = "ENABLE_SRBCHANNEL",
+    [PA_COMMAND_DISABLE_SRBCHANNEL] = "DISABLE_SRBCHANNEL",
 };
 
 #endif
@@ -214,7 +221,7 @@ struct pa_pdispatch {
     PA_LLIST_HEAD(struct reply_info, replies);
     pa_pdispatch_drain_cb_t drain_callback;
     void *drain_userdata;
-    const pa_creds *creds;
+    const pa_cmsg_ancil_data *ancil_data;
     bool use_rtclock;
 };
 
@@ -284,7 +291,7 @@ static void run_action(pa_pdispatch *pd, struct reply_info *r, uint32_t command,
     pa_pdispatch_unref(pd);
 }
 
-int pa_pdispatch_run(pa_pdispatch *pd, pa_packet*packet, const pa_creds *creds, void *userdata) {
+int pa_pdispatch_run(pa_pdispatch *pd, pa_packet *packet, const pa_cmsg_ancil_data *ancil_data, void *userdata) {
     uint32_t tag, command;
     pa_tagstruct *ts = NULL;
     int ret = -1;
@@ -318,7 +325,7 @@ int pa_pdispatch_run(pa_pdispatch *pd, pa_packet*packet, const pa_creds *creds,
 }
 #endif
 
-    pd->creds = creds;
+    pd->ancil_data = ancil_data;
 
     if (command == PA_COMMAND_ERROR || command == PA_COMMAND_REPLY) {
         struct reply_info *r;
@@ -342,7 +349,7 @@ int pa_pdispatch_run(pa_pdispatch *pd, pa_packet*packet, const pa_creds *creds,
     ret = 0;
 
 finish:
-    pd->creds = NULL;
+    pd->ancil_data = NULL;
 
     if (ts)
         pa_tagstruct_free(ts);
@@ -431,9 +438,29 @@ pa_pdispatch* pa_pdispatch_ref(pa_pdispatch *pd) {
     return pd;
 }
 
+#ifdef HAVE_CREDS
+
 const pa_creds * pa_pdispatch_creds(pa_pdispatch *pd) {
     pa_assert(pd);
     pa_assert(PA_REFCNT_VALUE(pd) >= 1);
 
-    return pd->creds;
+    if (pd->ancil_data && pd->ancil_data->creds_valid)
+         return &pd->ancil_data->creds;
+    return NULL;
 }
+
+const int * pa_pdispatch_fds(pa_pdispatch *pd, int *nfd) {
+    pa_assert(pd);
+    pa_assert(PA_REFCNT_VALUE(pd) >= 1);
+    pa_assert(nfd);
+
+    if (pd->ancil_data) {
+         *nfd = pd->ancil_data->nfd;
+         return pd->ancil_data->fds;
+    }
+
+    *nfd = 0;
+    return NULL;
+}
+
+#endif
diff --git a/src/pulsecore/pdispatch.h b/src/pulsecore/pdispatch.h
index 797ddca..df2e2fd 100644
--- a/src/pulsecore/pdispatch.h
+++ b/src/pulsecore/pdispatch.h
@@ -41,7 +41,7 @@ pa_pdispatch* pa_pdispatch_new(pa_mainloop_api *m, bool use_rtclock, const pa_pd
 void pa_pdispatch_unref(pa_pdispatch *pd);
 pa_pdispatch* pa_pdispatch_ref(pa_pdispatch *pd);
 
-int pa_pdispatch_run(pa_pdispatch *pd, pa_packet*p, const pa_creds *creds, void *userdata);
+int pa_pdispatch_run(pa_pdispatch *pd, pa_packet *p, const pa_cmsg_ancil_data *ancil_data, void *userdata);
 
 void pa_pdispatch_register_reply(pa_pdispatch *pd, uint32_t tag, int timeout, pa_pdispatch_cb_t callback, void *userdata, pa_free_cb_t free_cb);
 
@@ -54,4 +54,6 @@ void pa_pdispatch_unregister_reply(pa_pdispatch *pd, void *userdata);
 
 const pa_creds * pa_pdispatch_creds(pa_pdispatch *pd);
 
+const int * pa_pdispatch_fds(pa_pdispatch *pd, int *nfd);
+
 #endif
diff --git a/src/pulsecore/pid.c b/src/pulsecore/pid.c
index e347884..c70b989 100644
--- a/src/pulsecore/pid.c
+++ b/src/pulsecore/pid.c
@@ -174,7 +174,7 @@ static int proc_name_ours(pid_t pid, const char *procname) {
         }
 /*#endif*/
 
-        return !!good;
+        return good;
     }
 #else
 
diff --git a/src/pulsecore/pipe.c b/src/pulsecore/pipe.c
index f873ef6..6ca1626 100644
--- a/src/pulsecore/pipe.c
+++ b/src/pulsecore/pipe.c
@@ -41,7 +41,7 @@ static int set_block(int fd, int blocking) {
 
     int v;
 
-    assert(fd >= 0);
+    pa_assert(fd >= 0);
 
     if ((v = fcntl(fd, F_GETFL)) < 0)
         return -1;
@@ -149,7 +149,7 @@ error:
         if (filedes[0] >= 0)
                 pa_close(filedes[0]);
         if (filedes[1] >= 0)
-                pa_close(filedes[0]);
+                pa_close(filedes[1]);
 
         return -1;
 }
diff --git a/src/pulsecore/poll-win32.c b/src/pulsecore/poll-win32.c
index 4a70171..c927e53 100644
--- a/src/pulsecore/poll-win32.c
+++ b/src/pulsecore/poll-win32.c
@@ -46,6 +46,7 @@ typedef unsigned long nfds_t;
 # include <io.h>
 # include <stdio.h>
 # include <conio.h>
+# include <signal.h>
 # if 0
 # include "msvc-nothrow.h"
 # endif
@@ -350,8 +351,9 @@ int
 pa_poll (struct pollfd *pfd, nfds_t nfd, int timeout)
 {
   struct timeval tv;
-  struct timeval *ptv;
+
 #ifndef WINDOWS_NATIVE
+  struct timeval *ptv;
   fd_set rfds, wfds, efds;
   int maxfd, rc;
   nfds_t i;
@@ -376,17 +378,6 @@ pa_poll (struct pollfd *pfd, nfds_t nfd, int timeout)
     }
 #  endif /* OPEN_MAX -- else, no check is needed */
 # endif /* !_SC_OPEN_MAX */
-#else /* WINDOWS_NATIVE*/
-  static HANDLE hEvent;
-  WSANETWORKEVENTS ev;
-  HANDLE h, handle_array[FD_SETSIZE + 2];
-  DWORD ret, wait_timeout, nhandles;
-  fd_set rfds, wfds, xfds;
-  BOOL poll_again;
-  MSG msg;
-  int rc = 0;
-  nfds_t i;
-#endif
 
   /* EFAULT is not necessary to implement, but let's do it in the
      simplest case. */
@@ -418,7 +409,6 @@ pa_poll (struct pollfd *pfd, nfds_t nfd, int timeout)
       return -1;
     }
 
-#ifndef WINDOWS_NATIVE
   /* create fd sets and determine max fd */
   maxfd = -1;
   FD_ZERO (&rfds);
@@ -475,10 +465,18 @@ pa_poll (struct pollfd *pfd, nfds_t nfd, int timeout)
       }
 
   return rc;
-#else
+#else /* WINDOWS_NATIVE*/
+  HANDLE hEvent;
+  WSANETWORKEVENTS ev;
+  HANDLE h, handle_array[FD_SETSIZE + 2];
+  DWORD ret, wait_timeout, nhandles;
+  fd_set rfds, wfds, xfds;
+  BOOL poll_again;
+  MSG msg;
+  int rc = 0;
+  nfds_t i;
 
-  if (!hEvent)
-    hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+  hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
 
 restart:
   handle_array[0] = hEvent;
@@ -535,19 +533,16 @@ restart:
             handle_array[nhandles++] = h;
           if (pfd[i].revents)
             timeout = 0;
-          else
-            {
-              if (!ptv)
-                ptv = &tv;
-              /* tune down to 0.25s. But don't touch smaller timeouts */
-              if (ptv->tv_usec > 250*1000 || ptv->tv_sec > 0)
-                ptv->tv_usec = 250*1000;
-              ptv->tv_sec = 0;
-            }
         }
     }
 
-  if (select (0, &rfds, &wfds, &xfds, ptv) > 0)
+  /* We poll current status using select(). It cannot be used to check
+     anything but sockets, so we still have to wait in
+     MsgWaitForMultipleObjects(). But that in turn cannot check existing
+     state, so we can't remove this select(). */
+  /* FIXME: MSDN states that we cannot give empty fd_set:s. */
+  tv.tv_sec = tv.tv_usec = 0;
+  if (select (0, &rfds, &wfds, &xfds, &tv) > 0)
     {
       /* Do MsgWaitForMultipleObjects anyway to dispatch messages, but
          no need to call select again.  */
@@ -574,8 +569,13 @@ restart:
           BOOL bRet;
           while ((bRet = PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) != 0)
             {
-              TranslateMessage (&msg);
-              DispatchMessage (&msg);
+              if (msg.message == WM_QUIT)
+                  raise(SIGTERM);
+              else
+                {
+                  TranslateMessage (&msg);
+                  DispatchMessage (&msg);
+                }
             }
         }
       else
@@ -583,7 +583,7 @@ restart:
     }
 
   if (poll_again)
-    select (0, &rfds, &wfds, &xfds, ptv);
+    select (0, &rfds, &wfds, &xfds, &tv);
 
   /* Place a sentinel at the end of the array.  */
   handle_array[nhandles] = NULL;
@@ -639,6 +639,8 @@ restart:
       goto restart;
     }
 
+  CloseHandle(hEvent);
+
   return rc;
 #endif
 }
diff --git a/src/pulsecore/protocol-dbus.c b/src/pulsecore/protocol-dbus.c
index c0d1ec4..cf4b9fc 100644
--- a/src/pulsecore/protocol-dbus.c
+++ b/src/pulsecore/protocol-dbus.c
@@ -993,8 +993,7 @@ void pa_dbus_protocol_add_signal_listener(
 
         /* Replace the old signal paths entry for this signal with a new
          * one. */
-        if ((signal_paths_entry = pa_hashmap_remove(conn_entry->listening_signals, signal_name)))
-            signal_paths_entry_free(signal_paths_entry);
+        pa_hashmap_remove_and_free(conn_entry->listening_signals, signal_name);
         signal_paths_entry = signal_paths_entry_new(signal_name);
 
         for (i = 0; i < n_objects; ++i)
diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
index 7c1b7a2..a4e0028 100644
--- a/src/pulsecore/protocol-esound.c
+++ b/src/pulsecore/protocol-esound.c
@@ -351,7 +351,7 @@ static int esd_proto_connect(connection *c, esd_proto_t request, const void *dat
     }
 
     if (!c->authorized) {
-        pa_log("Kicked client with invalid authorization key.");
+        pa_log("Kicked client with invalid authentication key.");
         return -1;
     }
 
@@ -1707,15 +1707,20 @@ int pa_esound_options_parse(pa_esound_options *o, pa_core *c, pa_modargs *ma) {
         pa_auth_cookie_unref(o->auth_cookie);
 
     if (enabled) {
-        const char *cn;
+        char *cn;
 
         /* The new name for this is 'auth-cookie', for compat reasons
          * we check the old name too */
-        if (!(cn = pa_modargs_get_value(ma, "auth-cookie", NULL)))
-            if (!(cn = pa_modargs_get_value(ma, "cookie", NULL)))
-                cn = DEFAULT_COOKIE_FILE;
+        if (!(cn = pa_xstrdup(pa_modargs_get_value(ma, "auth-cookie", NULL)))) {
+            if (!(cn = pa_xstrdup(pa_modargs_get_value(ma, "cookie", NULL)))) {
+                if (pa_append_to_home_dir(DEFAULT_COOKIE_FILE, &cn) < 0)
+                    return -1;
+            }
+        }
 
-        if (!(o->auth_cookie = pa_auth_cookie_get(c, cn, true, ESD_KEY_LEN)))
+        o->auth_cookie = pa_auth_cookie_get(c, cn, true, ESD_KEY_LEN);
+        pa_xfree(cn);
+        if (!o->auth_cookie)
             return -1;
 
     } else
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 41b4b50..c0cd0e0 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -181,6 +181,7 @@ struct pa_native_connection {
     uint32_t rrobin_index;
     pa_subscription *subscription;
     pa_time_event *auth_timeout_event;
+    pa_srbchannel *srbpending;
 };
 
 #define PA_NATIVE_CONNECTION(o) (pa_native_connection_cast(o))
@@ -294,6 +295,7 @@ static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag,
 static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_enable_srbchannel(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 
 static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
     [PA_COMMAND_ERROR] = NULL,
@@ -397,6 +399,8 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
 
     [PA_COMMAND_SET_PORT_LATENCY_OFFSET] = command_set_port_latency_offset,
 
+    [PA_COMMAND_ENABLE_SRBCHANNEL] = command_enable_srbchannel,
+
     [PA_COMMAND_EXTENSION] = command_extension
 };
 
@@ -555,8 +559,11 @@ static void fix_record_buffer_attr_pre(record_stream *s) {
     if (s->early_requests) {
 
         /* In early request mode we need to emulate the classic
-         * fragment-based playback model. We do this setting the source
-         * latency to the fragment size. */
+         * fragment-based playback model. Unfortunately we have no
+         * mechanism to tell the source how often we want it to send us
+         * data. The next best thing we can do is to set the source's
+         * total buffer (i.e. its latency) to the fragment size. That
+         * way it will have to send data at least that often. */
 
         source_usec = fragsize_usec;
 
@@ -584,10 +591,12 @@ static void fix_record_buffer_attr_pre(record_stream *s) {
 
     if (s->early_requests) {
 
-        /* Ok, we didn't necessarily get what we were asking for, so
-         * let's tell the user */
+        /* Ok, we didn't necessarily get what we were asking for. We
+         * might still get the proper fragment interval, we just can't
+         * guarantee it. */
 
-        fragsize_usec = s->configured_source_latency;
+        if (fragsize_usec != s->configured_source_latency)
+            pa_log_debug("Could not configure a sufficiently low latency. Early requests might not be satisifed.");
 
     } else if (s->adjust_latency) {
 
@@ -963,8 +972,11 @@ static void fix_playback_buffer_attr(playback_stream *s) {
     if (s->early_requests) {
 
         /* In early request mode we need to emulate the classic
-         * fragment-based playback model. We do this setting the sink
-         * latency to the fragment size. */
+         * fragment-based playback model. Unfortunately we have no
+         * mechanism to tell the sink how often we want to be queried
+         * for data. The next best thing we can do is to set the sink's
+         * total buffer (i.e. its latency) to the fragment size. That
+         * way it will have to query us at least that often. */
 
         sink_usec = minreq_usec;
         pa_log_debug("Early requests mode enabled, configuring sink latency to minreq.");
@@ -1013,10 +1025,12 @@ static void fix_playback_buffer_attr(playback_stream *s) {
 
     if (s->early_requests) {
 
-        /* Ok, we didn't necessarily get what we were asking for, so
-         * let's tell the user */
+        /* Ok, we didn't necessarily get what we were asking for. We
+         * might still get the proper fragment interval, we just can't
+         * guarantee it. */
 
-        minreq_usec = s->configured_sink_latency;
+        if (minreq_usec != s->configured_sink_latency)
+            pa_log_debug("Could not configure a sufficiently low latency. Early requests might not be satisifed.");
 
     } else if (s->adjust_latency) {
 
@@ -1317,6 +1331,9 @@ static void native_connection_unlink(pa_native_connection *c) {
     if (c->options)
         pa_native_options_unref(c->options);
 
+    if (c->srbpending)
+        pa_srbchannel_free(c->srbpending);
+
     while ((r = pa_idxset_first(c->record_streams, NULL)))
         record_stream_unlink(r);
 
@@ -2568,6 +2585,69 @@ static void command_exit(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
     pa_pstream_send_simple_ack(c->pstream, tag); /* nonsense */
 }
 
+static void setup_srbchannel(pa_native_connection *c) {
+    pa_srbchannel_template srbt;
+    pa_srbchannel *srb;
+    pa_memchunk mc;
+    pa_tagstruct *t;
+    int fdlist[2];
+
+    if (!c->options->srbchannel) {
+        pa_log_debug("Disabling srbchannel, reason: Disabled by module parameter");
+        return;
+    }
+
+    if (c->version < 30) {
+        pa_log_debug("Disabling srbchannel, reason: Protocol too old");
+        return;
+    }
+
+    if (!pa_pstream_get_shm(c->pstream)) {
+        pa_log_debug("Disabling srbchannel, reason: No SHM support");
+        return;
+    }
+
+    if (!c->protocol->core->rw_mempool) {
+        pa_log_debug("Disabling srbchannel, reason: No rw memory pool");
+        return;
+    }
+
+    srb = pa_srbchannel_new(c->protocol->core->mainloop, c->protocol->core->rw_mempool);
+    if (!srb) {
+        pa_log_debug("Failed to create srbchannel");
+        return;
+    }
+    pa_log_debug("Enabling srbchannel...");
+    pa_srbchannel_export(srb, &srbt);
+
+    /* Send enable command to client */
+    t = pa_tagstruct_new(NULL, 0);
+    pa_tagstruct_putu32(t, PA_COMMAND_ENABLE_SRBCHANNEL);
+    pa_tagstruct_putu32(t, (size_t) srb); /* tag */
+    fdlist[0] = srbt.readfd;
+    fdlist[1] = srbt.writefd;
+    pa_pstream_send_tagstruct_with_fds(c->pstream, t, 2, fdlist);
+
+    /* Send ringbuffer memblock to client */
+    mc.memblock = srbt.memblock;
+    mc.index = 0;
+    mc.length = pa_memblock_get_length(srbt.memblock);
+    pa_pstream_send_memblock(c->pstream, 0, 0, 0, &mc);
+
+    c->srbpending = srb;
+}
+
+static void command_enable_srbchannel(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
+    pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
+
+    if (tag != (uint32_t) (size_t) c->srbpending)
+        protocol_error(c);
+
+    pa_log_debug("Client enabled srbchannel.");
+    pa_pstream_set_srbchannel(c->pstream, c->srbpending);
+    c->srbpending = NULL;
+}
+
 static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
     const void*cookie;
@@ -2644,7 +2724,7 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
         }
 
         if (!success) {
-            pa_log_warn("Denied access to client with invalid authorization data.");
+            pa_log_warn("Denied access to client with invalid authentication data.");
             pa_pstream_send_error(c->pstream, tag, PA_ERR_ACCESS);
             return;
         }
@@ -2699,6 +2779,8 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
 #else
     pa_pstream_send_tagstruct(c->pstream, reply);
 #endif
+
+    setup_srbchannel(c);
 }
 
 static void command_set_client_name(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
@@ -3366,7 +3448,7 @@ static void sink_input_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t,
     pa_tagstruct_puts(t, pa_resample_method_to_string(pa_sink_input_get_resample_method(s)));
     pa_tagstruct_puts(t, s->driver);
     if (c->version >= 11)
-        pa_tagstruct_put_boolean(t, pa_sink_input_get_mute(s));
+        pa_tagstruct_put_boolean(t, s->muted);
     if (c->version >= 13)
         pa_tagstruct_put_proplist(t, s->proplist);
     if (c->version >= 19)
@@ -3413,7 +3495,7 @@ static void source_output_fill_tagstruct(pa_native_connection *c, pa_tagstruct *
         pa_tagstruct_put_boolean(t, (pa_source_output_get_state(s) == PA_SOURCE_OUTPUT_CORKED));
     if (c->version >= 22) {
         pa_tagstruct_put_cvolume(t, &v);
-        pa_tagstruct_put_boolean(t, pa_source_output_get_mute(s));
+        pa_tagstruct_put_boolean(t, s->muted);
         pa_tagstruct_put_boolean(t, has_volume);
         pa_tagstruct_put_boolean(t, s->volume_writable);
         pa_tagstruct_put_format_info(t, s->format);
@@ -4806,14 +4888,14 @@ static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command,
 
 /*** pstream callbacks ***/
 
-static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_creds *creds, void *userdata) {
+static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_cmsg_ancil_data *ancil_data, void *userdata) {
     pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
 
     pa_assert(p);
     pa_assert(packet);
     pa_native_connection_assert_ref(c);
 
-    if (pa_pdispatch_run(c->pdispatch, packet, creds, c) < 0) {
+    if (pa_pdispatch_run(c->pdispatch, packet, ancil_data, c) < 0) {
         pa_log("invalid packet.");
         native_connection_unlink(c);
     }
@@ -4840,6 +4922,13 @@ static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int64_t o
     if (playback_stream_isinstance(stream)) {
         playback_stream *ps = PLAYBACK_STREAM(stream);
 
+        size_t frame_size = pa_frame_size(&ps->sink_input->sample_spec);
+        if (chunk->index % frame_size != 0 || chunk->length % frame_size != 0) {
+            pa_log_warn("Client sent non-aligned memblock: index %d, length %d, frame size: %d",
+                        (int) chunk->index, (int) chunk->length, (int) frame_size);
+            return;
+        }
+
         pa_atomic_inc(&ps->seek_or_post_in_queue);
         if (chunk->memblock) {
             if (seek != PA_SEEK_RELATIVE || offset != 0)
@@ -5007,6 +5096,7 @@ void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_nati
     c->protocol = p;
     c->options = pa_native_options_ref(o);
     c->authorized = false;
+    c->srbpending = NULL;
 
     if (o->auth_anonymous) {
         pa_log_info("Client authenticated anonymously.");
@@ -5237,6 +5327,12 @@ int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) {
     pa_assert(PA_REFCNT_VALUE(o) >= 1);
     pa_assert(ma);
 
+    o->srbchannel = true;
+    if (pa_modargs_get_value_boolean(ma, "srbchannel", &o->srbchannel) < 0) {
+        pa_log("srbchannel= expects a boolean argument.");
+        return -1;
+    }
+
     if (pa_modargs_get_value_boolean(ma, "auth-anonymous", &o->auth_anonymous) < 0) {
         pa_log("auth-anonymous= expects a boolean argument.");
         return -1;
@@ -5293,7 +5389,12 @@ int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) {
         else {
             o->auth_cookie = pa_auth_cookie_get(c, PA_NATIVE_COOKIE_FILE, false, PA_NATIVE_COOKIE_LENGTH);
             if (!o->auth_cookie) {
-                o->auth_cookie = pa_auth_cookie_get(c, PA_NATIVE_COOKIE_FILE_FALLBACK, false, PA_NATIVE_COOKIE_LENGTH);
+                char *fallback_path;
+
+                if (pa_append_to_home_dir(PA_NATIVE_COOKIE_FILE_FALLBACK, &fallback_path) >= 0) {
+                    o->auth_cookie = pa_auth_cookie_get(c, fallback_path, false, PA_NATIVE_COOKIE_LENGTH);
+                    pa_xfree(fallback_path);
+                }
 
                 if (!o->auth_cookie)
                     o->auth_cookie = pa_auth_cookie_get(c, PA_NATIVE_COOKIE_FILE, true, PA_NATIVE_COOKIE_LENGTH);
diff --git a/src/pulsecore/protocol-native.h b/src/pulsecore/protocol-native.h
index 30b99f9..df30d44 100644
--- a/src/pulsecore/protocol-native.h
+++ b/src/pulsecore/protocol-native.h
@@ -44,6 +44,7 @@ typedef struct pa_native_options {
     pa_module *module;
 
     bool auth_anonymous;
+    bool srbchannel;
     char *auth_group;
     pa_ip_acl *auth_ip_acl;
     pa_auth_cookie *auth_cookie;
diff --git a/src/pulsecore/pstream-util.c b/src/pulsecore/pstream-util.c
index f84f486..9ccd5a4 100644
--- a/src/pulsecore/pstream-util.c
+++ b/src/pulsecore/pstream-util.c
@@ -28,7 +28,7 @@
 
 #include "pstream-util.h"
 
-void pa_pstream_send_tagstruct_with_creds(pa_pstream *p, pa_tagstruct *t, const pa_creds *creds) {
+static void pa_pstream_send_tagstruct_with_ancil_data(pa_pstream *p, pa_tagstruct *t, const pa_cmsg_ancil_data *ancil_data) {
     size_t length;
     uint8_t *data;
     pa_packet *packet;
@@ -38,10 +38,51 @@ void pa_pstream_send_tagstruct_with_creds(pa_pstream *p, pa_tagstruct *t, const
 
     pa_assert_se(data = pa_tagstruct_free_data(t, &length));
     pa_assert_se(packet = pa_packet_new_dynamic(data, length));
-    pa_pstream_send_packet(p, packet, creds);
+    pa_pstream_send_packet(p, packet, ancil_data);
     pa_packet_unref(packet);
 }
 
+#ifdef HAVE_CREDS
+
+void pa_pstream_send_tagstruct_with_creds(pa_pstream *p, pa_tagstruct *t, const pa_creds *creds) {
+    if (creds) {
+        pa_cmsg_ancil_data a;
+
+        a.nfd = 0;
+        a.creds_valid = true;
+        a.creds = *creds;
+        pa_pstream_send_tagstruct_with_ancil_data(p, t, &a);
+    }
+    else
+        pa_pstream_send_tagstruct_with_ancil_data(p, t, NULL);
+}
+
+void pa_pstream_send_tagstruct_with_fds(pa_pstream *p, pa_tagstruct *t, int nfd, const int *fds) {
+    if (nfd > 0) {
+        pa_cmsg_ancil_data a;
+
+        a.nfd = nfd;
+        a.creds_valid = false;
+        pa_assert(nfd <= MAX_ANCIL_DATA_FDS);
+        memcpy(a.fds, fds, sizeof(int) * nfd);
+        pa_pstream_send_tagstruct_with_ancil_data(p, t, &a);
+    }
+    else
+        pa_pstream_send_tagstruct_with_ancil_data(p, t, NULL);
+}
+
+#else
+
+void pa_pstream_send_tagstruct_with_creds(pa_pstream *p, pa_tagstruct *t, const pa_creds *creds) {
+    pa_pstream_send_tagstruct_with_ancil_data(p, t, NULL);
+}
+
+void pa_pstream_send_tagstruct_with_fds(pa_pstream *p, pa_tagstruct *t, int nfd, const int *fds) {
+    pa_assert_not_reached();
+}
+
+#endif
+
 void pa_pstream_send_error(pa_pstream *p, uint32_t tag, uint32_t error) {
     pa_tagstruct *t;
 
diff --git a/src/pulsecore/pstream-util.h b/src/pulsecore/pstream-util.h
index ae0d79c..7ea89ba 100644
--- a/src/pulsecore/pstream-util.h
+++ b/src/pulsecore/pstream-util.h
@@ -29,6 +29,7 @@
 
 /* The tagstruct is freed!*/
 void pa_pstream_send_tagstruct_with_creds(pa_pstream *p, pa_tagstruct *t, const pa_creds *creds);
+void pa_pstream_send_tagstruct_with_fds(pa_pstream *p, pa_tagstruct *t, int nfd, const int *fds);
 
 #define pa_pstream_send_tagstruct(p, t) pa_pstream_send_tagstruct_with_creds((p), (t), NULL)
 
diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index 190fc9a..5b15b10 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -45,11 +45,12 @@
 #include "pstream.h"
 
 /* We piggyback information if audio data blocks are stored in SHM on the seek mode */
-#define PA_FLAG_SHMDATA    0x80000000LU
-#define PA_FLAG_SHMRELEASE 0x40000000LU
-#define PA_FLAG_SHMREVOKE  0xC0000000LU
-#define PA_FLAG_SHMMASK    0xFF000000LU
-#define PA_FLAG_SEEKMASK   0x000000FFLU
+#define PA_FLAG_SHMDATA     0x80000000LU
+#define PA_FLAG_SHMRELEASE  0x40000000LU
+#define PA_FLAG_SHMREVOKE   0xC0000000LU
+#define PA_FLAG_SHMMASK     0xFF000000LU
+#define PA_FLAG_SEEKMASK    0x000000FFLU
+#define PA_FLAG_SHMWRITABLE 0x00800000LU
 
 /* The sequence descriptor header consists of 5 32bit integers: */
 enum {
@@ -94,8 +95,8 @@ struct item_info {
     /* packet info */
     pa_packet *packet;
 #ifdef HAVE_CREDS
-    bool with_creds;
-    pa_creds creds;
+    bool with_ancil_data;
+    pa_cmsg_ancil_data ancil_data;
 #endif
 
     /* memblock info */
@@ -108,12 +109,23 @@ struct item_info {
     uint32_t block_id;
 };
 
+struct pstream_read {
+    pa_pstream_descriptor descriptor;
+    pa_memblock *memblock;
+    pa_packet *packet;
+    uint32_t shm_info[PA_PSTREAM_SHM_MAX];
+    void *data;
+    size_t index;
+};
+
 struct pa_pstream {
     PA_REFCNT_DECLARE;
 
     pa_mainloop_api *mainloop;
     pa_defer_event *defer_event;
     pa_iochannel *io;
+    pa_srbchannel *srb, *srbpending;
+    bool is_srbpending;
 
     pa_queue *send_queue;
 
@@ -131,14 +143,7 @@ struct pa_pstream {
         pa_memchunk memchunk;
     } write;
 
-    struct {
-        pa_pstream_descriptor descriptor;
-        pa_memblock *memblock;
-        pa_packet *packet;
-        uint32_t shm_info[PA_PSTREAM_SHM_MAX];
-        void *data;
-        size_t index;
-    } read;
+    struct pstream_read readio, readsrb;
 
     bool use_shm;
     pa_memimport *import;
@@ -165,13 +170,13 @@ struct pa_pstream {
     pa_mempool *mempool;
 
 #ifdef HAVE_CREDS
-    pa_creds read_creds, write_creds;
-    bool read_creds_valid, send_creds_now;
+    pa_cmsg_ancil_data read_ancil_data, write_ancil_data;
+    bool send_ancil_data_now;
 #endif
 };
 
 static int do_write(pa_pstream *p);
-static int do_read(pa_pstream *p);
+static int do_read(pa_pstream *p, struct pstream_read *re);
 
 static void do_pstream_read_write(pa_pstream *p) {
     pa_assert(p);
@@ -181,8 +186,13 @@ static void do_pstream_read_write(pa_pstream *p) {
 
     p->mainloop->defer_enable(p->defer_event, 0);
 
+    if (!p->dead && p->srb) {
+         do_write(p);
+         while (!p->dead && do_read(p, &p->readsrb) == 0);
+    }
+
     if (!p->dead && pa_iochannel_is_readable(p->io)) {
-        if (do_read(p) < 0)
+        if (do_read(p, &p->readio) < 0)
             goto fail;
     } else if (!p->dead && pa_iochannel_is_hungup(p->io))
         goto fail;
@@ -207,6 +217,17 @@ fail:
     pa_pstream_unref(p);
 }
 
+static bool srb_callback(pa_srbchannel *srb, void *userdata) {
+    pa_pstream *p = userdata;
+
+    pa_assert(p);
+    pa_assert(PA_REFCNT_VALUE(p) > 0);
+    pa_assert(p->srb == srb);
+
+    do_pstream_read_write(p);
+    return p->srb != NULL;
+}
+
 static void io_callback(pa_iochannel*io, void *userdata) {
     pa_pstream *p = userdata;
 
@@ -237,11 +258,10 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo
     pa_assert(io);
     pa_assert(pool);
 
-    p = pa_xnew(pa_pstream, 1);
+    p = pa_xnew0(pa_pstream, 1);
     PA_REFCNT_INIT(p);
     p->io = io;
     pa_iochannel_set_callback(io, io_callback, p);
-    p->dead = false;
 
     p->mainloop = m;
     p->defer_event = m->defer_new(m, defer_callback, p);
@@ -249,41 +269,14 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo
 
     p->send_queue = pa_queue_new();
 
-    p->write.current = NULL;
-    p->write.index = 0;
-    pa_memchunk_reset(&p->write.memchunk);
-    p->read.memblock = NULL;
-    p->read.packet = NULL;
-    p->read.index = 0;
-
-    p->receive_packet_callback = NULL;
-    p->receive_packet_callback_userdata = NULL;
-    p->receive_memblock_callback = NULL;
-    p->receive_memblock_callback_userdata = NULL;
-    p->drain_callback = NULL;
-    p->drain_callback_userdata = NULL;
-    p->die_callback = NULL;
-    p->die_callback_userdata = NULL;
-    p->revoke_callback = NULL;
-    p->revoke_callback_userdata = NULL;
-    p->release_callback = NULL;
-    p->release_callback_userdata = NULL;
-
     p->mempool = pool;
 
-    p->use_shm = false;
-    p->export = NULL;
-
     /* We do importing unconditionally */
     p->import = pa_memimport_new(p->mempool, memimport_release_cb, p);
 
     pa_iochannel_socket_set_rcvbuf(io, pa_mempool_block_size_max(p->mempool));
     pa_iochannel_socket_set_sndbuf(io, pa_mempool_block_size_max(p->mempool));
 
-#ifdef HAVE_CREDS
-    p->send_creds_now = false;
-    p->read_creds_valid = false;
-#endif
     return p;
 }
 
@@ -316,16 +309,22 @@ static void pstream_free(pa_pstream *p) {
     if (p->write.memchunk.memblock)
         pa_memblock_unref(p->write.memchunk.memblock);
 
-    if (p->read.memblock)
-        pa_memblock_unref(p->read.memblock);
+    if (p->readsrb.memblock)
+        pa_memblock_unref(p->readsrb.memblock);
+
+    if (p->readsrb.packet)
+        pa_packet_unref(p->readsrb.packet);
 
-    if (p->read.packet)
-        pa_packet_unref(p->read.packet);
+    if (p->readio.memblock)
+        pa_memblock_unref(p->readio.memblock);
+
+    if (p->readio.packet)
+        pa_packet_unref(p->readio.packet);
 
     pa_xfree(p);
 }
 
-void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, const pa_creds *creds) {
+void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, const pa_cmsg_ancil_data *ancil_data) {
     struct item_info *i;
 
     pa_assert(p);
@@ -342,8 +341,13 @@ void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, const pa_creds *cre
     i->packet = pa_packet_ref(packet);
 
 #ifdef HAVE_CREDS
-    if ((i->with_creds = !!creds))
-        i->creds = *creds;
+    if ((i->with_ancil_data = !!ancil_data)) {
+        i->ancil_data = *ancil_data;
+        if (ancil_data->creds_valid)
+            pa_assert(ancil_data->nfd == 0);
+        else
+            pa_assert(ancil_data->nfd > 0);
+    }
 #endif
 
     pa_queue_push(p->send_queue, i);
@@ -385,7 +389,7 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa
         i->offset = offset;
         i->seek_mode = seek_mode;
 #ifdef HAVE_CREDS
-        i->with_creds = false;
+        i->with_ancil_data = false;
 #endif
 
         pa_queue_push(p->send_queue, i);
@@ -412,7 +416,7 @@ void pa_pstream_send_release(pa_pstream *p, uint32_t block_id) {
     item->type = PA_PSTREAM_ITEM_SHMRELEASE;
     item->block_id = block_id;
 #ifdef HAVE_CREDS
-    item->with_creds = false;
+    item->with_ancil_data = false;
 #endif
 
     pa_queue_push(p->send_queue, item);
@@ -449,7 +453,7 @@ void pa_pstream_send_revoke(pa_pstream *p, uint32_t block_id) {
     item->type = PA_PSTREAM_ITEM_SHMREVOKE;
     item->block_id = block_id;
 #ifdef HAVE_CREDS
-    item->with_creds = false;
+    item->with_ancil_data = false;
 #endif
 
     pa_queue_push(p->send_queue, item);
@@ -527,10 +531,15 @@ static void prepare_next_write_item(pa_pstream *p) {
             size_t offset, length;
             uint32_t *shm_info = (uint32_t *) &p->write.minibuf[PA_PSTREAM_DESCRIPTOR_SIZE];
             size_t shm_size = sizeof(uint32_t) * PA_PSTREAM_SHM_MAX;
+            pa_mempool *current_pool = pa_memblock_get_pool(p->write.current->chunk.memblock);
+            pa_memexport *current_export;
 
-            pa_assert(p->export);
+            if (p->mempool == current_pool)
+                pa_assert_se(current_export = p->export);
+            else
+                pa_assert_se(current_export = pa_memexport_new(current_pool, memexport_revoke_cb, p));
 
-            if (pa_memexport_put(p->export,
+            if (pa_memexport_put(current_export,
                                  p->write.current->chunk.memblock,
                                  &block_id,
                                  &shm_id,
@@ -538,6 +547,8 @@ static void prepare_next_write_item(pa_pstream *p) {
                                  &length) >= 0) {
 
                 flags |= PA_FLAG_SHMDATA;
+                if (pa_mempool_is_remote_writable(current_pool))
+                    flags |= PA_FLAG_SHMWRITABLE;
                 send_payload = false;
 
                 shm_info[PA_PSTREAM_SHM_BLOCKID] = htonl(block_id);
@@ -550,24 +561,40 @@ static void prepare_next_write_item(pa_pstream *p) {
             }
 /*             else */
 /*                 pa_log_warn("Failed to export memory block."); */
+
+            if (current_export != p->export)
+                pa_memexport_free(current_export);
         }
 
         if (send_payload) {
             p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH] = htonl((uint32_t) p->write.current->chunk.length);
             p->write.memchunk = p->write.current->chunk;
             pa_memblock_ref(p->write.memchunk.memblock);
-            p->write.data = NULL;
         }
 
         p->write.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS] = htonl(flags);
     }
 
 #ifdef HAVE_CREDS
-    if ((p->send_creds_now = p->write.current->with_creds))
-        p->write_creds = p->write.current->creds;
+    if ((p->send_ancil_data_now = p->write.current->with_ancil_data))
+        p->write_ancil_data = p->write.current->ancil_data;
 #endif
 }
 
+static void check_srbpending(pa_pstream *p) {
+    if (!p->is_srbpending)
+        return;
+
+    if (p->srb)
+        pa_srbchannel_free(p->srb);
+
+    p->srb = p->srbpending;
+    p->is_srbpending = false;
+
+    if (p->srb)
+        pa_srbchannel_set_callback(p->srb, srb_callback, p);
+}
+
 static int do_write(pa_pstream *p) {
     void *d;
     size_t l;
@@ -580,8 +607,11 @@ static int do_write(pa_pstream *p) {
     if (!p->write.current)
         prepare_next_write_item(p);
 
-    if (!p->write.current)
+    if (!p->write.current) {
+        /* The out queue is empty, so switching channels is safe */
+        check_srbpending(p);
         return 0;
+    }
 
     if (p->write.minibuf_validsize > 0) {
         d = p->write.minibuf + p->write.index;
@@ -606,16 +636,21 @@ static int do_write(pa_pstream *p) {
     pa_assert(l > 0);
 
 #ifdef HAVE_CREDS
-    if (p->send_creds_now) {
-
-        if ((r = pa_iochannel_write_with_creds(p->io, d, l, &p->write_creds)) < 0)
-            goto fail;
-
-        p->send_creds_now = false;
+    if (p->send_ancil_data_now) {
+        if (p->write_ancil_data.creds_valid) {
+            pa_assert(p->write_ancil_data.nfd == 0);
+            if ((r = pa_iochannel_write_with_creds(p->io, d, l, &p->write_ancil_data.creds)) < 0)
+                goto fail;
+        }
+        else
+            if ((r = pa_iochannel_write_with_fds(p->io, d, l, p->write_ancil_data.nfd, p->write_ancil_data.fds)) < 0)
+                goto fail;
+        p->send_ancil_data_now = false;
     } else
 #endif
-
-    if ((r = pa_iochannel_write(p->io, d, l)) < 0)
+    if (p->srb)
+        r = pa_srbchannel_write(p->srb, d, l);
+    else if ((r = pa_iochannel_write(p->io, d, l)) < 0)
         goto fail;
 
     if (release_memblock)
@@ -647,7 +682,7 @@ fail:
     return -1;
 }
 
-static int do_read(pa_pstream *p) {
+static int do_read(pa_pstream *p, struct pstream_read *re) {
     void *d;
     size_t l;
     ssize_t r;
@@ -655,31 +690,48 @@ static int do_read(pa_pstream *p) {
     pa_assert(p);
     pa_assert(PA_REFCNT_VALUE(p) > 0);
 
-    if (p->read.index < PA_PSTREAM_DESCRIPTOR_SIZE) {
-        d = (uint8_t*) p->read.descriptor + p->read.index;
-        l = PA_PSTREAM_DESCRIPTOR_SIZE - p->read.index;
+    if (re->index < PA_PSTREAM_DESCRIPTOR_SIZE) {
+        d = (uint8_t*) re->descriptor + re->index;
+        l = PA_PSTREAM_DESCRIPTOR_SIZE - re->index;
     } else {
-        pa_assert(p->read.data || p->read.memblock);
+        pa_assert(re->data || re->memblock);
 
-        if (p->read.data)
-            d = p->read.data;
+        if (re->data)
+            d = re->data;
         else {
-            d = pa_memblock_acquire(p->read.memblock);
-            release_memblock = p->read.memblock;
+            d = pa_memblock_acquire(re->memblock);
+            release_memblock = re->memblock;
         }
 
-        d = (uint8_t*) d + p->read.index - PA_PSTREAM_DESCRIPTOR_SIZE;
-        l = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]) - (p->read.index - PA_PSTREAM_DESCRIPTOR_SIZE);
+        d = (uint8_t*) d + re->index - PA_PSTREAM_DESCRIPTOR_SIZE;
+        l = ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]) - (re->index - PA_PSTREAM_DESCRIPTOR_SIZE);
     }
 
+    if (re == &p->readsrb) {
+        r = pa_srbchannel_read(p->srb, d, l);
+        if (r == 0) {
+            if (release_memblock)
+                pa_memblock_release(release_memblock);
+            return 1;
+        }
+    }
+    else
 #ifdef HAVE_CREDS
     {
-        bool b = 0;
+        pa_cmsg_ancil_data b;
 
-        if ((r = pa_iochannel_read_with_creds(p->io, d, l, &p->read_creds, &b)) <= 0)
+        if ((r = pa_iochannel_read_with_ancil_data(p->io, d, l, &b)) <= 0)
             goto fail;
 
-        p->read_creds_valid = p->read_creds_valid || b;
+        if (b.creds_valid) {
+            p->read_ancil_data.creds_valid = true;
+            p->read_ancil_data.creds = b.creds;
+        }
+        if (b.nfd > 0) {
+            pa_assert(b.nfd <= MAX_ANCIL_DATA_FDS);
+            p->read_ancil_data.nfd = b.nfd;
+            memcpy(p->read_ancil_data.fds, b.fds, sizeof(int) * b.nfd);
+        }
     }
 #else
     if ((r = pa_iochannel_read(p->io, d, l)) <= 0)
@@ -689,13 +741,13 @@ static int do_read(pa_pstream *p) {
     if (release_memblock)
         pa_memblock_release(release_memblock);
 
-    p->read.index += (size_t) r;
+    re->index += (size_t) r;
 
-    if (p->read.index == PA_PSTREAM_DESCRIPTOR_SIZE) {
+    if (re->index == PA_PSTREAM_DESCRIPTOR_SIZE) {
         uint32_t flags, length, channel;
         /* Reading of frame descriptor complete */
 
-        flags = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]);
+        flags = ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]);
 
         if (!p->use_shm && (flags & PA_FLAG_SHMMASK) != 0) {
             pa_log_warn("Received SHM frame on a socket where SHM is disabled.");
@@ -706,10 +758,10 @@ static int do_read(pa_pstream *p) {
 
             /* This is a SHM memblock release frame with no payload */
 
-/*             pa_log("Got release frame for %u", ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])); */
+/*             pa_log("Got release frame for %u", ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])); */
 
             pa_assert(p->export);
-            pa_memexport_process_release(p->export, ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI]));
+            pa_memexport_process_release(p->export, ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI]));
 
             goto frame_done;
 
@@ -717,24 +769,24 @@ static int do_read(pa_pstream *p) {
 
             /* This is a SHM memblock revoke frame with no payload */
 
-/*             pa_log("Got revoke frame for %u", ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])); */
+/*             pa_log("Got revoke frame for %u", ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])); */
 
             pa_assert(p->import);
-            pa_memimport_process_revoke(p->import, ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI]));
+            pa_memimport_process_revoke(p->import, ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI]));
 
             goto frame_done;
         }
 
-        length = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]);
+        length = ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]);
 
         if (length > FRAME_SIZE_MAX_ALLOW || length <= 0) {
             pa_log_warn("Received invalid frame size: %lu", (unsigned long) length);
             return -1;
         }
 
-        pa_assert(!p->read.packet && !p->read.memblock);
+        pa_assert(!re->packet && !re->memblock);
 
-        channel = ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL]);
+        channel = ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL]);
 
         if (channel == (uint32_t) -1) {
 
@@ -744,8 +796,8 @@ static int do_read(pa_pstream *p) {
             }
 
             /* Frame is a packet frame */
-            p->read.packet = pa_packet_new(length);
-            p->read.data = p->read.packet->data;
+            re->packet = pa_packet_new(length);
+            re->data = re->packet->data;
 
         } else {
 
@@ -756,20 +808,20 @@ static int do_read(pa_pstream *p) {
 
             if ((flags & PA_FLAG_SHMMASK) == PA_FLAG_SHMDATA) {
 
-                if (length != sizeof(p->read.shm_info)) {
+                if (length != sizeof(re->shm_info)) {
                     pa_log_warn("Received SHM memblock frame with invalid frame length.");
                     return -1;
                 }
 
                 /* Frame is a memblock frame referencing an SHM memblock */
-                p->read.data = p->read.shm_info;
+                re->data = re->shm_info;
 
             } else if ((flags & PA_FLAG_SHMMASK) == 0) {
 
                 /* Frame is a memblock frame */
 
-                p->read.memblock = pa_memblock_new(p->mempool, length);
-                p->read.data = NULL;
+                re->memblock = pa_memblock_new(p->mempool, length);
+                re->data = NULL;
             } else {
 
                 pa_log_warn("Received memblock frame with invalid flags value.");
@@ -777,74 +829,75 @@ static int do_read(pa_pstream *p) {
             }
         }
 
-    } else if (p->read.index > PA_PSTREAM_DESCRIPTOR_SIZE) {
+    } else if (re->index > PA_PSTREAM_DESCRIPTOR_SIZE) {
         /* Frame payload available */
 
-        if (p->read.memblock && p->receive_memblock_callback) {
+        if (re->memblock && p->receive_memblock_callback) {
 
             /* Is this memblock data? Than pass it to the user */
-            l = (p->read.index - (size_t) r) < PA_PSTREAM_DESCRIPTOR_SIZE ? (size_t) (p->read.index - PA_PSTREAM_DESCRIPTOR_SIZE) : (size_t) r;
+            l = (re->index - (size_t) r) < PA_PSTREAM_DESCRIPTOR_SIZE ? (size_t) (re->index - PA_PSTREAM_DESCRIPTOR_SIZE) : (size_t) r;
 
             if (l > 0) {
                 pa_memchunk chunk;
 
-                chunk.memblock = p->read.memblock;
-                chunk.index = p->read.index - PA_PSTREAM_DESCRIPTOR_SIZE - l;
+                chunk.memblock = re->memblock;
+                chunk.index = re->index - PA_PSTREAM_DESCRIPTOR_SIZE - l;
                 chunk.length = l;
 
                 if (p->receive_memblock_callback) {
                     int64_t offset;
 
                     offset = (int64_t) (
-                            (((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) |
-                            (((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO]))));
+                            (((uint64_t) ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) |
+                            (((uint64_t) ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO]))));
 
                     p->receive_memblock_callback(
                         p,
-                        ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL]),
+                        ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL]),
                         offset,
-                        ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]) & PA_FLAG_SEEKMASK,
+                        ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]) & PA_FLAG_SEEKMASK,
                         &chunk,
                         p->receive_memblock_callback_userdata);
                 }
 
                 /* Drop seek info for following callbacks */
-                p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS] =
-                    p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI] =
-                    p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO] = 0;
+                re->descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS] =
+                    re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI] =
+                    re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO] = 0;
             }
         }
 
         /* Frame complete */
-        if (p->read.index >= ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]) + PA_PSTREAM_DESCRIPTOR_SIZE) {
+        if (re->index >= ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH]) + PA_PSTREAM_DESCRIPTOR_SIZE) {
 
-            if (p->read.memblock) {
+            if (re->memblock) {
 
                 /* This was a memblock frame. We can unref the memblock now */
-                pa_memblock_unref(p->read.memblock);
+                pa_memblock_unref(re->memblock);
 
-            } else if (p->read.packet) {
+            } else if (re->packet) {
 
                 if (p->receive_packet_callback)
 #ifdef HAVE_CREDS
-                    p->receive_packet_callback(p, p->read.packet, p->read_creds_valid ? &p->read_creds : NULL, p->receive_packet_callback_userdata);
+                    p->receive_packet_callback(p, re->packet, &p->read_ancil_data, p->receive_packet_callback_userdata);
 #else
-                    p->receive_packet_callback(p, p->read.packet, NULL, p->receive_packet_callback_userdata);
+                    p->receive_packet_callback(p, re->packet, NULL, p->receive_packet_callback_userdata);
 #endif
 
-                pa_packet_unref(p->read.packet);
+                pa_packet_unref(re->packet);
             } else {
                 pa_memblock *b;
-
-                pa_assert((ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]) & PA_FLAG_SHMMASK) == PA_FLAG_SHMDATA);
+                uint32_t flags = ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]);
+                pa_assert((flags & PA_FLAG_SHMMASK) == PA_FLAG_SHMDATA);
 
                 pa_assert(p->import);
 
                 if (!(b = pa_memimport_get(p->import,
-                                          ntohl(p->read.shm_info[PA_PSTREAM_SHM_BLOCKID]),
-                                          ntohl(p->read.shm_info[PA_PSTREAM_SHM_SHMID]),
-                                          ntohl(p->read.shm_info[PA_PSTREAM_SHM_INDEX]),
-                                          ntohl(p->read.shm_info[PA_PSTREAM_SHM_LENGTH])))) {
+                                          ntohl(re->shm_info[PA_PSTREAM_SHM_BLOCKID]),
+                                          ntohl(re->shm_info[PA_PSTREAM_SHM_SHMID]),
+                                          ntohl(re->shm_info[PA_PSTREAM_SHM_INDEX]),
+                                          ntohl(re->shm_info[PA_PSTREAM_SHM_LENGTH]),
+                                          !!(flags & PA_FLAG_SHMWRITABLE)))) {
 
                     if (pa_log_ratelimit(PA_LOG_DEBUG))
                         pa_log_debug("Failed to import memory block.");
@@ -856,17 +909,17 @@ static int do_read(pa_pstream *p) {
 
                     chunk.memblock = b;
                     chunk.index = 0;
-                    chunk.length = b ? pa_memblock_get_length(b) : ntohl(p->read.shm_info[PA_PSTREAM_SHM_LENGTH]);
+                    chunk.length = b ? pa_memblock_get_length(b) : ntohl(re->shm_info[PA_PSTREAM_SHM_LENGTH]);
 
                     offset = (int64_t) (
-                            (((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) |
-                            (((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO]))));
+                            (((uint64_t) ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) |
+                            (((uint64_t) ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO]))));
 
                     p->receive_memblock_callback(
                             p,
-                            ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL]),
+                            ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL]),
                             offset,
-                            ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]) & PA_FLAG_SEEKMASK,
+                            ntohl(re->descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]) & PA_FLAG_SEEKMASK,
                             &chunk,
                             p->receive_memblock_callback_userdata);
                 }
@@ -882,13 +935,14 @@ static int do_read(pa_pstream *p) {
     return 0;
 
 frame_done:
-    p->read.memblock = NULL;
-    p->read.packet = NULL;
-    p->read.index = 0;
-    p->read.data = NULL;
+    re->memblock = NULL;
+    re->packet = NULL;
+    re->index = 0;
+    re->data = NULL;
 
 #ifdef HAVE_CREDS
-    p->read_creds_valid = false;
+    p->read_ancil_data.creds_valid = false;
+    p->read_ancil_data.nfd = 0;
 #endif
 
     return 0;
@@ -986,6 +1040,9 @@ void pa_pstream_unlink(pa_pstream *p) {
 
     p->dead = true;
 
+    while (p->srb || p->is_srbpending) /* In theory there could be one active and one pending */
+        pa_pstream_set_srbchannel(p, NULL);
+
     if (p->import) {
         pa_memimport_free(p->import);
         p->import = NULL;
@@ -1038,3 +1095,23 @@ bool pa_pstream_get_shm(pa_pstream *p) {
 
     return p->use_shm;
 }
+
+void pa_pstream_set_srbchannel(pa_pstream *p, pa_srbchannel *srb) {
+    pa_assert(p);
+    pa_assert(PA_REFCNT_VALUE(p) > 0 || srb == NULL);
+
+    if (srb == p->srb)
+        return;
+
+    /* We can't handle quick switches between srbchannels. */
+    pa_assert(!p->is_srbpending);
+
+    p->srbpending = srb;
+    p->is_srbpending = true;
+
+    /* Switch immediately, if possible. */
+    if (p->dead)
+        check_srbpending(p);
+    else
+        do_write(p);
+}
diff --git a/src/pulsecore/pstream.h b/src/pulsecore/pstream.h
index deb2bc3..cbea237 100644
--- a/src/pulsecore/pstream.h
+++ b/src/pulsecore/pstream.h
@@ -31,13 +31,14 @@
 #include <pulsecore/packet.h>
 #include <pulsecore/memblock.h>
 #include <pulsecore/iochannel.h>
+#include <pulsecore/srbchannel.h>
 #include <pulsecore/memchunk.h>
 #include <pulsecore/creds.h>
 #include <pulsecore/macro.h>
 
 typedef struct pa_pstream pa_pstream;
 
-typedef void (*pa_pstream_packet_cb_t)(pa_pstream *p, pa_packet *packet, const pa_creds *creds, void *userdata);
+typedef void (*pa_pstream_packet_cb_t)(pa_pstream *p, pa_packet *packet, const pa_cmsg_ancil_data *ancil_data, void *userdata);
 typedef void (*pa_pstream_memblock_cb_t)(pa_pstream *p, uint32_t channel, int64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk, void *userdata);
 typedef void (*pa_pstream_notify_cb_t)(pa_pstream *p, void *userdata);
 typedef void (*pa_pstream_block_id_cb_t)(pa_pstream *p, uint32_t block_id, void *userdata);
@@ -49,7 +50,7 @@ void pa_pstream_unref(pa_pstream*p);
 
 void pa_pstream_unlink(pa_pstream *p);
 
-void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, const pa_creds *creds);
+void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, const pa_cmsg_ancil_data *ancil_data);
 void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk);
 void pa_pstream_send_release(pa_pstream *p, uint32_t block_id);
 void pa_pstream_send_revoke(pa_pstream *p, uint32_t block_id);
@@ -66,4 +67,8 @@ bool pa_pstream_is_pending(pa_pstream *p);
 void pa_pstream_enable_shm(pa_pstream *p, bool enable);
 bool pa_pstream_get_shm(pa_pstream *p);
 
+/* Enables shared ringbuffer channel. Note that the srbchannel is now owned by the pstream.
+   Setting srb to NULL will free any existing srbchannel. */
+void pa_pstream_set_srbchannel(pa_pstream *p, pa_srbchannel *srb);
+
 #endif
diff --git a/src/pulsecore/remap.c b/src/pulsecore/remap.c
index 8585e34..d9b121e 100644
--- a/src/pulsecore/remap.c
+++ b/src/pulsecore/remap.c
@@ -26,168 +26,428 @@
 
 #include <string.h>
 
+#include <pulse/xmalloc.h>
 #include <pulse/sample.h>
 #include <pulse/volume.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 
+#include "cpu.h"
 #include "remap.h"
 
-static void remap_mono_to_stereo_c(pa_remap_t *m, void *dst, const void *src, unsigned n) {
+static void remap_mono_to_stereo_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
     unsigned i;
 
-    switch (*m->format) {
-        case PA_SAMPLE_FLOAT32NE:
-        {
-            float *d, *s;
-
-            d = (float *) dst;
-            s = (float *) src;
-
-            for (i = n >> 2; i; i--) {
-                d[0] = d[1] = s[0];
-                d[2] = d[3] = s[1];
-                d[4] = d[5] = s[2];
-                d[6] = d[7] = s[3];
-                s += 4;
-                d += 8;
-            }
-            for (i = n & 3; i; i--) {
-                d[0] = d[1] = s[0];
-                s++;
-                d += 2;
-            }
-            break;
-        }
-        case PA_SAMPLE_S16NE:
-        {
-            int16_t *d, *s;
-
-            d = (int16_t *) dst;
-            s = (int16_t *) src;
-
-            for (i = n >> 2; i; i--) {
-                d[0] = d[1] = s[0];
-                d[2] = d[3] = s[1];
-                d[4] = d[5] = s[2];
-                d[6] = d[7] = s[3];
-                s += 4;
-                d += 8;
-            }
-            for (i = n & 3; i; i--) {
-                d[0] = d[1] = s[0];
-                s++;
-                d += 2;
+    for (i = n >> 2; i; i--) {
+        dst[0] = dst[1] = src[0];
+        dst[2] = dst[3] = src[1];
+        dst[4] = dst[5] = src[2];
+        dst[6] = dst[7] = src[3];
+        src += 4;
+        dst += 8;
+    }
+    for (i = n & 3; i; i--) {
+        dst[0] = dst[1] = src[0];
+        src++;
+        dst += 2;
+    }
+}
+
+static void remap_mono_to_stereo_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    unsigned i;
+
+    for (i = n >> 2; i; i--) {
+        dst[0] = dst[1] = src[0];
+        dst[2] = dst[3] = src[1];
+        dst[4] = dst[5] = src[2];
+        dst[6] = dst[7] = src[3];
+        src += 4;
+        dst += 8;
+    }
+    for (i = n & 3; i; i--) {
+        dst[0] = dst[1] = src[0];
+        src++;
+        dst += 2;
+    }
+}
+
+static void remap_stereo_to_mono_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    unsigned i;
+
+    for (i = n >> 2; i > 0; i--) {
+        dst[0] = (src[0] + src[1])/2;
+        dst[1] = (src[2] + src[3])/2;
+        dst[2] = (src[4] + src[5])/2;
+        dst[3] = (src[6] + src[7])/2;
+        src += 8;
+        dst += 4;
+    }
+    for (i = n & 3; i; i--) {
+        dst[0] = (src[0] + src[1])/2;
+        src += 2;
+        dst += 1;
+    }
+}
+
+static void remap_stereo_to_mono_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    unsigned i;
+
+    for (i = n >> 2; i > 0; i--) {
+        dst[0] = (src[0] + src[1])*0.5f;
+        dst[1] = (src[2] + src[3])*0.5f;
+        dst[2] = (src[4] + src[5])*0.5f;
+        dst[3] = (src[6] + src[7])*0.5f;
+        src += 8;
+        dst += 4;
+    }
+    for (i = n & 3; i; i--) {
+        dst[0] = (src[0] + src[1])*0.5f;
+        src += 2;
+        dst += 1;
+    }
+}
+
+static void remap_mono_to_ch4_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    unsigned i;
+
+    for (i = n >> 2; i; i--) {
+        dst[0] = dst[1] = dst[2] = dst[3] = src[0];
+        dst[4] = dst[5] = dst[6] = dst[7] = src[1];
+        dst[8] = dst[9] = dst[10] = dst[11] = src[2];
+        dst[12] = dst[13] = dst[14] = dst[15] = src[3];
+        src += 4;
+        dst += 16;
+    }
+    for (i = n & 3; i; i--) {
+        dst[0] = dst[1] = dst[2] = dst[3] = src[0];
+        src++;
+        dst += 4;
+    }
+}
+
+static void remap_mono_to_ch4_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    unsigned i;
+
+    for (i = n >> 2; i; i--) {
+        dst[0] = dst[1] = dst[2] = dst[3] = src[0];
+        dst[4] = dst[5] = dst[6] = dst[7] = src[1];
+        dst[8] = dst[9] = dst[10] = dst[11] = src[2];
+        dst[12] = dst[13] = dst[14] = dst[15] = src[3];
+        src += 4;
+        dst += 16;
+    }
+    for (i = n & 3; i; i--) {
+        dst[0] = dst[1] = dst[2] = dst[3] = src[0];
+        src++;
+        dst += 4;
+    }
+}
+
+static void remap_ch4_to_mono_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    unsigned i;
+
+    for (i = n >> 2; i > 0; i--) {
+        dst[0] = (src[0] + src[1] + src[2] + src[3])/4;
+        dst[1] = (src[4] + src[5] + src[6] + src[7])/4;
+        dst[2] = (src[8] + src[9] + src[10] + src[11])/4;
+        dst[3] = (src[12] + src[13] + src[14] + src[15])/4;
+        src += 16;
+        dst += 4;
+    }
+    for (i = n & 3; i; i--) {
+        dst[0] = (src[0] + src[1] + src[2] + src[3])/4;
+        src += 4;
+        dst += 1;
+    }
+}
+
+static void remap_ch4_to_mono_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    unsigned i;
+
+    for (i = n >> 2; i > 0; i--) {
+        dst[0] = (src[0] + src[1] + src[2] + src[3])*0.25f;
+        dst[1] = (src[4] + src[5] + src[6] + src[7])*0.25f;
+        dst[2] = (src[8] + src[9] + src[10] + src[11])*0.25f;
+        dst[3] = (src[12] + src[13] + src[14] + src[15])*0.25f;
+        src += 16;
+        dst += 4;
+    }
+    for (i = n & 3; i; i--) {
+        dst[0] = (src[0] + src[1] + src[2] + src[3])*0.25f;
+        src += 4;
+        dst += 1;
+    }
+}
+
+static void remap_channels_matrix_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+
+    unsigned oc, ic, i;
+    unsigned n_ic, n_oc;
+
+    n_ic = m->i_ss.channels;
+    n_oc = m->o_ss.channels;
+
+    memset(dst, 0, n * sizeof(int16_t) * n_oc);
+
+    for (oc = 0; oc < n_oc; oc++) {
+
+        for (ic = 0; ic < n_ic; ic++) {
+            int16_t *d = dst + oc;
+            const int16_t *s = src + ic;
+            int32_t vol = m->map_table_i[oc][ic];
+
+            if (vol <= 0)
+                continue;
+
+            if (vol >= 0x10000) {
+                for (i = n; i > 0; i--, s += n_ic, d += n_oc)
+                    *d += *s;
+            } else {
+                for (i = n; i > 0; i--, s += n_ic, d += n_oc)
+                    *d += (int16_t) (((int32_t)*s * vol) >> 16);
             }
-            break;
         }
-        default:
-            pa_assert_not_reached();
     }
 }
 
-static void remap_channels_matrix_c(pa_remap_t *m, void *dst, const void *src, unsigned n) {
+static void remap_channels_matrix_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
     unsigned oc, ic, i;
     unsigned n_ic, n_oc;
 
-    n_ic = m->i_ss->channels;
-    n_oc = m->o_ss->channels;
+    n_ic = m->i_ss.channels;
+    n_oc = m->o_ss.channels;
+
+    memset(dst, 0, n * sizeof(float) * n_oc);
+
+    for (oc = 0; oc < n_oc; oc++) {
 
-    switch (*m->format) {
-        case PA_SAMPLE_FLOAT32NE:
-        {
-            float *d, *s;
+        for (ic = 0; ic < n_ic; ic++) {
+            float *d = dst + oc;
+            const float *s = src + ic;
+            float vol = m->map_table_f[oc][ic];
 
-            memset(dst, 0, n * sizeof(float) * n_oc);
+            if (vol <= 0.0f)
+                continue;
 
-            for (oc = 0; oc < n_oc; oc++) {
+            if (vol >= 1.0f) {
+                for (i = n; i > 0; i--, s += n_ic, d += n_oc)
+                    *d += *s;
+            } else {
+                for (i = n; i > 0; i--, s += n_ic, d += n_oc)
+                    *d += *s * vol;
+            }
+        }
+    }
+}
 
-                for (ic = 0; ic < n_ic; ic++) {
-                    float vol;
+/* Produce an array containing input channel indices to map to output channels.
+ * If the output channel is empty, the array element is -1. */
+bool pa_setup_remap_arrange(const pa_remap_t *m, int8_t arrange[PA_CHANNELS_MAX]) {
+    unsigned ic, oc;
+    unsigned n_ic, n_oc;
+    unsigned count_output = 0;
 
-                    vol = m->map_table_f[oc][ic];
+    pa_assert(m);
 
-                    if (vol <= 0.0)
-                        continue;
+    n_ic = m->i_ss.channels;
+    n_oc = m->o_ss.channels;
 
-                    d = (float *)dst + oc;
-                    s = (float *)src + ic;
+    for (oc = 0; oc < n_oc; oc++) {
+        arrange[oc] = -1;
+        for (ic = 0; ic < n_ic; ic++) {
+            int32_t vol = m->map_table_i[oc][ic];
 
-                    if (vol >= 1.0) {
-                        for (i = n; i > 0; i--, s += n_ic, d += n_oc)
-                            *d += *s;
-                    } else {
-                        for (i = n; i > 0; i--, s += n_ic, d += n_oc)
-                            *d += *s * vol;
-                    }
-                }
-            }
+            /* input channel is not used */
+            if (vol == 0)
+                continue;
 
-            break;
+            /* if mixing this channel, we cannot just rearrange */
+            if (vol != 0x10000 || arrange[oc] >= 0)
+                return false;
+
+            arrange[oc] = ic;
+            count_output++;
         }
-        case PA_SAMPLE_S16NE:
-        {
-            int16_t *d, *s;
+    }
+
+    return count_output > 0;
+}
+
+static void remap_arrange_mono_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    const unsigned n_ic = m->i_ss.channels;
+    const int8_t *arrange = m->state;
+
+    src += arrange[0];
+    for (; n > 0; n--) {
+        *dst++ = *src;
+        src += n_ic;
+    }
+}
 
-            memset(dst, 0, n * sizeof(int16_t) * n_oc);
+static void remap_arrange_stereo_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    const unsigned n_ic = m->i_ss.channels;
+    const int8_t *arrange = m->state;
+    const int8_t ic0 = arrange[0], ic1 = arrange[1];
 
-            for (oc = 0; oc < n_oc; oc++) {
+    for (; n > 0; n--) {
+        *dst++ = (ic0 >= 0) ? *(src + ic0) : 0;
+        *dst++ = (ic1 >= 0) ? *(src + ic1) : 0;
+        src += n_ic;
+    }
+}
 
-                for (ic = 0; ic < n_ic; ic++) {
-                    int32_t vol;
+static void remap_arrange_ch4_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    const unsigned n_ic = m->i_ss.channels;
+    const int8_t *arrange = m->state;
+    const int8_t ic0 = arrange[0], ic1 = arrange[1],
+        ic2 = arrange[2], ic3 = arrange[3];
+
+    for (; n > 0; n--) {
+        *dst++ = (ic0 >= 0) ? *(src + ic0) : 0;
+        *dst++ = (ic1 >= 0) ? *(src + ic1) : 0;
+        *dst++ = (ic2 >= 0) ? *(src + ic2) : 0;
+        *dst++ = (ic3 >= 0) ? *(src + ic3) : 0;
+        src += n_ic;
+    }
+}
 
-                    vol = m->map_table_i[oc][ic];
+static void remap_arrange_mono_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    const unsigned n_ic = m->i_ss.channels;
+    const int8_t *arrange = m->state;
 
-                    if (vol <= 0)
-                        continue;
+    src += arrange[0];
+    for (; n > 0; n--) {
+        *dst++ = *src;
+        src += n_ic;
+    }
+}
 
-                    d = (int16_t *)dst + oc;
-                    s = (int16_t *)src + ic;
+static void remap_arrange_stereo_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    const unsigned n_ic = m->i_ss.channels;
+    const int8_t *arrange = m->state;
+    const int ic0 = arrange[0], ic1 = arrange[1];
 
-                    if (vol >= 0x10000) {
-                        for (i = n; i > 0; i--, s += n_ic, d += n_oc)
-                            *d += *s;
-                    } else {
-                        for (i = n; i > 0; i--, s += n_ic, d += n_oc)
-                            *d += (int16_t) (((int32_t)*s * vol) >> 16);
-                    }
-                }
-            }
-            break;
-        }
-        default:
-            pa_assert_not_reached();
+    for (; n > 0; n--) {
+        *dst++ = (ic0 >= 0) ? *(src + ic0) : 0.0f;
+        *dst++ = (ic1 >= 0) ? *(src + ic1) : 0.0f;
+        src += n_ic;
+    }
+}
+
+static void remap_arrange_ch4_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    const unsigned n_ic = m->i_ss.channels;
+    const int8_t *arrange = m->state;
+    const int ic0 = arrange[0], ic1 = arrange[1],
+        ic2 = arrange[2], ic3 = arrange[3];
+
+    for (; n > 0; n--) {
+        *dst++ = (ic0 >= 0) ? *(src + ic0) : 0.0f;
+        *dst++ = (ic1 >= 0) ? *(src + ic1) : 0.0f;
+        *dst++ = (ic2 >= 0) ? *(src + ic2) : 0.0f;
+        *dst++ = (ic3 >= 0) ? *(src + ic3) : 0.0f;
+        src += n_ic;
     }
 }
 
+void pa_set_remap_func(pa_remap_t *m, pa_do_remap_func_t func_s16,
+    pa_do_remap_func_t func_float) {
+
+    pa_assert(m);
+
+    if (m->format == PA_SAMPLE_S16NE)
+        m->do_remap = func_s16;
+    else if (m->format == PA_SAMPLE_FLOAT32NE)
+        m->do_remap = func_float;
+    else
+        pa_assert_not_reached();
+}
+
+static bool force_generic_code = false;
+
 /* set the function that will execute the remapping based on the matrices */
 static void init_remap_c(pa_remap_t *m) {
     unsigned n_oc, n_ic;
+    int8_t arrange[PA_CHANNELS_MAX];
 
-    n_oc = m->o_ss->channels;
-    n_ic = m->i_ss->channels;
+    n_oc = m->o_ss.channels;
+    n_ic = m->i_ss.channels;
 
     /* find some common channel remappings, fall back to full matrix operation. */
+    if (force_generic_code) {
+        pa_log_info("Forced to use generic matrix remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_channels_matrix_s16ne_c,
+            (pa_do_remap_func_t) remap_channels_matrix_float32ne_c);
+        return;
+    }
+
     if (n_ic == 1 && n_oc == 2 &&
-            m->map_table_i[0][0] == PA_VOLUME_NORM && m->map_table_i[1][0] == PA_VOLUME_NORM) {
-        m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_c;
+            m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) {
+
         pa_log_info("Using mono to stereo remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_c,
+            (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_c);
+    } else if (n_ic == 2 && n_oc == 1 &&
+            m->map_table_i[0][0] == 0x8000 && m->map_table_i[0][1] == 0x8000) {
+
+        pa_log_info("Using stereo to mono remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_stereo_to_mono_s16ne_c,
+            (pa_do_remap_func_t) remap_stereo_to_mono_float32ne_c);
+    } else if (n_ic == 1 && n_oc == 4 &&
+            m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000 &&
+            m->map_table_i[2][0] == 0x10000 && m->map_table_i[3][0] == 0x10000) {
+
+        pa_log_info("Using mono to 4-channel remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t)remap_mono_to_ch4_s16ne_c,
+            (pa_do_remap_func_t) remap_mono_to_ch4_float32ne_c);
+    } else if (n_ic == 4 && n_oc == 1 &&
+            m->map_table_i[0][0] == 0x4000 && m->map_table_i[0][1] == 0x4000 &&
+            m->map_table_i[0][2] == 0x4000 && m->map_table_i[0][3] == 0x4000) {
+
+        pa_log_info("Using 4-channel to mono remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_ch4_to_mono_s16ne_c,
+            (pa_do_remap_func_t) remap_ch4_to_mono_float32ne_c);
+    } else if (pa_setup_remap_arrange(m, arrange) && n_oc == 1) {
+
+        pa_log_info("Using mono arrange remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_arrange_mono_s16ne_c,
+            (pa_do_remap_func_t) remap_arrange_mono_float32ne_c);
+
+        /* setup state */
+        m->state = pa_xnewdup(int8_t, arrange, PA_CHANNELS_MAX);
+    } else if (pa_setup_remap_arrange(m, arrange) && n_oc == 2) {
+
+        pa_log_info("Using stereo arrange remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_arrange_stereo_s16ne_c,
+            (pa_do_remap_func_t) remap_arrange_stereo_float32ne_c);
+
+        /* setup state */
+        m->state = pa_xnewdup(int8_t, arrange, PA_CHANNELS_MAX);
+    } else if (pa_setup_remap_arrange(m, arrange) && n_oc == 4) {
+
+        pa_log_info("Using 4-channel arrange remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_arrange_ch4_s16ne_c,
+            (pa_do_remap_func_t) remap_arrange_ch4_float32ne_c);
+
+        /* setup state */
+        m->state = pa_xnewdup(int8_t, arrange, PA_CHANNELS_MAX);
     } else {
-        m->do_remap = (pa_do_remap_func_t) remap_channels_matrix_c;
+
         pa_log_info("Using generic matrix remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_channels_matrix_s16ne_c,
+            (pa_do_remap_func_t) remap_channels_matrix_float32ne_c);
     }
 }
 
 /* default C implementation */
-static pa_init_remap_func_t remap_func = init_remap_c;
+static pa_init_remap_func_t init_remap_func = init_remap_c;
 
-void pa_init_remap(pa_remap_t *m) {
-    pa_assert(remap_func);
+void pa_init_remap_func(pa_remap_t *m) {
+    pa_assert(init_remap_func);
 
     m->do_remap = NULL;
 
     /* call the installed remap init function */
-    remap_func(m);
+    init_remap_func(m);
 
     if (m->do_remap == NULL) {
         /* nothing was installed, fallback to C version */
@@ -196,9 +456,13 @@ void pa_init_remap(pa_remap_t *m) {
 }
 
 pa_init_remap_func_t pa_get_init_remap_func(void) {
-    return remap_func;
+    return init_remap_func;
 }
 
 void pa_set_init_remap_func(pa_init_remap_func_t func) {
-    remap_func = func;
+    init_remap_func = func;
+}
+
+void pa_remap_func_init(const pa_cpu_info *cpu_info) {
+    force_generic_code = cpu_info->force_generic_code;
 }
diff --git a/src/pulsecore/remap.h b/src/pulsecore/remap.h
index 32a67cd..66ab7bc 100644
--- a/src/pulsecore/remap.h
+++ b/src/pulsecore/remap.h
@@ -30,14 +30,15 @@ typedef struct pa_remap pa_remap_t;
 typedef void (*pa_do_remap_func_t) (pa_remap_t *m, void *d, const void *s, unsigned n);
 
 struct pa_remap {
-    pa_sample_format_t *format;
-    pa_sample_spec *i_ss, *o_ss;
+    pa_sample_format_t format;
+    pa_sample_spec i_ss, o_ss;
     float map_table_f[PA_CHANNELS_MAX][PA_CHANNELS_MAX];
     int32_t map_table_i[PA_CHANNELS_MAX][PA_CHANNELS_MAX];
     pa_do_remap_func_t do_remap;
+    void *state; /* optional state information for the remap function */
 };
 
-void pa_init_remap (pa_remap_t *m);
+void pa_init_remap_func(pa_remap_t *m);
 
 /* custom installation of init functions */
 typedef void (*pa_init_remap_func_t) (pa_remap_t *m);
@@ -45,4 +46,17 @@ typedef void (*pa_init_remap_func_t) (pa_remap_t *m);
 pa_init_remap_func_t pa_get_init_remap_func(void);
 void pa_set_init_remap_func(pa_init_remap_func_t func);
 
+/* Check if remapping can be performed by just copying some or all input
+ * channels' data to output channels. Returns true and a table of input
+ * channel indices, or false otherwise.
+ *
+ * The table contains an entry for each output channels. Each table entry given
+ * either the input channel index to be copied, or -1 indicating that the
+ * output channel is not used and hence zero.
+ */
+bool pa_setup_remap_arrange(const pa_remap_t *m, int8_t arrange[PA_CHANNELS_MAX]);
+
+void pa_set_remap_func(pa_remap_t *m, pa_do_remap_func_t func_s16,
+    pa_do_remap_func_t func_float);
+
 #endif /* fooremapfoo */
diff --git a/src/pulsecore/remap_mmx.c b/src/pulsecore/remap_mmx.c
index 5b3f0f9..51a6da7 100644
--- a/src/pulsecore/remap_mmx.c
+++ b/src/pulsecore/remap_mmx.c
@@ -102,47 +102,42 @@
                 " emms                          \n\t"
 
 #if defined (__i386__) || defined (__amd64__)
-static void remap_mono_to_stereo_mmx(pa_remap_t *m, void *dst, const void *src, unsigned n) {
+static void remap_mono_to_stereo_s16ne_mmx(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
     pa_reg_x86 temp, temp2;
 
-    switch (*m->format) {
-        case PA_SAMPLE_FLOAT32NE:
-        {
-            __asm__ __volatile__ (
-                MONO_TO_STEREO(dq,3,7) /* do doubles to quads */
-                : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
-                : "r" ((pa_reg_x86)n)
-                : "cc"
-            );
-            break;
-        }
-        case PA_SAMPLE_S16NE:
-        {
-            __asm__ __volatile__ (
-                MONO_TO_STEREO(wd,4,15) /* do words to doubles */
-                : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
-                : "r" ((pa_reg_x86)n)
-                : "cc"
-            );
-            break;
-        }
-        default:
-            pa_assert_not_reached();
-    }
+    __asm__ __volatile__ (
+        MONO_TO_STEREO(wd,4,15) /* do words to doubles */
+        : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
+        : "r" ((pa_reg_x86)n)
+        : "cc"
+    );
+}
+
+static void remap_mono_to_stereo_float32ne_mmx(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    pa_reg_x86 temp, temp2;
+
+    __asm__ __volatile__ (
+        MONO_TO_STEREO(dq,3,7) /* do doubles to quads */
+        : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
+        : "r" ((pa_reg_x86)n)
+        : "cc"
+    );
 }
 
 /* set the function that will execute the remapping based on the matrices */
 static void init_remap_mmx(pa_remap_t *m) {
     unsigned n_oc, n_ic;
 
-    n_oc = m->o_ss->channels;
-    n_ic = m->i_ss->channels;
+    n_oc = m->o_ss.channels;
+    n_ic = m->i_ss.channels;
 
     /* find some common channel remappings, fall back to full matrix operation. */
     if (n_ic == 1 && n_oc == 2 &&
-            m->map_table_i[0][0] == PA_VOLUME_NORM && m->map_table_i[1][0] == PA_VOLUME_NORM) {
-        m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_mmx;
+            m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) {
+
         pa_log_info("Using MMX mono to stereo remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_mmx,
+            (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_mmx);
     }
 }
 #endif /* defined (__i386__) || defined (__amd64__) */
diff --git a/src/pulsecore/remap_neon.c b/src/pulsecore/remap_neon.c
new file mode 100644
index 0000000..ebacf92
--- /dev/null
+++ b/src/pulsecore/remap_neon.c
@@ -0,0 +1,498 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2013 Peter Meerwald <p.meerwald at bct-electronic.com>
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulse/sample.h>
+#include <pulse/xmalloc.h>
+#include <pulsecore/log.h>
+#include <pulsecore/macro.h>
+
+#include "cpu-arm.h"
+#include "remap.h"
+
+#include <arm_neon.h>
+
+static void remap_mono_to_stereo_float32ne_neon_a8(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    for (; n >= 4; n -= 4) {
+        __asm__ __volatile__ (
+            "vld1.32    {q0}, [%[src]]!         \n\t"
+            "vmov       q1, q0                  \n\t"
+            "vst2.32    {q0,q1}, [%[dst]]!      \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : /* input operands */
+            : "memory", "q0", "q1" /* clobber list */
+        );
+    }
+
+    for (; n > 0; n--) {
+        dst[0] = dst[1] = src[0];
+        src++;
+        dst += 2;
+    }
+}
+
+static void remap_mono_to_stereo_float32ne_generic_arm(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    for (; n >= 2; n -= 2) {
+        __asm__ __volatile__ (
+            "ldm        %[src]!, {r4,r6}        \n\t"
+            "mov        r5, r4                  \n\t"
+            "mov        r7, r6                  \n\t"
+            "stm        %[dst]!, {r4-r7}        \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : /* input operands */
+            : "memory", "r4", "r5", "r6", "r7" /* clobber list */
+        );
+    }
+
+    if (n > 0)
+        dst[0] = dst[1] = src[0];
+}
+
+static void remap_mono_to_stereo_s16ne_neon(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    for (; n >= 8; n -= 8) {
+        __asm__ __volatile__ (
+            "vld1.16    {q0}, [%[src]]!         \n\t"
+            "vmov       q1, q0                  \n\t"
+            "vst2.16    {q0,q1}, [%[dst]]!      \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : /* input operands */
+            : "memory", "q0", "q1" /* clobber list */
+        );
+    }
+
+    for (; n > 0; n--) {
+        dst[0] = dst[1] = src[0];
+        src++;
+        dst += 2;
+    }
+}
+
+static void remap_mono_to_ch4_float32ne_neon(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    for (; n >= 2; n -= 2) {
+        __asm__ __volatile__ (
+            "vld1.32    {d0}, [%[src]]!         \n\t"
+            "vdup.f32   q1, d0[0]               \n\t"
+            "vdup.f32   q2, d0[1]               \n\t"
+            "vst1.32    {q1,q2}, [%[dst]]!      \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : /* input operands */
+            : "memory", "q0", "q1", "q2" /* clobber list */
+        );
+    }
+
+    if (n--)
+        dst[0] = dst[1] = dst[2] = dst[3] = src[0];
+}
+
+static void remap_mono_to_ch4_s16ne_neon(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    for (; n >= 4; n -= 4) {
+        __asm__ __volatile__ (
+            "vld1.16    {d0}, [%[src]]!         \n\t"
+            "vdup.s16   d1, d0[1]               \n\t"
+            "vdup.s16   d2, d0[2]               \n\t"
+            "vdup.s16   d3, d0[3]               \n\t"
+            "vdup.s16   d0, d0[0]               \n\t"
+            "vst1.16    {d0,d1,d2,d3}, [%[dst]]!\n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : /* input operands */
+            : "memory", "d0", "d1", "d2", "d3" /* clobber list */
+        );
+    }
+
+    for (; n > 0; n--) {
+        dst[0] = dst[1] = dst[2] = dst[3] = src[0];
+        src++;
+        dst += 4;
+    }
+}
+
+static void remap_stereo_to_mono_float32ne_neon(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    const float32x4_t halve = vdupq_n_f32(0.5f);
+    for (; n >= 4; n -= 4) {
+        __asm__ __volatile__ (
+            "vld2.32    {q0,q1}, [%[src]]!      \n\t"
+            "vadd.f32   q0, q0, q1              \n\t"
+            "vmul.f32   q0, q0, %q[halve]       \n\t"
+            "vst1.32    {q0}, [%[dst]]!         \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [halve] "w" (halve) /* input operands */
+            : "memory", "q0", "q1" /* clobber list */
+        );
+    }
+
+    for (; n > 0; n--) {
+        dst[0] = (src[0] + src[1])*0.5f;
+        src += 2;
+        dst++;
+    }
+}
+
+static void remap_stereo_to_mono_s16ne_neon(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    for (; n >= 8; n -= 8) {
+        __asm__ __volatile__ (
+            "vld2.16    {q0,q1}, [%[src]]!      \n\t"
+            "vrhadd.s16 q0, q0, q1              \n\t"
+            "vst1.16    {q0}, [%[dst]]!         \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : /* input operands */
+            : "memory", "q0", "q1" /* clobber list */
+        );
+    }
+
+    for (; n > 0; n--) {
+        dst[0] = (src[0] + src[1])/2;
+        src += 2;
+        dst++;
+    }
+}
+
+static void remap_ch4_to_mono_float32ne_neon(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    const float32x2_t quart = vdup_n_f32(0.25f);
+    for (; n >= 2; n -= 2) {
+        __asm__ __volatile__ (
+            "vld4.32    {d0,d1,d2,d3}, [%[src]]!\n\t"
+            "vadd.f32   d0, d0, d1              \n\t"
+            "vadd.f32   d2, d2, d3              \n\t"
+            "vadd.f32   d0, d0, d2              \n\t"
+            "vmul.f32   d0, d0, %[quart]        \n\t"
+            "vst1.32    {d0}, [%[dst]]!         \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [quart] "w" (quart) /* input operands */
+            : "memory", "d0", "d1", "d2", "d3" /* clobber list */
+        );
+    }
+
+    if (n > 0)
+        dst[0] = (src[0] + src[1] + src[2] + src[3])*0.25f;
+}
+
+static void remap_ch4_to_mono_s16ne_neon(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    for (; n >= 4; n -= 4) {
+        __asm__ __volatile__ (
+            "vld4.16    {d0,d1,d2,d3}, [%[src]]!\n\t"
+            "vrhadd.s16 d0, d0, d1              \n\t"
+            "vrhadd.s16 d2, d2, d3              \n\t"
+            "vrhadd.s16 d0, d0, d2              \n\t"
+            "vst1.16    {d0}, [%[dst]]!         \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : /* input operands */
+            : "memory", "d0", "d1", "d2", "d3" /* clobber list */
+        );
+    }
+
+    for (; n > 0; n--) {
+        dst[0] = (src[0] + src[1] + src[2] + src[3])/4;
+        src += 4;
+        dst++;
+    }
+}
+
+static void remap_ch4_s16ne_neon(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    int32x4_t *f = m->state;
+    const int32x4_t f0 = f[0], f1 = f[1], f2 = f[2], f3 = f[3];
+
+    for (; n > 0; n--) {
+        __asm__ __volatile__ (
+            "vld1.16    {d0}, [%[src]]!         \n\t"
+            "vmovl.s16  q0, d0                  \n\t"
+            "vdup.s32   q1, d0[0]               \n\t"
+            "vmul.s32   q1, q1, %q[f0]          \n\t"
+            "vdup.s32   q2, d0[1]               \n\t"
+            "vmla.s32   q1, q2, %q[f1]          \n\t"
+            "vdup.s32   q2, d1[0]               \n\t"
+            "vmla.s32   q1, q2, %q[f2]          \n\t"
+            "vdup.s32   q2, d1[1]               \n\t"
+            "vmla.s32   q1, q2, %q[f3]          \n\t"
+            "vqshrn.s32  d2, q1, #16            \n\t"
+            "vst1.32    {d2}, [%[dst]]!         \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src)
+            : [f0] "w" (f0), [f1] "w" (f1), [f2] "w" (f2), [f3] "w" (f3)
+            : "memory", "q0", "q1", "q2"
+        );
+    }
+}
+
+static void remap_ch4_float32ne_neon(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    float32x4_t *f = m->state;
+    const float32x4_t f0 = f[0], f1 = f[1], f2 = f[2], f3 = f[3];
+
+    for (; n > 0; n--) {
+        __asm__ __volatile__ (
+            "vld1.32    {d0,d1}, [%[src]]!      \n\t"
+            "vdup.f32   q1, d0[0]               \n\t"
+            "vmul.f32   q1, q1, %q[f0]          \n\t"
+            "vdup.f32   q2, d0[1]               \n\t"
+            "vmla.f32   q1, q2, %q[f1]          \n\t"
+            "vdup.f32   q2, d1[0]               \n\t"
+            "vmla.f32   q1, q2, %q[f2]          \n\t"
+            "vdup.f32   q2, d1[1]               \n\t"
+            "vmla.f32   q1, q2, %q[f3]          \n\t"
+            "vst1.32    {d2,d3}, [%[dst]]!      \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src)
+            : [f0] "w" (f0), [f1] "w" (f1), [f2] "w" (f2), [f3] "w" (f3)
+            : "memory", "q0", "q1", "q2"
+        );
+    }
+}
+
+static void remap_arrange_stereo_s16ne_neon(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    const uint8x8_t t = ((uint8x8_t *) m->state)[0];
+
+    for (; n >= 2; n -= 2) {
+        __asm__ __volatile__ (
+            "vld1.s16   d0, [%[src]]!           \n\t"
+            "vtbl.8     d0, {d0}, %[t]          \n\t"
+            "vst1.s16   d0, [%[dst]]!           \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [t] "w" (t) /* input operands */
+            : "memory", "d0" /* clobber list */
+        );
+    }
+
+    if (n > 0) {
+        __asm__ __volatile__ (
+            "vld1.32   d0[0], [%[src]]!         \n\t"
+            "vtbl.8    d0, {d0}, %[t]           \n\t"
+            "vst1.32   d0[0], [%[dst]]!         \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [t] "w" (t) /* input operands */
+            : "memory", "d0" /* clobber list */
+        );
+    }
+}
+
+static void remap_arrange_ch2_ch4_s16ne_neon(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    const uint8x8_t t = ((uint8x8_t *) m->state)[0];
+
+    for (; n > 0; n--) {
+        __asm__ __volatile__ (
+            "vld1.32    d0[0], [%[src]]!           \n\t"
+            "vtbl.8     d0, {d0}, %[t]          \n\t"
+            "vst1.s16   d0, [%[dst]]!           \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [t] "w" (t) /* input operands */
+            : "memory", "d0" /* clobber list */
+        );
+    }
+}
+
+static void remap_arrange_ch4_s16ne_neon(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
+    const uint8x8_t t = ((uint8x8_t *) m->state)[0];
+
+    for (; n > 0; n--) {
+        __asm__ __volatile__ (
+            "vld1.s16   d0, [%[src]]!           \n\t"
+            "vtbl.8     d0, {d0}, %[t]          \n\t"
+            "vst1.s16   d0, [%[dst]]!           \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [t] "w" (t) /* input operands */
+            : "memory", "d0" /* clobber list */
+        );
+    }
+}
+
+static void remap_arrange_stereo_float32ne_neon(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    const uint8x8_t t = ((uint8x8_t *)m->state)[0];
+
+    for (; n > 0; n--) {
+        __asm__ __volatile__ (
+            "vld1.f32   d0, [%[src]]!           \n\t"
+            "vtbl.8     d0, {d0}, %[t]          \n\t"
+            "vst1.s16   {d0}, [%[dst]]!         \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [t] "w" (t) /* input operands */
+            : "memory", "d0" /* clobber list */
+        );
+    }
+}
+
+static void remap_arrange_ch2_ch4_float32ne_neon(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    const uint8x8_t t0 = ((uint8x8_t *)m->state)[0];
+    const uint8x8_t t1 = ((uint8x8_t *)m->state)[1];
+
+    for (; n > 0; n--) {
+        __asm__ __volatile__ (
+            "vld1.f32   d0, [%[src]]!           \n\t"
+            "vtbl.8     d1, {d0}, %[t0]         \n\t"
+            "vtbl.8     d2, {d0}, %[t1]         \n\t"
+            "vst1.s16   {d1,d2}, [%[dst]]!      \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [t0] "w" (t0), [t1] "w" (t1) /* input operands */
+            : "memory", "d0", "d1", "d2" /* clobber list */
+        );
+    }
+}
+
+static void remap_arrange_ch4_float32ne_neon(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    const uint8x8_t t0 = ((uint8x8_t *)m->state)[0];
+    const uint8x8_t t1 = ((uint8x8_t *)m->state)[1];
+
+    for (; n > 0; n--) {
+        __asm__ __volatile__ (
+            "vld1.f32   {d0,d1}, [%[src]]!      \n\t"
+            "vtbl.8     d2, {d0,d1}, %[t0]      \n\t"
+            "vtbl.8     d3, {d0,d1}, %[t1]      \n\t"
+            "vst1.s16   {d2,d3}, [%[dst]]!      \n\t"
+            : [dst] "+r" (dst), [src] "+r" (src) /* output operands */
+            : [t0] "w" (t0), [t1] "w" (t1) /* input operands */
+            : "memory", "d0", "d1", "d2", "d3" /* clobber list */
+        );
+    }
+}
+
+static pa_cpu_arm_flag_t arm_flags;
+
+static void init_remap_neon(pa_remap_t *m) {
+    unsigned n_oc, n_ic;
+    int8_t arrange[PA_CHANNELS_MAX];
+
+    n_oc = m->o_ss.channels;
+    n_ic = m->i_ss.channels;
+
+    if (n_ic == 1 && n_oc == 2 &&
+            m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) {
+        if (arm_flags & PA_CPU_ARM_CORTEX_A8) {
+
+            pa_log_info("Using ARM NEON/A8 mono to stereo remapping");
+            pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_neon,
+                (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_neon_a8);
+        }
+        else {
+            pa_log_info("Using ARM NEON mono to stereo remapping");
+            pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_neon,
+                (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_generic_arm);
+        }
+    } else if (n_ic == 1 && n_oc == 4 &&
+            m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000 &&
+            m->map_table_i[2][0] == 0x10000 && m->map_table_i[3][0] == 0x10000) {
+
+        pa_log_info("Using ARM NEON mono to 4-channel remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_ch4_s16ne_neon,
+            (pa_do_remap_func_t) remap_mono_to_ch4_float32ne_neon);
+    } else if (n_ic == 2 && n_oc == 1 &&
+            m->map_table_i[0][0] == 0x8000 && m->map_table_i[0][1] == 0x8000) {
+
+        pa_log_info("Using ARM NEON stereo to mono remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_stereo_to_mono_s16ne_neon,
+            (pa_do_remap_func_t) remap_stereo_to_mono_float32ne_neon);
+    } else if (n_ic == 4 && n_oc == 1 &&
+            m->map_table_i[0][0] == 0x4000 && m->map_table_i[0][1] == 0x4000 &&
+            m->map_table_i[0][2] == 0x4000 && m->map_table_i[0][3] == 0x4000) {
+
+        pa_log_info("Using ARM NEON 4-channel to mono remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_ch4_to_mono_s16ne_neon,
+            (pa_do_remap_func_t) remap_ch4_to_mono_float32ne_neon);
+    } else if (pa_setup_remap_arrange(m, arrange) &&
+        ((n_ic == 2 && n_oc == 2) ||
+         (n_ic == 2 && n_oc == 4) ||
+         (n_ic == 4 && n_oc == 4))) {
+        unsigned o;
+
+        if (n_ic == 2 && n_oc == 2) {
+            pa_log_info("Using NEON stereo arrange remapping");
+            pa_set_remap_func(m, (pa_do_remap_func_t) remap_arrange_stereo_s16ne_neon,
+                (pa_do_remap_func_t) remap_arrange_stereo_float32ne_neon);
+        } else if (n_ic == 2 && n_oc == 4) {
+            pa_log_info("Using NEON 2-channel to 4-channel arrange remapping");
+            pa_set_remap_func(m, (pa_do_remap_func_t) remap_arrange_ch2_ch4_s16ne_neon,
+                (pa_do_remap_func_t) remap_arrange_ch2_ch4_float32ne_neon);
+        } else if (n_ic == 4 && n_oc == 4) {
+            pa_log_info("Using NEON 4-channel arrange remapping");
+            pa_set_remap_func(m, (pa_do_remap_func_t) remap_arrange_ch4_s16ne_neon,
+                (pa_do_remap_func_t) remap_arrange_ch4_float32ne_neon);
+        }
+
+        /* setup state */
+        switch (m->format) {
+        case PA_SAMPLE_S16NE: {
+            uint8x8_t *t = m->state = pa_xnew0(uint8x8_t, 1);
+            for (o = 0; o < 4; o++) {
+                if (arrange[o % n_oc] >= 0) {
+                    /* convert channel index to vtbl indices */
+                    unsigned frame = o / n_oc;
+                    ((uint8_t *) t)[o * 2 + 0] = (frame * n_oc + arrange[o % n_oc]) * 2 + 0;
+                    ((uint8_t *) t)[o * 2 + 1] = (frame * n_oc + arrange[o % n_oc]) * 2 + 1;
+                } else {
+                    /* use invalid table indices to map to 0 */
+                    ((uint8_t *) t)[o * 2 + 0] = 0xff;
+                    ((uint8_t *) t)[o * 2 + 1] = 0xff;
+                }
+            }
+            break;
+        }
+        case PA_SAMPLE_FLOAT32NE: {
+            uint8x8_t *t = m->state = pa_xnew0(uint8x8_t, 2);
+            for (o = 0; o < n_oc; o++) {
+                if (arrange[o] >= 0) {
+                    /* convert channel index to vtbl indices */
+                    ((uint8_t *) t)[o * 4 + 0] = arrange[o] * 4 + 0;
+                    ((uint8_t *) t)[o * 4 + 1] = arrange[o] * 4 + 1;
+                    ((uint8_t *) t)[o * 4 + 2] = arrange[o] * 4 + 2;
+                    ((uint8_t *) t)[o * 4 + 3] = arrange[o] * 4 + 3;
+                } else {
+                    /* use invalid table indices to map to 0 */
+                    ((uint8_t *) t)[o * 4 + 0] = 0xff;
+                    ((uint8_t *) t)[o * 4 + 1] = 0xff;
+                    ((uint8_t *) t)[o * 4 + 2] = 0xff;
+                    ((uint8_t *) t)[o * 4 + 3] = 0xff;
+                }
+            }
+            break;
+        }
+        default:
+            pa_assert_not_reached();
+        }
+    } else if (n_ic == 4 && n_oc == 4) {
+        unsigned i, o;
+
+        pa_log_info("Using ARM NEON 4-channel remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_ch4_s16ne_neon,
+            (pa_do_remap_func_t) remap_ch4_float32ne_neon);
+
+        /* setup state */
+        switch (m->format) {
+        case PA_SAMPLE_S16NE: {
+            int32x4_t *f = m->state = pa_xnew0(int32x4_t, 4);
+            for (o = 0; o < 4; o++) {
+                for (i = 0; i < 4; i++) {
+                    ((int *) &f[i])[o] = PA_CLAMP_UNLIKELY(m->map_table_i[o][i], 0, 0x10000);
+                }
+            }
+            break;
+        }
+        case PA_SAMPLE_FLOAT32NE: {
+            float32x4_t *f = m->state = pa_xnew0(float32x4_t, 4);
+            for (o = 0; o < 4; o++) {
+                for (i = 0; i < 4; i++) {
+                    ((float *) &f[i])[o] = PA_CLAMP_UNLIKELY(m->map_table_f[o][i], 0.0f, 1.0f);
+                }
+            }
+            break;
+        }
+        default:
+            pa_assert_not_reached();
+        }
+    }
+}
+
+void pa_remap_func_init_neon(pa_cpu_arm_flag_t flags) {
+    pa_log_info("Initialising ARM NEON optimized remappers.");
+    arm_flags = flags;
+    pa_set_init_remap_func((pa_init_remap_func_t) init_remap_neon);
+}
diff --git a/src/pulsecore/remap_sse.c b/src/pulsecore/remap_sse.c
index 8831723..d502ece 100644
--- a/src/pulsecore/remap_sse.c
+++ b/src/pulsecore/remap_sse.c
@@ -101,47 +101,42 @@
                 "4:                             \n\t"
 
 #if defined (__i386__) || defined (__amd64__)
-static void remap_mono_to_stereo_sse2(pa_remap_t *m, void *dst, const void *src, unsigned n) {
+static void remap_mono_to_stereo_s16ne_sse2(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
     pa_reg_x86 temp, temp2;
 
-    switch (*m->format) {
-        case PA_SAMPLE_FLOAT32NE:
-        {
-            __asm__ __volatile__ (
-                MONO_TO_STEREO(dq, 4, 15) /* do doubles to quads */
-                : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
-                : "r" ((pa_reg_x86)n)
-                : "cc"
-            );
-            break;
-        }
-        case PA_SAMPLE_S16NE:
-        {
-            __asm__ __volatile__ (
-                MONO_TO_STEREO(wd, 5, 31) /* do words to doubles */
-                : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
-                : "r" ((pa_reg_x86)n)
-                : "cc"
-            );
-            break;
-        }
-        default:
-            pa_assert_not_reached();
-    }
+    __asm__ __volatile__ (
+        MONO_TO_STEREO(wd, 5, 31) /* do words to doubles */
+        : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
+        : "r" ((pa_reg_x86)n)
+        : "cc"
+    );
+}
+
+static void remap_mono_to_stereo_float32ne_sse2(pa_remap_t *m, float *dst, const float *src, unsigned n) {
+    pa_reg_x86 temp, temp2;
+
+    __asm__ __volatile__ (
+        MONO_TO_STEREO(dq, 4, 15) /* do doubles to quads */
+        : "+r" (dst), "+r" (src), "=&r" (temp), "=&r" (temp2)
+        : "r" ((pa_reg_x86)n)
+        : "cc"
+    );
 }
 
 /* set the function that will execute the remapping based on the matrices */
 static void init_remap_sse2(pa_remap_t *m) {
     unsigned n_oc, n_ic;
 
-    n_oc = m->o_ss->channels;
-    n_ic = m->i_ss->channels;
+    n_oc = m->o_ss.channels;
+    n_ic = m->i_ss.channels;
 
     /* find some common channel remappings, fall back to full matrix operation. */
     if (n_ic == 1 && n_oc == 2 &&
-            m->map_table_i[0][0] == PA_VOLUME_NORM && m->map_table_i[1][0] == PA_VOLUME_NORM) {
-        m->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo_sse2;
+            m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) {
+
         pa_log_info("Using SSE2 mono to stereo remapping");
+        pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_sse2,
+            (pa_do_remap_func_t) remap_mono_to_stereo_float32ne_sse2);
     }
 }
 #endif /* defined (__i386__) || defined (__amd64__) */
diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index 38389f3..183d05f 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -25,104 +25,33 @@
 
 #include <string.h>
 
-#ifdef HAVE_LIBSAMPLERATE
-#include <samplerate.h>
-#endif
-
-#ifdef HAVE_SPEEX
-#include <speex/speex_resampler.h>
-#endif
-
 #include <pulse/xmalloc.h>
-#include <pulsecore/sconv.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/strbuf.h>
-#include <pulsecore/remap.h>
 #include <pulsecore/core-util.h>
-#include "ffmpeg/avcodec.h"
 
 #include "resampler.h"
 
 /* Number of samples of extra space we allow the resamplers to return */
 #define EXTRA_FRAMES 128
 
-struct pa_resampler {
-    pa_resample_method_t method;
-    pa_resample_flags_t flags;
-
-    pa_sample_spec i_ss, o_ss;
-    pa_channel_map i_cm, o_cm;
-    size_t i_fz, o_fz, w_fz, w_sz;
-    pa_mempool *mempool;
-
-    pa_memchunk to_work_format_buf;
-    pa_memchunk remap_buf;
-    pa_memchunk resample_buf;
-    pa_memchunk from_work_format_buf;
-    size_t to_work_format_buf_size;
-    size_t remap_buf_size;
-    size_t resample_buf_size;
-    size_t from_work_format_buf_size;
-
-    /* points to buffer before resampling stage, remap or to_work */
-    pa_memchunk *leftover_buf;
-    size_t *leftover_buf_size;
-
-    /* have_leftover points to leftover_in_remap or leftover_in_to_work */
-    bool *have_leftover;
-    bool leftover_in_remap;
-    bool leftover_in_to_work;
-
-    pa_sample_format_t work_format;
-    uint8_t work_channels;
-
-    pa_convert_func_t to_work_format_func;
-    pa_convert_func_t from_work_format_func;
-
-    pa_remap_t remap;
-    bool map_required;
-
-    pa_resampler_impl impl;
-};
-
-struct trivial_data { /* data specific to the trivial resampler */
-    unsigned o_counter;
-    unsigned i_counter;
-};
-
-struct peaks_data { /* data specific to the peak finder pseudo resampler */
-    unsigned o_counter;
-    unsigned i_counter;
-
-    float max_f[PA_CHANNELS_MAX];
-    int16_t max_i[PA_CHANNELS_MAX];
-};
-
 struct ffmpeg_data { /* data specific to ffmpeg */
     struct AVResampleContext *state;
 };
 
 static int copy_init(pa_resampler *r);
-static int trivial_init(pa_resampler*r);
-#ifdef HAVE_SPEEX
-static int speex_init(pa_resampler*r);
-#endif
-static int ffmpeg_init(pa_resampler*r);
-static int peaks_init(pa_resampler*r);
-#ifdef HAVE_LIBSAMPLERATE
-static int libsamplerate_init(pa_resampler*r);
-#endif
 
-static void calc_map_table(pa_resampler *r);
+static void setup_remap(const pa_resampler *r, pa_remap_t *m);
+static void free_remap(pa_remap_t *m);
 
-static int (* const init_table[])(pa_resampler*r) = {
+static int (* const init_table[])(pa_resampler *r) = {
 #ifdef HAVE_LIBSAMPLERATE
-    [PA_RESAMPLER_SRC_SINC_BEST_QUALITY]   = libsamplerate_init,
-    [PA_RESAMPLER_SRC_SINC_MEDIUM_QUALITY] = libsamplerate_init,
-    [PA_RESAMPLER_SRC_SINC_FASTEST]        = libsamplerate_init,
-    [PA_RESAMPLER_SRC_ZERO_ORDER_HOLD]     = libsamplerate_init,
-    [PA_RESAMPLER_SRC_LINEAR]              = libsamplerate_init,
+    [PA_RESAMPLER_SRC_SINC_BEST_QUALITY]   = pa_resampler_libsamplerate_init,
+    [PA_RESAMPLER_SRC_SINC_MEDIUM_QUALITY] = pa_resampler_libsamplerate_init,
+    [PA_RESAMPLER_SRC_SINC_FASTEST]        = pa_resampler_libsamplerate_init,
+    [PA_RESAMPLER_SRC_ZERO_ORDER_HOLD]     = pa_resampler_libsamplerate_init,
+    [PA_RESAMPLER_SRC_LINEAR]              = pa_resampler_libsamplerate_init,
 #else
     [PA_RESAMPLER_SRC_SINC_BEST_QUALITY]   = NULL,
     [PA_RESAMPLER_SRC_SINC_MEDIUM_QUALITY] = NULL,
@@ -130,30 +59,30 @@ static int (* const init_table[])(pa_resampler*r) = {
     [PA_RESAMPLER_SRC_ZERO_ORDER_HOLD]     = NULL,
     [PA_RESAMPLER_SRC_LINEAR]              = NULL,
 #endif
-    [PA_RESAMPLER_TRIVIAL]                 = trivial_init,
+    [PA_RESAMPLER_TRIVIAL]                 = pa_resampler_trivial_init,
 #ifdef HAVE_SPEEX
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+0]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+1]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+2]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+3]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+4]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+5]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+6]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+7]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+8]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+9]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FLOAT_BASE+10]     = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+0]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+1]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+2]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+3]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+4]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+5]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+6]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+7]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+8]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+9]      = speex_init,
-    [PA_RESAMPLER_SPEEX_FIXED_BASE+10]     = speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+0]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+1]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+2]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+3]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+4]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+5]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+6]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+7]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+8]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+9]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FLOAT_BASE+10]     = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+0]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+1]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+2]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+3]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+4]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+5]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+6]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+7]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+8]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+9]      = pa_resampler_speex_init,
+    [PA_RESAMPLER_SPEEX_FIXED_BASE+10]     = pa_resampler_speex_init,
 #else
     [PA_RESAMPLER_SPEEX_FLOAT_BASE+0]      = NULL,
     [PA_RESAMPLER_SPEEX_FLOAT_BASE+1]      = NULL,
@@ -178,10 +107,10 @@ static int (* const init_table[])(pa_resampler*r) = {
     [PA_RESAMPLER_SPEEX_FIXED_BASE+9]      = NULL,
     [PA_RESAMPLER_SPEEX_FIXED_BASE+10]     = NULL,
 #endif
-    [PA_RESAMPLER_FFMPEG]                  = ffmpeg_init,
+    [PA_RESAMPLER_FFMPEG]                  = pa_resampler_ffmpeg_init,
     [PA_RESAMPLER_AUTO]                    = NULL,
     [PA_RESAMPLER_COPY]                    = copy_init,
-    [PA_RESAMPLER_PEAKS]                   = peaks_init,
+    [PA_RESAMPLER_PEAKS]                   = pa_resampler_peaks_init,
 };
 
 static pa_resample_method_t choose_auto_resampler(pa_resample_flags_t flags) {
@@ -197,7 +126,7 @@ static pa_resample_method_t choose_auto_resampler(pa_resample_flags_t flags) {
     return method;
 }
 
-static pa_resample_method_t pa_resampler_fix_method(
+static pa_resample_method_t fix_method(
                 pa_resample_flags_t flags,
                 pa_resample_method_t method,
                 const uint32_t rate_a,
@@ -249,6 +178,23 @@ static pa_resample_method_t pa_resampler_fix_method(
     if (method == PA_RESAMPLER_AUTO)
         method = choose_auto_resampler(flags);
 
+#ifdef HAVE_SPEEX
+    /* At this point, method is supported in the sense that it
+     * has an init function and supports the required flags. However,
+     * speex-float implementation in PulseAudio relies on the
+     * assumption that is invalid if speex has been compiled with
+     * --enable-fixed-point. Besides, speex-fixed is more efficient
+     * in this configuration. So use it instead.
+     */
+    if (method >= PA_RESAMPLER_SPEEX_FLOAT_BASE && method <= PA_RESAMPLER_SPEEX_FLOAT_MAX) {
+        if (pa_speex_is_fixed_point()) {
+            pa_log_info("Speex appears to be compiled with --enable-fixed-point. "
+                        "Switching to a fixed-point resampler because it should be faster.");
+            method = method - PA_RESAMPLER_SPEEX_FLOAT_BASE + PA_RESAMPLER_SPEEX_FIXED_BASE;
+        }
+    }
+#endif
+
     return method;
 }
 
@@ -288,7 +234,7 @@ static bool sample_format_more_precise(pa_sample_format_t a, pa_sample_format_t
         case PA_SAMPLE_S32LE:
         case PA_SAMPLE_S32BE:
             if (b == PA_SAMPLE_FLOAT32LE || b == PA_SAMPLE_FLOAT32BE ||
-                b == PA_SAMPLE_S32LE || b == PA_SAMPLE_FLOAT32BE)
+                b == PA_SAMPLE_S32LE || b == PA_SAMPLE_S32BE)
                 return false;
             else
                 return true;
@@ -299,7 +245,7 @@ static bool sample_format_more_precise(pa_sample_format_t a, pa_sample_format_t
     }
 }
 
-static pa_sample_format_t pa_resampler_choose_work_format(
+static pa_sample_format_t choose_work_format(
                     pa_resample_method_t method,
                     pa_sample_format_t a,
                     pa_sample_format_t b,
@@ -367,7 +313,7 @@ pa_resampler* pa_resampler_new(
     pa_assert(method >= 0);
     pa_assert(method < PA_RESAMPLER_MAX);
 
-    method = pa_resampler_fix_method(flags, method, a->rate, b->rate);
+    method = fix_method(flags, method, a->rate, b->rate);
 
     r = pa_xnew0(pa_resampler, 1);
     r->mempool = pool;
@@ -378,11 +324,6 @@ pa_resampler* pa_resampler_new(
     r->i_ss = *a;
     r->o_ss = *b;
 
-    /* set up the remap structure */
-    r->remap.i_ss = &r->i_ss;
-    r->remap.o_ss = &r->o_ss;
-    r->remap.format = &r->work_format;
-
     if (am)
         r->i_cm = *am;
     else if (!pa_channel_map_init_auto(&r->i_cm, r->i_ss.channels, PA_CHANNEL_MAP_DEFAULT))
@@ -396,9 +337,10 @@ pa_resampler* pa_resampler_new(
     r->i_fz = pa_frame_size(a);
     r->o_fz = pa_frame_size(b);
 
-    calc_map_table(r);
+    r->map_required = (r->i_ss.channels != r->o_ss.channels || (!(r->flags & PA_RESAMPLER_NO_REMAP) &&
+        !pa_channel_map_equal(&r->i_cm, &r->o_cm)));
 
-    r->work_format = pa_resampler_choose_work_format(method, a->format, b->format, r->map_required);
+    r->work_format = choose_work_format(method, a->format, b->format, r->map_required);
     r->w_sz = pa_sample_size_of_format(r->work_format);
 
     if (r->i_ss.format != r->work_format) {
@@ -448,6 +390,10 @@ pa_resampler* pa_resampler_new(
                  pa_sample_format_to_string(b->format), pa_sample_format_to_string(r->work_format));
     pa_log_debug("  channels %d -> %d (resampling %d)", a->channels, b->channels, r->work_channels);
 
+    /* set up the remap structure */
+    if (r->map_required)
+        setup_remap(r, &r->remap);
+
     /* initialize implementation */
     if (init_table[method](r) < 0)
         goto fail;
@@ -477,6 +423,8 @@ void pa_resampler_free(pa_resampler *r) {
     if (r->from_work_format_buf.memblock)
         pa_memblock_unref(r->from_work_format_buf.memblock);
 
+    free_remap(&r->remap);
+
     pa_xfree(r);
 }
 
@@ -785,39 +733,33 @@ static int front_rear_side(pa_channel_position_t p) {
     return ON_OTHER;
 }
 
-static void calc_map_table(pa_resampler *r) {
+static void setup_remap(const pa_resampler *r, pa_remap_t *m) {
     unsigned oc, ic;
     unsigned n_oc, n_ic;
     bool ic_connected[PA_CHANNELS_MAX];
-    bool remix;
     pa_strbuf *s;
     char *t;
-    pa_remap_t *m;
 
     pa_assert(r);
-
-    if (!(r->map_required = (r->i_ss.channels != r->o_ss.channels || (!(r->flags & PA_RESAMPLER_NO_REMAP) && !pa_channel_map_equal(&r->i_cm, &r->o_cm)))))
-        return;
-
-    m = &r->remap;
+    pa_assert(m);
 
     n_oc = r->o_ss.channels;
     n_ic = r->i_ss.channels;
 
+    m->format = r->work_format;
+    m->i_ss = r->i_ss;
+    m->o_ss = r->o_ss;
+
     memset(m->map_table_f, 0, sizeof(m->map_table_f));
     memset(m->map_table_i, 0, sizeof(m->map_table_i));
 
     memset(ic_connected, 0, sizeof(ic_connected));
-    remix = (r->flags & (PA_RESAMPLER_NO_REMAP | PA_RESAMPLER_NO_REMIX)) == 0;
 
     if (r->flags & PA_RESAMPLER_NO_REMAP) {
-        pa_assert(!remix);
-
         for (oc = 0; oc < PA_MIN(n_ic, n_oc); oc++)
             m->map_table_f[oc][oc] = 1.0f;
 
     } else if (r->flags & PA_RESAMPLER_NO_REMIX) {
-        pa_assert(!remix);
         for (oc = 0; oc < n_oc; oc++) {
             pa_channel_position_t b = r->o_cm.map[oc];
 
@@ -902,8 +844,6 @@ static void calc_map_table(pa_resampler *r) {
             ic_unconnected_lfe = 0;
         bool ic_unconnected_center_mixed_in = 0;
 
-        pa_assert(remix);
-
         for (ic = 0; ic < n_ic; ic++) {
             if (on_left(r->i_cm.map[ic]))
                 ic_left++;
@@ -1150,7 +1090,13 @@ static void calc_map_table(pa_resampler *r) {
     pa_xfree(t);
 
     /* initialize the remapping function */
-    pa_init_remap(m);
+    pa_init_remap_func(m);
+}
+
+static void free_remap(pa_remap_t *m) {
+    pa_assert(m);
+
+    pa_xfree(m->state);
 }
 
 /* check if buf's memblock is large enough to hold 'len' bytes; create a
@@ -1383,501 +1329,6 @@ void pa_resampler_run(pa_resampler *r, const pa_memchunk *in, pa_memchunk *out)
         pa_memchunk_reset(out);
 }
 
-/*** libsamplerate based implementation ***/
-
-#ifdef HAVE_LIBSAMPLERATE
-static unsigned libsamplerate_resample(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
-    SRC_DATA data;
-    SRC_STATE *state;
-
-    pa_assert(r);
-    pa_assert(input);
-    pa_assert(output);
-    pa_assert(out_n_frames);
-
-    state = r->impl.data;
-    memset(&data, 0, sizeof(data));
-
-    data.data_in = pa_memblock_acquire_chunk(input);
-    data.input_frames = (long int) in_n_frames;
-
-    data.data_out = pa_memblock_acquire_chunk(output);
-    data.output_frames = (long int) *out_n_frames;
-
-    data.src_ratio = (double) r->o_ss.rate / r->i_ss.rate;
-    data.end_of_input = 0;
-
-    pa_assert_se(src_process(state, &data) == 0);
-
-    pa_memblock_release(input->memblock);
-    pa_memblock_release(output->memblock);
-
-    *out_n_frames = (unsigned) data.output_frames_gen;
-
-    return in_n_frames - data.input_frames_used;
-}
-
-static void libsamplerate_update_rates(pa_resampler *r) {
-    SRC_STATE *state;
-    pa_assert(r);
-
-    state = r->impl.data;
-    pa_assert_se(src_set_ratio(state, (double) r->o_ss.rate / r->i_ss.rate) == 0);
-}
-
-static void libsamplerate_reset(pa_resampler *r) {
-    SRC_STATE *state;
-    pa_assert(r);
-
-    state = r->impl.data;
-    pa_assert_se(src_reset(state) == 0);
-}
-
-static void libsamplerate_free(pa_resampler *r) {
-    SRC_STATE *state;
-    pa_assert(r);
-
-    state = r->impl.data;
-    if (state)
-        src_delete(state);
-}
-
-static int libsamplerate_init(pa_resampler *r) {
-    int err;
-    SRC_STATE *state;
-
-    pa_assert(r);
-
-    if (!(state = src_new(r->method, r->work_channels, &err)))
-        return -1;
-
-    r->impl.free = libsamplerate_free;
-    r->impl.update_rates = libsamplerate_update_rates;
-    r->impl.resample = libsamplerate_resample;
-    r->impl.reset = libsamplerate_reset;
-    r->impl.data = state;
-
-    return 0;
-}
-#endif
-
-#ifdef HAVE_SPEEX
-/*** speex based implementation ***/
-
-static unsigned speex_resample_float(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
-    float *in, *out;
-    uint32_t inf = in_n_frames, outf = *out_n_frames;
-    SpeexResamplerState *state;
-
-    pa_assert(r);
-    pa_assert(input);
-    pa_assert(output);
-    pa_assert(out_n_frames);
-
-    state = r->impl.data;
-
-    in = pa_memblock_acquire_chunk(input);
-    out = pa_memblock_acquire_chunk(output);
-
-    pa_assert_se(speex_resampler_process_interleaved_float(state, in, &inf, out, &outf) == 0);
-
-    pa_memblock_release(input->memblock);
-    pa_memblock_release(output->memblock);
-
-    pa_assert(inf == in_n_frames);
-    *out_n_frames = outf;
-
-    return 0;
-}
-
-static unsigned speex_resample_int(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
-    int16_t *in, *out;
-    uint32_t inf = in_n_frames, outf = *out_n_frames;
-    SpeexResamplerState *state;
-
-    pa_assert(r);
-    pa_assert(input);
-    pa_assert(output);
-    pa_assert(out_n_frames);
-
-    state = r->impl.data;
-
-    in = pa_memblock_acquire_chunk(input);
-    out = pa_memblock_acquire_chunk(output);
-
-    pa_assert_se(speex_resampler_process_interleaved_int(state, in, &inf, out, &outf) == 0);
-
-    pa_memblock_release(input->memblock);
-    pa_memblock_release(output->memblock);
-
-    pa_assert(inf == in_n_frames);
-    *out_n_frames = outf;
-
-    return 0;
-}
-
-static void speex_update_rates(pa_resampler *r) {
-    SpeexResamplerState *state;
-    pa_assert(r);
-
-    state = r->impl.data;
-
-    pa_assert_se(speex_resampler_set_rate(state, r->i_ss.rate, r->o_ss.rate) == 0);
-}
-
-static void speex_reset(pa_resampler *r) {
-    SpeexResamplerState *state;
-    pa_assert(r);
-
-    state = r->impl.data;
-
-    pa_assert_se(speex_resampler_reset_mem(state) == 0);
-}
-
-static void speex_free(pa_resampler *r) {
-    SpeexResamplerState *state;
-    pa_assert(r);
-
-    state = r->impl.data;
-    if (!state)
-        return;
-
-    speex_resampler_destroy(state);
-}
-
-static int speex_init(pa_resampler *r) {
-    int q, err;
-    SpeexResamplerState *state;
-
-    pa_assert(r);
-
-    r->impl.free = speex_free;
-    r->impl.update_rates = speex_update_rates;
-    r->impl.reset = speex_reset;
-
-    if (r->method >= PA_RESAMPLER_SPEEX_FIXED_BASE && r->method <= PA_RESAMPLER_SPEEX_FIXED_MAX) {
-
-        q = r->method - PA_RESAMPLER_SPEEX_FIXED_BASE;
-        r->impl.resample = speex_resample_int;
-
-    } else {
-        pa_assert(r->method >= PA_RESAMPLER_SPEEX_FLOAT_BASE && r->method <= PA_RESAMPLER_SPEEX_FLOAT_MAX);
-
-        q = r->method - PA_RESAMPLER_SPEEX_FLOAT_BASE;
-        r->impl.resample = speex_resample_float;
-    }
-
-    pa_log_info("Choosing speex quality setting %i.", q);
-
-    if (!(state = speex_resampler_init(r->work_channels, r->i_ss.rate, r->o_ss.rate, q, &err)))
-        return -1;
-
-    r->impl.data = state;
-
-    return 0;
-}
-#endif
-
-/* Trivial implementation */
-
-static unsigned trivial_resample(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
-    unsigned i_index, o_index;
-    void *src, *dst;
-    struct trivial_data *trivial_data;
-
-    pa_assert(r);
-    pa_assert(input);
-    pa_assert(output);
-    pa_assert(out_n_frames);
-
-    trivial_data = r->impl.data;
-
-    src = pa_memblock_acquire_chunk(input);
-    dst = pa_memblock_acquire_chunk(output);
-
-    for (o_index = 0;; o_index++, trivial_data->o_counter++) {
-        i_index = ((uint64_t) trivial_data->o_counter * r->i_ss.rate) / r->o_ss.rate;
-        i_index = i_index > trivial_data->i_counter ? i_index - trivial_data->i_counter : 0;
-
-        if (i_index >= in_n_frames)
-            break;
-
-        pa_assert_fp(o_index * r->w_fz < pa_memblock_get_length(output->memblock));
-
-        memcpy((uint8_t*) dst + r->w_fz * o_index, (uint8_t*) src + r->w_fz * i_index, (int) r->w_fz);
-    }
-
-    pa_memblock_release(input->memblock);
-    pa_memblock_release(output->memblock);
-
-    *out_n_frames = o_index;
-
-    trivial_data->i_counter += in_n_frames;
-
-    /* Normalize counters */
-    while (trivial_data->i_counter >= r->i_ss.rate) {
-        pa_assert(trivial_data->o_counter >= r->o_ss.rate);
-
-        trivial_data->i_counter -= r->i_ss.rate;
-        trivial_data->o_counter -= r->o_ss.rate;
-    }
-
-    return 0;
-}
-
-static void trivial_update_rates_or_reset(pa_resampler *r) {
-    struct trivial_data *trivial_data;
-    pa_assert(r);
-
-    trivial_data = r->impl.data;
-
-    trivial_data->i_counter = 0;
-    trivial_data->o_counter = 0;
-}
-
-static int trivial_init(pa_resampler*r) {
-    struct trivial_data *trivial_data;
-    pa_assert(r);
-
-    trivial_data = pa_xnew0(struct trivial_data, 1);
-
-    r->impl.resample = trivial_resample;
-    r->impl.update_rates = trivial_update_rates_or_reset;
-    r->impl.reset = trivial_update_rates_or_reset;
-    r->impl.data = trivial_data;
-
-    return 0;
-}
-
-/* Peak finder implementation */
-
-static unsigned peaks_resample(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
-    unsigned c, o_index = 0;
-    unsigned i, i_end = 0;
-    void *src, *dst;
-    struct peaks_data *peaks_data;
-
-    pa_assert(r);
-    pa_assert(input);
-    pa_assert(output);
-    pa_assert(out_n_frames);
-
-    peaks_data = r->impl.data;
-    src = pa_memblock_acquire_chunk(input);
-    dst = pa_memblock_acquire_chunk(output);
-
-    i = ((uint64_t) peaks_data->o_counter * r->i_ss.rate) / r->o_ss.rate;
-    i = i > peaks_data->i_counter ? i - peaks_data->i_counter : 0;
-
-    while (i_end < in_n_frames) {
-        i_end = ((uint64_t) (peaks_data->o_counter + 1) * r->i_ss.rate) / r->o_ss.rate;
-        i_end = i_end > peaks_data->i_counter ? i_end - peaks_data->i_counter : 0;
-
-        pa_assert_fp(o_index * r->w_fz < pa_memblock_get_length(output->memblock));
-
-        /* 1ch float is treated separately, because that is the common case */
-        if (r->work_channels == 1 && r->work_format == PA_SAMPLE_FLOAT32NE) {
-            float *s = (float*) src + i;
-            float *d = (float*) dst + o_index;
-
-            for (; i < i_end && i < in_n_frames; i++) {
-                float n = fabsf(*s++);
-
-                if (n > peaks_data->max_f[0])
-                    peaks_data->max_f[0] = n;
-            }
-
-            if (i == i_end) {
-                *d = peaks_data->max_f[0];
-                peaks_data->max_f[0] = 0;
-                o_index++, peaks_data->o_counter++;
-            }
-        } else if (r->work_format == PA_SAMPLE_S16NE) {
-            int16_t *s = (int16_t*) src + r->work_channels * i;
-            int16_t *d = (int16_t*) dst + r->work_channels * o_index;
-
-            for (; i < i_end && i < in_n_frames; i++)
-                for (c = 0; c < r->work_channels; c++) {
-                    int16_t n = abs(*s++);
-
-                    if (n > peaks_data->max_i[c])
-                        peaks_data->max_i[c] = n;
-                }
-
-            if (i == i_end) {
-                for (c = 0; c < r->work_channels; c++, d++) {
-                    *d = peaks_data->max_i[c];
-                    peaks_data->max_i[c] = 0;
-                }
-                o_index++, peaks_data->o_counter++;
-            }
-        } else {
-            float *s = (float*) src + r->work_channels * i;
-            float *d = (float*) dst + r->work_channels * o_index;
-
-            for (; i < i_end && i < in_n_frames; i++)
-                for (c = 0; c < r->work_channels; c++) {
-                    float n = fabsf(*s++);
-
-                    if (n > peaks_data->max_f[c])
-                        peaks_data->max_f[c] = n;
-                }
-
-            if (i == i_end) {
-                for (c = 0; c < r->work_channels; c++, d++) {
-                    *d = peaks_data->max_f[c];
-                    peaks_data->max_f[c] = 0;
-                }
-                o_index++, peaks_data->o_counter++;
-            }
-        }
-    }
-
-    pa_memblock_release(input->memblock);
-    pa_memblock_release(output->memblock);
-
-    *out_n_frames = o_index;
-
-    peaks_data->i_counter += in_n_frames;
-
-    /* Normalize counters */
-    while (peaks_data->i_counter >= r->i_ss.rate) {
-        pa_assert(peaks_data->o_counter >= r->o_ss.rate);
-
-        peaks_data->i_counter -= r->i_ss.rate;
-        peaks_data->o_counter -= r->o_ss.rate;
-    }
-
-    return 0;
-}
-
-static void peaks_update_rates_or_reset(pa_resampler *r) {
-    struct peaks_data *peaks_data;
-    pa_assert(r);
-
-    peaks_data = r->impl.data;
-
-    peaks_data->i_counter = 0;
-    peaks_data->o_counter = 0;
-}
-
-static int peaks_init(pa_resampler*r) {
-    struct peaks_data *peaks_data;
-    pa_assert(r);
-    pa_assert(r->i_ss.rate >= r->o_ss.rate);
-    pa_assert(r->work_format == PA_SAMPLE_S16NE || r->work_format == PA_SAMPLE_FLOAT32NE);
-
-    peaks_data = pa_xnew0(struct peaks_data, 1);
-
-    r->impl.resample = peaks_resample;
-    r->impl.update_rates = peaks_update_rates_or_reset;
-    r->impl.reset = peaks_update_rates_or_reset;
-    r->impl.data = peaks_data;
-
-    return 0;
-}
-
-/*** ffmpeg based implementation ***/
-
-static unsigned ffmpeg_resample(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
-    unsigned used_frames = 0, c;
-    int previous_consumed_frames = -1;
-    struct ffmpeg_data *ffmpeg_data;
-
-    pa_assert(r);
-    pa_assert(input);
-    pa_assert(output);
-    pa_assert(out_n_frames);
-
-    ffmpeg_data = r->impl.data;
-
-    for (c = 0; c < r->work_channels; c++) {
-        unsigned u;
-        pa_memblock *b, *w;
-        int16_t *p, *t, *k, *q, *s;
-        int consumed_frames;
-
-        /* Allocate a new block */
-        b = pa_memblock_new(r->mempool, in_n_frames * sizeof(int16_t));
-        p = pa_memblock_acquire(b);
-
-        /* Now copy the input data, splitting up channels */
-        t = (int16_t*) pa_memblock_acquire_chunk(input) + c;
-        k = p;
-        for (u = 0; u < in_n_frames; u++) {
-            *k = *t;
-            t += r->work_channels;
-            k ++;
-        }
-        pa_memblock_release(input->memblock);
-
-        /* Allocate buffer for the result */
-        w = pa_memblock_new(r->mempool, *out_n_frames * sizeof(int16_t));
-        q = pa_memblock_acquire(w);
-
-        /* Now, resample */
-        used_frames = (unsigned) av_resample(ffmpeg_data->state,
-                                             q, p,
-                                             &consumed_frames,
-                                             (int) in_n_frames, (int) *out_n_frames,
-                                             c >= (unsigned) (r->work_channels-1));
-
-        pa_memblock_release(b);
-        pa_memblock_unref(b);
-
-        pa_assert(consumed_frames <= (int) in_n_frames);
-        pa_assert(previous_consumed_frames == -1 || consumed_frames == previous_consumed_frames);
-        previous_consumed_frames = consumed_frames;
-
-        /* And place the results in the output buffer */
-        s = (int16_t *) pa_memblock_acquire_chunk(output) + c;
-        for (u = 0; u < used_frames; u++) {
-            *s = *q;
-            q++;
-            s += r->work_channels;
-        }
-        pa_memblock_release(output->memblock);
-        pa_memblock_release(w);
-        pa_memblock_unref(w);
-    }
-
-    *out_n_frames = used_frames;
-
-    return in_n_frames - previous_consumed_frames;
-}
-
-static void ffmpeg_free(pa_resampler *r) {
-    struct ffmpeg_data *ffmpeg_data;
-
-    pa_assert(r);
-
-    ffmpeg_data = r->impl.data;
-    if (ffmpeg_data->state)
-        av_resample_close(ffmpeg_data->state);
-}
-
-static int ffmpeg_init(pa_resampler *r) {
-    struct ffmpeg_data *ffmpeg_data;
-
-    pa_assert(r);
-
-    ffmpeg_data = pa_xnew(struct ffmpeg_data, 1);
-
-    /* We could probably implement different quality levels by
-     * adjusting the filter parameters here. However, ffmpeg
-     * internally only uses these hardcoded values, so let's use them
-     * here for now as well until ffmpeg makes this configurable. */
-
-    if (!(ffmpeg_data->state = av_resample_init((int) r->o_ss.rate, (int) r->i_ss.rate, 16, 10, 0, 0.8)))
-        return -1;
-
-    r->impl.free = ffmpeg_free;
-    r->impl.resample = ffmpeg_resample;
-    r->impl.data = (void *) ffmpeg_data;
-
-    return 0;
-}
-
 /*** copy (noop) implementation ***/
 
 static int copy_init(pa_resampler *r) {
diff --git a/src/pulsecore/resampler.h b/src/pulsecore/resampler.h
index 058a800..5a84cf0 100644
--- a/src/pulsecore/resampler.h
+++ b/src/pulsecore/resampler.h
@@ -26,6 +26,8 @@
 #include <pulse/channelmap.h>
 #include <pulsecore/memblock.h>
 #include <pulsecore/memchunk.h>
+#include <pulsecore/sconv.h>
+#include <pulsecore/remap.h>
 
 typedef struct pa_resampler pa_resampler;
 typedef struct pa_resampler_impl pa_resampler_impl;
@@ -67,6 +69,45 @@ typedef enum pa_resample_flags {
     PA_RESAMPLER_NO_LFE        = 0x0008U
 } pa_resample_flags_t;
 
+struct pa_resampler {
+    pa_resample_method_t method;
+    pa_resample_flags_t flags;
+
+    pa_sample_spec i_ss, o_ss;
+    pa_channel_map i_cm, o_cm;
+    size_t i_fz, o_fz, w_fz, w_sz;
+    pa_mempool *mempool;
+
+    pa_memchunk to_work_format_buf;
+    pa_memchunk remap_buf;
+    pa_memchunk resample_buf;
+    pa_memchunk from_work_format_buf;
+    size_t to_work_format_buf_size;
+    size_t remap_buf_size;
+    size_t resample_buf_size;
+    size_t from_work_format_buf_size;
+
+    /* points to buffer before resampling stage, remap or to_work */
+    pa_memchunk *leftover_buf;
+    size_t *leftover_buf_size;
+
+    /* have_leftover points to leftover_in_remap or leftover_in_to_work */
+    bool *have_leftover;
+    bool leftover_in_remap;
+    bool leftover_in_to_work;
+
+    pa_sample_format_t work_format;
+    uint8_t work_channels;
+
+    pa_convert_func_t to_work_format_func;
+    pa_convert_func_t from_work_format_func;
+
+    pa_remap_t remap;
+    bool map_required;
+
+    pa_resampler_impl impl;
+};
+
 pa_resampler* pa_resampler_new(
         pa_mempool *pool,
         const pa_sample_spec *a,
@@ -116,4 +157,14 @@ const pa_sample_spec* pa_resampler_input_sample_spec(pa_resampler *r);
 const pa_channel_map* pa_resampler_output_channel_map(pa_resampler *r);
 const pa_sample_spec* pa_resampler_output_sample_spec(pa_resampler *r);
 
+/* Implementation specific init functions */
+int pa_resampler_ffmpeg_init(pa_resampler *r);
+int pa_resampler_libsamplerate_init(pa_resampler *r);
+int pa_resampler_peaks_init(pa_resampler *r);
+int pa_resampler_speex_init(pa_resampler *r);
+int pa_resampler_trivial_init(pa_resampler*r);
+
+/* Resampler-specific quirks */
+bool pa_speex_is_fixed_point(void);
+
 #endif
diff --git a/src/pulsecore/resampler/ffmpeg.c b/src/pulsecore/resampler/ffmpeg.c
new file mode 100644
index 0000000..cc1e3e4
--- /dev/null
+++ b/src/pulsecore/resampler/ffmpeg.c
@@ -0,0 +1,132 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 Lennart Poettering
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulse/xmalloc.h>
+#include "pulsecore/ffmpeg/avcodec.h"
+
+#include <pulsecore/resampler.h>
+
+struct ffmpeg_data { /* data specific to ffmpeg */
+    struct AVResampleContext *state;
+};
+
+static unsigned ffmpeg_resample(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
+    unsigned used_frames = 0, c;
+    int previous_consumed_frames = -1;
+    struct ffmpeg_data *ffmpeg_data;
+
+    pa_assert(r);
+    pa_assert(input);
+    pa_assert(output);
+    pa_assert(out_n_frames);
+
+    ffmpeg_data = r->impl.data;
+
+    for (c = 0; c < r->work_channels; c++) {
+        unsigned u;
+        pa_memblock *b, *w;
+        int16_t *p, *t, *k, *q, *s;
+        int consumed_frames;
+
+        /* Allocate a new block */
+        b = pa_memblock_new(r->mempool, in_n_frames * sizeof(int16_t));
+        p = pa_memblock_acquire(b);
+
+        /* Now copy the input data, splitting up channels */
+        t = (int16_t*) pa_memblock_acquire_chunk(input) + c;
+        k = p;
+        for (u = 0; u < in_n_frames; u++) {
+            *k = *t;
+            t += r->work_channels;
+            k ++;
+        }
+        pa_memblock_release(input->memblock);
+
+        /* Allocate buffer for the result */
+        w = pa_memblock_new(r->mempool, *out_n_frames * sizeof(int16_t));
+        q = pa_memblock_acquire(w);
+
+        /* Now, resample */
+        used_frames = (unsigned) av_resample(ffmpeg_data->state,
+                                             q, p,
+                                             &consumed_frames,
+                                             (int) in_n_frames, (int) *out_n_frames,
+                                             c >= (unsigned) (r->work_channels-1));
+
+        pa_memblock_release(b);
+        pa_memblock_unref(b);
+
+        pa_assert(consumed_frames <= (int) in_n_frames);
+        pa_assert(previous_consumed_frames == -1 || consumed_frames == previous_consumed_frames);
+        previous_consumed_frames = consumed_frames;
+
+        /* And place the results in the output buffer */
+        s = (int16_t *) pa_memblock_acquire_chunk(output) + c;
+        for (u = 0; u < used_frames; u++) {
+            *s = *q;
+            q++;
+            s += r->work_channels;
+        }
+        pa_memblock_release(output->memblock);
+        pa_memblock_release(w);
+        pa_memblock_unref(w);
+    }
+
+    *out_n_frames = used_frames;
+
+    return in_n_frames - previous_consumed_frames;
+}
+
+static void ffmpeg_free(pa_resampler *r) {
+    struct ffmpeg_data *ffmpeg_data;
+
+    pa_assert(r);
+
+    ffmpeg_data = r->impl.data;
+    if (ffmpeg_data->state)
+        av_resample_close(ffmpeg_data->state);
+}
+
+int pa_resampler_ffmpeg_init(pa_resampler *r) {
+    struct ffmpeg_data *ffmpeg_data;
+
+    pa_assert(r);
+
+    ffmpeg_data = pa_xnew(struct ffmpeg_data, 1);
+
+    /* We could probably implement different quality levels by
+     * adjusting the filter parameters here. However, ffmpeg
+     * internally only uses these hardcoded values, so let's use them
+     * here for now as well until ffmpeg makes this configurable. */
+
+    if (!(ffmpeg_data->state = av_resample_init((int) r->o_ss.rate, (int) r->i_ss.rate, 16, 10, 0, 0.8)))
+        return -1;
+
+    r->impl.free = ffmpeg_free;
+    r->impl.resample = ffmpeg_resample;
+    r->impl.data = (void *) ffmpeg_data;
+
+    return 0;
+}
diff --git a/src/pulsecore/resampler/libsamplerate.c b/src/pulsecore/resampler/libsamplerate.c
new file mode 100644
index 0000000..34a9ba4
--- /dev/null
+++ b/src/pulsecore/resampler/libsamplerate.c
@@ -0,0 +1,102 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 Lennart Poettering
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <samplerate.h>
+
+#include <pulsecore/resampler.h>
+
+static unsigned libsamplerate_resample(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
+    SRC_DATA data;
+    SRC_STATE *state;
+
+    pa_assert(r);
+    pa_assert(input);
+    pa_assert(output);
+    pa_assert(out_n_frames);
+
+    state = r->impl.data;
+    memset(&data, 0, sizeof(data));
+
+    data.data_in = pa_memblock_acquire_chunk(input);
+    data.input_frames = (long int) in_n_frames;
+
+    data.data_out = pa_memblock_acquire_chunk(output);
+    data.output_frames = (long int) *out_n_frames;
+
+    data.src_ratio = (double) r->o_ss.rate / r->i_ss.rate;
+    data.end_of_input = 0;
+
+    pa_assert_se(src_process(state, &data) == 0);
+
+    pa_memblock_release(input->memblock);
+    pa_memblock_release(output->memblock);
+
+    *out_n_frames = (unsigned) data.output_frames_gen;
+
+    return in_n_frames - data.input_frames_used;
+}
+
+static void libsamplerate_update_rates(pa_resampler *r) {
+    SRC_STATE *state;
+    pa_assert(r);
+
+    state = r->impl.data;
+    pa_assert_se(src_set_ratio(state, (double) r->o_ss.rate / r->i_ss.rate) == 0);
+}
+
+static void libsamplerate_reset(pa_resampler *r) {
+    SRC_STATE *state;
+    pa_assert(r);
+
+    state = r->impl.data;
+    pa_assert_se(src_reset(state) == 0);
+}
+
+static void libsamplerate_free(pa_resampler *r) {
+    SRC_STATE *state;
+    pa_assert(r);
+
+    state = r->impl.data;
+    if (state)
+        src_delete(state);
+}
+
+int pa_resampler_libsamplerate_init(pa_resampler *r) {
+    int err;
+    SRC_STATE *state;
+
+    pa_assert(r);
+
+    if (!(state = src_new(r->method, r->work_channels, &err)))
+        return -1;
+
+    r->impl.free = libsamplerate_free;
+    r->impl.update_rates = libsamplerate_update_rates;
+    r->impl.resample = libsamplerate_resample;
+    r->impl.reset = libsamplerate_reset;
+    r->impl.data = state;
+
+    return 0;
+}
diff --git a/src/pulsecore/resampler/peaks.c b/src/pulsecore/resampler/peaks.c
new file mode 100644
index 0000000..d0b7cd0
--- /dev/null
+++ b/src/pulsecore/resampler/peaks.c
@@ -0,0 +1,163 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 Lennart Poettering
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulse/xmalloc.h>
+#include <math.h>
+
+#include <pulsecore/resampler.h>
+
+struct peaks_data { /* data specific to the peak finder pseudo resampler */
+    unsigned o_counter;
+    unsigned i_counter;
+
+    float max_f[PA_CHANNELS_MAX];
+    int16_t max_i[PA_CHANNELS_MAX];
+};
+
+static unsigned peaks_resample(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
+    unsigned c, o_index = 0;
+    unsigned i, i_end = 0;
+    void *src, *dst;
+    struct peaks_data *peaks_data;
+
+    pa_assert(r);
+    pa_assert(input);
+    pa_assert(output);
+    pa_assert(out_n_frames);
+
+    peaks_data = r->impl.data;
+    src = pa_memblock_acquire_chunk(input);
+    dst = pa_memblock_acquire_chunk(output);
+
+    i = ((uint64_t) peaks_data->o_counter * r->i_ss.rate) / r->o_ss.rate;
+    i = i > peaks_data->i_counter ? i - peaks_data->i_counter : 0;
+
+    while (i_end < in_n_frames) {
+        i_end = ((uint64_t) (peaks_data->o_counter + 1) * r->i_ss.rate) / r->o_ss.rate;
+        i_end = i_end > peaks_data->i_counter ? i_end - peaks_data->i_counter : 0;
+
+        pa_assert_fp(o_index * r->w_fz < pa_memblock_get_length(output->memblock));
+
+        /* 1ch float is treated separately, because that is the common case */
+        if (r->work_channels == 1 && r->work_format == PA_SAMPLE_FLOAT32NE) {
+            float *s = (float*) src + i;
+            float *d = (float*) dst + o_index;
+
+            for (; i < i_end && i < in_n_frames; i++) {
+                float n = fabsf(*s++);
+
+                if (n > peaks_data->max_f[0])
+                    peaks_data->max_f[0] = n;
+            }
+
+            if (i == i_end) {
+                *d = peaks_data->max_f[0];
+                peaks_data->max_f[0] = 0;
+                o_index++, peaks_data->o_counter++;
+            }
+        } else if (r->work_format == PA_SAMPLE_S16NE) {
+            int16_t *s = (int16_t*) src + r->work_channels * i;
+            int16_t *d = (int16_t*) dst + r->work_channels * o_index;
+
+            for (; i < i_end && i < in_n_frames; i++)
+                for (c = 0; c < r->work_channels; c++) {
+                    int16_t n = abs(*s++);
+
+                    if (n > peaks_data->max_i[c])
+                        peaks_data->max_i[c] = n;
+                }
+
+            if (i == i_end) {
+                for (c = 0; c < r->work_channels; c++, d++) {
+                    *d = peaks_data->max_i[c];
+                    peaks_data->max_i[c] = 0;
+                }
+                o_index++, peaks_data->o_counter++;
+            }
+        } else {
+            float *s = (float*) src + r->work_channels * i;
+            float *d = (float*) dst + r->work_channels * o_index;
+
+            for (; i < i_end && i < in_n_frames; i++)
+                for (c = 0; c < r->work_channels; c++) {
+                    float n = fabsf(*s++);
+
+                    if (n > peaks_data->max_f[c])
+                        peaks_data->max_f[c] = n;
+                }
+
+            if (i == i_end) {
+                for (c = 0; c < r->work_channels; c++, d++) {
+                    *d = peaks_data->max_f[c];
+                    peaks_data->max_f[c] = 0;
+                }
+                o_index++, peaks_data->o_counter++;
+            }
+        }
+    }
+
+    pa_memblock_release(input->memblock);
+    pa_memblock_release(output->memblock);
+
+    *out_n_frames = o_index;
+
+    peaks_data->i_counter += in_n_frames;
+
+    /* Normalize counters */
+    while (peaks_data->i_counter >= r->i_ss.rate) {
+        pa_assert(peaks_data->o_counter >= r->o_ss.rate);
+
+        peaks_data->i_counter -= r->i_ss.rate;
+        peaks_data->o_counter -= r->o_ss.rate;
+    }
+
+    return 0;
+}
+
+static void peaks_update_rates_or_reset(pa_resampler *r) {
+    struct peaks_data *peaks_data;
+    pa_assert(r);
+
+    peaks_data = r->impl.data;
+
+    peaks_data->i_counter = 0;
+    peaks_data->o_counter = 0;
+}
+
+int pa_resampler_peaks_init(pa_resampler*r) {
+    struct peaks_data *peaks_data;
+    pa_assert(r);
+    pa_assert(r->i_ss.rate >= r->o_ss.rate);
+    pa_assert(r->work_format == PA_SAMPLE_S16NE || r->work_format == PA_SAMPLE_FLOAT32NE);
+
+    peaks_data = pa_xnew0(struct peaks_data, 1);
+
+    r->impl.resample = peaks_resample;
+    r->impl.update_rates = peaks_update_rates_or_reset;
+    r->impl.reset = peaks_update_rates_or_reset;
+    r->impl.data = peaks_data;
+
+    return 0;
+}
diff --git a/src/pulsecore/resampler/speex.c b/src/pulsecore/resampler/speex.c
new file mode 100644
index 0000000..e989c3a
--- /dev/null
+++ b/src/pulsecore/resampler/speex.c
@@ -0,0 +1,180 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 Lennart Poettering
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <speex/speex_resampler.h>
+#include <math.h>
+
+#include <pulsecore/once.h>
+#include <pulsecore/resampler.h>
+
+bool pa_speex_is_fixed_point(void) {
+    static bool result = false;
+    PA_ONCE_BEGIN {
+        float f_out = -1.0f, f_in = 1.0f;
+        spx_uint32_t in_len = 1, out_len = 1;
+        SpeexResamplerState *s;
+
+        pa_assert_se(s = speex_resampler_init(1, 1, 1,
+            SPEEX_RESAMPLER_QUALITY_MIN, NULL));
+
+        /* feed one sample that is too soft for fixed-point speex */
+        pa_assert_se(speex_resampler_process_float(s, 0, &f_in, &in_len,
+            &f_out, &out_len) == RESAMPLER_ERR_SUCCESS);
+
+        /* expecting sample has been processed, one sample output */
+        pa_assert_se(in_len == 1 && out_len == 1);
+
+        /* speex compiled with --enable-fixed-point will output 0.0 due to insufficient precision */
+        if (fabsf(f_out) < 0.00001f)
+            result = true;
+
+        speex_resampler_destroy(s);
+    } PA_ONCE_END;
+    return result;
+}
+
+
+static unsigned speex_resample_float(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
+    float *in, *out;
+    uint32_t inf = in_n_frames, outf = *out_n_frames;
+    SpeexResamplerState *state;
+
+    pa_assert(r);
+    pa_assert(input);
+    pa_assert(output);
+    pa_assert(out_n_frames);
+
+    state = r->impl.data;
+
+    in = pa_memblock_acquire_chunk(input);
+    out = pa_memblock_acquire_chunk(output);
+
+    /* Strictly speaking, speex resampler expects its input
+     * to be normalized to the [-32768.0 .. 32767.0] range.
+     * This matters if speex has been compiled with --enable-fixed-point,
+     * because such speex will round the samples to the nearest
+     * integer. speex with --enable-fixed-point is therefore incompatible
+     * with PulseAudio's floating-point sample range [-1 .. 1]. speex
+     * without --enable-fixed-point works fine with this range.
+     * Care has been taken to call speex_resample_float() only
+     * for speex compiled without --enable-fixed-point.
+     */
+    pa_assert_se(speex_resampler_process_interleaved_float(state, in, &inf, out, &outf) == 0);
+
+    pa_memblock_release(input->memblock);
+    pa_memblock_release(output->memblock);
+
+    pa_assert(inf == in_n_frames);
+    *out_n_frames = outf;
+
+    return 0;
+}
+
+static unsigned speex_resample_int(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
+    int16_t *in, *out;
+    uint32_t inf = in_n_frames, outf = *out_n_frames;
+    SpeexResamplerState *state;
+
+    pa_assert(r);
+    pa_assert(input);
+    pa_assert(output);
+    pa_assert(out_n_frames);
+
+    state = r->impl.data;
+
+    in = pa_memblock_acquire_chunk(input);
+    out = pa_memblock_acquire_chunk(output);
+
+    pa_assert_se(speex_resampler_process_interleaved_int(state, in, &inf, out, &outf) == 0);
+
+    pa_memblock_release(input->memblock);
+    pa_memblock_release(output->memblock);
+
+    pa_assert(inf == in_n_frames);
+    *out_n_frames = outf;
+
+    return 0;
+}
+
+static void speex_update_rates(pa_resampler *r) {
+    SpeexResamplerState *state;
+    pa_assert(r);
+
+    state = r->impl.data;
+
+    pa_assert_se(speex_resampler_set_rate(state, r->i_ss.rate, r->o_ss.rate) == 0);
+}
+
+static void speex_reset(pa_resampler *r) {
+    SpeexResamplerState *state;
+    pa_assert(r);
+
+    state = r->impl.data;
+
+    pa_assert_se(speex_resampler_reset_mem(state) == 0);
+}
+
+static void speex_free(pa_resampler *r) {
+    SpeexResamplerState *state;
+    pa_assert(r);
+
+    state = r->impl.data;
+    if (!state)
+        return;
+
+    speex_resampler_destroy(state);
+}
+
+int pa_resampler_speex_init(pa_resampler *r) {
+    int q, err;
+    SpeexResamplerState *state;
+
+    pa_assert(r);
+
+    r->impl.free = speex_free;
+    r->impl.update_rates = speex_update_rates;
+    r->impl.reset = speex_reset;
+
+    if (r->method >= PA_RESAMPLER_SPEEX_FIXED_BASE && r->method <= PA_RESAMPLER_SPEEX_FIXED_MAX) {
+
+        q = r->method - PA_RESAMPLER_SPEEX_FIXED_BASE;
+        r->impl.resample = speex_resample_int;
+
+    } else {
+        pa_assert(r->method >= PA_RESAMPLER_SPEEX_FLOAT_BASE && r->method <= PA_RESAMPLER_SPEEX_FLOAT_MAX);
+
+        q = r->method - PA_RESAMPLER_SPEEX_FLOAT_BASE;
+        r->impl.resample = speex_resample_float;
+    }
+
+    pa_log_info("Choosing speex quality setting %i.", q);
+
+    if (!(state = speex_resampler_init(r->work_channels, r->i_ss.rate, r->o_ss.rate, q, &err)))
+        return -1;
+
+    r->impl.data = state;
+
+    return 0;
+}
diff --git a/src/pulsecore/resampler/trivial.c b/src/pulsecore/resampler/trivial.c
new file mode 100644
index 0000000..be15295
--- /dev/null
+++ b/src/pulsecore/resampler/trivial.c
@@ -0,0 +1,102 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 Lennart Poettering
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/resampler.h>
+
+struct trivial_data { /* data specific to the trivial resampler */
+    unsigned o_counter;
+    unsigned i_counter;
+};
+
+static unsigned trivial_resample(pa_resampler *r, const pa_memchunk *input, unsigned in_n_frames, pa_memchunk *output, unsigned *out_n_frames) {
+    unsigned i_index, o_index;
+    void *src, *dst;
+    struct trivial_data *trivial_data;
+
+    pa_assert(r);
+    pa_assert(input);
+    pa_assert(output);
+    pa_assert(out_n_frames);
+
+    trivial_data = r->impl.data;
+
+    src = pa_memblock_acquire_chunk(input);
+    dst = pa_memblock_acquire_chunk(output);
+
+    for (o_index = 0;; o_index++, trivial_data->o_counter++) {
+        i_index = ((uint64_t) trivial_data->o_counter * r->i_ss.rate) / r->o_ss.rate;
+        i_index = i_index > trivial_data->i_counter ? i_index - trivial_data->i_counter : 0;
+
+        if (i_index >= in_n_frames)
+            break;
+
+        pa_assert_fp(o_index * r->w_fz < pa_memblock_get_length(output->memblock));
+
+        memcpy((uint8_t*) dst + r->w_fz * o_index, (uint8_t*) src + r->w_fz * i_index, (int) r->w_fz);
+    }
+
+    pa_memblock_release(input->memblock);
+    pa_memblock_release(output->memblock);
+
+    *out_n_frames = o_index;
+
+    trivial_data->i_counter += in_n_frames;
+
+    /* Normalize counters */
+    while (trivial_data->i_counter >= r->i_ss.rate) {
+        pa_assert(trivial_data->o_counter >= r->o_ss.rate);
+
+        trivial_data->i_counter -= r->i_ss.rate;
+        trivial_data->o_counter -= r->o_ss.rate;
+    }
+
+    return 0;
+}
+
+static void trivial_update_rates_or_reset(pa_resampler *r) {
+    struct trivial_data *trivial_data;
+    pa_assert(r);
+
+    trivial_data = r->impl.data;
+
+    trivial_data->i_counter = 0;
+    trivial_data->o_counter = 0;
+}
+
+int pa_resampler_trivial_init(pa_resampler *r) {
+    struct trivial_data *trivial_data;
+    pa_assert(r);
+
+    trivial_data = pa_xnew0(struct trivial_data, 1);
+
+    r->impl.resample = trivial_resample;
+    r->impl.update_rates = trivial_update_rates_or_reset;
+    r->impl.reset = trivial_update_rates_or_reset;
+    r->impl.data = trivial_data;
+
+    return 0;
+}
diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
index 09e5e8a..5f3ca8b 100644
--- a/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@ -203,7 +203,7 @@ static void reset_all_revents(pa_rtpoll *p) {
     }
 }
 
-int pa_rtpoll_run(pa_rtpoll *p, bool wait_op) {
+int pa_rtpoll_run(pa_rtpoll *p) {
     pa_rtpoll_item *i;
     int r = 0;
     struct timeval timeout;
@@ -285,7 +285,7 @@ int pa_rtpoll_run(pa_rtpoll *p, bool wait_op) {
     pa_zero(timeout);
 
     /* Calculate timeout */
-    if (wait_op && !p->quit && p->timer_enabled) {
+    if (!p->quit && p->timer_enabled) {
         struct timeval now;
         pa_rtclock_get(&now);
 
@@ -298,10 +298,12 @@ int pa_rtpoll_run(pa_rtpoll *p, bool wait_op) {
         pa_usec_t now = pa_rtclock_now();
         p->awake = now - p->timestamp;
         p->timestamp = now;
-        if (!wait_op || p->quit || p->timer_enabled)
+        if (!p->quit && p->timer_enabled)
             pa_log("poll timeout: %d ms ",(int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)));
-        else
+        else if (q->quit)
             pa_log("poll timeout is ZERO");
+        else
+            pa_log("poll timeout is FOREVER");
     }
 #endif
 
@@ -311,10 +313,10 @@ int pa_rtpoll_run(pa_rtpoll *p, bool wait_op) {
         struct timespec ts;
         ts.tv_sec = timeout.tv_sec;
         ts.tv_nsec = timeout.tv_usec * 1000;
-        r = ppoll(p->pollfd, p->n_pollfd_used, (!wait_op || p->quit || p->timer_enabled) ? &ts : NULL, NULL);
+        r = ppoll(p->pollfd, p->n_pollfd_used, (p->quit || p->timer_enabled) ? &ts : NULL, NULL);
     }
 #else
-    r = pa_poll(p->pollfd, p->n_pollfd_used, (!wait_op || p->quit || p->timer_enabled) ? (int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)) : -1);
+    r = pa_poll(p->pollfd, p->n_pollfd_used, (p->quit || p->timer_enabled) ? (int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)) : -1);
 #endif
 
     p->timer_elapsed = r == 0;
diff --git a/src/pulsecore/rtpoll.h b/src/pulsecore/rtpoll.h
index 43ff5e6..c0a4dda 100644
--- a/src/pulsecore/rtpoll.h
+++ b/src/pulsecore/rtpoll.h
@@ -41,7 +41,7 @@
  * 3) It allows arbitrary functions to be run before entering the
  * actual poll() and after it.
  *
- * Only a single interval timer is supported..*/
+ * Only a single interval timer is supported. */
 
 typedef struct pa_rtpoll pa_rtpoll;
 typedef struct pa_rtpoll_item pa_rtpoll_item;
@@ -57,11 +57,10 @@ pa_rtpoll *pa_rtpoll_new(void);
 void pa_rtpoll_free(pa_rtpoll *p);
 
 /* Sleep on the rtpoll until the time event, or any of the fd events
- * is triggered. If "wait" is 0 we don't sleep but only update the
- * struct pollfd. Returns negative on error, positive if the loop
+ * is triggered. Returns negative on error, positive if the loop
  * should continue to run, 0 when the loop should be terminated
  * cleanly. */
-int pa_rtpoll_run(pa_rtpoll *f, bool wait);
+int pa_rtpoll_run(pa_rtpoll *f);
 
 void pa_rtpoll_set_timer_absolute(pa_rtpoll *p, pa_usec_t usec);
 void pa_rtpoll_set_timer_relative(pa_rtpoll *p, pa_usec_t usec);
diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
index dc5c1fd..539f3b8 100644
--- a/src/pulsecore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -296,9 +296,9 @@ void pa_sample_clamp(pa_sample_format_t format, void *dst, size_t dstr, const vo
         for (; n > 0; n--) {
             float f;
 
-            f = PA_FLOAT32_SWAP(*s);
+            f = PA_READ_FLOAT32RE(s);
             f = PA_CLAMP_UNLIKELY(f, -1.0f, 1.0f);
-            *d = PA_FLOAT32_SWAP(f);
+            PA_WRITE_FLOAT32RE(d, f);
 
             s = (const float*) ((const uint8_t*) s + sstr);
             d = (float*) ((uint8_t*) d + dstr);
diff --git a/src/pulsecore/sconv-s16le.c b/src/pulsecore/sconv-s16le.c
index 45cf972..0c1d16c 100644
--- a/src/pulsecore/sconv-s16le.c
+++ b/src/pulsecore/sconv-s16le.c
@@ -157,8 +157,7 @@ void pa_sconv_s16le_to_float32re(unsigned n, const int16_t *a, float *b) {
     for (; n > 0; n--) {
         int16_t s = *(a++);
         float k = INT16_FROM(s) * (1.0f / (1 << 15));
-        k = PA_FLOAT32_SWAP(k);
-        *(b++) = k;
+        PA_WRITE_FLOAT32RE(b++, k);
     }
 }
 
@@ -169,8 +168,7 @@ void pa_sconv_s32le_to_float32re(unsigned n, const int32_t *a, float *b) {
     for (; n > 0; n--) {
         int32_t s = *(a++);
         float k = INT32_FROM(s) * (1.0f / (1U << 31));
-        k = PA_FLOAT32_SWAP(k);
-        *(b++) = k;
+        PA_WRITE_FLOAT32RE(b++, k);
     }
 }
 
@@ -180,8 +178,7 @@ void pa_sconv_s16le_from_float32re(unsigned n, const float *a, int16_t *b) {
 
     for (; n > 0; n--) {
         int16_t s;
-        float v = *(a++);
-        v = PA_FLOAT32_SWAP(v) * (1 << 15);
+        float v = PA_READ_FLOAT32RE(a++) * (1 << 15);
         s = (int16_t) PA_CLAMP_UNLIKELY(lrintf(v), -0x8000, 0x7FFF);
         *(b++) = INT16_TO(s);
     }
@@ -193,8 +190,7 @@ void pa_sconv_s32le_from_float32re(unsigned n, const float *a, int32_t *b) {
 
     for (; n > 0; n--) {
         int32_t s;
-        float v = *(a++);
-        v = PA_FLOAT32_SWAP(v) * (1U << 31);
+        float v = PA_READ_FLOAT32RE(a++) * (1U << 31);
         s = (int32_t) PA_CLAMP_UNLIKELY(llrintf(v), -0x80000000LL, 0x7FFFFFFFLL);
         *(b++) = INT32_TO(s);
     }
@@ -325,7 +321,7 @@ void pa_sconv_s24le_to_float32re(unsigned n, const uint8_t *a, float *b) {
     for (; n > 0; n--) {
         int32_t s = READ24(a) << 8;
         float k = s * (1.0f / (1U << 31));
-        *b = PA_FLOAT32_SWAP(k);
+        PA_WRITE_FLOAT32RE(b, k);
         a += 3;
         b++;
     }
@@ -337,8 +333,7 @@ void pa_sconv_s24le_from_float32re(unsigned n, const float *a, uint8_t *b) {
 
     for (; n > 0; n--) {
         int32_t s;
-        float v = *a;
-        v = PA_FLOAT32_SWAP(v) * (1U << 31);
+        float v = PA_READ_FLOAT32RE(a) * (1U << 31);
         s = (int32_t) PA_CLAMP_UNLIKELY(llrint(v), -0x80000000LL, 0x7FFFFFFFLL);
         WRITE24(b, ((uint32_t) s) >> 8);
         a++;
@@ -411,7 +406,7 @@ void pa_sconv_s24_32le_to_float32re(unsigned n, const uint32_t *a, float *b) {
     for (; n > 0; n--) {
         int32_t s = (int32_t) (UINT32_FROM(*a) << 8);
         float k = s * (1.0f / (1U << 31));
-        *b = PA_FLOAT32_SWAP(k);
+        PA_WRITE_FLOAT32RE(b, k);
         a++;
         b++;
     }
@@ -437,8 +432,7 @@ void pa_sconv_s24_32le_from_float32re(unsigned n, const float *a, uint32_t *b) {
 
     for (; n > 0; n--) {
         int32_t s;
-        float v = *a;
-        v = PA_FLOAT32_SWAP(v) * (1U << 31);
+        float v = PA_READ_FLOAT32RE(a) * (1U << 31);
         s = (int32_t) PA_CLAMP_UNLIKELY(llrint(v), -0x80000000LL, 0x7FFFFFFFLL);
         *b = UINT32_TO(((uint32_t) s) >> 8);
         a++;
diff --git a/src/pulsecore/sconv_neon.c b/src/pulsecore/sconv_neon.c
index 071ba85..11d94d2 100644
--- a/src/pulsecore/sconv_neon.c
+++ b/src/pulsecore/sconv_neon.c
@@ -18,8 +18,6 @@
 #include <config.h>
 #endif
 
-#include <pulse/rtclock.h>
-
 #include <pulsecore/macro.h>
 #include <pulsecore/endianmacros.h>
 
@@ -60,9 +58,10 @@ static void pa_sconv_s16le_from_f32ne_neon(unsigned n, const float *src, int16_t
 
 static void pa_sconv_s16le_to_f32ne_neon(unsigned n, const int16_t *src, float *dst) {
     unsigned i = n & 3;
+    const float invscale = 1.0f / (1 << 15);
 
     __asm__ __volatile__ (
-        "movs        %[n], %[n], lsr #2     \n\t"
+        "movs       %[n], %[n], lsr #2      \n\t"
         "beq        2f                      \n\t"
 
         "1:                                 \n\t"
@@ -81,7 +80,6 @@ static void pa_sconv_s16le_to_f32ne_neon(unsigned n, const int16_t *src, float *
     );
 
     /* leftovers */
-    const float invscale = 1.0f / (1 << 15);
     while (i--) {
         *dst++ = *src++ * invscale;
     }
@@ -91,4 +89,8 @@ void pa_convert_func_init_neon(pa_cpu_arm_flag_t flags) {
     pa_log_info("Initialising ARM NEON optimized conversions.");
     pa_set_convert_from_float32ne_function(PA_SAMPLE_S16LE, (pa_convert_func_t) pa_sconv_s16le_from_f32ne_neon);
     pa_set_convert_to_float32ne_function(PA_SAMPLE_S16LE, (pa_convert_func_t) pa_sconv_s16le_to_f32ne_neon);
+#ifndef WORDS_BIGENDIAN
+    pa_set_convert_from_s16ne_function(PA_SAMPLE_FLOAT32LE, (pa_convert_func_t) pa_sconv_s16le_to_f32ne_neon);
+    pa_set_convert_to_s16ne_function(PA_SAMPLE_FLOAT32LE, (pa_convert_func_t) pa_sconv_s16le_from_f32ne_neon);
+#endif
 }
diff --git a/src/pulsecore/sconv_sse.c b/src/pulsecore/sconv_sse.c
index 10943ba..9cfb9d9 100644
--- a/src/pulsecore/sconv_sse.c
+++ b/src/pulsecore/sconv_sse.c
@@ -168,10 +168,11 @@ void pa_convert_func_init_sse(pa_cpu_x86_flag_t flags) {
     if (flags & PA_CPU_X86_SSE2) {
         pa_log_info("Initialising SSE2 optimized conversions.");
         pa_set_convert_from_float32ne_function(PA_SAMPLE_S16LE, (pa_convert_func_t) pa_sconv_s16le_from_f32ne_sse2);
-
+        pa_set_convert_to_s16ne_function(PA_SAMPLE_FLOAT32LE, (pa_convert_func_t) pa_sconv_s16le_from_f32ne_sse2);
     } else if (flags & PA_CPU_X86_SSE) {
         pa_log_info("Initialising SSE optimized conversions.");
         pa_set_convert_from_float32ne_function(PA_SAMPLE_S16LE, (pa_convert_func_t) pa_sconv_s16le_from_f32ne_sse);
+        pa_set_convert_to_s16ne_function(PA_SAMPLE_FLOAT32LE, (pa_convert_func_t) pa_sconv_s16le_from_f32ne_sse);
     }
 
 #endif /* defined (__i386__) || defined (__amd64__) */
diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
index efaee57..075c8bd 100644
--- a/src/pulsecore/shm.c
+++ b/src/pulsecore/shm.c
@@ -290,16 +290,17 @@ void pa_shm_punch(pa_shm *m, size_t offset, size_t size) {
 
 #ifdef HAVE_SHM_OPEN
 
-int pa_shm_attach_ro(pa_shm *m, unsigned id) {
+int pa_shm_attach(pa_shm *m, unsigned id, bool writable) {
     char fn[32];
     int fd = -1;
+    int prot;
     struct stat st;
 
     pa_assert(m);
 
     segment_name(fn, sizeof(fn), m->id = id);
 
-    if ((fd = shm_open(fn, O_RDONLY, 0)) < 0) {
+    if ((fd = shm_open(fn, writable ? O_RDWR : O_RDONLY, 0)) < 0) {
         if (errno != EACCES && errno != ENOENT)
             pa_log("shm_open() failed: %s", pa_cstrerror(errno));
         goto fail;
@@ -319,7 +320,8 @@ int pa_shm_attach_ro(pa_shm *m, unsigned id) {
 
     m->size = (size_t) st.st_size;
 
-    if ((m->ptr = mmap(NULL, PA_PAGE_ALIGN(m->size), PROT_READ, MAP_SHARED, fd, (off_t) 0)) == MAP_FAILED) {
+    prot = writable ? PROT_READ | PROT_WRITE : PROT_READ;
+    if ((m->ptr = mmap(NULL, PA_PAGE_ALIGN(m->size), prot, MAP_SHARED, fd, (off_t) 0)) == MAP_FAILED) {
         pa_log("mmap() failed: %s", pa_cstrerror(errno));
         goto fail;
     }
@@ -340,7 +342,7 @@ fail:
 
 #else /* HAVE_SHM_OPEN */
 
-int pa_shm_attach_ro(pa_shm *m, unsigned id) {
+int pa_shm_attach(pa_shm *m, unsigned id, bool writable) {
     return -1;
 }
 
@@ -375,7 +377,7 @@ int pa_shm_cleanup(void) {
         if (pa_atou(de->d_name + SHM_ID_LEN, &id) < 0)
             continue;
 
-        if (pa_shm_attach_ro(&seg, id) < 0)
+        if (pa_shm_attach(&seg, id, false) < 0)
             continue;
 
         if (seg.size < SHM_MARKER_SIZE) {
diff --git a/src/pulsecore/shm.h b/src/pulsecore/shm.h
index 9d61551..2238239 100644
--- a/src/pulsecore/shm.h
+++ b/src/pulsecore/shm.h
@@ -35,7 +35,7 @@ typedef struct pa_shm {
 } pa_shm;
 
 int pa_shm_create_rw(pa_shm *m, size_t size, bool shared, mode_t mode);
-int pa_shm_attach_ro(pa_shm *m, unsigned id);
+int pa_shm_attach(pa_shm *m, unsigned id, bool writable);
 
 void pa_shm_punch(pa_shm *m, size_t offset, size_t size);
 
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index f85b2c7..8e773ec 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -179,7 +179,7 @@ void pa_sink_input_new_data_set_muted(pa_sink_input_new_data *data, bool mute) {
     pa_assert(data);
 
     data->muted_is_set = true;
-    data->muted = !!mute;
+    data->muted = mute;
 }
 
 bool pa_sink_input_new_data_set_sink(pa_sink_input_new_data *data, pa_sink *s, bool save) {
@@ -644,7 +644,7 @@ static void sink_input_set_state(pa_sink_input *i, pa_sink_input_state_t state)
 /* Called from main context */
 void pa_sink_input_unlink(pa_sink_input *i) {
     bool linked;
-    pa_source_output *o, *p = NULL;
+    pa_source_output *o, PA_UNUSED *p = NULL;
 
     pa_assert(i);
     pa_assert_ctl_context();
@@ -1096,7 +1096,7 @@ void pa_sink_input_process_rewind(pa_sink_input *i, size_t nbytes /* in sink sam
                 i->process_rewind(i, amount);
             called = true;
 
-            /* Convert back to to sink domain */
+            /* Convert back to sink domain */
             if (i->thread_info.resampler)
                 amount = pa_resampler_result(i->thread_info.resampler, amount);
 
@@ -1260,7 +1260,7 @@ void pa_sink_input_set_volume(pa_sink_input *i, const pa_cvolume *volume, bool s
         return;
     }
 
-    i->volume = *volume;
+    pa_sink_input_set_volume_direct(i, volume);
     i->save_volume = save;
 
     if (pa_sink_flat_volume_enabled(i->sink)) {
@@ -1273,18 +1273,11 @@ void pa_sink_input_set_volume(pa_sink_input *i, const pa_cvolume *volume, bool s
         /* OK, we are in normal volume mode. The volume only affects
          * ourselves */
         set_real_ratio(i, volume);
-        i->reference_ratio = i->volume;
+        pa_sink_input_set_reference_ratio(i, &i->volume);
 
         /* Copy the new soft_volume to the thread_info struct */
         pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_SOFT_VOLUME, NULL, 0, NULL) == 0);
     }
-
-    /* The volume changed, let's tell people so */
-    if (i->volume_changed)
-        i->volume_changed(i);
-
-    /* The virtual volume changed, let's tell people so */
-    pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
 }
 
 void pa_sink_input_add_volume_factor(pa_sink_input *i, const char *key, const pa_cvolume *volume_factor) {
@@ -1324,13 +1317,9 @@ int pa_sink_input_remove_volume_factor(pa_sink_input *i, const char *key) {
     pa_assert_ctl_context();
     pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
 
-    v = pa_hashmap_remove(i->volume_factor_items, key);
-
-    if (!v)
+    if (pa_hashmap_remove_and_free(i->volume_factor_items, key) < 0)
         return -1;
 
-    volume_factor_entry_free(v);
-
     switch (pa_hashmap_size(i->volume_factor_items)) {
         case 0:
             pa_cvolume_reset(&i->volume_factor, i->sample_spec.channels);
@@ -1410,16 +1399,22 @@ pa_cvolume *pa_sink_input_get_volume(pa_sink_input *i, pa_cvolume *volume, bool
 
 /* Called from main context */
 void pa_sink_input_set_mute(pa_sink_input *i, bool mute, bool save) {
+    bool old_mute;
+
     pa_sink_input_assert_ref(i);
     pa_assert_ctl_context();
     pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
 
-    if (!i->muted == !mute) {
-        i->save_muted = i->save_muted || mute;
+    old_mute = i->muted;
+
+    if (mute == old_mute) {
+        i->save_muted |= save;
         return;
     }
 
     i->muted = mute;
+    pa_log_debug("The mute of sink input %u changed from %s to %s.", i->index, pa_yes_no(old_mute), pa_yes_no(mute));
+
     i->save_muted = save;
 
     pa_assert_se(pa_asyncmsgq_send(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_SOFT_MUTE, NULL, 0, NULL) == 0);
@@ -1429,15 +1424,7 @@ void pa_sink_input_set_mute(pa_sink_input *i, bool mute, bool save) {
         i->mute_changed(i);
 
     pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
-}
-
-/* Called from main context */
-bool pa_sink_input_get_mute(pa_sink_input *i) {
-    pa_sink_input_assert_ref(i);
-    pa_assert_ctl_context();
-    pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
-
-    return i->muted;
+    pa_hook_fire(&i->core->hooks[PA_CORE_HOOK_SINK_INPUT_MUTE_CHANGED], i);
 }
 
 /* Called from main thread */
@@ -1532,7 +1519,7 @@ bool pa_sink_input_may_move(pa_sink_input *i) {
 }
 
 static bool find_filter_sink_input(pa_sink_input *target, pa_sink *s) {
-    int i = 0;
+    unsigned PA_UNUSED i = 0;
     while (s && s->input_to_master) {
         if (s->input_to_master == target)
             return true;
@@ -1578,7 +1565,7 @@ bool pa_sink_input_may_move_to(pa_sink_input *i, pa_sink *dest) {
 
 /* Called from main context */
 int pa_sink_input_start_move(pa_sink_input *i) {
-    pa_source_output *o, *p = NULL;
+    pa_source_output *o, PA_UNUSED *p = NULL;
     struct volume_factor_entry *v;
     void *state = NULL;
     int r;
@@ -1635,7 +1622,7 @@ int pa_sink_input_start_move(pa_sink_input *i) {
  * then also the origin sink and all streams connected to it need to update
  * their volume - this function does all that by using recursion. */
 static void update_volume_due_to_moving(pa_sink_input *i, pa_sink *dest) {
-    pa_cvolume old_volume;
+    pa_cvolume new_volume;
 
     pa_assert(i);
     pa_assert(dest);
@@ -1684,19 +1671,11 @@ static void update_volume_due_to_moving(pa_sink_input *i, pa_sink *dest) {
              *          always have volume_factor as soft_volume, so no change
              *          should be needed) */
 
-            old_volume = i->volume;
-            pa_cvolume_reset(&i->volume, i->volume.channels);
-            pa_cvolume_reset(&i->reference_ratio, i->reference_ratio.channels);
+            pa_cvolume_reset(&new_volume, i->volume.channels);
+            pa_sink_input_set_volume_direct(i, &new_volume);
+            pa_sink_input_set_reference_ratio(i, &new_volume);
             pa_assert(pa_cvolume_is_norm(&i->real_ratio));
             pa_assert(pa_cvolume_equal(&i->soft_volume, &i->volume_factor));
-
-            /* Notify others about the changed sink input volume. */
-            if (!pa_cvolume_equal(&i->volume, &old_volume)) {
-                if (i->volume_changed)
-                    i->volume_changed(i);
-
-                pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
-            }
         }
 
         /* Additionally, the origin sink volume needs updating:
@@ -1707,33 +1686,27 @@ static void update_volume_due_to_moving(pa_sink_input *i, pa_sink *dest) {
          *         (sinks that use volume sharing should always have
          *          soft_volume of 0 dB) */
 
-        old_volume = i->origin_sink->reference_volume;
-
-        i->origin_sink->reference_volume = root_sink->reference_volume;
-        pa_cvolume_remap(&i->origin_sink->reference_volume, &root_sink->channel_map, &i->origin_sink->channel_map);
+        new_volume = root_sink->reference_volume;
+        pa_cvolume_remap(&new_volume, &root_sink->channel_map, &i->origin_sink->channel_map);
+        pa_sink_set_reference_volume_direct(i->origin_sink, &new_volume);
 
         i->origin_sink->real_volume = root_sink->real_volume;
         pa_cvolume_remap(&i->origin_sink->real_volume, &root_sink->channel_map, &i->origin_sink->channel_map);
 
         pa_assert(pa_cvolume_is_norm(&i->origin_sink->soft_volume));
 
-        /* Notify others about the changed sink volume. If you wonder whether
-         * i->origin_sink->set_volume() should be called somewhere, that's not
-         * the case, because sinks that use volume sharing shouldn't have any
-         * internal volume that set_volume() would update. If you wonder
-         * whether the thread_info variables should be synced, yes, they
-         * should, and it's done by the PA_SINK_MESSAGE_FINISH_MOVE message
-         * handler. */
-        if (!pa_cvolume_equal(&i->origin_sink->reference_volume, &old_volume))
-            pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, i->origin_sink->index);
+        /* If you wonder whether i->origin_sink->set_volume() should be called
+         * somewhere, that's not the case, because sinks that use volume
+         * sharing shouldn't have any internal volume that set_volume() would
+         * update. If you wonder whether the thread_info variables should be
+         * synced, yes, they should, and it's done by the
+         * PA_SINK_MESSAGE_FINISH_MOVE message handler. */
 
         /* Recursively update origin sink inputs. */
         PA_IDXSET_FOREACH(origin_sink_input, i->origin_sink->inputs, idx)
             update_volume_due_to_moving(origin_sink_input, dest);
 
     } else {
-        old_volume = i->volume;
-
         if (pa_sink_flat_volume_enabled(i->sink)) {
             /* Ok, so this is a regular stream, and flat volume is enabled. The
              * volume will have to be updated as follows:
@@ -1745,9 +1718,10 @@ static void update_volume_due_to_moving(pa_sink_input *i, pa_sink *dest) {
              *     i->soft_volume := i->real_ratio * i->volume_factor
              *         (handled later by pa_sink_set_volume) */
 
-            i->volume = i->sink->reference_volume;
-            pa_cvolume_remap(&i->volume, &i->sink->channel_map, &i->channel_map);
-            pa_sw_cvolume_multiply(&i->volume, &i->volume, &i->reference_ratio);
+            new_volume = i->sink->reference_volume;
+            pa_cvolume_remap(&new_volume, &i->sink->channel_map, &i->channel_map);
+            pa_sw_cvolume_multiply(&new_volume, &new_volume, &i->reference_ratio);
+            pa_sink_input_set_volume_direct(i, &new_volume);
 
         } else {
             /* Ok, so this is a regular stream, and flat volume is disabled.
@@ -1758,21 +1732,10 @@ static void update_volume_due_to_moving(pa_sink_input *i, pa_sink *dest) {
              *     i->real_ratio := i->reference_ratio
              *     i->soft_volume := i->real_ratio * i->volume_factor */
 
-            i->volume = i->reference_ratio;
+            pa_sink_input_set_volume_direct(i, &i->reference_ratio);
             i->real_ratio = i->reference_ratio;
             pa_sw_cvolume_multiply(&i->soft_volume, &i->real_ratio, &i->volume_factor);
         }
-
-        /* Notify others about the changed sink input volume. */
-        if (!pa_cvolume_equal(&i->volume, &old_volume)) {
-            /* XXX: In case i->sink has flat volume enabled, then real_ratio
-             * and soft_volume are not updated yet. Let's hope that the
-             * callback implementation doesn't care about those variables... */
-            if (i->volume_changed)
-                i->volume_changed(i);
-
-            pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
-        }
     }
 
     /* If i->sink == dest, then recursion has finished, and we can finally call
@@ -2249,3 +2212,53 @@ int pa_sink_input_update_rate(pa_sink_input *i) {
 
     return 0;
 }
+
+/* Called from the main thread. */
+void pa_sink_input_set_volume_direct(pa_sink_input *i, const pa_cvolume *volume) {
+    pa_cvolume old_volume;
+    char old_volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+    char new_volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+
+    pa_assert(i);
+    pa_assert(volume);
+
+    old_volume = i->volume;
+
+    if (pa_cvolume_equal(volume, &old_volume))
+        return;
+
+    i->volume = *volume;
+    pa_log_debug("The volume of sink input %u changed from %s to %s.", i->index,
+                 pa_cvolume_snprint_verbose(old_volume_str, sizeof(old_volume_str), &old_volume, &i->channel_map, true),
+                 pa_cvolume_snprint_verbose(new_volume_str, sizeof(new_volume_str), volume, &i->channel_map, true));
+
+    if (i->volume_changed)
+        i->volume_changed(i);
+
+    pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
+    pa_hook_fire(&i->core->hooks[PA_CORE_HOOK_SINK_INPUT_VOLUME_CHANGED], i);
+}
+
+/* Called from the main thread. */
+void pa_sink_input_set_reference_ratio(pa_sink_input *i, const pa_cvolume *ratio) {
+    pa_cvolume old_ratio;
+    char old_ratio_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+    char new_ratio_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+
+    pa_assert(i);
+    pa_assert(ratio);
+
+    old_ratio = i->reference_ratio;
+
+    if (pa_cvolume_equal(ratio, &old_ratio))
+        return;
+
+    i->reference_ratio = *ratio;
+
+    if (!PA_SINK_INPUT_IS_LINKED(i->state))
+        return;
+
+    pa_log_debug("Sink input %u reference ratio changed from %s to %s.", i->index,
+                 pa_cvolume_snprint_verbose(old_ratio_str, sizeof(old_ratio_str), &old_ratio, &i->channel_map, true),
+                 pa_cvolume_snprint_verbose(new_ratio_str, sizeof(new_ratio_str), ratio, &i->channel_map, true));
+}
diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h
index da33717..15f9315 100644
--- a/src/pulsecore/sink-input.h
+++ b/src/pulsecore/sink-input.h
@@ -375,7 +375,6 @@ int pa_sink_input_remove_volume_factor(pa_sink_input *i, const char *key);
 pa_cvolume *pa_sink_input_get_volume(pa_sink_input *i, pa_cvolume *volume, bool absolute);
 
 void pa_sink_input_set_mute(pa_sink_input *i, bool mute, bool save);
-bool pa_sink_input_get_mute(pa_sink_input *i);
 
 void pa_sink_input_update_proplist(pa_sink_input *i, pa_update_mode_t mode, pa_proplist *p);
 
@@ -417,6 +416,19 @@ bool pa_sink_input_process_underrun(pa_sink_input *i);
 
 pa_memchunk* pa_sink_input_get_silence(pa_sink_input *i, pa_memchunk *ret);
 
+/* Called from the main thread, from sink.c only. The normal way to set the
+ * sink input volume is to call pa_sink_input_set_volume(), but the flat volume
+ * logic in sink.c needs also a function that doesn't do all the extra stuff
+ * that pa_sink_input_set_volume() does. This function simply sets i->volume
+ * and fires change notifications. */
+void pa_sink_input_set_volume_direct(pa_sink_input *i, const pa_cvolume *volume);
+
+/* Called from the main thread, from sink.c only. This shouldn't be a public
+ * function, but the flat volume logic in sink.c currently needs a way to
+ * directly set the sink input reference ratio. This function simply sets
+ * i->reference_ratio and logs a message if the value changes. */
+void pa_sink_input_set_reference_ratio(pa_sink_input *i, const pa_cvolume *ratio);
+
 #define pa_sink_input_assert_io_context(s) \
     pa_assert(pa_thread_mq_get() || !PA_SINK_INPUT_IS_LINKED((s)->state))
 
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index f4647b8..8e2b5c8 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -126,7 +126,7 @@ void pa_sink_new_data_set_muted(pa_sink_new_data *data, bool mute) {
     pa_assert(data);
 
     data->muted_is_set = true;
-    data->muted = !!mute;
+    data->muted = mute;
 }
 
 void pa_sink_new_data_set_port(pa_sink_new_data *data, const char *port) {
@@ -231,10 +231,16 @@ pa_sink* pa_sink_new(
     if (data->card)
         pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->card->proplist);
 
-    pa_device_init_description(data->proplist);
+    pa_device_init_description(data->proplist, data->card);
     pa_device_init_icon(data->proplist, true);
     pa_device_init_intended_roles(data->proplist);
 
+    if (!data->active_port) {
+        pa_device_port *p = pa_device_port_find_best(data->ports);
+        if (p)
+            pa_sink_new_data_set_port(data, p->name);
+    }
+
     if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SINK_FIXATE], data) < 0) {
         pa_xfree(s);
         pa_namereg_unregister(core, name);
@@ -300,23 +306,10 @@ pa_sink* pa_sink_new(
         if ((s->active_port = pa_hashmap_get(s->ports, data->active_port)))
             s->save_port = data->save_port;
 
-    if (!s->active_port) {
-        void *state;
-        pa_device_port *p;
-
-        PA_HASHMAP_FOREACH(p, s->ports, state) {
-            if (p->available == PA_AVAILABLE_NO)
-                continue;
-
-            if (!s->active_port || p->priority > s->active_port->priority)
-                s->active_port = p;
-        }
-        if (!s->active_port) {
-            PA_HASHMAP_FOREACH(p, s->ports, state)
-                if (!s->active_port || p->priority > s->active_port->priority)
-                    s->active_port = p;
-        }
-    }
+    /* Hopefully the active port has already been assigned in the previous call
+       to pa_device_port_find_best, but better safe than sorry */
+    if (!s->active_port)
+        s->active_port = pa_device_port_find_best(s->ports);
 
     if (s->active_port)
         s->latency_offset = s->active_port->latency_offset;
@@ -515,7 +508,7 @@ void pa_sink_set_write_volume_callback(pa_sink *s, pa_sink_cb_t cb) {
         pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
 }
 
-void pa_sink_set_get_mute_callback(pa_sink *s, pa_sink_cb_t cb) {
+void pa_sink_set_get_mute_callback(pa_sink *s, pa_sink_get_mute_cb_t cb) {
     pa_assert(s);
 
     s->get_mute = cb;
@@ -620,8 +613,10 @@ void pa_sink_put(pa_sink* s) {
      * the sink implementor to set this flag as needed.
      *
      * Note: This flag can also change over the life time of the sink. */
-    if (!(s->flags & PA_SINK_HW_VOLUME_CTRL) && !(s->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER))
+    if (!(s->flags & PA_SINK_HW_VOLUME_CTRL) && !(s->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER)) {
         pa_sink_enable_decibel_volume(s, true);
+        s->soft_volume = s->reference_volume;
+    }
 
     /* If the sink implementor support DB volumes by itself, we should always
      * try and enable flat volumes too */
@@ -674,7 +669,7 @@ void pa_sink_put(pa_sink* s) {
 /* Called from main context */
 void pa_sink_unlink(pa_sink* s) {
     bool linked;
-    pa_sink_input *i, *j = NULL;
+    pa_sink_input *i, PA_UNUSED *j = NULL;
 
     pa_assert(s);
     pa_assert_ctl_context();
@@ -1394,7 +1389,8 @@ int pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
     uint32_t alternate_rate = s->alternate_sample_rate;
     uint32_t idx;
     pa_sink_input *i;
-    bool use_alternate = false;
+    bool default_rate_is_usable = false;
+    bool alternate_rate_is_usable = false;
 
     if (rate == s->sample_spec.rate)
         return 0;
@@ -1403,7 +1399,7 @@ int pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
         return -1;
 
     if (PA_UNLIKELY(default_rate == alternate_rate && !passthrough)) {
-        pa_log_debug("Default and alternate sample rates are the same.");
+        pa_log_debug("Default and alternate sample rates are the same, so there is no point in switching.");
         return -1;
     }
 
@@ -1423,25 +1419,20 @@ int pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
     if (PA_UNLIKELY(!pa_sample_rate_valid(desired_rate)))
         return -1;
 
-    if (!passthrough) {
-        pa_assert((default_rate % 4000 == 0) || (default_rate % 11025 == 0));
-        pa_assert((alternate_rate % 4000 == 0) || (alternate_rate % 11025 == 0));
-
-        if (default_rate % 11025 == 0) {
-            if ((alternate_rate % 4000 == 0) && (desired_rate % 4000 == 0))
-                use_alternate=true;
-        } else {
-            /* default is 4000 multiple */
-            if ((alternate_rate % 11025 == 0) && (desired_rate % 11025 == 0))
-                use_alternate=true;
-        }
-
-        if (use_alternate)
+    if (!passthrough && default_rate != desired_rate && alternate_rate != desired_rate) {
+        if (default_rate % 11025 == 0 && desired_rate % 11025 == 0)
+            default_rate_is_usable = true;
+        if (default_rate % 4000 == 0 && desired_rate % 4000 == 0)
+            default_rate_is_usable = true;
+        if (alternate_rate && alternate_rate % 11025 == 0 && desired_rate % 11025 == 0)
+            alternate_rate_is_usable = true;
+        if (alternate_rate && alternate_rate % 4000 == 0 && desired_rate % 4000 == 0)
+            alternate_rate_is_usable = true;
+
+        if (alternate_rate_is_usable && !default_rate_is_usable)
             desired_rate = alternate_rate;
         else
             desired_rate = default_rate;
-    } else {
-        desired_rate = rate; /* use stream sampling rate, discard default/alternate settings */
     }
 
     if (desired_rate == s->sample_spec.rate)
@@ -1621,6 +1612,7 @@ void pa_sink_leave_passthrough(pa_sink *s) {
 static void compute_reference_ratio(pa_sink_input *i) {
     unsigned c = 0;
     pa_cvolume remapped;
+    pa_cvolume ratio;
 
     pa_assert(i);
     pa_assert(pa_sink_flat_volume_enabled(i->sink));
@@ -1635,7 +1627,7 @@ static void compute_reference_ratio(pa_sink_input *i) {
     remapped = i->sink->reference_volume;
     pa_cvolume_remap(&remapped, &i->sink->channel_map, &i->channel_map);
 
-    i->reference_ratio.channels = i->sample_spec.channels;
+    ratio = i->reference_ratio;
 
     for (c = 0; c < i->sample_spec.channels; c++) {
 
@@ -1645,14 +1637,16 @@ static void compute_reference_ratio(pa_sink_input *i) {
 
         /* Don't update the reference ratio unless necessary */
         if (pa_sw_volume_multiply(
-                    i->reference_ratio.values[c],
+                    ratio.values[c],
                     remapped.values[c]) == i->volume.values[c])
             continue;
 
-        i->reference_ratio.values[c] = pa_sw_volume_divide(
+        ratio.values[c] = pa_sw_volume_divide(
                 i->volume.values[c],
                 remapped.values[c]);
     }
+
+    pa_sink_input_set_reference_ratio(i, &ratio);
 }
 
 /* Called from main context. Only called for the root sink in volume sharing
@@ -1842,20 +1836,13 @@ static void update_real_volume(pa_sink *s, const pa_cvolume *new_volume, pa_chan
     PA_IDXSET_FOREACH(i, s->inputs, idx) {
         if (i->origin_sink && (i->origin_sink->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER)) {
             if (pa_sink_flat_volume_enabled(s)) {
-                pa_cvolume old_volume = i->volume;
+                pa_cvolume new_input_volume;
 
                 /* Follow the root sink's real volume. */
-                i->volume = *new_volume;
-                pa_cvolume_remap(&i->volume, channel_map, &i->channel_map);
+                new_input_volume = *new_volume;
+                pa_cvolume_remap(&new_input_volume, channel_map, &i->channel_map);
+                pa_sink_input_set_volume_direct(i, &new_input_volume);
                 compute_reference_ratio(i);
-
-                /* The volume changed, let's tell people so */
-                if (!pa_cvolume_equal(&old_volume, &i->volume)) {
-                    if (i->volume_changed)
-                        i->volume_changed(i);
-
-                    pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
-                }
             }
 
             update_real_volume(i->origin_sink, new_volume, channel_map);
@@ -1910,7 +1897,7 @@ static void propagate_reference_volume(pa_sink *s) {
      * sink input volumes accordingly */
 
     PA_IDXSET_FOREACH(i, s->inputs, idx) {
-        pa_cvolume old_volume;
+        pa_cvolume new_volume;
 
         if (i->origin_sink && (i->origin_sink->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER)) {
             propagate_reference_volume(i->origin_sink);
@@ -1921,24 +1908,14 @@ static void propagate_reference_volume(pa_sink *s) {
             continue;
         }
 
-        old_volume = i->volume;
-
         /* This basically calculates:
          *
          * i->volume := s->reference_volume * i->reference_ratio  */
 
-        i->volume = s->reference_volume;
-        pa_cvolume_remap(&i->volume, &s->channel_map, &i->channel_map);
-        pa_sw_cvolume_multiply(&i->volume, &i->volume, &i->reference_ratio);
-
-        /* The volume changed, let's tell people so */
-        if (!pa_cvolume_equal(&old_volume, &i->volume)) {
-
-            if (i->volume_changed)
-                i->volume_changed(i);
-
-            pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
-        }
+        new_volume = s->reference_volume;
+        pa_cvolume_remap(&new_volume, &s->channel_map, &i->channel_map);
+        pa_sw_cvolume_multiply(&new_volume, &new_volume, &i->reference_ratio);
+        pa_sink_input_set_volume_direct(i, &new_volume);
     }
 }
 
@@ -1961,13 +1938,11 @@ static bool update_reference_volume(pa_sink *s, const pa_cvolume *v, const pa_ch
     pa_cvolume_remap(&volume, channel_map, &s->channel_map);
 
     reference_volume_changed = !pa_cvolume_equal(&volume, &s->reference_volume);
-    s->reference_volume = volume;
+    pa_sink_set_reference_volume_direct(s, &volume);
 
     s->save_volume = (!reference_volume_changed && s->save_volume) || save;
 
-    if (reference_volume_changed)
-        pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
-    else if (!(s->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER))
+    if (!reference_volume_changed && !(s->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER))
         /* If the root sink's volume doesn't change, then there can't be any
          * changes in the other sinks in the sink tree either.
          *
@@ -2056,7 +2031,7 @@ void pa_sink_set_volume(
 
         /* Let's 'push' the reference volume if necessary */
         pa_cvolume_merge(&new_reference_volume, &s->reference_volume, &root_sink->real_volume);
-        /* If the sink and it's root don't have the same number of channels, we need to remap */
+        /* If the sink and its root don't have the same number of channels, we need to remap */
         if (s != root_sink && !pa_channel_map_equal(&s->channel_map, &root_sink->channel_map))
             pa_cvolume_remap(&new_reference_volume, &s->channel_map, &root_sink->channel_map);
         update_reference_volume(root_sink, &new_reference_volume, &root_sink->channel_map, save);
@@ -2135,11 +2110,11 @@ static void propagate_real_volume(pa_sink *s, const pa_cvolume *old_real_volume)
     if (pa_sink_flat_volume_enabled(s)) {
 
         PA_IDXSET_FOREACH(i, s->inputs, idx) {
-            pa_cvolume old_volume = i->volume;
+            pa_cvolume new_volume;
 
             /* 2. Since the sink's reference and real volumes are equal
              * now our ratios should be too. */
-            i->reference_ratio = i->real_ratio;
+            pa_sink_input_set_reference_ratio(i, &i->real_ratio);
 
             /* 3. Recalculate the new stream reference volume based on the
              * reference ratio and the sink's reference volume.
@@ -2149,18 +2124,10 @@ static void propagate_real_volume(pa_sink *s, const pa_cvolume *old_real_volume)
              * i->volume = s->reference_volume * i->reference_ratio
              *
              * This is identical to propagate_reference_volume() */
-            i->volume = s->reference_volume;
-            pa_cvolume_remap(&i->volume, &s->channel_map, &i->channel_map);
-            pa_sw_cvolume_multiply(&i->volume, &i->volume, &i->reference_ratio);
-
-            /* Notify if something changed */
-            if (!pa_cvolume_equal(&old_volume, &i->volume)) {
-
-                if (i->volume_changed)
-                    i->volume_changed(i);
-
-                pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
-            }
+            new_volume = s->reference_volume;
+            pa_cvolume_remap(&new_volume, &s->channel_map, &i->channel_map);
+            pa_sw_cvolume_multiply(&new_volume, &new_volume, &i->reference_ratio);
+            pa_sink_input_set_volume_direct(i, &new_volume);
 
             if (i->origin_sink && (i->origin_sink->flags & PA_SINK_SHARE_VOLUME_WITH_MASTER))
                 propagate_real_volume(i->origin_sink, old_real_volume);
@@ -2230,19 +2197,30 @@ void pa_sink_set_mute(pa_sink *s, bool mute, bool save) {
 
     pa_sink_assert_ref(s);
     pa_assert_ctl_context();
-    pa_assert(PA_SINK_IS_LINKED(s->state));
 
     old_muted = s->muted;
+
+    if (mute == old_muted) {
+        s->save_muted |= save;
+        return;
+    }
+
     s->muted = mute;
-    s->save_muted = (old_muted == s->muted && s->save_muted) || save;
+    s->save_muted = save;
 
-    if (!(s->flags & PA_SINK_DEFERRED_VOLUME) && s->set_mute)
+    if (!(s->flags & PA_SINK_DEFERRED_VOLUME) && s->set_mute) {
+        s->set_mute_in_progress = true;
         s->set_mute(s);
+        s->set_mute_in_progress = false;
+    }
 
-    pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0);
+    if (!PA_SINK_IS_LINKED(s->state))
+        return;
 
-    if (old_muted != s->muted)
-        pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    pa_log_debug("The mute of sink %s changed from %s to %s.", s->name, pa_yes_no(old_muted), pa_yes_no(mute));
+    pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0);
+    pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_MUTE_CHANGED], s);
 }
 
 /* Called from main thread */
@@ -2252,21 +2230,15 @@ bool pa_sink_get_mute(pa_sink *s, bool force_refresh) {
     pa_assert_ctl_context();
     pa_assert(PA_SINK_IS_LINKED(s->state));
 
-    if (s->refresh_muted || force_refresh) {
-        bool old_muted = s->muted;
+    if ((s->refresh_muted || force_refresh) && s->get_mute) {
+        bool mute;
 
-        if (!(s->flags & PA_SINK_DEFERRED_VOLUME) && s->get_mute)
-            s->get_mute(s);
-
-        pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_MUTE, NULL, 0, NULL) == 0);
-
-        if (old_muted != s->muted) {
-            s->save_muted = true;
-
-            pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
-
-            /* Make sure the soft mute status stays in sync */
-            pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0);
+        if (s->flags & PA_SINK_DEFERRED_VOLUME) {
+            if (pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_MUTE, &mute, 0, NULL) >= 0)
+                pa_sink_mute_changed(s, mute);
+        } else {
+            if (s->get_mute(s, &mute) >= 0)
+                pa_sink_mute_changed(s, mute);
         }
     }
 
@@ -2279,15 +2251,17 @@ void pa_sink_mute_changed(pa_sink *s, bool new_muted) {
     pa_assert_ctl_context();
     pa_assert(PA_SINK_IS_LINKED(s->state));
 
-    /* The sink implementor may call this if the volume changed to make sure everyone is notified */
-
-    if (s->muted == new_muted)
+    if (s->set_mute_in_progress)
         return;
 
-    s->muted = new_muted;
-    s->save_muted = true;
+    /* pa_sink_set_mute() does this same check, so this may appear redundant,
+     * but we must have this here also, because the save parameter of
+     * pa_sink_set_mute() would otherwise have unintended side effects (saving
+     * the mute state when it shouldn't be saved). */
+    if (new_muted == s->muted)
+        return;
 
-    pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    pa_sink_set_mute(s, new_muted, true);
 }
 
 /* Called from main thread */
@@ -2554,9 +2528,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
                 i->thread_info.sync_next = NULL;
             }
 
-            if (pa_hashmap_remove(s->thread_info.inputs, PA_UINT32_TO_PTR(i->index)))
-                pa_sink_input_unref(i);
-
+            pa_hashmap_remove_and_free(s->thread_info.inputs, PA_UINT32_TO_PTR(i->index));
             pa_sink_invalidate_requested_latency(s, true);
             pa_sink_request_rewind(s, (size_t) -1);
 
@@ -2637,8 +2609,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
             i->thread_info.attached = false;
 
             /* Let's remove the sink input ...*/
-            if (pa_hashmap_remove(s->thread_info.inputs, PA_UINT32_TO_PTR(i->index)))
-                pa_sink_input_unref(i);
+            pa_hashmap_remove_and_free(s->thread_info.inputs, PA_UINT32_TO_PTR(i->index));
 
             pa_sink_invalidate_requested_latency(s, true);
 
@@ -2775,7 +2746,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
         case PA_SINK_MESSAGE_GET_MUTE:
 
             if (s->flags & PA_SINK_DEFERRED_VOLUME && s->get_mute)
-                s->get_mute(s);
+                return s->get_mute(s, userdata);
 
             return 0;
 
@@ -3441,16 +3412,21 @@ bool pa_device_init_icon(pa_proplist *p, bool is_sink) {
     return true;
 }
 
-bool pa_device_init_description(pa_proplist *p) {
+bool pa_device_init_description(pa_proplist *p, pa_card *card) {
     const char *s, *d = NULL, *k;
     pa_assert(p);
 
     if (pa_proplist_contains(p, PA_PROP_DEVICE_DESCRIPTION))
         return true;
 
-    if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_FORM_FACTOR)))
-        if (pa_streq(s, "internal"))
-            d = _("Built-in Audio");
+    if (card)
+        if ((s = pa_proplist_gets(card->proplist, PA_PROP_DEVICE_DESCRIPTION)))
+            d = s;
+
+    if (!d)
+        if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_FORM_FACTOR)))
+            if (pa_streq(s, "internal"))
+                d = _("Built-in Audio");
 
     if (!d)
         if ((s = pa_proplist_gets(p, PA_PROP_DEVICE_CLASS)))
@@ -3803,3 +3779,28 @@ done:
 
     return out_formats;
 }
+
+/* Called from the main thread. */
+void pa_sink_set_reference_volume_direct(pa_sink *s, const pa_cvolume *volume) {
+    pa_cvolume old_volume;
+    char old_volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+    char new_volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+
+    pa_assert(s);
+    pa_assert(volume);
+
+    old_volume = s->reference_volume;
+
+    if (pa_cvolume_equal(volume, &old_volume))
+        return;
+
+    s->reference_volume = *volume;
+    pa_log_debug("The reference volume of sink %s changed from %s to %s.", s->name,
+                 pa_cvolume_snprint_verbose(old_volume_str, sizeof(old_volume_str), &old_volume, &s->channel_map,
+                                            s->flags & PA_SINK_DECIBEL_VOLUME),
+                 pa_cvolume_snprint_verbose(new_volume_str, sizeof(new_volume_str), volume, &s->channel_map,
+                                            s->flags & PA_SINK_DECIBEL_VOLUME));
+
+    pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_VOLUME_CHANGED], s);
+}
diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
index c7cb5f8..d18e0be 100644
--- a/src/pulsecore/sink.h
+++ b/src/pulsecore/sink.h
@@ -58,6 +58,8 @@ static inline bool PA_SINK_IS_LINKED(pa_sink_state_t x) {
 /* A generic definition for void callback functions */
 typedef void(*pa_sink_cb_t)(pa_sink *s);
 
+typedef int (*pa_sink_get_mute_cb_t)(pa_sink *s, bool *mute);
+
 struct pa_sink {
     pa_msgobject parent;
 
@@ -118,6 +120,8 @@ struct pa_sink {
 
     unsigned priority;
 
+    bool set_mute_in_progress;
+
     /* Called when the main loop requests a state change. Called from
      * main loop context. If returns -1 the state change will be
      * inhibited */
@@ -189,14 +193,24 @@ struct pa_sink {
      * set this callback. */
     pa_sink_cb_t write_volume; /* may be NULL */
 
-    /* Called when the mute setting is queried. A PA_SINK_MESSAGE_GET_MUTE
-     * message will also be sent. Called from IO thread if PA_SINK_DEFERRED_VOLUME
-     * flag is set otherwise from main loop context. If refresh_mute is false
-     * neither this function is called nor a message is sent.
+    /* If the sink mute can change "spontaneously" (i.e. initiated by the sink
+     * implementation, not by someone else calling pa_sink_set_mute()), then
+     * the sink implementation can notify about changed mute either by calling
+     * pa_sink_mute_changed() or by calling pa_sink_get_mute() with
+     * force_refresh=true. If the implementation chooses the latter approach,
+     * it should implement the get_mute callback. Otherwise get_mute can be
+     * NULL.
+     *
+     * This is called when pa_sink_get_mute() is called with
+     * force_refresh=true. This is called from the IO thread if the
+     * PA_SINK_DEFERRED_VOLUME flag is set, otherwise this is called from the
+     * main thread. On success, the implementation is expected to return 0 and
+     * set the mute parameter that is passed as a reference. On failure, the
+     * implementation is expected to return -1.
      *
      * You must use the function pa_sink_set_get_mute_callback() to
      * set this callback. */
-    pa_sink_cb_t get_mute; /* may be NULL */
+    pa_sink_get_mute_cb_t get_mute;
 
     /* Called when the mute setting shall be changed. A PA_SINK_MESSAGE_SET_MUTE
      * message will also be sent. Called from IO thread if PA_SINK_DEFERRED_VOLUME
@@ -342,7 +356,7 @@ typedef struct pa_sink_new_data {
     pa_channel_map channel_map;
     uint32_t alternate_sample_rate;
     pa_cvolume volume;
-    bool muted :1;
+    bool muted:1;
 
     bool sample_spec_is_set:1;
     bool channel_map_is_set:1;
@@ -377,7 +391,7 @@ pa_sink* pa_sink_new(
 void pa_sink_set_get_volume_callback(pa_sink *s, pa_sink_cb_t cb);
 void pa_sink_set_set_volume_callback(pa_sink *s, pa_sink_cb_t cb);
 void pa_sink_set_write_volume_callback(pa_sink *s, pa_sink_cb_t cb);
-void pa_sink_set_get_mute_callback(pa_sink *s, pa_sink_cb_t cb);
+void pa_sink_set_get_mute_callback(pa_sink *s, pa_sink_get_mute_cb_t cb);
 void pa_sink_set_set_mute_callback(pa_sink *s, pa_sink_cb_t cb);
 void pa_sink_enable_decibel_volume(pa_sink *s, bool enable);
 
@@ -399,7 +413,7 @@ void pa_sink_mute_changed(pa_sink *s, bool new_muted);
 
 void pa_sink_update_flags(pa_sink *s, pa_sink_flags_t mask, pa_sink_flags_t value);
 
-bool pa_device_init_description(pa_proplist *p);
+bool pa_device_init_description(pa_proplist *p, pa_card *card);
 bool pa_device_init_icon(pa_proplist *p, bool is_sink);
 bool pa_device_init_intended_roles(pa_proplist *p);
 unsigned pa_device_init_priority(pa_proplist *p);
@@ -503,6 +517,13 @@ void pa_sink_invalidate_requested_latency(pa_sink *s, bool dynamic);
 
 pa_usec_t pa_sink_get_latency_within_thread(pa_sink *s);
 
+/* Called from the main thread, from sink-input.c only. The normal way to set
+ * the sink reference volume is to call pa_sink_set_volume(), but the flat
+ * volume logic in sink-input.c needs also a function that doesn't do all the
+ * extra stuff that pa_sink_set_volume() does. This function simply sets
+ * s->reference_volume and fires change notifications. */
+void pa_sink_set_reference_volume_direct(pa_sink *s, const pa_cvolume *volume);
+
 /* Verify that we called in IO context (aka 'thread context), or that
  * the sink is not yet set up, i.e. the thread not set up yet. See
  * pa_assert_io_context() in thread-mq.h for more information. */
diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c
index ef77563..2138cbc 100644
--- a/src/pulsecore/socket-server.c
+++ b/src/pulsecore/socket-server.c
@@ -56,6 +56,10 @@ int deny_severity = LOG_WARNING;
 
 #endif /* HAVE_LIBWRAP */
 
+#ifdef HAVE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif
+
 #include <pulse/xmalloc.h>
 #include <pulse/util.h>
 
@@ -74,6 +78,7 @@ struct pa_socket_server {
     PA_REFCNT_DECLARE;
     int fd;
     char *filename;
+    bool activated;
     char *tcpwrap_service;
 
     pa_socket_server_on_connection_cb_t on_connection;
@@ -174,43 +179,63 @@ pa_socket_server* pa_socket_server_ref(pa_socket_server *s) {
 
 pa_socket_server* pa_socket_server_new_unix(pa_mainloop_api *m, const char *filename) {
     int fd = -1;
+    bool activated = false;
     struct sockaddr_un sa;
     pa_socket_server *s;
 
     pa_assert(m);
     pa_assert(filename);
 
-    if ((fd = pa_socket_cloexec(PF_UNIX, SOCK_STREAM, 0)) < 0) {
-        pa_log("socket(): %s", pa_cstrerror(errno));
-        goto fail;
+#ifdef HAVE_SYSTEMD_DAEMON
+    {
+        int n = sd_listen_fds(0);
+        if (n > 0) {
+            for (int i = 0; i < n; ++i) {
+                if (sd_is_socket_unix(SD_LISTEN_FDS_START + i, SOCK_STREAM, 1, filename, 0) > 0) {
+                    fd = SD_LISTEN_FDS_START + i;
+                    activated = true;
+                    pa_log_info("Found socket activation socket for '%s' \\o/", filename);
+                    break;
+                }
+            }
+        }
     }
+#endif
 
-    memset(&sa, 0, sizeof(sa));
-    sa.sun_family = AF_UNIX;
-    pa_strlcpy(sa.sun_path, filename, sizeof(sa.sun_path));
+    if (fd < 0) {
+        if ((fd = pa_socket_cloexec(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+            pa_log("socket(PF_UNIX): %s", pa_cstrerror(errno));
+            goto fail;
+        }
 
-    pa_make_socket_low_delay(fd);
+        memset(&sa, 0, sizeof(sa));
+        sa.sun_family = AF_UNIX;
+        pa_strlcpy(sa.sun_path, filename, sizeof(sa.sun_path));
 
-    if (bind(fd, (struct sockaddr*) &sa, (socklen_t) SUN_LEN(&sa)) < 0) {
-        pa_log("bind(): %s", pa_cstrerror(errno));
-        goto fail;
-    }
+        pa_make_socket_low_delay(fd);
 
-    /* Allow access from all clients. Sockets like this one should
-     * always be put inside a directory with proper access rights,
-     * because not all OS check the access rights on the socket
-     * inodes. */
-    chmod(filename, 0777);
+        if (bind(fd, (struct sockaddr*) &sa, (socklen_t) SUN_LEN(&sa)) < 0) {
+            pa_log("bind(): %s", pa_cstrerror(errno));
+            goto fail;
+        }
 
-    if (listen(fd, 5) < 0) {
-        pa_log("listen(): %s", pa_cstrerror(errno));
-        goto fail;
+        /* Allow access from all clients. Sockets like this one should
+        * always be put inside a directory with proper access rights,
+        * because not all OS check the access rights on the socket
+        * inodes. */
+        chmod(filename, 0777);
+
+        if (listen(fd, 5) < 0) {
+            pa_log("listen(): %s", pa_cstrerror(errno));
+            goto fail;
+        }
     }
 
     pa_assert_se(s = pa_socket_server_new(m, fd));
 
     s->filename = pa_xstrdup(filename);
     s->type = SOCKET_SERVER_UNIX;
+    s->activated = activated;
 
     return s;
 
@@ -260,15 +285,14 @@ pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address
         if (errno == EADDRINUSE && fallback) {
             sa.sin_port = 0;
 
-            if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) >= 0)
-                goto good;
+            if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
+                pa_log("bind(): %s", pa_cstrerror(errno));
+                goto fail;
+            }
+        } else {
+            pa_log("bind(): %s", pa_cstrerror(errno));
+            goto fail;
         }
-
-        pa_log("bind(): %s", pa_cstrerror(errno));
-        goto fail;
-
-    good:
-        ;
     }
 
     if (listen(fd, 5) < 0) {
@@ -329,15 +353,14 @@ pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t ad
         if (errno == EADDRINUSE && fallback) {
             sa.sin6_port = 0;
 
-            if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) >= 0)
-                goto good;
+            if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
+                pa_log("bind(): %s", pa_cstrerror(errno));
+                goto fail;
+            }
+        } else {
+            pa_log("bind(): %s", pa_cstrerror(errno));
+            goto fail;
         }
-
-        pa_log("bind(): %s", pa_cstrerror(errno));
-        goto fail;
-
-    good:
-        ;
     }
 
     if (listen(fd, 5) < 0) {
@@ -423,10 +446,9 @@ pa_socket_server* pa_socket_server_new_ipv6_string(pa_mainloop_api *m, const cha
 static void socket_server_free(pa_socket_server*s) {
     pa_assert(s);
 
-    if (s->filename) {
+    if (!s->activated && s->filename)
         unlink(s->filename);
-        pa_xfree(s->filename);
-    }
+    pa_xfree(s->filename);
 
     pa_close(s->fd);
 
diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c
index e1c0b55..ccb9442 100644
--- a/src/pulsecore/socket-util.c
+++ b/src/pulsecore/socket-util.c
@@ -52,6 +52,9 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
+#ifdef HAVE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
+#endif
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
@@ -255,6 +258,21 @@ int pa_unix_socket_remove_stale(const char *fn) {
 
     pa_assert(fn);
 
+#ifdef HAVE_SYSTEMD_DAEMON
+    {
+        int n = sd_listen_fds(0);
+        if (n > 0) {
+            for (int i = 0; i < n; ++i) {
+                if (sd_is_socket_unix(SD_LISTEN_FDS_START + i, SOCK_STREAM, 1, fn, 0) > 0) {
+                    /* This is a socket activated socket, therefore do not consider
+                    * it stale. */
+                    return 0;
+                }
+            }
+        }
+    }
+#endif
+
     if ((r = pa_unix_socket_is_stale(fn)) < 0)
         return errno != ENOENT ? -1 : 0;
 
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 4e4b7e9..65b2d80 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -122,7 +122,7 @@ void pa_source_output_new_data_set_muted(pa_source_output_new_data *data, bool m
     pa_assert(data);
 
     data->muted_is_set = true;
-    data->muted = !!mute;
+    data->muted = mute;
 }
 
 bool pa_source_output_new_data_set_source(pa_source_output_new_data *data, pa_source *s, bool save) {
@@ -972,7 +972,7 @@ void pa_source_output_set_volume(pa_source_output *o, const pa_cvolume *volume,
         return;
     }
 
-    o->volume = *volume;
+    pa_source_output_set_volume_direct(o, volume);
     o->save_volume = save;
 
     if (pa_source_flat_volume_enabled(o->source)) {
@@ -1057,16 +1057,22 @@ pa_cvolume *pa_source_output_get_volume(pa_source_output *o, pa_cvolume *volume,
 
 /* Called from main context */
 void pa_source_output_set_mute(pa_source_output *o, bool mute, bool save) {
+    bool old_mute;
+
     pa_source_output_assert_ref(o);
     pa_assert_ctl_context();
     pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->state));
 
-    if (!o->muted == !mute) {
-        o->save_muted = o->save_muted || mute;
+    old_mute = o->muted;
+
+    if (mute == old_mute) {
+        o->save_muted |= save;
         return;
     }
 
     o->muted = mute;
+    pa_log_debug("The mute of source output %u changed from %s to %s.", o->index, pa_yes_no(old_mute), pa_yes_no(mute));
+
     o->save_muted = save;
 
     pa_assert_se(pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o), PA_SOURCE_OUTPUT_MESSAGE_SET_SOFT_MUTE, NULL, 0, NULL) == 0);
@@ -1076,15 +1082,7 @@ void pa_source_output_set_mute(pa_source_output *o, bool mute, bool save) {
         o->mute_changed(o);
 
     pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
-}
-
-/* Called from main context */
-bool pa_source_output_get_mute(pa_source_output *o) {
-    pa_source_output_assert_ref(o);
-    pa_assert_ctl_context();
-    pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->state));
-
-    return o->muted;
+    pa_hook_fire(&o->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_MUTE_CHANGED], o);
 }
 
 /* Called from main thread */
@@ -1177,7 +1175,7 @@ bool pa_source_output_may_move(pa_source_output *o) {
 }
 
 static bool find_filter_source_output(pa_source_output *target, pa_source *s) {
-    int i = 0;
+    unsigned PA_UNUSED i = 0;
     while (s && s->output_from_master) {
         if (s->output_from_master == target)
             return true;
@@ -1262,7 +1260,7 @@ int pa_source_output_start_move(pa_source_output *o) {
  * then also the origin source and all streams connected to it need to update
  * their volume - this function does all that by using recursion. */
 static void update_volume_due_to_moving(pa_source_output *o, pa_source *dest) {
-    pa_cvolume old_volume;
+    pa_cvolume new_volume;
 
     pa_assert(o);
     pa_assert(dest);
@@ -1313,19 +1311,11 @@ static void update_volume_due_to_moving(pa_source_output *o, pa_source *dest) {
              *          always have volume_factor as soft_volume, so no change
              *          should be needed) */
 
-            old_volume = o->volume;
-            pa_cvolume_reset(&o->volume, o->volume.channels);
-            pa_cvolume_reset(&o->reference_ratio, o->reference_ratio.channels);
+            pa_cvolume_reset(&new_volume, o->volume.channels);
+            pa_source_output_set_volume_direct(o, &new_volume);
+            pa_source_output_set_reference_ratio(o, &new_volume);
             pa_assert(pa_cvolume_is_norm(&o->real_ratio));
             pa_assert(pa_cvolume_equal(&o->soft_volume, &o->volume_factor));
-
-            /* Notify others about the changed source output volume. */
-            if (!pa_cvolume_equal(&o->volume, &old_volume)) {
-                if (o->volume_changed)
-                    o->volume_changed(o);
-
-                pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
-            }
         }
 
         /* Additionally, the origin source volume needs updating:
@@ -1336,33 +1326,27 @@ static void update_volume_due_to_moving(pa_source_output *o, pa_source *dest) {
          *         (sources that use volume sharing should always have
          *          soft_volume of 0 dB) */
 
-        old_volume = o->destination_source->reference_volume;
-
-        o->destination_source->reference_volume = root_source->reference_volume;
-        pa_cvolume_remap(&o->destination_source->reference_volume, &root_source->channel_map, &o->destination_source->channel_map);
+        new_volume = root_source->reference_volume;
+        pa_cvolume_remap(&new_volume, &root_source->channel_map, &o->destination_source->channel_map);
+        pa_source_set_reference_volume_direct(o->destination_source, &new_volume);
 
         o->destination_source->real_volume = root_source->real_volume;
         pa_cvolume_remap(&o->destination_source->real_volume, &root_source->channel_map, &o->destination_source->channel_map);
 
         pa_assert(pa_cvolume_is_norm(&o->destination_source->soft_volume));
 
-        /* Notify others about the changed source volume. If you wonder whether
-         * o->destination_source->set_volume() should be called somewhere, that's not
-         * the case, because sources that use volume sharing shouldn't have any
-         * internal volume that set_volume() would update. If you wonder
-         * whether the thread_info variables should be synced, yes, they
-         * should, and it's done by the PA_SOURCE_MESSAGE_FINISH_MOVE message
-         * handler. */
-        if (!pa_cvolume_equal(&o->destination_source->reference_volume, &old_volume))
-            pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, o->destination_source->index);
+        /* If you wonder whether o->destination_source->set_volume() should be
+         * called somewhere, that's not the case, because sources that use
+         * volume sharing shouldn't have any internal volume that set_volume()
+         * would update. If you wonder whether the thread_info variables should
+         * be synced, yes, they should, and it's done by the
+         * PA_SOURCE_MESSAGE_FINISH_MOVE message handler. */
 
         /* Recursively update origin source outputs. */
         PA_IDXSET_FOREACH(destination_source_output, o->destination_source->outputs, idx)
             update_volume_due_to_moving(destination_source_output, dest);
 
     } else {
-        old_volume = o->volume;
-
         if (pa_source_flat_volume_enabled(o->source)) {
             /* Ok, so this is a regular stream, and flat volume is enabled. The
              * volume will have to be updated as follows:
@@ -1374,9 +1358,10 @@ static void update_volume_due_to_moving(pa_source_output *o, pa_source *dest) {
              *     o->soft_volume := o->real_ratio * o->volume_factor
              *         (handled later by pa_source_set_volume) */
 
-            o->volume = o->source->reference_volume;
-            pa_cvolume_remap(&o->volume, &o->source->channel_map, &o->channel_map);
-            pa_sw_cvolume_multiply(&o->volume, &o->volume, &o->reference_ratio);
+            new_volume = o->source->reference_volume;
+            pa_cvolume_remap(&new_volume, &o->source->channel_map, &o->channel_map);
+            pa_sw_cvolume_multiply(&new_volume, &new_volume, &o->reference_ratio);
+            pa_source_output_set_volume_direct(o, &new_volume);
 
         } else {
             /* Ok, so this is a regular stream, and flat volume is disabled.
@@ -1387,21 +1372,10 @@ static void update_volume_due_to_moving(pa_source_output *o, pa_source *dest) {
              *     o->real_ratio := o->reference_ratio
              *     o->soft_volume := o->real_ratio * o->volume_factor */
 
-            o->volume = o->reference_ratio;
+            pa_source_output_set_volume_direct(o, &o->reference_ratio);
             o->real_ratio = o->reference_ratio;
             pa_sw_cvolume_multiply(&o->soft_volume, &o->real_ratio, &o->volume_factor);
         }
-
-        /* Notify others about the changed source output volume. */
-        if (!pa_cvolume_equal(&o->volume, &old_volume)) {
-            /* XXX: In case o->source has flat volume enabled, then real_ratio
-             * and soft_volume are not updated yet. Let's hope that the
-             * callback implementation doesn't care about those variables... */
-            if (o->volume_changed)
-                o->volume_changed(o);
-
-            pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
-        }
     }
 
     /* If o->source == dest, then recursion has finished, and we can finally call
@@ -1695,3 +1669,53 @@ int pa_source_output_update_rate(pa_source_output *o) {
 
     return 0;
 }
+
+/* Called from the main thread. */
+void pa_source_output_set_volume_direct(pa_source_output *o, const pa_cvolume *volume) {
+    pa_cvolume old_volume;
+    char old_volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+    char new_volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+
+    pa_assert(o);
+    pa_assert(volume);
+
+    old_volume = o->volume;
+
+    if (pa_cvolume_equal(volume, &old_volume))
+        return;
+
+    o->volume = *volume;
+    pa_log_debug("The volume of source output %u changed from %s to %s.", o->index,
+                 pa_cvolume_snprint_verbose(old_volume_str, sizeof(old_volume_str), &old_volume, &o->channel_map, true),
+                 pa_cvolume_snprint_verbose(new_volume_str, sizeof(new_volume_str), volume, &o->channel_map, true));
+
+    if (o->volume_changed)
+        o->volume_changed(o);
+
+    pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
+    pa_hook_fire(&o->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_VOLUME_CHANGED], o);
+}
+
+/* Called from the main thread. */
+void pa_source_output_set_reference_ratio(pa_source_output *o, const pa_cvolume *ratio) {
+    pa_cvolume old_ratio;
+    char old_ratio_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+    char new_ratio_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+
+    pa_assert(o);
+    pa_assert(ratio);
+
+    old_ratio = o->reference_ratio;
+
+    if (pa_cvolume_equal(ratio, &old_ratio))
+        return;
+
+    o->reference_ratio = *ratio;
+
+    if (!PA_SOURCE_OUTPUT_IS_LINKED(o->state))
+        return;
+
+    pa_log_debug("Source output %u reference ratio changed from %s to %s.", o->index,
+                 pa_cvolume_snprint_verbose(old_ratio_str, sizeof(old_ratio_str), &old_ratio, &o->channel_map, true),
+                 pa_cvolume_snprint_verbose(new_ratio_str, sizeof(new_ratio_str), ratio, &o->channel_map, true));
+}
diff --git a/src/pulsecore/source-output.h b/src/pulsecore/source-output.h
index 102fb8b..3ed950b 100644
--- a/src/pulsecore/source-output.h
+++ b/src/pulsecore/source-output.h
@@ -318,7 +318,6 @@ void pa_source_output_set_volume(pa_source_output *o, const pa_cvolume *volume,
 pa_cvolume *pa_source_output_get_volume(pa_source_output *o, pa_cvolume *volume, bool absolute);
 
 void pa_source_output_set_mute(pa_source_output *o, bool mute, bool save);
-bool pa_source_output_get_mute(pa_source_output *o);
 
 void pa_source_output_update_proplist(pa_source_output *o, pa_update_mode_t mode, pa_proplist *p);
 
@@ -353,6 +352,19 @@ int pa_source_output_process_msg(pa_msgobject *mo, int code, void *userdata, int
 
 pa_usec_t pa_source_output_set_requested_latency_within_thread(pa_source_output *o, pa_usec_t usec);
 
+/* Called from the main thread, from source.c only. The normal way to set the
+ * source output volume is to call pa_source_output_set_volume(), but the flat
+ * volume logic in source.c needs also a function that doesn't do all the extra
+ * stuff that pa_source_output_set_volume() does. This function simply sets
+ * o->volume and fires change notifications. */
+void pa_source_output_set_volume_direct(pa_source_output *o, const pa_cvolume *volume);
+
+/* Called from the main thread, from source.c only. This shouldn't be a public
+ * function, but the flat volume logic in source.c currently needs a way to
+ * directly set the source output reference ratio. This function simply sets
+ * o->reference_ratio and logs a message if the value changes. */
+void pa_source_output_set_reference_ratio(pa_source_output *o, const pa_cvolume *ratio);
+
 #define pa_source_output_assert_io_context(s) \
     pa_assert(pa_thread_mq_get() || !PA_SOURCE_OUTPUT_IS_LINKED((s)->state))
 
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index af4c6ec..ab3a0d2 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -117,7 +117,7 @@ void pa_source_new_data_set_muted(pa_source_new_data *data, bool mute) {
     pa_assert(data);
 
     data->muted_is_set = true;
-    data->muted = !!mute;
+    data->muted = mute;
 }
 
 void pa_source_new_data_set_port(pa_source_new_data *data, const char *port) {
@@ -218,10 +218,16 @@ pa_source* pa_source_new(
     if (data->card)
         pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->card->proplist);
 
-    pa_device_init_description(data->proplist);
+    pa_device_init_description(data->proplist, data->card);
     pa_device_init_icon(data->proplist, false);
     pa_device_init_intended_roles(data->proplist);
 
+    if (!data->active_port) {
+        pa_device_port *p = pa_device_port_find_best(data->ports);
+        if (p)
+            pa_source_new_data_set_port(data, p->name);
+    }
+
     if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SOURCE_FIXATE], data) < 0) {
         pa_xfree(s);
         pa_namereg_unregister(core, name);
@@ -288,24 +294,10 @@ pa_source* pa_source_new(
         if ((s->active_port = pa_hashmap_get(s->ports, data->active_port)))
             s->save_port = data->save_port;
 
-    if (!s->active_port) {
-        void *state;
-        pa_device_port *p;
-
-        PA_HASHMAP_FOREACH(p, s->ports, state) {
-            if (p->available == PA_AVAILABLE_NO)
-                continue;
-
-            if (!s->active_port || p->priority > s->active_port->priority)
-                s->active_port = p;
-        }
-
-        if (!s->active_port) {
-            PA_HASHMAP_FOREACH(p, s->ports, state)
-                if (!s->active_port || p->priority > s->active_port->priority)
-                    s->active_port = p;
-        }
-    }
+    /* Hopefully the active port has already been assigned in the previous call
+       to pa_device_port_find_best, but better safe than sorry */
+    if (!s->active_port)
+        s->active_port = pa_device_port_find_best(s->ports);
 
     if (s->active_port)
         s->latency_offset = s->active_port->latency_offset;
@@ -467,7 +459,7 @@ void pa_source_set_write_volume_callback(pa_source *s, pa_source_cb_t cb) {
         pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
 }
 
-void pa_source_set_get_mute_callback(pa_source *s, pa_source_cb_t cb) {
+void pa_source_set_get_mute_callback(pa_source *s, pa_source_get_mute_cb_t cb) {
     pa_assert(s);
 
     s->get_mute = cb;
@@ -572,8 +564,10 @@ void pa_source_put(pa_source *s) {
      * the source implementor to set this flag as needed.
      *
      * Note: This flag can also change over the life time of the source. */
-    if (!(s->flags & PA_SOURCE_HW_VOLUME_CTRL) && !(s->flags & PA_SOURCE_SHARE_VOLUME_WITH_MASTER))
+    if (!(s->flags & PA_SOURCE_HW_VOLUME_CTRL) && !(s->flags & PA_SOURCE_SHARE_VOLUME_WITH_MASTER)) {
         pa_source_enable_decibel_volume(s, true);
+        s->soft_volume = s->reference_volume;
+    }
 
     /* If the source implementor support DB volumes by itself, we should always
      * try and enable flat volumes too */
@@ -618,7 +612,7 @@ void pa_source_put(pa_source *s) {
 /* Called from main context */
 void pa_source_unlink(pa_source *s) {
     bool linked;
-    pa_source_output *o, *j = NULL;
+    pa_source_output *o, PA_UNUSED *j = NULL;
 
     pa_assert(s);
     pa_assert_ctl_context();
@@ -983,7 +977,8 @@ int pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
     uint32_t desired_rate = rate;
     uint32_t default_rate = s->default_sample_rate;
     uint32_t alternate_rate = s->alternate_sample_rate;
-    bool use_alternate = false;
+    bool default_rate_is_usable = false;
+    bool alternate_rate_is_usable = false;
 
     if (rate == s->sample_spec.rate)
         return 0;
@@ -992,7 +987,7 @@ int pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
         return -1;
 
     if (PA_UNLIKELY(default_rate == alternate_rate && !passthrough)) {
-        pa_log_debug("Default and alternate sample rates are the same.");
+        pa_log_debug("Default and alternate sample rates are the same, so there is no point in switching.");
         return -1;
     }
 
@@ -1012,25 +1007,20 @@ int pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
     if (PA_UNLIKELY(!pa_sample_rate_valid(desired_rate)))
         return -1;
 
-    if (!passthrough) {
-        pa_assert((default_rate % 4000 == 0) || (default_rate % 11025 == 0));
-        pa_assert((alternate_rate % 4000 == 0) || (alternate_rate % 11025 == 0));
-
-        if (default_rate % 11025 == 0) {
-            if ((alternate_rate % 4000 == 0) && (desired_rate % 4000 == 0))
-                use_alternate=true;
-        } else {
-            /* default is 4000 multiple */
-            if ((alternate_rate % 11025 == 0) && (desired_rate % 11025 == 0))
-                use_alternate=true;
-        }
-
-        if (use_alternate)
+    if (!passthrough && default_rate != desired_rate && alternate_rate != desired_rate) {
+        if (default_rate % 11025 == 0 && desired_rate % 11025 == 0)
+            default_rate_is_usable = true;
+        if (default_rate % 4000 == 0 && desired_rate % 4000 == 0)
+            default_rate_is_usable = true;
+        if (alternate_rate && alternate_rate % 11025 == 0 && desired_rate % 11025 == 0)
+            alternate_rate_is_usable = true;
+        if (alternate_rate && alternate_rate % 4000 == 0 && desired_rate % 4000 == 0)
+            alternate_rate_is_usable = true;
+
+        if (alternate_rate_is_usable && !default_rate_is_usable)
             desired_rate = alternate_rate;
         else
             desired_rate = default_rate;
-    } else {
-        desired_rate = rate; /* use stream sampling rate, discard default/alternate settings */
     }
 
     if (desired_rate == s->sample_spec.rate)
@@ -1216,6 +1206,7 @@ void pa_source_leave_passthrough(pa_source *s) {
 static void compute_reference_ratio(pa_source_output *o) {
     unsigned c = 0;
     pa_cvolume remapped;
+    pa_cvolume ratio;
 
     pa_assert(o);
     pa_assert(pa_source_flat_volume_enabled(o->source));
@@ -1230,7 +1221,7 @@ static void compute_reference_ratio(pa_source_output *o) {
     remapped = o->source->reference_volume;
     pa_cvolume_remap(&remapped, &o->source->channel_map, &o->channel_map);
 
-    o->reference_ratio.channels = o->sample_spec.channels;
+    ratio = o->reference_ratio;
 
     for (c = 0; c < o->sample_spec.channels; c++) {
 
@@ -1240,14 +1231,16 @@ static void compute_reference_ratio(pa_source_output *o) {
 
         /* Don't update the reference ratio unless necessary */
         if (pa_sw_volume_multiply(
-                    o->reference_ratio.values[c],
+                    ratio.values[c],
                     remapped.values[c]) == o->volume.values[c])
             continue;
 
-        o->reference_ratio.values[c] = pa_sw_volume_divide(
+        ratio.values[c] = pa_sw_volume_divide(
                 o->volume.values[c],
                 remapped.values[c]);
     }
+
+    pa_source_output_set_reference_ratio(o, &ratio);
 }
 
 /* Called from main context. Only called for the root source in volume sharing
@@ -1437,20 +1430,13 @@ static void update_real_volume(pa_source *s, const pa_cvolume *new_volume, pa_ch
     PA_IDXSET_FOREACH(o, s->outputs, idx) {
         if (o->destination_source && (o->destination_source->flags & PA_SOURCE_SHARE_VOLUME_WITH_MASTER)) {
             if (pa_source_flat_volume_enabled(s)) {
-                pa_cvolume old_volume = o->volume;
+                pa_cvolume new_output_volume;
 
                 /* Follow the root source's real volume. */
-                o->volume = *new_volume;
-                pa_cvolume_remap(&o->volume, channel_map, &o->channel_map);
+                new_output_volume = *new_volume;
+                pa_cvolume_remap(&new_output_volume, channel_map, &o->channel_map);
+                pa_source_output_set_volume_direct(o, &new_output_volume);
                 compute_reference_ratio(o);
-
-                /* The volume changed, let's tell people so */
-                if (!pa_cvolume_equal(&old_volume, &o->volume)) {
-                    if (o->volume_changed)
-                        o->volume_changed(o);
-
-                    pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
-                }
             }
 
             update_real_volume(o->destination_source, new_volume, channel_map);
@@ -1505,7 +1491,7 @@ static void propagate_reference_volume(pa_source *s) {
      * source output volumes accordingly */
 
     PA_IDXSET_FOREACH(o, s->outputs, idx) {
-        pa_cvolume old_volume;
+        pa_cvolume new_volume;
 
         if (o->destination_source && (o->destination_source->flags & PA_SOURCE_SHARE_VOLUME_WITH_MASTER)) {
             propagate_reference_volume(o->destination_source);
@@ -1516,24 +1502,14 @@ static void propagate_reference_volume(pa_source *s) {
             continue;
         }
 
-        old_volume = o->volume;
-
         /* This basically calculates:
          *
          * o->volume := o->reference_volume * o->reference_ratio  */
 
-        o->volume = s->reference_volume;
-        pa_cvolume_remap(&o->volume, &s->channel_map, &o->channel_map);
-        pa_sw_cvolume_multiply(&o->volume, &o->volume, &o->reference_ratio);
-
-        /* The volume changed, let's tell people so */
-        if (!pa_cvolume_equal(&old_volume, &o->volume)) {
-
-            if (o->volume_changed)
-                o->volume_changed(o);
-
-            pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
-        }
+        new_volume = s->reference_volume;
+        pa_cvolume_remap(&new_volume, &s->channel_map, &o->channel_map);
+        pa_sw_cvolume_multiply(&new_volume, &new_volume, &o->reference_ratio);
+        pa_source_output_set_volume_direct(o, &new_volume);
     }
 }
 
@@ -1556,13 +1532,11 @@ static bool update_reference_volume(pa_source *s, const pa_cvolume *v, const pa_
     pa_cvolume_remap(&volume, channel_map, &s->channel_map);
 
     reference_volume_changed = !pa_cvolume_equal(&volume, &s->reference_volume);
-    s->reference_volume = volume;
+    pa_source_set_reference_volume_direct(s, &volume);
 
     s->save_volume = (!reference_volume_changed && s->save_volume) || save;
 
-    if (reference_volume_changed)
-        pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
-    else if (!(s->flags & PA_SOURCE_SHARE_VOLUME_WITH_MASTER))
+    if (!reference_volume_changed && !(s->flags & PA_SOURCE_SHARE_VOLUME_WITH_MASTER))
         /* If the root source's volume doesn't change, then there can't be any
          * changes in the other source in the source tree either.
          *
@@ -1651,7 +1625,7 @@ void pa_source_set_volume(
 
         /* Let's 'push' the reference volume if necessary */
         pa_cvolume_merge(&new_reference_volume, &s->reference_volume, &root_source->real_volume);
-        /* If the source and it's root don't have the same number of channels, we need to remap */
+        /* If the source and its root don't have the same number of channels, we need to remap */
         if (s != root_source && !pa_channel_map_equal(&s->channel_map, &root_source->channel_map))
             pa_cvolume_remap(&new_reference_volume, &s->channel_map, &root_source->channel_map);
         update_reference_volume(root_source, &new_reference_volume, &root_source->channel_map, save);
@@ -1728,13 +1702,12 @@ static void propagate_real_volume(pa_source *s, const pa_cvolume *old_real_volum
     }
 
     if (pa_source_flat_volume_enabled(s)) {
-
         PA_IDXSET_FOREACH(o, s->outputs, idx) {
-            pa_cvolume old_volume = o->volume;
+            pa_cvolume new_volume;
 
             /* 2. Since the source's reference and real volumes are equal
              * now our ratios should be too. */
-            o->reference_ratio = o->real_ratio;
+            pa_source_output_set_reference_ratio(o, &o->real_ratio);
 
             /* 3. Recalculate the new stream reference volume based on the
              * reference ratio and the sink's reference volume.
@@ -1744,18 +1717,10 @@ static void propagate_real_volume(pa_source *s, const pa_cvolume *old_real_volum
              * o->volume = s->reference_volume * o->reference_ratio
              *
              * This is identical to propagate_reference_volume() */
-            o->volume = s->reference_volume;
-            pa_cvolume_remap(&o->volume, &s->channel_map, &o->channel_map);
-            pa_sw_cvolume_multiply(&o->volume, &o->volume, &o->reference_ratio);
-
-            /* Notify if something changed */
-            if (!pa_cvolume_equal(&old_volume, &o->volume)) {
-
-                if (o->volume_changed)
-                    o->volume_changed(o);
-
-                pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
-            }
+            new_volume = s->reference_volume;
+            pa_cvolume_remap(&new_volume, &s->channel_map, &o->channel_map);
+            pa_sw_cvolume_multiply(&new_volume, &new_volume, &o->reference_ratio);
+            pa_source_output_set_volume_direct(o, &new_volume);
 
             if (o->destination_source && (o->destination_source->flags & PA_SOURCE_SHARE_VOLUME_WITH_MASTER))
                 propagate_real_volume(o->destination_source, old_real_volume);
@@ -1825,19 +1790,30 @@ void pa_source_set_mute(pa_source *s, bool mute, bool save) {
 
     pa_source_assert_ref(s);
     pa_assert_ctl_context();
-    pa_assert(PA_SOURCE_IS_LINKED(s->state));
 
     old_muted = s->muted;
+
+    if (mute == old_muted) {
+        s->save_muted |= save;
+        return;
+    }
+
     s->muted = mute;
-    s->save_muted = (old_muted == s->muted && s->save_muted) || save;
+    s->save_muted = save;
 
-    if (!(s->flags & PA_SOURCE_DEFERRED_VOLUME) && s->set_mute)
+    if (!(s->flags & PA_SOURCE_DEFERRED_VOLUME) && s->set_mute) {
+        s->set_mute_in_progress = true;
         s->set_mute(s);
+        s->set_mute_in_progress = false;
+    }
 
-    pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0);
+    if (!PA_SOURCE_IS_LINKED(s->state))
+        return;
 
-    if (old_muted != s->muted)
-        pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    pa_log_debug("The mute of source %s changed from %s to %s.", s->name, pa_yes_no(old_muted), pa_yes_no(mute));
+    pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0);
+    pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SOURCE_MUTE_CHANGED], s);
 }
 
 /* Called from main thread */
@@ -1847,21 +1823,15 @@ bool pa_source_get_mute(pa_source *s, bool force_refresh) {
     pa_assert_ctl_context();
     pa_assert(PA_SOURCE_IS_LINKED(s->state));
 
-    if (s->refresh_muted || force_refresh) {
-        bool old_muted = s->muted;
-
-        if (!(s->flags & PA_SOURCE_DEFERRED_VOLUME) && s->get_mute)
-            s->get_mute(s);
-
-        pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_MUTE, NULL, 0, NULL) == 0);
-
-        if (old_muted != s->muted) {
-            s->save_muted = true;
-
-            pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    if ((s->refresh_muted || force_refresh) && s->get_mute) {
+        bool mute;
 
-            /* Make sure the soft mute status stays in sync */
-            pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_MUTE, NULL, 0, NULL) == 0);
+        if (s->flags & PA_SOURCE_DEFERRED_VOLUME) {
+            if (pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_MUTE, &mute, 0, NULL) >= 0)
+                pa_source_mute_changed(s, mute);
+        } else {
+            if (s->get_mute(s, &mute) >= 0)
+                pa_source_mute_changed(s, mute);
         }
     }
 
@@ -1874,15 +1844,17 @@ void pa_source_mute_changed(pa_source *s, bool new_muted) {
     pa_assert_ctl_context();
     pa_assert(PA_SOURCE_IS_LINKED(s->state));
 
-    /* The source implementor may call this if the mute state changed to make sure everyone is notified */
-
-    if (s->muted == new_muted)
+    if (s->set_mute_in_progress)
         return;
 
-    s->muted = new_muted;
-    s->save_muted = true;
+    /* pa_source_set_mute() does this same check, so this may appear redundant,
+     * but we must have this here also, because the save parameter of
+     * pa_source_set_mute() would otherwise have unintended side effects
+     * (saving the mute state when it shouldn't be saved). */
+    if (new_muted == s->muted)
+        return;
 
-    pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    pa_source_set_mute(s, new_muted, true);
 }
 
 /* Called from main thread */
@@ -2078,9 +2050,7 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
                 o->thread_info.direct_on_input = NULL;
             }
 
-            if (pa_hashmap_remove(s->thread_info.outputs, PA_UINT32_TO_PTR(o->index)))
-                pa_source_output_unref(o);
-
+            pa_hashmap_remove_and_free(s->thread_info.outputs, PA_UINT32_TO_PTR(o->index));
             pa_source_invalidate_requested_latency(s, true);
 
             /* In flat volume mode we need to update the volume as
@@ -2146,7 +2116,7 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
         case PA_SOURCE_MESSAGE_GET_MUTE:
 
             if (s->flags & PA_SOURCE_DEFERRED_VOLUME && s->get_mute)
-                s->get_mute(s);
+                return s->get_mute(s, userdata);
 
             return 0;
 
@@ -2878,3 +2848,28 @@ done:
 
     return out_formats;
 }
+
+/* Called from the main thread. */
+void pa_source_set_reference_volume_direct(pa_source *s, const pa_cvolume *volume) {
+    pa_cvolume old_volume;
+    char old_volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+    char new_volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+
+    pa_assert(s);
+    pa_assert(volume);
+
+    old_volume = s->reference_volume;
+
+    if (pa_cvolume_equal(volume, &old_volume))
+        return;
+
+    s->reference_volume = *volume;
+    pa_log_debug("The reference volume of source %s changed from %s to %s.", s->name,
+                 pa_cvolume_snprint_verbose(old_volume_str, sizeof(old_volume_str), &old_volume, &s->channel_map,
+                                            s->flags & PA_SOURCE_DECIBEL_VOLUME),
+                 pa_cvolume_snprint_verbose(new_volume_str, sizeof(new_volume_str), volume, &s->channel_map,
+                                            s->flags & PA_SOURCE_DECIBEL_VOLUME));
+
+    pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
+    pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SOURCE_VOLUME_CHANGED], s);
+}
diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h
index 5c74a51..1c9ecec 100644
--- a/src/pulsecore/source.h
+++ b/src/pulsecore/source.h
@@ -58,6 +58,8 @@ static inline bool PA_SOURCE_IS_LINKED(pa_source_state_t x) {
 /* A generic definition for void callback functions */
 typedef void(*pa_source_cb_t)(pa_source *s);
 
+typedef int (*pa_source_get_mute_cb_t)(pa_source *s, bool *mute);
+
 struct pa_source {
     pa_msgobject parent;
 
@@ -118,6 +120,8 @@ struct pa_source {
 
     unsigned priority;
 
+    bool set_mute_in_progress;
+
     /* Called when the main loop requests a state change. Called from
      * main loop context. If returns -1 the state change will be
      * inhibited */
@@ -156,14 +160,24 @@ struct pa_source {
      * set this callback. */
     pa_source_cb_t write_volume; /* may be NULL */
 
-    /* Called when the mute setting is queried. Called from main loop
-     * context. If this is NULL a PA_SOURCE_MESSAGE_GET_MUTE message
-     * will be sent to the IO thread instead. If refresh_mute is
-     * false neither this function is called nor a message is sent.
+    /* If the source mute can change "spontaneously" (i.e. initiated by the
+     * source implementation, not by someone else calling
+     * pa_source_set_mute()), then the source implementation can notify about
+     * changed mute either by calling pa_source_mute_changed() or by calling
+     * pa_source_get_mute() with force_refresh=true. If the implementation
+     * chooses the latter approach, it should implement the get_mute callback.
+     * Otherwise get_mute can be NULL.
+     *
+     * This is called when pa_source_get_mute() is called with
+     * force_refresh=true. This is called from the IO thread if the
+     * PA_SINK_DEFERRED_VOLUME flag is set, otherwise this is called from the
+     * main thread. On success, the implementation is expected to return 0 and
+     * set the mute parameter that is passed as a reference. On failure, the
+     * implementation is expected to return -1.
      *
      * You must use the function pa_source_set_get_mute_callback() to
      * set this callback. */
-    pa_source_cb_t get_mute; /* may be NULL */
+    pa_source_get_mute_cb_t get_mute;
 
     /* Called when the mute setting shall be changed. Called from main
      * loop context. If this is NULL a PA_SOURCE_MESSAGE_SET_MUTE
@@ -314,7 +328,7 @@ pa_source* pa_source_new(
 void pa_source_set_get_volume_callback(pa_source *s, pa_source_cb_t cb);
 void pa_source_set_set_volume_callback(pa_source *s, pa_source_cb_t cb);
 void pa_source_set_write_volume_callback(pa_source *s, pa_source_cb_t cb);
-void pa_source_set_get_mute_callback(pa_source *s, pa_source_cb_t cb);
+void pa_source_set_get_mute_callback(pa_source *s, pa_source_get_mute_cb_t cb);
 void pa_source_set_set_mute_callback(pa_source *s, pa_source_cb_t cb);
 void pa_source_enable_decibel_volume(pa_source *s, bool enable);
 
@@ -426,6 +440,13 @@ bool pa_source_volume_change_apply(pa_source *s, pa_usec_t *usec_to_next);
 void pa_source_invalidate_requested_latency(pa_source *s, bool dynamic);
 pa_usec_t pa_source_get_latency_within_thread(pa_source *s);
 
+/* Called from the main thread, from source-output.c only. The normal way to
+ * set the source reference volume is to call pa_source_set_volume(), but the
+ * flat volume logic in source-output.c needs also a function that doesn't do
+ * all the extra stuff that pa_source_set_volume() does. This function simply
+ * sets s->reference_volume and fires change notifications. */
+void pa_source_set_reference_volume_direct(pa_source *s, const pa_cvolume *volume);
+
 #define pa_source_assert_io_context(s) \
     pa_assert(pa_thread_mq_get() || !PA_SOURCE_IS_LINKED((s)->state))
 
diff --git a/src/pulsecore/srbchannel.c b/src/pulsecore/srbchannel.c
new file mode 100644
index 0000000..a0f916e
--- /dev/null
+++ b/src/pulsecore/srbchannel.c
@@ -0,0 +1,378 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2014 David Henningsson, Canonical Ltd.
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "srbchannel.h"
+
+#include <pulsecore/atomic.h>
+#include <pulse/xmalloc.h>
+
+/* #define DEBUG_SRBCHANNEL */
+
+/* This ringbuffer might be useful in other contexts too, but
+ * right now it's only used inside the srbchannel, so let's keep it here
+ * for the time being. */
+typedef struct pa_ringbuffer pa_ringbuffer;
+
+struct pa_ringbuffer {
+    pa_atomic_t *count; /* amount of data in the buffer */
+    int capacity;
+    uint8_t *memory;
+    int readindex, writeindex;
+};
+
+static void *pa_ringbuffer_peek(pa_ringbuffer *r, int *count) {
+    int c = pa_atomic_load(r->count);
+
+    if (r->readindex + c > r->capacity)
+        *count = r->capacity - r->readindex;
+    else
+        *count = c;
+
+    return r->memory + r->readindex;
+}
+
+/* Returns true only if the buffer was completely full before the drop. */
+static bool pa_ringbuffer_drop(pa_ringbuffer *r, int count) {
+    bool b = pa_atomic_sub(r->count, count) >= r->capacity;
+
+    r->readindex += count;
+    r->readindex %= r->capacity;
+
+    return b;
+}
+
+static void *pa_ringbuffer_begin_write(pa_ringbuffer *r, int *count) {
+    int c = pa_atomic_load(r->count);
+
+    *count = PA_MIN(r->capacity - r->writeindex, r->capacity - c);
+
+    return r->memory + r->writeindex;
+}
+
+static void pa_ringbuffer_end_write(pa_ringbuffer *r, int count) {
+    pa_atomic_add(r->count, count);
+    r->writeindex += count;
+    r->writeindex %= r->capacity;
+}
+
+struct pa_srbchannel {
+    pa_ringbuffer rb_read, rb_write;
+    pa_fdsem *sem_read, *sem_write;
+    pa_memblock *memblock;
+
+    void *cb_userdata;
+    pa_srbchannel_cb_t callback;
+
+    pa_io_event *read_event;
+    pa_defer_event *defer_event;
+    pa_mainloop_api *mainloop;
+};
+
+/* We always listen to sem_read, and always signal on sem_write.
+ *
+ * This means we signal the same semaphore for two scenarios:
+ * 1) We have written something to our send buffer, and want the other
+ *    side to read it
+ * 2) We have read something from our receive buffer that was previously
+ *    completely full, and want the other side to continue writing
+*/
+
+size_t pa_srbchannel_write(pa_srbchannel *sr, const void *data, size_t l) {
+    size_t written = 0;
+
+    while (l > 0) {
+        int towrite;
+        void *ptr = pa_ringbuffer_begin_write(&sr->rb_write, &towrite);
+
+        if ((size_t) towrite > l)
+            towrite = l;
+
+        if (towrite == 0) {
+#ifdef DEBUG_SRBCHANNEL
+            pa_log("srbchannel output buffer full");
+#endif
+            break;
+        }
+
+        memcpy(ptr, data, towrite);
+        pa_ringbuffer_end_write(&sr->rb_write, towrite);
+        written += towrite;
+        data = (uint8_t*) data + towrite;
+        l -= towrite;
+    }
+#ifdef DEBUG_SRBCHANNEL
+    pa_log("Wrote %d bytes to srbchannel, signalling fdsem", (int) written);
+#endif
+
+    pa_fdsem_post(sr->sem_write);
+    return written;
+}
+
+size_t pa_srbchannel_read(pa_srbchannel *sr, void *data, size_t l) {
+    size_t isread = 0;
+
+    while (l > 0) {
+        int toread;
+        void *ptr = pa_ringbuffer_peek(&sr->rb_read, &toread);
+
+        if ((size_t) toread > l)
+            toread = l;
+
+        if (toread == 0)
+            break;
+
+        memcpy(data, ptr, toread);
+
+        if (pa_ringbuffer_drop(&sr->rb_read, toread)) {
+#ifdef DEBUG_SRBCHANNEL
+            pa_log("Read from full output buffer, signalling fdsem");
+#endif
+            pa_fdsem_post(sr->sem_write);
+        }
+
+        isread += toread;
+        data = (uint8_t*) data + toread;
+        l -= toread;
+    }
+
+#ifdef DEBUG_SRBCHANNEL
+    pa_log("Read %d bytes from srbchannel", (int) isread);
+#endif
+
+    return isread;
+}
+
+/* This is the memory layout of the ringbuffer shm block. It is followed by
+   read and write ringbuffer memory. */
+struct srbheader {
+    pa_atomic_t read_count;
+    pa_atomic_t write_count;
+
+    pa_fdsem_data read_semdata;
+    pa_fdsem_data write_semdata;
+
+    int capacity;
+    int readbuf_offset;
+    int writebuf_offset;
+
+    /* TODO: Maybe a marker here to make sure we talk to a server with equally sized struct */
+};
+
+static void srbchannel_rwloop(pa_srbchannel* sr) {
+    do {
+#ifdef DEBUG_SRBCHANNEL
+        int q;
+        pa_ringbuffer_peek(&sr->rb_read, &q);
+        pa_log("In rw loop from srbchannel, before callback, count = %d", q);
+#endif
+
+        if (sr->callback) {
+            if (!sr->callback(sr, sr->cb_userdata)) {
+#ifdef DEBUG_SRBCHANNEL
+                pa_log("Aborting read loop from srbchannel");
+#endif
+                return;
+            }
+        }
+
+#ifdef DEBUG_SRBCHANNEL
+        pa_ringbuffer_peek(&sr->rb_read, &q);
+        pa_log("In rw loop from srbchannel, after callback, count = %d", q);
+#endif
+
+    } while (pa_fdsem_before_poll(sr->sem_read) < 0);
+}
+
+static void semread_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) {
+    pa_srbchannel* sr = userdata;
+
+    pa_fdsem_after_poll(sr->sem_read);
+    srbchannel_rwloop(sr);
+}
+
+static void defer_cb(pa_mainloop_api *m, pa_defer_event *e, void *userdata) {
+    pa_srbchannel* sr = userdata;
+
+#ifdef DEBUG_SRBCHANNEL
+    pa_log("Calling rw loop from deferred event");
+#endif
+
+    m->defer_enable(e, 0);
+    srbchannel_rwloop(sr);
+}
+
+pa_srbchannel* pa_srbchannel_new(pa_mainloop_api *m, pa_mempool *p) {
+    int capacity;
+    int readfd;
+    struct srbheader *srh;
+
+    pa_srbchannel* sr = pa_xmalloc0(sizeof(pa_srbchannel));
+    sr->mainloop = m;
+    sr->memblock = pa_memblock_new_pool(p, -1);
+    srh = pa_memblock_acquire(sr->memblock);
+    pa_zero(*srh);
+
+    sr->rb_read.memory = (uint8_t*) srh + PA_ALIGN(sizeof(*srh));
+    srh->readbuf_offset = sr->rb_read.memory - (uint8_t*) srh;
+
+    capacity = (pa_memblock_get_length(sr->memblock) - srh->readbuf_offset) / 2;
+
+    sr->rb_write.memory = PA_ALIGN_PTR(sr->rb_read.memory + capacity);
+    srh->writebuf_offset = sr->rb_write.memory - (uint8_t*) srh;
+
+    capacity = PA_MIN(capacity, srh->writebuf_offset - srh->readbuf_offset);
+
+    pa_log_debug("SHM block is %d bytes, ringbuffer capacity is 2 * %d bytes",
+        (int) pa_memblock_get_length(sr->memblock), capacity);
+
+    srh->capacity = sr->rb_read.capacity = sr->rb_write.capacity = capacity;
+
+    sr->rb_read.count = &srh->read_count;
+    sr->rb_write.count = &srh->write_count;
+
+    sr->sem_read = pa_fdsem_new_shm(&srh->read_semdata);
+    if (!sr->sem_read)
+        goto fail;
+
+    sr->sem_write = pa_fdsem_new_shm(&srh->write_semdata);
+    if (!sr->sem_write)
+        goto fail;
+
+    readfd = pa_fdsem_get(sr->sem_read);
+
+#ifdef DEBUG_SRBCHANNEL
+    pa_log("Enabling io event on fd %d", readfd);
+#endif
+
+    sr->read_event = m->io_new(m, readfd, PA_IO_EVENT_INPUT, semread_cb, sr);
+    m->io_enable(sr->read_event, PA_IO_EVENT_INPUT);
+
+    return sr;
+
+fail:
+    pa_srbchannel_free(sr);
+
+    return NULL;
+}
+
+static void pa_srbchannel_swap(pa_srbchannel *sr) {
+    pa_srbchannel temp = *sr;
+
+    sr->sem_read = temp.sem_write;
+    sr->sem_write = temp.sem_read;
+    sr->rb_read = temp.rb_write;
+    sr->rb_write = temp.rb_read;
+}
+
+pa_srbchannel* pa_srbchannel_new_from_template(pa_mainloop_api *m, pa_srbchannel_template *t)
+{
+    int temp;
+    struct srbheader *srh;
+    pa_srbchannel* sr = pa_xmalloc0(sizeof(pa_srbchannel));
+
+    sr->mainloop = m;
+    sr->memblock = t->memblock;
+    pa_memblock_ref(sr->memblock);
+    srh = pa_memblock_acquire(sr->memblock);
+
+    sr->rb_read.capacity = sr->rb_write.capacity = srh->capacity;
+    sr->rb_read.count = &srh->read_count;
+    sr->rb_write.count = &srh->write_count;
+
+    sr->rb_read.memory = (uint8_t*) srh + srh->readbuf_offset;
+    sr->rb_write.memory = (uint8_t*) srh + srh->writebuf_offset;
+
+    sr->sem_read = pa_fdsem_open_shm(&srh->read_semdata, t->readfd);
+    if (!sr->sem_read)
+        goto fail;
+
+    sr->sem_write = pa_fdsem_open_shm(&srh->write_semdata, t->writefd);
+    if (!sr->sem_write)
+        goto fail;
+
+    pa_srbchannel_swap(sr);
+    temp = t->readfd; t->readfd = t->writefd; t->writefd = temp;
+
+#ifdef DEBUG_SRBCHANNEL
+    pa_log("Enabling io event on fd %d", t->readfd);
+#endif
+
+    sr->read_event = m->io_new(m, t->readfd, PA_IO_EVENT_INPUT, semread_cb, sr);
+    m->io_enable(sr->read_event, PA_IO_EVENT_INPUT);
+
+    return sr;
+
+fail:
+    pa_srbchannel_free(sr);
+
+    return NULL;
+}
+
+void pa_srbchannel_export(pa_srbchannel *sr, pa_srbchannel_template *t) {
+    t->memblock = sr->memblock;
+    t->readfd = pa_fdsem_get(sr->sem_read);
+    t->writefd = pa_fdsem_get(sr->sem_write);
+}
+
+void pa_srbchannel_set_callback(pa_srbchannel *sr, pa_srbchannel_cb_t callback, void *userdata) {
+    if (sr->callback)
+        pa_fdsem_after_poll(sr->sem_read);
+
+    sr->callback = callback;
+    sr->cb_userdata = userdata;
+
+    if (sr->callback) {
+        /* If there are events to be read already in the ringbuffer, we will not get any IO event for that,
+           because that's how pa_fdsem works. Therefore check the ringbuffer in a defer event instead. */
+        if (!sr->defer_event)
+            sr->defer_event = sr->mainloop->defer_new(sr->mainloop, defer_cb, sr);
+        sr->mainloop->defer_enable(sr->defer_event, 1);
+    }
+}
+
+void pa_srbchannel_free(pa_srbchannel *sr)
+{
+#ifdef DEBUG_SRBCHANNEL
+    pa_log("Freeing srbchannel");
+#endif
+    pa_assert(sr);
+
+    if (sr->defer_event)
+        sr->mainloop->defer_free(sr->defer_event);
+    if (sr->read_event)
+        sr->mainloop->io_free(sr->read_event);
+
+    if (sr->sem_read)
+        pa_fdsem_free(sr->sem_read);
+    if (sr->sem_write)
+        pa_fdsem_free(sr->sem_write);
+
+    if (sr->memblock) {
+        pa_memblock_release(sr->memblock);
+        pa_memblock_unref(sr->memblock);
+    }
+
+    pa_xfree(sr);
+}
diff --git a/src/pulsecore/srbchannel.h b/src/pulsecore/srbchannel.h
new file mode 100644
index 0000000..c96877e
--- /dev/null
+++ b/src/pulsecore/srbchannel.h
@@ -0,0 +1,59 @@
+#ifndef foopulsesrbchannelhfoo
+#define foopulsesrbchannelhfoo
+
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2014 David Henningsson, Canonical Ltd.
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#include <pulse/mainloop-api.h>
+#include <pulsecore/fdsem.h>
+#include <pulsecore/memblock.h>
+
+/* An shm ringbuffer that is used for low overhead server-client communication.
+ * Signaling is done through eventfd semaphores (pa_fdsem). */
+
+typedef struct pa_srbchannel pa_srbchannel;
+
+typedef struct pa_srbchannel_template {
+    int readfd, writefd;
+    pa_memblock *memblock;
+} pa_srbchannel_template;
+
+pa_srbchannel* pa_srbchannel_new(pa_mainloop_api *m, pa_mempool *p);
+/* Note: this creates a srbchannel with swapped read and write. */
+pa_srbchannel* pa_srbchannel_new_from_template(pa_mainloop_api *m, pa_srbchannel_template *t);
+
+void pa_srbchannel_free(pa_srbchannel *sr);
+
+void pa_srbchannel_export(pa_srbchannel *sr, pa_srbchannel_template *t);
+
+size_t pa_srbchannel_write(pa_srbchannel *sr, const void *data, size_t l);
+size_t pa_srbchannel_read(pa_srbchannel *sr, void *data, size_t l);
+
+/* Set the callback function that is called whenever data becomes available for reading.
+ * It can also be called if the output buffer was full and can now be written to.
+ *
+ * Return false to abort all processing (e g if the srbchannel has been freed during the callback).
+ * Otherwise return true.
+*/
+typedef bool (*pa_srbchannel_cb_t)(pa_srbchannel *sr, void *userdata);
+void pa_srbchannel_set_callback(pa_srbchannel *sr, pa_srbchannel_cb_t callback, void *userdata);
+
+#endif
diff --git a/src/pulsecore/start-child.c b/src/pulsecore/start-child.c
index 7f55d4e..8318b9b 100644
--- a/src/pulsecore/start-child.c
+++ b/src/pulsecore/start-child.c
@@ -92,7 +92,7 @@ int pa_start_child_for_read(const char *name, const char *argv1, pid_t *pid) {
 
         /* Make sure our children are not influenced by the
          * LD_BIND_NOW we set for ourselves. */
-        unsetenv("LD_BIND_NOW");
+        pa_unset_env("LD_BIND_NOW");
 
 #ifdef PR_SET_PDEATHSIG
         /* On Linux we can use PR_SET_PDEATHSIG to have the helper
diff --git a/src/pulsecore/svolume_c.c b/src/pulsecore/svolume_c.c
index eb04973..2e2db12 100644
--- a/src/pulsecore/svolume_c.c
+++ b/src/pulsecore/svolume_c.c
@@ -117,7 +117,7 @@ static void pa_volume_float32ne_c(float *samples, const float *volumes, unsigned
     }
 }
 
-static void pa_volume_float32re_c(float *samples, float *volumes, unsigned channels, unsigned length) {
+static void pa_volume_float32re_c(float *samples, const float *volumes, unsigned channels, unsigned length) {
     unsigned channel;
 
     length /= sizeof(float);
@@ -125,9 +125,9 @@ static void pa_volume_float32re_c(float *samples, float *volumes, unsigned chann
     for (channel = 0; length; length--) {
         float t;
 
-        t = PA_FLOAT32_SWAP(*samples);
+        t = PA_READ_FLOAT32RE(samples);
         t *= volumes[channel];
-        *samples++ = PA_FLOAT32_SWAP(t);
+        PA_WRITE_FLOAT32RE(samples++, t);
 
         if (PA_UNLIKELY(++channel >= channels))
             channel = 0;
diff --git a/src/tests/alsa-time-test.c b/src/tests/alsa-time-test.c
index 3c82fdc..b4eedab 100644
--- a/src/tests/alsa-time-test.c
+++ b/src/tests/alsa-time-test.c
@@ -10,6 +10,9 @@
 
 #include <alsa/asoundlib.h>
 
+#define SAMPLE_RATE 44100
+#define CHANNELS 2
+
 static uint64_t timespec_us(const struct timespec *ts) {
     return
         ts->tv_sec * 1000000LLU +
@@ -23,16 +26,18 @@ int main(int argc, char *argv[]) {
     snd_pcm_sw_params_t *swparams;
     snd_pcm_status_t *status;
     snd_pcm_t *pcm;
-    unsigned rate = 44100;
+    unsigned rate = SAMPLE_RATE;
     unsigned periods = 2;
-    snd_pcm_uframes_t boundary, buffer_size = 44100/10; /* 100s */
+    snd_pcm_uframes_t boundary, buffer_size = SAMPLE_RATE/10; /* 100s */
     int dir = 1;
+    int fillrate;
     struct timespec start, last_timestamp = { 0, 0 };
     uint64_t start_us, last_us = 0;
     snd_pcm_sframes_t last_avail = 0, last_delay = 0;
     struct pollfd *pollfds;
     int n_pollfd;
     int64_t sample_count = 0;
+    uint16_t *samples;
     struct sched_param sp;
 
     r = -1;
@@ -52,8 +57,12 @@ int main(int argc, char *argv[]) {
 
     start_us = timespec_us(&start);
 
-    dev = argc > 1 ? argv[1] : "front:AudioPCI";
+    dev = argc > 1 ? argv[1] : "front:0";
     cap = argc > 2 ? atoi(argv[2]) : 0;
+    fillrate = argc > 3 ? atoi(argv[3]) : 1;
+
+    samples = calloc(fillrate, CHANNELS*sizeof(uint16_t));
+    assert(samples);
 
     if (cap == 0)
       r = snd_pcm_open(&pcm, dev, SND_PCM_STREAM_PLAYBACK, 0);
@@ -76,7 +85,7 @@ int main(int argc, char *argv[]) {
     r = snd_pcm_hw_params_set_rate_near(pcm, hwparams, &rate, NULL);
     assert(r == 0);
 
-    r = snd_pcm_hw_params_set_channels(pcm, hwparams, 2);
+    r = snd_pcm_hw_params_set_channels(pcm, hwparams, CHANNELS);
     assert(r == 0);
 
     r = snd_pcm_hw_params_set_periods_integer(pcm, hwparams);
@@ -108,7 +117,7 @@ int main(int argc, char *argv[]) {
 
     r = snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size);
     assert(r == 0);
-    r = snd_pcm_sw_params_set_start_threshold(pcm, swparams, buffer_size);
+    r = snd_pcm_sw_params_set_start_threshold(pcm, swparams, buffer_size - (buffer_size % fillrate));
     assert(r == 0);
 
     r = snd_pcm_sw_params_get_boundary(swparams, &boundary);
@@ -185,19 +194,17 @@ int main(int argc, char *argv[]) {
 
         assert(!revents || avail > 0);
 
-        if ((!cap && avail) || (cap && (unsigned)avail >= buffer_size)) {
+        if ((!cap && (avail >= fillrate)) || (cap && (unsigned)avail >= buffer_size)) {
             snd_pcm_sframes_t sframes;
-            static const uint16_t psamples[2] = { 0, 0 };
-            uint16_t csamples[2];
 
             if (cap == 0)
-              sframes = snd_pcm_writei(pcm, psamples, 1);
+              sframes = snd_pcm_writei(pcm, samples, fillrate);
             else
-              sframes = snd_pcm_readi(pcm, csamples, 1);
-            assert(sframes == 1);
+              sframes = snd_pcm_readi(pcm, samples, fillrate);
+            assert(sframes == fillrate);
 
-            handled = 1;
-            sample_count++;
+            handled = fillrate;
+            sample_count += fillrate;
         }
 
         if (!handled &&
@@ -212,9 +219,9 @@ int main(int argc, char *argv[]) {
         timestamp_us = timespec_us(&timestamp);
 
         if (cap == 0)
-            pos = (unsigned long long) ((sample_count - handled - delay) * 1000000LU / 44100);
+            pos = (unsigned long long) ((sample_count - handled - delay) * 1000000LU / SAMPLE_RATE);
         else
-            pos = (unsigned long long) ((sample_count - handled + delay) * 1000000LU / 44100);
+            pos = (unsigned long long) ((sample_count - handled + delay) * 1000000LU / SAMPLE_RATE);
 
         if (count++ % 50 == 0)
             printf("Elapsed\tCPU\tALSA\tPos\tSamples\tavail\tdelay\trevents\thandled\tstate\n");
diff --git a/src/tests/connect-stress.c b/src/tests/connect-stress.c
index 0cf072d..48d015b 100644
--- a/src/tests/connect-stress.c
+++ b/src/tests/connect-stress.c
@@ -42,7 +42,13 @@
  * which makes a non-error abort less likely (although still easily possible of
  * playing >=3 streams outside of the test - including internal loopback, rtp,
  * combine, remap streams etc.) */
-#define NSTREAMS ((PA_MAX_INPUTS_PER_SINK/2) - 1)
+/* #define NSTREAMS ((PA_MAX_INPUTS_PER_SINK/2) - 1) */
+
+/* This test broke when PA_MAX_INPUTS_PER_SINK was increased from 32 to 256.
+ * Because we currently don't have time to figure out why, let's just set
+ * NSTREAMS to 20 in the meantime.
+ */
+#define NSTREAMS 20
 #define NTESTS 1000
 #define SAMPLE_HZ 44100
 
diff --git a/src/tests/cpu-mix-test.c b/src/tests/cpu-mix-test.c
new file mode 100644
index 0000000..181a767
--- /dev/null
+++ b/src/tests/cpu-mix-test.c
@@ -0,0 +1,226 @@
+/***
+  This file is part of PulseAudio.
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <check.h>
+
+#include <pulsecore/cpu.h>
+#include <pulsecore/cpu-arm.h>
+#include <pulsecore/random.h>
+#include <pulsecore/macro.h>
+#include <pulsecore/mix.h>
+
+#include "runtime-test-util.h"
+
+#define SAMPLES 1028
+#define TIMES 1000
+#define TIMES2 100
+
+static void acquire_mix_streams(pa_mix_info streams[], unsigned nstreams) {
+    unsigned i;
+
+    for (i = 0; i < nstreams; i++)
+        streams[i].ptr = pa_memblock_acquire_chunk(&streams[i].chunk);
+}
+
+static void release_mix_streams(pa_mix_info streams[], unsigned nstreams) {
+    unsigned i;
+
+    for (i = 0; i < nstreams; i++)
+        pa_memblock_release(streams[i].chunk.memblock);
+}
+
+static void run_mix_test(
+        pa_do_mix_func_t func,
+        pa_do_mix_func_t orig_func,
+        int align,
+        int channels,
+        bool correct,
+        bool perf) {
+
+    PA_DECLARE_ALIGNED(8, int16_t, in0[SAMPLES * 4]) = { 0 };
+    PA_DECLARE_ALIGNED(8, int16_t, in1[SAMPLES * 4]) = { 0 };
+    PA_DECLARE_ALIGNED(8, int16_t, out[SAMPLES * 4]) = { 0 };
+    PA_DECLARE_ALIGNED(8, int16_t, out_ref[SAMPLES * 4]) = { 0 };
+    int16_t *samples0, *samples1;
+    int16_t *samples, *samples_ref;
+    int nsamples;
+    pa_mempool *pool;
+    pa_memchunk c0, c1;
+    pa_mix_info m[2];
+    int i;
+
+    pa_assert(channels == 1 || channels == 2 || channels == 4);
+
+    /* Force sample alignment as requested */
+    samples0 = in0 + (8 - align);
+    samples1 = in1 + (8 - align);
+    samples = out + (8 - align);
+    samples_ref = out_ref + (8 - align);
+    nsamples = channels * (SAMPLES - (8 - align));
+
+    fail_unless((pool = pa_mempool_new(false, 0)) != NULL, NULL);
+
+    pa_random(samples0, nsamples * sizeof(int16_t));
+    c0.memblock = pa_memblock_new_fixed(pool, samples0, nsamples * sizeof(int16_t), false);
+    c0.length = pa_memblock_get_length(c0.memblock);
+    c0.index = 0;
+
+    pa_random(samples1, nsamples * sizeof(int16_t));
+    c1.memblock = pa_memblock_new_fixed(pool, samples1, nsamples * sizeof(int16_t), false);
+    c1.length = pa_memblock_get_length(c1.memblock);
+    c1.index = 0;
+
+    m[0].chunk = c0;
+    m[0].volume.channels = channels;
+    for (i = 0; i < channels; i++) {
+        m[0].volume.values[i] = PA_VOLUME_NORM;
+        m[0].linear[i].i = 0x5555;
+    }
+
+    m[1].chunk = c1;
+    m[1].volume.channels = channels;
+    for (i = 0; i < channels; i++) {
+        m[1].volume.values[i] = PA_VOLUME_NORM;
+        m[1].linear[i].i = 0x6789;
+    }
+
+    if (correct) {
+        acquire_mix_streams(m, 2);
+        orig_func(m, 2, channels, samples_ref, nsamples * sizeof(int16_t));
+        release_mix_streams(m, 2);
+
+        acquire_mix_streams(m, 2);
+        func(m, 2, channels, samples, nsamples * sizeof(int16_t));
+        release_mix_streams(m, 2);
+
+        for (i = 0; i < nsamples; i++) {
+            if (samples[i] != samples_ref[i]) {
+                pa_log_debug("Correctness test failed: align=%d, channels=%d", align, channels);
+                pa_log_debug("%d: %hd != %04hd (%hd + %hd)\n",
+                    i,
+                    samples[i], samples_ref[i],
+                    samples0[i], samples1[i]);
+                fail();
+            }
+        }
+    }
+
+    if (perf) {
+        pa_log_debug("Testing %d-channel mixing performance with %d sample alignment", channels, align);
+
+        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
+            acquire_mix_streams(m, 2);
+            func(m, 2, channels, samples, nsamples * sizeof(int16_t));
+            release_mix_streams(m, 2);
+        } PA_RUNTIME_TEST_RUN_STOP
+
+        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
+            acquire_mix_streams(m, 2);
+            orig_func(m, 2, channels, samples_ref, nsamples * sizeof(int16_t));
+            release_mix_streams(m, 2);
+        } PA_RUNTIME_TEST_RUN_STOP
+    }
+
+    pa_memblock_unref(c0.memblock);
+    pa_memblock_unref(c1.memblock);
+
+    pa_mempool_free(pool);
+}
+
+START_TEST (mix_special_test) {
+    pa_cpu_info cpu_info = { PA_CPU_UNDEFINED, {}, false };
+    pa_do_mix_func_t orig_func, special_func;
+
+    cpu_info.force_generic_code = true;
+    pa_mix_func_init(&cpu_info);
+    orig_func = pa_get_mix_func(PA_SAMPLE_S16NE);
+
+    cpu_info.force_generic_code = false;
+    pa_mix_func_init(&cpu_info);
+    special_func = pa_get_mix_func(PA_SAMPLE_S16NE);
+
+    pa_log_debug("Checking special mix (s16, stereo)");
+    run_mix_test(special_func, orig_func, 7, 2, true, true);
+
+    pa_log_debug("Checking special mix (s16, 4-channel)");
+    run_mix_test(special_func, orig_func, 7, 4, true, true);
+
+    pa_log_debug("Checking special mix (s16, mono)");
+    run_mix_test(special_func, orig_func, 7, 1, true, true);
+}
+END_TEST
+
+#if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+START_TEST (mix_neon_test) {
+    pa_do_mix_func_t orig_func, neon_func;
+    pa_cpu_arm_flag_t flags = 0;
+
+    pa_cpu_get_arm_flags(&flags);
+
+    if (!(flags & PA_CPU_ARM_NEON)) {
+        pa_log_info("NEON not supported. Skipping");
+        return;
+    }
+
+    orig_func = pa_get_mix_func(PA_SAMPLE_S16NE);
+    pa_mix_func_init_neon(flags);
+    neon_func = pa_get_mix_func(PA_SAMPLE_S16NE);
+
+    pa_log_debug("Checking NEON mix (s16, stereo)");
+    run_mix_test(neon_func, orig_func, 7, 2, true, true);
+
+    pa_log_debug("Checking NEON mix (s16, 4-channel)");
+    run_mix_test(neon_func, orig_func, 7, 4, true, true);
+
+    pa_log_debug("Checking NEON mix (s16, mono)");
+    run_mix_test(neon_func, orig_func, 7, 1, true, true);
+}
+END_TEST
+#endif /* defined (__arm__) && defined (__linux__) && defined (HAVE_NEON) */
+
+int main(int argc, char *argv[]) {
+    int failed = 0;
+    Suite *s;
+    TCase *tc;
+    SRunner *sr;
+
+    if (!getenv("MAKE_CHECK"))
+        pa_log_set_level(PA_LOG_DEBUG);
+
+    s = suite_create("CPU");
+
+    tc = tcase_create("mix");
+    tcase_add_test(tc, mix_special_test);
+#if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+    tcase_add_test(tc, mix_neon_test);
+#endif
+    tcase_set_timeout(tc, 120);
+    suite_add_tcase(s, tc);
+
+    sr = srunner_create(s);
+    srunner_run_all(sr, CK_NORMAL);
+    failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/src/tests/cpu-remap-test.c b/src/tests/cpu-remap-test.c
new file mode 100644
index 0000000..4ee5e00
--- /dev/null
+++ b/src/tests/cpu-remap-test.c
@@ -0,0 +1,436 @@
+/***
+  This file is part of PulseAudio.
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <check.h>
+
+#include <pulsecore/cpu-x86.h>
+#include <pulsecore/cpu.h>
+#include <pulsecore/random.h>
+#include <pulsecore/macro.h>
+#include <pulsecore/remap.h>
+
+#include "runtime-test-util.h"
+
+#define SAMPLES 1027
+#define TIMES 1000
+#define TIMES2 100
+
+static void run_remap_test_float(
+        pa_remap_t *remap_func,
+        pa_remap_t *remap_orig,
+        int align,
+        bool correct,
+        bool perf) {
+
+    PA_DECLARE_ALIGNED(8, float, out_buf_ref[SAMPLES*8]) = { 0.0f, };
+    PA_DECLARE_ALIGNED(8, float, out_buf[SAMPLES*8]) = { 0.0f, };
+    PA_DECLARE_ALIGNED(8, float, in_buf[SAMPLES*8]);
+    float *out, *out_ref;
+    float *in;
+    unsigned n_ic = remap_func->i_ss.channels;
+    unsigned n_oc = remap_func->o_ss.channels;
+    unsigned i, nsamples;
+
+    pa_assert(n_ic >= 1 && n_ic <= 8);
+    pa_assert(n_oc >= 1 && n_oc <= 8);
+
+    /* Force sample alignment as requested */
+    out = out_buf + (8 - align);
+    out_ref = out_buf_ref + (8 - align);
+    in = in_buf + (8 - align);
+    nsamples = SAMPLES - (8 - align);
+
+    for (i = 0; i < nsamples * n_ic; i++)
+        in[i] = 2.1f * (rand()/(float) RAND_MAX - 0.5f);
+
+    if (correct) {
+        remap_orig->do_remap(remap_orig, out_ref, in, nsamples);
+        remap_func->do_remap(remap_func, out, in, nsamples);
+
+        for (i = 0; i < nsamples * n_oc; i++) {
+            if (fabsf(out[i] - out_ref[i]) > 0.0001f) {
+                pa_log_debug("Correctness test failed: align=%d", align);
+                pa_log_debug("%d: %.24f != %.24f\n", i,
+                    out[i], out_ref[i]);
+                fail();
+            }
+        }
+    }
+
+    if (perf) {
+        pa_log_debug("Testing remap performance with %d sample alignment", align);
+
+        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
+            remap_func->do_remap(remap_func, out, in, nsamples);
+        } PA_RUNTIME_TEST_RUN_STOP
+
+        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
+            remap_orig->do_remap(remap_orig, out_ref, in, nsamples);
+        } PA_RUNTIME_TEST_RUN_STOP
+    }
+}
+
+static void run_remap_test_s16(
+        pa_remap_t *remap_func,
+        pa_remap_t *remap_orig,
+        int align,
+        bool correct,
+        bool perf) {
+
+    PA_DECLARE_ALIGNED(8, int16_t, out_buf_ref[SAMPLES*8]) = { 0 };
+    PA_DECLARE_ALIGNED(8, int16_t, out_buf[SAMPLES*8]) = { 0 };
+    PA_DECLARE_ALIGNED(8, int16_t, in_buf[SAMPLES*8]);
+    int16_t *out, *out_ref;
+    int16_t *in;
+    unsigned n_ic = remap_func->i_ss.channels;
+    unsigned n_oc = remap_func->o_ss.channels;
+    unsigned i, nsamples;
+
+    pa_assert(n_ic >= 1 && n_ic <= 8);
+    pa_assert(n_oc >= 1 && n_oc <= 8);
+
+    /* Force sample alignment as requested */
+    out = out_buf + (8 - align);
+    out_ref = out_buf_ref + (8 - align);
+    in = in_buf + (8 - align);
+    nsamples = SAMPLES - (8 - align);
+
+    pa_random(in, nsamples * n_ic * sizeof(int16_t));
+
+    if (correct) {
+        remap_orig->do_remap(remap_orig, out_ref, in, nsamples);
+        remap_func->do_remap(remap_func, out, in, nsamples);
+
+        for (i = 0; i < nsamples * n_oc; i++) {
+            if (abs(out[i] - out_ref[i]) > 3) {
+                pa_log_debug("Correctness test failed: align=%d", align);
+                pa_log_debug("%d: %d != %d\n", i, out[i], out_ref[i]);
+                fail();
+            }
+        }
+    }
+
+    if (perf) {
+        pa_log_debug("Testing remap performance with %d sample alignment", align);
+
+        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
+            remap_func->do_remap(remap_func, out, in, nsamples);
+        } PA_RUNTIME_TEST_RUN_STOP
+
+        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
+            remap_orig->do_remap(remap_orig, out_ref, in, nsamples);
+        } PA_RUNTIME_TEST_RUN_STOP
+    }
+}
+
+static void setup_remap_channels(
+    pa_remap_t *m,
+    pa_sample_format_t f,
+    unsigned in_channels,
+    unsigned out_channels,
+    bool rearrange) {
+
+    unsigned i, o;
+
+    m->format = f;
+    m->i_ss.channels = in_channels;
+    m->o_ss.channels = out_channels;
+
+    if (rearrange) {
+        for (o = 0; o < out_channels; o++) {
+            for (i = 0; i < in_channels; i++) {
+                m->map_table_f[o][i] = (o == i) ? 1.0f : 0.0f;
+                m->map_table_i[o][i] = (o == i) ? 0x10000 : 0;
+            }
+        }
+    } else {
+        for (o = 0; o < out_channels; o++) {
+            for (i = 0; i < in_channels; i++) {
+                m->map_table_f[o][i] = 1.0f / in_channels;
+                m->map_table_i[o][i] = 0x10000 / in_channels;
+            }
+        }
+    }
+}
+
+static void remap_test_channels(
+    pa_remap_t *remap_func, pa_remap_t *remap_orig) {
+
+    if (!remap_orig->do_remap) {
+        pa_log_warn("No reference remapping function, abort test");
+        return;
+    }
+
+    if (!remap_func->do_remap || remap_func->do_remap == remap_orig->do_remap) {
+        pa_log_warn("No remapping function, abort test");
+        return;
+    }
+
+    pa_assert(remap_func->format == remap_orig->format);
+
+    switch (remap_func->format) {
+    case PA_SAMPLE_FLOAT32NE:
+        run_remap_test_float(remap_func, remap_orig, 0, true, false);
+        run_remap_test_float(remap_func, remap_orig, 1, true, false);
+        run_remap_test_float(remap_func, remap_orig, 2, true, false);
+        run_remap_test_float(remap_func, remap_orig, 3, true, true);
+        break;
+    case PA_SAMPLE_S16NE:
+        run_remap_test_s16(remap_func, remap_orig, 0, true, false);
+        run_remap_test_s16(remap_func, remap_orig, 1, true, false);
+        run_remap_test_s16(remap_func, remap_orig, 2, true, false);
+        run_remap_test_s16(remap_func, remap_orig, 3, true, true);
+        break;
+    default:
+        pa_assert_not_reached();
+    }
+}
+
+static void remap_init_test_channels(
+        pa_init_remap_func_t init_func,
+        pa_init_remap_func_t orig_init_func,
+        pa_sample_format_t f,
+        unsigned in_channels,
+        unsigned out_channels,
+        bool rearrange) {
+
+    pa_remap_t remap_orig, remap_func;
+
+    setup_remap_channels(&remap_orig, f, in_channels, out_channels, rearrange);
+    orig_init_func(&remap_orig);
+
+    setup_remap_channels(&remap_func, f, in_channels, out_channels, rearrange);
+    init_func(&remap_func);
+
+    remap_test_channels(&remap_func, &remap_orig);
+}
+
+static void remap_init2_test_channels(
+        pa_sample_format_t f,
+        unsigned in_channels,
+        unsigned out_channels,
+        bool rearrange) {
+
+    pa_cpu_info cpu_info = { PA_CPU_UNDEFINED, {}, false };
+    pa_remap_t remap_orig, remap_func;
+
+    cpu_info.force_generic_code = true;
+    pa_remap_func_init(&cpu_info);
+    setup_remap_channels(&remap_orig, f, in_channels, out_channels, rearrange);
+    pa_init_remap_func(&remap_orig);
+
+    cpu_info.force_generic_code = false;
+    pa_remap_func_init(&cpu_info);
+    setup_remap_channels(&remap_func, f, in_channels, out_channels, rearrange);
+    pa_init_remap_func(&remap_func);
+
+    remap_test_channels(&remap_func, &remap_orig);
+}
+
+START_TEST (remap_special_test) {
+    pa_log_debug("Checking special remap (float, mono->stereo)");
+    remap_init2_test_channels(PA_SAMPLE_FLOAT32NE, 1, 2, false);
+    pa_log_debug("Checking special remap (float, mono->4-channel)");
+    remap_init2_test_channels(PA_SAMPLE_FLOAT32NE, 1, 4, false);
+
+    pa_log_debug("Checking special remap (s16, mono->stereo)");
+    remap_init2_test_channels(PA_SAMPLE_S16NE, 1, 2, false);
+    pa_log_debug("Checking special remap (s16, mono->4-channel)");
+    remap_init2_test_channels(PA_SAMPLE_S16NE, 1, 4, false);
+
+    pa_log_debug("Checking special remap (float, stereo->mono)");
+    remap_init2_test_channels(PA_SAMPLE_FLOAT32NE, 2, 1, false);
+    pa_log_debug("Checking special remap (float, 4-channel->mono)");
+    remap_init2_test_channels(PA_SAMPLE_FLOAT32NE, 4, 1, false);
+
+    pa_log_debug("Checking special remap (s16, stereo->mono)");
+    remap_init2_test_channels(PA_SAMPLE_S16NE, 2, 1, false);
+    pa_log_debug("Checking special remap (s16, 4-channel->mono)");
+    remap_init2_test_channels(PA_SAMPLE_S16NE, 4, 1, false);
+}
+END_TEST
+
+START_TEST (rearrange_special_test) {
+    pa_log_debug("Checking special remap (s16, stereo rearrange)");
+    remap_init2_test_channels(PA_SAMPLE_S16NE, 2, 2, true);
+    pa_log_debug("Checking special remap (float, stereo rearrange)");
+    remap_init2_test_channels(PA_SAMPLE_FLOAT32NE, 2, 2, true);
+
+    pa_log_debug("Checking special remap (s16, 4-channel rearrange)");
+    remap_init2_test_channels(PA_SAMPLE_S16NE, 4, 4, true);
+    pa_log_debug("Checking special remap (float, 4-channel rearrange)");
+    remap_init2_test_channels(PA_SAMPLE_FLOAT32NE, 4, 4, true);
+}
+END_TEST
+
+#if defined (__i386__) || defined (__amd64__)
+START_TEST (remap_mmx_test) {
+    pa_cpu_x86_flag_t flags = 0;
+    pa_init_remap_func_t init_func, orig_init_func;
+
+    pa_cpu_get_x86_flags(&flags);
+    if (!(flags & PA_CPU_X86_MMX)) {
+        pa_log_info("MMX not supported. Skipping");
+        return;
+    }
+
+    pa_log_debug("Checking MMX remap (float, mono->stereo)");
+    orig_init_func = pa_get_init_remap_func();
+    pa_remap_func_init_mmx(flags);
+    init_func = pa_get_init_remap_func();
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 1, 2, false);
+
+    pa_log_debug("Checking MMX remap (s16, mono->stereo)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 1, 2, false);
+}
+END_TEST
+
+START_TEST (remap_sse2_test) {
+    pa_cpu_x86_flag_t flags = 0;
+    pa_init_remap_func_t init_func, orig_init_func;
+
+    pa_cpu_get_x86_flags(&flags);
+    if (!(flags & PA_CPU_X86_SSE2)) {
+        pa_log_info("SSE2 not supported. Skipping");
+        return;
+    }
+
+    pa_log_debug("Checking SSE2 remap (float, mono->stereo)");
+    orig_init_func = pa_get_init_remap_func();
+    pa_remap_func_init_sse(flags);
+    init_func = pa_get_init_remap_func();
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 1, 2, false);
+
+    pa_log_debug("Checking SSE2 remap (s16, mono->stereo)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 1, 2, false);
+}
+END_TEST
+#endif /* defined (__i386__) || defined (__amd64__) */
+
+#if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+START_TEST (remap_neon_test) {
+    pa_cpu_arm_flag_t flags = 0;
+    pa_init_remap_func_t init_func, orig_init_func;
+
+    pa_cpu_get_arm_flags(&flags);
+    if (!(flags & PA_CPU_ARM_NEON)) {
+        pa_log_info("NEON not supported. Skipping");
+        return;
+    }
+
+    orig_init_func = pa_get_init_remap_func();
+    pa_remap_func_init_neon(flags);
+    init_func = pa_get_init_remap_func();
+
+    pa_log_debug("Checking NEON remap (float, mono->stereo)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 1, 2, false);
+    pa_log_debug("Checking NEON remap (float, mono->4-channel)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 1, 4, false);
+
+    pa_log_debug("Checking NEON remap (s16, mono->stereo)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 1, 2, false);
+    pa_log_debug("Checking NEON remap (s16, mono->4-channel)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 1, 4, false);
+
+    pa_log_debug("Checking NEON remap (float, stereo->mono)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 2, 1, false);
+    pa_log_debug("Checking NEON remap (float, 4-channel->mono)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 4, 1, false);
+
+    pa_log_debug("Checking NEON remap (s16, stereo->mono)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 2, 1, false);
+    pa_log_debug("Checking NEON remap (s16, 4-channel->mono)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 4, 1, false);
+
+    pa_log_debug("Checking NEON remap (float, 4-channel->4-channel)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 4, 4, false);
+    pa_log_debug("Checking NEON remap (s16, 4-channel->4-channel)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 4, 4, false);
+}
+END_TEST
+
+START_TEST (rearrange_neon_test) {
+    pa_cpu_arm_flag_t flags = 0;
+    pa_init_remap_func_t init_func, orig_init_func;
+
+    pa_cpu_get_arm_flags(&flags);
+    if (!(flags & PA_CPU_ARM_NEON)) {
+        pa_log_info("NEON not supported. Skipping");
+        return;
+    }
+
+    orig_init_func = pa_get_init_remap_func();
+    pa_remap_func_init_neon(flags);
+    init_func = pa_get_init_remap_func();
+
+    pa_log_debug("Checking NEON remap (float, stereo rearrange)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 2, 2, true);
+    pa_log_debug("Checking NEON remap (s16, stereo rearrange)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 2, 2, true);
+
+    pa_log_debug("Checking NEON remap (float, 4-channel rearrange)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_FLOAT32NE, 4, 4, true);
+    pa_log_debug("Checking NEON remap (s16, 4-channel rearrange)");
+    remap_init_test_channels(init_func, orig_init_func, PA_SAMPLE_S16NE, 4, 4, true);
+}
+END_TEST
+#endif
+
+int main(int argc, char *argv[]) {
+    int failed = 0;
+    Suite *s;
+    TCase *tc;
+    SRunner *sr;
+
+    if (!getenv("MAKE_CHECK"))
+        pa_log_set_level(PA_LOG_DEBUG);
+
+    s = suite_create("CPU");
+
+    tc = tcase_create("remap");
+    tcase_add_test(tc, remap_special_test);
+#if defined (__i386__) || defined (__amd64__)
+    tcase_add_test(tc, remap_mmx_test);
+    tcase_add_test(tc, remap_sse2_test);
+#endif
+#if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+    tcase_add_test(tc, remap_neon_test);
+#endif
+    tcase_set_timeout(tc, 120);
+    suite_add_tcase(s, tc);
+
+    tc = tcase_create("rearrange");
+    tcase_add_test(tc, rearrange_special_test);
+#if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+    tcase_add_test(tc, rearrange_neon_test);
+#endif
+    tcase_set_timeout(tc, 120);
+    suite_add_tcase(s, tc);
+
+    sr = srunner_create(s);
+    srunner_run_all(sr, CK_NORMAL);
+    failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/src/tests/cpu-sconv-test.c b/src/tests/cpu-sconv-test.c
new file mode 100644
index 0000000..428ebe0
--- /dev/null
+++ b/src/tests/cpu-sconv-test.c
@@ -0,0 +1,265 @@
+/***
+  This file is part of PulseAudio.
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <check.h>
+
+#include <pulsecore/cpu-arm.h>
+#include <pulsecore/cpu-x86.h>
+#include <pulsecore/random.h>
+#include <pulsecore/macro.h>
+#include <pulsecore/sconv.h>
+
+#include "runtime-test-util.h"
+
+#define SAMPLES 1028
+#define TIMES 1000
+#define TIMES2 100
+
+static void run_conv_test_float_to_s16(
+        pa_convert_func_t func,
+        pa_convert_func_t orig_func,
+        int align,
+        bool correct,
+        bool perf) {
+
+    PA_DECLARE_ALIGNED(8, int16_t, s[SAMPLES]) = { 0 };
+    PA_DECLARE_ALIGNED(8, int16_t, s_ref[SAMPLES]) = { 0 };
+    PA_DECLARE_ALIGNED(8, float, f[SAMPLES]);
+    int16_t *samples, *samples_ref;
+    float *floats;
+    int i, nsamples;
+
+    /* Force sample alignment as requested */
+    samples = s + (8 - align);
+    samples_ref = s_ref + (8 - align);
+    floats = f + (8 - align);
+    nsamples = SAMPLES - (8 - align);
+
+    for (i = 0; i < nsamples; i++) {
+        floats[i] = 2.1f * (rand()/(float) RAND_MAX - 0.5f);
+    }
+
+    if (correct) {
+        orig_func(nsamples, floats, samples_ref);
+        func(nsamples, floats, samples);
+
+        for (i = 0; i < nsamples; i++) {
+            if (abs(samples[i] - samples_ref[i]) > 1) {
+                pa_log_debug("Correctness test failed: align=%d", align);
+                pa_log_debug("%d: %04hx != %04hx (%.24f)\n", i, samples[i], samples_ref[i], floats[i]);
+                fail();
+            }
+        }
+    }
+
+    if (perf) {
+        pa_log_debug("Testing sconv performance with %d sample alignment", align);
+
+        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
+            func(nsamples, floats, samples);
+        } PA_RUNTIME_TEST_RUN_STOP
+
+        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
+            orig_func(nsamples, floats, samples_ref);
+        } PA_RUNTIME_TEST_RUN_STOP
+    }
+}
+
+/* This test is currently only run under NEON */
+#if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+static void run_conv_test_s16_to_float(
+        pa_convert_func_t func,
+        pa_convert_func_t orig_func,
+        int align,
+        bool correct,
+        bool perf) {
+
+    PA_DECLARE_ALIGNED(8, float, f[SAMPLES]) = { 0.0f };
+    PA_DECLARE_ALIGNED(8, float, f_ref[SAMPLES]) = { 0.0f };
+    PA_DECLARE_ALIGNED(8, int16_t, s[SAMPLES]);
+    float *floats, *floats_ref;
+    int16_t *samples;
+    int i, nsamples;
+
+    /* Force sample alignment as requested */
+    floats = f + (8 - align);
+    floats_ref = f_ref + (8 - align);
+    samples = s + (8 - align);
+    nsamples = SAMPLES - (8 - align);
+
+    pa_random(samples, nsamples * sizeof(int16_t));
+
+    if (correct) {
+        orig_func(nsamples, samples, floats_ref);
+        func(nsamples, samples, floats);
+
+        for (i = 0; i < nsamples; i++) {
+            if (fabsf(floats[i] - floats_ref[i]) > 0.0001f) {
+                pa_log_debug("Correctness test failed: align=%d", align);
+                pa_log_debug("%d: %.24f != %.24f (%d)\n", i, floats[i], floats_ref[i], samples[i]);
+                fail();
+            }
+        }
+    }
+
+    if (perf) {
+        pa_log_debug("Testing sconv performance with %d sample alignment", align);
+
+        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
+            func(nsamples, samples, floats);
+        } PA_RUNTIME_TEST_RUN_STOP
+
+        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
+            orig_func(nsamples, samples, floats_ref);
+        } PA_RUNTIME_TEST_RUN_STOP
+    }
+}
+#endif /* defined (__arm__) && defined (__linux__) && defined (HAVE_NEON) */
+
+#if defined (__i386__) || defined (__amd64__)
+START_TEST (sconv_sse2_test) {
+    pa_cpu_x86_flag_t flags = 0;
+    pa_convert_func_t orig_func, sse2_func;
+
+    pa_cpu_get_x86_flags(&flags);
+
+    if (!(flags & PA_CPU_X86_SSE2)) {
+        pa_log_info("SSE2 not supported. Skipping");
+        return;
+    }
+
+    orig_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
+    pa_convert_func_init_sse(PA_CPU_X86_SSE2);
+    sse2_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
+
+    pa_log_debug("Checking SSE2 sconv (float -> s16)");
+    run_conv_test_float_to_s16(sse2_func, orig_func, 0, true, false);
+    run_conv_test_float_to_s16(sse2_func, orig_func, 1, true, false);
+    run_conv_test_float_to_s16(sse2_func, orig_func, 2, true, false);
+    run_conv_test_float_to_s16(sse2_func, orig_func, 3, true, false);
+    run_conv_test_float_to_s16(sse2_func, orig_func, 4, true, false);
+    run_conv_test_float_to_s16(sse2_func, orig_func, 5, true, false);
+    run_conv_test_float_to_s16(sse2_func, orig_func, 6, true, false);
+    run_conv_test_float_to_s16(sse2_func, orig_func, 7, true, true);
+}
+END_TEST
+
+START_TEST (sconv_sse_test) {
+    pa_cpu_x86_flag_t flags = 0;
+    pa_convert_func_t orig_func, sse_func;
+
+    pa_cpu_get_x86_flags(&flags);
+
+    if (!(flags & PA_CPU_X86_SSE)) {
+        pa_log_info("SSE not supported. Skipping");
+        return;
+    }
+
+    orig_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
+    pa_convert_func_init_sse(PA_CPU_X86_SSE);
+    sse_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
+
+    pa_log_debug("Checking SSE sconv (float -> s16)");
+    run_conv_test_float_to_s16(sse_func, orig_func, 0, true, false);
+    run_conv_test_float_to_s16(sse_func, orig_func, 1, true, false);
+    run_conv_test_float_to_s16(sse_func, orig_func, 2, true, false);
+    run_conv_test_float_to_s16(sse_func, orig_func, 3, true, false);
+    run_conv_test_float_to_s16(sse_func, orig_func, 4, true, false);
+    run_conv_test_float_to_s16(sse_func, orig_func, 5, true, false);
+    run_conv_test_float_to_s16(sse_func, orig_func, 6, true, false);
+    run_conv_test_float_to_s16(sse_func, orig_func, 7, true, true);
+}
+END_TEST
+#endif /* defined (__i386__) || defined (__amd64__) */
+
+#if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+START_TEST (sconv_neon_test) {
+    pa_cpu_arm_flag_t flags = 0;
+    pa_convert_func_t orig_from_func, neon_from_func;
+    pa_convert_func_t orig_to_func, neon_to_func;
+
+    pa_cpu_get_arm_flags(&flags);
+
+    if (!(flags & PA_CPU_ARM_NEON)) {
+        pa_log_info("NEON not supported. Skipping");
+        return;
+    }
+
+    orig_from_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
+    orig_to_func = pa_get_convert_to_float32ne_function(PA_SAMPLE_S16LE);
+    pa_convert_func_init_neon(flags);
+    neon_from_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
+    neon_to_func = pa_get_convert_to_float32ne_function(PA_SAMPLE_S16LE);
+
+    pa_log_debug("Checking NEON sconv (float -> s16)");
+    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 0, true, false);
+    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 1, true, false);
+    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 2, true, false);
+    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 3, true, false);
+    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 4, true, false);
+    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 5, true, false);
+    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 6, true, false);
+    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 7, true, true);
+
+    pa_log_debug("Checking NEON sconv (s16 -> float)");
+    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 0, true, false);
+    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 1, true, false);
+    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 2, true, false);
+    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 3, true, false);
+    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 4, true, false);
+    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 5, true, false);
+    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 6, true, false);
+    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 7, true, true);
+}
+END_TEST
+#endif /* defined (__arm__) && defined (__linux__) && defined (HAVE_NEON) */
+
+int main(int argc, char *argv[]) {
+    int failed = 0;
+    Suite *s;
+    TCase *tc;
+    SRunner *sr;
+
+    if (!getenv("MAKE_CHECK"))
+        pa_log_set_level(PA_LOG_DEBUG);
+
+    s = suite_create("CPU");
+
+    tc = tcase_create("sconv");
+#if defined (__i386__) || defined (__amd64__)
+    tcase_add_test(tc, sconv_sse2_test);
+    tcase_add_test(tc, sconv_sse_test);
+#endif
+#if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+    tcase_add_test(tc, sconv_neon_test);
+#endif
+    tcase_set_timeout(tc, 120);
+    suite_add_tcase(s, tc);
+
+    sr = srunner_create(s);
+    srunner_run_all(sr, CK_NORMAL);
+    failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/src/tests/cpu-test.c b/src/tests/cpu-test.c
deleted file mode 100644
index c57a375..0000000
--- a/src/tests/cpu-test.c
+++ /dev/null
@@ -1,887 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <check.h>
-#include <unistd.h>
-#include <math.h>
-
-#include <pulse/rtclock.h>
-#include <pulsecore/cpu-x86.h>
-#include <pulsecore/cpu-orc.h>
-#include <pulsecore/random.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/endianmacros.h>
-#include <pulsecore/sconv.h>
-#include <pulsecore/remap.h>
-#include <pulsecore/sample-util.h>
-#include <pulsecore/mix.h>
-
-#include "runtime-test-util.h"
-
-/* Common defines for svolume tests */
-#define SAMPLES 1028
-#define TIMES 1000
-#define TIMES2 100
-#define PADDING 16
-
-static void run_volume_test(
-        pa_do_volume_func_t func,
-        pa_do_volume_func_t orig_func,
-        int align,
-        int channels,
-        bool correct,
-        bool perf) {
-
-    PA_DECLARE_ALIGNED(8, int16_t, s[SAMPLES]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, s_ref[SAMPLES]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, s_orig[SAMPLES]) = { 0 };
-    int32_t volumes[channels + PADDING];
-    int16_t *samples, *samples_ref, *samples_orig;
-    int i, padding, nsamples, size;
-
-    /* Force sample alignment as requested */
-    samples = s + (8 - align);
-    samples_ref = s_ref + (8 - align);
-    samples_orig = s_orig + (8 - align);
-    nsamples = SAMPLES - (8 - align);
-    if (nsamples % channels)
-        nsamples -= nsamples % channels;
-    size = nsamples * sizeof(int16_t);
-
-    pa_random(samples, size);
-    memcpy(samples_ref, samples, size);
-    memcpy(samples_orig, samples, size);
-
-    for (i = 0; i < channels; i++)
-        volumes[i] = PA_CLAMP_VOLUME((pa_volume_t)(rand() >> 15));
-    for (padding = 0; padding < PADDING; padding++, i++)
-        volumes[i] = volumes[padding];
-
-    if (correct) {
-        orig_func(samples_ref, volumes, channels, size);
-        func(samples, volumes, channels, size);
-
-        for (i = 0; i < nsamples; i++) {
-            if (samples[i] != samples_ref[i]) {
-                pa_log_debug("Correctness test failed: align=%d, channels=%d", align, channels);
-                pa_log_debug("%d: %04hx != %04hx (%04hx * %08x)\n", i, samples[i], samples_ref[i],
-                        samples_orig[i], volumes[i % channels]);
-                fail();
-            }
-        }
-    }
-
-    if (perf) {
-        pa_log_debug("Testing svolume %dch performance with %d sample alignment", channels, align);
-
-        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
-            memcpy(samples, samples_orig, size);
-            func(samples, volumes, channels, size);
-        } PA_RUNTIME_TEST_RUN_STOP
-
-        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
-            memcpy(samples_ref, samples_orig, size);
-            orig_func(samples_ref, volumes, channels, size);
-        } PA_RUNTIME_TEST_RUN_STOP
-
-        fail_unless(memcmp(samples_ref, samples, size) == 0);
-    }
-}
-
-#if defined (__i386__) || defined (__amd64__)
-START_TEST (svolume_mmx_test) {
-    pa_do_volume_func_t orig_func, mmx_func;
-    pa_cpu_x86_flag_t flags = 0;
-    int i, j;
-
-    pa_cpu_get_x86_flags(&flags);
-
-    if (!((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV))) {
-        pa_log_info("MMX/CMOV not supported. Skipping");
-        return;
-    }
-
-    orig_func = pa_get_volume_func(PA_SAMPLE_S16NE);
-    pa_volume_func_init_mmx(flags);
-    mmx_func = pa_get_volume_func(PA_SAMPLE_S16NE);
-
-    pa_log_debug("Checking MMX svolume");
-    for (i = 1; i <= 3; i++) {
-        for (j = 0; j < 7; j++)
-            run_volume_test(mmx_func, orig_func, j, i, true, false);
-    }
-    run_volume_test(mmx_func, orig_func, 7, 1, true, true);
-    run_volume_test(mmx_func, orig_func, 7, 2, true, true);
-    run_volume_test(mmx_func, orig_func, 7, 3, true, true);
-}
-END_TEST
-
-START_TEST (svolume_sse_test) {
-    pa_do_volume_func_t orig_func, sse_func;
-    pa_cpu_x86_flag_t flags = 0;
-    int i, j;
-
-    pa_cpu_get_x86_flags(&flags);
-
-    if (!(flags & PA_CPU_X86_SSE2)) {
-        pa_log_info("SSE2 not supported. Skipping");
-        return;
-    }
-
-    orig_func = pa_get_volume_func(PA_SAMPLE_S16NE);
-    pa_volume_func_init_sse(flags);
-    sse_func = pa_get_volume_func(PA_SAMPLE_S16NE);
-
-    pa_log_debug("Checking SSE2 svolume");
-    for (i = 1; i <= 3; i++) {
-        for (j = 0; j < 7; j++)
-            run_volume_test(sse_func, orig_func, j, i, true, false);
-    }
-    run_volume_test(sse_func, orig_func, 7, 1, true, true);
-    run_volume_test(sse_func, orig_func, 7, 2, true, true);
-    run_volume_test(sse_func, orig_func, 7, 3, true, true);
-}
-END_TEST
-#endif /* defined (__i386__) || defined (__amd64__) */
-
-#if defined (__arm__) && defined (__linux__)
-START_TEST (svolume_arm_test) {
-    pa_do_volume_func_t orig_func, arm_func;
-    pa_cpu_arm_flag_t flags = 0;
-    int i, j;
-
-    pa_cpu_get_arm_flags(&flags);
-
-    if (!(flags & PA_CPU_ARM_V6)) {
-        pa_log_info("ARMv6 instructions not supported. Skipping");
-        return;
-    }
-
-    orig_func = pa_get_volume_func(PA_SAMPLE_S16NE);
-    pa_volume_func_init_arm(flags);
-    arm_func = pa_get_volume_func(PA_SAMPLE_S16NE);
-
-    pa_log_debug("Checking ARM svolume");
-    for (i = 1; i <= 3; i++) {
-        for (j = 0; j < 7; j++)
-            run_volume_test(arm_func, orig_func, j, i, true, false);
-    }
-    run_volume_test(arm_func, orig_func, 7, 1, true, true);
-    run_volume_test(arm_func, orig_func, 7, 2, true, true);
-    run_volume_test(arm_func, orig_func, 7, 3, true, true);
-}
-END_TEST
-#endif /* defined (__arm__) && defined (__linux__) */
-
-START_TEST (svolume_orc_test) {
-    pa_do_volume_func_t orig_func, orc_func;
-    pa_cpu_info cpu_info;
-    int i, j;
-
-#if defined (__i386__) || defined (__amd64__)
-    pa_zero(cpu_info);
-    cpu_info.cpu_type = PA_CPU_X86;
-    pa_cpu_get_x86_flags(&cpu_info.flags.x86);
-#endif
-
-    orig_func = pa_get_volume_func(PA_SAMPLE_S16NE);
-
-    if (!pa_cpu_init_orc(cpu_info)) {
-        pa_log_info("Orc not supported. Skipping");
-        return;
-    }
-
-    orc_func = pa_get_volume_func(PA_SAMPLE_S16NE);
-
-    pa_log_debug("Checking Orc svolume");
-    for (i = 1; i <= 2; i++) {
-        for (j = 0; j < 7; j++)
-            run_volume_test(orc_func, orig_func, j, i, true, false);
-    }
-    run_volume_test(orc_func, orig_func, 7, 1, true, true);
-    run_volume_test(orc_func, orig_func, 7, 2, true, true);
-}
-END_TEST
-
-#undef SAMPLES
-#undef TIMES
-#undef TIMES2
-#undef PADDING
-/* End svolume tests */
-
-/* Start conversion tests */
-#define SAMPLES 1028
-#define TIMES 1000
-#define TIMES2 100
-
-static void run_conv_test_float_to_s16(
-        pa_convert_func_t func,
-        pa_convert_func_t orig_func,
-        int align,
-        bool correct,
-        bool perf) {
-
-    PA_DECLARE_ALIGNED(8, int16_t, s[SAMPLES]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, s_ref[SAMPLES]) = { 0 };
-    PA_DECLARE_ALIGNED(8, float, f[SAMPLES]);
-    int16_t *samples, *samples_ref;
-    float *floats;
-    int i, nsamples;
-
-    /* Force sample alignment as requested */
-    samples = s + (8 - align);
-    samples_ref = s_ref + (8 - align);
-    floats = f + (8 - align);
-    nsamples = SAMPLES - (8 - align);
-
-    for (i = 0; i < nsamples; i++) {
-        floats[i] = 2.1f * (rand()/(float) RAND_MAX - 0.5f);
-    }
-
-    if (correct) {
-        orig_func(nsamples, floats, samples_ref);
-        func(nsamples, floats, samples);
-
-        for (i = 0; i < nsamples; i++) {
-            if (abs(samples[i] - samples_ref[i]) > 1) {
-                pa_log_debug("Correctness test failed: align=%d", align);
-                pa_log_debug("%d: %04hx != %04hx (%.24f)\n", i, samples[i], samples_ref[i], floats[i]);
-                fail();
-            }
-        }
-    }
-
-    if (perf) {
-        pa_log_debug("Testing sconv performance with %d sample alignment", align);
-
-        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
-            func(nsamples, floats, samples);
-        } PA_RUNTIME_TEST_RUN_STOP
-
-        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
-            orig_func(nsamples, floats, samples_ref);
-        } PA_RUNTIME_TEST_RUN_STOP
-    }
-}
-
-/* This test is currently only run under NEON */
-#if defined (__arm__) && defined (__linux__)
-#ifdef HAVE_NEON
-static void run_conv_test_s16_to_float(
-        pa_convert_func_t func,
-        pa_convert_func_t orig_func,
-        int align,
-        bool correct,
-        bool perf) {
-
-    PA_DECLARE_ALIGNED(8, float, f[SAMPLES]) = { 0 };
-    PA_DECLARE_ALIGNED(8, float, f_ref[SAMPLES]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, s[SAMPLES]);
-    float *floats, *floats_ref;
-    int16_t *samples;
-    int i, nsamples;
-
-    /* Force sample alignment as requested */
-    floats = f + (8 - align);
-    floats_ref = f_ref + (8 - align);
-    samples = s + (8 - align);
-    nsamples = SAMPLES - (8 - align);
-
-    pa_random(samples, nsamples * sizeof(int16_t));
-
-    if (correct) {
-        orig_func(nsamples, samples, floats_ref);
-        func(nsamples, samples, floats);
-
-        for (i = 0; i < nsamples; i++) {
-            if (fabsf(floats[i] - floats_ref[i]) > 0.0001) {
-                pa_log_debug("Correctness test failed: align=%d", align);
-                pa_log_debug("%d: %.24f != %.24f (%d)\n", i, floats[i], floats_ref[i], samples[i]);
-                fail();
-            }
-        }
-    }
-
-    if (perf) {
-        pa_log_debug("Testing sconv performance with %d sample alignment", align);
-
-        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
-            func(nsamples, samples, floats);
-        } PA_RUNTIME_TEST_RUN_STOP
-
-        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
-            orig_func(nsamples, samples, floats_ref);
-        } PA_RUNTIME_TEST_RUN_STOP
-    }
-}
-#endif /* HAVE_NEON */
-#endif /* defined (__arm__) && defined (__linux__) */
-
-#if defined (__i386__) || defined (__amd64__)
-START_TEST (sconv_sse2_test) {
-    pa_cpu_x86_flag_t flags = 0;
-    pa_convert_func_t orig_func, sse2_func;
-
-    pa_cpu_get_x86_flags(&flags);
-
-    if (!(flags & PA_CPU_X86_SSE2)) {
-        pa_log_info("SSE2 not supported. Skipping");
-        return;
-    }
-
-    orig_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
-    pa_convert_func_init_sse(PA_CPU_X86_SSE2);
-    sse2_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
-
-    pa_log_debug("Checking SSE2 sconv (float -> s16)");
-    run_conv_test_float_to_s16(sse2_func, orig_func, 0, true, false);
-    run_conv_test_float_to_s16(sse2_func, orig_func, 1, true, false);
-    run_conv_test_float_to_s16(sse2_func, orig_func, 2, true, false);
-    run_conv_test_float_to_s16(sse2_func, orig_func, 3, true, false);
-    run_conv_test_float_to_s16(sse2_func, orig_func, 4, true, false);
-    run_conv_test_float_to_s16(sse2_func, orig_func, 5, true, false);
-    run_conv_test_float_to_s16(sse2_func, orig_func, 6, true, false);
-    run_conv_test_float_to_s16(sse2_func, orig_func, 7, true, true);
-}
-END_TEST
-
-START_TEST (sconv_sse_test) {
-    pa_cpu_x86_flag_t flags = 0;
-    pa_convert_func_t orig_func, sse_func;
-
-    pa_cpu_get_x86_flags(&flags);
-
-    if (!(flags & PA_CPU_X86_SSE)) {
-        pa_log_info("SSE not supported. Skipping");
-        return;
-    }
-
-    orig_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
-    pa_convert_func_init_sse(PA_CPU_X86_SSE);
-    sse_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
-
-    pa_log_debug("Checking SSE sconv (float -> s16)");
-    run_conv_test_float_to_s16(sse_func, orig_func, 0, true, false);
-    run_conv_test_float_to_s16(sse_func, orig_func, 1, true, false);
-    run_conv_test_float_to_s16(sse_func, orig_func, 2, true, false);
-    run_conv_test_float_to_s16(sse_func, orig_func, 3, true, false);
-    run_conv_test_float_to_s16(sse_func, orig_func, 4, true, false);
-    run_conv_test_float_to_s16(sse_func, orig_func, 5, true, false);
-    run_conv_test_float_to_s16(sse_func, orig_func, 6, true, false);
-    run_conv_test_float_to_s16(sse_func, orig_func, 7, true, true);
-}
-END_TEST
-#endif /* defined (__i386__) || defined (__amd64__) */
-
-#if defined (__arm__) && defined (__linux__)
-#ifdef HAVE_NEON
-START_TEST (sconv_neon_test) {
-    pa_cpu_arm_flag_t flags = 0;
-    pa_convert_func_t orig_from_func, neon_from_func;
-    pa_convert_func_t orig_to_func, neon_to_func;
-
-    pa_cpu_get_arm_flags(&flags);
-
-    if (!(flags & PA_CPU_ARM_NEON)) {
-        pa_log_info("NEON not supported. Skipping");
-        return;
-    }
-
-    orig_from_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
-    orig_to_func = pa_get_convert_to_float32ne_function(PA_SAMPLE_S16LE);
-    pa_convert_func_init_neon(flags);
-    neon_from_func = pa_get_convert_from_float32ne_function(PA_SAMPLE_S16LE);
-    neon_to_func = pa_get_convert_to_float32ne_function(PA_SAMPLE_S16LE);
-
-    pa_log_debug("Checking NEON sconv (float -> s16)");
-    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 0, true, false);
-    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 1, true, false);
-    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 2, true, false);
-    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 3, true, false);
-    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 4, true, false);
-    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 5, true, false);
-    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 6, true, false);
-    run_conv_test_float_to_s16(neon_from_func, orig_from_func, 7, true, true);
-
-    pa_log_debug("Checking NEON sconv (s16 -> float)");
-    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 0, true, false);
-    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 1, true, false);
-    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 2, true, false);
-    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 3, true, false);
-    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 4, true, false);
-    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 5, true, false);
-    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 6, true, false);
-    run_conv_test_s16_to_float(neon_to_func, orig_to_func, 7, true, true);
-}
-END_TEST
-#endif /* HAVE_NEON */
-#endif /* defined (__arm__) && defined (__linux__) */
-
-#undef SAMPLES
-#undef TIMES
-/* End conversion tests */
-
-/* Start remap tests */
-#define SAMPLES 1028
-#define TIMES 1000
-#define TIMES2 100
-
-static void run_remap_test_mono_stereo_float(
-        pa_remap_t *remap,
-        pa_do_remap_func_t func,
-        pa_do_remap_func_t orig_func,
-        int align,
-        bool correct,
-        bool perf) {
-
-    PA_DECLARE_ALIGNED(8, float, s_ref[SAMPLES*2]) = { 0 };
-    PA_DECLARE_ALIGNED(8, float, s[SAMPLES*2]) = { 0 };
-    PA_DECLARE_ALIGNED(8, float, m[SAMPLES]);
-    float *stereo, *stereo_ref;
-    float *mono;
-    int i, nsamples;
-
-    /* Force sample alignment as requested */
-    stereo = s + (8 - align);
-    stereo_ref = s_ref + (8 - align);
-    mono = m + (8 - align);
-    nsamples = SAMPLES - (8 - align);
-
-    for (i = 0; i < nsamples; i++)
-        mono[i] = 2.1f * (rand()/(float) RAND_MAX - 0.5f);
-
-    if (correct) {
-        orig_func(remap, stereo_ref, mono, nsamples);
-        func(remap, stereo, mono, nsamples);
-
-        for (i = 0; i < nsamples * 2; i++) {
-            if (fabsf(stereo[i] - stereo_ref[i]) > 0.0001) {
-                pa_log_debug("Correctness test failed: align=%d", align);
-                pa_log_debug("%d: %.24f != %.24f (%.24f)\n", i, stereo[i], stereo_ref[i], mono[i]);
-                fail();
-            }
-        }
-    }
-
-    if (perf) {
-        pa_log_debug("Testing remap performance with %d sample alignment", align);
-
-        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
-            func(remap, stereo, mono, nsamples);
-        } PA_RUNTIME_TEST_RUN_STOP
-
-        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
-            orig_func(remap, stereo_ref, mono, nsamples);
-        } PA_RUNTIME_TEST_RUN_STOP
-    }
-}
-
-static void run_remap_test_mono_stereo_s16(
-        pa_remap_t *remap,
-        pa_do_remap_func_t func,
-        pa_do_remap_func_t orig_func,
-        int align,
-        bool correct,
-        bool perf) {
-
-    PA_DECLARE_ALIGNED(8, int16_t, s_ref[SAMPLES*2]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, s[SAMPLES*2]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, m[SAMPLES]);
-    int16_t *stereo, *stereo_ref;
-    int16_t *mono;
-    int i, nsamples;
-
-    /* Force sample alignment as requested */
-    stereo = s + (8 - align);
-    stereo_ref = s_ref + (8 - align);
-    mono = m + (8 - align);
-    nsamples = SAMPLES - (8 - align);
-
-    pa_random(mono, nsamples * sizeof(int16_t));
-
-    if (correct) {
-        orig_func(remap, stereo_ref, mono, nsamples);
-        func(remap, stereo, mono, nsamples);
-
-        for (i = 0; i < nsamples * 2; i++) {
-            if (abs(stereo[i] - stereo_ref[i]) > 1) {
-                pa_log_debug("Correctness test failed: align=%d", align);
-                pa_log_debug("%d: %d != %d (%d)\n", i, stereo[i], stereo_ref[i], mono[i]);
-                fail();
-            }
-        }
-    }
-
-    if (perf) {
-        pa_log_debug("Testing remap performance with %d sample alignment", align);
-
-        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
-            func(remap, stereo, mono, nsamples);
-        } PA_RUNTIME_TEST_RUN_STOP
-
-        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
-            orig_func(remap, stereo_ref, mono, nsamples);
-        } PA_RUNTIME_TEST_RUN_STOP
-    }
-}
-
-static void remap_test_mono_stereo_float(
-        pa_init_remap_func_t init_func,
-        pa_init_remap_func_t orig_init_func) {
-
-    pa_sample_format_t sf;
-    pa_remap_t remap;
-    pa_sample_spec iss, oss;
-    pa_do_remap_func_t orig_func, func;
-
-    iss.format = oss.format = sf = PA_SAMPLE_FLOAT32NE;
-    iss.channels = 1;
-    oss.channels = 2;
-    remap.format = &sf;
-    remap.i_ss = &iss;
-    remap.o_ss = &oss;
-    remap.map_table_f[0][0] = 1.0;
-    remap.map_table_f[1][0] = 1.0;
-    remap.map_table_i[0][0] = 0x10000;
-    remap.map_table_i[1][0] = 0x10000;
-    orig_init_func(&remap);
-    orig_func = remap.do_remap;
-    if (!orig_func) {
-        pa_log_warn("No reference remapping function, abort test");
-        return;
-    }
-
-    init_func(&remap);
-    func = remap.do_remap;
-    if (!func || func == orig_func) {
-        pa_log_warn("No remapping function, abort test");
-        return;
-    }
-
-    run_remap_test_mono_stereo_float(&remap, func, orig_func, 0, true, false);
-    run_remap_test_mono_stereo_float(&remap, func, orig_func, 1, true, false);
-    run_remap_test_mono_stereo_float(&remap, func, orig_func, 2, true, false);
-    run_remap_test_mono_stereo_float(&remap, func, orig_func, 3, true, true);
-}
-
-static void remap_test_mono_stereo_s16(
-        pa_init_remap_func_t init_func,
-        pa_init_remap_func_t orig_init_func) {
-
-    pa_sample_format_t sf;
-    pa_remap_t remap;
-    pa_sample_spec iss, oss;
-    pa_do_remap_func_t orig_func, func;
-
-    iss.format = oss.format = sf = PA_SAMPLE_S16NE;
-    iss.channels = 1;
-    oss.channels = 2;
-    remap.format = &sf;
-    remap.i_ss = &iss;
-    remap.o_ss = &oss;
-    remap.map_table_f[0][0] = 1.0;
-    remap.map_table_f[1][0] = 1.0;
-    remap.map_table_i[0][0] = 0x10000;
-    remap.map_table_i[1][0] = 0x10000;
-    orig_init_func(&remap);
-    orig_func = remap.do_remap;
-    if (!orig_func) {
-        pa_log_warn("No reference remapping function, abort test");
-        return;
-    }
-
-    init_func(&remap);
-    func = remap.do_remap;
-    if (!func || func == orig_func) {
-        pa_log_warn("No remapping function, abort test");
-        return;
-    }
-
-    run_remap_test_mono_stereo_s16(&remap, func, orig_func, 0, true, false);
-    run_remap_test_mono_stereo_s16(&remap, func, orig_func, 1, true, false);
-    run_remap_test_mono_stereo_s16(&remap, func, orig_func, 2, true, false);
-    run_remap_test_mono_stereo_s16(&remap, func, orig_func, 3, true, true);
-}
-
-#if defined (__i386__) || defined (__amd64__)
-START_TEST (remap_mmx_test) {
-    pa_cpu_x86_flag_t flags = 0;
-    pa_init_remap_func_t init_func, orig_init_func;
-
-    pa_cpu_get_x86_flags(&flags);
-    if (!(flags & PA_CPU_X86_MMX)) {
-        pa_log_info("MMX not supported. Skipping");
-        return;
-    }
-
-    pa_log_debug("Checking MMX remap (float, mono->stereo)");
-    orig_init_func = pa_get_init_remap_func();
-    pa_remap_func_init_mmx(flags);
-    init_func = pa_get_init_remap_func();
-    remap_test_mono_stereo_float(init_func, orig_init_func);
-
-    pa_log_debug("Checking MMX remap (s16, mono->stereo)");
-    remap_test_mono_stereo_s16(init_func, orig_init_func);
-}
-END_TEST
-
-START_TEST (remap_sse2_test) {
-    pa_cpu_x86_flag_t flags = 0;
-    pa_init_remap_func_t init_func, orig_init_func;
-
-    pa_cpu_get_x86_flags(&flags);
-    if (!(flags & PA_CPU_X86_SSE2)) {
-        pa_log_info("SSE2 not supported. Skipping");
-        return;
-    }
-
-    pa_log_debug("Checking SSE2 remap (float, mono->stereo)");
-    orig_init_func = pa_get_init_remap_func();
-    pa_remap_func_init_sse(flags);
-    init_func = pa_get_init_remap_func();
-    remap_test_mono_stereo_float(init_func, orig_init_func);
-
-    pa_log_debug("Checking SSE2 remap (s16, mono->stereo)");
-    remap_test_mono_stereo_s16(init_func, orig_init_func);
-}
-END_TEST
-#endif /* defined (__i386__) || defined (__amd64__) */
-
-#undef SAMPLES
-#undef TIMES
-#undef TIMES2
-/* End remap tests */
-
-/* Start mix tests */
-
-/* Only ARM NEON has mix tests, so disable the related functions for other
- * architectures for now to avoid compiler warnings about unused functions. */
-#if defined (__arm__) && defined (__linux__)
-#ifdef HAVE_NEON
-
-#define SAMPLES 1028
-#define TIMES 1000
-#define TIMES2 100
-
-static void acquire_mix_streams(pa_mix_info streams[], unsigned nstreams) {
-    unsigned i;
-
-    for (i = 0; i < nstreams; i++)
-        streams[i].ptr = pa_memblock_acquire_chunk(&streams[i].chunk);
-}
-
-static void release_mix_streams(pa_mix_info streams[], unsigned nstreams) {
-    unsigned i;
-
-    for (i = 0; i < nstreams; i++)
-        pa_memblock_release(streams[i].chunk.memblock);
-}
-
-static void run_mix_test(
-        pa_do_mix_func_t func,
-        pa_do_mix_func_t orig_func,
-        int align,
-        int channels,
-        bool correct,
-        bool perf) {
-
-    PA_DECLARE_ALIGNED(8, int16_t, in0[SAMPLES * 4]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, in1[SAMPLES * 4]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, out[SAMPLES * 4]) = { 0 };
-    PA_DECLARE_ALIGNED(8, int16_t, out_ref[SAMPLES * 4]) = { 0 };
-    int16_t *samples0, *samples1;
-    int16_t *samples, *samples_ref;
-    int nsamples;
-    pa_mempool *pool;
-    pa_memchunk c0, c1;
-    pa_mix_info m[2];
-    int i;
-
-    pa_assert(channels == 1 || channels == 2 || channels == 4);
-
-    /* Force sample alignment as requested */
-    samples0 = in0 + (8 - align);
-    samples1 = in1 + (8 - align);
-    samples = out + (8 - align);
-    samples_ref = out_ref + (8 - align);
-    nsamples = channels * (SAMPLES - (8 - align));
-
-    fail_unless((pool = pa_mempool_new(false, 0)) != NULL, NULL);
-
-    pa_random(samples0, nsamples * sizeof(int16_t));
-    c0.memblock = pa_memblock_new_fixed(pool, samples0, nsamples * sizeof(int16_t), false);
-    c0.length = pa_memblock_get_length(c0.memblock);
-    c0.index = 0;
-
-    pa_random(samples1, nsamples * sizeof(int16_t));
-    c1.memblock = pa_memblock_new_fixed(pool, samples1, nsamples * sizeof(int16_t), false);
-    c1.length = pa_memblock_get_length(c1.memblock);
-    c1.index = 0;
-
-    m[0].chunk = c0;
-    m[0].volume.channels = channels;
-    for (i = 0; i < channels; i++) {
-        m[0].volume.values[i] = PA_VOLUME_NORM;
-        m[0].linear[i].i = 0x5555;
-    }
-
-    m[1].chunk = c1;
-    m[1].volume.channels = channels;
-    for (i = 0; i < channels; i++) {
-        m[1].volume.values[i] = PA_VOLUME_NORM;
-        m[1].linear[i].i = 0x6789;
-    }
-
-    if (correct) {
-        acquire_mix_streams(m, 2);
-        orig_func(m, 2, channels, samples_ref, nsamples * sizeof(int16_t));
-        release_mix_streams(m, 2);
-
-        acquire_mix_streams(m, 2);
-        func(m, 2, channels, samples, nsamples * sizeof(int16_t));
-        release_mix_streams(m, 2);
-
-        for (i = 0; i < nsamples; i++) {
-            if (samples[i] != samples_ref[i]) {
-                pa_log_debug("Correctness test failed: align=%d, channels=%d", align, channels);
-                pa_log_debug("%d: %hd != %04hd (%hd + %hd)\n",
-                    i,
-                    samples[i], samples_ref[i],
-                    samples0[i], samples1[i]);
-                fail();
-            }
-        }
-    }
-
-    if (perf) {
-        pa_log_debug("Testing %d-channel mixing performance with %d sample alignment", channels, align);
-
-        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
-            acquire_mix_streams(m, 2);
-            func(m, 2, channels, samples, nsamples * sizeof(int16_t));
-            release_mix_streams(m, 2);
-        } PA_RUNTIME_TEST_RUN_STOP
-
-        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
-            acquire_mix_streams(m, 2);
-            orig_func(m, 2, channels, samples_ref, nsamples * sizeof(int16_t));
-            release_mix_streams(m, 2);
-        } PA_RUNTIME_TEST_RUN_STOP
-    }
-
-    pa_memblock_unref(c0.memblock);
-    pa_memblock_unref(c1.memblock);
-
-    pa_mempool_free(pool);
-}
-#endif /* HAVE_NEON */
-#endif /* defined (__arm__) && defined (__linux__) */
-
-#if defined (__arm__) && defined (__linux__)
-#ifdef HAVE_NEON
-START_TEST (mix_neon_test) {
-    pa_do_mix_func_t orig_func, neon_func;
-    pa_cpu_arm_flag_t flags = 0;
-
-    pa_cpu_get_arm_flags(&flags);
-
-    if (!(flags & PA_CPU_ARM_NEON)) {
-        pa_log_info("NEON not supported. Skipping");
-        return;
-    }
-
-    orig_func = pa_get_mix_func(PA_SAMPLE_S16NE);
-    pa_mix_func_init_neon(flags);
-    neon_func = pa_get_mix_func(PA_SAMPLE_S16NE);
-
-    pa_log_debug("Checking NEON mix");
-    run_mix_test(neon_func, orig_func, 7, 2, true, true);
-}
-END_TEST
-#endif /* HAVE_NEON */
-#endif /* defined (__arm__) && defined (__linux__) */
-/* End mix tests */
-
-int main(int argc, char *argv[]) {
-    int failed = 0;
-    Suite *s;
-    TCase *tc;
-    SRunner *sr;
-
-    if (!getenv("MAKE_CHECK"))
-        pa_log_set_level(PA_LOG_DEBUG);
-
-    s = suite_create("CPU");
-
-    /* Volume tests */
-    tc = tcase_create("svolume");
-#if defined (__i386__) || defined (__amd64__)
-    tcase_add_test(tc, svolume_mmx_test);
-    tcase_add_test(tc, svolume_sse_test);
-#endif
-#if defined (__arm__) && defined (__linux__)
-    tcase_add_test(tc, svolume_arm_test);
-#endif
-    tcase_add_test(tc, svolume_orc_test);
-    tcase_set_timeout(tc, 120);
-    suite_add_tcase(s, tc);
-
-    /* Conversion tests */
-    tc = tcase_create("sconv");
-#if defined (__i386__) || defined (__amd64__)
-    tcase_add_test(tc, sconv_sse2_test);
-    tcase_add_test(tc, sconv_sse_test);
-#endif
-#if defined (__arm__) && defined (__linux__)
-#if HAVE_NEON
-    tcase_add_test(tc, sconv_neon_test);
-#endif
-#endif
-    tcase_set_timeout(tc, 120);
-    suite_add_tcase(s, tc);
-
-    /* Remap tests */
-    tc = tcase_create("remap");
-#if defined (__i386__) || defined (__amd64__)
-    tcase_add_test(tc, remap_mmx_test);
-    tcase_add_test(tc, remap_sse2_test);
-#endif
-    tcase_set_timeout(tc, 120);
-    suite_add_tcase(s, tc);
-    /* Mix tests */
-    tc = tcase_create("mix");
-#if defined (__arm__) && defined (__linux__)
-#if HAVE_NEON
-    tcase_add_test(tc, mix_neon_test);
-#endif
-#endif
-    tcase_set_timeout(tc, 120);
-    suite_add_tcase(s, tc);
-
-    sr = srunner_create(s);
-    srunner_run_all(sr, CK_NORMAL);
-    failed = srunner_ntests_failed(sr);
-    srunner_free(sr);
-
-    return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff --git a/src/tests/cpu-volume-test.c b/src/tests/cpu-volume-test.c
new file mode 100644
index 0000000..659136e
--- /dev/null
+++ b/src/tests/cpu-volume-test.c
@@ -0,0 +1,249 @@
+/***
+  This file is part of PulseAudio.
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <check.h>
+
+#include <pulsecore/cpu-arm.h>
+#include <pulsecore/cpu-x86.h>
+#include <pulsecore/cpu-orc.h>
+#include <pulsecore/random.h>
+#include <pulsecore/macro.h>
+#include <pulsecore/sample-util.h>
+
+#include "runtime-test-util.h"
+
+/* Common defines for svolume tests */
+#define SAMPLES 1028
+#define TIMES 1000
+#define TIMES2 100
+#define PADDING 16
+
+static void run_volume_test(
+        pa_do_volume_func_t func,
+        pa_do_volume_func_t orig_func,
+        int align,
+        int channels,
+        bool correct,
+        bool perf) {
+
+    PA_DECLARE_ALIGNED(8, int16_t, s[SAMPLES]) = { 0 };
+    PA_DECLARE_ALIGNED(8, int16_t, s_ref[SAMPLES]) = { 0 };
+    PA_DECLARE_ALIGNED(8, int16_t, s_orig[SAMPLES]) = { 0 };
+    int32_t volumes[channels + PADDING];
+    int16_t *samples, *samples_ref, *samples_orig;
+    int i, padding, nsamples, size;
+
+    /* Force sample alignment as requested */
+    samples = s + (8 - align);
+    samples_ref = s_ref + (8 - align);
+    samples_orig = s_orig + (8 - align);
+    nsamples = SAMPLES - (8 - align);
+    if (nsamples % channels)
+        nsamples -= nsamples % channels;
+    size = nsamples * sizeof(int16_t);
+
+    pa_random(samples, size);
+    memcpy(samples_ref, samples, size);
+    memcpy(samples_orig, samples, size);
+
+    for (i = 0; i < channels; i++)
+        volumes[i] = PA_CLAMP_VOLUME((pa_volume_t)(rand() >> 15));
+    for (padding = 0; padding < PADDING; padding++, i++)
+        volumes[i] = volumes[padding];
+
+    if (correct) {
+        orig_func(samples_ref, volumes, channels, size);
+        func(samples, volumes, channels, size);
+
+        for (i = 0; i < nsamples; i++) {
+            if (samples[i] != samples_ref[i]) {
+                pa_log_debug("Correctness test failed: align=%d, channels=%d", align, channels);
+                pa_log_debug("%d: %04hx != %04hx (%04hx * %08x)\n", i, samples[i], samples_ref[i],
+                        samples_orig[i], volumes[i % channels]);
+                fail();
+            }
+        }
+    }
+
+    if (perf) {
+        pa_log_debug("Testing svolume %dch performance with %d sample alignment", channels, align);
+
+        PA_RUNTIME_TEST_RUN_START("func", TIMES, TIMES2) {
+            memcpy(samples, samples_orig, size);
+            func(samples, volumes, channels, size);
+        } PA_RUNTIME_TEST_RUN_STOP
+
+        PA_RUNTIME_TEST_RUN_START("orig", TIMES, TIMES2) {
+            memcpy(samples_ref, samples_orig, size);
+            orig_func(samples_ref, volumes, channels, size);
+        } PA_RUNTIME_TEST_RUN_STOP
+
+        fail_unless(memcmp(samples_ref, samples, size) == 0);
+    }
+}
+
+#if defined (__i386__) || defined (__amd64__)
+START_TEST (svolume_mmx_test) {
+    pa_do_volume_func_t orig_func, mmx_func;
+    pa_cpu_x86_flag_t flags = 0;
+    int i, j;
+
+    pa_cpu_get_x86_flags(&flags);
+
+    if (!((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV))) {
+        pa_log_info("MMX/CMOV not supported. Skipping");
+        return;
+    }
+
+    orig_func = pa_get_volume_func(PA_SAMPLE_S16NE);
+    pa_volume_func_init_mmx(flags);
+    mmx_func = pa_get_volume_func(PA_SAMPLE_S16NE);
+
+    pa_log_debug("Checking MMX svolume");
+    for (i = 1; i <= 3; i++) {
+        for (j = 0; j < 7; j++)
+            run_volume_test(mmx_func, orig_func, j, i, true, false);
+    }
+    run_volume_test(mmx_func, orig_func, 7, 1, true, true);
+    run_volume_test(mmx_func, orig_func, 7, 2, true, true);
+    run_volume_test(mmx_func, orig_func, 7, 3, true, true);
+}
+END_TEST
+
+START_TEST (svolume_sse_test) {
+    pa_do_volume_func_t orig_func, sse_func;
+    pa_cpu_x86_flag_t flags = 0;
+    int i, j;
+
+    pa_cpu_get_x86_flags(&flags);
+
+    if (!(flags & PA_CPU_X86_SSE2)) {
+        pa_log_info("SSE2 not supported. Skipping");
+        return;
+    }
+
+    orig_func = pa_get_volume_func(PA_SAMPLE_S16NE);
+    pa_volume_func_init_sse(flags);
+    sse_func = pa_get_volume_func(PA_SAMPLE_S16NE);
+
+    pa_log_debug("Checking SSE2 svolume");
+    for (i = 1; i <= 3; i++) {
+        for (j = 0; j < 7; j++)
+            run_volume_test(sse_func, orig_func, j, i, true, false);
+    }
+    run_volume_test(sse_func, orig_func, 7, 1, true, true);
+    run_volume_test(sse_func, orig_func, 7, 2, true, true);
+    run_volume_test(sse_func, orig_func, 7, 3, true, true);
+}
+END_TEST
+#endif /* defined (__i386__) || defined (__amd64__) */
+
+#if defined (__arm__) && defined (__linux__)
+START_TEST (svolume_arm_test) {
+    pa_do_volume_func_t orig_func, arm_func;
+    pa_cpu_arm_flag_t flags = 0;
+    int i, j;
+
+    pa_cpu_get_arm_flags(&flags);
+
+    if (!(flags & PA_CPU_ARM_V6)) {
+        pa_log_info("ARMv6 instructions not supported. Skipping");
+        return;
+    }
+
+    orig_func = pa_get_volume_func(PA_SAMPLE_S16NE);
+    pa_volume_func_init_arm(flags);
+    arm_func = pa_get_volume_func(PA_SAMPLE_S16NE);
+
+    pa_log_debug("Checking ARM svolume");
+    for (i = 1; i <= 3; i++) {
+        for (j = 0; j < 7; j++)
+            run_volume_test(arm_func, orig_func, j, i, true, false);
+    }
+    run_volume_test(arm_func, orig_func, 7, 1, true, true);
+    run_volume_test(arm_func, orig_func, 7, 2, true, true);
+    run_volume_test(arm_func, orig_func, 7, 3, true, true);
+}
+END_TEST
+#endif /* defined (__arm__) && defined (__linux__) */
+
+START_TEST (svolume_orc_test) {
+    pa_do_volume_func_t orig_func, orc_func;
+    pa_cpu_info cpu_info;
+    int i, j;
+
+#if defined (__i386__) || defined (__amd64__)
+    pa_zero(cpu_info);
+    cpu_info.cpu_type = PA_CPU_X86;
+    pa_cpu_get_x86_flags(&cpu_info.flags.x86);
+#endif
+
+    orig_func = pa_get_volume_func(PA_SAMPLE_S16NE);
+
+    if (!pa_cpu_init_orc(cpu_info)) {
+        pa_log_info("Orc not supported. Skipping");
+        return;
+    }
+
+    orc_func = pa_get_volume_func(PA_SAMPLE_S16NE);
+
+    pa_log_debug("Checking Orc svolume");
+    for (i = 1; i <= 2; i++) {
+        for (j = 0; j < 7; j++)
+            run_volume_test(orc_func, orig_func, j, i, true, false);
+    }
+    run_volume_test(orc_func, orig_func, 7, 1, true, true);
+    run_volume_test(orc_func, orig_func, 7, 2, true, true);
+}
+END_TEST
+
+int main(int argc, char *argv[]) {
+    int failed = 0;
+    Suite *s;
+    TCase *tc;
+    SRunner *sr;
+
+    if (!getenv("MAKE_CHECK"))
+        pa_log_set_level(PA_LOG_DEBUG);
+
+    s = suite_create("CPU");
+
+    tc = tcase_create("svolume");
+#if defined (__i386__) || defined (__amd64__)
+    tcase_add_test(tc, svolume_mmx_test);
+    tcase_add_test(tc, svolume_sse_test);
+#endif
+#if defined (__arm__) && defined (__linux__)
+    tcase_add_test(tc, svolume_arm_test);
+#endif
+    tcase_add_test(tc, svolume_orc_test);
+    tcase_set_timeout(tc, 120);
+    suite_add_tcase(s, tc);
+
+    sr = srunner_create(s);
+    srunner_run_all(sr, CK_NORMAL);
+    failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/src/tests/flist-test.c b/src/tests/flist-test.c
index 6915204..d8c227a 100644
--- a/src/tests/flist-test.c
+++ b/src/tests/flist-test.c
@@ -88,7 +88,7 @@ int main(int argc, char* argv[]) {
 
     for (i = 0; i < THREADS_MAX; i++) {
         threads[i] = pa_thread_new("test", thread_func, pa_sprintf_malloc("Thread #%i", i+1));
-        assert(threads[i]);
+        pa_assert(threads[i]);
     }
 
     pa_msleep(60000);
diff --git a/src/tests/format-test.c b/src/tests/format-test.c
index 5e7d587..e9e9622 100644
--- a/src/tests/format-test.c
+++ b/src/tests/format-test.c
@@ -36,7 +36,7 @@
 
 START_TEST (format_test) {
     pa_format_info *f1 = NULL, *f2 = NULL;
-    int rates1[] = { 32000, 44100, 48000 }, i, temp_int1 = -1, temp_int2 = -1, *temp_int_array;
+    int rates1[] = { 32000, 44100, 48000 }, i, temp_int1 = -1, PA_UNUSED temp_int2 = -1, *temp_int_array;
     const char *strings[] = { "thing1", "thing2", "thing3" };
     char *temp_str, **temp_str_array;
 
diff --git a/src/tests/lo-test-util.c b/src/tests/lo-test-util.c
index 01eb295..84e8af3 100644
--- a/src/tests/lo-test-util.c
+++ b/src/tests/lo-test-util.c
@@ -72,7 +72,7 @@ static int cal_state = CALIBRATION_ONE;
 
 static void calibrate_write_cb(pa_stream *s, size_t nbytes, void *userdata) {
     pa_lo_test_context *ctx = (pa_lo_test_context *) userdata;
-    int i, r, nsamp = nbytes / ctx->fs;
+    int i, nsamp = nbytes / ctx->fs;
     float tmp[nsamp][2];
     static int count = 0;
 
@@ -80,8 +80,7 @@ static void calibrate_write_cb(pa_stream *s, size_t nbytes, void *userdata) {
     for (i = 0; i < nsamp; i++)
         tmp[i][0] = tmp[i][1] = cal_state == CALIBRATION_ONE ? sinf(count++ * TONE_HZ * 2 * M_PI / ctx->sample_spec.rate) : 0.0f;
 
-    r = pa_stream_write(s, &tmp, nbytes, nop_free_cb, 0, PA_SEEK_RELATIVE);
-    pa_assert(r == 0);
+    pa_assert_se(pa_stream_write(s, &tmp, nbytes, nop_free_cb, 0, PA_SEEK_RELATIVE) == 0);
 
     if (cal_state == CALIBRATION_DONE)
         pa_stream_set_write_callback(s, ctx->write_cb, ctx);
@@ -94,12 +93,11 @@ static void calibrate_read_cb(pa_stream *s, size_t nbytes, void *userdata) {
 
     pa_cvolume vol;
     pa_operation *o;
-    int r, nsamp;
+    int nsamp;
     float *in;
     size_t l;
 
-    r = pa_stream_peek(s, (const void **)&in, &l);
-    pa_assert(r == 0);
+    pa_assert_se(pa_stream_peek(s, (const void **)&in, &l) == 0);
 
     nsamp = l / ctx->fs;
 
diff --git a/src/tests/mcalign-test.c b/src/tests/mcalign-test.c
index bd192b5..455e18c 100644
--- a/src/tests/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #endif
 
-#include <assert.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -56,7 +55,7 @@ int main(int argc, char *argv[]) {
             c.index = c.length = 0;
         }
 
-        assert(c.index < pa_memblock_get_length(c.memblock));
+        pa_assert(c.index < pa_memblock_get_length(c.memblock));
 
         l = pa_memblock_get_length(c.memblock) - c.index;
 
@@ -74,7 +73,7 @@ int main(int argc, char *argv[]) {
 
         c.length = (size_t) r;
         pa_mcalign_push(a, &c);
-        fprintf(stderr, "Read %ld bytes\n", (long)r);
+        fprintf(stderr, "Read %zd bytes\n", r);
 
         c.index += (size_t) r;
 
diff --git a/src/tests/memblock-test.c b/src/tests/memblock-test.c
index d46da6c..9581daa 100644
--- a/src/tests/memblock-test.c
+++ b/src/tests/memblock-test.c
@@ -130,7 +130,7 @@ START_TEST (memblock_test) {
 
         pa_log("A: Memory block exported as %u", id);
 
-        mb_b = pa_memimport_get(import_b, id, shm_id, offset, size);
+        mb_b = pa_memimport_get(import_b, id, shm_id, offset, size, false);
         fail_unless(mb_b != NULL);
         r = pa_memexport_put(export_b, mb_b, &id, &shm_id, &offset, &size);
         fail_unless(r >= 0);
@@ -139,7 +139,7 @@ START_TEST (memblock_test) {
 
         pa_log("B: Memory block exported as %u", id);
 
-        mb_c = pa_memimport_get(import_c, id, shm_id, offset, size);
+        mb_c = pa_memimport_get(import_c, id, shm_id, offset, size, false);
         fail_unless(mb_c != NULL);
         x = pa_memblock_acquire(mb_c);
         pa_log_debug("1 data=%s", x);
diff --git a/src/tests/mix-special-test.c b/src/tests/mix-special-test.c
deleted file mode 100644
index 08ac812..0000000
--- a/src/tests/mix-special-test.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2.1 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <check.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <pulse/rtclock.h>
-#include <pulsecore/random.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/mix.h>
-#include <pulsecore/sample-util.h>
-
-#include "runtime-test-util.h"
-
-static void acquire_mix_streams(pa_mix_info streams[], unsigned nstreams) {
-    unsigned i;
-
-    for (i = 0; i < nstreams; i++)
-        streams[i].ptr = pa_memblock_acquire_chunk(&streams[i].chunk);
-}
-
-static void release_mix_streams(pa_mix_info streams[], unsigned nstreams) {
-    unsigned i;
-
-    for (i = 0; i < nstreams; i++)
-        pa_memblock_release(streams[i].chunk.memblock);
-}
-
-/* special case: mix 2 s16ne streams, 1 channel each */
-static void pa_mix2_ch1_s16ne(pa_mix_info streams[], int16_t *data, unsigned length) {
-    const int16_t *ptr0 = streams[0].ptr;
-    const int16_t *ptr1 = streams[1].ptr;
-
-    const int32_t cv0 = streams[0].linear[0].i;
-    const int32_t cv1 = streams[1].linear[0].i;
-
-    length /= sizeof(int16_t);
-
-    for (; length > 0; length--) {
-        int32_t sum;
-
-        sum = pa_mult_s16_volume(*ptr0++, cv0);
-        sum += pa_mult_s16_volume(*ptr1++, cv1);
-
-        sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
-        *data++ = sum;
-    }
-}
-
-/* special case: mix 2 s16ne streams, 2 channels each */
-static void pa_mix2_ch2_s16ne(pa_mix_info streams[], int16_t *data, unsigned length) {
-    const int16_t *ptr0 = streams[0].ptr;
-    const int16_t *ptr1 = streams[1].ptr;
-
-    length /= sizeof(int16_t) * 2;
-
-    for (; length > 0; length--) {
-        int32_t sum;
-
-        sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[0].i);
-        sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[0].i);
-
-        sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
-        *data++ = sum;
-
-        sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[1].i);
-        sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[1].i);
-
-        sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
-        *data++ = sum;
-    }
-}
-
-/* special case: mix 2 s16ne streams */
-static void pa_mix2_s16ne(pa_mix_info streams[], unsigned channels, int16_t *data, unsigned length) {
-    const int16_t *ptr0 = streams[0].ptr;
-    const int16_t *ptr1 = streams[1].ptr;
-    unsigned channel = 0;
-
-    length /= sizeof(int16_t);
-
-    for (; length > 0; length--) {
-        int32_t sum;
-
-        sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[channel].i);
-        sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[channel].i);
-
-        sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
-        *data++ = sum;
-
-        if (PA_UNLIKELY(++channel >= channels))
-            channel = 0;
-    }
-}
-
-/* special case: mix s16ne streams, 2 channels each */
-static void pa_mix_ch2_s16ne(pa_mix_info streams[], unsigned nstreams, int16_t *data, unsigned length) {
-
-    length /= sizeof(int16_t) * 2;
-
-    for (; length > 0; length--) {
-        int32_t sum0 = 0, sum1 = 0;
-        unsigned i;
-
-        for (i = 0; i < nstreams; i++) {
-            pa_mix_info *m = streams + i;
-            int32_t cv0 = m->linear[0].i;
-            int32_t cv1 = m->linear[1].i;
-
-            sum0 += pa_mult_s16_volume(*((int16_t*) m->ptr), cv0);
-            m->ptr = (uint8_t*) m->ptr + sizeof(int16_t);
-
-            sum1 += pa_mult_s16_volume(*((int16_t*) m->ptr), cv1);
-            m->ptr = (uint8_t*) m->ptr + sizeof(int16_t);
-        }
-
-        *data++ = PA_CLAMP_UNLIKELY(sum0, -0x8000, 0x7FFF);
-        *data++ = PA_CLAMP_UNLIKELY(sum1, -0x8000, 0x7FFF);
-    }
-}
-
-static void pa_mix_generic_s16ne(pa_mix_info streams[], unsigned nstreams, unsigned channels, int16_t *data, unsigned length) {
-    unsigned channel = 0;
-
-    length /= sizeof(int16_t);
-
-    for (; length > 0; length--) {
-        int32_t sum = 0;
-        unsigned i;
-
-        for (i = 0; i < nstreams; i++) {
-            pa_mix_info *m = streams + i;
-            int32_t cv = m->linear[channel].i;
-
-            if (PA_LIKELY(cv > 0))
-                sum += pa_mult_s16_volume(*((int16_t*) m->ptr), cv);
-            m->ptr = (uint8_t*) m->ptr + sizeof(int16_t);
-        }
-
-        sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
-        *data++ = sum;
-
-        if (PA_UNLIKELY(++channel >= channels))
-            channel = 0;
-    }
-}
-
-#define SAMPLES 1028
-#define TIMES 1000
-#define TIMES2 100
-
-START_TEST (mix_special_1ch_test) {
-    int16_t samples0[SAMPLES];
-    int16_t samples1[SAMPLES];
-    int16_t out[SAMPLES];
-    int16_t out_ref[SAMPLES];
-    pa_mempool *pool;
-    pa_memchunk c0, c1;
-    pa_mix_info m[2];
-    unsigned nsamples = SAMPLES;
-
-    fail_unless((pool = pa_mempool_new(false, 0)) != NULL, NULL);
-
-    pa_random(samples0, nsamples * sizeof(int16_t));
-    c0.memblock = pa_memblock_new_fixed(pool, samples0, nsamples * sizeof(int16_t), false);
-    c0.length = pa_memblock_get_length(c0.memblock);
-    c0.index = 0;
-
-    pa_random(samples1, nsamples * sizeof(int16_t));
-    c1.memblock = pa_memblock_new_fixed(pool, samples1, nsamples * sizeof(int16_t), false);
-    c1.length = pa_memblock_get_length(c1.memblock);
-    c1.index = 0;
-
-    m[0].chunk = c0;
-    m[0].volume.channels = 1;
-    m[0].volume.values[0] = PA_VOLUME_NORM;
-    m[0].linear[0].i = 0x5555;
-
-    m[1].chunk = c1;
-    m[1].volume.channels = 1;
-    m[1].volume.values[0] = PA_VOLUME_NORM;
-    m[1].linear[0].i = 0x6789;
-
-    PA_RUNTIME_TEST_RUN_START("mix s16 generic 1 channel", TIMES, TIMES2) {
-        acquire_mix_streams(m, 2);
-        pa_mix_generic_s16ne(m, 2, 1, out_ref, nsamples * sizeof(int16_t));
-        release_mix_streams(m, 2);
-    } PA_RUNTIME_TEST_RUN_STOP
-
-    PA_RUNTIME_TEST_RUN_START("mix s16 2 streams 1 channel", TIMES, TIMES2) {
-        acquire_mix_streams(m, 2);
-        pa_mix2_ch1_s16ne(m, out, nsamples * sizeof(int16_t));
-        release_mix_streams(m, 2);
-    } PA_RUNTIME_TEST_RUN_STOP
-
-    fail_unless(memcmp(out, out_ref, nsamples * sizeof(int16_t)) == 0);
-
-    pa_memblock_unref(c0.memblock);
-    pa_memblock_unref(c1.memblock);
-
-    pa_mempool_free(pool);
-}
-END_TEST
-
-START_TEST (mix_special_2ch_test) {
-    int16_t samples0[SAMPLES*2];
-    int16_t samples1[SAMPLES*2];
-    int16_t out[SAMPLES*2];
-    int16_t out_ref[SAMPLES*2];
-    int i;
-    pa_mempool *pool;
-    pa_memchunk c0, c1;
-    pa_mix_info m[2];
-    unsigned nsamples = SAMPLES * 2;
-
-    fail_unless((pool = pa_mempool_new(false, 0)) != NULL, NULL);
-
-    pa_random(samples0, nsamples * sizeof(int16_t));
-    c0.memblock = pa_memblock_new_fixed(pool, samples0, nsamples * sizeof(int16_t), false);
-    c0.length = pa_memblock_get_length(c0.memblock);
-    c0.index = 0;
-
-    pa_random(samples1, nsamples * sizeof(int16_t));
-    c1.memblock = pa_memblock_new_fixed(pool, samples1, nsamples * sizeof(int16_t), false);
-    c1.length = pa_memblock_get_length(c1.memblock);
-    c1.index = 0;
-
-    m[0].chunk = c0;
-    m[0].volume.channels = 2;
-    for (i = 0; i < m[0].volume.channels; i++) {
-        m[0].volume.values[i] = PA_VOLUME_NORM;
-        m[0].linear[i].i = 0x5555;
-    }
-
-    m[1].chunk = c1;
-    m[1].volume.channels = 2;
-    for (i = 0; i < m[1].volume.channels; i++) {
-        m[1].volume.values[i] = PA_VOLUME_NORM;
-        m[1].linear[i].i = 0x6789;
-    }
-
-    PA_RUNTIME_TEST_RUN_START("mix s16 generic 2 channels", TIMES, TIMES2) {
-        acquire_mix_streams(m, 2);
-        pa_mix_generic_s16ne(m, 2, 2, out_ref, nsamples * sizeof(int16_t));
-        release_mix_streams(m, 2);
-    } PA_RUNTIME_TEST_RUN_STOP
-
-    PA_RUNTIME_TEST_RUN_START("mix s16 2 channels", TIMES, TIMES2) {
-        acquire_mix_streams(m, 2);
-        pa_mix_ch2_s16ne(m, 2, out, nsamples * sizeof(int16_t));
-        release_mix_streams(m, 2);
-    } PA_RUNTIME_TEST_RUN_STOP
-
-    fail_unless(memcmp(out, out_ref, nsamples * sizeof(int16_t)) == 0);
-
-    PA_RUNTIME_TEST_RUN_START("mix s16 2 streams", TIMES, TIMES2) {
-        acquire_mix_streams(m, 2);
-        pa_mix2_s16ne(m, 2, out, nsamples * sizeof(int16_t));
-        release_mix_streams(m, 2);
-    } PA_RUNTIME_TEST_RUN_STOP
-
-    fail_unless(memcmp(out, out_ref, nsamples * sizeof(int16_t)) == 0);
-
-    PA_RUNTIME_TEST_RUN_START("mix s16 2 streams 2 channels", TIMES, TIMES2) {
-        acquire_mix_streams(m, 2);
-        pa_mix2_ch2_s16ne(m, out, nsamples * sizeof(int16_t));
-        release_mix_streams(m, 2);
-    } PA_RUNTIME_TEST_RUN_STOP
-
-    fail_unless(memcmp(out, out_ref, nsamples * sizeof(int16_t)) == 0);
-
-    pa_memblock_unref(c0.memblock);
-    pa_memblock_unref(c1.memblock);
-
-    pa_mempool_free(pool);
-}
-END_TEST
-
-int main(int argc, char *argv[]) {
-    int failed = 0;
-    Suite *s;
-    TCase *tc;
-    SRunner *sr;
-
-    if (!getenv("MAKE_CHECK"))
-        pa_log_set_level(PA_LOG_DEBUG);
-
-    s = suite_create("Mix-special");
-    tc = tcase_create("mix-special 1ch");
-    tcase_add_test(tc, mix_special_1ch_test);
-    tcase_set_timeout(tc, 120);
-    suite_add_tcase(s, tc);
-    tc = tcase_create("mix-special 2ch");
-    tcase_add_test(tc, mix_special_2ch_test);
-    tcase_set_timeout(tc, 120);
-    suite_add_tcase(s, tc);
-
-    sr = srunner_create(s);
-    srunner_run_all(sr, CK_NORMAL);
-    failed = srunner_ntests_failed(sr);
-    srunner_free(sr);
-
-    return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff --git a/src/tests/mix-test.c b/src/tests/mix-test.c
index ae65209..e95607d 100644
--- a/src/tests/mix-test.c
+++ b/src/tests/mix-test.c
@@ -56,79 +56,37 @@ static const uint8_t ulaw_result[3][10] = {
 { 0x00, 0xff, 0xff, 0x80, 0x91, 0x31, 0x00, 0xe9, 0x12, 0x13 },
 };
 
-/* PA_SAMPLE_S16LE */
-static const uint16_t s16le_result[3][10] = {
+static const uint16_t s16ne_result[3][10] = {
 { 0x0000, 0xffff, 0x7fff, 0x8000, 0x9fff, 0x3fff, 0x0001, 0xf000, 0x0020, 0x0021 },
 { 0x0000, 0xffff, 0x7332, 0x8ccd, 0xa998, 0x3998, 0x0000, 0xf199, 0x001c, 0x001d },
 { 0x0000, 0xfffe, 0x7fff, 0x8000, 0x8000, 0x7997, 0x0001, 0xe199, 0x003c, 0x003e },
 };
 
-/* PA_SAMPLE_S16BE */
-static const uint16_t s16be_result[3][10] = {
-{ 0x0000, 0xffff, 0x7fff, 0x8000, 0x9fff, 0x3fff, 0x0001, 0xf000, 0x0020, 0x0021 },
-{ 0x0000, 0xffff, 0x8bff, 0x7300, 0xa8ff, 0x52ff, 0xe600, 0xd700, 0xcc1c, 0xb31d },
-{ 0x0000, 0xfeff, 0x0aff, 0xf300, 0x47ff, 0x91fe, 0xe601, 0xc701, 0xcc3c, 0xb33e },
-};
-
-/* PA_SAMPLE_FLOAT32LE */
-static const float float32le_result[3][10] = {
-{ 0.000000, -1.000000, 1.000000, 4711.000000, 0.222000, 0.330000, -0.300000, 99.000000, -0.555000, -0.123000 },
-{ 0.000000, -0.899987, 0.899987, 4239.837402, 0.199797, 0.296996, -0.269996, 89.098679, -0.499493, -0.110698 },
-{ 0.000000, -1.899987, 1.899987, 8950.837891, 0.421797, 0.626996, -0.569996, 188.098679, -1.054493, -0.233698 },
-};
-
-/* PA_SAMPLE_FLOAT32BE */
-static const float float32be_result[3][10] = {
+static const float float32ne_result[3][10] = {
 { 0.000000, -1.000000, 1.000000, 4711.000000, 0.222000, 0.330000, -0.300000, 99.000000, -0.555000, -0.123000 },
 { 0.000000, -0.899987, 0.899987, 4239.837402, 0.199797, 0.296996, -0.269996, 89.098679, -0.499493, -0.110698 },
 { 0.000000, -1.899987, 1.899987, 8950.837891, 0.421797, 0.626996, -0.569996, 188.098679, -1.054493, -0.233698 },
 };
 
-/* PA_SAMPLE_S32LE */
-static const uint32_t s32le_result[3][10] = {
+static const uint32_t s32ne_result[3][10] = {
 { 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
 { 0x00000000, 0xffff199b, 0x7332199c, 0x8ccd0003, 0xa998d99e, 0x3998999f, 0x0000e66c, 0xf199a007, 0x001cccc8, 0x001db32e },
 { 0x00000001, 0xfffe199d, 0x7fffffff, 0x80000000, 0x80000000, 0x799799a5, 0x0001e673, 0xe199a00f, 0x003cccd1, 0x003eb338 },
 };
 
-/* PA_SAMPLE_S32BE */
-static const uint32_t s32be_result[3][10] = {
-{ 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
-{ 0x0066e600, 0x65b2cd01, 0xf117b402, 0x73989903, 0x0ee48004, 0xb8496705, 0xe6ca4c06, 0xd7303307, 0xccb21908, 0xb3190009 },
-{ 0x0066e601, 0x64b2ce03, 0x7017b505, 0xf3989907, 0xade38109, 0xf748680b, 0xe6cb4c0d, 0xc731330f, 0xccd21911, 0xb33a0013 },
-};
-
-/* PA_SAMPLE_S24LE */
-static const uint8_t s24le_result[3][30] = {
-{ 0x00, 0x00, 0x01, 0xff, 0xff, 0x02, 0x7f, 0xff, 0x03, 0x80, 0x00, 0x04, 0x9f, 0xff, 0x05, 0x3f, 0xff, 0x06, 0x01, 0x00, 0x07, 0xf0, 0x00, 0x08, 0x20, 0x00, 0x09, 0x21, 0x00, 0x0a },
-{ 0x66, 0xe6, 0x00, 0x31, 0xb3, 0x02, 0x23, 0x99, 0x03, 0x0b, 0x9a, 0x03, 0x0c, 0x66, 0x05, 0x1c, 0x4c, 0x06, 0xca, 0x4c, 0x06, 0x07, 0x34, 0x07, 0xb2, 0x19, 0x08, 0x19, 0x00, 0x09 },
-{ 0x66, 0xe6, 0x01, 0x30, 0xb3, 0x05, 0xa2, 0x98, 0x07, 0x8b, 0x9a, 0x07, 0xab, 0x65, 0x0b, 0x5b, 0x4b, 0x0d, 0xcb, 0x4c, 0x0d, 0xf7, 0x34, 0x0f, 0xd2, 0x19, 0x11, 0x3a, 0x00, 0x13 },
-};
-
-/* PA_SAMPLE_S24BE */
+/* attention: result is in BE, not NE! */
 static const uint8_t s24be_result[3][30] = {
-{ 0x00, 0x00, 0x01, 0xff, 0xff, 0x02, 0x7f, 0xff, 0x03, 0x80, 0x00, 0x04, 0x9f, 0xff, 0x05, 0x3f, 0xff, 0x06, 0x01, 0x00, 0x07,
-    0xf0, 0x00, 0x08, 0x20, 0x00, 0x09, 0x21, 0x00, 0x0a },
-{ 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x73, 0x32, 0x1c, 0x8c, 0xcd, 0x03, 0xa9, 0x98, 0xde, 0x39, 0x98, 0x9f, 0x00, 0xe6, 0x6c,
-    0xf1, 0x99, 0xa7, 0x1c, 0xcc, 0xc8, 0x1d, 0xb3, 0x2e },
-{ 0x00, 0x00, 0x01, 0xff, 0xfe, 0x1d, 0x7f, 0xff, 0xff, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x79, 0x97, 0xa5, 0x01, 0xe6, 0x73,
-    0xe1, 0x99, 0xaf, 0x3c, 0xcc, 0xd1, 0x3e, 0xb3, 0x38 },
+{ 0x00, 0x00, 0x01, 0xff, 0xff, 0x02, 0x7f, 0xff, 0x03, 0x80, 0x00, 0x04, 0x9f, 0xff, 0x05, 0x3f, 0xff, 0x06, 0x01, 0x00, 0x07, 0xf0, 0x00, 0x08, 0x20, 0x00, 0x09, 0x21, 0x00, 0x0a },
+{ 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x73, 0x32, 0x1c, 0x8c, 0xcd, 0x03, 0xa9, 0x98, 0xde, 0x39, 0x98, 0x9f, 0x00, 0xe6, 0x6c, 0xf1, 0x99, 0xa7, 0x1c, 0xcc, 0xc8, 0x1d, 0xb3, 0x2e },
+{ 0x00, 0x00, 0x01, 0xff, 0xfe, 0x1d, 0x7f, 0xff, 0xff, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x79, 0x97, 0xa5, 0x01, 0xe6, 0x73, 0xe1, 0x99, 0xaf, 0x3c, 0xcc, 0xd1, 0x3e, 0xb3, 0x38 },
 };
 
-/* PA_SAMPLE_S24_32LE */
-static const uint32_t s24_32le_result[3][10] = {
+static const uint32_t s24_32ne_result[3][10] = {
 { 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
 { 0x00000000, 0x00ff199b, 0x00ff199c, 0x00000003, 0x00ff199e, 0x00ff199f, 0x0000e66c, 0x00000007, 0x001cccc8, 0x001db32e },
 { 0x00000001, 0x00fe199d, 0x00fe199f, 0x00000007, 0x00fe19a3, 0x00fe19a5, 0x0001e673, 0x0000000f, 0x003cccd1, 0x003eb338 },
 };
 
-/* PA_SAMPLE_S24_32BE */
-static const uint32_t s24_32be_result[3][10] = {
-{ 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
-{ 0x00000000, 0x65e60000, 0xf1e50000, 0x73000000, 0x0ee60000, 0xb8e50000, 0xe6000000, 0xd7000000, 0xcc1c0000, 0xb31d0000 },
-{ 0x00000000, 0xe5010200, 0x00036400, 0x0470e500, 0xf3000000, 0xe5010500, 0x0006ad00, 0x07f7e400, 0xe6010000, 0x00000800 },
-};
-
 static void compare_block(const pa_sample_spec *ss, const pa_memchunk *chunk, int iter) {
     void *d;
     unsigned i;
@@ -172,127 +130,70 @@ static void compare_block(const pa_sample_spec *ss, const pa_memchunk *chunk, in
             break;
         }
 
-        case PA_SAMPLE_S16LE: {
-            const uint16_t *v = s16le_result[iter];
-            uint16_t *u = d;
-
-            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                fail_unless(*u == *v, NULL);
-                ++u;
-                ++v;
-            }
-            break;
-        }
-
-        case PA_SAMPLE_S16BE: {
-            const uint16_t *v = s16be_result[iter];
+        case PA_SAMPLE_S16NE:
+        case PA_SAMPLE_S16RE: {
+            const uint16_t *v = s16ne_result[iter];
             uint16_t *u = d;
 
             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                fail_unless(*u == *v, NULL);
+                uint16_t uu = PA_MAYBE_UINT16_SWAP(ss->format != PA_SAMPLE_S16NE, *u);
+                fail_unless(uu == *v, NULL);
                 ++u;
                 ++v;
             }
             break;
         }
 
-        case PA_SAMPLE_FLOAT32LE: {
-            const float *v = float32le_result[iter];
-            float *u = d;
-
-            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u);
-                fail_unless(fabs(uu - *v) <= 1e-6, NULL);
-                ++u;
-                ++v;
-            }
-            break;
-        }
-
-        case PA_SAMPLE_FLOAT32BE: {
-            const float *v = float32be_result[iter];
+        case PA_SAMPLE_FLOAT32NE:
+        case PA_SAMPLE_FLOAT32RE: {
+            const float *v = float32ne_result[iter];
             float *u = d;
 
             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u);
-                fail_unless(fabs(uu - *v) <= 1e-6, NULL);
-                ++u;
-                ++v;
-            }
-            break;
-        }
-
-        case PA_SAMPLE_S32LE: {
-            const uint32_t *v = s32le_result[iter];
-            uint32_t *u = d;
-
-            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                fail_unless(*u == *v, NULL);
-                ++u;
-                ++v;
-            }
-            break;
-        }
-
-        case PA_SAMPLE_S32BE: {
-            const uint32_t *v = s32be_result[iter];
-            uint32_t *u = d;
-
-            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                fail_unless(*u == *v, NULL);
+                float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_READ_FLOAT32RE(u);
+                fail_unless(fabsf(uu - *v) <= 1e-6f, NULL);
                 ++u;
                 ++v;
             }
             break;
         }
 
-        case PA_SAMPLE_S24_32LE: {
-            const uint32_t *v = s24_32le_result[iter];
+        case PA_SAMPLE_S32NE:
+        case PA_SAMPLE_S32RE: {
+            const uint32_t *v = s32ne_result[iter];
             uint32_t *u = d;
 
             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                fail_unless(*u == *v, NULL);
+                uint32_t uu = PA_MAYBE_UINT32_SWAP(ss->format != PA_SAMPLE_S32NE, *u);
+                fail_unless(uu == *v, NULL);
                 ++u;
                 ++v;
             }
             break;
         }
 
-        case PA_SAMPLE_S24_32BE: {
-            const uint32_t *v = s24_32be_result[iter];
+        case PA_SAMPLE_S24_32NE:
+        case PA_SAMPLE_S24_32RE: {
+            const uint32_t *v = s24_32ne_result[iter];
             uint32_t *u = d;
 
             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                fail_unless(*u == *v, NULL);
+                uint32_t uu = PA_MAYBE_UINT32_SWAP(ss->format != PA_SAMPLE_S24_32NE, *u);
+                fail_unless(uu == *v, NULL);
                 ++u;
                 ++v;
             }
             break;
         }
 
-        case PA_SAMPLE_S24LE: {
-            const uint8_t *v = s24le_result[iter];
-            uint8_t *u = d;
-
-            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                fail_unless(*u == *v, NULL);
-                fail_unless(*(u+1) == *(v+1), NULL);
-                fail_unless(*(u+2) == *(v+2), NULL);
-
-                u += 3;
-                v += 3;
-            }
-            break;
-        }
-
-        case PA_SAMPLE_S24BE: {
+        case PA_SAMPLE_S24NE:
+        case PA_SAMPLE_S24RE: {
             const uint8_t *v = s24be_result[iter];
             uint8_t *u = d;
 
             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                fail_unless(*u == *v, NULL);
-                fail_unless(*(u+1) == *(v+1), NULL);
-                fail_unless(*(u+2) == *(v+2), NULL);
+                uint32_t uu = ss->format == PA_SAMPLE_S24LE ? PA_READ24LE(u) : PA_READ24BE(u);
+                fail_unless(uu == PA_READ24BE(v), NULL);
 
                 u += 3;
                 v += 3;
@@ -320,23 +221,18 @@ static pa_memblock* generate_block(pa_mempool *pool, const pa_sample_spec *ss) {
         case PA_SAMPLE_U8:
         case PA_SAMPLE_ULAW:
         case PA_SAMPLE_ALAW: {
-            static const uint8_t u8_samples[] = {
-                0x00, 0xFF, 0x7F, 0x80, 0x9f,
-                0x3f, 0x01, 0xF0, 0x20, 0x21
-            };
-
-            memcpy(d, u8_samples, sizeof(u8_samples));
+            memcpy(d, u8_result[0], sizeof(u8_result[0]));
             break;
         }
 
         case PA_SAMPLE_S16NE:
         case PA_SAMPLE_S16RE: {
-            static const uint16_t u16_samples[] = {
-                0x0000, 0xFFFF, 0x7FFF, 0x8000, 0x9fff,
-                0x3fff, 0x0001, 0xF000, 0x0020, 0x0021
-            };
-
-            memcpy(d, u16_samples, sizeof(u16_samples));
+            if (ss->format == PA_SAMPLE_S16RE) {
+                uint16_t *u = d;
+                for (i = 0; i < 10; i++)
+                    u[i] = PA_UINT16_SWAP(s16ne_result[0][i]);
+            } else
+                memcpy(d, s16ne_result[0], sizeof(s16ne_result[0]));
             break;
         }
 
@@ -344,48 +240,33 @@ static pa_memblock* generate_block(pa_mempool *pool, const pa_sample_spec *ss) {
         case PA_SAMPLE_S24_32RE:
         case PA_SAMPLE_S32NE:
         case PA_SAMPLE_S32RE: {
-            static const uint32_t u32_samples[] = {
-                0x00000001, 0xFFFF0002, 0x7FFF0003, 0x80000004, 0x9fff0005,
-                0x3fff0006, 0x00010007, 0xF0000008, 0x00200009, 0x0021000A
-            };
-
-            memcpy(d, u32_samples, sizeof(u32_samples));
+            if (ss->format == PA_SAMPLE_S24_32RE || ss->format == PA_SAMPLE_S32RE) {
+                uint32_t *u = d;
+                for (i = 0; i < 10; i++)
+                    u[i] = PA_UINT32_SWAP(s32ne_result[0][i]);
+            } else
+                memcpy(d, s32ne_result[0], sizeof(s32ne_result[0]));
             break;
         }
 
         case PA_SAMPLE_S24NE:
-        case PA_SAMPLE_S24RE: {
-            /* Need to be on a byte array because they are not aligned */
-            static const uint8_t u24_samples[] = {
-                0x00, 0x00, 0x01,
-                0xFF, 0xFF, 0x02,
-                0x7F, 0xFF, 0x03,
-                0x80, 0x00, 0x04,
-                0x9f, 0xff, 0x05,
-                0x3f, 0xff, 0x06,
-                0x01, 0x00, 0x07,
-                0xF0, 0x00, 0x08,
-                0x20, 0x00, 0x09,
-                0x21, 0x00, 0x0A
-            };
-
-            memcpy(d, u24_samples, sizeof(u24_samples));
+        case PA_SAMPLE_S24RE:
+            if (ss->format == PA_SAMPLE_S24LE) {
+                uint8_t *u = d;
+                for (i = 0; i < 30; i += 3)
+                    PA_WRITE24LE(&u[i], PA_READ24BE(&s24be_result[0][i]));
+            } else
+                memcpy(d, s24be_result[0], sizeof(s24be_result[0]));
             break;
-        }
 
         case PA_SAMPLE_FLOAT32NE:
         case PA_SAMPLE_FLOAT32RE: {
-            float *u = d;
-            static const float float_samples[] = {
-                0.0f, -1.0f, 1.0f, 4711.0f, 0.222f,
-                0.33f, -.3f, 99.0f, -0.555f, -.123f
-            };
-
             if (ss->format == PA_SAMPLE_FLOAT32RE) {
+                float *u = d;
                 for (i = 0; i < 10; i++)
-                    u[i] = PA_FLOAT32_SWAP(float_samples[i]);
+                    PA_WRITE_FLOAT32RE(&u[i], float32ne_result[0][i]);
             } else
-              memcpy(d, float_samples, sizeof(float_samples));
+                memcpy(d, float32ne_result[0], sizeof(float32ne_result[0]));
 
             break;
         }
@@ -427,8 +308,6 @@ START_TEST (mix_test) {
         i.length = pa_memblock_get_length(i.memblock);
         i.index = 0;
 
-        compare_block(&a, &i, 0);
-
         /* Make a copy */
         j = i;
         pa_memblock_ref(j.memblock);
diff --git a/src/tests/resampler-test.c b/src/tests/resampler-test.c
index 566b69f..f547770 100644
--- a/src/tests/resampler-test.c
+++ b/src/tests/resampler-test.c
@@ -98,7 +98,7 @@ static void dump_block(const char *label, const pa_sample_spec *ss, const pa_mem
             float *u = d;
 
             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                printf("%4.3g ", ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u));
+                printf("%4.3g ", ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_READ_FLOAT32RE(u));
                 u++;
             }
 
@@ -222,7 +222,7 @@ static pa_memblock* generate_block(pa_mempool *pool, const pa_sample_spec *ss) {
 
             if (ss->format == PA_SAMPLE_FLOAT32RE)
                 for (i = 0; i < 10; i++)
-                    u[i] = PA_FLOAT32_SWAP(u[i]);
+                    PA_WRITE_FLOAT32RE(&u[i], u[i]);
 
             break;
         }
@@ -415,8 +415,8 @@ int main(int argc, char *argv[]) {
         pa_memchunk i, j;
         pa_usec_t ts;
 
-        pa_log_debug(_("Compilation CFLAGS: %s"), PA_CFLAGS);
-        pa_log_debug(_("=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"), seconds,
+        pa_log_debug("Compilation CFLAGS: %s", PA_CFLAGS);
+        pa_log_debug("=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)", seconds,
                    a.rate, a.channels, pa_sample_format_to_string(a.format),
                    b.rate, b.channels, pa_sample_format_to_string(b.format));
 
diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c
index 2ac34f0..2cf8125 100644
--- a/src/tests/rtpoll-test.c
+++ b/src/tests/rtpoll-test.c
@@ -62,7 +62,7 @@ START_TEST (rtpoll_test) {
 
     pa_rtpoll_set_timer_relative(p, 10000000); /* 10 s */
 
-    pa_rtpoll_run(p, 1);
+    pa_rtpoll_run(p);
 
     pa_rtpoll_item_free(i);
 
@@ -74,7 +74,7 @@ START_TEST (rtpoll_test) {
     pollfd->fd = 0;
     pollfd->events = POLLIN;
 
-    pa_rtpoll_run(p, 1);
+    pa_rtpoll_run(p);
 
     pa_rtpoll_item_free(i);
 
diff --git a/src/tests/sigbus-test.c b/src/tests/sigbus-test.c
index c48df8a..6acac04 100644
--- a/src/tests/sigbus-test.c
+++ b/src/tests/sigbus-test.c
@@ -54,6 +54,7 @@ START_TEST (sigbus_test) {
     /* Verify memory map */
     pa_log("Let's see if this worked: %s", (char*) p);
     pa_log("And memtrap says it is good: %s", pa_yes_no(pa_memtrap_is_good(m)));
+    fail_unless(pa_memtrap_is_good(m) == true);
 
     /* Invalidate mapping */
     fail_unless(ftruncate(fd, 0) >= 0);
@@ -64,6 +65,7 @@ START_TEST (sigbus_test) {
     /* Verify memory map */
     pa_log("Let's see if this worked: %s", (char*) p);
     pa_log("And memtrap says it is good: %s", pa_yes_no(pa_memtrap_is_good(m)));
+    fail_unless(pa_memtrap_is_good(m) == false);
 
     pa_memtrap_remove(m);
     munmap(p, PA_PAGE_SIZE);
diff --git a/src/tests/srbchannel-test.c b/src/tests/srbchannel-test.c
new file mode 100644
index 0000000..ce5930b
--- /dev/null
+++ b/src/tests/srbchannel-test.c
@@ -0,0 +1,138 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2014 David Henningsson, Canonical Ltd.
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <unistd.h>
+#include <check.h>
+
+#include <pulse/mainloop.h>
+#include <pulsecore/packet.h>
+#include <pulsecore/pstream.h>
+#include <pulsecore/iochannel.h>
+#include <pulsecore/memblock.h>
+
+static unsigned packets_received;
+static unsigned packets_checksum;
+static size_t packets_length;
+
+static void packet_received(pa_pstream *p, pa_packet *packet, const pa_cmsg_ancil_data *ancil_data, void *userdata) {
+    unsigned i;
+    fail_unless(packets_length == packet->length);
+    packets_received++;
+    for (i = 0; i < packet->length; i++)
+        packets_checksum += packet->data[i];
+}
+
+static void packet_test(unsigned npackets, size_t plength, pa_mainloop *ml, pa_pstream *p1, pa_pstream *p2) {
+    pa_packet *packet = pa_packet_new(plength);
+    unsigned i;
+    unsigned psum = 0, totalsum = 0;
+    pa_log_info("Sending %d packets of length %zd", npackets, plength);
+    packets_received = 0;
+    packets_checksum = 0;
+    packets_length = plength;
+    pa_pstream_set_receive_packet_callback(p2, packet_received, NULL);
+
+    for (i = 0; i < plength; i++) {
+        packet->data[i] = i;
+        psum += packet->data[i];
+    }
+
+    for (i = 0; i < npackets; i++) {
+        pa_pstream_send_packet(p1, packet, NULL);
+        totalsum += psum;
+        pa_mainloop_iterate(ml, 0, NULL);
+    }
+
+    while (packets_received < npackets)
+        pa_mainloop_iterate(ml, 1, NULL);
+
+    fail_unless(packets_checksum == totalsum);
+    pa_log_debug("Correct checksum received (%d)", packets_checksum);
+    pa_packet_unref(packet);
+}
+
+START_TEST (srbchannel_test) {
+
+    int pipefd[4];
+
+    pa_mainloop *ml = pa_mainloop_new();
+    pa_mempool *mp = pa_mempool_new(true, 0);
+    pa_iochannel *io1, *io2;
+    pa_pstream *p1, *p2;
+    pa_srbchannel *sr1, *sr2;
+    pa_srbchannel_template srt;
+
+    fail_unless(pipe(pipefd) == 0);
+    fail_unless(pipe(&pipefd[2]) == 0);
+    io1 = pa_iochannel_new(pa_mainloop_get_api(ml), pipefd[2], pipefd[1]);
+    io2 = pa_iochannel_new(pa_mainloop_get_api(ml), pipefd[0], pipefd[3]);
+    p1 = pa_pstream_new(pa_mainloop_get_api(ml), io1, mp);
+    p2 = pa_pstream_new(pa_mainloop_get_api(ml), io2, mp);
+
+    pa_log_debug("Pipes: fd %d -> %d, %d -> %d", pipefd[1], pipefd[0], pipefd[3], pipefd[2]);
+
+    packet_test(250, 5, ml, p1, p2);
+    packet_test(10, 1234567, ml, p1, p2);
+
+    pa_log_debug("And now the same thing with srbchannel...");
+
+    sr1 = pa_srbchannel_new(pa_mainloop_get_api(ml), mp);
+    pa_srbchannel_export(sr1, &srt);
+    pa_pstream_set_srbchannel(p1, sr1);
+    sr2 = pa_srbchannel_new_from_template(pa_mainloop_get_api(ml), &srt);
+    pa_pstream_set_srbchannel(p2, sr2);
+
+    packet_test(250, 5, ml, p1, p2);
+    packet_test(10, 1234567, ml, p1, p2);
+
+    pa_pstream_unref(p1);
+    pa_pstream_unref(p2);
+    pa_mempool_free(mp);
+    pa_mainloop_free(ml);
+}
+END_TEST
+
+
+int main(int argc, char *argv[]) {
+    int failed = 0;
+    Suite *s;
+    TCase *tc;
+    SRunner *sr;
+
+    if (!getenv("MAKE_CHECK"))
+        pa_log_set_level(PA_LOG_DEBUG);
+
+    s = suite_create("srbchannel");
+    tc = tcase_create("srbchannel");
+    tcase_add_test(tc, srbchannel_test);
+    suite_add_tcase(s, tc);
+
+    sr = srunner_create(s);
+    srunner_run_all(sr, CK_NORMAL);
+    failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/src/utils/pacat.c b/src/utils/pacat.c
index e1abc31..e60dfca 100644
--- a/src/utils/pacat.c
+++ b/src/utils/pacat.c
@@ -356,10 +356,10 @@ static void stream_state_callback(pa_stream *s, void *userdata) {
                         pa_sample_spec_snprint(sst, sizeof(sst), pa_stream_get_sample_spec(s)),
                         pa_channel_map_snprint(cmt, sizeof(cmt), pa_stream_get_channel_map(s)));
 
-                pa_log(_("Connected to device %s (%u, %ssuspended)."),
+                pa_log(_("Connected to device %s (index: %u, suspended: %s)."),
                         pa_stream_get_device_name(s),
                         pa_stream_get_device_index(s),
-                        pa_stream_is_suspended(s) ? "" : "not ");
+                        pa_yes_no(pa_stream_is_suspended(s)));
             }
 
             break;
@@ -687,12 +687,12 @@ static void help(const char *argv0) {
              "      --channels=CHANNELS               The number of channels, 1 for mono, 2 for stereo\n"
              "                                        (defaults to 2)\n"
              "      --channel-map=CHANNELMAP          Channel map to use instead of the default\n"
-             "      --fix-format                      Take the sample format from the sink the stream is\n"
+             "      --fix-format                      Take the sample format from the sink/source the stream is\n"
              "                                        being connected to.\n"
-             "      --fix-rate                        Take the sampling rate from the sink the stream is\n"
+             "      --fix-rate                        Take the sampling rate from the sink/source the stream is\n"
              "                                        being connected to.\n"
              "      --fix-channels                    Take the number of channels and the channel map\n"
-             "                                        from the sink the stream is being connected to.\n"
+             "                                        from the sink/source the stream is being connected to.\n"
              "      --no-remix                        Don't upmix or downmix channels.\n"
              "      --no-remap                        Map channels by index instead of name.\n"
              "      --latency=BYTES                   Request the specified latency in bytes.\n"
@@ -701,7 +701,7 @@ static void help(const char *argv0) {
              "      --process-time-msec=MSEC          Request the specified process time per request in msec.\n"
              "      --property=PROPERTY=VALUE         Set the specified property to the specified value.\n"
              "      --raw                             Record/play raw PCM data.\n"
-             "      --passthrough                     passthrough data \n"
+             "      --passthrough                     Passthrough data.\n"
              "      --file-format[=FFORMAT]           Record/play formatted PCM data.\n"
              "      --list-file-formats               List available file formats.\n"
              "      --monitor-stream=INDEX            Record from the sink input with index INDEX.\n")
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 40e6689..f6555b9 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -69,7 +69,7 @@ static bool short_list_format = false;
 static uint32_t module_index;
 static int32_t latency_offset;
 static bool suspend;
-static pa_volume_t volume;
+static pa_cvolume volume;
 static enum volume_flags {
     VOL_UINT     = 0,
     VOL_PERCENT  = 1,
@@ -93,7 +93,12 @@ static pa_stream *sample_stream = NULL;
 static pa_sample_spec sample_spec;
 static pa_channel_map channel_map;
 static size_t sample_length = 0;
-static int actions = 1;
+
+/* This variable tracks the number of ongoing asynchronous operations. When a
+ * new operation begins, this is incremented simply with actions++, and when
+ * an operation finishes, this is decremented with the complete_action()
+ * function, which shuts down the program if actions reaches zero. */
+static int actions = 0;
 
 static bool nl = false;
 
@@ -832,18 +837,21 @@ static void index_callback(pa_context *c, uint32_t idx, void *userdata) {
 }
 
 static void volume_relative_adjust(pa_cvolume *cv) {
-    pa_assert((volume_flags & VOL_RELATIVE) == VOL_RELATIVE);
+    pa_assert(volume_flags & VOL_RELATIVE);
 
     /* Relative volume change is additive in case of UINT or PERCENT
      * and multiplicative for LINEAR or DECIBEL */
     if ((volume_flags & 0x0F) == VOL_UINT || (volume_flags & 0x0F) == VOL_PERCENT) {
-        pa_volume_t v = pa_cvolume_avg(cv);
-        v = v + volume < PA_VOLUME_NORM ? PA_VOLUME_MUTED : v + volume - PA_VOLUME_NORM;
-        pa_cvolume_set(cv, 1, v);
-    }
-    if ((volume_flags & 0x0F) == VOL_LINEAR || (volume_flags & 0x0F) == VOL_DECIBEL) {
-        pa_sw_cvolume_multiply_scalar(cv, cv, volume);
+        unsigned i;
+        for (i = 0; i < cv->channels; i++) {
+            if (cv->values[i] + volume.values[i] < PA_VOLUME_NORM)
+                cv->values[i] = PA_VOLUME_MUTED;
+            else
+                cv->values[i] = cv->values[i] + volume.values[i] - PA_VOLUME_NORM;
+        }
     }
+    if ((volume_flags & 0x0F) == VOL_LINEAR || (volume_flags & 0x0F) == VOL_DECIBEL)
+        pa_sw_cvolume_multiply(cv, cv, &volume);
 }
 
 static void unload_module_by_name_callback(pa_context *c, const pa_module_info *i, int is_last, void *userdata) {
@@ -871,6 +879,22 @@ static void unload_module_by_name_callback(pa_context *c, const pa_module_info *
     }
 }
 
+static void fill_volume(pa_cvolume *cv, unsigned supported) {
+    if (volume.channels == 1) {
+        pa_cvolume_set(&volume, supported, volume.values[0]);
+    } else if (volume.channels != supported) {
+        pa_log(_("Failed to set volume: You tried to set volumes for %d channels, whereas channel/s supported = %d\n"),
+            volume.channels, supported);
+        quit(1);
+        return;
+    }
+
+    if (volume_flags & VOL_RELATIVE)
+        volume_relative_adjust(cv);
+    else
+        *cv = volume;
+}
+
 static void get_sink_volume_callback(pa_context *c, const pa_sink_info *i, int is_last, void *userdata) {
     pa_cvolume cv;
 
@@ -886,7 +910,8 @@ static void get_sink_volume_callback(pa_context *c, const pa_sink_info *i, int i
     pa_assert(i);
 
     cv = i->volume;
-    volume_relative_adjust(&cv);
+    fill_volume(&cv, i->channel_map.channels);
+
     pa_operation_unref(pa_context_set_sink_volume_by_name(c, sink_name, &cv, simple_callback, NULL));
 }
 
@@ -905,7 +930,8 @@ static void get_source_volume_callback(pa_context *c, const pa_source_info *i, i
     pa_assert(i);
 
     cv = i->volume;
-    volume_relative_adjust(&cv);
+    fill_volume(&cv, i->channel_map.channels);
+
     pa_operation_unref(pa_context_set_source_volume_by_name(c, source_name, &cv, simple_callback, NULL));
 }
 
@@ -924,7 +950,8 @@ static void get_sink_input_volume_callback(pa_context *c, const pa_sink_input_in
     pa_assert(i);
 
     cv = i->volume;
-    volume_relative_adjust(&cv);
+    fill_volume(&cv, i->channel_map.channels);
+
     pa_operation_unref(pa_context_set_sink_input_volume(c, sink_input_idx, &cv, simple_callback, NULL));
 }
 
@@ -943,7 +970,8 @@ static void get_source_output_volume_callback(pa_context *c, const pa_source_out
     pa_assert(o);
 
     cv = o->volume;
-    volume_relative_adjust(&cv);
+    fill_volume(&cv, o->channel_map.channels);
+
     pa_operation_unref(pa_context_set_source_output_volume(c, source_output_idx, &cv, simple_callback, NULL));
 }
 
@@ -1015,6 +1043,7 @@ static void set_sink_formats(pa_context *c, uint32_t sink, const char *str) {
     char *format = NULL;
     const char *state = NULL;
     int i = 0;
+    pa_operation *o = NULL;
 
     while ((format = pa_split(str, ";", &state))) {
         pa_format_info *f = pa_format_info_from_string(pa_strip(format));
@@ -1028,7 +1057,11 @@ static void set_sink_formats(pa_context *c, uint32_t sink, const char *str) {
         pa_xfree(format);
     }
 
-    pa_operation_unref(pa_ext_device_restore_save_formats(c, PA_DEVICE_TYPE_SINK, sink, i, f_arr, simple_callback, NULL));
+    o = pa_ext_device_restore_save_formats(c, PA_DEVICE_TYPE_SINK, sink, i, f_arr, simple_callback, NULL);
+    if (o) {
+        pa_operation_unref(o);
+        actions++;
+    }
 
 done:
     if (format)
@@ -1137,7 +1170,7 @@ static const char *subscription_event_facility_to_string(pa_subscription_event_t
         return _("server");
 
     case PA_SUBSCRIPTION_EVENT_CARD:
-        return _("server");
+        return _("card");
     }
 
     return _("unknown");
@@ -1154,7 +1187,10 @@ static void context_subscribe_callback(pa_context *c, pa_subscription_event_type
 }
 
 static void context_state_callback(pa_context *c, void *userdata) {
+    pa_operation *o = NULL;
+
     pa_assert(c);
+
     switch (pa_context_get_state(c)) {
         case PA_CONTEXT_CONNECTING:
         case PA_CONTEXT_AUTHORIZING:
@@ -1164,21 +1200,19 @@ static void context_state_callback(pa_context *c, void *userdata) {
         case PA_CONTEXT_READY:
             switch (action) {
                 case STAT:
-                    pa_operation_unref(pa_context_stat(c, stat_callback, NULL));
-                    if (short_list_format)
-                        break;
-                    actions++;
+                    o = pa_context_stat(c, stat_callback, NULL);
+                    break;
 
                 case INFO:
-                    pa_operation_unref(pa_context_get_server_info(c, get_server_info_callback, NULL));
+                    o = pa_context_get_server_info(c, get_server_info_callback, NULL);
                     break;
 
                 case PLAY_SAMPLE:
-                    pa_operation_unref(pa_context_play_sample(c, sample_name, sink_name, PA_VOLUME_NORM, simple_callback, NULL));
+                    o = pa_context_play_sample(c, sample_name, sink_name, PA_VOLUME_NORM, simple_callback, NULL);
                     break;
 
                 case REMOVE_SAMPLE:
-                    pa_operation_unref(pa_context_remove_sample(c, sample_name, simple_callback, NULL));
+                    o = pa_context_remove_sample(c, sample_name, simple_callback, NULL);
                     break;
 
                 case UPLOAD_SAMPLE:
@@ -1188,164 +1222,180 @@ static void context_state_callback(pa_context *c, void *userdata) {
                     pa_stream_set_state_callback(sample_stream, stream_state_callback, NULL);
                     pa_stream_set_write_callback(sample_stream, stream_write_callback, NULL);
                     pa_stream_connect_upload(sample_stream, sample_length);
+                    actions++;
                     break;
 
                 case EXIT:
-                    pa_operation_unref(pa_context_exit_daemon(c, simple_callback, NULL));
+                    o = pa_context_exit_daemon(c, simple_callback, NULL);
                     break;
 
                 case LIST:
                     if (list_type) {
                         if (pa_streq(list_type, "modules"))
-                            pa_operation_unref(pa_context_get_module_info_list(c, get_module_info_callback, NULL));
+                            o = pa_context_get_module_info_list(c, get_module_info_callback, NULL);
                         else if (pa_streq(list_type, "sinks"))
-                            pa_operation_unref(pa_context_get_sink_info_list(c, get_sink_info_callback, NULL));
+                            o = pa_context_get_sink_info_list(c, get_sink_info_callback, NULL);
                         else if (pa_streq(list_type, "sources"))
-                            pa_operation_unref(pa_context_get_source_info_list(c, get_source_info_callback, NULL));
+                            o = pa_context_get_source_info_list(c, get_source_info_callback, NULL);
                         else if (pa_streq(list_type, "sink-inputs"))
-                            pa_operation_unref(pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL));
+                            o = pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL);
                         else if (pa_streq(list_type, "source-outputs"))
-                            pa_operation_unref(pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL));
+                            o = pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL);
                         else if (pa_streq(list_type, "clients"))
-                            pa_operation_unref(pa_context_get_client_info_list(c, get_client_info_callback, NULL));
+                            o = pa_context_get_client_info_list(c, get_client_info_callback, NULL);
                         else if (pa_streq(list_type, "samples"))
-                            pa_operation_unref(pa_context_get_sample_info_list(c, get_sample_info_callback, NULL));
+                            o = pa_context_get_sample_info_list(c, get_sample_info_callback, NULL);
                         else if (pa_streq(list_type, "cards"))
-                            pa_operation_unref(pa_context_get_card_info_list(c, get_card_info_callback, NULL));
+                            o = pa_context_get_card_info_list(c, get_card_info_callback, NULL);
                         else
                             pa_assert_not_reached();
                     } else {
-                        actions = 8;
-                        pa_operation_unref(pa_context_get_module_info_list(c, get_module_info_callback, NULL));
-                        pa_operation_unref(pa_context_get_sink_info_list(c, get_sink_info_callback, NULL));
-                        pa_operation_unref(pa_context_get_source_info_list(c, get_source_info_callback, NULL));
-                        pa_operation_unref(pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL));
-                        pa_operation_unref(pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL));
-                        pa_operation_unref(pa_context_get_client_info_list(c, get_client_info_callback, NULL));
-                        pa_operation_unref(pa_context_get_sample_info_list(c, get_sample_info_callback, NULL));
-                        pa_operation_unref(pa_context_get_card_info_list(c, get_card_info_callback, NULL));
+                        o = pa_context_get_module_info_list(c, get_module_info_callback, NULL);
+                        if (o) {
+                            pa_operation_unref(o);
+                            actions++;
+                        }
+
+                        o = pa_context_get_sink_info_list(c, get_sink_info_callback, NULL);
+                        if (o) {
+                            pa_operation_unref(o);
+                            actions++;
+                        }
+
+                        o = pa_context_get_source_info_list(c, get_source_info_callback, NULL);
+                        if (o) {
+                            pa_operation_unref(o);
+                            actions++;
+                        }
+                        o = pa_context_get_sink_input_info_list(c, get_sink_input_info_callback, NULL);
+                        if (o) {
+                            pa_operation_unref(o);
+                            actions++;
+                        }
+
+                        o = pa_context_get_source_output_info_list(c, get_source_output_info_callback, NULL);
+                        if (o) {
+                            pa_operation_unref(o);
+                            actions++;
+                        }
+
+                        o = pa_context_get_client_info_list(c, get_client_info_callback, NULL);
+                        if (o) {
+                            pa_operation_unref(o);
+                            actions++;
+                        }
+
+                        o = pa_context_get_sample_info_list(c, get_sample_info_callback, NULL);
+                        if (o) {
+                            pa_operation_unref(o);
+                            actions++;
+                        }
+
+                        o = pa_context_get_card_info_list(c, get_card_info_callback, NULL);
+                        if (o) {
+                            pa_operation_unref(o);
+                            actions++;
+                        }
+
+                        o = NULL;
                     }
                     break;
 
                 case MOVE_SINK_INPUT:
-                    pa_operation_unref(pa_context_move_sink_input_by_name(c, sink_input_idx, sink_name, simple_callback, NULL));
+                    o = pa_context_move_sink_input_by_name(c, sink_input_idx, sink_name, simple_callback, NULL);
                     break;
 
                 case MOVE_SOURCE_OUTPUT:
-                    pa_operation_unref(pa_context_move_source_output_by_name(c, source_output_idx, source_name, simple_callback, NULL));
+                    o = pa_context_move_source_output_by_name(c, source_output_idx, source_name, simple_callback, NULL);
                     break;
 
                 case LOAD_MODULE:
-                    pa_operation_unref(pa_context_load_module(c, module_name, module_args, index_callback, NULL));
+                    o = pa_context_load_module(c, module_name, module_args, index_callback, NULL);
                     break;
 
                 case UNLOAD_MODULE:
                     if (module_name)
-                        pa_operation_unref(pa_context_get_module_info_list(c, unload_module_by_name_callback, NULL));
+                        o = pa_context_get_module_info_list(c, unload_module_by_name_callback, NULL);
                     else
-                        pa_operation_unref(pa_context_unload_module(c, module_index, simple_callback, NULL));
+                        o = pa_context_unload_module(c, module_index, simple_callback, NULL);
                     break;
 
                 case SUSPEND_SINK:
                     if (sink_name)
-                        pa_operation_unref(pa_context_suspend_sink_by_name(c, sink_name, suspend, simple_callback, NULL));
+                        o = pa_context_suspend_sink_by_name(c, sink_name, suspend, simple_callback, NULL);
                     else
-                        pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL));
+                        o = pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL);
                     break;
 
                 case SUSPEND_SOURCE:
                     if (source_name)
-                        pa_operation_unref(pa_context_suspend_source_by_name(c, source_name, suspend, simple_callback, NULL));
+                        o = pa_context_suspend_source_by_name(c, source_name, suspend, simple_callback, NULL);
                     else
-                        pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL));
+                        o = pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL);
                     break;
 
                 case SET_CARD_PROFILE:
-                    pa_operation_unref(pa_context_set_card_profile_by_name(c, card_name, profile_name, simple_callback, NULL));
+                    o = pa_context_set_card_profile_by_name(c, card_name, profile_name, simple_callback, NULL);
                     break;
 
                 case SET_SINK_PORT:
-                    pa_operation_unref(pa_context_set_sink_port_by_name(c, sink_name, port_name, simple_callback, NULL));
+                    o = pa_context_set_sink_port_by_name(c, sink_name, port_name, simple_callback, NULL);
                     break;
 
                 case SET_DEFAULT_SINK:
-                    pa_operation_unref(pa_context_set_default_sink(c, sink_name, simple_callback, NULL));
+                    o = pa_context_set_default_sink(c, sink_name, simple_callback, NULL);
                     break;
 
                 case SET_SOURCE_PORT:
-                    pa_operation_unref(pa_context_set_source_port_by_name(c, source_name, port_name, simple_callback, NULL));
+                    o = pa_context_set_source_port_by_name(c, source_name, port_name, simple_callback, NULL);
                     break;
 
                 case SET_DEFAULT_SOURCE:
-                    pa_operation_unref(pa_context_set_default_source(c, source_name, simple_callback, NULL));
+                    o = pa_context_set_default_source(c, source_name, simple_callback, NULL);
                     break;
 
                 case SET_SINK_MUTE:
                     if (mute == TOGGLE_MUTE)
-                        pa_operation_unref(pa_context_get_sink_info_by_name(c, sink_name, sink_toggle_mute_callback, NULL));
+                        o = pa_context_get_sink_info_by_name(c, sink_name, sink_toggle_mute_callback, NULL);
                     else
-                        pa_operation_unref(pa_context_set_sink_mute_by_name(c, sink_name, mute, simple_callback, NULL));
+                        o = pa_context_set_sink_mute_by_name(c, sink_name, mute, simple_callback, NULL);
                     break;
 
                 case SET_SOURCE_MUTE:
                     if (mute == TOGGLE_MUTE)
-                        pa_operation_unref(pa_context_get_source_info_by_name(c, source_name, source_toggle_mute_callback, NULL));
+                        o = pa_context_get_source_info_by_name(c, source_name, source_toggle_mute_callback, NULL);
                     else
-                        pa_operation_unref(pa_context_set_source_mute_by_name(c, source_name, mute, simple_callback, NULL));
+                        o = pa_context_set_source_mute_by_name(c, source_name, mute, simple_callback, NULL);
                     break;
 
                 case SET_SINK_INPUT_MUTE:
                     if (mute == TOGGLE_MUTE)
-                        pa_operation_unref(pa_context_get_sink_input_info(c, sink_input_idx, sink_input_toggle_mute_callback, NULL));
+                        o = pa_context_get_sink_input_info(c, sink_input_idx, sink_input_toggle_mute_callback, NULL);
                     else
-                        pa_operation_unref(pa_context_set_sink_input_mute(c, sink_input_idx, mute, simple_callback, NULL));
+                        o = pa_context_set_sink_input_mute(c, sink_input_idx, mute, simple_callback, NULL);
                     break;
 
                 case SET_SOURCE_OUTPUT_MUTE:
                     if (mute == TOGGLE_MUTE)
-                        pa_operation_unref(pa_context_get_source_output_info(c, source_output_idx, source_output_toggle_mute_callback, NULL));
+                        o = pa_context_get_source_output_info(c, source_output_idx, source_output_toggle_mute_callback, NULL);
                     else
-                        pa_operation_unref(pa_context_set_source_output_mute(c, source_output_idx, mute, simple_callback, NULL));
+                        o = pa_context_set_source_output_mute(c, source_output_idx, mute, simple_callback, NULL);
                     break;
 
                 case SET_SINK_VOLUME:
-                    if ((volume_flags & VOL_RELATIVE) == VOL_RELATIVE) {
-                        pa_operation_unref(pa_context_get_sink_info_by_name(c, sink_name, get_sink_volume_callback, NULL));
-                    } else {
-                        pa_cvolume v;
-                        pa_cvolume_set(&v, 1, volume);
-                        pa_operation_unref(pa_context_set_sink_volume_by_name(c, sink_name, &v, simple_callback, NULL));
-                    }
+                    o = pa_context_get_sink_info_by_name(c, sink_name, get_sink_volume_callback, NULL);
                     break;
 
                 case SET_SOURCE_VOLUME:
-                    if ((volume_flags & VOL_RELATIVE) == VOL_RELATIVE) {
-                        pa_operation_unref(pa_context_get_source_info_by_name(c, source_name, get_source_volume_callback, NULL));
-                    } else {
-                        pa_cvolume v;
-                        pa_cvolume_set(&v, 1, volume);
-                        pa_operation_unref(pa_context_set_source_volume_by_name(c, source_name, &v, simple_callback, NULL));
-                    }
+                    o = pa_context_get_source_info_by_name(c, source_name, get_source_volume_callback, NULL);
                     break;
 
                 case SET_SINK_INPUT_VOLUME:
-                    if ((volume_flags & VOL_RELATIVE) == VOL_RELATIVE) {
-                        pa_operation_unref(pa_context_get_sink_input_info(c, sink_input_idx, get_sink_input_volume_callback, NULL));
-                    } else {
-                        pa_cvolume v;
-                        pa_cvolume_set(&v, 1, volume);
-                        pa_operation_unref(pa_context_set_sink_input_volume(c, sink_input_idx, &v, simple_callback, NULL));
-                    }
+                    o = pa_context_get_sink_input_info(c, sink_input_idx, get_sink_input_volume_callback, NULL);
                     break;
 
                 case SET_SOURCE_OUTPUT_VOLUME:
-                    if ((volume_flags & VOL_RELATIVE) == VOL_RELATIVE) {
-                        pa_operation_unref(pa_context_get_source_output_info(c, source_output_idx, get_source_output_volume_callback, NULL));
-                    } else {
-                        pa_cvolume v;
-                        pa_cvolume_set(&v, 1, volume);
-                        pa_operation_unref(pa_context_set_source_output_volume(c, source_output_idx, &v, simple_callback, NULL));
-                    }
+                    o = pa_context_get_source_output_info(c, source_output_idx, get_source_output_volume_callback, NULL);
                     break;
 
                 case SET_SINK_FORMATS:
@@ -1353,30 +1403,40 @@ static void context_state_callback(pa_context *c, void *userdata) {
                     break;
 
                 case SET_PORT_LATENCY_OFFSET:
-                    pa_operation_unref(pa_context_set_port_latency_offset(c, card_name, port_name, latency_offset, simple_callback, NULL));
+                    o = pa_context_set_port_latency_offset(c, card_name, port_name, latency_offset, simple_callback, NULL);
                     break;
 
                 case SUBSCRIBE:
                     pa_context_set_subscribe_callback(c, context_subscribe_callback, NULL);
 
-                    pa_operation_unref(pa_context_subscribe(
-                                              c,
-                                              PA_SUBSCRIPTION_MASK_SINK|
-                                              PA_SUBSCRIPTION_MASK_SOURCE|
-                                              PA_SUBSCRIPTION_MASK_SINK_INPUT|
-                                              PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT|
-                                              PA_SUBSCRIPTION_MASK_MODULE|
-                                              PA_SUBSCRIPTION_MASK_CLIENT|
-                                              PA_SUBSCRIPTION_MASK_SAMPLE_CACHE|
-                                              PA_SUBSCRIPTION_MASK_SERVER|
-                                              PA_SUBSCRIPTION_MASK_CARD,
-                                              NULL,
-                                              NULL));
+                    o = pa_context_subscribe(c,
+                                             PA_SUBSCRIPTION_MASK_SINK|
+                                             PA_SUBSCRIPTION_MASK_SOURCE|
+                                             PA_SUBSCRIPTION_MASK_SINK_INPUT|
+                                             PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT|
+                                             PA_SUBSCRIPTION_MASK_MODULE|
+                                             PA_SUBSCRIPTION_MASK_CLIENT|
+                                             PA_SUBSCRIPTION_MASK_SAMPLE_CACHE|
+                                             PA_SUBSCRIPTION_MASK_SERVER|
+                                             PA_SUBSCRIPTION_MASK_CARD,
+                                             NULL,
+                                             NULL);
                     break;
 
                 default:
                     pa_assert_not_reached();
             }
+
+            if (o) {
+                pa_operation_unref(o);
+                actions++;
+            }
+
+            if (actions == 0) {
+                pa_log("Operation failed: %s", pa_strerror(pa_context_errno(c)));
+                quit(1);
+            }
+
             break;
 
         case PA_CONTEXT_TERMINATED:
@@ -1425,7 +1485,7 @@ static int parse_volume(const char *vol_spec, pa_volume_t *vol, enum volume_flag
 
     pa_xfree(vs);
 
-    if ((*vol_flags & VOL_RELATIVE) == VOL_RELATIVE) {
+    if (*vol_flags & VOL_RELATIVE) {
         if ((*vol_flags & 0x0F) == VOL_UINT)
             v += (double) PA_VOLUME_NORM;
         if ((*vol_flags & 0x0F) == VOL_PERCENT)
@@ -1450,6 +1510,31 @@ static int parse_volume(const char *vol_spec, pa_volume_t *vol, enum volume_flag
     return 0;
 }
 
+static int parse_volumes(char *args[], unsigned n) {
+    unsigned i;
+
+    if (n >= PA_CHANNELS_MAX) {
+        pa_log(_("Invalid number of volume specifications.\n"));
+        return -1;
+    }
+
+    volume.channels = n;
+    for (i = 0; i < volume.channels; i++) {
+        enum volume_flags flags;
+
+        if (parse_volume(args[i], &volume.values[i], &flags) < 0)
+            return -1;
+
+        if (i > 0 && flags != volume_flags) {
+            pa_log(_("Inconsistent volume specification.\n"));
+            return -1;
+        } else
+            volume_flags = flags;
+    }
+
+    return 0;
+}
+
 static enum mute_flags parse_mute(const char *mute_text) {
     int b;
 
@@ -1471,7 +1556,7 @@ static enum mute_flags parse_mute(const char *mute_text) {
 
 static void help(const char *argv0) {
 
-    printf("%s %s %s\n",    argv0, _("[options]"), "stat [short]");
+    printf("%s %s %s\n",    argv0, _("[options]"), "stat");
     printf("%s %s %s\n",    argv0, _("[options]"), "info");
     printf("%s %s %s %s\n", argv0, _("[options]"), "list [short]", _("[TYPE]"));
     printf("%s %s %s\n",    argv0, _("[options]"), "exit");
@@ -1485,8 +1570,8 @@ static void help(const char *argv0) {
     printf("%s %s %s %s\n", argv0, _("[options]"), "set-card-profile ", _("CARD PROFILE"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "set-default-(sink|source)", _("NAME"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink|source)-port", _("NAME|#N PORT"));
-    printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink|source)-volume", _("NAME|#N VOLUME"));
-    printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink-input|source-output)-volume", _("#N VOLUME"));
+    printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink|source)-volume", _("NAME|#N VOLUME [VOLUME ...]"));
+    printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink-input|source-output)-volume", _("#N VOLUME [VOLUME ...]"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink|source)-mute", _("NAME|#N 1|0|toggle"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "set-(sink-input|source-output)-mute", _("#N 1|0|toggle"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "set-sink-formats", _("#N FORMATS"));
@@ -1528,7 +1613,7 @@ int main(int argc, char *argv[]) {
 
     proplist = pa_proplist_new();
 
-    while ((c = getopt_long(argc, argv, "s:n:h", long_options, NULL)) != -1) {
+    while ((c = getopt_long(argc, argv, "+s:n:h", long_options, NULL)) != -1) {
         switch (c) {
             case 'h' :
                 help(bn);
@@ -1573,9 +1658,6 @@ int main(int argc, char *argv[]) {
     if (optind < argc) {
         if (pa_streq(argv[optind], "stat")) {
             action = STAT;
-            short_list_format = false;
-            if (optind+1 < argc && pa_streq(argv[optind+1], "short"))
-                short_list_format = true;
 
         } else if (pa_streq(argv[optind], "info"))
             action = INFO;
@@ -1808,33 +1890,33 @@ int main(int argc, char *argv[]) {
         } else if (pa_streq(argv[optind], "set-sink-volume")) {
             action = SET_SINK_VOLUME;
 
-            if (argc != optind+3) {
+            if (argc < optind+3) {
                 pa_log(_("You have to specify a sink name/index and a volume"));
                 goto quit;
             }
 
             sink_name = pa_xstrdup(argv[optind+1]);
 
-            if (parse_volume(argv[optind+2], &volume, &volume_flags) < 0)
+            if (parse_volumes(argv+optind+2, argc-3) < 0)
                 goto quit;
 
         } else if (pa_streq(argv[optind], "set-source-volume")) {
             action = SET_SOURCE_VOLUME;
 
-            if (argc != optind+3) {
+            if (argc < optind+3) {
                 pa_log(_("You have to specify a source name/index and a volume"));
                 goto quit;
             }
 
             source_name = pa_xstrdup(argv[optind+1]);
 
-            if (parse_volume(argv[optind+2], &volume, &volume_flags) < 0)
+            if (parse_volumes(argv+optind+2, argc-3) < 0)
                 goto quit;
 
         } else if (pa_streq(argv[optind], "set-sink-input-volume")) {
             action = SET_SINK_INPUT_VOLUME;
 
-            if (argc != optind+3) {
+            if (argc < optind+3) {
                 pa_log(_("You have to specify a sink input index and a volume"));
                 goto quit;
             }
@@ -1844,13 +1926,13 @@ int main(int argc, char *argv[]) {
                 goto quit;
             }
 
-            if (parse_volume(argv[optind+2], &volume, &volume_flags) < 0)
+            if (parse_volumes(argv+optind+2, argc-3) < 0)
                 goto quit;
 
         } else if (pa_streq(argv[optind], "set-source-output-volume")) {
             action = SET_SOURCE_OUTPUT_VOLUME;
 
-            if (argc != optind+3) {
+            if (argc < optind+3) {
                 pa_log(_("You have to specify a source output index and a volume"));
                 goto quit;
             }
@@ -1860,7 +1942,7 @@ int main(int argc, char *argv[]) {
                 goto quit;
             }
 
-            if (parse_volume(argv[optind+2], &volume, &volume_flags) < 0)
+            if (parse_volumes(argv+optind+2, argc-3) < 0)
                 goto quit;
 
         } else if (pa_streq(argv[optind], "set-sink-mute")) {
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index abb2312..86336d0 100644
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -152,15 +152,7 @@ int main(int argc, char *argv[]) {
             char hx[PA_NATIVE_COOKIE_LENGTH*2+1];
             assert(conf);
 
-            if (pa_client_conf_load(conf, NULL) < 0) {
-                fprintf(stderr, _("Failed to load client configuration file.\n"));
-                goto finish;
-            }
-
-            if (pa_client_conf_env(conf) < 0) {
-                fprintf(stderr, _("Failed to read environment configuration data.\n"));
-                goto finish;
-            }
+            pa_client_conf_load(conf, false, true);
 
             pa_x11_del_prop(xcb, screen, "PULSE_SERVER");
             pa_x11_del_prop(xcb, screen, "PULSE_SINK");
@@ -194,7 +186,7 @@ int main(int argc, char *argv[]) {
 
             pa_client_conf_free(conf);
 
-            if (pa_authkey_load_auto(cookie_file, true, cookie, sizeof(cookie)) < 0) {
+            if (pa_authkey_load(cookie_file, true, cookie, sizeof(cookie)) < 0) {
                 fprintf(stderr, _("Failed to load cookie data\n"));
                 goto finish;
             }
diff --git a/vala/libpulse-simple.deps b/vala/libpulse-simple.deps
new file mode 100644
index 0000000..f90ee89
--- /dev/null
+++ b/vala/libpulse-simple.deps
@@ -0,0 +1 @@
+libpulse-simple
diff --git a/vala/libpulse-simple.vapi b/vala/libpulse-simple.vapi
new file mode 100644
index 0000000..11b6e0f
--- /dev/null
+++ b/vala/libpulse-simple.vapi
@@ -0,0 +1,36 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2012 Alexander Kurtz <kurtz.alex at googlemail.com>
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+namespace PulseAudio {
+        [Compact]
+        [CCode (cheader_filename="pulse/simple.h", cname="pa_simple", cprefix="pa_simple_")]
+        class Simple {
+                public Simple(string? server = null, string? name = null, Stream.Direction dir = Stream.Direction.PLAYBACK,
+                              string? dev = null, string stream_name = "",
+                              SampleSpec ss = SampleSpec(){ format = SampleFormat.S16NE, rate = 44100, channels = 2 },
+                              ChannelMap? map = null, Stream.BufferAttr? attr = null, out int error = null);
+                public int write(void* data, size_t bytes, out int error = null);
+                public int drain(out int error = null);
+                public int read(void* data, size_t bytes, out int error = null);
+                public usec get_latency(out int error = null);
+                public int flush(out int error = null);
+        }
+}
diff --git a/vala/libpulse.vapi b/vala/libpulse.vapi
index eb8dfa1..ea66c41 100644
--- a/vala/libpulse.vapi
+++ b/vala/libpulse.vapi
@@ -1376,6 +1376,9 @@ namespace PulseAudio {
                 public string driver;
                 public int mute;
                 public Proplist proplist;
+                public int corked;
+                public int has_volume;
+                public int volume_writable;
         }
 
         [CCode (cname="pa_source_output_info", has_type_id=false)]
@@ -1392,6 +1395,11 @@ namespace PulseAudio {
                 public string resample_method;
                 public string driver;
                 public Proplist proplist;
+                public int corked;
+                public CVolume volume;
+                public int mute;
+                public int has_volume;
+                public int volume_writable;
         }
 
         [CCode (cname="pa_stat_info", has_type_id=false)]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git


From themuso-guest at moszumanska.debian.org  Sun Nov 30 22:48:39 2014
From: themuso-guest at moszumanska.debian.org (Luke Yelavich)
Date: Sun, 30 Nov 2014 22:48:39 -0000
Subject: [pulseaudio] 05/19: Dropped patches,
 either applied upstream or are now obsolete:
In-Reply-To: <20141130224835.19450.82988@moszumanska.debian.org>
References: <20141130224835.19450.82988@moszumanska.debian.org>
Message-ID: <E1XvDIE-00058E-SJ@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 1881bb94d8fc5a9975318ccd0e3b36c17e446756
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 25 10:00:47 2014 +1100

    Dropped patches, either applied upstream or are now obsolete:
---
 debian/changelog                                   |  17 +
 ...use-incompatible-default-sample-spec-para.patch |  41 ---
 ...se-the-fixed-point-speex-resampler-on-ARM.patch |  70 ----
 debian/patches/0003-exit-with-X-session.patch      |  55 ----
 .../0004-dont-start-when-already-running.patch     |  30 --
 debian/patches/broken-PA_FLOAT32_SWAP.patch        | 320 ------------------
 ...ndianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch |  27 --
 .../kfreebsd_no_lock_and_threads_synchro.patch     |  29 --
 debian/patches/misc-cleanups-and-bug-fixes.patch   | 118 -------
 ...Fix-mixing-of-S24-samples-stored-as-S32RE.patch |  37 ---
 debian/patches/only-autostart-kde-version.patch    |  12 -
 ...x-crash-on-empty-UDP-packets-CVE-2014-397.patch |  57 ----
 debian/patches/series                              |  16 -
 debian/patches/tests-Cleanup-mix-test.patch        |  41 ---
 .../tests-Fix-mix-test-on-big-endian-systems.patch | 364 ---------------------
 ...Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch |  38 ---
 ...finding-out-application-name-using-dladdr.patch |  78 -----
 ...ion-Fix-completion-for-default-sink-sourc.patch |  22 --
 18 files changed, 17 insertions(+), 1355 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d10dd5..cab46ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,23 @@
 pulseaudio (5.99.1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
+  * Dropped patches, either applied upstream or are now obsolete:
+    - 0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
+    - 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
+    - 0003-exit-with-X-session.patch
+    - 0004-dont-start-when-already-running.patch
+    - broken-PA_FLOAT32_SWAP.patch
+    - endianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch
+    - kfreebsd_no_lock_and_threads_synchro.patch
+    - misc-cleanups-and-bug-fixes.patch
+    - mix-Fix-mixing-of-S24-samples-stored-as-S32RE.patch
+    - only-autostart-kde-version.patch
+    - rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch
+    - tests-Cleanup-mix-test.patch
+    - tests-Fix-mix-test-on-big-endian-systems.patch
+    - util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch
+    - util-Try-finding-out-application-name-using-dladdr.patch
+    - zsh-completion-Fix-completion-for-default-sink-sourc.patch
 
  -- Luke Yelavich <themuso at ubuntu.com>  Tue, 25 Nov 2014 09:39:16 +1100
 
diff --git a/debian/patches/0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch b/debian/patches/0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
deleted file mode 100644
index a58b2e3..0000000
--- a/debian/patches/0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b1c4e7bf6bae405999d3247c332a71be6b130496 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
-Date: Tue, 19 Aug 2014 14:08:34 +0300
-Subject: [PATCH] raop: Don't use incompatible default sample spec parameters
-
-Since the RAOP sink supports only some formats and channel counts, we
-shouldn't blindly use pa_core.default_sample_spec. This patch changes
-things so that we default to PA_SAMPLE_S16NE and 2 channels, and only
-take the sample rate from pa_core.default_sample_spec.
----
- src/modules/raop/module-raop-sink.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c
-index 2d08645..13036d9 100644
---- a/src/modules/raop/module-raop-sink.c
-+++ b/src/modules/raop/module-raop-sink.c
-@@ -518,15 +518,17 @@ int pa__init(pa_module*m) {
-         goto fail;
-     }
- 
--    ss = m->core->default_sample_spec;
-+    ss.format = PA_SAMPLE_S16NE;
-+    ss.channels = 2;
-+    ss.rate = m->core->default_sample_spec.rate;
-     if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
-         pa_log("invalid sample format specification");
-         goto fail;
-     }
- 
--    if ((/*ss.format != PA_SAMPLE_U8 &&*/ ss.format != PA_SAMPLE_S16NE) ||
-+    if ((ss.format != PA_SAMPLE_S16NE) ||
-         (ss.channels > 2)) {
--        pa_log("sample type support is limited to mono/stereo and U8 or S16NE sample data");
-+        pa_log("sample type support is limited to mono/stereo and S16NE sample data");
-         goto fail;
-     }
- 
--- 
-2.1.0
-
diff --git a/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch b/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
deleted file mode 100644
index 5749bcb..0000000
--- a/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 00fbfcc27ffa179eb88c8a9627c1e928b0593d0e Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sun, 25 Nov 2012 21:46:38 +0100
-Subject: [PATCH 2/2] Use the fixed point speex resampler on ARM
-
-Switch to use the speex fixed point resampler method by default on ARM.
-Traditionately there wasn't any standard floating point hardware, so for
-those machines it's an obvious choise. On machine using the hardfloat
-ABI floating point still isn't an obvious win over integer performance,
-it's of equal performance on some machines, but slower on others.
----
- man/pulse-daemon.conf.5.xml.in |    2 ++
- src/daemon/daemon.conf.in      |    2 ++
- src/pulsecore/core.c           |    4 ++++
- src/pulsecore/resampler.c      |    4 ++++
- 4 files changed, 12 insertions(+)
-
---- a/man/pulse-daemon.conf.5.xml.in
-+++ b/man/pulse-daemon.conf.5.xml.in
-@@ -101,6 +101,8 @@
-       also offers slightly better quality. See the output of
-       <opt>dump-resample-methods</opt> for a complete list of all
-       available resamplers. Defaults to <opt>speex-float-1</opt>. The
-+      available resamplers. Defaults to <opt>speex-float-1</opt> on most
-+      achitectures and <opt>speex-fixed-1</opt> on ARM. The
-       <opt>--resample-method</opt> command line option takes precedence.
-       Note that some modules overwrite or allow overwriting of the
-       resampler to use.</p>
---- a/src/daemon/daemon.conf.in
-+++ b/src/daemon/daemon.conf.in
-@@ -54,6 +54,8 @@
- ; log-time = no
- ; log-backtrace = 0
- 
-+# resample-method defaults to  speex-float-1 on most architectures,
-+# speex-fixed-1 on ARM
- ; resample-method = speex-float-1
- ; enable-remixing = yes
- ; enable-lfe-remixing = no
---- a/src/pulsecore/core.c
-+++ b/src/pulsecore/core.c
-@@ -141,7 +141,11 @@
-     c->disable_remixing = false;
-     c->disable_lfe_remixing = false;
-     c->deferred_volume = true;
--    c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
-+#ifdef __arm__
-+    c->resample_method = PA_RESAMPLER_SPEEX_FIXED_BASE + 1;
-+#else
-+   c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
-+#endif
- 
-     for (j = 0; j < PA_CORE_HOOK_MAX; j++)
-         pa_hook_init(&c->hooks[j], c);
---- a/src/pulsecore/resampler.c
-+++ b/src/pulsecore/resampler.c
-@@ -187,8 +187,13 @@
- static pa_resample_method_t choose_auto_resampler(pa_resample_flags_t flags) {
-     pa_resample_method_t method;
- 
-+#  ifdef __arm__
-+    if (pa_resample_method_supported(PA_RESAMPLER_SPEEX_FIXED_BASE + 1))
-+        method = PA_RESAMPLER_SPEEX_FIXED_BASE + 1;
-+#else
-     if (pa_resample_method_supported(PA_RESAMPLER_SPEEX_FLOAT_BASE + 1))
-         method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
-+#endif
-     else if (flags & PA_RESAMPLER_VARIABLE_RATE)
-         method = PA_RESAMPLER_TRIVIAL;
-     else
diff --git a/debian/patches/0003-exit-with-X-session.patch b/debian/patches/0003-exit-with-X-session.patch
deleted file mode 100644
index a77d34e..0000000
--- a/debian/patches/0003-exit-with-X-session.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: start-pulseaudio-*: Kill pulseaudio daemon when x session ends
-Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=77497
-Author: Alexander Kurtz <kurtz.alex at googlemail.com>
---- a/src/daemon/start-pulseaudio-x11.in
-+++ b/src/daemon/start-pulseaudio-x11.in
-@@ -19,6 +19,13 @@
- 
- set -e
- 
-+# check if pulseaudio has already been started by someone else
-+if /usr/bin/pulseaudio --check; then
-+       EXIT_WITH_X_SESSION=no
-+else
-+       EXIT_WITH_X_SESSION=yes
-+fi
-+
- @PA_BINARY@ --start "$@"
- 
- if [ x"$DISPLAY" != x ] ; then
-@@ -30,3 +37,9 @@ if [ x"$DISPLAY" != x ] ; then
- 	@PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null
-     fi
- fi
-+
-+# fork and wait for X-session to end, then quit pulseaudio
-+if [ "$EXIT_WITH_X_SESSION" = yes ]; then
-+	/usr/bin/xprop -root -spy > /dev/null 2>&1 || true
-+	/usr/bin/pulseaudio --kill
-+fi &
---- a/src/daemon/start-pulseaudio-kde.in
-+++ b/src/daemon/start-pulseaudio-kde.in
-@@ -21,6 +21,13 @@ set -e
- 
- [ -z "$PULSE_SERVER" ]
- 
-+# check if pulseaudio has already been started by someone else
-+if /usr/bin/pulseaudio --check; then
-+    EXIT_WITH_X_SESSION=no
-+else
-+    EXIT_WITH_X_SESSION=yes
-+fi
-+
- @PA_BINARY@ --start "$@"
- 
- if [ x"$DISPLAY" != x ] ; then
-@@ -28,3 +35,9 @@ if [ x"$DISPLAY" != x ] ; then
-     @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
- 
- fi
-+
-+# fork and wait for X-session to end, then quit pulseaudio
-+if [ "$EXIT_WITH_X_SESSION" = yes ]; then
-+    /usr/bin/xprop -root -spy > /dev/null 2>&1 || true
-+    /usr/bin/pulseaudio --kill
-+fi &
diff --git a/debian/patches/0004-dont-start-when-already-running.patch b/debian/patches/0004-dont-start-when-already-running.patch
deleted file mode 100644
index 948837a..0000000
--- a/debian/patches/0004-dont-start-when-already-running.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Do not start pulseaudio if it is already running
-Origin: https://bbs.archlinux.org/viewtopic.php?pid=1164699#p1164699
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743813
-Forwarded: http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-April/020381.html
---- a/src/daemon/start-pulseaudio-kde.in
-+++ b/src/daemon/start-pulseaudio-kde.in
-@@ -26,9 +26,9 @@ if /usr/bin/pulseaudio --check; then
-     EXIT_WITH_X_SESSION=no
- else
-     EXIT_WITH_X_SESSION=yes
-+    @PA_BINARY@ --start "$@"
- fi
- 
-- at PA_BINARY@ --start "$@"
- 
- if [ x"$DISPLAY" != x ] ; then
- 
---- a/src/daemon/start-pulseaudio-x11.in
-+++ b/src/daemon/start-pulseaudio-x11.in
-@@ -24,9 +24,9 @@ if /usr/bin/pulseaudio --check; then
-        EXIT_WITH_X_SESSION=no
- else
-        EXIT_WITH_X_SESSION=yes
-+       @PA_BINARY@ --start "$@"
- fi
- 
-- at PA_BINARY@ --start "$@"
- 
- if [ x"$DISPLAY" != x ] ; then
- 
diff --git a/debian/patches/broken-PA_FLOAT32_SWAP.patch b/debian/patches/broken-PA_FLOAT32_SWAP.patch
deleted file mode 100644
index f8c0d87..0000000
--- a/debian/patches/broken-PA_FLOAT32_SWAP.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-From: Peter Meerwald <pmeerw at pmeerw.net>
-To: General PulseAudio Discussion <pulseaudio-discuss at lists.freedesktop.org>
-Date: Wed,  3 Sep 2014 02:25:42 +0200
-Message-Id: <1409703942-20509-2-git-send-email-pmeerw at pmeerw.net>
-X-Mailer: git-send-email 1.9.1
-In-Reply-To: <1409703942-20509-1-git-send-email-pmeerw at pmeerw.net>
-References: <1409703942-20509-1-git-send-email-pmeerw at pmeerw.net>
-Subject: [pulseaudio-discuss] [PATCH 2/2] endianmacros: Replace borked
-	PA_FLOAT32_SWAP() with PA_READ_FLOAT32RE() / PA_WRITE_FLOAT32RE()
-X-BeenThere: pulseaudio-discuss at lists.freedesktop.org
-X-Mailman-Version: 2.1.15
-Precedence: list
-Reply-To: General PulseAudio Discussion
- <pulseaudio-discuss at lists.freedesktop.org>
-List-Id: General PulseAudio Discussion
- <pulseaudio-discuss.lists.freedesktop.org>
-List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/pulseaudio-discuss>, 
- <mailto:pulseaudio-discuss-request at lists.freedesktop.org?subject=unsubscribe>
-List-Archive: <http://lists.freedesktop.org/archives/pulseaudio-discuss>
-List-Post: <mailto:pulseaudio-discuss at lists.freedesktop.org>
-List-Help: <mailto:pulseaudio-discuss-request at lists.freedesktop.org?subject=help>
-List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss>, 
- <mailto:pulseaudio-discuss-request at lists.freedesktop.org?subject=subscribe>
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Errors-To: pulseaudio-discuss-bounces at lists.freedesktop.org
-Sender: "pulseaudio-discuss" <pulseaudio-discuss-bounces at lists.freedesktop.org>
-
-From: Peter Meerwald <pmeerw at debian>
-
-building PA with -O0 leads to test failure in mix-test on i386
-
-issue reported by Felipe, see
-http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-August/021406.html
-
-the problem is the value 0xbeffbd7f: when byte-swapped it becomes 0x7fbdffbe and according
-to IEEE-754 represents a signalling NaN (starting with s111 1111 10, see http://en.wikipedia.org/wiki/NaN)
-
-when this value is assigned to a floating point register, it becomes 0x7ffdffbe, representing
-a quiet NaN (starting with s111 1111 11) -- a signalling NaN is turned into a quiet NaN!
-
-so PA_FLOAT32_SWAP(PA_FLOAT32_SWAP(x)) != x for certain values, uhuh!
-
-the following test code can be used; due to volatile, it will always demonstrate the issue;
-without volatile, it depends on the optimization level (i386, 32-bit, gcc 4.9):
-
-// snip
-
-static inline float PA_FLOAT32_SWAP(float x) {
-    union {
-        float f;
-        uint32_t u;
-    } t;
-
-    t.f = x;
-    t.u = bswap_32(t.u);
-    return t.f;
-}
-
-int main() {
-  unsigned x = 0xbeffbd7f;
-  volatile float f = PA_FLOAT32_SWAP(*(float *)&x);
-  printf("%08x %08x %08x %f\n", 0xbeffbd7f, *(unsigned *)&f, bswap_32(*(unsigned *)&f), f);
-}
-// snip
-
-the problem goes away with optimization when no temporary floating point registers are used
-
-the proposed solution is to avoid passing swapped floating point data in a
-float; this is done with new functions PA_READ_FLOAT32RE() and PA_WRITE_FLOAT32RE()
-which use uint32_t to dereference a pointer and byte-swap the data, hence no temporary
-float variable is used
-
-also delete PA_FLOAT32_TO_LE()/_BE(), not used
-
-Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
-Reported-by: Felipe Sateler <fsateler at debian.org>
----
- src/pulsecore/endianmacros.h | 23 ++++++++++++-----------
- src/pulsecore/mix.c          | 11 ++++-------
- src/pulsecore/sample-util.c  |  4 ++--
- src/pulsecore/sconv-s16le.c  | 22 ++++++++--------------
- src/pulsecore/svolume_c.c    |  4 ++--
- src/tests/mix-test.c         |  4 ++--
- src/tests/resampler-test.c   |  4 ++--
- 7 files changed, 32 insertions(+), 40 deletions(-)
-
---- a/src/pulsecore/endianmacros.h
-+++ b/src/pulsecore/endianmacros.h
-@@ -71,25 +71,32 @@ static inline void PA_WRITE24LE(uint8_t
-     p[0] = (uint8_t) u;
- }
- 
--static inline float PA_FLOAT32_SWAP(float x) {
-+static inline float PA_READ_FLOAT32RE(const void *p) {
-     union {
-         float f;
-         uint32_t u;
-     } t;
- 
--    t.f = x;
--    t.u = PA_UINT32_SWAP(t.u);
-+    t.u = PA_UINT32_SWAP(*(uint32_t *) p);
-     return t.f;
- }
- 
-+static inline void PA_WRITE_FLOAT32RE(void *p, float x) {
-+    union {
-+        float f;
-+        uint32_t u;
-+    } t;
-+
-+    t.f = x;
-+    *(uint32_t *) p = PA_UINT32_SWAP(t.u);
-+}
-+
- #define PA_MAYBE_INT16_SWAP(c,x) ((c) ? PA_INT16_SWAP(x) : (x))
- #define PA_MAYBE_UINT16_SWAP(c,x) ((c) ? PA_UINT16_SWAP(x) : (x))
- 
- #define PA_MAYBE_INT32_SWAP(c,x) ((c) ? PA_INT32_SWAP(x) : (x))
- #define PA_MAYBE_UINT32_SWAP(c,x) ((c) ? PA_UINT32_SWAP(x) : (x))
- 
--#define PA_MAYBE_FLOAT32_SWAP(c,x) ((c) ? PA_FLOAT32_SWAP(x) : (x))
--
- #ifdef WORDS_BIGENDIAN
-  #define PA_INT16_FROM_LE(x) PA_INT16_SWAP(x)
-  #define PA_INT16_FROM_BE(x) ((int16_t)(x))
-@@ -115,9 +122,6 @@ static inline float PA_FLOAT32_SWAP(floa
-  #define PA_UINT32_TO_LE(x) PA_UINT32_SWAP(x)
-  #define PA_UINT32_TO_BE(x) ((uint32_t)(x))
- 
-- #define PA_FLOAT32_TO_LE(x) PA_FLOAT32_SWAP(x)
-- #define PA_FLOAT32_TO_BE(x) ((float) (x))
--
-  #define PA_READ24NE(x) PA_READ24BE(x)
-  #define PA_WRITE24NE(x,y) PA_WRITE24BE((x),(y))
- 
-@@ -148,9 +152,6 @@ static inline float PA_FLOAT32_SWAP(floa
-  #define PA_UINT32_TO_LE(x) ((uint32_t)(x))
-  #define PA_UINT32_TO_BE(x) PA_UINT32_SWAP(x)
- 
-- #define PA_FLOAT32_TO_LE(x) ((float) (x))
-- #define PA_FLOAT32_TO_BE(x) PA_FLOAT32_SWAP(x)
--
-  #define PA_READ24NE(x) PA_READ24LE(x)
-  #define PA_WRITE24NE(x,y) PA_WRITE24LE((x),(y))
- 
---- a/src/pulsecore/mix.c
-+++ b/src/pulsecore/mix.c
-@@ -576,17 +576,14 @@ static void pa_mix_float32re_c(pa_mix_in
- 
-         for (i = 0; i < nstreams; i++) {
-             pa_mix_info *m = streams + i;
--            float v, cv = m->linear[channel].f;
-+            float cv = m->linear[channel].f;
- 
--            if (PA_LIKELY(cv > 0)) {
--                v = PA_FLOAT32_SWAP(*(float*) m->ptr);
--                v *= cv;
--                sum += v;
--            }
-+            if (PA_LIKELY(cv > 0))
-+                sum += PA_READ_FLOAT32RE(m->ptr) * cv;
-             m->ptr = (uint8_t*) m->ptr + sizeof(float);
-         }
- 
--        *data = PA_FLOAT32_SWAP(sum);
-+        PA_WRITE_FLOAT32RE(data, sum);
- 
-         if (PA_UNLIKELY(++channel >= channels))
-             channel = 0;
---- a/src/pulsecore/sample-util.c
-+++ b/src/pulsecore/sample-util.c
-@@ -296,9 +296,9 @@ void pa_sample_clamp(pa_sample_format_t
-         for (; n > 0; n--) {
-             float f;
- 
--            f = PA_FLOAT32_SWAP(*s);
-+            f = PA_READ_FLOAT32RE(s);
-             f = PA_CLAMP_UNLIKELY(f, -1.0f, 1.0f);
--            *d = PA_FLOAT32_SWAP(f);
-+            PA_WRITE_FLOAT32RE(d, f);
- 
-             s = (const float*) ((const uint8_t*) s + sstr);
-             d = (float*) ((uint8_t*) d + dstr);
---- a/src/pulsecore/sconv-s16le.c
-+++ b/src/pulsecore/sconv-s16le.c
-@@ -157,8 +157,7 @@ void pa_sconv_s16le_to_float32re(unsigne
-     for (; n > 0; n--) {
-         int16_t s = *(a++);
-         float k = INT16_FROM(s) * (1.0f / (1 << 15));
--        k = PA_FLOAT32_SWAP(k);
--        *(b++) = k;
-+        PA_WRITE_FLOAT32RE(b++, k);
-     }
- }
- 
-@@ -169,8 +168,7 @@ void pa_sconv_s32le_to_float32re(unsigne
-     for (; n > 0; n--) {
-         int32_t s = *(a++);
-         float k = INT32_FROM(s) * (1.0f / (1U << 31));
--        k = PA_FLOAT32_SWAP(k);
--        *(b++) = k;
-+        PA_WRITE_FLOAT32RE(b++, k);
-     }
- }
- 
-@@ -180,8 +178,7 @@ void pa_sconv_s16le_from_float32re(unsig
- 
-     for (; n > 0; n--) {
-         int16_t s;
--        float v = *(a++);
--        v = PA_FLOAT32_SWAP(v) * (1 << 15);
-+        float v = PA_READ_FLOAT32RE(a++) * (1 << 15);
-         s = (int16_t) PA_CLAMP_UNLIKELY(lrintf(v), -0x8000, 0x7FFF);
-         *(b++) = INT16_TO(s);
-     }
-@@ -193,8 +190,7 @@ void pa_sconv_s32le_from_float32re(unsig
- 
-     for (; n > 0; n--) {
-         int32_t s;
--        float v = *(a++);
--        v = PA_FLOAT32_SWAP(v) * (1U << 31);
-+        float v = PA_READ_FLOAT32RE(a++) * (1U << 31);
-         s = (int32_t) PA_CLAMP_UNLIKELY(llrintf(v), -0x80000000LL, 0x7FFFFFFFLL);
-         *(b++) = INT32_TO(s);
-     }
-@@ -325,7 +321,7 @@ void pa_sconv_s24le_to_float32re(unsigne
-     for (; n > 0; n--) {
-         int32_t s = READ24(a) << 8;
-         float k = s * (1.0f / (1U << 31));
--        *b = PA_FLOAT32_SWAP(k);
-+        PA_WRITE_FLOAT32RE(b, k);
-         a += 3;
-         b++;
-     }
-@@ -337,8 +333,7 @@ void pa_sconv_s24le_from_float32re(unsig
- 
-     for (; n > 0; n--) {
-         int32_t s;
--        float v = *a;
--        v = PA_FLOAT32_SWAP(v) * (1U << 31);
-+        float v = PA_READ_FLOAT32RE(a) * (1U << 31);
-         s = (int32_t) PA_CLAMP_UNLIKELY(llrint(v), -0x80000000LL, 0x7FFFFFFFLL);
-         WRITE24(b, ((uint32_t) s) >> 8);
-         a++;
-@@ -411,7 +406,7 @@ void pa_sconv_s24_32le_to_float32re(unsi
-     for (; n > 0; n--) {
-         int32_t s = (int32_t) (UINT32_FROM(*a) << 8);
-         float k = s * (1.0f / (1U << 31));
--        *b = PA_FLOAT32_SWAP(k);
-+        PA_WRITE_FLOAT32RE(b, k);
-         a++;
-         b++;
-     }
-@@ -437,8 +432,7 @@ void pa_sconv_s24_32le_from_float32re(un
- 
-     for (; n > 0; n--) {
-         int32_t s;
--        float v = *a;
--        v = PA_FLOAT32_SWAP(v) * (1U << 31);
-+        float v = PA_READ_FLOAT32RE(a) * (1U << 31);
-         s = (int32_t) PA_CLAMP_UNLIKELY(llrint(v), -0x80000000LL, 0x7FFFFFFFLL);
-         *b = UINT32_TO(((uint32_t) s) >> 8);
-         a++;
---- a/src/pulsecore/svolume_c.c
-+++ b/src/pulsecore/svolume_c.c
-@@ -125,9 +125,9 @@ static void pa_volume_float32re_c(float
-     for (channel = 0; length; length--) {
-         float t;
- 
--        t = PA_FLOAT32_SWAP(*samples);
-+        t = PA_READ_FLOAT32RE(samples);
-         t *= volumes[channel];
--        *samples++ = PA_FLOAT32_SWAP(t);
-+        PA_WRITE_FLOAT32RE(samples++, t);
- 
-         if (PA_UNLIKELY(++channel >= channels))
-             channel = 0;
---- a/src/tests/mix-test.c
-+++ b/src/tests/mix-test.c
-@@ -150,7 +150,7 @@ static void compare_block(const pa_sampl
-             float *u = d;
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                float uu = PA_MAYBE_FLOAT32_SWAP(ss->format != PA_SAMPLE_FLOAT32NE, *u);
-+                float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_READ_FLOAT32RE(u);
-                 fail_unless(fabsf(uu - *v) <= 1e-6f, NULL);
-                 ++u;
-                 ++v;
-@@ -264,7 +264,7 @@ static pa_memblock* generate_block(pa_me
-             if (ss->format == PA_SAMPLE_FLOAT32RE) {
-                 float *u = d;
-                 for (i = 0; i < 10; i++)
--                    u[i] = PA_FLOAT32_SWAP(float32ne_result[0][i]);
-+                    PA_WRITE_FLOAT32RE(&u[i], float32ne_result[0][i]);
-             } else
-                 memcpy(d, float32ne_result[0], sizeof(float32ne_result[0]));
- 
---- a/src/tests/resampler-test.c
-+++ b/src/tests/resampler-test.c
-@@ -98,7 +98,7 @@ static void dump_block(const char *label
-             float *u = d;
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                printf("%4.3g ", ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u));
-+                printf("%4.3g ", ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_READ_FLOAT32RE(u));
-                 u++;
-             }
- 
-@@ -222,7 +222,7 @@ static pa_memblock* generate_block(pa_me
- 
-             if (ss->format == PA_SAMPLE_FLOAT32RE)
-                 for (i = 0; i < 10; i++)
--                    u[i] = PA_FLOAT32_SWAP(u[i]);
-+                    PA_WRITE_FLOAT32RE(&u[i], u[i]);
- 
-             break;
-         }
diff --git a/debian/patches/endianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch b/debian/patches/endianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch
deleted file mode 100644
index d98f81a..0000000
--- a/debian/patches/endianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a39a3b3f7df3ece773bb74b8c6baa599272704e0 Mon Sep 17 00:00:00 2001
-From: Peter Meerwald <pmeerw at pmeerw.net>
-Date: Wed, 6 Aug 2014 11:47:34 +0200
-Subject: [PATCH 4/6] endianmacros: Fix PA_MAYBE_INT16_SWAP() macro
-
-PA_MAYBE_INT16_SWAP() should call PA_INT16_SWAP(), not PA_INT32_SWAP
-
-PA_MAYBE_INT16_SWAP() is not used (yet), so no big deal :)
-
-Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
----
- src/pulsecore/endianmacros.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/pulsecore/endianmacros.h
-+++ b/src/pulsecore/endianmacros.h
-@@ -82,8 +82,8 @@ static inline float PA_FLOAT32_SWAP(floa
-     return t.f;
- }
- 
--#define PA_MAYBE_INT16_SWAP(c,x) ((c) ? PA_INT32_SWAP(x) : (x))
--#define PA_MAYBE_UINT16_SWAP(c,x) ((c) ? PA_UINT32_SWAP(x) : (x))
-+#define PA_MAYBE_INT16_SWAP(c,x) ((c) ? PA_INT16_SWAP(x) : (x))
-+#define PA_MAYBE_UINT16_SWAP(c,x) ((c) ? PA_UINT16_SWAP(x) : (x))
- 
- #define PA_MAYBE_INT32_SWAP(c,x) ((c) ? PA_INT32_SWAP(x) : (x))
- #define PA_MAYBE_UINT32_SWAP(c,x) ((c) ? PA_UINT32_SWAP(x) : (x))
diff --git a/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch b/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
deleted file mode 100644
index 3ad44dc..0000000
--- a/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Don't try to lock and synchronise threads on kFreeBSD.
-Bug-Debian: http://bugs.debian.org/705435
-Origin: http://svnweb.freebsd.org/ports/head/audio/pulseaudio/files/patch-src_daemon_main.c?revision=231972&view=markup&pathrev=231972
-Author: Joe Marcus Clarke <marcus at FreeBSD.org>
-Author: Steven Chamberlain <steven at pyro.eu.org>
-Last-Update: 2013-04-24
-Applied-Upstream: 6.0, commit:69fae3e33ad024be39fb3da0643314abf4e59980
-
---- a/src/daemon/main.c
-+++ b/src/daemon/main.c
-@@ -743,6 +743,10 @@
-          * first take the autospawn lock to make things
-          * synchronous. */
- 
-+        /* This locking and thread synchronisation code doesn't work reliably
-+         * on kFreeBSD (Debian bug #705435), or in upstream FreeBSD ports
-+         * (bug reference: ports/128947, patched in SVN r231972). */
-+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
-         if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
-             pa_log("Failed to initialize autospawn lock");
-             goto finish;
-@@ -754,6 +758,7 @@
-         }
- 
-         autospawn_locked = true;
-+#endif
-     }
- 
-     if (conf->daemonize) {
diff --git a/debian/patches/misc-cleanups-and-bug-fixes.patch b/debian/patches/misc-cleanups-and-bug-fixes.patch
deleted file mode 100644
index 7a08a53..0000000
--- a/debian/patches/misc-cleanups-and-bug-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Author: Peter Meerwald <pmeerw at pmeerw.net>
-Description: misc cleanups and bug fixes
- This is a collapse of a few small patches by Peter Meerwald.
- Changes are:
- put *.log and *.trs (which are created by running 'make check') into src/.gitignore
- fix format specifiers, avoid compilation warnings
- fix compilation warning when certain syscalls are not available (e.g. on kFreeBSD)
- add checks for the expected results in sigbus-test
- add SIGSEGV to the memtrap signal handler to make the sigbus-test work on kFreeBSD
---- a/src/.gitignore
-+++ b/src/.gitignore
-@@ -3,6 +3,8 @@ TAGS
- *.o
- *.la
- *.gcno
-+*.trs
-+*.log
- .deps
- .libs
- /Makefile
---- a/src/pulsecore/core-util.c
-+++ b/src/pulsecore/core-util.c
-@@ -3315,8 +3315,11 @@ int pa_open_cloexec(const char *fn, int
-         return fd;
- #endif
- 
--    if ((fd = open(fn, flags, mode)) < 0)
--        return fd;
-+    if ((fd = open(fn, flags, mode)) >= 0)
-+        goto finish;
-+
-+    /* return error */
-+    return fd;
- 
- finish:
-     /* Some implementations might simply ignore O_CLOEXEC if it is not
-@@ -3337,8 +3340,11 @@ int pa_socket_cloexec(int domain, int ty
-         return fd;
- #endif
- 
--    if ((fd = socket(domain, type, protocol)) < 0)
--        return fd;
-+    if ((fd = socket(domain, type, protocol)) >= 0)
-+        goto finish;
-+
-+    /* return error */
-+    return fd;
- 
- finish:
-     /* Some implementations might simply ignore SOCK_CLOEXEC if it is
-@@ -3360,8 +3366,11 @@ int pa_pipe_cloexec(int pipefd[2]) {
- 
- #endif
- 
--    if ((r = pipe(pipefd)) < 0)
--        return r;
-+    if ((r = pipe(pipefd)) >= 0)
-+        goto finish;
-+
-+    /* return error */
-+    return r;
- 
- finish:
-     pa_make_fd_cloexec(pipefd[0]);
-@@ -3382,8 +3391,11 @@ int pa_accept_cloexec(int sockfd, struct
- 
- #endif
- 
--    if ((fd = accept(sockfd, addr, addrlen)) < 0)
--        return fd;
-+    if ((fd = accept(sockfd, addr, addrlen)) >= 0)
-+        goto finish;
-+
-+    /* return error */
-+    return fd;
- 
- finish:
-     pa_make_fd_cloexec(fd);
---- a/src/pulsecore/memtrap.c
-+++ b/src/pulsecore/memtrap.c
-@@ -237,5 +237,8 @@ void pa_memtrap_install(void) {
-     sa.sa_flags = SA_RESTART|SA_SIGINFO;
- 
-     pa_assert_se(sigaction(SIGBUS, &sa, NULL) == 0);
-+#ifdef __FreeBSD_kernel__
-+    pa_assert_se(sigaction(SIGSEGV, &sa, NULL) == 0);
-+#endif
- #endif
- }
---- a/src/tests/mcalign-test.c
-+++ b/src/tests/mcalign-test.c
-@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) {
- 
-         c.length = (size_t) r;
-         pa_mcalign_push(a, &c);
--        fprintf(stderr, "Read %ld bytes\n", (long)r);
-+        fprintf(stderr, "Read %zd bytes\n", r);
- 
-         c.index += (size_t) r;
- 
---- a/src/tests/sigbus-test.c
-+++ b/src/tests/sigbus-test.c
-@@ -54,6 +54,7 @@ START_TEST (sigbus_test) {
-     /* Verify memory map */
-     pa_log("Let's see if this worked: %s", (char*) p);
-     pa_log("And memtrap says it is good: %s", pa_yes_no(pa_memtrap_is_good(m)));
-+    fail_unless(pa_memtrap_is_good(m) == true);
- 
-     /* Invalidate mapping */
-     fail_unless(ftruncate(fd, 0) >= 0);
-@@ -64,6 +65,7 @@ START_TEST (sigbus_test) {
-     /* Verify memory map */
-     pa_log("Let's see if this worked: %s", (char*) p);
-     pa_log("And memtrap says it is good: %s", pa_yes_no(pa_memtrap_is_good(m)));
-+    fail_unless(pa_memtrap_is_good(m) == false);
- 
-     pa_memtrap_remove(m);
-     munmap(p, PA_PAGE_SIZE);
diff --git a/debian/patches/mix-Fix-mixing-of-S24-samples-stored-as-S32RE.patch b/debian/patches/mix-Fix-mixing-of-S24-samples-stored-as-S32RE.patch
deleted file mode 100644
index 1bd8bf7..0000000
--- a/debian/patches/mix-Fix-mixing-of-S24-samples-stored-as-S32RE.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1499271f46c5b7289a61a4fa508cc412544842c4 Mon Sep 17 00:00:00 2001
-From: Peter Meerwald <pmeerw at pmeerw.net>
-Date: Mon, 4 Aug 2014 14:42:00 +0200
-Subject: [PATCH 1/6] mix: Fix mixing of S24 samples stored as S32RE
-
-pa_mix_s24_32re_c() should advance m->ptr by sizeof(int32_t)
-
-http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-July/020998.html
-
-Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
----
- src/pulsecore/mix.c  | 2 +-
- src/tests/mix-test.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/pulsecore/mix.c
-+++ b/src/pulsecore/mix.c
-@@ -445,7 +445,7 @@ static void pa_mix_s24_32re_c(pa_mix_inf
-                 v = (v * cv) >> 16;
-                 sum += v;
-             }
--            m->ptr = (uint8_t*) m->ptr + 3;
-+            m->ptr = (uint8_t*) m->ptr + sizeof(int32_t);
-         }
- 
-         sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
---- a/src/tests/mix-test.c
-+++ b/src/tests/mix-test.c
-@@ -126,7 +126,7 @@ static const uint32_t s24_32le_result[3]
- static const uint32_t s24_32be_result[3][10] = {
- { 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
- { 0x00000000, 0x65e60000, 0xf1e50000, 0x73000000, 0x0ee60000, 0xb8e50000, 0xe6000000, 0xd7000000, 0xcc1c0000, 0xb31d0000 },
--{ 0x00000000, 0xe5010200, 0x00036400, 0x0470e500, 0xf3000000, 0xe5010500, 0x0006ad00, 0x07f7e400, 0xe6010000, 0x00000800 },
-+{ 0x00000000, 0x64e60100, 0x70e50100, 0xf3000000, 0xade50100, 0xf7e40100, 0xe6010000, 0xc7010000, 0xcc3c0000, 0xb33e0000 },
- };
- 
- static void compare_block(const pa_sample_spec *ss, const pa_memchunk *chunk, int iter) {
diff --git a/debian/patches/only-autostart-kde-version.patch b/debian/patches/only-autostart-kde-version.patch
deleted file mode 100644
index 5661431..0000000
--- a/debian/patches/only-autostart-kde-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Sometimes starting 2 pulseaudio daemons breaks kde login, so don't start the generic one when the kde one will start
- This is fixed upstream post 5.0 by not shipping a kde-specific version
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705426
-Author: T?r?k Edwin <edwin at etorok.net>
-Forwarded: not-needed
---- a/src/daemon/pulseaudio.desktop.in
-+++ b/src/daemon/pulseaudio.desktop.in
-@@ -8,3 +8,4 @@ Type=Application
- Categories=
- GenericName=
- X-GNOME-Autostart-Phase=Initialization
-+NotShowIn=KDE;
diff --git a/debian/patches/rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch b/debian/patches/rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch
deleted file mode 100644
index 073e663..0000000
--- a/debian/patches/rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 26b9d22dd24c17eb118d0205bf7b02b75d435e3c Mon Sep 17 00:00:00 2001
-From: "Alexander E. Patrakov" <patrakov at gmail.com>
-Date: Thu, 5 Jun 2014 22:29:25 +0600
-Subject: [PATCH] rtp-recv: fix crash on empty UDP packets (CVE-2014-3970)
-
-On FIONREAD returning 0 bytes, we cannot return success, as the caller
-(rtpoll_work_cb in module-rtp-recv.c) would then try to
-pa_memblock_unref(chunk.memblock) and, because memblock is NULL, trigger
-an assertion.
-
-Also we have to read out the possible empty packet from the socket, so
-that the kernel doesn't tell us again and again about it.
-
-Signed-off-by: Alexander E. Patrakov <patrakov at gmail.com>
----
- src/modules/rtp/rtp.c | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
-index 570737e..7b75e0e 100644
---- a/src/modules/rtp/rtp.c
-+++ b/src/modules/rtp/rtp.c
-@@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
-         goto fail;
-     }
- 
--    if (size <= 0)
--        return 0;
-+    if (size <= 0) {
-+        /* size can be 0 due to any of the following reasons:
-+         *
-+         * 1. Somebody sent us a perfectly valid zero-length UDP packet.
-+         * 2. Somebody sent us a UDP packet with a bad CRC.
-+         *
-+         * It is unknown whether size can actually be less than zero.
-+         *
-+         * In the first case, the packet has to be read out, otherwise the
-+         * kernel will tell us again and again about it, thus preventing
-+         * reception of any further packets. So let's just read it out
-+         * now and discard it later, when comparing the number of bytes
-+         * received (0) with the number of bytes wanted (1, see below).
-+         *
-+         * In the second case, recvmsg() will fail, thus allowing us to
-+         * return the error.
-+         *
-+         * Just to avoid passing zero-sized memchunks and NULL pointers to
-+         * recvmsg(), let's force allocation of at least one byte by setting
-+         * size to 1.
-+         */
-+        size = 1;
-+    }
- 
-     if (c->memchunk.length < (unsigned) size) {
-         size_t l;
--- 
-2.0.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 97b3013..9dd5712 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,17 +1 @@
-0001-raop-Don-t-use-incompatible-default-sample-spec-para.patch
-0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
-0003-exit-with-X-session.patch
-0004-dont-start-when-already-running.patch
-kfreebsd_no_lock_and_threads_synchro.patch
-only-autostart-kde-version.patch
-rtp-recv-fix-crash-on-empty-UDP-packets-CVE-2014-397.patch
-zsh-completion-Fix-completion-for-default-sink-sourc.patch
 gnu-kfreebsd.patch
-mix-Fix-mixing-of-S24-samples-stored-as-S32RE.patch
-tests-Cleanup-mix-test.patch
-endianmacros-Fix-PA_MAYBE_INT16_SWAP-macro.patch
-tests-Fix-mix-test-on-big-endian-systems.patch
-util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch
-misc-cleanups-and-bug-fixes.patch
-util-Try-finding-out-application-name-using-dladdr.patch
-broken-PA_FLOAT32_SWAP.patch
diff --git a/debian/patches/tests-Cleanup-mix-test.patch b/debian/patches/tests-Cleanup-mix-test.patch
deleted file mode 100644
index e628723..0000000
--- a/debian/patches/tests-Cleanup-mix-test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e14863334b7e9267b3b3bbab08edf4a019411e89 Mon Sep 17 00:00:00 2001
-From: Peter Meerwald <pmeerw at pmeerw.net>
-Date: Wed, 6 Aug 2014 11:47:33 +0200
-Subject: [PATCH 3/6] tests: Cleanup mix-test
-
-indentation and use of fabsf() for floats
-
-Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
----
- src/tests/mix-test.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/src/tests/mix-test.c
-+++ b/src/tests/mix-test.c
-@@ -202,7 +202,7 @@ static void compare_block(const pa_sampl
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                 float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u);
--                fail_unless(fabs(uu - *v) <= 1e-6, NULL);
-+                fail_unless(fabsf(uu - *v) <= 1e-6f, NULL);
-                 ++u;
-                 ++v;
-             }
-@@ -215,7 +215,7 @@ static void compare_block(const pa_sampl
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
-                 float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u);
--                fail_unless(fabs(uu - *v) <= 1e-6, NULL);
-+                fail_unless(fabsf(uu - *v) <= 1e-6f, NULL);
-                 ++u;
-                 ++v;
-             }
-@@ -385,7 +385,7 @@ static pa_memblock* generate_block(pa_me
-                 for (i = 0; i < 10; i++)
-                     u[i] = PA_FLOAT32_SWAP(float_samples[i]);
-             } else
--              memcpy(d, float_samples, sizeof(float_samples));
-+                memcpy(d, float_samples, sizeof(float_samples));
- 
-             break;
-         }
diff --git a/debian/patches/tests-Fix-mix-test-on-big-endian-systems.patch b/debian/patches/tests-Fix-mix-test-on-big-endian-systems.patch
deleted file mode 100644
index 0aed324..0000000
--- a/debian/patches/tests-Fix-mix-test-on-big-endian-systems.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From eca6217129e835e1beabd13e7ca839ef0f89ddd0 Mon Sep 17 00:00:00 2001
-From: Peter Meerwald <pmeerw at pmeerw.net>
-Date: Wed, 6 Aug 2014 11:19:57 +0200
-Subject: [PATCH 5/6] tests: Fix mix-test on big-endian systems
-
-the mix test code never worked on big-endian systems
-
-patch saves a lot of duplicate test and uses more logical naming
-
-see
-http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-August/021035.html
-
-Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
-Reported-by: Felipe Sateler <fsateler at debian.org>
----
- src/tests/mix-test.c | 229 ++++++++++++---------------------------------------
- 1 file changed, 54 insertions(+), 175 deletions(-)
-
---- a/src/tests/mix-test.c
-+++ b/src/tests/mix-test.c
-@@ -56,79 +56,37 @@ static const uint8_t ulaw_result[3][10]
- { 0x00, 0xff, 0xff, 0x80, 0x91, 0x31, 0x00, 0xe9, 0x12, 0x13 },
- };
- 
--/* PA_SAMPLE_S16LE */
--static const uint16_t s16le_result[3][10] = {
-+static const uint16_t s16ne_result[3][10] = {
- { 0x0000, 0xffff, 0x7fff, 0x8000, 0x9fff, 0x3fff, 0x0001, 0xf000, 0x0020, 0x0021 },
- { 0x0000, 0xffff, 0x7332, 0x8ccd, 0xa998, 0x3998, 0x0000, 0xf199, 0x001c, 0x001d },
- { 0x0000, 0xfffe, 0x7fff, 0x8000, 0x8000, 0x7997, 0x0001, 0xe199, 0x003c, 0x003e },
- };
- 
--/* PA_SAMPLE_S16BE */
--static const uint16_t s16be_result[3][10] = {
--{ 0x0000, 0xffff, 0x7fff, 0x8000, 0x9fff, 0x3fff, 0x0001, 0xf000, 0x0020, 0x0021 },
--{ 0x0000, 0xffff, 0x8bff, 0x7300, 0xa8ff, 0x52ff, 0xe600, 0xd700, 0xcc1c, 0xb31d },
--{ 0x0000, 0xfeff, 0x0aff, 0xf300, 0x47ff, 0x91fe, 0xe601, 0xc701, 0xcc3c, 0xb33e },
--};
--
--/* PA_SAMPLE_FLOAT32LE */
--static const float float32le_result[3][10] = {
--{ 0.000000, -1.000000, 1.000000, 4711.000000, 0.222000, 0.330000, -0.300000, 99.000000, -0.555000, -0.123000 },
--{ 0.000000, -0.899987, 0.899987, 4239.837402, 0.199797, 0.296996, -0.269996, 89.098679, -0.499493, -0.110698 },
--{ 0.000000, -1.899987, 1.899987, 8950.837891, 0.421797, 0.626996, -0.569996, 188.098679, -1.054493, -0.233698 },
--};
--
--/* PA_SAMPLE_FLOAT32BE */
--static const float float32be_result[3][10] = {
-+static const float float32ne_result[3][10] = {
- { 0.000000, -1.000000, 1.000000, 4711.000000, 0.222000, 0.330000, -0.300000, 99.000000, -0.555000, -0.123000 },
- { 0.000000, -0.899987, 0.899987, 4239.837402, 0.199797, 0.296996, -0.269996, 89.098679, -0.499493, -0.110698 },
- { 0.000000, -1.899987, 1.899987, 8950.837891, 0.421797, 0.626996, -0.569996, 188.098679, -1.054493, -0.233698 },
- };
- 
--/* PA_SAMPLE_S32LE */
--static const uint32_t s32le_result[3][10] = {
-+static const uint32_t s32ne_result[3][10] = {
- { 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
- { 0x00000000, 0xffff199b, 0x7332199c, 0x8ccd0003, 0xa998d99e, 0x3998999f, 0x0000e66c, 0xf199a007, 0x001cccc8, 0x001db32e },
- { 0x00000001, 0xfffe199d, 0x7fffffff, 0x80000000, 0x80000000, 0x799799a5, 0x0001e673, 0xe199a00f, 0x003cccd1, 0x003eb338 },
- };
- 
--/* PA_SAMPLE_S32BE */
--static const uint32_t s32be_result[3][10] = {
--{ 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
--{ 0x0066e600, 0x65b2cd01, 0xf117b402, 0x73989903, 0x0ee48004, 0xb8496705, 0xe6ca4c06, 0xd7303307, 0xccb21908, 0xb3190009 },
--{ 0x0066e601, 0x64b2ce03, 0x7017b505, 0xf3989907, 0xade38109, 0xf748680b, 0xe6cb4c0d, 0xc731330f, 0xccd21911, 0xb33a0013 },
--};
--
--/* PA_SAMPLE_S24LE */
--static const uint8_t s24le_result[3][30] = {
--{ 0x00, 0x00, 0x01, 0xff, 0xff, 0x02, 0x7f, 0xff, 0x03, 0x80, 0x00, 0x04, 0x9f, 0xff, 0x05, 0x3f, 0xff, 0x06, 0x01, 0x00, 0x07, 0xf0, 0x00, 0x08, 0x20, 0x00, 0x09, 0x21, 0x00, 0x0a },
--{ 0x66, 0xe6, 0x00, 0x31, 0xb3, 0x02, 0x23, 0x99, 0x03, 0x0b, 0x9a, 0x03, 0x0c, 0x66, 0x05, 0x1c, 0x4c, 0x06, 0xca, 0x4c, 0x06, 0x07, 0x34, 0x07, 0xb2, 0x19, 0x08, 0x19, 0x00, 0x09 },
--{ 0x66, 0xe6, 0x01, 0x30, 0xb3, 0x05, 0xa2, 0x98, 0x07, 0x8b, 0x9a, 0x07, 0xab, 0x65, 0x0b, 0x5b, 0x4b, 0x0d, 0xcb, 0x4c, 0x0d, 0xf7, 0x34, 0x0f, 0xd2, 0x19, 0x11, 0x3a, 0x00, 0x13 },
--};
--
--/* PA_SAMPLE_S24BE */
-+/* attention: result is in BE, not NE! */
- static const uint8_t s24be_result[3][30] = {
--{ 0x00, 0x00, 0x01, 0xff, 0xff, 0x02, 0x7f, 0xff, 0x03, 0x80, 0x00, 0x04, 0x9f, 0xff, 0x05, 0x3f, 0xff, 0x06, 0x01, 0x00, 0x07,
--    0xf0, 0x00, 0x08, 0x20, 0x00, 0x09, 0x21, 0x00, 0x0a },
--{ 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x73, 0x32, 0x1c, 0x8c, 0xcd, 0x03, 0xa9, 0x98, 0xde, 0x39, 0x98, 0x9f, 0x00, 0xe6, 0x6c,
--    0xf1, 0x99, 0xa7, 0x1c, 0xcc, 0xc8, 0x1d, 0xb3, 0x2e },
--{ 0x00, 0x00, 0x01, 0xff, 0xfe, 0x1d, 0x7f, 0xff, 0xff, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x79, 0x97, 0xa5, 0x01, 0xe6, 0x73,
--    0xe1, 0x99, 0xaf, 0x3c, 0xcc, 0xd1, 0x3e, 0xb3, 0x38 },
-+{ 0x00, 0x00, 0x01, 0xff, 0xff, 0x02, 0x7f, 0xff, 0x03, 0x80, 0x00, 0x04, 0x9f, 0xff, 0x05, 0x3f, 0xff, 0x06, 0x01, 0x00, 0x07, 0xf0, 0x00, 0x08, 0x20, 0x00, 0x09, 0x21, 0x00, 0x0a },
-+{ 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x73, 0x32, 0x1c, 0x8c, 0xcd, 0x03, 0xa9, 0x98, 0xde, 0x39, 0x98, 0x9f, 0x00, 0xe6, 0x6c, 0xf1, 0x99, 0xa7, 0x1c, 0xcc, 0xc8, 0x1d, 0xb3, 0x2e },
-+{ 0x00, 0x00, 0x01, 0xff, 0xfe, 0x1d, 0x7f, 0xff, 0xff, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x79, 0x97, 0xa5, 0x01, 0xe6, 0x73, 0xe1, 0x99, 0xaf, 0x3c, 0xcc, 0xd1, 0x3e, 0xb3, 0x38 },
- };
- 
--/* PA_SAMPLE_S24_32LE */
--static const uint32_t s24_32le_result[3][10] = {
-+static const uint32_t s24_32ne_result[3][10] = {
- { 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
- { 0x00000000, 0x00ff199b, 0x00ff199c, 0x00000003, 0x00ff199e, 0x00ff199f, 0x0000e66c, 0x00000007, 0x001cccc8, 0x001db32e },
- { 0x00000001, 0x00fe199d, 0x00fe199f, 0x00000007, 0x00fe19a3, 0x00fe19a5, 0x0001e673, 0x0000000f, 0x003cccd1, 0x003eb338 },
- };
- 
--/* PA_SAMPLE_S24_32BE */
--static const uint32_t s24_32be_result[3][10] = {
--{ 0x00000001, 0xffff0002, 0x7fff0003, 0x80000004, 0x9fff0005, 0x3fff0006, 0x00010007, 0xf0000008, 0x00200009, 0x0021000a },
--{ 0x00000000, 0x65e60000, 0xf1e50000, 0x73000000, 0x0ee60000, 0xb8e50000, 0xe6000000, 0xd7000000, 0xcc1c0000, 0xb31d0000 },
--{ 0x00000000, 0x64e60100, 0x70e50100, 0xf3000000, 0xade50100, 0xf7e40100, 0xe6010000, 0xc7010000, 0xcc3c0000, 0xb33e0000 },
--};
--
- static void compare_block(const pa_sample_spec *ss, const pa_memchunk *chunk, int iter) {
-     void *d;
-     unsigned i;
-@@ -172,49 +130,27 @@ static void compare_block(const pa_sampl
-             break;
-         }
- 
--        case PA_SAMPLE_S16LE: {
--            const uint16_t *v = s16le_result[iter];
--            uint16_t *u = d;
--
--            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                fail_unless(*u == *v, NULL);
--                ++u;
--                ++v;
--            }
--            break;
--        }
--
--        case PA_SAMPLE_S16BE: {
--            const uint16_t *v = s16be_result[iter];
-+        case PA_SAMPLE_S16NE:
-+        case PA_SAMPLE_S16RE: {
-+            const uint16_t *v = s16ne_result[iter];
-             uint16_t *u = d;
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                fail_unless(*u == *v, NULL);
--                ++u;
--                ++v;
--            }
--            break;
--        }
--
--        case PA_SAMPLE_FLOAT32LE: {
--            const float *v = float32le_result[iter];
--            float *u = d;
--
--            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u);
--                fail_unless(fabsf(uu - *v) <= 1e-6f, NULL);
-+                uint16_t uu = PA_MAYBE_UINT16_SWAP(ss->format != PA_SAMPLE_S16NE, *u);
-+                fail_unless(uu == *v, NULL);
-                 ++u;
-                 ++v;
-             }
-             break;
-         }
- 
--        case PA_SAMPLE_FLOAT32BE: {
--            const float *v = float32be_result[iter];
-+        case PA_SAMPLE_FLOAT32NE:
-+        case PA_SAMPLE_FLOAT32RE: {
-+            const float *v = float32ne_result[iter];
-             float *u = d;
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                float uu = ss->format == PA_SAMPLE_FLOAT32NE ? *u : PA_FLOAT32_SWAP(*u);
-+                float uu = PA_MAYBE_FLOAT32_SWAP(ss->format != PA_SAMPLE_FLOAT32NE, *u);
-                 fail_unless(fabsf(uu - *v) <= 1e-6f, NULL);
-                 ++u;
-                 ++v;
-@@ -222,77 +158,42 @@ static void compare_block(const pa_sampl
-             break;
-         }
- 
--        case PA_SAMPLE_S32LE: {
--            const uint32_t *v = s32le_result[iter];
--            uint32_t *u = d;
--
--            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                fail_unless(*u == *v, NULL);
--                ++u;
--                ++v;
--            }
--            break;
--        }
--
--        case PA_SAMPLE_S32BE: {
--            const uint32_t *v = s32be_result[iter];
--            uint32_t *u = d;
--
--            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                fail_unless(*u == *v, NULL);
--                ++u;
--                ++v;
--            }
--            break;
--        }
--
--        case PA_SAMPLE_S24_32LE: {
--            const uint32_t *v = s24_32le_result[iter];
-+        case PA_SAMPLE_S32NE:
-+        case PA_SAMPLE_S32RE: {
-+            const uint32_t *v = s32ne_result[iter];
-             uint32_t *u = d;
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                fail_unless(*u == *v, NULL);
-+                uint32_t uu = PA_MAYBE_UINT32_SWAP(ss->format != PA_SAMPLE_S32NE, *u);
-+                fail_unless(uu == *v, NULL);
-                 ++u;
-                 ++v;
-             }
-             break;
-         }
- 
--        case PA_SAMPLE_S24_32BE: {
--            const uint32_t *v = s24_32be_result[iter];
-+        case PA_SAMPLE_S24_32NE:
-+        case PA_SAMPLE_S24_32RE: {
-+            const uint32_t *v = s24_32ne_result[iter];
-             uint32_t *u = d;
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                fail_unless(*u == *v, NULL);
-+                uint32_t uu = PA_MAYBE_UINT32_SWAP(ss->format != PA_SAMPLE_S24_32NE, *u);
-+                fail_unless(uu == *v, NULL);
-                 ++u;
-                 ++v;
-             }
-             break;
-         }
- 
--        case PA_SAMPLE_S24LE: {
--            const uint8_t *v = s24le_result[iter];
--            uint8_t *u = d;
--
--            for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                fail_unless(*u == *v, NULL);
--                fail_unless(*(u+1) == *(v+1), NULL);
--                fail_unless(*(u+2) == *(v+2), NULL);
--
--                u += 3;
--                v += 3;
--            }
--            break;
--        }
--
--        case PA_SAMPLE_S24BE: {
-+        case PA_SAMPLE_S24NE:
-+        case PA_SAMPLE_S24RE: {
-             const uint8_t *v = s24be_result[iter];
-             uint8_t *u = d;
- 
-             for (i = 0; i < chunk->length / pa_frame_size(ss); i++) {
--                fail_unless(*u == *v, NULL);
--                fail_unless(*(u+1) == *(v+1), NULL);
--                fail_unless(*(u+2) == *(v+2), NULL);
-+                uint32_t uu = ss->format == PA_SAMPLE_S24LE ? PA_READ24LE(u) : PA_READ24BE(u);
-+                fail_unless(uu == PA_READ24BE(v), NULL);
- 
-                 u += 3;
-                 v += 3;
-@@ -320,23 +221,18 @@ static pa_memblock* generate_block(pa_me
-         case PA_SAMPLE_U8:
-         case PA_SAMPLE_ULAW:
-         case PA_SAMPLE_ALAW: {
--            static const uint8_t u8_samples[] = {
--                0x00, 0xFF, 0x7F, 0x80, 0x9f,
--                0x3f, 0x01, 0xF0, 0x20, 0x21
--            };
--
--            memcpy(d, u8_samples, sizeof(u8_samples));
-+            memcpy(d, u8_result[0], sizeof(u8_result[0]));
-             break;
-         }
- 
-         case PA_SAMPLE_S16NE:
-         case PA_SAMPLE_S16RE: {
--            static const uint16_t u16_samples[] = {
--                0x0000, 0xFFFF, 0x7FFF, 0x8000, 0x9fff,
--                0x3fff, 0x0001, 0xF000, 0x0020, 0x0021
--            };
--
--            memcpy(d, u16_samples, sizeof(u16_samples));
-+            if (ss->format == PA_SAMPLE_S16RE) {
-+                uint16_t *u = d;
-+                for (i = 0; i < 10; i++)
-+                    u[i] = PA_UINT16_SWAP(s16ne_result[0][i]);
-+            } else
-+                memcpy(d, s16ne_result[0], sizeof(s16ne_result[0]));
-             break;
-         }
- 
-@@ -344,48 +240,33 @@ static pa_memblock* generate_block(pa_me
-         case PA_SAMPLE_S24_32RE:
-         case PA_SAMPLE_S32NE:
-         case PA_SAMPLE_S32RE: {
--            static const uint32_t u32_samples[] = {
--                0x00000001, 0xFFFF0002, 0x7FFF0003, 0x80000004, 0x9fff0005,
--                0x3fff0006, 0x00010007, 0xF0000008, 0x00200009, 0x0021000A
--            };
--
--            memcpy(d, u32_samples, sizeof(u32_samples));
-+            if (ss->format == PA_SAMPLE_S24_32RE || ss->format == PA_SAMPLE_S32RE) {
-+                uint32_t *u = d;
-+                for (i = 0; i < 10; i++)
-+                    u[i] = PA_UINT32_SWAP(s32ne_result[0][i]);
-+            } else
-+                memcpy(d, s32ne_result[0], sizeof(s32ne_result[0]));
-             break;
-         }
- 
-         case PA_SAMPLE_S24NE:
--        case PA_SAMPLE_S24RE: {
--            /* Need to be on a byte array because they are not aligned */
--            static const uint8_t u24_samples[] = {
--                0x00, 0x00, 0x01,
--                0xFF, 0xFF, 0x02,
--                0x7F, 0xFF, 0x03,
--                0x80, 0x00, 0x04,
--                0x9f, 0xff, 0x05,
--                0x3f, 0xff, 0x06,
--                0x01, 0x00, 0x07,
--                0xF0, 0x00, 0x08,
--                0x20, 0x00, 0x09,
--                0x21, 0x00, 0x0A
--            };
--
--            memcpy(d, u24_samples, sizeof(u24_samples));
-+        case PA_SAMPLE_S24RE:
-+            if (ss->format == PA_SAMPLE_S24LE) {
-+                uint8_t *u = d;
-+                for (i = 0; i < 30; i += 3)
-+                    PA_WRITE24LE(&u[i], PA_READ24BE(&s24be_result[0][i]));
-+            } else
-+                memcpy(d, s24be_result[0], sizeof(s24be_result[0]));
-             break;
--        }
- 
-         case PA_SAMPLE_FLOAT32NE:
-         case PA_SAMPLE_FLOAT32RE: {
--            float *u = d;
--            static const float float_samples[] = {
--                0.0f, -1.0f, 1.0f, 4711.0f, 0.222f,
--                0.33f, -.3f, 99.0f, -0.555f, -.123f
--            };
--
-             if (ss->format == PA_SAMPLE_FLOAT32RE) {
-+                float *u = d;
-                 for (i = 0; i < 10; i++)
--                    u[i] = PA_FLOAT32_SWAP(float_samples[i]);
-+                    u[i] = PA_FLOAT32_SWAP(float32ne_result[0][i]);
-             } else
--                memcpy(d, float_samples, sizeof(float_samples));
-+                memcpy(d, float32ne_result[0], sizeof(float32ne_result[0]));
- 
-             break;
-         }
-@@ -427,8 +308,6 @@ START_TEST (mix_test) {
-         i.length = pa_memblock_get_length(i.memblock);
-         i.index = 0;
- 
--        compare_block(&a, &i, 0);
--
-         /* Make a copy */
-         j = i;
-         pa_memblock_ref(j.memblock);
diff --git a/debian/patches/util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch b/debian/patches/util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch
deleted file mode 100644
index 7152d4e..0000000
--- a/debian/patches/util-Fix-pa_get_binary_name-on-Debian-kFreeBSD.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8a4a4f408c3e71a67b2134c21b971ce54a571fd1 Mon Sep 17 00:00:00 2001
-From: Peter Meerwald <pmeerw at pmeerw.net>
-Date: Mon, 4 Aug 2014 14:45:23 +0200
-Subject: [PATCH 6/6] util: Fix pa_get_binary_name() on Debian/kFreeBSD
-
-Debian GNU/kFreeBSD uses a FreeBSD kernel and GLIBC,
-it #defines __FreeBSD_kernel__, but not __FreeBSD__ nor __linux__
-Debian GNU/kFreeBSD does have a /proc/self/exe
-
-FreeBSD #defines __FreeBSD__ and __FreeBSD_kernel__
-
-problem reporte here:
-http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-July/020998.html
-
-http://stackoverflow.com/questions/1023306/finding-current-executables-path-without-proc-self-exe and
-http://stackoverflow.com/questions/933850/how-to-find-the-location-of-the-executable-in-c have some
-background info
-
-Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
----
- src/pulse/util.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/pulse/util.c
-+++ b/src/pulse/util.c
-@@ -181,10 +181,10 @@ char *pa_get_binary_name(char *s, size_t
-     }
- #endif
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
-     {
-         char *rp;
--        /* This works on Linux only */
-+        /* This works on Linux and Debian/kFreeBSD */
- 
-         if ((rp = pa_readlink("/proc/self/exe"))) {
-             pa_strlcpy(s, pa_path_get_filename(rp), l);
diff --git a/debian/patches/util-Try-finding-out-application-name-using-dladdr.patch b/debian/patches/util-Try-finding-out-application-name-using-dladdr.patch
deleted file mode 100644
index 139239d..0000000
--- a/debian/patches/util-Try-finding-out-application-name-using-dladdr.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-commit 704c96985be104396b86f6b2c0a96827b9d90501
-Author: Felipe Sateler <fsateler at debian.org>
-Date:   Thu Aug 14 00:43:00 2014 -0400
-
-    util: Try finding out application name using dladdr if available
-    
-    This fixes getting the binary name in the Hurd, or any other port using
-    the GNU C library, but only in the case where the library is directly
-    linked to. Opening with dlopen will not work.
-    
-    Change since last version: use a weak reference to main, so that we
-    don't crash when main cannot be found.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -574,6 +574,8 @@ AC_SYS_LARGEFILE
- # Check for open64 to know if the current system does have open64() and similar functions
- AC_CHECK_FUNCS_ONCE([open64])
- 
-+AC_SEARCH_LIBS([dladdr], [dl], [HAVE_DLADDR=1], [HAVE_DLADDR=0])
-+AC_DEFINE(HAVE_DLADDR, [1], [Have dladdr?])
- 
- ###################################
- #      External libraries         #
---- a/src/pulse/util.c
-+++ b/src/pulse/util.c
-@@ -24,6 +24,10 @@
- #include <config.h>
- #endif
- 
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE 1
-+#endif
-+
- #include <errno.h>
- #include <limits.h>
- #include <stdio.h>
-@@ -32,6 +36,7 @@
- #include <time.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <dlfcn.h>
- 
- #ifdef HAVE_PWD_H
- #include <pwd.h>
-@@ -64,6 +69,10 @@
- 
- #include "util.h"
- 
-+#if defined(HAVE_DLADDR) && defined(PA_GCC_WEAKREF)
-+static int _main() PA_GCC_WEAKREF(main);
-+#endif
-+
- char *pa_get_user_name(char *s, size_t l) {
-     const char *p;
-     char *name = NULL;
-@@ -205,6 +214,21 @@ char *pa_get_binary_name(char *s, size_t
-         }
-     }
- #endif
-+
-+#if defined(HAVE_DLADDR) && defined(PA_GCC_WEAKREF)
-+    {
-+        Dl_info info;
-+        if(_main) {
-+            int err = dladdr(&_main, &info);
-+            if (err != 0) {
-+                char *p = pa_realpath(info.dli_fname);
-+                if (p) {
-+                    return p;
-+                }
-+            }
-+        }
-+    }
-+#endif
- 
- #if defined(HAVE_SYS_PRCTL_H) && defined(PR_GET_NAME)
-     {
diff --git a/debian/patches/zsh-completion-Fix-completion-for-default-sink-sourc.patch b/debian/patches/zsh-completion-Fix-completion-for-default-sink-sourc.patch
deleted file mode 100644
index f7bea83..0000000
--- a/debian/patches/zsh-completion-Fix-completion-for-default-sink-sourc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3be8382fcdfdebeb3bf154631e94b3ccd5ca4576 Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler at debian.org>
-Date: Wed, 2 Jul 2014 11:32:38 -0400
-Subject: [PATCH] zsh-completion: Fix completion for default sink/source
-
----
- shell-completion/pulseaudio-zsh-completion.zsh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/shell-completion/pulseaudio-zsh-completion.zsh
-+++ b/shell-completion/pulseaudio-zsh-completion.zsh
-@@ -274,8 +274,8 @@ _pactl_completion() {
-             'suspend-sink: suspend or resume a sink'
-             'suspend-source: suspend or resume a source'
-             'set-card-profile: set a card profile:cards:_cards'
--            'set-sink-default: set the default sink'
--            'set-source-default: set the default source'
-+            'set-default-sink: set the default sink'
-+            'set-default-source: set the default source'
-             'set-sink-port: set the sink port of a sink'
-             'set-source-port: set the source port of a source'
-             'set-port-latency-offset: set a latency offset on a port'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git