diff options
| author | Luke Yelavich <themuso@ubuntu.com> | 2015-01-05 12:56:11 +1100 |
|---|---|---|
| committer | Luke Yelavich <themuso@ubuntu.com> | 2015-01-05 12:56:11 +1100 |
| commit | 24db196e3801dc59336929e1ae24a8671c8fdee7 (patch) | |
| tree | 952924058457997ba59be83e25ee2d01ccce1df5 | |
| parent | 9d219dac2000a04b697106f01bf42498b2e90e42 (diff) | |
Imported Upstream version 5.99.2
36 files changed, 1163 insertions, 1443 deletions
diff --git a/.tarball-version b/.tarball-version index e8cead2..0d530ba 100644 --- a/.tarball-version +++ b/.tarball-version @@ -1 +1 @@ -5.99.1 +5.99.2 @@ -1 +1 @@ -5.99.1 +5.99.2 diff --git a/Makefile.in b/Makefile.in index 6f7adcf..42816ca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -437,7 +437,6 @@ 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@ @@ -6,7 +6,6 @@ Changes at a glance: * 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 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pulseaudio 5.99.1. +# Generated by GNU Autoconf 2.69 for pulseaudio 5.99.2. # # 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.99.1' -PACKAGE_STRING='pulseaudio 5.99.1' +PACKAGE_VERSION='5.99.2' +PACKAGE_STRING='pulseaudio 5.99.2' PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org' PACKAGE_URL='http://pulseaudio.org/' @@ -686,7 +686,6 @@ SYSTEMDLOGIN_CFLAGS HAVE_SYSTEMD_DAEMON_FALSE HAVE_SYSTEMD_DAEMON_TRUE HAVE_SYSTEMD_DAEMON -PA_DEFAULT_AUTOSPAWN SYSTEMDDAEMON_LIBS SYSTEMDDAEMON_CFLAGS systemduserunitdir @@ -844,6 +843,8 @@ PTHREAD_CC ax_pthread_config HAVE_SIGXCPU_FALSE HAVE_SIGXCPU_TRUE +HAVE_SYS_EVENTFD_H_FALSE +HAVE_SYS_EVENTFD_H_TRUE HAVE_EVDEV_FALSE HAVE_EVDEV_TRUE HAVE_AF_UNIX @@ -1732,7 +1733,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.99.1 to adapt to many kinds of systems. +\`configure' configures pulseaudio 5.99.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1802,7 +1803,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pulseaudio 5.99.1:";; + short | recursive ) echo "Configuration of pulseaudio 5.99.2:";; esac cat <<\_ACEOF @@ -2097,7 +2098,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pulseaudio configure 5.99.1 +pulseaudio configure 5.99.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2687,7 +2688,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.99.1, which was +It was created by pulseaudio $as_me 5.99.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3639,7 +3640,7 @@ fi # Define the identity of the package. PACKAGE='pulseaudio' - VERSION='5.99.1' + VERSION='5.99.2' cat >>confdefs.h <<_ACEOF @@ -20631,6 +20632,14 @@ fi + if test "x$ac_cv_header_sys_eventfd_h" = "xyes"; then + HAVE_SYS_EVENTFD_H_TRUE= + HAVE_SYS_EVENTFD_H_FALSE='#' +else + HAVE_SYS_EVENTFD_H_TRUE='#' + HAVE_SYS_EVENTFD_H_FALSE= +fi + #### Typdefs, structures, etc. #### @@ -25977,6 +25986,8 @@ fi ## BlueZ 4 ## if test "x$enable_bluez4" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"; then : HAVE_BLUEZ_4=1 +else + HAVE_BLUEZ_4=0 fi if test "x$enable_bluez4" = "xyes" && test "x$HAVE_BLUEZ_4" != "x1"; then : as_fn_error $? "*** BLUEZ 4 support not found (requires sbc and D-Bus)" "$LINENO" 5 @@ -25994,6 +26005,8 @@ fi ## BlueZ 5 ## if test "x$enable_bluez5" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"; then : HAVE_BLUEZ_5=1 +else + HAVE_BLUEZ_5=0 fi if test "x$enable_bluez5" = "xyes" && test "x$HAVE_BLUEZ_5" != "x1"; then : as_fn_error $? "*** BLUEZ 5 support not found (requires sbc and D-Bus)" "$LINENO" 5 @@ -26010,6 +26023,8 @@ fi if test "x$HAVE_BLUEZ_4" = "x1" || test "x$HAVE_BLUEZ_5" = "x1"; then : HAVE_BLUEZ=1 +else + HAVE_BLUEZ=0 fi if test "x$HAVE_BLUEZ" = x1; then @@ -26030,6 +26045,8 @@ fi if test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_ofono_headset" != "xno"; then : HAVE_BLUEZ_5_OFONO_HEADSET=1 +else + HAVE_BLUEZ_5_OFONO_HEADSET=0 fi if test "x$HAVE_BLUEZ_5_OFONO_HEADSET" = x1; then @@ -26052,9 +26069,6 @@ if test "${enable_bluez5_native_headset+set}" = set; then : 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 @@ -26114,20 +26128,24 @@ 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 + HAVE_BLUEZ_5_NATIVE_HEADSET=0 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 + HAVE_BLUEZ_5_NATIVE_HEADSET=0 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; } - + HAVE_BLUEZ_5_NATIVE_HEADSET=1 fi +else + HAVE_BLUEZ_5_NATIVE_HEADSET=0 +fi +if test "x$enable_bluez5_native_headset" = "xyes" && test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x0"; then : + as_fn_error $? "*** BlueZ 5 native headset backend support not available (requires the libbluetooth headers)" "$LINENO" 5 fi - if test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = x1; then HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE= @@ -27130,13 +27148,6 @@ if test "x$enable_systemd_daemon" = "xyes" && test "x$HAVE_SYSTEMD_DAEMON" = "x0 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= @@ -28084,6 +28095,10 @@ if test -z "${HAVE_EVDEV_TRUE}" && test -z "${HAVE_EVDEV_FALSE}"; then as_fn_error $? "conditional \"HAVE_EVDEV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_SYS_EVENTFD_H_TRUE}" && test -z "${HAVE_SYS_EVENTFD_H_FALSE}"; then + as_fn_error $? "conditional \"HAVE_SYS_EVENTFD_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_SIGXCPU_TRUE}" && test -z "${HAVE_SIGXCPU_FALSE}"; then as_fn_error $? "conditional \"HAVE_SIGXCPU\" was never defined. @@ -28678,7 +28693,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.99.1, which was +This file was extended by pulseaudio $as_me 5.99.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28745,7 +28760,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.99.1 +pulseaudio config.status 5.99.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 433236b..6843729 100644 --- a/configure.ac +++ b/configure.ac @@ -449,6 +449,7 @@ AC_CHECK_HEADERS_ONCE([execinfo.h]) AC_CHECK_HEADERS_ONCE([langinfo.h]) AC_CHECK_HEADERS_ONCE([regex.h pcreposix.h]) +AM_CONDITIONAL(HAVE_SYS_EVENTFD_H, test "x$ac_cv_header_sys_eventfd_h" = "xyes") #### Typdefs, structures, etc. #### @@ -1018,20 +1019,22 @@ AS_IF([test "x$enable_bluez4" != "xno" || test "x$enable_bluez5" != "xno"], HAVE_SBC=0) ## BlueZ 4 ## -AS_IF([test "x$enable_bluez4" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"], HAVE_BLUEZ_4=1) +AS_IF([test "x$enable_bluez4" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"], HAVE_BLUEZ_4=1, + HAVE_BLUEZ_4=0) AS_IF([test "x$enable_bluez4" = "xyes" && test "x$HAVE_BLUEZ_4" != "x1"], [AC_MSG_ERROR([*** BLUEZ 4 support not found (requires sbc and D-Bus)])]) AC_SUBST(HAVE_BLUEZ_4) AM_CONDITIONAL([HAVE_BLUEZ_4], [test "x$HAVE_BLUEZ_4" = x1]) ## BlueZ 5 ## -AS_IF([test "x$enable_bluez5" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"], HAVE_BLUEZ_5=1) +AS_IF([test "x$enable_bluez5" != "xno" && test "x$HAVE_DBUS" = "x1" && test "x$HAVE_SBC" = "x1"], HAVE_BLUEZ_5=1, + HAVE_BLUEZ_5=0) AS_IF([test "x$enable_bluez5" = "xyes" && test "x$HAVE_BLUEZ_5" != "x1"], [AC_MSG_ERROR([*** BLUEZ 5 support not found (requires sbc and D-Bus)])]) AC_SUBST(HAVE_BLUEZ_5) AM_CONDITIONAL([HAVE_BLUEZ_5], [test "x$HAVE_BLUEZ_5" = x1]) -AS_IF([test "x$HAVE_BLUEZ_4" = "x1" || test "x$HAVE_BLUEZ_5" = "x1"], HAVE_BLUEZ=1) +AS_IF([test "x$HAVE_BLUEZ_4" = "x1" || test "x$HAVE_BLUEZ_5" = "x1"], HAVE_BLUEZ=1, HAVE_BLUEZ=0) AC_SUBST(HAVE_BLUEZ) AM_CONDITIONAL([HAVE_BLUEZ], [test "x$HAVE_BLUEZ" = x1]) @@ -1039,17 +1042,19 @@ AM_CONDITIONAL([HAVE_BLUEZ], [test "x$HAVE_BLUEZ" = x1]) 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) +AS_IF([test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_ofono_headset" != "xno"], HAVE_BLUEZ_5_OFONO_HEADSET=1, + HAVE_BLUEZ_5_OFONO_HEADSET=0) 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)])])]) - +AS_IF([test "x$HAVE_BLUEZ_5" = "x1" && test "x$enable_bluez5_native_headset" != "xno"], + [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 4.101 ], HAVE_BLUEZ_5_NATIVE_HEADSET=1, HAVE_BLUEZ_5_NATIVE_HEADSET=0)], + HAVE_BLUEZ_5_NATIVE_HEADSET=0) +AS_IF([test "x$enable_bluez5_native_headset" = "xyes" && test "x$HAVE_BLUEZ_5_NATIVE_HEADSET" = "x0"], + [AC_MSG_ERROR([*** BlueZ 5 native headset backend support not available (requires the libbluetooth headers)])]) 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])) @@ -1225,9 +1230,6 @@ AS_IF([test "x$enable_systemd_daemon" != "xno"], 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?])) diff --git a/doxygen/Makefile.in b/doxygen/Makefile.in index 379a54d..c841996 100644 --- a/doxygen/Makefile.in +++ b/doxygen/Makefile.in @@ -301,7 +301,6 @@ 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@ diff --git a/man/Makefile.in b/man/Makefile.in index af32f02..159167f 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -348,7 +348,6 @@ 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@ diff --git a/man/pulse-client.conf.5 b/man/pulse-client.conf.5 index 77ca52f..516f97d 100644 --- a/man/pulse-client.conf.5 +++ b/man/pulse-client.conf.5 @@ -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 \fBno\f1. +\fBautospawn=\f1 Autospawn a PulseAudio daemon when needed. Takes a boolean value, defaults to \fByes\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 7025df7..45f02da 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>@PA_DEFAULT_AUTOSPAWN@</opt>.</p> + needed. Takes a boolean value, defaults to <opt>yes</opt>.</p> </option> <option> @@ -2770,7 +2770,7 @@ msgstr "Pas de boost" #: ../src/modules/alsa/alsa-mixer.c:2239 msgid "Speaker" -msgstr "" +msgstr "Haut-parleur" #: ../src/modules/alsa/alsa-mixer.c:2240 ../src/modules/alsa/alsa-mixer.c:2311 msgid "Headphones" @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-11 14:59+0100\n" -"PO-Revision-Date: 2014-02-11 15:00+0100\n" +"POT-Creation-Date: 2014-11-22 20:13+0100\n" +"PO-Revision-Date: 2014-11-22 20:14+0100\n" "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n" "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n" "Language: pl\n" @@ -16,10 +16,6 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: ../src/daemon/caps.c:54 -msgid "Cleaning up privileges." -msgstr "Czyszczenie uprawnień." - #: ../src/daemon/cmdline.c:113 #, c-format msgid "" @@ -269,47 +265,47 @@ msgstr "[%s:%u] Nieprawidłowy rlimit \"%s\"." msgid "[%s:%u] Invalid sample format '%s'." msgstr "[%s:%u] Nieprawidłowy format próbki \"%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] Nieprawidłowa częstotliwość próbki \"%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] Nieprawidłowe kanały próbki \"%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] Nieprawidłowa mapa kanałów \"%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] Nieprawidłowa liczba fragmentów \"%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] Nieprawidłowy rozmiar fragmentu \"%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] Nieprawidłowy poziom nice \"%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] Nieprawidłowy typ serwera \"%s\"." -#: ../src/daemon/daemon-conf.c:615 +#: ../src/daemon/daemon-conf.c:613 #, c-format msgid "Failed to open configuration file: %s" msgstr "Otwarcie pliku konfiguracji się nie powiodł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." @@ -317,7 +313,7 @@ msgstr "" "Podana domyślna mapa kanałów ma inną liczbę kanałów niż podana domyślna " "liczba kanałów." -#: ../src/daemon/daemon-conf.c:718 +#: ../src/daemon/daemon-conf.c:716 #, c-format msgid "### Read from configuration file: %s ###\n" msgstr "### Odczytano z pliku konfiguracji: %s ###\n" @@ -385,78 +381,55 @@ msgstr "Przydzielenie nowego programu wczytującego dl się nie powiodło." msgid "Failed to add bind-now-loader." msgstr "Dodanie bind-now-loader się nie powiodło." -#: ../src/daemon/main.c:139 -#, c-format -msgid "Got signal %s." -msgstr "Otrzymano sygnał %s." - -#: ../src/daemon/main.c:166 -msgid "Exiting." -msgstr "Kończenie działania." - -#: ../src/daemon/main.c:184 +#: ../src/daemon/main.c:162 #, c-format msgid "Failed to find user '%s'." msgstr "Odnalezienie użytkownika \"%s\" się nie powiodło." -#: ../src/daemon/main.c:189 +#: ../src/daemon/main.c:167 #, c-format msgid "Failed to find group '%s'." msgstr "Odnalezienie grupy \"%s\" się nie powiodło." -#: ../src/daemon/main.c:193 -#, c-format -msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)." -msgstr "Odnaleziono użytkownika \"%s\" (UID %lu) i grupę \"%s\" (GID %lu)." - -#: ../src/daemon/main.c:198 +#: ../src/daemon/main.c:176 #, c-format msgid "GID of user '%s' and of group '%s' don't match." msgstr "GID użytkownika \"%s\" i grupy \"%s\" się nie zgadzają." -#: ../src/daemon/main.c:203 +#: ../src/daemon/main.c:181 #, c-format msgid "Home directory of user '%s' is not '%s', ignoring." msgstr "Katalogiem domowym użytkownika \"%s\" nie jest \"%s\", ignorowanie." -#: ../src/daemon/main.c:206 ../src/daemon/main.c:211 +#: ../src/daemon/main.c:184 ../src/daemon/main.c:189 #, c-format msgid "Failed to create '%s': %s" msgstr "Utworzenie \"%s\" się nie powiodło: %s" -#: ../src/daemon/main.c:218 +#: ../src/daemon/main.c:196 #, c-format msgid "Failed to change group list: %s" msgstr "Zmiana listy grup się nie powiodła: %s" -#: ../src/daemon/main.c:234 +#: ../src/daemon/main.c:212 #, c-format msgid "Failed to change GID: %s" msgstr "Zmiana GID się nie powiodła: %s" -#: ../src/daemon/main.c:250 +#: ../src/daemon/main.c:228 #, c-format msgid "Failed to change UID: %s" msgstr "Zmiana UID się nie powiodła: %s" -#: ../src/daemon/main.c:271 -msgid "Successfully changed user to \"" -msgstr "Pomyślnie zmieniono użytkownika na \"" - -#: ../src/daemon/main.c:279 +#: ../src/daemon/main.c:257 msgid "System wide mode unsupported on this platform." msgstr "Tryb systemowy nie jest obsługiwany na tej platformie." -#: ../src/daemon/main.c:297 -#, c-format -msgid "setrlimit(%s, (%u, %u)) failed: %s" -msgstr "setrlimit(%s, (%u, %u)) się nie powiodło: %s" - -#: ../src/daemon/main.c:498 +#: ../src/daemon/main.c:486 msgid "Failed to parse command line." msgstr "Przetworzenie wiersza poleceń się nie powiodło." -#: ../src/daemon/main.c:537 +#: ../src/daemon/main.c:525 msgid "" "System mode refused for non-root user. Only starting the D-Bus server lookup " "service." @@ -464,21 +437,12 @@ msgstr "" "Odmówiono trybu systemowego dla użytkownika nie będącego rootem. " "Uruchamianie tylko usługi wyszukiwania serwera D-Bus." -#: ../src/daemon/main.c:619 -msgid "Daemon not running" -msgstr "Usługa nie jest uruchomiona" - -#: ../src/daemon/main.c:621 -#, c-format -msgid "Daemon running as PID %u" -msgstr "Usługa jest uruchomiona jako PID %u" - -#: ../src/daemon/main.c:636 +#: ../src/daemon/main.c:624 #, c-format msgid "Failed to kill daemon: %s" msgstr "Zniszczenie usługi się nie powiodło: %s" -#: ../src/daemon/main.c:665 +#: ../src/daemon/main.c:653 msgid "" "This program is not intended to be run as root (unless --system is " "specified)." @@ -486,22 +450,22 @@ msgstr "" "Ten program nie powinien być uruchamiany jako root (chyba, że podano --" "system)." -#: ../src/daemon/main.c:668 +#: ../src/daemon/main.c:656 msgid "Root privileges required." msgstr "Wymagane są uprawnienia roota." -#: ../src/daemon/main.c:675 +#: ../src/daemon/main.c:663 msgid "--start not supported for system instances." msgstr "--start nie jest obsługiwane przy uruchamianiu systemowym." -#: ../src/daemon/main.c:715 +#: ../src/daemon/main.c:703 #, c-format msgid "User-configured server at %s, refusing to start/autospawn." msgstr "" "Serwer skonfigurowany przez użytkownika w %s, odmawianie uruchomienia/" "automatycznego wznowienia." -#: ../src/daemon/main.c:721 +#: ../src/daemon/main.c:709 #, c-format msgid "" "User-configured server at %s, which appears to be local. Probing deeper." @@ -509,162 +473,60 @@ msgstr "" "Serwer skonfigurowany przez użytkownika w %s, który jest lokalny. Dalsze " "wykrywanie." -#: ../src/daemon/main.c:726 +#: ../src/daemon/main.c:714 msgid "Running in system mode, but --disallow-exit not set!" msgstr "" "Uruchamianie w trybie systemowym, ale --disallow-exit nie jest ustawione." -#: ../src/daemon/main.c:729 +#: ../src/daemon/main.c:717 msgid "Running in system mode, but --disallow-module-loading not set!" msgstr "" "Uruchamianie w trybie systemowym, ale --disallow-module-loading nie jest " "ustawione." -#: ../src/daemon/main.c:732 +#: ../src/daemon/main.c:720 msgid "Running in system mode, forcibly disabling SHM mode!" msgstr "Uruchamianie w trybie systemowym, wymuszanie wyłączenia trybu SHM." -#: ../src/daemon/main.c:737 +#: ../src/daemon/main.c:725 msgid "Running in system mode, forcibly disabling exit idle time!" msgstr "" "Uruchamianie w trybie systemowym, wymuszanie wyłączenia czasu oczekiwania na " "zakończenie." -#: ../src/daemon/main.c:765 +#: ../src/daemon/main.c:758 msgid "Failed to acquire stdio." msgstr "Uzyskanie standardowego wejścia/wyjścia się nie powiodło." -#: ../src/daemon/main.c:771 ../src/daemon/main.c:842 +#: ../src/daemon/main.c:764 ../src/daemon/main.c:835 #, c-format msgid "pipe() failed: %s" msgstr "pipe() się nie powiodło: %s" -#: ../src/daemon/main.c:776 ../src/daemon/main.c:847 +#: ../src/daemon/main.c:769 ../src/daemon/main.c:840 #, c-format msgid "fork() failed: %s" msgstr "fork() się nie powiodło: %s" -#: ../src/daemon/main.c:791 ../src/daemon/main.c:862 ../src/utils/pacat.c:569 +#: ../src/daemon/main.c:784 ../src/daemon/main.c:855 ../src/utils/pacat.c:569 #, c-format msgid "read() failed: %s" msgstr "read() się nie powiodło: %s" -#: ../src/daemon/main.c:797 +#: ../src/daemon/main.c:790 msgid "Daemon startup failed." msgstr "Uruchomienie usługi się nie powiodło." -#: ../src/daemon/main.c:799 -msgid "Daemon startup successful." -msgstr "Pomyślnie uruchomiono usługę." - -#: ../src/daemon/main.c:830 +#: ../src/daemon/main.c:823 #, c-format msgid "setsid() failed: %s" msgstr "setsid() się nie powiodło: %s" -#: ../src/daemon/main.c:916 -#, c-format -msgid "This is PulseAudio %s" -msgstr "To jest PulseAudio %s" - -#: ../src/daemon/main.c:917 -#, c-format -msgid "Compilation host: %s" -msgstr "Komputer kompilacji: %s" - -#: ../src/daemon/main.c:918 ../src/tests/resampler-test.c:418 -#, c-format -msgid "Compilation CFLAGS: %s" -msgstr "CFLAGS kompilacji: %s" - -#: ../src/daemon/main.c:921 -#, c-format -msgid "Running on host: %s" -msgstr "Uruchamianie na komputerze: %s" - -#: ../src/daemon/main.c:924 -#, c-format -msgid "Found %u CPUs." -msgstr "Odnaleziono %u procesorów." - -#: ../src/daemon/main.c:926 -#, c-format -msgid "Page size is %lu bytes" -msgstr "Rozmiar strony to %lu bajtów" - -#: ../src/daemon/main.c:929 -msgid "Compiled with Valgrind support: yes" -msgstr "Skompilowano z obsługą Valgrind: tak" - -#: ../src/daemon/main.c:931 -msgid "Compiled with Valgrind support: no" -msgstr "Skompilowano z obsługą Valgrind: nie" - -#: ../src/daemon/main.c:934 -#, c-format -msgid "Running in valgrind mode: %s" -msgstr "Uruchamianie w trybie Valgrind: %s" - -#: ../src/daemon/main.c:936 -#, c-format -msgid "Running in VM: %s" -msgstr "Uruchamianie w maszynie wirtualnej: %s" - -#: ../src/daemon/main.c:939 -msgid "Optimized build: yes" -msgstr "Budowanie optymalizowane: tak" - -#: ../src/daemon/main.c:941 -msgid "Optimized build: no" -msgstr "Budowanie optymalizowane: nie" - -#: ../src/daemon/main.c:945 -msgid "NDEBUG defined, all asserts disabled." -msgstr "Podano NDEBUG, wszystkie asercje zostały wyłączone." - -#: ../src/daemon/main.c:947 -msgid "FASTPATH defined, only fast path asserts disabled." -msgstr "Podano FASTPATH, tylko szybkie asercje ścieżek zostały wyłączone." - -#: ../src/daemon/main.c:949 -msgid "All asserts enabled." -msgstr "Wszystkie asercje są włączone." - -#: ../src/daemon/main.c:953 +#: ../src/daemon/main.c:950 msgid "Failed to get machine ID" msgstr "Uzyskanie identyfikatora komputera się nie powiodło" -#: ../src/daemon/main.c:956 -#, c-format -msgid "Machine ID is %s." -msgstr "Identyfikator komputera to %s." - -#: ../src/daemon/main.c:960 -#, c-format -msgid "Session ID is %s." -msgstr "Identyfikator sesji to %s." - -#: ../src/daemon/main.c:966 -#, c-format -msgid "Using runtime directory %s." -msgstr "Używanie katalogu wykonywania %s." - -#: ../src/daemon/main.c:971 -#, c-format -msgid "Using state directory %s." -msgstr "Używanie katalogu stanu %s." - -#: ../src/daemon/main.c:974 -#, c-format -msgid "Using modules directory %s." -msgstr "Używanie katalogu modułów %s." - #: ../src/daemon/main.c:976 -#, c-format -msgid "Running in system mode: %s" -msgstr "Uruchamianie w trybie systemowym: %s" - -#: ../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" @@ -680,47 +542,23 @@ msgstr "" "Proszę przeczytać http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode, " "gdzie wyjaśniono, dlaczego tryb systemowy jest zwykle złym pomysłem." -#: ../src/daemon/main.c:996 +#: ../src/daemon/main.c:993 msgid "pa_pid_file_create() failed." msgstr "pa_pid_file_create() się nie powiodło." -#: ../src/daemon/main.c:1006 -msgid "Fresh high-resolution timers available! Bon appetit!" -msgstr "Świeże zegary o wysokiej rozdzielczości! Smacznego!" - -#: ../src/daemon/main.c:1008 -msgid "" -"Dude, your kernel stinks! The chef's recommendation today is Linux with high-" -"resolution timers enabled!" -msgstr "" -"Koleś, twoje jądro śmierdzi! Szef kuchni poleca dzisiaj Linuksa z włączonymi " -"zegarami o wysokiej rozdzielczości!" - -#: ../src/daemon/main.c:1026 +#: ../src/daemon/main.c:1023 msgid "pa_core_new() failed." msgstr "pa_core_new() się nie powiodło." -#: ../src/daemon/main.c:1104 +#: ../src/daemon/main.c:1090 msgid "Failed to initialize daemon." msgstr "Zainicjowanie usługi się nie powiodło." -#: ../src/daemon/main.c:1109 +#: ../src/daemon/main.c:1095 msgid "Daemon startup without any loaded modules, refusing to work." msgstr "" "Uruchamianie usługi bez żadnych wczytanych modułów, odmawianie działania." -#: ../src/daemon/main.c:1147 -msgid "Daemon startup complete." -msgstr "Ukończono uruchamianie usługi." - -#: ../src/daemon/main.c:1153 -msgid "Daemon shutdown initiated." -msgstr "Zainicjowano wyłączenie usługi." - -#: ../src/daemon/main.c:1184 -msgid "Daemon terminated." -msgstr "Usługa została zniszczona." - #: ../src/daemon/pulseaudio.desktop.in.h:1 msgid "PulseAudio Sound System" msgstr "System dźwięku PulseAudio" @@ -729,268 +567,260 @@ msgstr "System dźwięku PulseAudio" msgid "Start the PulseAudio Sound System" msgstr "Uruchomienie systemu dźwięku PulseAudio" -#: ../src/daemon/pulseaudio-kde.desktop.in.h:1 -msgid "PulseAudio Sound System KDE Routing Policy" -msgstr "Polityka trasowania dla KDE systemu dźwięku PulseAudio" - -#: ../src/daemon/pulseaudio-kde.desktop.in.h:2 -msgid "Start the PulseAudio Sound System with KDE Routing Policy" -msgstr "Uruchomienie systemu dźwięku PulseAudio z polityką trasowania dla KDE" - -#: ../src/modules/alsa/alsa-mixer.c:2251 +#: ../src/modules/alsa/alsa-mixer.c:2293 msgid "Input" msgstr "Wejście" -#: ../src/modules/alsa/alsa-mixer.c:2252 +#: ../src/modules/alsa/alsa-mixer.c:2294 msgid "Docking Station Input" msgstr "Wejście stacji dokującej" -#: ../src/modules/alsa/alsa-mixer.c:2253 +#: ../src/modules/alsa/alsa-mixer.c:2295 msgid "Docking Station Microphone" msgstr "Mikrofon stacji dokującej" -#: ../src/modules/alsa/alsa-mixer.c:2254 +#: ../src/modules/alsa/alsa-mixer.c:2296 msgid "Docking Station Line In" msgstr "Wejście liniowe stacji dokującej" -#: ../src/modules/alsa/alsa-mixer.c:2255 ../src/modules/alsa/alsa-mixer.c:2340 +#: ../src/modules/alsa/alsa-mixer.c:2297 ../src/modules/alsa/alsa-mixer.c:2382 msgid "Line In" msgstr "Wejście liniowe" -#: ../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/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2376 +#: ../src/modules/bluetooth/module-bluez4-device.c:2104 +#: ../src/modules/bluetooth/module-bluez5-device.c:1712 msgid "Microphone" msgstr "Mikrofon" -#: ../src/modules/alsa/alsa-mixer.c:2257 ../src/modules/alsa/alsa-mixer.c:2335 +#: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377 msgid "Front Microphone" msgstr "Przedni mikrofon" -#: ../src/modules/alsa/alsa-mixer.c:2258 ../src/modules/alsa/alsa-mixer.c:2336 +#: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378 msgid "Rear Microphone" msgstr "Tylny mikrofon" -#: ../src/modules/alsa/alsa-mixer.c:2259 +#: ../src/modules/alsa/alsa-mixer.c:2301 msgid "External Microphone" msgstr "Zewnętrzny mikrofon" -#: ../src/modules/alsa/alsa-mixer.c:2260 ../src/modules/alsa/alsa-mixer.c:2338 +#: ../src/modules/alsa/alsa-mixer.c:2302 ../src/modules/alsa/alsa-mixer.c:2380 msgid "Internal Microphone" msgstr "Wewnętrzny mikrofon" -#: ../src/modules/alsa/alsa-mixer.c:2261 ../src/modules/alsa/alsa-mixer.c:2341 +#: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2383 msgid "Radio" msgstr "Radio" -#: ../src/modules/alsa/alsa-mixer.c:2262 ../src/modules/alsa/alsa-mixer.c:2342 +#: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2384 msgid "Video" msgstr "Wideo" -#: ../src/modules/alsa/alsa-mixer.c:2263 +#: ../src/modules/alsa/alsa-mixer.c:2305 msgid "Automatic Gain Control" msgstr "Automatyczna kontrola natężenia" -#: ../src/modules/alsa/alsa-mixer.c:2264 +#: ../src/modules/alsa/alsa-mixer.c:2306 msgid "No Automatic Gain Control" msgstr "Brak automatycznej kontroli natężenia" -#: ../src/modules/alsa/alsa-mixer.c:2265 +#: ../src/modules/alsa/alsa-mixer.c:2307 msgid "Boost" msgstr "Podbicie" -#: ../src/modules/alsa/alsa-mixer.c:2266 +#: ../src/modules/alsa/alsa-mixer.c:2308 msgid "No Boost" msgstr "Brak podbicia" -#: ../src/modules/alsa/alsa-mixer.c:2267 +#: ../src/modules/alsa/alsa-mixer.c:2309 msgid "Amplifier" msgstr "Amplituner" -#: ../src/modules/alsa/alsa-mixer.c:2268 +#: ../src/modules/alsa/alsa-mixer.c:2310 msgid "No Amplifier" msgstr "Brak amplitunera" -#: ../src/modules/alsa/alsa-mixer.c:2269 +#: ../src/modules/alsa/alsa-mixer.c:2311 msgid "Bass Boost" msgstr "Podbicie basów" -#: ../src/modules/alsa/alsa-mixer.c:2270 +#: ../src/modules/alsa/alsa-mixer.c:2312 msgid "No Bass Boost" msgstr "Brak podbicia basów" -#: ../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/alsa/alsa-mixer.c:2313 +#: ../src/modules/bluetooth/module-bluez4-device.c:2109 +#: ../src/modules/bluetooth/module-bluez5-device.c:1719 msgid "Speaker" msgstr "Głośnik" -#: ../src/modules/alsa/alsa-mixer.c:2272 ../src/modules/alsa/alsa-mixer.c:2344 +#: ../src/modules/alsa/alsa-mixer.c:2314 ../src/modules/alsa/alsa-mixer.c:2386 msgid "Headphones" msgstr "Słuchawki" -#: ../src/modules/alsa/alsa-mixer.c:2333 +#: ../src/modules/alsa/alsa-mixer.c:2375 msgid "Analog Input" msgstr "Wejście analogowe" -#: ../src/modules/alsa/alsa-mixer.c:2337 +#: ../src/modules/alsa/alsa-mixer.c:2379 msgid "Dock Microphone" msgstr "Mikrofon stacji dokującej" -#: ../src/modules/alsa/alsa-mixer.c:2339 +#: ../src/modules/alsa/alsa-mixer.c:2381 msgid "Headset Microphone" msgstr "Mikrofon na słuchawkach" -#: ../src/modules/alsa/alsa-mixer.c:2343 +#: ../src/modules/alsa/alsa-mixer.c:2385 msgid "Analog Output" msgstr "Wyjście analogowe" -#: ../src/modules/alsa/alsa-mixer.c:2345 +#: ../src/modules/alsa/alsa-mixer.c:2387 msgid "LFE on Separate Mono Output" msgstr "Subwoofer na oddzielnym wyjściu mono" -#: ../src/modules/alsa/alsa-mixer.c:2346 +#: ../src/modules/alsa/alsa-mixer.c:2388 msgid "Line Out" msgstr "Wyjście liniowe" -#: ../src/modules/alsa/alsa-mixer.c:2347 +#: ../src/modules/alsa/alsa-mixer.c:2389 msgid "Analog Mono Output" msgstr "Analogowe wyjście mono" -#: ../src/modules/alsa/alsa-mixer.c:2348 +#: ../src/modules/alsa/alsa-mixer.c:2390 msgid "Speakers" msgstr "Głośniki" -#: ../src/modules/alsa/alsa-mixer.c:2349 +#: ../src/modules/alsa/alsa-mixer.c:2391 msgid "HDMI / DisplayPort" msgstr "HDMI/DisplayPort" -#: ../src/modules/alsa/alsa-mixer.c:2350 +#: ../src/modules/alsa/alsa-mixer.c:2392 msgid "Digital Output (S/PDIF)" msgstr "Wyjście cyfrowe (S/PDIF)" -#: ../src/modules/alsa/alsa-mixer.c:2351 +#: ../src/modules/alsa/alsa-mixer.c:2393 msgid "Digital Input (S/PDIF)" msgstr "Wejście cyfrowe (S/PDIF)" -#: ../src/modules/alsa/alsa-mixer.c:2352 +#: ../src/modules/alsa/alsa-mixer.c:2394 msgid "Digital Passthrough (S/PDIF)" msgstr "Cyfrowe przekazywanie (S/PDIF)" -#: ../src/modules/alsa/alsa-mixer.c:3807 +#: ../src/modules/alsa/alsa-mixer.c:3900 msgid "Analog Mono" msgstr "Analogowe mono" -#: ../src/modules/alsa/alsa-mixer.c:3808 +#: ../src/modules/alsa/alsa-mixer.c:3901 msgid "Analog Stereo" msgstr "Analogowe stereo" -#: ../src/modules/alsa/alsa-mixer.c:3809 +#: ../src/modules/alsa/alsa-mixer.c:3902 +msgid "Multichannel" +msgstr "Wielokanałowe" + +#: ../src/modules/alsa/alsa-mixer.c:3903 msgid "Analog Surround 2.1" msgstr "Analogowe surround 2.1" -#: ../src/modules/alsa/alsa-mixer.c:3810 +#: ../src/modules/alsa/alsa-mixer.c:3904 msgid "Analog Surround 3.0" msgstr "Analogowe surround 3.0" -#: ../src/modules/alsa/alsa-mixer.c:3811 +#: ../src/modules/alsa/alsa-mixer.c:3905 msgid "Analog Surround 3.1" msgstr "Analogowe surround 3.1" -#: ../src/modules/alsa/alsa-mixer.c:3812 +#: ../src/modules/alsa/alsa-mixer.c:3906 msgid "Analog Surround 4.0" msgstr "Analogowe surround 4.0" -#: ../src/modules/alsa/alsa-mixer.c:3813 +#: ../src/modules/alsa/alsa-mixer.c:3907 msgid "Analog Surround 4.1" msgstr "Analogowe surround 4.1" -#: ../src/modules/alsa/alsa-mixer.c:3814 +#: ../src/modules/alsa/alsa-mixer.c:3908 msgid "Analog Surround 5.0" msgstr "Analogowe surround 5.0" -#: ../src/modules/alsa/alsa-mixer.c:3815 +#: ../src/modules/alsa/alsa-mixer.c:3909 msgid "Analog Surround 5.1" msgstr "Analogowe surround 5.1" -#: ../src/modules/alsa/alsa-mixer.c:3816 +#: ../src/modules/alsa/alsa-mixer.c:3910 msgid "Analog Surround 6.0" msgstr "Analogowe surround 6.0" -#: ../src/modules/alsa/alsa-mixer.c:3817 +#: ../src/modules/alsa/alsa-mixer.c:3911 msgid "Analog Surround 6.1" msgstr "Analogowe surround 6.1" -#: ../src/modules/alsa/alsa-mixer.c:3818 +#: ../src/modules/alsa/alsa-mixer.c:3912 msgid "Analog Surround 7.0" msgstr "Analogowe surround 7.0" -#: ../src/modules/alsa/alsa-mixer.c:3819 +#: ../src/modules/alsa/alsa-mixer.c:3913 msgid "Analog Surround 7.1" msgstr "Analogowe surround 7.1" -#: ../src/modules/alsa/alsa-mixer.c:3820 -msgid "Analog 4-channel Input" -msgstr "Czterokanałowe wejście analogowe" - -#: ../src/modules/alsa/alsa-mixer.c:3821 +#: ../src/modules/alsa/alsa-mixer.c:3914 msgid "Digital Stereo (IEC958)" msgstr "Cyfrowe stereo (IEC958)" -#: ../src/modules/alsa/alsa-mixer.c:3822 +#: ../src/modules/alsa/alsa-mixer.c:3915 msgid "Digital Passthrough (IEC958)" msgstr "Cyfrowe przekazywanie (IEC958)" -#: ../src/modules/alsa/alsa-mixer.c:3823 +#: ../src/modules/alsa/alsa-mixer.c:3916 msgid "Digital Surround 4.0 (IEC958/AC3)" msgstr "Cyfrowe surround 4.0 (IEC958/AC3)" -#: ../src/modules/alsa/alsa-mixer.c:3824 +#: ../src/modules/alsa/alsa-mixer.c:3917 msgid "Digital Surround 5.1 (IEC958/AC3)" msgstr "Cyfrowe surround 5.1 (IEC958/AC3)" -#: ../src/modules/alsa/alsa-mixer.c:3825 +#: ../src/modules/alsa/alsa-mixer.c:3918 msgid "Digital Surround 5.1 (IEC958/DTS)" msgstr "Cyfrowe surround 5.1 (IEC958/DTS)" -#: ../src/modules/alsa/alsa-mixer.c:3826 +#: ../src/modules/alsa/alsa-mixer.c:3919 msgid "Digital Stereo (HDMI)" msgstr "Cyfrowe stereo (HDMI)" -#: ../src/modules/alsa/alsa-mixer.c:3827 +#: ../src/modules/alsa/alsa-mixer.c:3920 msgid "Digital Surround 5.1 (HDMI)" msgstr "Cyfrowe surround 5.1 (HDMI)" -#: ../src/modules/alsa/alsa-mixer.c:3956 +#: ../src/modules/alsa/alsa-mixer.c:4051 msgid "Analog Mono Duplex" msgstr "Analogowy dupleks mono" -#: ../src/modules/alsa/alsa-mixer.c:3957 +#: ../src/modules/alsa/alsa-mixer.c:4052 msgid "Analog Stereo Duplex" msgstr "Analogowy dupleks stereo" -#: ../src/modules/alsa/alsa-mixer.c:3958 +#: ../src/modules/alsa/alsa-mixer.c:4053 msgid "Digital Stereo Duplex (IEC958)" msgstr "Cyfrowy dupleks stereo (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/alsa/alsa-mixer.c:4054 +#: ../src/modules/alsa/module-alsa-card.c:192 +#: ../src/modules/bluetooth/module-bluez4-device.c:2300 +#: ../src/modules/bluetooth/module-bluez5-device.c:1943 msgid "Off" msgstr "Wyłączone" -#: ../src/modules/alsa/alsa-mixer.c:4058 +#: ../src/modules/alsa/alsa-mixer.c:4153 #, c-format msgid "%s Output" msgstr "Wyjście %s" -#: ../src/modules/alsa/alsa-mixer.c:4066 +#: ../src/modules/alsa/alsa-mixer.c:4161 #, c-format msgid "%s Input" msgstr "Wejście %s" -#: ../src/modules/alsa/alsa-sink.c:570 ../src/modules/alsa/alsa-sink.c:748 +#: ../src/modules/alsa/alsa-sink.c:572 ../src/modules/alsa/alsa-sink.c:749 #, c-format msgid "" "ALSA woke us up to write new data to the device, but there was actually " @@ -1007,7 +837,7 @@ msgstr "" "Wybudzono za pomocą ustawienia POLLOUT - ale jednoczesne wywołanie " "snd_pcm_avail() zwróciło zero lub inną wartość < min_avail." -#: ../src/modules/alsa/alsa-source.c:529 ../src/modules/alsa/alsa-source.c:681 +#: ../src/modules/alsa/alsa-source.c:531 ../src/modules/alsa/alsa-source.c:682 #, c-format msgid "" "ALSA woke us up to read new data from the device, but there was actually " @@ -1024,7 +854,7 @@ msgstr "" "Wybudzono za pomocą ustawienia POLLIN - ale jednoczesne wywołanie " "snd_pcm_avail() zwróciło zero lub inną wartość < min_avail." -#: ../src/modules/alsa/alsa-util.c:1134 ../src/modules/alsa/alsa-util.c:1209 +#: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1211 #, c-format msgid "" "snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu " @@ -1036,7 +866,7 @@ msgstr "" "Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten " "problem programistom usługi ALSA." -#: ../src/modules/alsa/alsa-util.c:1184 +#: ../src/modules/alsa/alsa-util.c:1186 #, c-format msgid "" "snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s" @@ -1048,7 +878,7 @@ msgstr "" "Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten " "problem programistom usługi ALSA." -#: ../src/modules/alsa/alsa-util.c:1225 +#: ../src/modules/alsa/alsa-util.c:1227 #, c-format msgid "" "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail " @@ -1061,7 +891,7 @@ msgstr "" "Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten " "problem programistom usługi ALSA." -#: ../src/modules/alsa/alsa-util.c:1268 +#: ../src/modules/alsa/alsa-util.c:1270 #, c-format msgid "" "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes " @@ -1073,82 +903,88 @@ msgstr "" "Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten " "problem programistom usługi ALSA." -#: ../src/modules/bluetooth/module-bluez4-device.c:2087 -#: ../src/modules/bluetooth/module-bluez5-device.c:1437 +#: ../src/modules/bluetooth/module-bluez4-device.c:2094 +#: ../src/modules/bluetooth/module-bluez5-device.c:1702 msgid "Headset" msgstr "Słuchawki z mikrofonem" -#: ../src/modules/bluetooth/module-bluez4-device.c:2092 -#: ../src/modules/bluetooth/module-bluez5-device.c:1442 +#: ../src/modules/bluetooth/module-bluez4-device.c:2099 +#: ../src/modules/bluetooth/module-bluez5-device.c:1707 msgid "Handsfree" msgstr "Zestaw głośnomówiący" -#: ../src/modules/bluetooth/module-bluez4-device.c:2107 -#: ../src/modules/bluetooth/module-bluez5-device.c:1460 +#: ../src/modules/bluetooth/module-bluez4-device.c:2114 +#: ../src/modules/bluetooth/module-bluez5-device.c:1725 msgid "Headphone" msgstr "Słuchawki" -#: ../src/modules/bluetooth/module-bluez4-device.c:2112 -#: ../src/modules/bluetooth/module-bluez5-device.c:1465 +#: ../src/modules/bluetooth/module-bluez4-device.c:2119 +#: ../src/modules/bluetooth/module-bluez5-device.c:1730 msgid "Portable" msgstr "Przenośne" -#: ../src/modules/bluetooth/module-bluez4-device.c:2117 -#: ../src/modules/bluetooth/module-bluez5-device.c:1470 +#: ../src/modules/bluetooth/module-bluez4-device.c:2124 +#: ../src/modules/bluetooth/module-bluez5-device.c:1735 msgid "Car" msgstr "Samochód" -#: ../src/modules/bluetooth/module-bluez4-device.c:2122 -#: ../src/modules/bluetooth/module-bluez5-device.c:1475 +#: ../src/modules/bluetooth/module-bluez4-device.c:2129 +#: ../src/modules/bluetooth/module-bluez5-device.c:1740 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:2134 +#: ../src/modules/bluetooth/module-bluez5-device.c:1745 msgid "Phone" msgstr "Telefon" -#: ../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:2142 +#: ../src/modules/bluetooth/module-bluez5-device.c:1697 +#: ../src/modules/bluetooth/module-bluez5-device.c:1713 +#: ../src/modules/bluetooth/module-bluez5-device.c:1751 msgid "Bluetooth Output" msgstr "Wyjście 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:2145 +#: ../src/modules/bluetooth/module-bluez5-device.c:1696 +#: ../src/modules/bluetooth/module-bluez5-device.c:1718 +#: ../src/modules/bluetooth/module-bluez5-device.c:1724 +#: ../src/modules/bluetooth/module-bluez5-device.c:1750 msgid "Bluetooth Input" msgstr "Wejście Bluetooth" -#: ../src/modules/bluetooth/module-bluez4-device.c:2174 +#: ../src/modules/bluetooth/module-bluez4-device.c:2181 msgid "High Fidelity Playback (A2DP)" msgstr "Odtwarzanie o wysokiej dokładności (A2DP)" -#: ../src/modules/bluetooth/module-bluez4-device.c:2185 +#: ../src/modules/bluetooth/module-bluez4-device.c:2192 msgid "High Fidelity Capture (A2DP)" msgstr "Przechwytywanie o wysokiej dokładności (A2DP)" -#: ../src/modules/bluetooth/module-bluez4-device.c:2196 +#: ../src/modules/bluetooth/module-bluez4-device.c:2203 msgid "Telephony Duplex (HSP/HFP)" msgstr "Duplex telefoniczny (HSP/HFP)" -#: ../src/modules/bluetooth/module-bluez4-device.c:2208 +#: ../src/modules/bluetooth/module-bluez4-device.c:2215 msgid "Handsfree Gateway" msgstr "Zestaw głośnomówiący" -#. 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:1788 msgid "High Fidelity Playback (A2DP Sink)" msgstr "Odtwarzanie o wysokiej dokładności (odpływ A2DP)" -#: ../src/modules/bluetooth/module-bluez5-device.c:1536 +#: ../src/modules/bluetooth/module-bluez5-device.c:1799 msgid "High Fidelity Capture (A2DP Source)" msgstr "Przechwytywanie o wysokiej dokładności (źródło A2DP)" +#: ../src/modules/bluetooth/module-bluez5-device.c:1810 +msgid "Headset Head Unit (HSP/HFP)" +msgstr "Jednostka główna słuchawek z mikrofonem (HSP/HFP)" + +#: ../src/modules/bluetooth/module-bluez5-device.c:1822 +msgid "Headset Audio Gateway (HSP/HFP)" +msgstr "Zestaw słuchawek z mikrofonem (HSP/HFP)" + #: ../src/modules/echo-cancel/module-echo-cancel.c:63 msgid "" "source_name=<name for the source> source_properties=<properties for the " @@ -1257,14 +1093,14 @@ msgstr "Dźwięk na @HOSTNAME@" #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus' #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus' -#: ../src/modules/module-tunnel-sink-new.c:293 -#: ../src/modules/module-tunnel-source-new.c:294 +#: ../src/modules/module-tunnel-sink-new.c:300 +#: ../src/modules/module-tunnel-source-new.c:307 #, c-format msgid "Tunnel for %s@%s" msgstr "Tunel dla %s@%s" -#: ../src/modules/module-tunnel-sink-new.c:483 -#: ../src/modules/module-tunnel-source-new.c:485 +#: ../src/modules/module-tunnel-sink-new.c:510 +#: ../src/modules/module-tunnel-source-new.c:518 #, c-format msgid "Tunnel to %s/%s" msgstr "Tunel do %s/%s" @@ -1291,7 +1127,7 @@ msgstr "" msgid "PulseAudio Sound Server" msgstr "Serwer dźwięku PulseAudio" -#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:754 +#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:760 msgid "Mono" msgstr "Mono" @@ -1503,66 +1339,92 @@ msgstr "Górny tylny prawy" msgid "(invalid)" msgstr "(nieprawidłowe)" -#: ../src/pulse/channelmap.c:758 +#: ../src/pulse/channelmap.c:764 msgid "Stereo" msgstr "Stereo" -#: ../src/pulse/channelmap.c:763 +#: ../src/pulse/channelmap.c:769 msgid "Surround 4.0" msgstr "Surround 4.0" -#: ../src/pulse/channelmap.c:769 +#: ../src/pulse/channelmap.c:775 msgid "Surround 4.1" msgstr "Surround 4.1" -#: ../src/pulse/channelmap.c:775 +#: ../src/pulse/channelmap.c:781 msgid "Surround 5.0" msgstr "Surround 5.0" -#: ../src/pulse/channelmap.c:781 +#: ../src/pulse/channelmap.c:787 msgid "Surround 5.1" msgstr "Surround 5.1" -#: ../src/pulse/channelmap.c:788 +#: ../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 "Otwarcie pliku konfiguracji \"%s\" się nie powiodło: %s" - -#: ../src/pulse/client-conf.c:213 ../src/pulse/client-conf-x11.c:95 -msgid "Failed to parse cookie data" -msgstr "Przetworzenie danych ciasteczka się nie powiodło" - -#: ../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() się nie powiodło: %s" -#: ../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() zwróciło wartość \"true\"" -#: ../src/pulse/context.c:528 -msgid "No cookie loaded. Attempting to connect without." -msgstr "Nie wczytano ciasteczka. Próba połączenia się bez niego." +#: ../src/pulse/client-conf-x11.c:96 +msgid "Failed to parse cookie data" +msgstr "Przetworzenie danych ciasteczka się nie powiodło" -#: ../src/pulse/context.c:609 +#: ../src/pulse/context.c:658 #, c-format msgid "fork(): %s" msgstr "fork(): %s" -#: ../src/pulse/context.c:664 +#: ../src/pulse/context.c:713 #, c-format msgid "waitpid(): %s" msgstr "waitpid(): %s" -#: ../src/pulse/context.c:1365 +#: ../src/pulse/context.c:1414 #, c-format msgid "Received message for unknown extension '%s'" msgstr "Otrzymano komunikat dla nieznanego rozszerzenia \"%s\"" +#: ../src/pulse/direction.c:39 +msgid "input" +msgstr "wejście" + +#: ../src/pulse/direction.c:41 +msgid "output" +msgstr "wyjście" + +#: ../src/pulse/direction.c:43 +msgid "bidirectional" +msgstr "dwukierunkowe" + +#: ../src/pulse/direction.c:45 +msgid "invalid" +msgstr "nieprawidłowe" + +#: ../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 "" +"Właścicielem XDG_RUNTIME_DIR (%s) nie jest UID %d, ale UID %d (może to być " +"spowodowane próbą połączenia do kopii PulseAudio niebędącej rootem jako " +"użytkownik root przez natywny protokół, czego nie należy robić)." + +#: ../src/pulsecore/core-util.h:95 +msgid "yes" +msgstr "tak" + +#: ../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 "Nie można uzyskać dostępu do blokady automatycznego wznawiania." @@ -1584,11 +1446,11 @@ msgstr "" msgid "Invalid log target." msgstr "Nieprawidłowy dziennik docelowy." -#: ../src/pulsecore/sink.c:3453 +#: ../src/pulsecore/sink.c:3429 msgid "Built-in Audio" msgstr "Wbudowany dźwięk" -#: ../src/pulsecore/sink.c:3458 +#: ../src/pulsecore/sink.c:3434 msgid "Modem" msgstr "Modem" @@ -1629,8 +1491,8 @@ msgid "Timeout" msgstr "Przekroczono czas oczekiwania" #: ../src/pulse/error.c:49 -msgid "No authorization key" -msgstr "Brak klucza upoważnienia" +msgid "No authentication key" +msgstr "Brak klucza uwierzytelnienia" #: ../src/pulse/error.c:50 msgid "Internal error" @@ -1783,11 +1645,6 @@ msgstr "" msgid "%s %s\n" msgstr "%s %s\n" -#: ../src/tests/resampler-test.c:419 -#, c-format -msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)" -msgstr "=== %d sekundy: %d Hz %d ch (%s) -> %d Hz %d ch (%s)" - #: ../src/utils/pacat.c:118 #, c-format msgid "Failed to drain stream: %s" @@ -1843,12 +1700,12 @@ msgstr "Metryka bufora: maxlength=%u, fragsize=%u" #: ../src/utils/pacat.c:355 #, c-format msgid "Using sample spec '%s', channel map '%s'." -msgstr "Używanie przykładowej specyfikacji \"%s\", mapa kanałów \"%s\"." +msgstr "Używanie przykładowego określenia \"%s\", mapa kanałów \"%s\"." #: ../src/utils/pacat.c:359 #, c-format -msgid "Connected to device %s (%u, %ssuspended)." -msgstr "Połączono się z urządzeniem %s (%u, %swstrzymane)." +msgid "Connected to device %s (index: %u, suspended: %s)." +msgstr "Połączono z urządzeniem %s (indeks: %u, wstrzymane: %s)." #: ../src/utils/pacat.c:369 #, c-format @@ -1931,7 +1788,7 @@ msgstr "Ustawienie strumienia monitora się nie powiodło: %s" msgid "pa_stream_connect_record() failed: %s" msgstr "pa_stream_connect_record() się nie powiodło: %s" -#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1388 +#: ../src/utils/pacat.c:531 ../src/utils/pactl.c:1448 #, c-format msgid "Connection failure: %s" msgstr "Połączenie się nie powiodło: %s" @@ -2000,16 +1857,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" @@ -2024,7 +1881,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 " @@ -2062,13 +1919,14 @@ msgstr "" " (domyślnie 2)\n" " --channel-map=MAPAKANAŁÓW Mapa kanałów używa zamiast\n" " domyślnej\n" -" --fix-format Pobiera format próbki z odpływu, z\n" -" jakim połączony jest strumień.\n" -" --fix-rate Pobiera częstotliwość sampli z\n" -" odpływu, z jakim połączony jest\n" +" --fix-format Pobiera format próbki z odpływu/\n" +" źródła, z jakim połączony jest\n" " strumień.\n" +" --fix-rate Pobiera częstotliwość sampli z\n" +" odpływu/źródła, z jakim połączony\n" +" jest strumień.\n" " --fix-channels Pobiera liczbę kanałów i mapę\n" -" kanałów z odpływu, z jakim\n" +" kanałów z odpływu/źródła, z jakim\n" " połączony jest strumień.\n" " --no-remix Nie miesza kanałów w górę lub w\n" " dół.\n" @@ -2104,7 +1962,7 @@ msgstr "" "Skompilowane za pomocą libpulse %s\n" "Skonsolidowane za pomocą libpulse %s\n" -#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1559 +#: ../src/utils/pacat.c:843 ../src/utils/pactl.c:1644 #, c-format msgid "Invalid client name '%s'" msgstr "Nieprawidłowa nazwa klienta \"%s\"" @@ -2177,7 +2035,7 @@ msgstr "" "Ostrzeżenie: podane określenie próbki zostanie zastąpione przez określenie z " "pliku." -#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1626 +#: ../src/utils/pacat.c:1070 ../src/utils/pactl.c:1708 msgid "Failed to determine sample specification from file." msgstr "Ustalenie określenia próbki z pliku nie się nie powiodło." @@ -2213,7 +2071,7 @@ msgstr "odtwarzanie" msgid "Failed to set media name." msgstr "Ustawienie nazwy nośnika się nie powiodło." -#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:1976 +#: ../src/utils/pacat.c:1148 ../src/utils/pactl.c:2058 msgid "pa_mainloop_new() failed." msgstr "pa_mainloop_new() się nie powiodło." @@ -2221,11 +2079,11 @@ msgstr "pa_mainloop_new() się nie powiodło." msgid "io_new() failed." msgstr "io_new() się nie powiodło." -#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:1988 +#: ../src/utils/pacat.c:1178 ../src/utils/pactl.c:2070 msgid "pa_context_new() failed." msgstr "pa_context_new() się nie powiodło." -#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:1994 +#: ../src/utils/pacat.c:1186 ../src/utils/pactl.c:2076 #, c-format msgid "pa_context_connect() failed: %s" msgstr "pa_context_connect() się nie powiodło: %s" @@ -2234,32 +2092,32 @@ msgstr "pa_context_connect() się nie powiodło: %s" msgid "pa_context_rttime_new() failed." msgstr "pa_context_rttime_new() się nie powiodło." -#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:1999 +#: ../src/utils/pacat.c:1199 ../src/utils/pactl.c:2081 msgid "pa_mainloop_run() failed." msgstr "pa_mainloop_run() się nie powiodło." -#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1481 +#: ../src/utils/pacmd.c:53 ../src/utils/pactl.c:1566 msgid "NAME [ARGS ...]" msgstr "NAZWA [PARAMETRY...]" -#: ../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:1567 msgid "NAME|#N" msgstr "NAZWA|#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:1565 +#: ../src/utils/pactl.c:1571 msgid "NAME" msgstr "NAZWA" -#: ../src/utils/pacmd.c:56 ../src/utils/pactl.c:1488 +#: ../src/utils/pacmd.c:56 msgid "NAME|#N VOLUME" msgstr "NAZWA|#N GŁOŚNOŚĆ" -#: ../src/utils/pacmd.c:57 ../src/utils/pactl.c:1489 +#: ../src/utils/pacmd.c:57 msgid "#N VOLUME" msgstr "#N GŁOŚNOŚĆ" -#: ../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:1569 msgid "NAME|#N 1|0" msgstr "NAZWA|#N 1|0" @@ -2295,7 +2153,7 @@ msgstr "NAZWA-ŚCIEŻKI" msgid "FILENAME SINK|#N" msgstr "NAZWA-PLIKU ODPŁYW|#N" -#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1483 +#: ../src/utils/pacmd.c:71 ../src/utils/pactl.c:1568 msgid "#N SINK|SOURCE" msgstr "#N ODPŁYW|ŹRÓDŁO" @@ -2303,15 +2161,15 @@ msgstr "#N ODPŁYW|ŹRÓDŁO" 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:1570 msgid "CARD PROFILE" msgstr "PROFIL KARTY" -#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1487 +#: ../src/utils/pacmd.c:75 ../src/utils/pactl.c:1572 msgid "NAME|#N PORT" msgstr "NAZWA|#N PORT" -#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1493 +#: ../src/utils/pacmd.c:76 ../src/utils/pactl.c:1578 msgid "CARD-NAME|CARD-#N PORT OFFSET" msgstr "NAZWA-KARTY|KARTA-#N PORT OFFSET" @@ -2391,34 +2249,34 @@ 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 "Uzyskanie statystyk się nie powiodło: %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 "Obecnie używane: %u bloków zawierających razem %s bajtów.\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 "" "Przydzielono podczas całego czasu uruchomienia: %u bloków zawierających " "razem %s bajtów.\n" -#: ../src/utils/pactl.c:173 +#: ../src/utils/pactl.c:178 #, c-format msgid "Sample cache size: %s\n" msgstr "Rozmiar pamięci podręcznej próbek: %s\n" -#: ../src/utils/pactl.c:182 +#: ../src/utils/pactl.c:187 #, c-format msgid "Failed to get server information: %s" msgstr "Uzyskanie informacji o serwerze się nie powiodło: %s" -#: ../src/utils/pactl.c:187 +#: ../src/utils/pactl.c:192 #, c-format msgid "" "Server String: %s\n" @@ -2435,7 +2293,7 @@ msgstr "" "Indeks klienta: %u\n" "Rozmiar kafla: %zu\n" -#: ../src/utils/pactl.c:203 +#: ../src/utils/pactl.c:208 #, c-format msgid "" "User Name: %s\n" @@ -2458,12 +2316,12 @@ msgstr "" "Domyślne źródło: %s\n" "Ciasteczko: %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 "Uzyskanie informacji o odpływie się nie powiodło: %s" -#: ../src/utils/pactl.c:278 +#: ../src/utils/pactl.c:283 #, c-format msgid "" "Sink #%u\n" @@ -2502,27 +2360,27 @@ msgstr "" "\tWłaściwości:\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 "\tPorty:\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 "\tAktywny port: %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 "\tFormaty:\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 "Uzyskanie informacji o źródle się nie powiodło: %s" -#: ../src/utils/pactl.c:385 +#: ../src/utils/pactl.c:390 #, c-format msgid "" "Source #%u\n" @@ -2561,20 +2419,20 @@ msgstr "" "\tWłaściwości:\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 "nie dotyczy" -#: ../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 "Uzyskanie informacji o module się nie powiodło: %s" -#: ../src/utils/pactl.c:475 +#: ../src/utils/pactl.c:480 #, c-format msgid "" "Module #%u\n" @@ -2591,12 +2449,12 @@ msgstr "" "\tWłaściwości:\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 "Uzyskanie informacji o kliencie się nie powiodło: %s" -#: ../src/utils/pactl.c:520 +#: ../src/utils/pactl.c:525 #, c-format msgid "" "Client #%u\n" @@ -2611,12 +2469,12 @@ msgstr "" "\tWłaściwości:\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 "Uzyskanie informacji o karcie się nie powiodło: %s" -#: ../src/utils/pactl.c:560 +#: ../src/utils/pactl.c:565 #, c-format msgid "" "Card #%u\n" @@ -2633,17 +2491,17 @@ msgstr "" "\tWłaściwości:\n" "\t\t%s\n" -#: ../src/utils/pactl.c:576 +#: ../src/utils/pactl.c:581 #, c-format msgid "\tProfiles:\n" msgstr "\tProfile:\n" -#: ../src/utils/pactl.c:583 +#: ../src/utils/pactl.c:588 #, c-format msgid "\tActive Profile: %s\n" msgstr "\tAktywny profil: %s\n" -#: ../src/utils/pactl.c:597 +#: ../src/utils/pactl.c:602 #, c-format msgid "" "\t\t\tProperties:\n" @@ -2652,17 +2510,17 @@ msgstr "" "\t\t\tWłaściwości:\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\tCzęść profilu: %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 "Uzyskanie informacji o odpływie wejścia się nie powiodło: %s" -#: ../src/utils/pactl.c:648 +#: ../src/utils/pactl.c:653 #, c-format msgid "" "Sink Input #%u\n" @@ -2701,12 +2559,12 @@ msgstr "" "\tWłaściwości:\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 "Uzyskanie informacji o wyjściu źródła się nie powiodło: %s" -#: ../src/utils/pactl.c:718 +#: ../src/utils/pactl.c:723 #, c-format msgid "" "Source Output #%u\n" @@ -2745,12 +2603,12 @@ msgstr "" "\tWłaściwości:\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 "Uzyskanie informacji o próbce się nie powiodło: %s" -#: ../src/utils/pactl.c:786 +#: ../src/utils/pactl.c:791 #, c-format msgid "" "Sample #%u\n" @@ -2779,135 +2637,164 @@ msgstr "" "\tWłaściwości:\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 "Niepowodzenie: %s" -#: ../src/utils/pactl.c:860 +#: ../src/utils/pactl.c:868 #, c-format msgid "Failed to unload module: Module %s not loaded" msgstr "" "Usunięcie modułu z pamięci się nie powiodło: moduł %s nie jest wczytany" -#: ../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 "" +"Uzyskanie głośności się nie powiodło: próbowano ustawić głośność dla %d " +"kanałów, kiedy obsługiwane kanały = %d\n" + +#: ../src/utils/pactl.c:1052 #, c-format msgid "Failed to set format: invalid format string %s" msgstr "Ustawienie formatu się nie powiodło: nieprawidłowy ciąg formatu %s" -#: ../src/utils/pactl.c:1062 +#: ../src/utils/pactl.c:1095 #, c-format msgid "Failed to upload sample: %s" msgstr "Wysłanie próbki się nie powiodło: %s" -#: ../src/utils/pactl.c:1079 +#: ../src/utils/pactl.c:1112 msgid "Premature end of file" msgstr "Przedwczesny koniec pliku" -#: ../src/utils/pactl.c:1099 +#: ../src/utils/pactl.c:1132 msgid "new" msgstr "nowy" -#: ../src/utils/pactl.c:1102 +#: ../src/utils/pactl.c:1135 msgid "change" msgstr "zmień" -#: ../src/utils/pactl.c:1105 +#: ../src/utils/pactl.c:1138 msgid "remove" msgstr "usuń" -#: ../src/utils/pactl.c:1108 ../src/utils/pactl.c:1143 +#: ../src/utils/pactl.c:1141 ../src/utils/pactl.c:1176 msgid "unknown" msgstr "nieznany" -#: ../src/utils/pactl.c:1116 +#: ../src/utils/pactl.c:1149 msgid "sink" msgstr "odpływ" -#: ../src/utils/pactl.c:1119 +#: ../src/utils/pactl.c:1152 msgid "source" msgstr "źródło" -#: ../src/utils/pactl.c:1122 +#: ../src/utils/pactl.c:1155 msgid "sink-input" msgstr "wejście-odpływu" -#: ../src/utils/pactl.c:1125 +#: ../src/utils/pactl.c:1158 msgid "source-output" msgstr "wyjście-źródła" -#: ../src/utils/pactl.c:1128 +#: ../src/utils/pactl.c:1161 msgid "module" msgstr "moduł" -#: ../src/utils/pactl.c:1131 +#: ../src/utils/pactl.c:1164 msgid "client" msgstr "klient" -#: ../src/utils/pactl.c:1134 +#: ../src/utils/pactl.c:1167 msgid "sample-cache" msgstr "bufor-próbki" -#: ../src/utils/pactl.c:1137 ../src/utils/pactl.c:1140 +#: ../src/utils/pactl.c:1170 msgid "server" msgstr "serwer" -#: ../src/utils/pactl.c:1149 +#: ../src/utils/pactl.c:1173 +msgid "card" +msgstr "karta" + +#: ../src/utils/pactl.c:1182 #, c-format msgid "Event '%s' on %s #%u\n" msgstr "Zdarzenie \"%s\" w %s #%u\n" -#: ../src/utils/pactl.c:1394 +#: ../src/utils/pactl.c:1454 msgid "Got SIGINT, exiting." msgstr "Otrzymano SIGINT, kończenie działania." -#: ../src/utils/pactl.c:1421 +#: ../src/utils/pactl.c:1481 msgid "Invalid volume specification" msgstr "Nieprawidłowe określenie głośności" -#: ../src/utils/pactl.c:1444 +#: ../src/utils/pactl.c:1504 msgid "Volume outside permissible range.\n" msgstr "Głośność jest poza dozwolonym zakresem.\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:1517 +msgid "Invalid number of volume specifications.\n" +msgstr "Nieprawidłowa liczba określeń głośności.\n" + +#: ../src/utils/pactl.c:1529 +msgid "Inconsistent volume specification.\n" +msgstr "Niespójne określenie głośności.\n" + +#: ../src/utils/pactl.c:1559 ../src/utils/pactl.c:1560 +#: ../src/utils/pactl.c:1561 ../src/utils/pactl.c:1562 +#: ../src/utils/pactl.c:1563 ../src/utils/pactl.c:1564 +#: ../src/utils/pactl.c:1565 ../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 msgid "[options]" msgstr "[opcje]" -#: ../src/utils/pactl.c:1476 +#: ../src/utils/pactl.c:1561 msgid "[TYPE]" msgstr "[TYP]" -#: ../src/utils/pactl.c:1478 +#: ../src/utils/pactl.c:1563 msgid "FILENAME [NAME]" msgstr "NAZWA-PLIKU [NAZWA]" -#: ../src/utils/pactl.c:1479 +#: ../src/utils/pactl.c:1564 msgid "NAME [SINK]" msgstr "NAZWA [ODPŁYW]" -#: ../src/utils/pactl.c:1490 +#: ../src/utils/pactl.c:1573 +msgid "NAME|#N VOLUME [VOLUME ...]" +msgstr "NAZWA|#N GŁOŚNOŚĆ [GŁOŚNOŚĆ...]" + +#: ../src/utils/pactl.c:1574 +msgid "#N VOLUME [VOLUME ...]" +msgstr "#N GŁOŚNOŚĆ [GŁOŚNOŚĆ...]" + +#: ../src/utils/pactl.c:1575 msgid "NAME|#N 1|0|toggle" msgstr "NAZWA|#N 1|0|przełącznik" -#: ../src/utils/pactl.c:1491 +#: ../src/utils/pactl.c:1576 msgid "#N 1|0|toggle" msgstr "#N 1|0|przełącznik" -#: ../src/utils/pactl.c:1492 +#: ../src/utils/pactl.c:1577 msgid "#N FORMATS" msgstr "#N FORMATY" -#: ../src/utils/pactl.c:1495 +#: ../src/utils/pactl.c:1580 #, c-format msgid "" "\n" @@ -2918,7 +2805,7 @@ msgstr "" "Specjalne nazwy @DEFAULT_SINK@, @DEFAULT_SOURCE@ i @DEFAULT_MONITOR@\n" "mogą być używane do podania domyślnego odpływu, źródła i monitora.\n" -#: ../src/utils/pactl.c:1498 +#: ../src/utils/pactl.c:1583 #, c-format msgid "" "\n" @@ -2937,7 +2824,7 @@ msgstr "" " -s, --server=SERWER Nazwa serwera do połączenia się\n" " -n, --client-name=NAZWA Jak nazwać tego klienta w serwerze\n" -#: ../src/utils/pactl.c:1539 +#: ../src/utils/pactl.c:1624 #, c-format msgid "" "pactl %s\n" @@ -2948,138 +2835,138 @@ msgstr "" "Skompilowane za pomocą libpulse %s\n" "Skonsolidowane za pomocą libpulse %s\n" -#: ../src/utils/pactl.c:1598 +#: ../src/utils/pactl.c:1680 #, c-format msgid "Specify nothing, or one of: %s" msgstr "Należy podać nic lub jedno z: %s" -#: ../src/utils/pactl.c:1608 +#: ../src/utils/pactl.c:1690 msgid "Please specify a sample file to load" msgstr "Proszę podać plik próbki do wczytania" -#: ../src/utils/pactl.c:1621 +#: ../src/utils/pactl.c:1703 msgid "Failed to open sound file." msgstr "Otwarcie pliku dźwiękowego się nie powiodło." -#: ../src/utils/pactl.c:1633 +#: ../src/utils/pactl.c:1715 msgid "Warning: Failed to determine sample specification from file." msgstr "Ostrzeżenie: ustalenie określenia próbki z pliku się nie powiodło." -#: ../src/utils/pactl.c:1643 +#: ../src/utils/pactl.c:1725 msgid "You have to specify a sample name to play" msgstr "Należy podać nazwę próbki do odtworzenia" -#: ../src/utils/pactl.c:1655 +#: ../src/utils/pactl.c:1737 msgid "You have to specify a sample name to remove" msgstr "Należy podać nazwę próbki do usunięcia" -#: ../src/utils/pactl.c:1664 +#: ../src/utils/pactl.c:1746 msgid "You have to specify a sink input index and a sink" msgstr "Należy podać indeks odpływu wejścia i odpływ" -#: ../src/utils/pactl.c:1674 +#: ../src/utils/pactl.c:1756 msgid "You have to specify a source output index and a source" msgstr "Należy podać indeks źródła wyjścia i źródło" -#: ../src/utils/pactl.c:1689 +#: ../src/utils/pactl.c:1771 msgid "You have to specify a module name and arguments." msgstr "Należy podać nazwę modułu i parametry." -#: ../src/utils/pactl.c:1709 +#: ../src/utils/pactl.c:1791 msgid "You have to specify a module index or name" msgstr "Należy podać indeks lub nazwę modułu" -#: ../src/utils/pactl.c:1722 +#: ../src/utils/pactl.c:1804 msgid "" "You may not specify more than one sink. You have to specify a boolean value." msgstr "" "Nie można podać więcej niż jednego odpływu. Należy podać wartość logiczną." -#: ../src/utils/pactl.c:1727 ../src/utils/pactl.c:1747 +#: ../src/utils/pactl.c:1809 ../src/utils/pactl.c:1829 msgid "Invalid suspend specification." msgstr "Nieprawidłowe określenie uśpienia." -#: ../src/utils/pactl.c:1742 +#: ../src/utils/pactl.c:1824 msgid "" "You may not specify more than one source. You have to specify a boolean " "value." msgstr "" "Nie można podać więcej niż jednego źródła. Należy podać wartość logiczną." -#: ../src/utils/pactl.c:1759 +#: ../src/utils/pactl.c:1841 msgid "You have to specify a card name/index and a profile name" msgstr "Należy podać nazwę karty/indeks i nazwę profilu" -#: ../src/utils/pactl.c:1770 +#: ../src/utils/pactl.c:1852 msgid "You have to specify a sink name/index and a port name" msgstr "Należy podać nazwę odpływu/indeks i nazwę portu" -#: ../src/utils/pactl.c:1781 +#: ../src/utils/pactl.c:1863 msgid "You have to specify a sink name" msgstr "Należy podać nazwę odpływu" -#: ../src/utils/pactl.c:1791 +#: ../src/utils/pactl.c:1873 msgid "You have to specify a source name/index and a port name" msgstr "Należy podać nazwę źródła/indeks i nazwę portu" -#: ../src/utils/pactl.c:1802 +#: ../src/utils/pactl.c:1884 msgid "You have to specify a source name" msgstr "Należy podać nazwę źródła" -#: ../src/utils/pactl.c:1812 +#: ../src/utils/pactl.c:1894 msgid "You have to specify a sink name/index and a volume" msgstr "Należy podać nazwę odpływu/indeks i głośność" -#: ../src/utils/pactl.c:1825 +#: ../src/utils/pactl.c:1907 msgid "You have to specify a source name/index and a volume" msgstr "Należy podać nazwę źródła/indeks i głośność" -#: ../src/utils/pactl.c:1838 +#: ../src/utils/pactl.c:1920 msgid "You have to specify a sink input index and a volume" msgstr "Należy podać indeks odpływu wejścia i głośność" -#: ../src/utils/pactl.c:1843 +#: ../src/utils/pactl.c:1925 msgid "Invalid sink input index" msgstr "Nieprawidłowy indeks odpływ wejścia" -#: ../src/utils/pactl.c:1854 +#: ../src/utils/pactl.c:1936 msgid "You have to specify a source output index and a volume" msgstr "Należy podać indeks źródła wyjścia i głośność" -#: ../src/utils/pactl.c:1859 +#: ../src/utils/pactl.c:1941 msgid "Invalid source output index" msgstr "Nieprawidłowy indeks wejścia źródła" -#: ../src/utils/pactl.c:1870 +#: ../src/utils/pactl.c:1952 msgid "You have to specify a sink name/index and a mute boolean" msgstr "Należy podać nazwę odpływu/indeks i zmienną logiczną wyciszenia" -#: ../src/utils/pactl.c:1875 ../src/utils/pactl.c:1890 -#: ../src/utils/pactl.c:1910 ../src/utils/pactl.c:1928 +#: ../src/utils/pactl.c:1957 ../src/utils/pactl.c:1972 +#: ../src/utils/pactl.c:1992 ../src/utils/pactl.c:2010 msgid "Invalid mute specification" msgstr "Nieprawidłowe określenie wyciszenia" -#: ../src/utils/pactl.c:1885 +#: ../src/utils/pactl.c:1967 msgid "You have to specify a source name/index and a mute boolean" msgstr "Należy podać nazwę źródła/indeks i zmienną logiczną wyciszenia" -#: ../src/utils/pactl.c:1900 +#: ../src/utils/pactl.c:1982 msgid "You have to specify a sink input index and a mute boolean" msgstr "Należy podać indeks odpływu wejścia i zmienną logiczną wyciszenia" -#: ../src/utils/pactl.c:1905 +#: ../src/utils/pactl.c:1987 msgid "Invalid sink input index specification" msgstr "Nieprawidłowe określenie indeksu odpływu wejścia" -#: ../src/utils/pactl.c:1918 +#: ../src/utils/pactl.c:2000 msgid "You have to specify a source output index and a mute boolean" msgstr "Należy podać nazwę indeks wyjścia źródła i zmienną logiczną wyciszenia" -#: ../src/utils/pactl.c:1923 +#: ../src/utils/pactl.c:2005 msgid "Invalid source output index specification" msgstr "Nieprawidłowe określenie indeksu wyjścia źródła" -#: ../src/utils/pactl.c:1940 +#: ../src/utils/pactl.c:2022 msgid "" "You have to specify a sink index and a semicolon-separated list of supported " "formats" @@ -3087,15 +2974,15 @@ msgstr "" "Należy podać nazwę indeks odpływu listę obsługiwanych formatów oddzielonych " "średnikami" -#: ../src/utils/pactl.c:1952 +#: ../src/utils/pactl.c:2034 msgid "You have to specify a card name/index, a port name and a latency offset" msgstr "Należy podać nazwę karty/indeks, nazwę portu i offset opóźnienia" -#: ../src/utils/pactl.c:1959 +#: ../src/utils/pactl.c:2041 msgid "Could not parse latency offset" msgstr "Nie można przetworzyć offsetu opóźnienia" -#: ../src/utils/pactl.c:1971 +#: ../src/utils/pactl.c:2053 msgid "No valid command specified." msgstr "Nie podano prawidłowego polecenia." @@ -3238,27 +3125,17 @@ msgstr "Przetworzenie danych ciasteczka się nie powiodło\n" msgid "Failed to save cookie data\n" msgstr "Zapisanie danych ciasteczka się nie powiodło\n" -#: ../src/utils/pax11publish.c:156 -#, c-format -msgid "Failed to load client configuration file.\n" -msgstr "Wczytanie pliku konfiguracji klienta się nie powiodło.\n" - -#: ../src/utils/pax11publish.c:161 -#, c-format -msgid "Failed to read environment configuration data.\n" -msgstr "Odczytanie danych konfiguracji środowiska się nie powiodło.\n" - -#: ../src/utils/pax11publish.c:178 +#: ../src/utils/pax11publish.c:170 #, c-format msgid "Failed to get FQDN.\n" msgstr "Uzyskanie FQDN się nie powiodło.\n" -#: ../src/utils/pax11publish.c:198 +#: ../src/utils/pax11publish.c:190 #, c-format msgid "Failed to load cookie data\n" msgstr "Wczytanie danych ciasteczka się nie powiodło\n" -#: ../src/utils/pax11publish.c:216 +#: ../src/utils/pax11publish.c:208 #, c-format msgid "Not yet implemented.\n" msgstr "Niezaimplementowane.\n" @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: pulseaudio.master-tx\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" +"POT-Creation-Date: 2014-09-08 22:21+0000\n" +"PO-Revision-Date: 2014-11-25 10:23+0200\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" "Language: uk\n" @@ -19,10 +19,6 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../src/daemon/caps.c:54 -msgid "Cleaning up privileges." -msgstr "Позбуваємося прав доступу." - #: ../src/daemon/cmdline.c:113 #, c-format msgid "" @@ -281,47 +277,47 @@ msgstr "[%s:%u] Некоректне значення rlimit «%s»." msgid "[%s:%u] Invalid sample format '%s'." msgstr "[%s:%u] Некоректний формат фрагмента «%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] Некоректна частота вибірки «%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] Некоректні канали фрагмента «%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] Некоректна карта каналів «%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] Некоректна кількість фрагментів «%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] Некоректний розмір фрагмента «%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] Некоректний рівень nice «%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] Некоректний тип сервера «%s»." -#: ../src/daemon/daemon-conf.c:615 +#: ../src/daemon/daemon-conf.c:613 #, c-format msgid "Failed to open configuration file: %s" msgstr "Не вдалося відкрити файл налаштувань: %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." @@ -329,7 +325,7 @@ msgstr "" "У вказаній типовій карті каналів визначається інша кількість каналів, ніж " "типова кількість каналів." -#: ../src/daemon/daemon-conf.c:718 +#: ../src/daemon/daemon-conf.c:716 #, c-format msgid "### Read from configuration file: %s ###\n" msgstr "### Прочитано з файла налаштувань: %s ###\n" @@ -399,78 +395,55 @@ msgstr "" msgid "Failed to add bind-now-loader." msgstr "Не вдалося додати bind-now-loader." -#: ../src/daemon/main.c:139 -#, c-format -msgid "Got signal %s." -msgstr "Отримано сигнал %s." - -#: ../src/daemon/main.c:166 -msgid "Exiting." -msgstr "Завершення роботи." - -#: ../src/daemon/main.c:184 +#: ../src/daemon/main.c:160 #, c-format msgid "Failed to find user '%s'." msgstr "Не вдалося знайти користувача «%s»." -#: ../src/daemon/main.c:189 +#: ../src/daemon/main.c:165 #, c-format msgid "Failed to find group '%s'." msgstr "Не вдалося знайти групу «%s»." -#: ../src/daemon/main.c:193 -#, c-format -msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)." -msgstr "Знайдено користувача «%s» (UID %lu) і групу «%s» (GID %lu)." - -#: ../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 "GID користувача «%s» і групи «%s» не збігаються." -#: ../src/daemon/main.c:203 +#: ../src/daemon/main.c:179 #, c-format msgid "Home directory of user '%s' is not '%s', ignoring." msgstr "Домашнім каталогом користувача «%s» не є «%s», дані проігноровано." -#: ../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 "Не вдалося створити «%s»: %s" -#: ../src/daemon/main.c:218 +#: ../src/daemon/main.c:194 #, c-format msgid "Failed to change group list: %s" msgstr "Не вдалося змінити список груп: %s" -#: ../src/daemon/main.c:234 +#: ../src/daemon/main.c:210 #, c-format msgid "Failed to change GID: %s" msgstr "Не вдалося змінити GID: %s" -#: ../src/daemon/main.c:250 +#: ../src/daemon/main.c:226 #, c-format msgid "Failed to change UID: %s" msgstr "Не вдалося змінити UID: %s" -#: ../src/daemon/main.c:271 -msgid "Successfully changed user to \"" -msgstr "Користувача успішно змінено на «" - -#: ../src/daemon/main.c:279 +#: ../src/daemon/main.c:255 msgid "System wide mode unsupported on this platform." msgstr "Загальносистемний режим не підтримується на цій платформі." -#: ../src/daemon/main.c:297 -#, c-format -msgid "setrlimit(%s, (%u, %u)) failed: %s" -msgstr "Спроба виконати setrlimit(%s, (%u, %u)) була невдалою: %s" - -#: ../src/daemon/main.c:498 +#: ../src/daemon/main.c:466 msgid "Failed to parse command line." msgstr "Не вдалося обробити рядок команди." -#: ../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." @@ -478,21 +451,12 @@ msgstr "" "Запуск у системному режимі для неадміністративного користувача неможливий. " "Буде запущено лише службу виявлення пристроїв сервера D-Bus." -#: ../src/daemon/main.c:619 -msgid "Daemon not running" -msgstr "Фонову службу не запущено" - -#: ../src/daemon/main.c:621 -#, c-format -msgid "Daemon running as PID %u" -msgstr "Фонову службу запущено як PID %u" - -#: ../src/daemon/main.c:636 +#: ../src/daemon/main.c:604 #, c-format msgid "Failed to kill daemon: %s" msgstr "Не вдалося завершити роботу фонової служби: %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)." @@ -500,23 +464,23 @@ msgstr "" "Цю програму не призначено для запуску від імені користувача root (якщо не " "вказано параметра --system)." -#: ../src/daemon/main.c:668 +#: ../src/daemon/main.c:636 msgid "Root privileges required." msgstr "Потрібні права доступу користувача root." -#: ../src/daemon/main.c:675 +#: ../src/daemon/main.c:643 msgid "--start not supported for system instances." msgstr "" "Параметр --start не підтримується для загальносистемних екземплярів програми." -#: ../src/daemon/main.c:715 +#: ../src/daemon/main.c:683 #, c-format msgid "User-configured server at %s, refusing to start/autospawn." msgstr "" "Налаштований користувачем сервер на %s, не вдалося запустити/автоматично " "відновити роботу." -#: ../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." @@ -524,162 +488,60 @@ msgstr "" "Налаштований користувачем сервер на %s, який, здається, є локальним. " "Виконуємо докладнішу діагностику." -#: ../src/daemon/main.c:726 +#: ../src/daemon/main.c:694 msgid "Running in system mode, but --disallow-exit not set!" msgstr "" "Запуск у загальносистемному режимі, але не встановлено --disallow-exit!" -#: ../src/daemon/main.c:729 +#: ../src/daemon/main.c:697 msgid "Running in system mode, but --disallow-module-loading not set!" msgstr "" "Запуск у загальносистемному режимі, але не встановлено --disallow-module-" "loading!" -#: ../src/daemon/main.c:732 +#: ../src/daemon/main.c:700 msgid "Running in system mode, forcibly disabling SHM mode!" msgstr "Запуск у загальносистемному режимі, примусове вимикання режиму SHM!" -#: ../src/daemon/main.c:737 +#: ../src/daemon/main.c:705 msgid "Running in system mode, forcibly disabling exit idle time!" msgstr "" "Запуск у загальносистемному режимі, примусове вимикання режиму параметрів " "часу виходу за відсутності активності!" -#: ../src/daemon/main.c:765 +#: ../src/daemon/main.c:738 msgid "Failed to acquire stdio." msgstr "Не вдалося отримати stdio." -#: ../src/daemon/main.c:771 ../src/daemon/main.c:842 +#: ../src/daemon/main.c:744 ../src/daemon/main.c:815 #, c-format msgid "pipe() failed: %s" msgstr "Спроба виконання pipe() завершилася невдало: %s" -#: ../src/daemon/main.c:776 ../src/daemon/main.c:847 +#: ../src/daemon/main.c:749 ../src/daemon/main.c:820 #, c-format msgid "fork() failed: %s" msgstr "Спроба виконання fork() завершилася невдало: %s" -#: ../src/daemon/main.c:791 ../src/daemon/main.c:862 ../src/utils/pacat.c:569 +#: ../src/daemon/main.c:764 ../src/daemon/main.c:835 ../src/utils/pacat.c:569 #, c-format msgid "read() failed: %s" msgstr "Спроба виконання read() завершилася невдало: %s" -#: ../src/daemon/main.c:797 +#: ../src/daemon/main.c:770 msgid "Daemon startup failed." msgstr "Спроба запуску фонової служби завершилася невдало." -#: ../src/daemon/main.c:799 -msgid "Daemon startup successful." -msgstr "Фонову службу успішно запущено." - -#: ../src/daemon/main.c:830 +#: ../src/daemon/main.c:803 #, c-format msgid "setsid() failed: %s" msgstr "Спроба виконання setsid() завершилася невдало: %s" -#: ../src/daemon/main.c:916 -#, c-format -msgid "This is PulseAudio %s" -msgstr "Це PulseAudio %s" - -#: ../src/daemon/main.c:917 -#, c-format -msgid "Compilation host: %s" -msgstr "Вузол збирання: %s" - -#: ../src/daemon/main.c:918 ../src/tests/resampler-test.c:418 -#, c-format -msgid "Compilation CFLAGS: %s" -msgstr "CFLAGS збирання: %s" - -#: ../src/daemon/main.c:921 -#, c-format -msgid "Running on host: %s" -msgstr "Запущено на вузлі: %s" - -#: ../src/daemon/main.c:924 -#, c-format -msgid "Found %u CPUs." -msgstr "Знайдено %u процесорів." - #: ../src/daemon/main.c:926 -#, c-format -msgid "Page size is %lu bytes" -msgstr "Розмір сторінки дорівнює %lu байтам" - -#: ../src/daemon/main.c:929 -msgid "Compiled with Valgrind support: yes" -msgstr "Зібрано з підтримкою Valgrind: так" - -#: ../src/daemon/main.c:931 -msgid "Compiled with Valgrind support: no" -msgstr "Зібрано з підтримкою Valgrind: ні" - -#: ../src/daemon/main.c:934 -#, c-format -msgid "Running in valgrind mode: %s" -msgstr "Запуск у режимі valgrind: %s" - -#: ../src/daemon/main.c:936 -#, c-format -msgid "Running in VM: %s" -msgstr "Запущено у віртуальній машині: %s" - -#: ../src/daemon/main.c:939 -msgid "Optimized build: yes" -msgstr "Зібрано з оптимізацією: так" - -#: ../src/daemon/main.c:941 -msgid "Optimized build: no" -msgstr "Зібрано з оптимізацією: ні" - -#: ../src/daemon/main.c:945 -msgid "NDEBUG defined, all asserts disabled." -msgstr "Визначено NDEBUG, всі додавання вимкнено." - -#: ../src/daemon/main.c:947 -msgid "FASTPATH defined, only fast path asserts disabled." -msgstr "Визначено FASTPATH, вимкнено лише додавання швидких шляхів." - -#: ../src/daemon/main.c:949 -msgid "All asserts enabled." -msgstr "Увімкнено всі додавання." - -#: ../src/daemon/main.c:953 msgid "Failed to get machine ID" msgstr "Спроба отримати ідентифікатор системи завершилася невдало" -#: ../src/daemon/main.c:956 -#, c-format -msgid "Machine ID is %s." -msgstr "Ідентифікатор системи %s." - -#: ../src/daemon/main.c:960 -#, c-format -msgid "Session ID is %s." -msgstr "Ідентифікатор сеансу — %s." - -#: ../src/daemon/main.c:966 -#, c-format -msgid "Using runtime directory %s." -msgstr "Каталог запуску: %s." - -#: ../src/daemon/main.c:971 -#, c-format -msgid "Using state directory %s." -msgstr "Каталог стану: %s." - -#: ../src/daemon/main.c:974 -#, c-format -msgid "Using modules directory %s." -msgstr "Каталог модулів: %s." - -#: ../src/daemon/main.c:976 -#, c-format -msgid "Running in system mode: %s" -msgstr "Запуску у загальносистемному режимі: %s" - -#: ../src/daemon/main.c:979 +#: ../src/daemon/main.c:952 msgid "" "OK, so you are running PA in system mode. Please note that you most likely " "shouldn't be doing that.\n" @@ -696,48 +558,24 @@ msgstr "" "WhatIsWrongWithSystemMode, щоб дізнатися про те, чому не варто " "використовувати системний режим." -#: ../src/daemon/main.c:996 +#: ../src/daemon/main.c:969 msgid "pa_pid_file_create() failed." msgstr "Спроба виконання pa_pid_file_create() зазнала невдачі." -#: ../src/daemon/main.c:1006 -msgid "Fresh high-resolution timers available! Bon appetit!" -msgstr "Доступні свіжі високоточні таймери! Смачного!" - -#: ../src/daemon/main.c:1008 -msgid "" -"Dude, your kernel stinks! The chef's recommendation today is Linux with high-" -"resolution timers enabled!" -msgstr "" -"Хлопче, від твого ядра вже тхне! Варто нарешті встановити Linux з " -"увімкненими високоточними таймерами!" - -#: ../src/daemon/main.c:1026 +#: ../src/daemon/main.c:999 msgid "pa_core_new() failed." msgstr "Спроба виконання pa_core_new() зазнала невдачі." -#: ../src/daemon/main.c:1104 +#: ../src/daemon/main.c:1073 msgid "Failed to initialize daemon." msgstr "Не вдалося ініціалізувати фонову службу." -#: ../src/daemon/main.c:1109 +#: ../src/daemon/main.c:1078 msgid "Daemon startup without any loaded modules, refusing to work." msgstr "" "Запуск фонової служби без жодного завантаженого модуля, служба не буде " "працездатною." -#: ../src/daemon/main.c:1147 -msgid "Daemon startup complete." -msgstr "Запуск фонової служби завершено." - -#: ../src/daemon/main.c:1153 -msgid "Daemon shutdown initiated." -msgstr "Ініційовано завершення роботи фонової служби." - -#: ../src/daemon/main.c:1184 -msgid "Daemon terminated." -msgstr "Виконання фонової служби перервано." - #: ../src/daemon/pulseaudio.desktop.in.h:1 msgid "PulseAudio Sound System" msgstr "Звукова система PulseAudio" @@ -746,255 +584,255 @@ msgstr "Звукова система PulseAudio" msgid "Start the PulseAudio Sound System" msgstr "Запустити звукову систему PulseAudio" -#: ../src/modules/alsa/alsa-mixer.c:2251 +#: ../src/modules/alsa/alsa-mixer.c:2294 msgid "Input" msgstr "Вхід" -#: ../src/modules/alsa/alsa-mixer.c:2252 +#: ../src/modules/alsa/alsa-mixer.c:2295 msgid "Docking Station Input" msgstr "Вхідний канал док-станції" -#: ../src/modules/alsa/alsa-mixer.c:2253 +#: ../src/modules/alsa/alsa-mixer.c:2296 msgid "Docking Station Microphone" msgstr "Мікрофон док-станції" -#: ../src/modules/alsa/alsa-mixer.c:2254 +#: ../src/modules/alsa/alsa-mixer.c:2297 msgid "Docking Station Line In" msgstr "Лінійний вхід док-станції" -#: ../src/modules/alsa/alsa-mixer.c:2255 ../src/modules/alsa/alsa-mixer.c:2340 +#: ../src/modules/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2383 msgid "Line In" msgstr "Лінійний вхід" -#: ../src/modules/alsa/alsa-mixer.c:2256 ../src/modules/alsa/alsa-mixer.c:2334 +#: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377 #: ../src/modules/bluetooth/module-bluez4-device.c:2101 -#: ../src/modules/bluetooth/module-bluez5-device.c:1451 +#: ../src/modules/bluetooth/module-bluez5-device.c:1635 msgid "Microphone" msgstr "Мікрофон" -#: ../src/modules/alsa/alsa-mixer.c:2257 ../src/modules/alsa/alsa-mixer.c:2335 +#: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378 msgid "Front Microphone" msgstr "Передній мікрофон" -#: ../src/modules/alsa/alsa-mixer.c:2258 ../src/modules/alsa/alsa-mixer.c:2336 +#: ../src/modules/alsa/alsa-mixer.c:2301 ../src/modules/alsa/alsa-mixer.c:2379 msgid "Rear Microphone" msgstr "Задній мікрофон" -#: ../src/modules/alsa/alsa-mixer.c:2259 +#: ../src/modules/alsa/alsa-mixer.c:2302 msgid "External Microphone" msgstr "Зовнішній мікрофон" -#: ../src/modules/alsa/alsa-mixer.c:2260 ../src/modules/alsa/alsa-mixer.c:2338 +#: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2381 msgid "Internal Microphone" msgstr "Вбудований мікрофон" -#: ../src/modules/alsa/alsa-mixer.c:2261 ../src/modules/alsa/alsa-mixer.c:2341 +#: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2384 msgid "Radio" msgstr "Радіо" -#: ../src/modules/alsa/alsa-mixer.c:2262 ../src/modules/alsa/alsa-mixer.c:2342 +#: ../src/modules/alsa/alsa-mixer.c:2305 ../src/modules/alsa/alsa-mixer.c:2385 msgid "Video" msgstr "Відео" -#: ../src/modules/alsa/alsa-mixer.c:2263 +#: ../src/modules/alsa/alsa-mixer.c:2306 msgid "Automatic Gain Control" msgstr "Автоматичне керування підсиленням" -#: ../src/modules/alsa/alsa-mixer.c:2264 +#: ../src/modules/alsa/alsa-mixer.c:2307 msgid "No Automatic Gain Control" msgstr "Без автоматичного керування підсиленням" -#: ../src/modules/alsa/alsa-mixer.c:2265 +#: ../src/modules/alsa/alsa-mixer.c:2308 msgid "Boost" msgstr "Підсилення" -#: ../src/modules/alsa/alsa-mixer.c:2266 +#: ../src/modules/alsa/alsa-mixer.c:2309 msgid "No Boost" msgstr "Без пісилення" -#: ../src/modules/alsa/alsa-mixer.c:2267 +#: ../src/modules/alsa/alsa-mixer.c:2310 msgid "Amplifier" msgstr "Підсилювач" -#: ../src/modules/alsa/alsa-mixer.c:2268 +#: ../src/modules/alsa/alsa-mixer.c:2311 msgid "No Amplifier" msgstr "Без підсилювача" -#: ../src/modules/alsa/alsa-mixer.c:2269 +#: ../src/modules/alsa/alsa-mixer.c:2312 msgid "Bass Boost" msgstr "Підсилення басів" -#: ../src/modules/alsa/alsa-mixer.c:2270 +#: ../src/modules/alsa/alsa-mixer.c:2313 msgid "No Bass Boost" msgstr "Без підсилення" -#: ../src/modules/alsa/alsa-mixer.c:2271 +#: ../src/modules/alsa/alsa-mixer.c:2314 #: ../src/modules/bluetooth/module-bluez4-device.c:2106 -#: ../src/modules/bluetooth/module-bluez5-device.c:1458 +#: ../src/modules/bluetooth/module-bluez5-device.c:1642 msgid "Speaker" msgstr "Гучномовець" -#: ../src/modules/alsa/alsa-mixer.c:2272 ../src/modules/alsa/alsa-mixer.c:2344 +#: ../src/modules/alsa/alsa-mixer.c:2315 ../src/modules/alsa/alsa-mixer.c:2387 msgid "Headphones" msgstr "Аналогові навушники" -#: ../src/modules/alsa/alsa-mixer.c:2333 +#: ../src/modules/alsa/alsa-mixer.c:2376 msgid "Analog Input" msgstr "Аналогових вхід" -#: ../src/modules/alsa/alsa-mixer.c:2337 +#: ../src/modules/alsa/alsa-mixer.c:2380 msgid "Dock Microphone" msgstr "Мікрофон стикувальної станції" -#: ../src/modules/alsa/alsa-mixer.c:2339 +#: ../src/modules/alsa/alsa-mixer.c:2382 msgid "Headset Microphone" msgstr "Мікрофон гарнітури" -#: ../src/modules/alsa/alsa-mixer.c:2343 +#: ../src/modules/alsa/alsa-mixer.c:2386 msgid "Analog Output" msgstr "Аналогове відтворення" -#: ../src/modules/alsa/alsa-mixer.c:2345 +#: ../src/modules/alsa/alsa-mixer.c:2388 msgid "LFE on Separate Mono Output" msgstr "Аналоговий вихід (сабвуфер)" -#: ../src/modules/alsa/alsa-mixer.c:2346 +#: ../src/modules/alsa/alsa-mixer.c:2389 msgid "Line Out" msgstr "Лінійний вихід" -#: ../src/modules/alsa/alsa-mixer.c:2347 +#: ../src/modules/alsa/alsa-mixer.c:2390 msgid "Analog Mono Output" msgstr "Аналоговий моно-вихід" -#: ../src/modules/alsa/alsa-mixer.c:2348 +#: ../src/modules/alsa/alsa-mixer.c:2391 msgid "Speakers" msgstr "Гучномовці" -#: ../src/modules/alsa/alsa-mixer.c:2349 +#: ../src/modules/alsa/alsa-mixer.c:2392 msgid "HDMI / DisplayPort" msgstr "HDMI / DisplayPort" -#: ../src/modules/alsa/alsa-mixer.c:2350 +#: ../src/modules/alsa/alsa-mixer.c:2393 msgid "Digital Output (S/PDIF)" msgstr "Цифровий вихід (S/PDIF)" -#: ../src/modules/alsa/alsa-mixer.c:2351 +#: ../src/modules/alsa/alsa-mixer.c:2394 msgid "Digital Input (S/PDIF)" msgstr "Цифровий вхід (S/PDIF)" -#: ../src/modules/alsa/alsa-mixer.c:2352 +#: ../src/modules/alsa/alsa-mixer.c:2395 msgid "Digital Passthrough (S/PDIF)" msgstr "Цифрове передавання (S/PDIF)" -#: ../src/modules/alsa/alsa-mixer.c:3807 +#: ../src/modules/alsa/alsa-mixer.c:3903 msgid "Analog Mono" msgstr "Аналогове моно" -#: ../src/modules/alsa/alsa-mixer.c:3808 +#: ../src/modules/alsa/alsa-mixer.c:3904 msgid "Analog Stereo" msgstr "Аналогове стерео" -#: ../src/modules/alsa/alsa-mixer.c:3809 +#: ../src/modules/alsa/alsa-mixer.c:3905 +msgid "Multichannel" +msgstr "Багатоканальний" + +#: ../src/modules/alsa/alsa-mixer.c:3906 msgid "Analog Surround 2.1" msgstr "Аналоговий об'ємний 2.1" -#: ../src/modules/alsa/alsa-mixer.c:3810 +#: ../src/modules/alsa/alsa-mixer.c:3907 msgid "Analog Surround 3.0" msgstr "Аналоговий об'ємний 3.0" -#: ../src/modules/alsa/alsa-mixer.c:3811 +#: ../src/modules/alsa/alsa-mixer.c:3908 msgid "Analog Surround 3.1" msgstr "Аналоговий об'ємний 3.1" -#: ../src/modules/alsa/alsa-mixer.c:3812 +#: ../src/modules/alsa/alsa-mixer.c:3909 msgid "Analog Surround 4.0" msgstr "Аналоговий об'ємний 4.0" -#: ../src/modules/alsa/alsa-mixer.c:3813 +#: ../src/modules/alsa/alsa-mixer.c:3910 msgid "Analog Surround 4.1" msgstr "Аналоговий об'ємний 4.1" -#: ../src/modules/alsa/alsa-mixer.c:3814 +#: ../src/modules/alsa/alsa-mixer.c:3911 msgid "Analog Surround 5.0" msgstr "Аналоговий об'ємний 5.0" -#: ../src/modules/alsa/alsa-mixer.c:3815 +#: ../src/modules/alsa/alsa-mixer.c:3912 msgid "Analog Surround 5.1" msgstr "Аналоговий об'ємний 5.1" -#: ../src/modules/alsa/alsa-mixer.c:3816 +#: ../src/modules/alsa/alsa-mixer.c:3913 msgid "Analog Surround 6.0" msgstr "Аналоговий об'ємний 6.0" -#: ../src/modules/alsa/alsa-mixer.c:3817 +#: ../src/modules/alsa/alsa-mixer.c:3914 msgid "Analog Surround 6.1" msgstr "Аналоговий об'ємний 6.1" -#: ../src/modules/alsa/alsa-mixer.c:3818 +#: ../src/modules/alsa/alsa-mixer.c:3915 msgid "Analog Surround 7.0" msgstr "Аналоговий об'ємний 7.0" -#: ../src/modules/alsa/alsa-mixer.c:3819 +#: ../src/modules/alsa/alsa-mixer.c:3916 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 +#: ../src/modules/alsa/alsa-mixer.c:3917 msgid "Digital Stereo (IEC958)" msgstr "Цифрове стерео (IEC958)" -#: ../src/modules/alsa/alsa-mixer.c:3822 +#: ../src/modules/alsa/alsa-mixer.c:3918 msgid "Digital Passthrough (IEC958)" msgstr "Цифрове передавання (IEC958)" -#: ../src/modules/alsa/alsa-mixer.c:3823 +#: ../src/modules/alsa/alsa-mixer.c:3919 msgid "Digital Surround 4.0 (IEC958/AC3)" msgstr "Цифровий об’ємний 4.0 (IEC958/AC3)" -#: ../src/modules/alsa/alsa-mixer.c:3824 +#: ../src/modules/alsa/alsa-mixer.c:3920 msgid "Digital Surround 5.1 (IEC958/AC3)" msgstr "Цифровий об’ємний 5.1 (IEC958/AC3)" -#: ../src/modules/alsa/alsa-mixer.c:3825 +#: ../src/modules/alsa/alsa-mixer.c:3921 msgid "Digital Surround 5.1 (IEC958/DTS)" msgstr "Цифровий об’ємний 5.1 (IEC958/DTS)" -#: ../src/modules/alsa/alsa-mixer.c:3826 +#: ../src/modules/alsa/alsa-mixer.c:3922 msgid "Digital Stereo (HDMI)" msgstr "Цифровий стерео (HDMI)" -#: ../src/modules/alsa/alsa-mixer.c:3827 +#: ../src/modules/alsa/alsa-mixer.c:3923 msgid "Digital Surround 5.1 (HDMI)" msgstr "Цифровий об’ємний 5.1 (HDMI)" -#: ../src/modules/alsa/alsa-mixer.c:3956 +#: ../src/modules/alsa/alsa-mixer.c:4054 msgid "Analog Mono Duplex" msgstr "Аналогове двобічне моно" -#: ../src/modules/alsa/alsa-mixer.c:3957 +#: ../src/modules/alsa/alsa-mixer.c:4055 msgid "Analog Stereo Duplex" msgstr "Аналогове двобічне стерео" -#: ../src/modules/alsa/alsa-mixer.c:3958 +#: ../src/modules/alsa/alsa-mixer.c:4056 msgid "Digital Stereo Duplex (IEC958)" msgstr "Цифрове двобічне стерео (IEC958)" -#: ../src/modules/alsa/alsa-mixer.c:3959 +#: ../src/modules/alsa/alsa-mixer.c:4057 #: ../src/modules/alsa/module-alsa-card.c:193 #: ../src/modules/bluetooth/module-bluez4-device.c:2297 -#: ../src/modules/bluetooth/module-bluez5-device.c:1654 +#: ../src/modules/bluetooth/module-bluez5-device.c:1866 msgid "Off" msgstr "Вимкнено" -#: ../src/modules/alsa/alsa-mixer.c:4058 +#: ../src/modules/alsa/alsa-mixer.c:4156 #, c-format msgid "%s Output" msgstr "вихід %s" -#: ../src/modules/alsa/alsa-mixer.c:4066 +#: ../src/modules/alsa/alsa-mixer.c:4164 #, c-format msgid "%s Input" msgstr "вхід %s" @@ -1086,52 +924,52 @@ msgstr "" "про цю ваду розробникам ALSA." #: ../src/modules/bluetooth/module-bluez4-device.c:2091 -#: ../src/modules/bluetooth/module-bluez5-device.c:1441 +#: ../src/modules/bluetooth/module-bluez5-device.c:1625 msgid "Headset" msgstr "Гарнітура" #: ../src/modules/bluetooth/module-bluez4-device.c:2096 -#: ../src/modules/bluetooth/module-bluez5-device.c:1446 +#: ../src/modules/bluetooth/module-bluez5-device.c:1630 msgid "Handsfree" msgstr "Пристрій гучного зв’язку" #: ../src/modules/bluetooth/module-bluez4-device.c:2111 -#: ../src/modules/bluetooth/module-bluez5-device.c:1464 +#: ../src/modules/bluetooth/module-bluez5-device.c:1648 msgid "Headphone" msgstr "Навушники" #: ../src/modules/bluetooth/module-bluez4-device.c:2116 -#: ../src/modules/bluetooth/module-bluez5-device.c:1469 +#: ../src/modules/bluetooth/module-bluez5-device.c:1653 msgid "Portable" msgstr "Портативна система" #: ../src/modules/bluetooth/module-bluez4-device.c:2121 -#: ../src/modules/bluetooth/module-bluez5-device.c:1474 +#: ../src/modules/bluetooth/module-bluez5-device.c:1658 msgid "Car" msgstr "Автомобільна система" #: ../src/modules/bluetooth/module-bluez4-device.c:2126 -#: ../src/modules/bluetooth/module-bluez5-device.c:1479 +#: ../src/modules/bluetooth/module-bluez5-device.c:1663 msgid "HiFi" msgstr "HiFi" #: ../src/modules/bluetooth/module-bluez4-device.c:2131 -#: ../src/modules/bluetooth/module-bluez5-device.c:1484 +#: ../src/modules/bluetooth/module-bluez5-device.c:1668 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 +#: ../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 "Bluetooth (відтворення)" #: ../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 +#: ../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 "Bluetooth (вхід)" @@ -1151,14 +989,22 @@ msgstr "Телефонний дуплекс (HSP/HFP)" msgid "Handsfree Gateway" msgstr "Пристрій гучного зв’язку" -#: ../src/modules/bluetooth/module-bluez5-device.c:1527 +#: ../src/modules/bluetooth/module-bluez5-device.c:1711 msgid "High Fidelity Playback (A2DP Sink)" msgstr "Високоточне відтворення (приймач A2DP)" -#: ../src/modules/bluetooth/module-bluez5-device.c:1538 +#: ../src/modules/bluetooth/module-bluez5-device.c:1722 msgid "High Fidelity Capture (A2DP Source)" msgstr "Високоточне захоплення (джерело A2DP)" +#: ../src/modules/bluetooth/module-bluez5-device.c:1733 +msgid "Headset Head Unit (HSP/HFP)" +msgstr "Головний модуль гарнітури (HSP/HFP)" + +#: ../src/modules/bluetooth/module-bluez5-device.c:1745 +msgid "Headset Audio Gateway (HSP/HFP)" +msgstr "Звуковий шлюз гарнітури (HSP/HFP)" + #: ../src/modules/echo-cancel/module-echo-cancel.c:63 msgid "" "source_name=<name for the source> source_properties=<properties for the " @@ -1267,14 +1113,14 @@ msgstr "Звук на @НАЗВАВУЗЛА@" #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus' #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus' -#: ../src/modules/module-tunnel-sink-new.c:293 -#: ../src/modules/module-tunnel-source-new.c:294 +#: ../src/modules/module-tunnel-sink-new.c:299 +#: ../src/modules/module-tunnel-source-new.c:307 #, 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 +#: ../src/modules/module-tunnel-sink-new.c:509 +#: ../src/modules/module-tunnel-source-new.c:518 #, c-format msgid "Tunnel to %s/%s" msgstr "Тунель до %s/%s" @@ -1549,33 +1395,26 @@ msgstr "xcb_connection_has_error() повернуто true" 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 +#: ../src/pulse/context.c:658 #, c-format msgid "fork(): %s" msgstr "fork(): %s" -#: ../src/pulse/context.c:665 +#: ../src/pulse/context.c:713 #, c-format msgid "waitpid(): %s" msgstr "waitpid(): %s" -#: ../src/pulse/context.c:1366 +#: ../src/pulse/context.c:1414 #, 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 "вихід" @@ -1584,16 +1423,26 @@ msgid "bidirectional" msgstr "двобічний" #: ../src/pulse/direction.c:45 -#| msgid "(invalid)" 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 "" +"XDG_RUNTIME_DIR (%s) не належить нашому користувачу (uid %d), а належить " +"користувачу uid %d! (Таке, наприклад, може трапитися, якщо ви намагаєтеся " +"встановити з’єднання із PulseAudio, запущеного не від імені користувача root, " +"від імені користувача root за допомогою вбудованого протоколу. Не робіть так.)" + #: ../src/pulsecore/core-util.h:95 msgid "yes" msgstr "так" #: ../src/pulsecore/core-util.h:95 -#| msgid "Mono" msgid "no" msgstr "ні" @@ -1618,11 +1467,11 @@ msgstr "" msgid "Invalid log target." msgstr "Некоректна адреса файла журналу." -#: ../src/pulsecore/sink.c:3428 +#: ../src/pulsecore/sink.c:3429 msgid "Built-in Audio" msgstr "Вбудоване аудіо" -#: ../src/pulsecore/sink.c:3433 +#: ../src/pulsecore/sink.c:3434 msgid "Modem" msgstr "Модем" @@ -1663,8 +1512,9 @@ msgid "Timeout" msgstr "Перевищення часу очікування" #: ../src/pulse/error.c:49 -msgid "No authorization key" -msgstr "Не вказано ключа розпізнавання" +#| msgid "No authorization key" +msgid "No authentication key" +msgstr "Немає ключа розпізнавання" #: ../src/pulse/error.c:50 msgid "Internal error" @@ -1747,12 +1597,12 @@ msgstr "%0.1f ГБ" #: ../src/pulse/sample.c:193 #, c-format msgid "%0.1f MiB" -msgstr "%0.1f МБ" +msgstr "%0.1f МіБ" #: ../src/pulse/sample.c:195 #, c-format msgid "%0.1f KiB" -msgstr "%0.1f кБ" +msgstr "%0.1f КіБ" #: ../src/pulse/sample.c:197 #, c-format @@ -1823,11 +1673,6 @@ msgstr "" msgid "%s %s\n" msgstr "%s %s\n" -#: ../src/tests/resampler-test.c:419 -#, c-format -msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)" -msgstr "=== %d секунд: %d Гц %d кан. (%s) -> %d Гц %d кан. (%s)" - #: ../src/utils/pacat.c:118 #, c-format msgid "Failed to drain stream: %s" @@ -1887,7 +1732,6 @@ msgstr "Використання частотної специфікації «% #: ../src/utils/pacat.c:359 #, c-format -#| msgid "Connected to device %s (%u, %ssuspended)." msgid "Connected to device %s (index: %u, suspended: %s)." msgstr "З’єднано з пристроєм %s (індекс: %u, призупинено: %s)." @@ -2009,70 +1853,6 @@ 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" @@ -2170,8 +1950,7 @@ msgstr "" " --channel-map=КАРТА КАНАЛІВ Карта каналів, яку слід " "використовувати замість типової\n" " --fix-format Запозичити формат фрагмента з " -"приймача, " -"з яким з’єднано\n" +"приймача, з яким з’єднано\n" " потік.\n" " --fix-rate Запозичити дані щодо частоти " "дискретизації з приймача, з яким з’єднано\n" @@ -2990,12 +2769,10 @@ msgid "Volume outside permissible range.\n" 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" @@ -3026,7 +2803,6 @@ msgid "NAME [SINK]" msgstr "НАЗВА [ПРИЙМАЧ]" #: ../src/utils/pactl.c:1580 -#| msgid "NAME|#N VOLUME" msgid "NAME|#N VOLUME [VOLUME ...]" msgstr "НАЗВА|НОМЕР ГУЧНІСТЬ [ГУЧНІСТЬ ...]" @@ -3389,31 +3165,146 @@ msgstr "Не вдалося обробити дані куки\n" msgid "Failed to save cookie data\n" msgstr "Не вдалося зберегти дані куки\n" -#: ../src/utils/pax11publish.c:156 -#, c-format -msgid "Failed to load client configuration file.\n" -msgstr "Не вдалося завантажити файл налаштувань клієнта.\n" - -#: ../src/utils/pax11publish.c:161 -#, c-format -msgid "Failed to read environment configuration data.\n" -msgstr "Не вдалося прочитати дані налаштування середовища.\n" - -#: ../src/utils/pax11publish.c:178 +#: ../src/utils/pax11publish.c:170 #, c-format msgid "Failed to get FQDN.\n" msgstr "Не вдалося отримати FQDN.\n" -#: ../src/utils/pax11publish.c:198 +#: ../src/utils/pax11publish.c:190 #, c-format msgid "Failed to load cookie data\n" msgstr "Не вдалося завантажити дані куки\n" -#: ../src/utils/pax11publish.c:216 +#: ../src/utils/pax11publish.c:208 #, c-format msgid "Not yet implemented.\n" msgstr "Ще не реалізовано.\n" +#~ msgid "Cleaning up privileges." +#~ msgstr "Позбуваємося прав доступу." + +#~ msgid "Got signal %s." +#~ msgstr "Отримано сигнал %s." + +#~ msgid "Exiting." +#~ msgstr "Завершення роботи." + +#~ msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)." +#~ msgstr "Знайдено користувача «%s» (UID %lu) і групу «%s» (GID %lu)." + +#~ msgid "Successfully changed user to \"" +#~ msgstr "Користувача успішно змінено на «" + +#~ msgid "setrlimit(%s, (%u, %u)) failed: %s" +#~ msgstr "Спроба виконати setrlimit(%s, (%u, %u)) була невдалою: %s" + +#~ msgid "Daemon not running" +#~ msgstr "Фонову службу не запущено" + +#~ msgid "Daemon running as PID %u" +#~ msgstr "Фонову службу запущено як PID %u" + +#~ msgid "Daemon startup successful." +#~ msgstr "Фонову службу успішно запущено." + +#~ msgid "This is PulseAudio %s" +#~ msgstr "Це PulseAudio %s" + +#~ msgid "Compilation host: %s" +#~ msgstr "Вузол збирання: %s" + +#~ msgid "Compilation CFLAGS: %s" +#~ msgstr "CFLAGS збирання: %s" + +#~ msgid "Running on host: %s" +#~ msgstr "Запущено на вузлі: %s" + +#~ msgid "Found %u CPUs." +#~ msgstr "Знайдено %u процесорів." + +#~ msgid "Page size is %lu bytes" +#~ msgstr "Розмір сторінки дорівнює %lu байтам" + +#~ msgid "Compiled with Valgrind support: yes" +#~ msgstr "Зібрано з підтримкою Valgrind: так" + +#~ msgid "Compiled with Valgrind support: no" +#~ msgstr "Зібрано з підтримкою Valgrind: ні" + +#~ msgid "Running in valgrind mode: %s" +#~ msgstr "Запуск у режимі valgrind: %s" + +#~ msgid "Running in VM: %s" +#~ msgstr "Запущено у віртуальній машині: %s" + +#~ msgid "Optimized build: yes" +#~ msgstr "Зібрано з оптимізацією: так" + +#~ msgid "Optimized build: no" +#~ msgstr "Зібрано з оптимізацією: ні" + +#~ msgid "NDEBUG defined, all asserts disabled." +#~ msgstr "Визначено NDEBUG, всі додавання вимкнено." + +#~ msgid "FASTPATH defined, only fast path asserts disabled." +#~ msgstr "Визначено FASTPATH, вимкнено лише додавання швидких шляхів." + +#~ msgid "All asserts enabled." +#~ msgstr "Увімкнено всі додавання." + +#~ msgid "Machine ID is %s." +#~ msgstr "Ідентифікатор системи %s." + +#~ msgid "Session ID is %s." +#~ msgstr "Ідентифікатор сеансу — %s." + +#~ msgid "Using runtime directory %s." +#~ msgstr "Каталог запуску: %s." + +#~ msgid "Using state directory %s." +#~ msgstr "Каталог стану: %s." + +#~ msgid "Using modules directory %s." +#~ msgstr "Каталог модулів: %s." + +#~ msgid "Running in system mode: %s" +#~ msgstr "Запуску у загальносистемному режимі: %s" + +#~ msgid "Fresh high-resolution timers available! Bon appetit!" +#~ msgstr "Доступні свіжі високоточні таймери! Смачного!" + +#~ msgid "" +#~ "Dude, your kernel stinks! The chef's recommendation today is Linux with " +#~ "high-resolution timers enabled!" +#~ msgstr "" +#~ "Хлопче, від твого ядра вже тхне! Варто нарешті встановити Linux з " +#~ "увімкненими високоточними таймерами!" + +#~ msgid "Daemon startup complete." +#~ msgstr "Запуск фонової служби завершено." + +#~ msgid "Daemon shutdown initiated." +#~ msgstr "Ініційовано завершення роботи фонової служби." + +#~ msgid "Daemon terminated." +#~ msgstr "Виконання фонової служби перервано." + +#~ msgid "Analog 4-channel Input" +#~ msgstr "Аналогових 4-канальний вхід" + +#~ msgid "No cookie loaded. Attempting to connect without." +#~ msgstr "" +#~ "Куків не завантажено. Буде виконано спробу з’єднання за їх відсутності." + +#~ msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)" +#~ msgstr "=== %d секунд: %d Гц %d кан. (%s) -> %d Гц %d кан. (%s)" + +#~ msgid "Failed to load client configuration file.\n" +#~ msgstr "Не вдалося завантажити файл налаштувань клієнта.\n" + +#~ msgid "Failed to read environment configuration data.\n" +#~ msgstr "Не вдалося прочитати дані налаштування середовища.\n" + #~ msgid "PulseAudio Sound System KDE Routing Policy" #~ msgstr "Правила маршрутизації звукової системи PulseAudio у KDE" diff --git a/po/zh_TW.po b/po/zh_TW.po index 25daff8..82a7eef 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,22 +8,20 @@ msgstr "" "Project-Id-Version: PulseAudio Volume Control\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-01-30 10:10+0000\n" -"PO-Revision-Date: 2013-07-31 00:33+0800\n" +"PO-Revision-Date: 2014-11-11 22:10+0800\n" "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" "Language-Team: zh_TW\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.6.10\n" #: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1204 #, 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." +"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 bytes (%lu ms)。\n" "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。" @@ -31,10 +29,8 @@ 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." +"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 bytes (%s%lu ms)。\n" "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。" @@ -42,10 +38,8 @@ 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." +"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 少於可用的 %lu。\n" "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。" @@ -53,10 +47,8 @@ msgstr "" #: ../src/modules/alsa/alsa-util.c:1263 #, 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." +"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 bytes (%lu ms)。\n" "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。" @@ -74,21 +66,8 @@ msgid "Virtual LADSPA sink" msgstr "虛擬 LADSPA sink" #: ../src/modules/module-ladspa-sink.c:52 -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 的名稱> sink_properties=<sink 的屬性> master=<要過濾的 sink " -"名稱> format=<樣本格式> rate=<取樣率> channels=<聲道數> channel_map=<輸入聲道" -"對應表> plugin=<ladspa 插件名稱> label=<ladspa 插件標籤> control=<以半形逗號" -"分隔的輸入控制值清單> input_ladspaport_map=<以半形逗號分隔的輸入 LADSPA 連接" -"埠名稱清單> output_ladspaport_map=<以半形逗號分隔的輸出 LADSPA 連接埠名稱清單" -"> " +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 的名稱> sink_properties=<sink 的屬性> master=<要過濾的 sink 名稱> 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" @@ -190,9 +169,7 @@ msgid "Failed to parse command line." msgstr "未能解析命令列。" #: ../src/daemon/main.c:529 -msgid "" -"System mode refused for non-root user. Only starting the D-Bus server lookup " -"service." +msgid "System mode refused for non-root user. Only starting the D-Bus server lookup service." msgstr "系統模式拒絕非 root 使用者。僅啟動 D-Bus 伺服器查看服務。" #: ../src/daemon/main.c:611 @@ -210,9 +187,7 @@ msgid "Failed to kill daemon: %s" msgstr "未能結束幕後程式：%s" #: ../src/daemon/main.c:657 -msgid "" -"This program is not intended to be run as root (unless --system is " -"specified)." +msgid "This program is not intended to be run as root (unless --system is specified)." msgstr "本程式不預期以 root 身份執行（除非有指定 --system）。" #: ../src/daemon/main.c:660 @@ -230,8 +205,7 @@ msgstr "使用者於 %s 設定的伺服器，拒絕啟動/autospawn。" #: ../src/daemon/main.c:713 #, c-format -msgid "" -"User-configured server at %s, which appears to be local. Probing deeper." +msgid "User-configured server at %s, which appears to be local. Probing deeper." msgstr "使用者設定的伺服器位於 %s，它似乎是本機。正在深入探測。" #: ../src/daemon/main.c:718 @@ -386,17 +360,13 @@ msgstr "以系統模式執行中：%s" #: ../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." +"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 "" "好的，所以您正以系統模式執行 PA。請注意，您很不應該那麼做。\n" "若您仍執意這樣做，那麼當事情的進展非如您所願時是您自己的過錯。\n" -"請閱讀 http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode 來瞭解為何採用系" -"統模式是個壞主意。" +"請閱讀 http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode 來瞭解為何採用系統模式是個壞主意。" #: ../src/daemon/main.c:981 msgid "pa_pid_file_create() failed." @@ -407,9 +377,7 @@ msgid "Fresh high-resolution timers available! Bon appetit!" msgstr "有新鮮的高解析度計時器可用！期望您有個好食慾！" #: ../src/daemon/main.c:993 -msgid "" -"Dude, your kernel stinks! The chef's recommendation today is Linux with high-" -"resolution timers enabled!" +msgid "Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!" msgstr "先生，您的核心糟透了！今日主廚推薦是啟用高解析度計時器的 Linux！" #: ../src/daemon/main.c:1011 @@ -447,46 +415,36 @@ msgid "" " --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" +" --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" +" --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" +" (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" +" (only available as root, when SUID or\n" " with elevated RLIMIT_RTPRIO)\n" -" --disallow-module-loading[=BOOL] Disallow module user requested " -"module\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" +" --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" +" --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-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" +" -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" @@ -497,12 +455,10 @@ msgid "" " --disable-shm[=BOOL] Disable shared memory support.\n" "\n" "STARTUP SCRIPT:\n" -" -L, --load=\"MODULE ARGUMENTS\" Load the specified plugin module " -"with\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" +" -C Open a command line on the running TTY\n" " after startup\n" "\n" " -n Don't load default script file\n" @@ -518,8 +474,7 @@ msgstr "" " --cleanup-shm 清理狀態共享記憶體區段\n" " --start 啟動幕後程式如果它未在執行中\n" " -k --kill 終結執行中的幕後程式\n" -" --check 檢查執行中的幕後程式 (僅傳回離開代" -"碼)\n" +" --check 檢查執行中的幕後程式 (僅傳回離開代碼)\n" "\n" "OPTIONS:\n" " --system[=BOOL] 以系統域實體執行\n" @@ -548,8 +503,7 @@ msgstr "" " -p, --dl-search-path=PATH 設定動態分享物件 (插件) \n" " 的搜尋路徑\n" " --resample-method=METHOD 使用指定的重新取樣方法\n" -" (查看 --dump-resample-methods 以了" -"解\n" +" (查看 --dump-resample-methods 以了解\n" " 可能的值)\n" " --use-pid-file[=BOOL] 建立一個 PID 檔案\n" " --no-cpu-limit[=BOOL] 不要在支援 CPU 載入限制器的\n" @@ -574,12 +528,8 @@ msgid "--fail expects boolean argument" msgstr "--fail 預期布林引數" #: ../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 "" -"--log-level 預期記錄層級引數 (範圍 0..4 間的數字，或是後列之一： debug、" -"info、notice、warn、error)。" +msgid "--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 間的數字，或是後列之一： debug、info、notice、warn、error)。" #: ../src/daemon/cmdline.c:273 msgid "--high-priority expects boolean argument" @@ -602,12 +552,8 @@ msgid "--use-pid-file expects boolean argument" msgstr "--use-pid-file 預期布林引數" #: ../src/daemon/cmdline.c:318 -msgid "" -"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file " -"name 'file:<path>'." -msgstr "" -"無效的記錄目標：使用「syslog」、「stderr」或「auto」或有效的檔名「file:" -"<path>」。" +msgid "Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file name 'file:<path>'." +msgstr "無效的記錄目標：使用「syslog」、「stderr」或「auto」或有效的檔名「file:<path>」。" #: ../src/daemon/cmdline.c:325 msgid "--log-time expects boolean argument" @@ -745,9 +691,7 @@ msgid "Failed to open configuration file: %s" msgstr "未能開啟組態檔：%s" #: ../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." +msgid "The specified default channel map has a different number of channels than the specified default number of channels." msgstr "指定的預設聲道對應表的聲道數與指定的預設聲道數不同。" #: ../src/daemon/daemon-conf.c:743 @@ -1363,52 +1307,31 @@ msgid "" "\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" +" -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" +" --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" +" --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" +" --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" +" --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" @@ -1428,14 +1351,10 @@ msgstr "" " -d, --device=DEVICE 要連接的 sink/來源名稱\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" +" --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" @@ -1449,8 +1368,7 @@ msgstr "" " --no-remix 不要 upmix 或 downmix 聲道。\n" " --no-remap 用索引來對應聲道而不是用名稱。\n" " --latency=BYTES 以 bytes 請求指定的延遲。\n" -" --process-time=BYTES 每個請求以 bytes 請求指定的程序時" -"間。\n" +" --process-time=BYTES 每個請求以 bytes 請求指定的程序時間。\n" " --latency-msec=MSEC 以毫秒請求指定的延遲。\n" " --process-time-msec=MSEC 每個請求以毫秒請求指定的程序時間。\n" " --property=PROPERTY=VALUE 設定指定的屬性給指定的值。\n" @@ -1532,9 +1450,7 @@ msgid "Failed to open audio file." msgstr "未能開啟音效檔。" #: ../src/utils/pacat.c:1036 -msgid "" -"Warning: specified sample specification will be overwritten with " -"specification from file." +msgid "Warning: specified sample specification will be overwritten with specification from file." msgstr "警告：指定的取樣規格將會覆寫從檔案得到的規格。" #: ../src/utils/pacat.c:1039 ../src/utils/pactl.c:1467 @@ -1555,8 +1471,7 @@ msgstr "警告：未能將聲道對應表寫入檔案。" #: ../src/utils/pacat.c:1085 #, c-format -msgid "" -"Opening a %s stream with sample specification '%s' and channel map '%s'." +msgid "Opening a %s stream with sample specification '%s' and channel map '%s'." msgstr "正在開啟一道 %s 串流，取樣規格為「%s」，聲道對應表為「%s」。" #: ../src/utils/pacat.c:1086 @@ -1643,8 +1558,7 @@ msgid "" "\n" " -h, --help Show this help\n" " --version Show version\n" -" -s, --server=SERVER The name of the server to connect " -"to\n" +" -s, --server=SERVER The name of the server to connect to\n" "\n" msgstr "" "%s [選項] ... \n" @@ -2214,10 +2128,8 @@ msgid "" " -h, --help Show this help\n" " --version Show version\n" "\n" -" -s, --server=SERVER The name of the server to connect " -"to\n" -" -n, --client-name=NAME How to call this client on the " -"server\n" +" -s, --server=SERVER The name of the server to connect to\n" +" -n, --client-name=NAME How to call this client on the server\n" msgstr "" "\n" " -h, --help 顯示此幫助\n" @@ -2279,14 +2191,11 @@ 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." +msgid "You may not specify more than one sink. You have to specify a boolean value." msgstr "您指定的 sink 數不能超過一個。您必須指定一項布林值。" #: ../src/utils/pactl.c:1573 -msgid "" -"You may not specify more than one source. You have to specify a boolean " -"value." +msgid "You may not specify more than one source. You have to specify a boolean value." msgstr "您指定的來源數不能超過一個。您必須指定一項布林值。" #: ../src/utils/pactl.c:1585 @@ -2355,9 +2264,7 @@ msgid "Invalid source output index specification" msgstr "無效的來源輸出索引規格" #: ../src/utils/pactl.c:1756 -msgid "" -"You have to specify a sink index and a semicolon-separated list of supported " -"formats" +msgid "You have to specify a sink index and a semicolon-separated list of supported formats" msgstr "您必須指定一個 sink 索引，以及一份以半形分號分隔、列有支援格式的清單" #: ../src/utils/pactl.c:1772 @@ -2371,8 +2278,7 @@ msgid "" "\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" +" -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" @@ -2486,32 +2392,24 @@ msgstr "無法存取 autospawn 鎖。" #: ../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." +"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。" +"我們被 POLLOUT 設定喚醒 -- 然而後續的 snd_pcm_avail() 傳回 0 或另一個值 < min_avail。" #: ../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." +"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。" +"我們被 POLLIN 設定喚醒 -- 然而後續的 snd_pcm_avail() 傳回 0 或另一個值 < min_avail。" #: ../src/modules/alsa/module-alsa-card.c:167 #: ../src/modules/bluetooth/module-bluetooth-device.c:2796 @@ -2641,7 +2539,7 @@ msgstr "喇叭" #: ../src/modules/alsa/alsa-mixer.c:2240 ../src/modules/alsa/alsa-mixer.c:2311 msgid "Headphones" -msgstr "頭戴式麥克風" +msgstr "頭戴式耳機" #: ../src/modules/alsa/alsa-mixer.c:2301 msgid "Analog Input" @@ -2782,39 +2680,16 @@ msgid "%s Input" msgstr "%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 "" -"source_name=<來源的名稱> source_properties=<來源的屬性> source_master=<要過濾" -"的來源名稱> sink_name=<sink 的名稱> sink_properties=<sink 的屬性> " -"sink_master=<要過濾的 sink 名稱> adjust_time=<多久 (秒) 重新調整一次頻率> " -"adjust_threshold=<在多少個 drift 後 (單位是微秒) 要重新調整> format=<取樣格式" -"> rate=<取樣率> channels=<聲道數> channel_map=<聲道對應表> aec_method=<要使用" -"的實作> aec_args=<AEC 引擎的參數> save_aec=<在 /tmp 內儲存 AEC 資料> " -"autoloaded=<設定此模組是否正被自動載入> use_volume_sharing=<yes 或 no> " +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 的名稱> sink_properties=<sink 的屬性> sink_master=<要過濾的 sink 名稱> adjust_time=<多久 (秒) 重新調整一次頻率> adjust_threshold=<在多少個 drift 後 (單位是微秒) 要重新調整> format=<取樣格式> rate=<取樣率> channels=<聲道數> channel_map=<聲道對應表> aec_method=<要使用的實作> aec_args=<AEC 引擎的參數> save_aec=<在 /tmp 內儲存 AEC 資料> autoloaded=<設定此模組是否正被自動載入> use_volume_sharing=<yes 或 no> " #: ../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 的名稱> sink_properties=<sink 的屬性> sink_master=<要連接的 " -"sink> format=<取樣格式> rate=<取樣率> channels=<聲道數> channel_map=<聲道對應" -"表> autoloaded=<設定此模組是否正被自動載入> use_volume_sharing=<yes 或 no> " +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 的名稱> sink_properties=<sink 的屬性> sink_master=<要連接的 sink> format=<取樣格式> rate=<取樣率> channels=<聲道數> channel_map=<聲道對應表> autoloaded=<設定此模組是否正被自動載入> use_volume_sharing=<yes 或 no> " #: ../src/modules/module-filter-apply.c:48 msgid "autoclean=<automatically unload unused filters?>" @@ -2827,24 +2702,19 @@ msgid "" "\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-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" +" --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" +"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" +"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" diff --git a/src/Makefile.am b/src/Makefile.am index 4e60a98..88a824e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -288,11 +288,15 @@ TESTS_daemon = \ if !OS_IS_WIN32 TESTS_default += \ - srbchannel-test \ sigbus-test \ usergroup-test endif +if HAVE_SYS_EVENTFD_H +TESTS_default += \ + srbchannel-test +endif + if !OS_IS_DARWIN TESTS_default += \ once-test diff --git a/src/Makefile.in b/src/Makefile.in index 82cd592..8c55521 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -161,244 +161,246 @@ bin_PROGRAMS = pulseaudio$(EXEEXT) pacat$(EXEEXT) pactl$(EXEEXT) \ @HAVE_X11_TRUE@am__append_15 = pax11publish @HAVE_X11_TRUE@am__append_16 = start-pulseaudio-x11 @OS_IS_WIN32_FALSE@am__append_17 = \ -@OS_IS_WIN32_FALSE@ srbchannel-test \ @OS_IS_WIN32_FALSE@ sigbus-test \ @OS_IS_WIN32_FALSE@ usergroup-test -@OS_IS_DARWIN_FALSE@am__append_18 = \ +@HAVE_SYS_EVENTFD_H_TRUE@am__append_18 = \ +@HAVE_SYS_EVENTFD_H_TRUE@ srbchannel-test + +@OS_IS_DARWIN_FALSE@am__append_19 = \ @OS_IS_DARWIN_FALSE@ once-test -@HAVE_SIGXCPU_TRUE@am__append_19 = \ +@HAVE_SIGXCPU_TRUE@am__append_20 = \ @HAVE_SIGXCPU_TRUE@ cpulimit-test \ @HAVE_SIGXCPU_TRUE@ cpulimit-test2 -@HAVE_GLIB20_TRUE@am__append_20 = \ +@HAVE_GLIB20_TRUE@am__append_21 = \ @HAVE_GLIB20_TRUE@ mainloop-test-glib -@HAVE_GTK30_TRUE@am__append_21 = \ +@HAVE_GTK30_TRUE@am__append_22 = \ @HAVE_GTK30_TRUE@ gtk-test -@HAVE_ALSA_TRUE@am__append_22 = \ +@HAVE_ALSA_TRUE@am__append_23 = \ @HAVE_ALSA_TRUE@ alsa-time-test -@HAVE_ALSA_TRUE@am__append_23 = \ +@HAVE_ALSA_TRUE@am__append_24 = \ @HAVE_ALSA_TRUE@ alsa-mixer-path-test -@HAVE_TESTS_TRUE@TESTS = $(am__EXEEXT_8) +@HAVE_TESTS_TRUE@TESTS = $(am__EXEEXT_9) @BUILD_TESTS_DEFAULT_TRUE@@HAVE_TESTS_TRUE@noinst_PROGRAMS = \ -@BUILD_TESTS_DEFAULT_TRUE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_8) \ -@BUILD_TESTS_DEFAULT_TRUE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_12) \ -@BUILD_TESTS_DEFAULT_TRUE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_13) +@BUILD_TESTS_DEFAULT_TRUE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_9) \ +@BUILD_TESTS_DEFAULT_TRUE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_13) \ +@BUILD_TESTS_DEFAULT_TRUE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_14) @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@check_PROGRAMS = \ -@BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_8) \ -@BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_12) -@OS_IS_WIN32_TRUE@am__append_24 = pulsecore/poll-win32.c pulsecore/poll.h -@OS_IS_WIN32_FALSE@am__append_25 = pulsecore/poll-posix.c pulsecore/poll.h -@HAVE_X11_TRUE@am__append_26 = \ +@BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_9) \ +@BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_13) +@OS_IS_WIN32_TRUE@am__append_25 = pulsecore/poll-win32.c pulsecore/poll.h +@OS_IS_WIN32_FALSE@am__append_26 = pulsecore/poll-posix.c pulsecore/poll.h +@HAVE_X11_TRUE@am__append_27 = \ @HAVE_X11_TRUE@ pulse/client-conf-x11.c pulse/client-conf-x11.h \ @HAVE_X11_TRUE@ pulsecore/x11prop.c pulsecore/x11prop.h -@HAVE_X11_TRUE@am__append_27 = $(X11_CFLAGS) -@HAVE_X11_TRUE@am__append_28 = $(X11_LIBS) -@HAVE_SYSTEMD_DAEMON_TRUE@am__append_29 = $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS) -@HAVE_SYSTEMD_DAEMON_TRUE@am__append_30 = $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS) -@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_31 = $(SYSTEMD_FLAGS) $(SYSTEMDJOURNAL_FLAGS) -@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_32 = $(SYSTEMD_LIBS) $(SYSTEMDJOURNAL_LIBS) -@OS_IS_WIN32_TRUE@am__append_33 = \ +@HAVE_X11_TRUE@am__append_28 = $(X11_CFLAGS) +@HAVE_X11_TRUE@am__append_29 = $(X11_LIBS) +@HAVE_SYSTEMD_DAEMON_TRUE@am__append_30 = $(SYSTEMD_FLAGS) $(SYSTEMDDAEMON_FLAGS) +@HAVE_SYSTEMD_DAEMON_TRUE@am__append_31 = $(SYSTEMD_LIBS) $(SYSTEMDDAEMON_LIBS) +@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_32 = $(SYSTEMD_FLAGS) $(SYSTEMDJOURNAL_FLAGS) +@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_33 = $(SYSTEMD_LIBS) $(SYSTEMDJOURNAL_LIBS) +@OS_IS_WIN32_TRUE@am__append_34 = \ @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 -@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_34 = \ +@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_35 = \ @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 -@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_35 = "-I/Developer/Headers/FlatCarbon/" +@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_36 = "-I/Developer/Headers/FlatCarbon/" #libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += "-framework CoreServices" -@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@am__append_36 = \ +@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@am__append_37 = \ @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 -@HAVE_LIBASYNCNS_TRUE@am__append_37 = $(LIBASYNCNS_CFLAGS) -@HAVE_LIBASYNCNS_TRUE@am__append_38 = $(LIBASYNCNS_LIBS) -@OS_IS_WIN32_TRUE@am__append_39 = pulsecore/dllmain.c -@HAVE_DBUS_TRUE@am__append_40 = \ +@HAVE_LIBASYNCNS_TRUE@am__append_38 = $(LIBASYNCNS_CFLAGS) +@HAVE_LIBASYNCNS_TRUE@am__append_39 = $(LIBASYNCNS_LIBS) +@OS_IS_WIN32_TRUE@am__append_40 = pulsecore/dllmain.c +@HAVE_DBUS_TRUE@am__append_41 = \ @HAVE_DBUS_TRUE@ pulsecore/dbus-util.c pulsecore/dbus-util.h \ @HAVE_DBUS_TRUE@ pulsecore/rtkit.c pulsecore/rtkit.h -@HAVE_DBUS_TRUE@am__append_41 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_42 = $(DBUS_LIBS) -@HAVE_GLIB20_TRUE@am__append_43 = \ +@HAVE_DBUS_TRUE@am__append_42 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_43 = $(DBUS_LIBS) +@HAVE_GLIB20_TRUE@am__append_44 = \ @HAVE_GLIB20_TRUE@ pulse/glib-mainloop.h -@HAVE_GLIB20_TRUE@am__append_44 = \ +@HAVE_GLIB20_TRUE@am__append_45 = \ @HAVE_GLIB20_TRUE@ libpulse-mainloop-glib.la -@HAVE_DBUS_TRUE@am__append_45 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_46 = $(DBUS_LIBS) -@HAVE_OSS_WRAPPER_TRUE@am__append_47 = padsp +@HAVE_DBUS_TRUE@am__append_46 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_47 = $(DBUS_LIBS) @HAVE_OSS_WRAPPER_TRUE@am__append_48 = padsp -@HAVE_NEON_TRUE@am__append_49 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la +@HAVE_OSS_WRAPPER_TRUE@am__append_49 = padsp @HAVE_NEON_TRUE@am__append_50 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la -@HAVE_ORC_TRUE@am__append_51 = pulsecore/svolume_orc.c -@HAVE_ORC_TRUE@am__append_52 = $(ORC_CFLAGS) -@HAVE_ORC_TRUE@am__append_53 = $(ORC_LIBS) -@HAVE_X11_TRUE@am__append_54 = pulsecore/x11wrap.c pulsecore/x11wrap.h -@HAVE_X11_TRUE@am__append_55 = $(X11_CFLAGS) -@HAVE_X11_TRUE@am__append_56 = $(X11_LIBS) -@HAVE_DBUS_TRUE@am__append_57 = \ +@HAVE_NEON_TRUE@am__append_51 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_remap_neon.la +@HAVE_ORC_TRUE@am__append_52 = pulsecore/svolume_orc.c +@HAVE_ORC_TRUE@am__append_53 = $(ORC_CFLAGS) +@HAVE_ORC_TRUE@am__append_54 = $(ORC_LIBS) +@HAVE_X11_TRUE@am__append_55 = pulsecore/x11wrap.c pulsecore/x11wrap.h +@HAVE_X11_TRUE@am__append_56 = $(X11_CFLAGS) +@HAVE_X11_TRUE@am__append_57 = $(X11_LIBS) +@HAVE_DBUS_TRUE@am__append_58 = \ @HAVE_DBUS_TRUE@ pulsecore/dbus-shared.c pulsecore/dbus-shared.h \ @HAVE_DBUS_TRUE@ pulsecore/protocol-dbus.c pulsecore/protocol-dbus.h -@HAVE_DBUS_TRUE@am__append_58 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_59 = $(DBUS_LIBS) -@HAVE_GDBM_TRUE@am__append_60 = pulsecore/database-gdbm.c -@HAVE_GDBM_TRUE@am__append_61 = $(GDBM_CFLAGS) -@HAVE_GDBM_TRUE@am__append_62 = $(GDBM_LIBS) -@HAVE_TDB_TRUE@am__append_63 = pulsecore/database-tdb.c -@HAVE_TDB_TRUE@am__append_64 = $(TDB_CFLAGS) -@HAVE_TDB_TRUE@am__append_65 = $(TDB_LIBS) -@HAVE_SIMPLEDB_TRUE@am__append_66 = pulsecore/database-simple.c -@HAVE_SPEEX_TRUE@am__append_67 = pulsecore/resampler/speex.c -@HAVE_SPEEX_TRUE@am__append_68 = $(LIBSPEEX_CFLAGS) -@HAVE_SPEEX_TRUE@am__append_69 = $(LIBSPEEX_LIBS) -@HAVE_LIBSAMPLERATE_TRUE@am__append_70 = pulsecore/resampler/libsamplerate.c -@HAVE_LIBSAMPLERATE_TRUE@am__append_71 = $(LIBSAMPLERATE_CFLAGS) -@HAVE_LIBSAMPLERATE_TRUE@am__append_72 = $(LIBSAMPLERATE_LIBS) -@HAVE_WEBRTC_TRUE@am__append_73 = libwebrtc-util.la -@HAVE_ESOUND_TRUE@am__append_74 = \ +@HAVE_DBUS_TRUE@am__append_59 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_60 = $(DBUS_LIBS) +@HAVE_GDBM_TRUE@am__append_61 = pulsecore/database-gdbm.c +@HAVE_GDBM_TRUE@am__append_62 = $(GDBM_CFLAGS) +@HAVE_GDBM_TRUE@am__append_63 = $(GDBM_LIBS) +@HAVE_TDB_TRUE@am__append_64 = pulsecore/database-tdb.c +@HAVE_TDB_TRUE@am__append_65 = $(TDB_CFLAGS) +@HAVE_TDB_TRUE@am__append_66 = $(TDB_LIBS) +@HAVE_SIMPLEDB_TRUE@am__append_67 = pulsecore/database-simple.c +@HAVE_SPEEX_TRUE@am__append_68 = pulsecore/resampler/speex.c +@HAVE_SPEEX_TRUE@am__append_69 = $(LIBSPEEX_CFLAGS) +@HAVE_SPEEX_TRUE@am__append_70 = $(LIBSPEEX_LIBS) +@HAVE_LIBSAMPLERATE_TRUE@am__append_71 = pulsecore/resampler/libsamplerate.c +@HAVE_LIBSAMPLERATE_TRUE@am__append_72 = $(LIBSAMPLERATE_CFLAGS) +@HAVE_LIBSAMPLERATE_TRUE@am__append_73 = $(LIBSAMPLERATE_LIBS) +@HAVE_WEBRTC_TRUE@am__append_74 = libwebrtc-util.la +@HAVE_ESOUND_TRUE@am__append_75 = \ @HAVE_ESOUND_TRUE@ libprotocol-esound.la # We need to emulate sendmsg/recvmsg to support this on Win32 -@OS_IS_WIN32_FALSE@am__append_75 = \ +@OS_IS_WIN32_FALSE@am__append_76 = \ @OS_IS_WIN32_FALSE@ librtp.la -@HAVE_AVAHI_TRUE@am__append_76 = \ +@HAVE_AVAHI_TRUE@am__append_77 = \ @HAVE_AVAHI_TRUE@ libavahi-wrap.la -@HAVE_DBUS_TRUE@am__append_77 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_78 = $(DBUS_LIBS) +@HAVE_DBUS_TRUE@am__append_78 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_79 = $(DBUS_LIBS) ################################### # Plug-in libraries # ################################### # Serveral module (e.g. libalsa-util.la) -@HAVE_DBUS_TRUE@am__append_79 = \ +@HAVE_DBUS_TRUE@am__append_80 = \ @HAVE_DBUS_TRUE@ module-console-kit.la -@HAVE_ESOUND_TRUE@am__append_80 = \ +@HAVE_ESOUND_TRUE@am__append_81 = \ @HAVE_ESOUND_TRUE@ module-esound-protocol-tcp.la \ @HAVE_ESOUND_TRUE@ module-esound-sink.la # See comment at librtp.la above -@OS_IS_WIN32_FALSE@am__append_81 = \ +@OS_IS_WIN32_FALSE@am__append_82 = \ @OS_IS_WIN32_FALSE@ module-rtp-send.la \ @OS_IS_WIN32_FALSE@ module-rtp-recv.la -@HAVE_AF_UNIX_TRUE@am__append_82 = \ +@HAVE_AF_UNIX_TRUE@am__append_83 = \ @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 -@HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@am__append_83 = \ +@HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@am__append_84 = \ @HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@ module-esound-protocol-unix.la -@HAVE_MKFIFO_TRUE@am__append_84 = \ +@HAVE_MKFIFO_TRUE@am__append_85 = \ @HAVE_MKFIFO_TRUE@ module-pipe-sink.la \ @HAVE_MKFIFO_TRUE@ module-pipe-source.la -@HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@am__append_85 = \ +@HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@am__append_86 = \ @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@ module-esound-compat-spawnfd.la \ @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@ module-esound-compat-spawnpid.la -@HAVE_REGEX_TRUE@am__append_86 = \ +@HAVE_REGEX_TRUE@am__append_87 = \ @HAVE_REGEX_TRUE@ module-match.la -@HAVE_X11_TRUE@am__append_87 = \ +@HAVE_X11_TRUE@am__append_88 = \ @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 -@HAVE_OSS_OUTPUT_TRUE@am__append_88 = \ +@HAVE_OSS_OUTPUT_TRUE@am__append_89 = \ @HAVE_OSS_OUTPUT_TRUE@ liboss-util.la \ @HAVE_OSS_OUTPUT_TRUE@ module-oss.la -@HAVE_COREAUDIO_TRUE@am__append_89 = \ +@HAVE_COREAUDIO_TRUE@am__append_90 = \ @HAVE_COREAUDIO_TRUE@ module-coreaudio-detect.la \ @HAVE_COREAUDIO_TRUE@ module-coreaudio-device.la -pulselibexec_PROGRAMS = $(am__EXEEXT_14) -@HAVE_ALSA_TRUE@am__append_90 = \ +pulselibexec_PROGRAMS = $(am__EXEEXT_15) +@HAVE_ALSA_TRUE@am__append_91 = \ @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 -@HAVE_SOLARIS_TRUE@am__append_91 = \ +@HAVE_SOLARIS_TRUE@am__append_92 = \ @HAVE_SOLARIS_TRUE@ module-solaris.la -@HAVE_AVAHI_TRUE@am__append_92 = \ +@HAVE_AVAHI_TRUE@am__append_93 = \ @HAVE_AVAHI_TRUE@ module-zeroconf-publish.la \ @HAVE_AVAHI_TRUE@ module-zeroconf-discover.la -@HAVE_BONJOUR_TRUE@am__append_93 = \ +@HAVE_BONJOUR_TRUE@am__append_94 = \ @HAVE_BONJOUR_TRUE@ module-bonjour-publish.la -@HAVE_LIRC_TRUE@am__append_94 = \ +@HAVE_LIRC_TRUE@am__append_95 = \ @HAVE_LIRC_TRUE@ module-lirc.la -@HAVE_XEN_TRUE@am__append_95 = \ +@HAVE_XEN_TRUE@am__append_96 = \ @HAVE_XEN_TRUE@ module-xenpv-sink.la -@HAVE_EVDEV_TRUE@am__append_96 = \ +@HAVE_EVDEV_TRUE@am__append_97 = \ @HAVE_EVDEV_TRUE@ module-mmkbd-evdev.la -@HAVE_JACK_TRUE@am__append_97 = \ +@HAVE_JACK_TRUE@am__append_98 = \ @HAVE_JACK_TRUE@ module-jack-sink.la \ @HAVE_JACK_TRUE@ module-jack-source.la -@HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@am__append_98 = \ +@HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@am__append_99 = \ @HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@ module-jackdbus-detect.la -@HAVE_GCONF_TRUE@am__append_99 = \ +@HAVE_GCONF_TRUE@am__append_100 = \ @HAVE_GCONF_TRUE@ module-gconf.la -@HAVE_GCONF_TRUE@am__append_100 = \ +@HAVE_GCONF_TRUE@am__append_101 = \ @HAVE_GCONF_TRUE@ gconf-helper -@HAVE_WAVEOUT_TRUE@am__append_101 = \ +@HAVE_WAVEOUT_TRUE@am__append_102 = \ @HAVE_WAVEOUT_TRUE@ module-waveout.la -@HAVE_HAL_COMPAT_TRUE@am__append_102 = \ +@HAVE_HAL_COMPAT_TRUE@am__append_103 = \ @HAVE_HAL_COMPAT_TRUE@ module-hal-detect.la -@HAVE_UDEV_TRUE@am__append_103 = \ +@HAVE_UDEV_TRUE@am__append_104 = \ @HAVE_UDEV_TRUE@ module-udev-detect.la -@HAVE_SYSTEMD_LOGIN_TRUE@am__append_104 = \ +@HAVE_SYSTEMD_LOGIN_TRUE@am__append_105 = \ @HAVE_SYSTEMD_LOGIN_TRUE@ module-systemd-login.la -@HAVE_DBUS_TRUE@am__append_105 = \ +@HAVE_DBUS_TRUE@am__append_106 = \ @HAVE_DBUS_TRUE@ module-rygel-media-server.la \ @HAVE_DBUS_TRUE@ module-dbus-protocol.la -@HAVE_BLUEZ_TRUE@am__append_106 = \ +@HAVE_BLUEZ_TRUE@am__append_107 = \ @HAVE_BLUEZ_TRUE@ module-bluetooth-discover.la \ @HAVE_BLUEZ_TRUE@ module-bluetooth-policy.la -@HAVE_BLUEZ_4_TRUE@am__append_107 = \ +@HAVE_BLUEZ_4_TRUE@am__append_108 = \ @HAVE_BLUEZ_4_TRUE@ libbluez4-util.la \ @HAVE_BLUEZ_4_TRUE@ module-bluez4-discover.la \ @HAVE_BLUEZ_4_TRUE@ module-bluez4-device.la -@HAVE_BLUEZ_5_TRUE@am__append_108 = \ +@HAVE_BLUEZ_5_TRUE@am__append_109 = \ @HAVE_BLUEZ_5_TRUE@ libbluez5-util.la \ @HAVE_BLUEZ_5_TRUE@ module-bluez5-discover.la \ @HAVE_BLUEZ_5_TRUE@ module-bluez5-device.la @@ -406,51 +408,51 @@ pulselibexec_PROGRAMS = $(am__EXEEXT_14) # RAOP depends on RTP, and we don't support RTP on Windows, see comment at # librtp.la above. -@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am__append_109 = \ +@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am__append_110 = \ @HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@ libraop.la \ @HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@ module-raop-sink.la -@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am__append_110 = \ +@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@am__append_111 = \ @HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@ module-raop-discover.la -@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_111 = \ +@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_112 = \ @HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@ module-equalizer-sink.la -@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_112 = utils/qpaeq -@HAVE_ESOUND_TRUE@am__append_113 = \ +@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_113 = utils/qpaeq +@HAVE_ESOUND_TRUE@am__append_114 = \ @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 -@HAVE_DBUS_TRUE@am__append_114 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_115 = $(DBUS_LIBS) -@HAVE_UDEV_TRUE@am__append_116 = modules/udev-util.h modules/udev-util.c -@HAVE_UDEV_TRUE@am__append_117 = $(UDEV_LIBS) -@HAVE_UDEV_TRUE@am__append_118 = $(UDEV_CFLAGS) -@HAVE_DBUS_TRUE@am__append_119 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c -@HAVE_DBUS_TRUE@am__append_120 = $(DBUS_LIBS) -@HAVE_DBUS_TRUE@am__append_121 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_122 = $(DBUS_LIBS) -@HAVE_DBUS_TRUE@am__append_123 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_124 = $(DBUS_LIBS) -@HAVE_DBUS_TRUE@am__append_125 = $(DBUS_CFLAGS) -@HAVE_ADRIAN_EC_TRUE@am__append_126 = \ +@HAVE_DBUS_TRUE@am__append_115 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_116 = $(DBUS_LIBS) +@HAVE_UDEV_TRUE@am__append_117 = modules/udev-util.h modules/udev-util.c +@HAVE_UDEV_TRUE@am__append_118 = $(UDEV_LIBS) +@HAVE_UDEV_TRUE@am__append_119 = $(UDEV_CFLAGS) +@HAVE_DBUS_TRUE@am__append_120 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c +@HAVE_DBUS_TRUE@am__append_121 = $(DBUS_LIBS) +@HAVE_DBUS_TRUE@am__append_122 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_123 = $(DBUS_LIBS) +@HAVE_DBUS_TRUE@am__append_124 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_125 = $(DBUS_LIBS) +@HAVE_DBUS_TRUE@am__append_126 = $(DBUS_CFLAGS) +@HAVE_ADRIAN_EC_TRUE@am__append_127 = \ @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 -@HAVE_ADRIAN_EC_TRUE@am__append_127 = -DHAVE_ADRIAN_EC=1 -@HAVE_ADRIAN_EC_TRUE@am__append_128 = modules/echo-cancel/adrian-aec -@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_129 = $(ORC_LIBS) -@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_130 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel -@HAVE_SPEEX_TRUE@am__append_131 = modules/echo-cancel/speex.c -@HAVE_WEBRTC_TRUE@am__append_132 = -DHAVE_WEBRTC=1 -@HAVE_WEBRTC_TRUE@am__append_133 = libwebrtc-util.la -@HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@am__append_134 = \ +@HAVE_ADRIAN_EC_TRUE@am__append_128 = -DHAVE_ADRIAN_EC=1 +@HAVE_ADRIAN_EC_TRUE@am__append_129 = modules/echo-cancel/adrian-aec +@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_130 = $(ORC_LIBS) +@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_131 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel +@HAVE_SPEEX_TRUE@am__append_132 = modules/echo-cancel/speex.c +@HAVE_WEBRTC_TRUE@am__append_133 = -DHAVE_WEBRTC=1 +@HAVE_WEBRTC_TRUE@am__append_134 = libwebrtc-util.la +@HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@am__append_135 = \ @HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@ modules/bluetooth/backend-ofono.c -@HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@am__append_135 = \ +@HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@am__append_136 = \ @HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@ modules/bluetooth/backend-native.c subdir = src @@ -892,7 +894,7 @@ libpulsecore_@PA_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ libpulsecommon-@PA_MAJORMINOR@.la libpulse.la \ - libpulsecore-foreign.la $(am__append_50) $(am__DEPENDENCIES_7) \ + libpulsecore-foreign.la $(am__append_51) $(am__DEPENDENCIES_7) \ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_8) \ $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \ $(am__DEPENDENCIES_11) @@ -1360,7 +1362,7 @@ module_device_restore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@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_12) $(am__append_133) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_12) $(am__append_134) 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 \ @@ -2033,13 +2035,13 @@ module_zeroconf_publish_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @OS_IS_WIN32_FALSE@am__EXEEXT_1 = pasuspender$(EXEEXT) @HAVE_AF_UNIX_TRUE@am__EXEEXT_2 = pacmd$(EXEEXT) @HAVE_X11_TRUE@am__EXEEXT_3 = pax11publish$(EXEEXT) -@OS_IS_WIN32_FALSE@am__EXEEXT_4 = srbchannel-test$(EXEEXT) \ -@OS_IS_WIN32_FALSE@ sigbus-test$(EXEEXT) \ +@OS_IS_WIN32_FALSE@am__EXEEXT_4 = sigbus-test$(EXEEXT) \ @OS_IS_WIN32_FALSE@ usergroup-test$(EXEEXT) -@OS_IS_DARWIN_FALSE@am__EXEEXT_5 = once-test$(EXEEXT) -@HAVE_GLIB20_TRUE@am__EXEEXT_6 = mainloop-test-glib$(EXEEXT) -@HAVE_ALSA_TRUE@am__EXEEXT_7 = alsa-mixer-path-test$(EXEEXT) -am__EXEEXT_8 = mainloop-test$(EXEEXT) strlist-test$(EXEEXT) \ +@HAVE_SYS_EVENTFD_H_TRUE@am__EXEEXT_5 = srbchannel-test$(EXEEXT) +@OS_IS_DARWIN_FALSE@am__EXEEXT_6 = once-test$(EXEEXT) +@HAVE_GLIB20_TRUE@am__EXEEXT_7 = mainloop-test-glib$(EXEEXT) +@HAVE_ALSA_TRUE@am__EXEEXT_8 = alsa-mixer-path-test$(EXEEXT) +am__EXEEXT_9 = mainloop-test$(EXEEXT) strlist-test$(EXEEXT) \ close-test$(EXEEXT) memblockq-test$(EXEEXT) \ channelmap-test$(EXEEXT) thread-mainloop-test$(EXEEXT) \ utf8-test$(EXEEXT) format-test$(EXEEXT) \ @@ -2053,20 +2055,20 @@ am__EXEEXT_8 = mainloop-test$(EXEEXT) strlist-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@am__EXEEXT_9 = cpulimit-test$(EXEEXT) \ + $(am__EXEEXT_7) $(am__EXEEXT_8) +@HAVE_SIGXCPU_TRUE@am__EXEEXT_10 = cpulimit-test$(EXEEXT) \ @HAVE_SIGXCPU_TRUE@ cpulimit-test2$(EXEEXT) -@HAVE_GTK30_TRUE@am__EXEEXT_10 = gtk-test$(EXEEXT) -@HAVE_ALSA_TRUE@am__EXEEXT_11 = alsa-time-test$(EXEEXT) -am__EXEEXT_12 = ipacl-test$(EXEEXT) mcalign-test$(EXEEXT) \ +@HAVE_GTK30_TRUE@am__EXEEXT_11 = gtk-test$(EXEEXT) +@HAVE_ALSA_TRUE@am__EXEEXT_12 = alsa-time-test$(EXEEXT) +am__EXEEXT_13 = ipacl-test$(EXEEXT) mcalign-test$(EXEEXT) \ pacat-simple$(EXEEXT) parec-simple$(EXEEXT) \ flist-test$(EXEEXT) remix-test$(EXEEXT) rtstutter$(EXEEXT) \ sig2str-test$(EXEEXT) stripnul$(EXEEXT) \ echo-cancel-test$(EXEEXT) lo-latency-test$(EXEEXT) \ - $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) -am__EXEEXT_13 = connect-stress$(EXEEXT) extended-test$(EXEEXT) \ + $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) +am__EXEEXT_14 = connect-stress$(EXEEXT) extended-test$(EXEEXT) \ interpol-test$(EXEEXT) sync-playback$(EXEEXT) -@HAVE_GCONF_TRUE@am__EXEEXT_14 = gconf-helper$(EXEEXT) +@HAVE_GCONF_TRUE@am__EXEEXT_15 = gconf-helper$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pulselibexec_PROGRAMS) am_alsa_mixer_path_test_OBJECTS = \ tests/alsa_mixer_path_test-alsa-mixer-path-test.$(OBJEXT) @@ -2206,7 +2208,7 @@ nodist_echo_cancel_test_OBJECTS = $(am__objects_26) echo_cancel_test_OBJECTS = $(am_echo_cancel_test_OBJECTS) \ $(nodist_echo_cancel_test_OBJECTS) am__DEPENDENCIES_13 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_12) $(am__append_133) + $(am__DEPENDENCIES_12) $(am__append_134) echo_cancel_test_DEPENDENCIES = $(am__DEPENDENCIES_13) echo_cancel_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -3339,7 +3341,6 @@ 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@ @@ -3526,7 +3527,7 @@ BUILT_SOURCES = $(am__append_6) $(SYMDEF_FILES) builddirs ################################### # Some minor stuff # ################################### -CLEANFILES = $(am__append_7) $(am__append_48) \ +CLEANFILES = $(am__append_7) $(am__append_49) \ daemon/pulseaudio.desktop @HAVE_ORC_TRUE@ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE)) @HAVE_ORC_TRUE@ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE)) @@ -3536,7 +3537,7 @@ CLEANFILES = $(am__append_7) $(am__append_48) \ @HAVE_ORC_TRUE@cp_v_gen = $(cp_v_gen_$(V)) @HAVE_ORC_TRUE@cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY)) @HAVE_ORC_TRUE@cp_v_gen_0 = @echo " CP $@"; -ORC_SOURCE = pulsecore/svolume $(am__append_128) +ORC_SOURCE = pulsecore/svolume $(am__append_129) 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 \ @@ -3563,8 +3564,8 @@ pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJ ################################### # Utility programs # ################################### -bin_SCRIPTS = esdcompat $(am__append_16) $(am__append_47) \ - $(am__append_112) +bin_SCRIPTS = esdcompat $(am__append_16) $(am__append_48) \ + $(am__append_113) pacat_SOURCES = utils/pacat.c pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS) pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) @@ -3595,7 +3596,7 @@ pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) ################################### # 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_49) \ +noinst_LTLIBRARIES = liblo-test-util.la $(am__append_50) \ libpulsecore-foreign.la TESTS_default = mainloop-test strlist-test close-test memblockq-test \ channelmap-test thread-mainloop-test utf8-test format-test \ @@ -3604,11 +3605,12 @@ TESTS_default = mainloop-test strlist-test close-test memblockq-test \ smoother-test thread-test volume-test mix-test proplist-test \ 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) + $(am__append_18) $(am__append_19) $(am__append_21) \ + $(am__append_24) 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_19) \ - $(am__append_21) $(am__append_22) + echo-cancel-test lo-latency-test $(am__append_20) \ + $(am__append_22) $(am__append_23) # These tests need a running pulseaudio daemon TESTS_daemon = \ @@ -3898,23 +3900,23 @@ libpulsecommon_@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_24) \ - $(am__append_25) $(am__append_26) $(am__append_33) \ - $(am__append_34) $(am__append_36) $(am__append_39) \ - $(am__append_40) + pulsecore/sndfile-util.h pulsecore/socket.h $(am__append_25) \ + $(am__append_26) $(am__append_27) $(am__append_34) \ + $(am__append_35) $(am__append_37) $(am__append_40) \ + $(am__append_41) # proplist-util.h uses these header files, but not the library itself! libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) \ - $(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) + $(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS) $(am__append_28) \ + $(am__append_30) $(am__append_32) $(GLIB20_CFLAGS) \ + $(GTK30_CFLAGS) $(am__append_36) $(am__append_38) \ + $(am__append_42) libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) \ - -avoid-version $(am__append_28) $(am__append_30) \ - $(am__append_32) + -avoid-version $(am__append_29) $(am__append_31) \ + $(am__append_33) libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) \ $(LIBJSON_LIBS) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \ - $(LIBSNDFILE_LIBS) $(am__append_38) $(am__append_42) + $(LIBSNDFILE_LIBS) $(am__append_39) $(am__append_43) ################################### # Client library # @@ -3929,12 +3931,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_43) + pulse/xmalloc.h $(am__append_44) ################################### # Daemon core library # ################################### -lib_LTLIBRARIES = libpulse.la libpulse-simple.la $(am__append_44) \ +lib_LTLIBRARIES = libpulse.la libpulse-simple.la $(am__append_45) \ libpulsecore-@PA_MAJORMINOR@.la # Public interface @@ -3970,10 +3972,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_45) +libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(am__append_46) libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) \ $(LIBJSON_LIBS) libpulsecommon-@PA_MAJORMINOR@.la \ - $(am__append_46) + $(am__append_47) 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) @@ -4036,22 +4038,22 @@ libpulsecore_@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_51) \ - $(am__append_54) $(am__append_57) $(am__append_60) \ - $(am__append_63) $(am__append_66) $(am__append_67) \ - $(am__append_70) -libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \ - $(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) $(am__append_52) \ + pulsecore/thread-mq.h pulsecore/database.h $(am__append_52) \ $(am__append_55) $(am__append_58) $(am__append_61) \ - $(am__append_64) $(am__append_68) $(am__append_71) + $(am__append_64) $(am__append_67) $(am__append_68) \ + $(am__append_71) +libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \ + $(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) $(am__append_53) \ + $(am__append_56) $(am__append_59) $(am__append_62) \ + $(am__append_65) $(am__append_69) $(am__append_72) libpulsecore_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \ - $(am__append_56) + $(am__append_57) libpulsecore_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) \ $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \ libpulsecommon-@PA_MAJORMINOR@.la libpulse.la \ - libpulsecore-foreign.la $(am__append_50) $(am__append_53) \ - $(am__append_59) $(am__append_62) $(am__append_65) \ - $(am__append_69) $(am__append_72) + libpulsecore-foreign.la $(am__append_51) $(am__append_54) \ + $(am__append_60) $(am__append_63) $(am__append_66) \ + $(am__append_70) $(am__append_73) @HAVE_NEON_TRUE@libpulsecore_sconv_neon_la_SOURCES = pulsecore/sconv_neon.c @HAVE_NEON_TRUE@libpulsecore_sconv_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS) @HAVE_NEON_TRUE@libpulsecore_mix_neon_la_SOURCES = pulsecore/mix_neon.c @@ -4074,8 +4076,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_73) $(am__append_74) \ - $(am__append_75) $(am__append_76) $(am__append_79) \ + libprotocol-native.la $(am__append_74) $(am__append_75) \ + $(am__append_76) $(am__append_77) $(am__append_80) \ 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 \ @@ -4096,17 +4098,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_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_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) + module-role-ducking.la $(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_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) $(am__append_112) 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-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la @@ -4121,11 +4123,11 @@ libprotocol_http_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_http_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@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_77) + $(am__append_78) libprotocol_native_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_native_la_LIBADD = $(AM_LIBADD) \ libpulsecore-@PA_MAJORMINOR@.la \ - libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(am__append_78) + libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(am__append_79) @HAVE_ESOUND_TRUE@libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h @HAVE_ESOUND_TRUE@libprotocol_esound_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version @HAVE_ESOUND_TRUE@libprotocol_esound_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la @@ -4259,7 +4261,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_113) + $(am__append_114) # Simple protocol module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c @@ -4394,10 +4396,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_114) + $(AM_CFLAGS) $(SERVER_CFLAGS) $(am__append_115) module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL) \ - $(am__append_115) + $(am__append_116) 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) @@ -4481,12 +4483,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_116) $(am__append_119) + modules/reserve-wrap.h $(am__append_117) $(am__append_120) libalsa_util_la_LDFLAGS = -avoid-version libalsa_util_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) \ - $(am__append_117) $(am__append_120) + $(am__append_118) $(am__append_121) libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \ - $(ASOUNDLIB_CFLAGS) $(am__append_118) $(am__append_121) + $(ASOUNDLIB_CFLAGS) $(am__append_119) $(am__append_122) 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 @@ -4593,15 +4595,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_122) -module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_123) + libprotocol-native.la $(am__append_123) +module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_124) # 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_124) -module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_125) + libprotocol-native.la $(am__append_125) +module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_126) # Card profile restore module module_card_restore_la_SOURCES = modules/module-card-restore.c @@ -4643,13 +4645,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_126) $(am__append_131) + $(am__append_127) $(am__append_132) module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS) module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS) \ - $(am__append_129) $(am__append_133) + $(am__append_130) $(am__append_134) module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \ - $(LIBSPEEX_CFLAGS) $(am__append_127) $(am__append_130) \ - $(am__append_132) + $(LIBSPEEX_CFLAGS) $(am__append_128) $(am__append_131) \ + $(am__append_133) @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@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 @@ -4745,8 +4747,8 @@ 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 $(am__append_134) \ - $(am__append_135) + modules/bluetooth/a2dp-codecs.h $(am__append_135) \ + $(am__append_136) libbluez5_util_la_LDFLAGS = -avoid-version libbluez5_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez5_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) @@ -10664,13 +10666,6 @@ 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) -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) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) sigbus-test.log: sigbus-test$(EXEEXT) @p='sigbus-test$(EXEEXT)'; \ b='sigbus-test'; \ @@ -10685,6 +10680,13 @@ usergroup-test.log: usergroup-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) +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) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) once-test.log: once-test$(EXEEXT) @p='once-test$(EXEEXT)'; \ b='once-test'; \ diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c index 6894e83..0b234ae 100644 --- a/src/modules/bluetooth/bluez5-util.c +++ b/src/modules/bluetooth/bluez5-util.c @@ -1660,12 +1660,12 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) { pa_dbus_free_pending_list(&y->pending); - if (y->devices) - pa_hashmap_free(y->devices); - if (y->adapters) pa_hashmap_free(y->adapters); + if (y->devices) + pa_hashmap_free(y->devices); + if (y->transports) { pa_assert(pa_hashmap_isempty(y->transports)); pa_hashmap_free(y->transports); diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c index e6a8071..995e550 100644 --- a/src/modules/bluetooth/module-bluez5-device.c +++ b/src/modules/bluetooth/module-bluez5-device.c @@ -1968,11 +1968,13 @@ static void handle_transport_state_change(struct userdata *u, struct pa_bluetoot bool release = false; pa_card_profile *cp; pa_device_port *port; + pa_available_t oldavail; pa_assert(u); pa_assert(t); pa_assert_se(cp = pa_hashmap_get(u->card->profiles, pa_bluetooth_profile_to_string(t->profile))); + oldavail = cp->available; pa_card_profile_set_available(cp, transport_state_to_availability(t->state)); /* Update port availability */ @@ -1983,7 +1985,7 @@ static void handle_transport_state_change(struct userdata *u, struct pa_bluetoot /* Acquire or release transport as needed */ acquire = (t->state == PA_BLUETOOTH_TRANSPORT_STATE_PLAYING && u->profile == t->profile); - release = (t->state != PA_BLUETOOTH_TRANSPORT_STATE_PLAYING && u->profile == t->profile); + release = (oldavail != PA_AVAILABLE_NO && t->state != PA_BLUETOOTH_TRANSPORT_STATE_PLAYING && u->profile == t->profile); if (acquire && transport_acquire(u, true) >= 0) { if (u->source) { diff --git a/src/modules/dbus/module-dbus-protocol.c b/src/modules/dbus/module-dbus-protocol.c index ab5546f..e5f1221 100644 --- a/src/modules/dbus/module-dbus-protocol.c +++ b/src/modules/dbus/module-dbus-protocol.c @@ -529,6 +529,11 @@ int pa__init(pa_module *m) { pa_assert(m); + pa_log_warn("module-dbus-protocol is currently unsupported, and can sometimes cause PulseAudio crashes."); + pa_log_warn("The most popular use cases for module-dbus-protocol are related to changing " + "equalizer settings and LADSPA plugin parameters at runtime."); + pa_log_warn("If you don't use such functionality, it's possible that you don't actually need this module."); + if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { pa_log("Failed to parse module arguments."); goto fail; diff --git a/src/modules/module-card-restore.c b/src/modules/module-card-restore.c index 681acca..beb748e 100644 --- a/src/modules/module-card-restore.c +++ b/src/modules/module-card-restore.c @@ -66,6 +66,7 @@ struct userdata { pa_hook_slot *card_put_hook_slot; pa_hook_slot *card_profile_changed_hook_slot; pa_hook_slot *card_profile_added_hook_slot; + pa_hook_slot *profile_available_changed_hook_slot; pa_hook_slot *port_offset_hook_slot; pa_time_event *save_time_event; pa_database *database; @@ -412,6 +413,9 @@ static pa_hook_result_t card_profile_added_callback(pa_core *c, pa_card_profile pa_assert(profile); + if (profile->available == PA_AVAILABLE_NO) + return PA_HOOK_OK; + if (!(entry = entry_read(u, profile->card->name))) return PA_HOOK_OK; @@ -425,6 +429,33 @@ static pa_hook_result_t card_profile_added_callback(pa_core *c, pa_card_profile return PA_HOOK_OK; } +static pa_hook_result_t profile_available_changed_callback(void *hook_data, void *call_data, void *userdata) { + pa_card_profile *profile = call_data; + pa_card *card; + struct userdata *u = userdata; + struct entry *entry; + + pa_assert(profile); + pa_assert(u); + + card = profile->card; + + if (profile->available == PA_AVAILABLE_NO) + return PA_HOOK_OK; + + entry = entry_read(u, card->name); + if (!entry) + return PA_HOOK_OK; + + if (!pa_streq(profile->name, entry->profile)) + return PA_HOOK_OK; + + pa_log_info("Card %s profile %s became available, activating.", card->name, profile->name); + pa_card_set_profile(profile->card, profile, true); + + return PA_HOOK_OK; +} + static pa_hook_result_t port_offset_change_callback(pa_core *c, pa_device_port *port, struct userdata *u) { struct entry *entry; pa_card *card; @@ -511,6 +542,8 @@ int pa__init(pa_module*m) { u->card_put_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PUT], PA_HOOK_NORMAL, (pa_hook_cb_t) card_put_hook_callback, u); u->card_profile_changed_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_changed_callback, u); u->card_profile_added_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_added_callback, u); + u->profile_available_changed_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED], + PA_HOOK_NORMAL, profile_available_changed_callback, u); u->port_offset_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_PORT_LATENCY_OFFSET_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) port_offset_change_callback, u); u->hooks_connected = true; @@ -551,6 +584,7 @@ void pa__done(pa_module*m) { pa_hook_slot_free(u->card_put_hook_slot); pa_hook_slot_free(u->card_profile_changed_hook_slot); pa_hook_slot_free(u->card_profile_added_hook_slot); + pa_hook_slot_free(u->profile_available_changed_hook_slot); pa_hook_slot_free(u->port_offset_hook_slot); } diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c index 811bbc2..70c30f5 100644 --- a/src/modules/module-equalizer-sink.c +++ b/src/modules/module-equalizer-sink.c @@ -232,7 +232,7 @@ static void alloc_input_buffers(struct userdata *u, size_t min_buffer_length) { if (u->input[c]) { if (!u->first_iteration) memcpy(tmp, u->input[c], u->overlap_size * sizeof(float)); - free(u->input[c]); + fftwf_free(u->input[c]); } u->input[c] = tmp; } @@ -674,8 +674,6 @@ END: pa_assert(chunk->memblock); pa_memblockq_drop(u->output_q, chunk->length); - /** FIXME: Uh? you need to unref the chunk here! */ - //pa_log_debug("gave %ld", chunk->length/fs); //pa_log_debug("end pop"); return 0; @@ -1096,6 +1094,10 @@ int pa__init(pa_module*m) { pa_assert(m); + pa_log_warn("module-equalizer-sink is currently unsupported, and can sometimes cause " + "PulseAudio crashes, increased latency or audible artifacts."); + pa_log_warn("If you're facing audio problems, try unloading this module as a potential workaround."); + if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { pa_log("Failed to parse module arguments."); goto fail; @@ -1340,22 +1342,22 @@ void pa__done(pa_module*m) { fftwf_destroy_plan(u->inverse_plan); fftwf_destroy_plan(u->forward_plan); - pa_xfree(u->output_window); + fftwf_free(u->output_window); for (c = 0; c < u->channels; ++c) { pa_aupdate_free(u->a_H[c]); - pa_xfree(u->overlap_accum[c]); - pa_xfree(u->input[c]); + fftwf_free(u->overlap_accum[c]); + fftwf_free(u->input[c]); } pa_xfree(u->a_H); pa_xfree(u->overlap_accum); pa_xfree(u->input); - pa_xfree(u->work_buffer); - pa_xfree(u->W); + fftwf_free(u->work_buffer); + fftwf_free(u->W); for (c = 0; c < u->channels; ++c) { pa_xfree(u->Xs[c]); for (size_t i = 0; i < 2; ++i) - pa_xfree(u->Hs[c][i]); - pa_xfree(u->Hs[c]); + fftwf_free(u->Hs[c][i]); + fftwf_free(u->Hs[c]); } pa_xfree(u->Xs); pa_xfree(u->Hs); diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c index 80ddae0..e0acc23 100644 --- a/src/pulse/client-conf.c +++ b/src/pulse/client-conf.c @@ -65,11 +65,7 @@ static const pa_client_conf default_conf = { .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, .shm_size = 0, .auto_connect_localhost = false, diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in index 446e22a..17753b0 100644 --- a/src/pulse/client.conf.in +++ b/src/pulse/client.conf.in @@ -24,7 +24,7 @@ ; default-server = ; default-dbus-server = -; autospawn = @PA_DEFAULT_AUTOSPAWN@ +; autospawn = yes ; daemon-binary = @PA_BINARY@ ; extra-arguments = --log-target=syslog diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h index 22fefed..689e231 100644 --- a/src/pulse/introspect.h +++ b/src/pulse/introspect.h @@ -326,7 +326,7 @@ typedef struct pa_source_info { pa_cvolume volume; /**< Volume of the source */ int mute; /**< Mute switch of the sink */ uint32_t monitor_of_sink; /**< If this is a monitor source, the index of the owning sink, otherwise PA_INVALID_INDEX. */ - const char *monitor_of_sink_name; /**< Name of the owning sink, or PA_INVALID_INDEX. */ + const char *monitor_of_sink_name; /**< Name of the owning sink, or NULL. */ pa_usec_t latency; /**< Length of filled record buffer of this source. */ const char *driver; /**< Driver name */ pa_source_flags_t flags; /**< Flags */ diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h index 419783d..bcc0bb3 100644 --- a/src/pulsecore/atomic.h +++ b/src/pulsecore/atomic.h @@ -180,7 +180,7 @@ static inline bool pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, void* return r == old_p; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include <sys/cdefs.h> #include <sys/types.h> diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index e9843ef..bf7f3d8 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -1816,6 +1816,7 @@ char *pa_get_runtime_dir(void) { /* Use the XDG standard for the runtime directory. */ d = getenv("XDG_RUNTIME_DIR"); if (d) { +#ifdef HAVE_GETUID 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! " @@ -1823,6 +1824,7 @@ char *pa_get_runtime_dir(void) { d, getuid(), st.st_uid); goto fail; } +#endif k = pa_sprintf_malloc("%s" PA_PATH_SEP "pulse", d); diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index e461963..c6fa8d7 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -117,7 +117,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, size_t shm_size) { c->deferred_volume_extra_delay_usec = 0; c->module_defer_unload_event = NULL; - c->scache_auto_unload_event = NULL; + c->modules_pending_unload = pa_hashmap_new(NULL, NULL); c->subscription_defer_event = NULL; PA_LLIST_HEAD_INIT(pa_subscription, c->subscriptions); @@ -133,6 +133,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, size_t shm_size) { pa_mempool_set_is_remote_writable(c->rw_mempool, true); c->exit_event = NULL; + c->scache_auto_unload_event = NULL; c->exit_idle_time = -1; c->scache_idle_time = 20; @@ -204,6 +205,9 @@ static void core_free(pa_object *o) { pa_assert(pa_hashmap_isempty(c->shared)); pa_hashmap_free(c->shared); + pa_assert(pa_hashmap_isempty(c->modules_pending_unload)); + pa_hashmap_free(c->modules_pending_unload); + pa_subscription_free_all(c); if (c->exit_event) diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h index 1f9df73..b0d1211 100644 --- a/src/pulsecore/core.h +++ b/src/pulsecore/core.h @@ -164,6 +164,7 @@ struct pa_core { int deferred_volume_extra_delay_usec; pa_defer_event *module_defer_unload_event; + pa_hashmap *modules_pending_unload; /* pa_module -> pa_module (hashmap-as-a-set) */ pa_defer_event *subscription_defer_event; PA_LLIST_HEAD(pa_subscription, subscriptions); diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c index f8b008f..b781312 100644 --- a/src/pulsecore/memblock.c +++ b/src/pulsecore/memblock.c @@ -132,6 +132,7 @@ struct pa_memexport { PA_LLIST_HEAD(struct memexport_slot, free_slots); PA_LLIST_HEAD(struct memexport_slot, used_slots); unsigned n_init; + unsigned baseidx; /* Called whenever a client from which we imported a memory block which we in turn exported to another client dies and we need to @@ -150,6 +151,7 @@ struct pa_mempool { size_t block_size; unsigned n_blocks; bool is_remote_writable; + unsigned export_baseidx; pa_atomic_t n_init; @@ -749,7 +751,7 @@ pa_mempool* pa_mempool_new(bool shared, size_t size) { pa_mempool *p; char t1[PA_BYTES_SNPRINT_MAX], t2[PA_BYTES_SNPRINT_MAX]; - p = pa_xnew(pa_mempool, 1); + p = pa_xnew0(pa_mempool, 1); p->block_size = PA_PAGE_ALIGN(PA_MEMPOOL_SLOT_SIZE); if (p->block_size < PA_PAGE_SIZE) @@ -776,7 +778,6 @@ pa_mempool* pa_mempool_new(bool shared, size_t size) { pa_bytes_snprint(t2, sizeof(t2), (unsigned) (p->n_blocks * p->block_size)), (unsigned long) pa_mempool_block_size_max(p)); - memset(&p->stat, 0, sizeof(p->stat)); pa_atomic_store(&p->n_init, 0); PA_LLIST_HEAD_INIT(pa_memimport, p->imports); @@ -1103,7 +1104,11 @@ pa_memexport* pa_memexport_new(pa_mempool *p, pa_memexport_revoke_cb_t cb, void e->userdata = userdata; pa_mutex_lock(p->mutex); + PA_LLIST_PREPEND(pa_memexport, p->exports, e); + e->baseidx = p->export_baseidx; + p->export_baseidx += PA_MEMEXPORT_SLOTS_MAX; + pa_mutex_unlock(p->mutex); return e; } @@ -1113,7 +1118,7 @@ void pa_memexport_free(pa_memexport *e) { pa_mutex_lock(e->mutex); while (e->used_slots) - pa_memexport_process_release(e, (uint32_t) (e->used_slots - e->slots)); + pa_memexport_process_release(e, (uint32_t) (e->used_slots - e->slots + e->baseidx)); pa_mutex_unlock(e->mutex); pa_mutex_lock(e->pool->mutex); @@ -1132,6 +1137,10 @@ int pa_memexport_process_release(pa_memexport *e, uint32_t id) { pa_mutex_lock(e->mutex); + if (id < e->baseidx) + goto fail; + id -= e->baseidx; + if (id >= e->n_init) goto fail; @@ -1180,7 +1189,7 @@ static void memexport_revoke_blocks(pa_memexport *e, pa_memimport *i) { slot->block->per_type.imported.segment->import != i) continue; - idx = (uint32_t) (slot - e->slots); + idx = (uint32_t) (slot - e->slots + e->baseidx); e->revoke_cb(e, idx, e->userdata); pa_memexport_process_release(e, idx); } @@ -1241,7 +1250,7 @@ int pa_memexport_put(pa_memexport *e, pa_memblock *b, uint32_t *block_id, uint32 PA_LLIST_PREPEND(struct memexport_slot, e->used_slots, slot); slot->block = b; - *block_id = (uint32_t) (slot - e->slots); + *block_id = (uint32_t) (slot - e->slots + e->baseidx); pa_mutex_unlock(e->mutex); /* pa_log("Got block id %u", *block_id); */ diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c index bee8a20..4974034 100644 --- a/src/pulsecore/module.c +++ b/src/pulsecore/module.c @@ -247,6 +247,8 @@ void pa_module_unload(pa_core *c, pa_module *m, bool force) { if (m->core->disallow_module_loading && !force) return; + pa_hashmap_remove(c->modules_pending_unload, m); + if (!(m = pa_idxset_remove_by_data(c->modules, m, NULL))) return; @@ -303,16 +305,14 @@ void pa_module_unload_all(pa_core *c) { } static void defer_cb(pa_mainloop_api*api, pa_defer_event *e, void *userdata) { - void *state = NULL; pa_core *c = PA_CORE(userdata); pa_module *m; pa_core_assert_ref(c); api->defer_enable(e, 0); - while ((m = pa_idxset_iterate(c->modules, &state, NULL))) - if (m->unload_requested) - pa_module_unload(c, m, true); + while ((m = pa_hashmap_first(c->modules_pending_unload))) + pa_module_unload(c, m, true); } void pa_module_unload_request(pa_module *m, bool force) { @@ -322,6 +322,7 @@ void pa_module_unload_request(pa_module *m, bool force) { return; m->unload_requested = true; + pa_hashmap_put(m->core->modules_pending_unload, m, m); if (!m->core->module_defer_unload_event) m->core->module_defer_unload_event = m->core->mainloop->defer_new(m->core->mainloop, defer_cb, m->core); diff --git a/src/pulsecore/sconv_sse.c b/src/pulsecore/sconv_sse.c index 9cfb9d9..ab2e9f4 100644 --- a/src/pulsecore/sconv_sse.c +++ b/src/pulsecore/sconv_sse.c @@ -33,7 +33,7 @@ #include "cpu-x86.h" #include "sconv.h" -#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) +#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) static const PA_DECLARE_ALIGNED (16, float, scale[4]) = { 0x8000, 0x8000, 0x8000, 0x8000 }; @@ -163,7 +163,7 @@ static void pa_sconv_s16le_from_f32ne_sse2(unsigned n, const float *a, int16_t * #endif /* defined (__i386__) || defined (__amd64__) */ void pa_convert_func_init_sse(pa_cpu_x86_flag_t flags) { -#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) +#if (!defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) if (flags & PA_CPU_X86_SSE2) { pa_log_info("Initialising SSE2 optimized conversions."); diff --git a/src/pulsecore/srbchannel.c b/src/pulsecore/srbchannel.c index a0f916e..8872a89 100644 --- a/src/pulsecore/srbchannel.c +++ b/src/pulsecore/srbchannel.c @@ -231,6 +231,9 @@ pa_srbchannel* pa_srbchannel_new(pa_mainloop_api *m, pa_mempool *p) { pa_srbchannel* sr = pa_xmalloc0(sizeof(pa_srbchannel)); sr->mainloop = m; sr->memblock = pa_memblock_new_pool(p, -1); + if (!sr->memblock) + goto fail; + srh = pa_memblock_acquire(sr->memblock); pa_zero(*srh); diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c index 279af8a..411e62c 100644 --- a/src/pulsecore/svolume_mmx.c +++ b/src/pulsecore/svolume_mmx.c @@ -34,7 +34,7 @@ #include "sample-util.h" -#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) +#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) /* in s: 2 int16_t samples * in v: 2 int32_t volumes, fixed point 16:16 * out s: contains scaled and clamped int16_t samples. @@ -240,15 +240,15 @@ static void pa_volume_s16re_mmx(int16_t *samples, const int32_t *volumes, unsign ); } -#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */ +#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */ void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) { -#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) +#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) { pa_log_info("Initialising MMX optimized volume functions."); pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_mmx); pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_mmx); } -#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */ +#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */ } diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c index eafa92c..abd8fa5 100644 --- a/src/pulsecore/svolume_sse.c +++ b/src/pulsecore/svolume_sse.c @@ -34,7 +34,7 @@ #include "sample-util.h" -#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) +#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) #define VOLUME_32x16(s,v) /* .. | vh | vl | */ \ " pxor %%xmm4, %%xmm4 \n\t" /* .. | 0 | 0 | */ \ @@ -251,15 +251,15 @@ static void pa_volume_s16re_sse2(int16_t *samples, const int32_t *volumes, unsig ); } -#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */ +#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */ void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) { -#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) +#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) if (flags & PA_CPU_X86_SSE2) { pa_log_info("Initialising SSE2 optimized volume functions."); pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_sse2); pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_sse2); } -#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */ +#endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */ } diff --git a/src/tests/once-test.c b/src/tests/once-test.c index 8b0009a..5744eca 100644 --- a/src/tests/once-test.c +++ b/src/tests/once-test.c @@ -24,8 +24,10 @@ #ifdef HAVE_PTHREAD #include <pthread.h> #ifdef HAVE_PTHREAD_SETAFFINITY_NP -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#ifdef __FreeBSD__ #include <pthread_np.h> +#endif #include <sys/param.h> #include <sys/cpuset.h> #endif @@ -63,7 +65,7 @@ static void thread_func(void *data) { #ifdef HAVE_PTHREAD_SETAFFINITY_NP static pa_atomic_t i_cpu = PA_ATOMIC_INIT(0); -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) cpuset_t mask; #else cpu_set_t mask; diff --git a/src/tests/rtstutter.c b/src/tests/rtstutter.c index ed567c1..8096ada 100644 --- a/src/tests/rtstutter.c +++ b/src/tests/rtstutter.c @@ -31,8 +31,10 @@ #ifdef HAVE_PTHREAD #include <pthread.h> #ifdef HAVE_PTHREAD_SETAFFINITY_NP -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#ifdef __FreeBSD__ #include <pthread_np.h> +#endif #include <sys/param.h> #include <sys/cpuset.h> #endif @@ -61,7 +63,7 @@ static void work(void *p) { #ifdef HAVE_PTHREAD_SETAFFINITY_NP { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) cpuset_t mask; #else cpu_set_t mask; |