[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master-tx, updated. v0.9.15-test5-23-gdd40006
Lennart Poettering
gitmailer-noreply at 0pointer.de
Thu Mar 19 10:05:55 PDT 2009
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master-tx branch has been updated
from 000f0b84d9c999fba83d5d67cf39628dafd23a2e (commit)
- Log -----------------------------------------------------------------
dd40006... document things that need to be fixed with FIXME
3762299... unfuck i18n
86439a4... Merge commit 'origin/master-tx'
0a1af8e... Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
4a98312... Merge commit 'elmarco/bluetooth-fixes'
291d21c... fix prototypes of sbc functions a bit
794775b... document todo items discussed at bt meeting
303cd90... get rid of setsockopt() calls since they have never been implemented upstream
e836217... bluetooth: rework the info_valid logic to be more tolerant
f1daa28... bluetooth: mark info_valid when receive Connected
af9f92b... bluetooth: update SCO over PCM with latest changes
df3f4ee... bluetooth: load bluetooth device with connected profile
9744595... Merge commit '2d903bae9a2e57f997a3d3f335379c3880f95c77'
4ebdee5... deduce a proper icon for TV sets
3e8c7ac... Ignore HAL NoSuchProperty errors when looking for capabilities field. Closes rhbz #489394
2928b44... Merge commit 'elmarco/bluetooth-fixes'
9e93b9c... bluetooth: stream also when source is suspended
018cadd... bluetooth: restart timer when write begin
362d196... bluetooth: accept temporarily unavailable error
2d903ba... bluetooth: s/handled/not_yet_handled for signals
12ea570... bluetooth: reset read/write index when starting to stream
-----------------------------------------------------------------------
Summary of changes:
po/LINGUAS | 7 +-
po/ca.po | 6 +-
po/cs.po | 6 +-
po/de.po | 6 +-
po/el.po | 6 +-
po/es.po | 6 +-
po/fi.po | 6 +-
po/fr.po | 6 +-
po/it.po | 6 +-
po/pa.po | 957 ++++++++++++--------
po/pl.po | 6 +-
po/pt_BR.po | 6 +-
po/sv.po | 6 +-
po/zh_CN.po | 6 +-
src/modules/bluetooth/bluetooth-util.c | 19 +-
src/modules/bluetooth/module-bluetooth-device.c | 57 +-
src/modules/bluetooth/module-bluetooth-discover.c | 2 +-
src/modules/bluetooth/module-bluetooth-proximity.c | 4 +-
src/modules/bluetooth/sbc.c | 14 +-
src/modules/bluetooth/sbc.h | 22 +-
src/modules/module-hal-detect.c | 3 +-
src/pulsecore/sink.c | 2 +
22 files changed, 703 insertions(+), 456 deletions(-)
-----------------------------------------------------------------------
commit 12ea5707b561117709053ea4580d97f03b772560
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Thu Mar 5 15:47:13 2009 +0200
bluetooth: reset read/write index when starting to stream
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 495bc82..7d601e7 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -700,6 +700,9 @@ static int start_stream_fd(struct userdata *u) {
pollfd->fd = u->stream_fd;
pollfd->events = pollfd->revents = 0;
+ u->read_index = 0;
+ u->write_index = 0;
+
return 0;
}
commit 2d903bae9a2e57f997a3d3f335379c3880f95c77
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Thu Mar 5 16:16:29 2009 +0200
bluetooth: s/handled/not_yet_handled for signals
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index dfd3a30..9e30f89 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -604,7 +604,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
pa_bluetooth_device_free(d);
}
- return DBUS_HANDLER_RESULT_HANDLED;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.bluez.Adapter", "DeviceCreated")) {
const char *path;
@@ -617,7 +617,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
pa_log_debug("Device %s created", path);
found_device(y, path);
- return DBUS_HANDLER_RESULT_HANDLED;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.bluez.Manager", "AdapterAdded")) {
const char *path;
@@ -630,7 +630,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
pa_log_debug("Adapter %s created", path);
found_adapter(y, path);
- return DBUS_HANDLER_RESULT_HANDLED;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.bluez.Headset", "PropertyChanged") ||
dbus_message_is_signal(m, "org.bluez.AudioSink", "PropertyChanged") ||
@@ -663,7 +663,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
run_callback(y, d, TRUE);
}
- return DBUS_HANDLER_RESULT_HANDLED;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
fail:
diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c
index a3b525e..c8d7b4d 100644
--- a/src/modules/bluetooth/module-bluetooth-proximity.c
+++ b/src/modules/bluetooth/module-bluetooth-proximity.c
@@ -302,7 +302,7 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *m,
bonding_new(u, a);
- return DBUS_HANDLER_RESULT_HANDLED;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.bluez.Adapter", "BondingRemoved")) {
@@ -315,7 +315,7 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *m,
bonding_remove(u, a);
- return DBUS_HANDLER_RESULT_HANDLED;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
finish:
commit 362d196093309c47ab7c53bb9343adf1792c9921
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Thu Mar 5 17:04:39 2009 +0200
bluetooth: accept temporarily unavailable error
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 7d601e7..d5c2a87 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -876,7 +876,7 @@ static int hsp_process_render(struct userdata *u) {
pa_assert(l != 0);
if (l < 0) {
- if (errno == EINTR)
+ if (errno == EINTR || errno == EAGAIN)
continue;
else {
pa_log_error("Failed to write data to SCO socket: %s", pa_cstrerror(errno));
@@ -921,7 +921,7 @@ static int hsp_process_push(struct userdata *u) {
pa_memblock_release(memchunk.memblock);
if (l <= 0) {
- if (l < 0 && errno == EINTR)
+ if (l < 0 && (errno == EINTR || errno == EAGAIN))
continue;
else {
pa_log_error("Failed to read data from SCO socket: %s", l < 0 ? pa_cstrerror(errno) : "EOF");
@@ -1044,7 +1044,7 @@ static int a2dp_process_render(struct userdata *u) {
pa_assert(l != 0);
if (l < 0) {
- if (errno == EINTR)
+ if (errno == EINTR || errno == EAGAIN)
continue;
else {
pa_log_error("Failed to write data to socket: %s", pa_cstrerror(errno));
commit 018cadd3375c7aa2a4e2b5b8371e87c4c83ee6b7
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Thu Mar 5 17:20:31 2009 +0200
bluetooth: restart timer when write begin
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index d5c2a87..3e09611 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1126,6 +1126,8 @@ static void thread_func(void *userdata) {
}
if (writable && do_write) {
+ if (u->write_index == 0)
+ u->started_at = pa_rtclock_usec();
if (u->profile == PROFILE_A2DP) {
if (a2dp_process_render(u) < 0)
commit 9e93b9ce0b4eb825d3ce434401e2ccb9ac54e779
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Thu Mar 5 18:18:07 2009 +0200
bluetooth: stream also when source is suspended
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 3e09611..2d9ede5 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1164,8 +1164,8 @@ static void thread_func(void *userdata) {
/* Hmm, nothing to do. Let's sleep */
if (pollfd)
- pollfd->events = (short) (((u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state) && !writable) ? POLLOUT : 0) |
- (u->source && PA_SOURCE_IS_OPENED(u->source->thread_info.state) ? POLLIN : 0));
+ pollfd->events = (short) (((u->sink && PA_SINK_IS_LINKED(u->sink->thread_info.state) && !writable) ? POLLOUT : 0) |
+ (u->source && PA_SOURCE_IS_LINKED(u->source->thread_info.state) ? POLLIN : 0));
if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
goto fail;
commit 2928b44c53a6648d6e91077e16947dbbed0e7546
Merge: 47bc3b7... 9e93b9c...
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 12 16:25:48 2009 -0300
Merge commit 'elmarco/bluetooth-fixes'
commit 3e8c7ac65ff1399310725380e988185c62d37ce7
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 12:38:36 2009 +0100
Ignore HAL NoSuchProperty errors when looking for capabilities field. Closes rhbz #489394
diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c
index fe60110..9b0d71c 100644
--- a/src/modules/module-hal-detect.c
+++ b/src/modules/module-hal-detect.c
@@ -452,7 +452,8 @@ static void device_added_cb(LibHalContext *context, const char *udi) {
finish:
if (dbus_error_is_set(&error)) {
- pa_log_error("D-Bus error while parsing HAL data: %s: %s", error.name, error.message);
+ if (!dbus_error_has_name(&error, "org.freedesktop.Hal.NoSuchProperty"))
+ pa_log_error("D-Bus error while parsing HAL data: %s: %s", error.name, error.message);
dbus_error_free(&error);
}
}
commit 4ebdee5b294e23ba03d7da15a9aa51c704d38490
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 12:38:59 2009 +0100
deduce a proper icon for TV sets
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index ff8700c..c725595 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -1921,6 +1921,8 @@ pa_bool_t pa_device_init_icon(pa_proplist *p, pa_bool_t is_sink) {
t = "phone";
else if (pa_streq(ff, "portable"))
t = "multimedia-player";
+ else if (pa_streq(ff, "tv"))
+ t = "video-display";
}
if (!t)
commit 97445955717468507ba70bf40dc944b1f117382e
Merge: 4ebdee5... 2d903ba...
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 12:56:41 2009 +0100
Merge commit '2d903bae9a2e57f997a3d3f335379c3880f95c77'
commit df3f4eef2d9c2b0f1a4ea0fba45ec7fc652ded97
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Thu Mar 19 14:15:38 2009 +0200
bluetooth: load bluetooth device with connected profile
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 521a912..4586d8c 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -75,7 +75,7 @@ static void load_module_for_device(struct userdata *u, pa_bluetooth_device *d, p
/* Oh, awesome, a new device has shown up and been connected! */
- args = pa_sprintf_malloc("address=\"%s\" path=\"%s\"", d->address, d->path);
+ args = pa_sprintf_malloc("address=\"%s\" path=\"%s\" profile=\"%s\"", d->address, d->path, d->headset_connected ? "hsp" : "a2dp");
if (pa_modargs_get_value(u->modargs, "sco_sink", NULL) &&
pa_modargs_get_value(u->modargs, "sco_source", NULL)) {
commit af9f92bfaa3a4fa78a31d8845a88cace85912d6c
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Fri Mar 6 14:45:06 2009 +0200
bluetooth: update SCO over PCM with latest changes
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 2d9ede5..4df2ca4 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -160,6 +160,8 @@ struct userdata {
int service_write_type, service_read_type;
};
+#define USE_SCO_OVER_PCM(u) (u->profile == PROFILE_HSP && (u->hsp.sco_sink && u->hsp.sco_source))
+
static int init_bt(struct userdata *u);
static int init_profile(struct userdata *u);
@@ -653,7 +655,7 @@ static int set_conf(struct userdata *u) {
return 0;
}
-/* from IO thread */
+/* from IO thread, except in SCO over PCM */
static int start_stream_fd(struct userdata *u) {
union {
bt_audio_msg_header_t rsp;
@@ -1359,8 +1361,6 @@ static char *get_name(const char *type, pa_modargs *ma, const char *device_id, p
return pa_sprintf_malloc("bluez_%s.%s", type, n);
}
-#define USE_SCO_OVER_PCM(u) (u->profile == PROFILE_HSP && (u->hsp.sco_sink && u->hsp.sco_source))
-
static void sco_over_pcm_state_update(struct userdata *u) {
pa_assert(u);
pa_assert(USE_SCO_OVER_PCM(u));
@@ -1375,11 +1375,14 @@ static void sco_over_pcm_state_update(struct userdata *u) {
if ((init_bt(u) < 0) || (init_profile(u) < 0))
pa_log("Can't resume SCO over PCM");
+ start_stream_fd(u);
} else {
if (u->service_fd < 0)
return;
+ stop_stream_fd(u);
+
pa_log_debug("Closing SCO over PCM");
pa_close(u->service_fd);
u->service_fd = -1;
@@ -1629,15 +1632,19 @@ static int start_thread(struct userdata *u) {
pa_assert(!u->rtpoll);
pa_assert(!u->rtpoll_item);
+ u->rtpoll = pa_rtpoll_new();
+ pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll);
+
if (USE_SCO_OVER_PCM(u)) {
+ if (start_stream_fd(u) < 0)
+ return -1;
+
pa_sink_ref(u->sink);
pa_source_ref(u->source);
+ /* FIXME: monitor stream_fd error */
return 0;
}
- u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll);
-
if (!(u->thread = pa_thread_new(thread_func, u))) {
pa_log_error("Failed to create IO thread");
stop_thread(u);
commit f1daa282f030e4e2381341e0f65faca47c4b891b
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Thu Mar 19 16:55:14 2009 +0200
bluetooth: mark info_valid when receive Connected
Sometime, we receive the connected signal before GetProperties reply.
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 9e30f89..5213ad6 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -653,10 +653,12 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
} else if (dbus_message_has_interface(m, "org.bluez.Headset")) {
if (parse_audio_property(y, &d->headset_connected, &arg_i) < 0)
goto fail;
+ d->headset_info_valid = 1;
} else if (dbus_message_has_interface(m, "org.bluez.AudioSink")) {
if (parse_audio_property(y, &d->audio_sink_connected, &arg_i) < 0)
goto fail;
+ d->audio_sink_info_valid = 1;
}
pa_assert_se(y->mode == MODE_DISCOVER);
commit e83621724d7939b97b4f01f0d7e965d61ef8e55e
Author: Marc-André Lureau <marc-andre.lureau at nokia.com>
Date: Thu Mar 19 16:48:31 2009 +0200
bluetooth: rework the info_valid logic to be more tolerant
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 5213ad6..912697e 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -114,15 +114,14 @@ void pa_bluetooth_device_free(pa_bluetooth_device *d) {
static pa_bool_t device_is_loaded(pa_bluetooth_device *d) {
pa_assert(d);
- return d->device_info_valid && d->audio_sink_info_valid && d->headset_info_valid;
+ return d->device_info_valid && (d->audio_sink_info_valid || d->headset_info_valid);
}
static pa_bool_t device_is_audio(pa_bluetooth_device *d) {
pa_assert(d);
pa_assert(d->device_info_valid);
- pa_assert(d->audio_sink_info_valid);
- pa_assert(d->headset_info_valid);
+ pa_assert(d->audio_sink_info_valid || d->headset_info_valid);
return d->device_info_valid > 0 &&
(d->audio_sink_info_valid > 0 || d->headset_info_valid > 0);
commit 303cd907b90768dbbdd372ea462523d0b5e5c9f1
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 17:18:08 2009 +0100
get rid of setsockopt() calls since they have never been implemented upstream
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 2d9ede5..b1b8a7b 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -57,9 +57,6 @@
#define MAX_BITPOOL 64
#define MIN_BITPOOL 2U
-#define SOL_SCO 17
-#define SCO_TXBUFS 0x03
-#define SCO_RXBUFS 0x04
PA_MODULE_AUTHOR("Joao Paulo Rechi Vita");
PA_MODULE_DESCRIPTION("Bluetooth audio sink and source");
@@ -689,9 +686,6 @@ static int start_stream_fd(struct userdata *u) {
return -1;
}
-/* setsockopt(u->stream_fd, SOL_SCO, SCO_TXBUFS, &period_count, sizeof(period_count)); */
-/* setsockopt(u->stream_fd, SOL_SCO, SCO_SNDBUF, &period_count, sizeof(period_count)); */
-
pa_make_fd_nonblock(u->stream_fd);
pa_make_socket_low_delay(u->stream_fd);
commit 794775bb51eac04546bc905f789bbe613fd23bfa
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 17:20:56 2009 +0100
document todo items discussed at bt meeting
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index b1b8a7b..80c1256 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -75,6 +75,10 @@ PA_MODULE_USAGE(
"sco_sink=<SCO over PCM sink name> "
"sco_source=<SCO over PCM source name>");
+/* TODO: not close fd when entering suspend mode in a2dp */
+
+/* TODO: BT_PCM_FLAG_NREC */
+
static const char* const valid_modargs[] = {
"name",
"card_name",
commit 291d21c4bab6970b70b08cc301c5287b4a11b20e
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 17:44:42 2009 +0100
fix prototypes of sbc functions a bit
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 80c1256..2ae6e11 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -949,7 +949,7 @@ static int a2dp_process_render(struct userdata *u) {
void *d;
const void *p;
unsigned frame_count;
- int written;
+ size_t written;
uint64_t writing_at;
pa_assert(u);
@@ -975,14 +975,14 @@ static int a2dp_process_render(struct userdata *u) {
writing_at = u->write_index;
do {
- int encoded;
+ ssize_t encoded;
if (!u->write_memchunk.memblock)
pa_sink_render_full(u->sink, u->block_size, &u->write_memchunk);
p = (const uint8_t*) pa_memblock_acquire(u->write_memchunk.memblock) + u->write_memchunk.index;
encoded = sbc_encode(&a2dp->sbc,
- (void*) p, u->write_memchunk.length,
+ p, u->write_memchunk.length,
d, left,
&written);
@@ -997,10 +997,11 @@ static int a2dp_process_render(struct userdata *u) {
return -1;
}
- pa_assert(written >= 0);
-
pa_assert((size_t) encoded <= u->write_memchunk.length);
+ pa_assert((size_t) encoded == sbc_get_codesize(&a2dp->sbc));
+
pa_assert((size_t) written <= left);
+ pa_assert((size_t) written == sbc_get_frame_length(&a2dp->sbc));
/* pa_log_debug("SBC: encoded: %d; written: %d", encoded, written); */
@@ -1019,7 +1020,7 @@ static int a2dp_process_render(struct userdata *u) {
frame_count++;
- } while ((uint8_t*) d - (uint8_t*) a2dp->buffer + written < (ptrdiff_t) u->link_mtu);
+ } while (((uint8_t*) d - ((uint8_t*) a2dp->buffer + sbc_get_frame_length(&a2dp->sbc))) < (ptrdiff_t) u->link_mtu);
/* write it to the fifo */
memset(a2dp->buffer, 0, sizeof(*header) + sizeof(*payload));
diff --git a/src/modules/bluetooth/sbc.c b/src/modules/bluetooth/sbc.c
index a33ed57..6fa5479 100644
--- a/src/modules/bluetooth/sbc.c
+++ b/src/modules/bluetooth/sbc.c
@@ -1044,8 +1044,10 @@ int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
return framelen;
}
-int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output,
- int output_len, int *written)
+ssize_t sbc_encode(sbc_t *sbc,
+ const void *input, size_t input_len,
+ void *output, size_t output_len,
+ size_t *written)
{
struct sbc_priv *priv;
int framelen, samples;
@@ -1133,9 +1135,9 @@ void sbc_finish(sbc_t *sbc)
memset(sbc, 0, sizeof(sbc_t));
}
-int sbc_get_frame_length(sbc_t *sbc)
+size_t sbc_get_frame_length(sbc_t *sbc)
{
- int ret;
+ size_t ret;
uint8_t subbands, channels, blocks, joint;
struct sbc_priv *priv;
@@ -1164,7 +1166,7 @@ int sbc_get_frame_length(sbc_t *sbc)
return ret;
}
-int sbc_get_frame_duration(sbc_t *sbc)
+unsigned sbc_get_frame_duration(sbc_t *sbc)
{
uint8_t subbands, blocks;
uint16_t frequency;
@@ -1202,7 +1204,7 @@ int sbc_get_frame_duration(sbc_t *sbc)
return (1000000 * blocks * subbands) / frequency;
}
-uint16_t sbc_get_codesize(sbc_t *sbc)
+size_t sbc_get_codesize(sbc_t *sbc)
{
uint16_t subbands, channels, blocks;
struct sbc_priv *priv;
diff --git a/src/modules/bluetooth/sbc.h b/src/modules/bluetooth/sbc.h
index f9d506b..25a1288 100644
--- a/src/modules/bluetooth/sbc.h
+++ b/src/modules/bluetooth/sbc.h
@@ -31,6 +31,7 @@ extern "C" {
#endif
#include <stdint.h>
+#include <sys/types.h>
/* sampling frequency */
#define SBC_FREQ_16000 0x00
@@ -84,11 +85,22 @@ int sbc_reinit(sbc_t *sbc, unsigned long flags);
int sbc_parse(sbc_t *sbc, void *input, int input_len);
int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
int output_len, int *len);
-int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output,
- int output_len, int *written);
-int sbc_get_frame_length(sbc_t *sbc);
-int sbc_get_frame_duration(sbc_t *sbc);
-uint16_t sbc_get_codesize(sbc_t *sbc);
+
+/* Encodes ONE input block into ONE output block */
+ssize_t sbc_encode(sbc_t *sbc,
+ const void *input, size_t input_len,
+ void *output, size_t output_len,
+ size_t *written);
+
+/* Returns the output block size in bytes */
+size_t sbc_get_frame_length(sbc_t *sbc);
+
+/* Returns the time one input/output block takes to play in msec*/
+unsigned sbc_get_frame_duration(sbc_t *sbc);
+
+/* Returns the input block size in bytes */
+size_t sbc_get_codesize(sbc_t *sbc);
+
const char *sbc_get_implementation_info(sbc_t *sbc);
void sbc_finish(sbc_t *sbc);
commit 4a983124e1ca76f05050e149d6333ec6b6940886
Merge: 291d21c... e836217...
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 17:46:13 2009 +0100
Merge commit 'elmarco/bluetooth-fixes'
commit 0a1af8eb59cd8c600803ca57a2be29dc927df882
Merge: 4a98312... 9744595...
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 17:46:22 2009 +0100
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
commit 86439a4613d70bbc04bebb788486205d23f79baf
Merge: 0a1af8e... 000f0b8...
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 17:48:10 2009 +0100
Merge commit 'origin/master-tx'
commit 3762299bebb74c370aac8fb9392c358b79d88444
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 18:01:56 2009 +0100
unfuck i18n
diff --git a/po/LINGUAS b/po/LINGUAS
index 6caa289..076efa4 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -5,12 +5,9 @@ el
es
fi
fr
-hu
+it
pa
pl
pt_BR
-sk
-sr
-sr at latin
sv
-tr
+zh_CN
diff --git a/po/ca.po b/po/ca.po
index ae699a3..11b1a50 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2009-02-15 20:53+0100\n"
"Last-Translator: Agusti Grau <fletxa at gmail.com>\n"
"Language-Team: Catalan <fedora at softcatala.net>\n"
@@ -98,12 +98,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "S'ha produït un error intern"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index c4e857f..e65c774 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2008-10-19 22:31+0200\n"
"Last-Translator: Petr Kovar <pknbe at volny.cz>\n"
"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -88,12 +88,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "Vnitřnà chyba"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 3e78cdb..a2b146f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2009-02-19 12:04+0100\n"
"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
"Language-Team: German <fedora-trans-de at redhat.com>\n"
@@ -95,12 +95,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "Interner Fehler"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/el.po b/po/el.po
index 8e930fd..a3f66fe 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2008-08-22 19:40+0300\n"
"Last-Translator: Dimitris Glezos <dimitris at glezos.com>\n"
"Language-Team: Greek <fedora-trans-el at redhat.com>\n"
@@ -87,11 +87,11 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
msgid "Internal Audio"
msgstr ""
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/es.po b/po/es.po
index d7b434b..54b5a47 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PulseAudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2009-01-16 09:25-0300\n"
"Last-Translator: daniel cabrera <h.daniel.cabrera at gmail.com>\n"
"Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -87,12 +87,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "Error interno"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index f3acfea..24029e4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2009-02-13 08:57+0200\n"
"Last-Translator: Timo Jyrinki <timo.jyrinki at iki.fi>\n"
"Language-Team: Finnish <laatu at lokalisointi.org>\n"
@@ -86,12 +86,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "Sisäinen virhe"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index fc1c57c..e48a02a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2008-10-18 20:34+0200\n"
"Last-Translator: Pablo Martin-Gomez <pablo.martin-gomez at laposte.net>\n"
"Language-Team: Français <fedora-trans-fr at redhat.com>\n"
@@ -90,12 +90,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "Erreur interne"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 893d9db..afa27b2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2009-02-23 19:19+0100\n"
"Last-Translator: Luca Ferretti <elle.uca at libero.it>\n"
"Language-Team: Italiano <tp at lists.linux.it>\n"
@@ -92,12 +92,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "Errore interno"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index b6b557a..ce6d677 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio.master-tx\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-26 01:41+0000\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2008-12-24 09:37+0530\n"
"Last-Translator: Amanpreet Singh Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi <punjabi-l10n at users.sf.net>\n"
@@ -17,12 +17,97 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../src/daemon/ltdl-bind-now.c:177 ../src/daemon/ltdl-bind-now.c:197
-msgid "Failed to add bind-now-loader."
+#: ../src/modules/alsa/alsa-util.c:530
+msgid "Analog Mono"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:536
+msgid "Analog Stereo"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:542
+msgid "Digital Stereo (IEC958)"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:548
+msgid "Digital Stereo (HDMI)"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:555
+msgid "Analog Surround 4.0"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:562
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:570
+msgid "Analog Surround 4.1"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:578
+msgid "Analog Surround 5.0"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:586
+msgid "Analog Surround 5.1"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:594
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:603
+msgid "Analog Surround 7.1"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:1602
+#, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:1642
+#, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s%"
+"lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgstr ""
+
+#: ../src/modules/alsa/alsa-util.c:1688
+#, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgstr ""
+
+#: ../src/pulsecore/sink.c:1965
+#, fuzzy
+msgid "Internal Audio"
+msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ"
+
+#: ../src/pulsecore/sink.c:1971
+msgid "Modem"
+msgstr ""
+
+#: ../src/daemon/ltdl-bind-now.c:124
+msgid "Failed to find original lt_dlopen loader."
msgstr ""
-#: ../src/daemon/ltdl-bind-now.c:184
-msgid "Failed to find original dlopen loader."
+#: ../src/daemon/ltdl-bind-now.c:129
+#, fuzzy
+msgid "Failed to allocate new dl loader."
+msgstr "ਸਾਊਂਡ ਫਾਇਲ ਖੋਲà©à¨¹à¨£ ਲਈ ਫੇਲà©à¨¹ ਹੈ।\n"
+
+#: ../src/daemon/ltdl-bind-now.c:142
+msgid "Failed to add bind-now-loader."
msgstr ""
#: ../src/daemon/polkit.c:55
@@ -146,260 +231,258 @@ msgstr ""
msgid "setrlimit(%s, (%u, %u)) failed: %s"
msgstr ""
-#: ../src/daemon/main.c:425
+#: ../src/daemon/main.c:434
msgid "Failed to parse command line."
msgstr ""
-#: ../src/daemon/main.c:441
+#: ../src/daemon/main.c:458
#, c-format
msgid "We're in the group '%s', allowing high-priority scheduling."
msgstr ""
-#: ../src/daemon/main.c:448
+#: ../src/daemon/main.c:465
#, c-format
msgid "We're in the group '%s', allowing real-time scheduling."
msgstr ""
-#: ../src/daemon/main.c:456
+#: ../src/daemon/main.c:473
msgid "PolicyKit grants us acquire-high-priority privilege."
msgstr ""
-#: ../src/daemon/main.c:459
+#: ../src/daemon/main.c:476
msgid "PolicyKit refuses acquire-high-priority privilege."
msgstr ""
-#: ../src/daemon/main.c:464
+#: ../src/daemon/main.c:481
msgid "PolicyKit grants us acquire-real-time privilege."
msgstr ""
-#: ../src/daemon/main.c:467
+#: ../src/daemon/main.c:484
msgid "PolicyKit refuses acquire-real-time privilege."
msgstr ""
-#: ../src/daemon/main.c:479
+#: ../src/daemon/main.c:513
+#, c-format
msgid ""
-"Called SUID root and real-time/high-priority scheduling was requested in the "
-"configuration. However, we lack the necessary priviliges:\n"
-"We are not in group '"
+"Called SUID root and real-time and/or high-priority scheduling was requested "
+"in the configuration. However, we lack the necessary privileges:\n"
+"We are not in group '%s', PolicyKit refuse to grant us the requested "
+"privileges and we have no increase RLIMIT_NICE/RLIMIT_RTPRIO resource "
+"limits.\n"
+"For enabling real-time/high-priority scheduling please acquire the "
+"appropriate PolicyKit privileges, or become a member of '%s', or increase "
+"the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user."
msgstr ""
-#: ../src/daemon/main.c:480
+#: ../src/daemon/main.c:538
msgid ""
-"' and PolicyKit refuse to grant us priviliges. Dropping SUID again.\n"
-"For enabling real-time scheduling please acquire the appropriate PolicyKit "
-"priviliges, or become a member of '"
-msgstr ""
-
-#: ../src/daemon/main.c:481
-msgid "', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user."
+"High-priority scheduling enabled in configuration but not allowed by policy."
msgstr ""
-#: ../src/daemon/main.c:497
-msgid "High-priority scheduling enabled in configuration but not allowed by policy."
-msgstr ""
-
-#: ../src/daemon/main.c:522
+#: ../src/daemon/main.c:567
msgid "Successfully increased RLIMIT_RTPRIO"
msgstr ""
-#: ../src/daemon/main.c:525
+#: ../src/daemon/main.c:570
#, c-format
msgid "RLIMIT_RTPRIO failed: %s"
msgstr "RLIMIT_RTPRIO failed: %s"
-#: ../src/daemon/main.c:532
+#: ../src/daemon/main.c:577
msgid "Giving up CAP_NICE"
msgstr ""
-#: ../src/daemon/main.c:539
-msgid "Real-time scheduling enabled in configuration but not allowed by policy."
+#: ../src/daemon/main.c:584
+msgid ""
+"Real-time scheduling enabled in configuration but not allowed by policy."
msgstr ""
-#: ../src/daemon/main.c:597
+#: ../src/daemon/main.c:645
msgid "Daemon not running"
msgstr ""
-#: ../src/daemon/main.c:599
+#: ../src/daemon/main.c:647
#, c-format
msgid "Daemon running as PID %u"
msgstr ""
-#: ../src/daemon/main.c:609
+#: ../src/daemon/main.c:657
#, c-format
msgid "Failed to kill daemon: %s"
msgstr ""
-#: ../src/daemon/main.c:627
+#: ../src/daemon/main.c:675
msgid ""
"This program is not intended to be run as root (unless --system is "
"specified)."
msgstr ""
-#: ../src/daemon/main.c:629
-msgid "Root priviliges required."
+#: ../src/daemon/main.c:677
+#, fuzzy
+msgid "Root privileges required."
msgstr "ਰੂਟ ਅਧਿਕਾਰਾਂ ਦੀ ਲੋੜ ਹੈ।"
-#: ../src/daemon/main.c:634
+#: ../src/daemon/main.c:682
msgid "--start not supported for system instances."
msgstr ""
-#: ../src/daemon/main.c:639
+#: ../src/daemon/main.c:687
msgid "Running in system mode, but --disallow-exit not set!"
msgstr ""
-#: ../src/daemon/main.c:642
+#: ../src/daemon/main.c:690
msgid "Running in system mode, but --disallow-module-loading not set!"
msgstr ""
-#: ../src/daemon/main.c:645
+#: ../src/daemon/main.c:693
msgid "Running in system mode, forcibly disabling SHM mode!"
msgstr ""
-#: ../src/daemon/main.c:650
+#: ../src/daemon/main.c:698
msgid "Running in system mode, forcibly disabling exit idle time!"
msgstr ""
-#: ../src/daemon/main.c:677
+#: ../src/daemon/main.c:725
msgid "Failed to acquire stdio."
msgstr ""
-#: ../src/daemon/main.c:683
+#: ../src/daemon/main.c:731
#, c-format
msgid "pipe failed: %s"
msgstr "pipe failed: %s"
-#: ../src/daemon/main.c:688
+#: ../src/daemon/main.c:736
#, c-format
msgid "fork() failed: %s"
msgstr "fork() ਫੇਲà©à¨¹ ਹੈ: %s"
-#: ../src/daemon/main.c:702
+#: ../src/daemon/main.c:750
#, c-format
msgid "read() failed: %s"
msgstr "read() ਫੇਲà©à¨¹ ਹੈ: %s"
-#: ../src/daemon/main.c:708
+#: ../src/daemon/main.c:756
msgid "Daemon startup failed."
msgstr ""
-#: ../src/daemon/main.c:710
+#: ../src/daemon/main.c:758
msgid "Daemon startup successful."
msgstr ""
-#: ../src/daemon/main.c:780
+#: ../src/daemon/main.c:828
#, c-format
msgid "This is PulseAudio %s"
msgstr ""
-#: ../src/daemon/main.c:781
+#: ../src/daemon/main.c:829
#, c-format
msgid "Compilation host: %s"
msgstr ""
-#: ../src/daemon/main.c:782
+#: ../src/daemon/main.c:830
#, c-format
msgid "Compilation CFLAGS: %s"
msgstr ""
-#: ../src/daemon/main.c:785
+#: ../src/daemon/main.c:833
#, c-format
msgid "Running on host: %s"
msgstr ""
-#: ../src/daemon/main.c:788
+#: ../src/daemon/main.c:836
+#, c-format
+msgid "Found %u CPUs."
+msgstr ""
+
+#: ../src/daemon/main.c:838
#, c-format
msgid "Page size is %lu bytes"
msgstr ""
-#: ../src/daemon/main.c:791
+#: ../src/daemon/main.c:841
msgid "Compiled with Valgrind support: yes"
msgstr ""
-#: ../src/daemon/main.c:793
+#: ../src/daemon/main.c:843
msgid "Compiled with Valgrind support: no"
msgstr ""
-#: ../src/daemon/main.c:796
+#: ../src/daemon/main.c:846
#, c-format
msgid "Running in valgrind mode: %s"
msgstr ""
-#: ../src/daemon/main.c:799
+#: ../src/daemon/main.c:849
msgid "Optimized build: yes"
msgstr ""
-#: ../src/daemon/main.c:801
+#: ../src/daemon/main.c:851
msgid "Optimized build: no"
msgstr ""
-#: ../src/daemon/main.c:805
+#: ../src/daemon/main.c:855
msgid "Failed to get machine ID"
msgstr ""
-#: ../src/daemon/main.c:808
+#: ../src/daemon/main.c:858
#, c-format
msgid "Machine ID is %s."
msgstr ""
-#: ../src/daemon/main.c:813
+#: ../src/daemon/main.c:863
#, c-format
msgid "Using runtime directory %s."
msgstr ""
-#: ../src/daemon/main.c:818
+#: ../src/daemon/main.c:868
#, c-format
msgid "Using state directory %s."
msgstr ""
-#: ../src/daemon/main.c:821
+#: ../src/daemon/main.c:871
#, c-format
msgid "Running in system mode: %s"
msgstr ""
-#: ../src/daemon/main.c:836
+#: ../src/daemon/main.c:886
msgid "pa_pid_file_create() failed."
msgstr "pa_pid_file_create() ਫੇਲà©à¨¹ ਹੈ।"
-#: ../src/daemon/main.c:848
+#: ../src/daemon/main.c:898
msgid "Fresh high-resolution timers available! Bon appetit!"
msgstr ""
-#: ../src/daemon/main.c:850
+#: ../src/daemon/main.c:900
msgid ""
"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
"resolution timers enabled!"
msgstr ""
-#: ../src/daemon/main.c:860
+#: ../src/daemon/main.c:912
msgid "pa_core_new() failed."
msgstr "pa_core_new() ਫੇਲà©à¨¹ ਹੈ।"
-#: ../src/daemon/main.c:921
+#: ../src/daemon/main.c:974
msgid "Failed to initialize daemon."
msgstr ""
-#: ../src/daemon/main.c:926
+#: ../src/daemon/main.c:979
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
-#: ../src/daemon/main.c:931
-#, c-format
-msgid "Default sink name (%s) does not exist in name register."
-msgstr ""
-
-#: ../src/daemon/main.c:944
+#: ../src/daemon/main.c:992
msgid "Daemon startup complete."
msgstr ""
-#: ../src/daemon/main.c:950
+#: ../src/daemon/main.c:998
msgid "Daemon shutdown initiated."
msgstr ""
-#: ../src/daemon/main.c:971
+#: ../src/daemon/main.c:1016
msgid "Daemon terminated."
msgstr ""
-#: ../src/daemon/cmdline.c:117
+#: ../src/daemon/cmdline.c:121
#, c-format
msgid ""
"%s [options]\n"
@@ -415,7 +498,8 @@ msgid ""
" --start Start the daemon if it is not "
"running\n"
" -k --kill Kill a running daemon\n"
-" --check Check for a running daemon\n"
+" --check Check for a running daemon (only "
+"returns exit code)\n"
"\n"
"OPTIONS:\n"
" --system[=BOOL] Run as system-wide instance\n"
@@ -445,6 +529,10 @@ msgid ""
" --log-level[=LEVEL] Increase or set verbosity level\n"
" -v Increase the verbosity level\n"
" --log-target={auto,syslog,stderr} Specify the log target\n"
+" --log-meta[=BOOL] Include code location in log "
+"messages\n"
+" --log-time[=BOOL] Include timestamps in log messages\n"
+" --log-backtrace=FRAMES Include a backtrace in log messages\n"
" -p, --dl-search-path=PATH Set the search path for dynamic "
"shared\n"
" objects (plugins)\n"
@@ -468,58 +556,66 @@ msgid ""
" -n Don't load default script file\n"
msgstr ""
-#: ../src/daemon/cmdline.c:245
+#: ../src/daemon/cmdline.c:252
msgid "--daemonize expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:252
+#: ../src/daemon/cmdline.c:259
msgid "--fail expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:262
+#: ../src/daemon/cmdline.c:269
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
"of debug, info, notice, warn, error)."
msgstr ""
-#: ../src/daemon/cmdline.c:274
+#: ../src/daemon/cmdline.c:281
msgid "--high-priority expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:281
+#: ../src/daemon/cmdline.c:288
msgid "--realtime expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:288
+#: ../src/daemon/cmdline.c:295
msgid "--disallow-module-loading expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:295
-msgid "--disallow-exit boolean argument"
+#: ../src/daemon/cmdline.c:302
+msgid "--disallow-exit expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:302
+#: ../src/daemon/cmdline.c:309
msgid "--use-pid-file expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:319
+#: ../src/daemon/cmdline.c:326
msgid "Invalid log target: use either 'syslog', 'stderr' or 'auto'."
msgstr ""
-#: ../src/daemon/cmdline.c:338
+#: ../src/daemon/cmdline.c:333
+msgid "--log-time expects boolean argument"
+msgstr ""
+
+#: ../src/daemon/cmdline.c:340
+msgid "--log-meta expects boolean argument"
+msgstr ""
+
+#: ../src/daemon/cmdline.c:359
#, c-format
msgid "Invalid resample method '%s'."
msgstr ""
-#: ../src/daemon/cmdline.c:345
+#: ../src/daemon/cmdline.c:366
msgid "--system expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:352
+#: ../src/daemon/cmdline.c:373
msgid "--no-cpu-limit expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:359
+#: ../src/daemon/cmdline.c:380
msgid "--disable-shm expects boolean argument"
msgstr ""
@@ -563,288 +659,350 @@ msgstr ""
msgid "Path: %s\n"
msgstr "ਪਾਥ: %s\n"
-#: ../src/daemon/daemon-conf.c:205
+#: ../src/daemon/daemon-conf.c:215
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:221
+#: ../src/daemon/daemon-conf.c:231
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:237
+#: ../src/daemon/daemon-conf.c:247
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:260
+#: ../src/daemon/daemon-conf.c:270
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:267
+#: ../src/daemon/daemon-conf.c:277
#, c-format
msgid "[%s:%u] rlimit not supported on this platform."
msgstr ""
-#: ../src/daemon/daemon-conf.c:283
+#: ../src/daemon/daemon-conf.c:293
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:301
+#: ../src/daemon/daemon-conf.c:311
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:319
+#: ../src/daemon/daemon-conf.c:335
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:337
+#: ../src/daemon/daemon-conf.c:353
+#, fuzzy, c-format
+msgid "[%s:%u] Invalid channel map '%s'."
+msgstr "ਗਲਤ ਚੈਨਲ ਮੈਪ\n"
+
+#: ../src/daemon/daemon-conf.c:371
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:355
+#: ../src/daemon/daemon-conf.c:389
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:373
+#: ../src/daemon/daemon-conf.c:407
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:570
+#: ../src/daemon/daemon-conf.c:522
#, c-format
msgid "Failed to open configuration file: %s"
msgstr ""
-#: ../src/daemon/daemon-conf.c:644
+#: ../src/daemon/daemon-conf.c:538
+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:616
#, c-format
msgid "### Read from configuration file: %s ###\n"
msgstr ""
#: ../src/daemon/caps.c:63
-msgid "Dropping root priviliges."
+msgid "Dropping root privileges."
msgstr ""
#: ../src/daemon/caps.c:103
msgid "Limited capabilities successfully to CAP_SYS_NICE."
msgstr ""
-#: ../src/pulse/channelmap.c:102
+#: ../src/daemon/pulseaudio.desktop.in.h:1
+msgid "PulseAudio Sound System"
+msgstr ""
+
+#: ../src/daemon/pulseaudio.desktop.in.h:2
+msgid "Start the PulseAudio Sound System"
+msgstr ""
+
+#: ../src/daemon/org.pulseaudio.policy.in.h:1
+msgid ""
+"High-priority scheduling (negative Unix nice level) for the PulseAudio daemon"
+msgstr ""
+
+#: ../src/daemon/org.pulseaudio.policy.in.h:2
+msgid "Real-time scheduling for the PulseAudio daemon"
+msgstr ""
+
+#: ../src/daemon/org.pulseaudio.policy.in.h:3
+msgid ""
+"System policy prevents PulseAudio from acquiring high-priority scheduling."
+msgstr ""
+
+#: ../src/daemon/org.pulseaudio.policy.in.h:4
+msgid "System policy prevents PulseAudio from acquiring real-time scheduling."
+msgstr ""
+
+#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:804
msgid "Mono"
msgstr "ਮੋਨੋ"
-#: ../src/pulse/channelmap.c:104
+#: ../src/pulse/channelmap.c:105
msgid "Front Center"
msgstr "ਫਰੰਟ ਸੈਂਟਰ"
-#: ../src/pulse/channelmap.c:105
+#: ../src/pulse/channelmap.c:106
msgid "Front Left"
msgstr ""
-#: ../src/pulse/channelmap.c:106
+#: ../src/pulse/channelmap.c:107
msgid "Front Right"
msgstr ""
-#: ../src/pulse/channelmap.c:108
+#: ../src/pulse/channelmap.c:109
msgid "Rear Center"
msgstr ""
-#: ../src/pulse/channelmap.c:109
+#: ../src/pulse/channelmap.c:110
msgid "Rear Left"
msgstr ""
-#: ../src/pulse/channelmap.c:110
+#: ../src/pulse/channelmap.c:111
msgid "Rear Right"
msgstr ""
-#: ../src/pulse/channelmap.c:112
+#: ../src/pulse/channelmap.c:113
msgid "Low Frequency Emmiter"
msgstr ""
-#: ../src/pulse/channelmap.c:114
+#: ../src/pulse/channelmap.c:115
msgid "Front Left-of-center"
msgstr ""
-#: ../src/pulse/channelmap.c:115
+#: ../src/pulse/channelmap.c:116
msgid "Front Right-of-center"
msgstr ""
-#: ../src/pulse/channelmap.c:117
+#: ../src/pulse/channelmap.c:118
msgid "Side Left"
msgstr ""
-#: ../src/pulse/channelmap.c:118
+#: ../src/pulse/channelmap.c:119
msgid "Side Right"
msgstr ""
-#: ../src/pulse/channelmap.c:120
+#: ../src/pulse/channelmap.c:121
msgid "Auxiliary 0"
msgstr "à¨à¨—ਜਿਲਰੀ 0"
-#: ../src/pulse/channelmap.c:121
+#: ../src/pulse/channelmap.c:122
msgid "Auxiliary 1"
msgstr "à¨à¨—ਜਿਲਰੀ 1"
-#: ../src/pulse/channelmap.c:122
+#: ../src/pulse/channelmap.c:123
msgid "Auxiliary 2"
msgstr "à¨à¨—ਜਿਲਰੀ 2"
-#: ../src/pulse/channelmap.c:123
+#: ../src/pulse/channelmap.c:124
msgid "Auxiliary 3"
msgstr "à¨à¨—ਜਿਲਰੀ 3"
-#: ../src/pulse/channelmap.c:124
+#: ../src/pulse/channelmap.c:125
msgid "Auxiliary 4"
msgstr "à¨à¨—ਜਿਲਰੀ 4"
-#: ../src/pulse/channelmap.c:125
+#: ../src/pulse/channelmap.c:126
msgid "Auxiliary 5"
msgstr "à¨à¨—ਜਿਲਰੀ 5"
-#: ../src/pulse/channelmap.c:126
+#: ../src/pulse/channelmap.c:127
msgid "Auxiliary 6"
msgstr "à¨à¨—ਜਿਲਰੀ 6"
-#: ../src/pulse/channelmap.c:127
+#: ../src/pulse/channelmap.c:128
msgid "Auxiliary 7"
msgstr "à¨à¨—ਜਿਲਰੀ 7"
-#: ../src/pulse/channelmap.c:128
+#: ../src/pulse/channelmap.c:129
msgid "Auxiliary 8"
msgstr "à¨à¨—ਜਿਲਰੀ 8"
-#: ../src/pulse/channelmap.c:129
+#: ../src/pulse/channelmap.c:130
msgid "Auxiliary 9"
msgstr "à¨à¨—ਜਿਲਰੀ 9"
-#: ../src/pulse/channelmap.c:130
+#: ../src/pulse/channelmap.c:131
msgid "Auxiliary 10"
msgstr "à¨à¨—ਜਿਲਰੀ 10"
-#: ../src/pulse/channelmap.c:131
+#: ../src/pulse/channelmap.c:132
msgid "Auxiliary 11"
msgstr "à¨à¨—ਜਿਲਰੀ 11"
-#: ../src/pulse/channelmap.c:132
+#: ../src/pulse/channelmap.c:133
msgid "Auxiliary 12"
msgstr "à¨à¨—ਜਿਲਰੀ 12"
-#: ../src/pulse/channelmap.c:133
+#: ../src/pulse/channelmap.c:134
msgid "Auxiliary 13"
msgstr "à¨à¨—ਜਿਲਰੀ 13"
-#: ../src/pulse/channelmap.c:134
+#: ../src/pulse/channelmap.c:135
msgid "Auxiliary 14"
msgstr "à¨à¨—ਜਿਲਰੀ 14"
-#: ../src/pulse/channelmap.c:135
+#: ../src/pulse/channelmap.c:136
msgid "Auxiliary 15"
msgstr "à¨à¨—ਜਿਲਰੀ 15"
-#: ../src/pulse/channelmap.c:136
+#: ../src/pulse/channelmap.c:137
msgid "Auxiliary 16"
msgstr "à¨à¨—ਜਿਲਰੀ 16"
-#: ../src/pulse/channelmap.c:137
+#: ../src/pulse/channelmap.c:138
msgid "Auxiliary 17"
msgstr "à¨à¨—ਜਿਲਰੀ 17"
-#: ../src/pulse/channelmap.c:138
+#: ../src/pulse/channelmap.c:139
msgid "Auxiliary 18"
msgstr "à¨à¨—ਜਿਲਰੀ 18"
-#: ../src/pulse/channelmap.c:139
+#: ../src/pulse/channelmap.c:140
msgid "Auxiliary 19"
msgstr "à¨à¨—ਜਿਲਰੀ 19"
-#: ../src/pulse/channelmap.c:140
+#: ../src/pulse/channelmap.c:141
msgid "Auxiliary 20"
msgstr "à¨à¨—ਜਿਲਰੀ 20"
-#: ../src/pulse/channelmap.c:141
+#: ../src/pulse/channelmap.c:142
msgid "Auxiliary 21"
msgstr "à¨à¨—ਜਿਲਰੀ 21"
-#: ../src/pulse/channelmap.c:142
+#: ../src/pulse/channelmap.c:143
msgid "Auxiliary 22"
msgstr "à¨à¨—ਜਿਲਰੀ 22"
-#: ../src/pulse/channelmap.c:143
+#: ../src/pulse/channelmap.c:144
msgid "Auxiliary 23"
msgstr "à¨à¨—ਜਿਲਰੀ 23"
-#: ../src/pulse/channelmap.c:144
+#: ../src/pulse/channelmap.c:145
msgid "Auxiliary 24"
msgstr "à¨à¨—ਜਿਲਰੀ 24"
-#: ../src/pulse/channelmap.c:145
+#: ../src/pulse/channelmap.c:146
msgid "Auxiliary 25"
msgstr "à¨à¨—ਜਿਲਰੀ 25"
-#: ../src/pulse/channelmap.c:146
+#: ../src/pulse/channelmap.c:147
msgid "Auxiliary 26"
msgstr "à¨à¨—ਜਿਲਰੀ 26"
-#: ../src/pulse/channelmap.c:147
+#: ../src/pulse/channelmap.c:148
msgid "Auxiliary 27"
msgstr "à¨à¨—ਜਿਲਰੀ 27"
-#: ../src/pulse/channelmap.c:148
+#: ../src/pulse/channelmap.c:149
msgid "Auxiliary 28"
msgstr "à¨à¨—ਜਿਲਰੀ 28"
-#: ../src/pulse/channelmap.c:149
+#: ../src/pulse/channelmap.c:150
msgid "Auxiliary 29"
msgstr "à¨à¨—ਜਿਲਰੀ 29"
-#: ../src/pulse/channelmap.c:150
+#: ../src/pulse/channelmap.c:151
msgid "Auxiliary 30"
msgstr "à¨à¨—ਜਿਲਰੀ 30"
-#: ../src/pulse/channelmap.c:151
+#: ../src/pulse/channelmap.c:152
msgid "Auxiliary 31"
msgstr "à¨à¨—ਜਿਲਰੀ 31"
-#: ../src/pulse/channelmap.c:153
+#: ../src/pulse/channelmap.c:154
msgid "Top Center"
msgstr "ਉੱਤੇ ਕੇਂਦਰੀ"
-#: ../src/pulse/channelmap.c:155
+#: ../src/pulse/channelmap.c:156
msgid "Top Front Center"
msgstr ""
-#: ../src/pulse/channelmap.c:156
+#: ../src/pulse/channelmap.c:157
msgid "Top Front Left"
msgstr ""
-#: ../src/pulse/channelmap.c:157
+#: ../src/pulse/channelmap.c:158
msgid "Top Front Right"
msgstr ""
-#: ../src/pulse/channelmap.c:159
+#: ../src/pulse/channelmap.c:160
msgid "Top Rear Center"
msgstr ""
-#: ../src/pulse/channelmap.c:160
+#: ../src/pulse/channelmap.c:161
msgid "Top Rear Left"
msgstr ""
-#: ../src/pulse/channelmap.c:161
+#: ../src/pulse/channelmap.c:162
msgid "Top Rear Right"
msgstr ""
-#: ../src/pulse/channelmap.c:472 ../src/pulse/sample.c:144
-#: ../src/pulse/volume.c:163 ../src/pulse/volume.c:194
+#: ../src/pulse/channelmap.c:476 ../src/pulse/sample.c:167
+#: ../src/pulse/volume.c:170 ../src/pulse/volume.c:196
+#: ../src/pulse/volume.c:216 ../src/pulse/volume.c:246
msgid "(invalid)"
msgstr "(ਗਲਤ)"
+#: ../src/pulse/channelmap.c:808
+msgid "Stereo"
+msgstr ""
+
+#: ../src/pulse/channelmap.c:813
+msgid "Surround 4.0"
+msgstr ""
+
+#: ../src/pulse/channelmap.c:819
+msgid "Surround 4.1"
+msgstr ""
+
+#: ../src/pulse/channelmap.c:825
+msgid "Surround 5.0"
+msgstr ""
+
+#: ../src/pulse/channelmap.c:831
+msgid "Surround 5.1"
+msgstr ""
+
+#: ../src/pulse/channelmap.c:838
+msgid "Surround 7.1"
+msgstr ""
+
#: ../src/pulse/error.c:43
msgid "OK"
msgstr "ਠੀਕ ਹੈ"
@@ -933,6 +1091,43 @@ msgstr "ਅਣਜਾਣ ਗਲਤੀ ਕੋਡ"
msgid "No such extension"
msgstr ""
+#: ../src/pulse/error.c:65
+msgid "Obsolete functionality"
+msgstr ""
+
+#: ../src/pulse/error.c:66
+msgid "Missing implementation"
+msgstr ""
+
+#: ../src/pulse/error.c:67
+msgid "Client forked"
+msgstr ""
+
+#: ../src/pulse/sample.c:169
+#, c-format
+msgid "%s %uch %uHz"
+msgstr ""
+
+#: ../src/pulse/sample.c:181
+#, c-format
+msgid "%0.1f GiB"
+msgstr ""
+
+#: ../src/pulse/sample.c:183
+#, c-format
+msgid "%0.1f MiB"
+msgstr ""
+
+#: ../src/pulse/sample.c:185
+#, c-format
+msgid "%0.1f KiB"
+msgstr ""
+
+#: ../src/pulse/sample.c:187
+#, c-format
+msgid "%u B"
+msgstr ""
+
#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:100
msgid "XOpenDisplay() failed"
msgstr "XOpenDisplay() ਫੇਲà©à¨¹ ਹੈ"
@@ -946,45 +1141,35 @@ msgstr ""
msgid "Failed to open configuration file '%s': %s"
msgstr ""
-#: ../src/pulse/context.c:516
+#: ../src/pulse/context.c:523
msgid "No cookie loaded. Attempting to connect without."
msgstr ""
-#: ../src/pulse/context.c:642
+#: ../src/pulse/context.c:653
#, c-format
msgid "fork(): %s"
msgstr "fork(): %s"
-#: ../src/pulse/context.c:695
+#: ../src/pulse/context.c:706
#, c-format
msgid "waitpid(): %s"
msgstr "waitpid(): %s"
-#: ../src/pulse/context.c:1256
+#: ../src/pulse/context.c:1304
#, c-format
msgid "Received message for unknown extension '%s'"
msgstr ""
-#: ../src/utils/pacat.c:93
+#: ../src/utils/pacat.c:94
#, c-format
msgid "pa_stream_write() failed: %s\n"
msgstr "pa_stream_write() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-#: ../src/utils/pacat.c:132
+#: ../src/utils/pacat.c:133
#, c-format
msgid "pa_stream_peek() failed: %s\n"
msgstr "pa_stream_peek() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-#: ../src/utils/pacat.c:141
-#, c-format
-msgid "Buffer overrun, dropping incoming data\n"
-msgstr ""
-
-#: ../src/utils/pacat.c:143
-#, c-format
-msgid "pa_stream_drop() failed: %s\n"
-msgstr "pa_stream_drop() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-
#: ../src/utils/pacat.c:169
#, c-format
msgid "Stream successfully created.\n"
@@ -1054,88 +1239,88 @@ msgstr ""
msgid "not "
msgstr "ਨਹੀਂ "
-#: ../src/utils/pacat.c:259
+#: ../src/utils/pacat.c:271
#, c-format
msgid "Connection established.%s \n"
msgstr ""
-#: ../src/utils/pacat.c:262
+#: ../src/utils/pacat.c:274
#, c-format
msgid "pa_stream_new() failed: %s\n"
msgstr "pa_stream_new() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-#: ../src/utils/pacat.c:287
+#: ../src/utils/pacat.c:301
#, c-format
msgid "pa_stream_connect_playback() failed: %s\n"
msgstr "pa_stream_connect_playback() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-#: ../src/utils/pacat.c:293
+#: ../src/utils/pacat.c:307
#, c-format
msgid "pa_stream_connect_record() failed: %s\n"
msgstr "pa_stream_connect_record() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-#: ../src/utils/pacat.c:307 ../src/utils/pasuspender.c:159
-#: ../src/utils/pactl.c:666 ../src/utils/paplay.c:183
+#: ../src/utils/pacat.c:321 ../src/utils/pasuspender.c:159
+#: ../src/utils/pactl.c:762 ../src/utils/paplay.c:183
#, c-format
msgid "Connection failure: %s\n"
msgstr ""
-#: ../src/utils/pacat.c:328 ../src/utils/paplay.c:75
+#: ../src/utils/pacat.c:341 ../src/utils/paplay.c:75
#, c-format
msgid "Failed to drain stream: %s\n"
msgstr ""
-#: ../src/utils/pacat.c:333 ../src/utils/paplay.c:80
+#: ../src/utils/pacat.c:346 ../src/utils/paplay.c:80
#, c-format
msgid "Playback stream drained.\n"
msgstr ""
-#: ../src/utils/pacat.c:343 ../src/utils/paplay.c:92
+#: ../src/utils/pacat.c:356 ../src/utils/paplay.c:92
#, c-format
msgid "Draining connection to server.\n"
msgstr ""
-#: ../src/utils/pacat.c:369
+#: ../src/utils/pacat.c:382
#, c-format
msgid "Got EOF.\n"
msgstr "EOF ਮਿਲਿਆ।\n"
-#: ../src/utils/pacat.c:375
+#: ../src/utils/pacat.c:388
#, c-format
msgid "pa_stream_drain(): %s\n"
msgstr "pa_stream_drain(): %s\n"
-#: ../src/utils/pacat.c:385
+#: ../src/utils/pacat.c:398
#, c-format
msgid "read() failed: %s\n"
msgstr "read() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-#: ../src/utils/pacat.c:417
+#: ../src/utils/pacat.c:430
#, c-format
msgid "write() failed: %s\n"
msgstr "write() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-#: ../src/utils/pacat.c:438
+#: ../src/utils/pacat.c:451
#, c-format
msgid "Got signal, exiting.\n"
msgstr ""
-#: ../src/utils/pacat.c:452
+#: ../src/utils/pacat.c:465
#, c-format
msgid "Failed to get latency: %s\n"
msgstr ""
-#: ../src/utils/pacat.c:457
+#: ../src/utils/pacat.c:470
#, c-format
msgid "Time: %0.3f sec; Latency: %0.0f usec. \r"
msgstr ""
-#: ../src/utils/pacat.c:477
+#: ../src/utils/pacat.c:490
#, c-format
msgid "pa_stream_update_timing_info() failed: %s\n"
msgstr "pa_stream_update_timing_info() ਫੇਲà©à¨¹ ਹੈ: %s\n"
-#: ../src/utils/pacat.c:490
+#: ../src/utils/pacat.c:503
#, c-format
msgid ""
"%s [options]\n"
@@ -1188,7 +1373,7 @@ msgid ""
"per request in bytes.\n"
msgstr ""
-#: ../src/utils/pacat.c:591
+#: ../src/utils/pacat.c:604
#, c-format
msgid ""
"pacat %s\n"
@@ -1196,88 +1381,89 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
-#: ../src/utils/pacat.c:647
+#: ../src/utils/pacat.c:661
#, c-format
msgid "Invalid channel map '%s'\n"
msgstr ""
-#: ../src/utils/pacat.c:676
+#: ../src/utils/pacat.c:690
#, c-format
msgid "Invalid latency specification '%s'\n"
msgstr ""
-#: ../src/utils/pacat.c:683
+#: ../src/utils/pacat.c:697
#, c-format
msgid "Invalid process time specification '%s'\n"
msgstr ""
-#: ../src/utils/pacat.c:694
+#: ../src/utils/pacat.c:708
#, c-format
msgid "Invalid sample specification\n"
msgstr ""
-#: ../src/utils/pacat.c:699
+#: ../src/utils/pacat.c:713
#, c-format
msgid "Channel map doesn't match sample specification\n"
msgstr ""
-#: ../src/utils/pacat.c:706
+#: ../src/utils/pacat.c:720
#, c-format
msgid "Opening a %s stream with sample specification '%s'.\n"
msgstr ""
-#: ../src/utils/pacat.c:706
+#: ../src/utils/pacat.c:720
msgid "recording"
msgstr "ਰਿਕਾਰਡਿੰਗ"
-#: ../src/utils/pacat.c:706
+#: ../src/utils/pacat.c:720
msgid "playback"
msgstr "ਪਲੇਅਬੈਕ"
-#: ../src/utils/pacat.c:714
+#: ../src/utils/pacat.c:728
#, c-format
msgid "open(): %s\n"
msgstr "open(): %s\n"
-#: ../src/utils/pacat.c:719
+#: ../src/utils/pacat.c:733
#, c-format
msgid "dup2(): %s\n"
msgstr "dup2(): %s\n"
-#: ../src/utils/pacat.c:729
+#: ../src/utils/pacat.c:743
#, c-format
msgid "Too many arguments.\n"
msgstr ""
-#: ../src/utils/pacat.c:742 ../src/utils/pasuspender.c:280
-#: ../src/utils/pactl.c:909 ../src/utils/paplay.c:381
+#: ../src/utils/pacat.c:756 ../src/utils/pasuspender.c:280
+#: ../src/utils/pactl.c:1017 ../src/utils/paplay.c:381
#, c-format
msgid "pa_mainloop_new() failed.\n"
msgstr "pa_mainloop_new() ਫੇਲà©à¨¹ ਹੈ।\n"
-#: ../src/utils/pacat.c:763
+#: ../src/utils/pacat.c:777
#, c-format
msgid "io_new() failed.\n"
msgstr "io_new() ਫੇਲà©à¨¹ ਹੈ।\n"
-#: ../src/utils/pacat.c:769 ../src/utils/pasuspender.c:293
-#: ../src/utils/pactl.c:923 ../src/utils/paplay.c:396
+#: ../src/utils/pacat.c:783 ../src/utils/pasuspender.c:293
+#: ../src/utils/pactl.c:1031 ../src/utils/paplay.c:396
#, c-format
msgid "pa_context_new() failed.\n"
msgstr "pa_context_new() ਫੇਲà©à¨¹ ਹੈ।\n"
-#: ../src/utils/pacat.c:777
+#: ../src/utils/pacat.c:791 ../src/utils/pactl.c:1037
+#: ../src/utils/paplay.c:404
#, c-format
msgid "pa_context_connect() failed: %s"
msgstr "pa_context_connect() ਫੇਲà©à¨¹ ਹੈ: %s"
-#: ../src/utils/pacat.c:788
+#: ../src/utils/pacat.c:802
#, c-format
msgid "time_new() failed.\n"
msgstr "time_new() ਫੇਲà©à¨¹ ਹੈ।\n"
-#: ../src/utils/pacat.c:795 ../src/utils/pasuspender.c:301
-#: ../src/utils/pactl.c:931 ../src/utils/paplay.c:407
+#: ../src/utils/pacat.c:809 ../src/utils/pasuspender.c:301
+#: ../src/utils/pactl.c:1042 ../src/utils/paplay.c:410
#, c-format
msgid "pa_mainloop_run() failed.\n"
msgstr "pa_mainloop_run() ਫੇਲà©à¨¹ ਹੈ।\n"
@@ -1307,7 +1493,7 @@ msgstr ""
msgid "WARNING: Sound server is not local, not suspending.\n"
msgstr ""
-#: ../src/utils/pasuspender.c:176 ../src/utils/pactl.c:672
+#: ../src/utils/pasuspender.c:176 ../src/utils/pactl.c:768
#: ../src/utils/paplay.c:191
#, c-format
msgid "Got SIGINT, exiting.\n"
@@ -1338,32 +1524,32 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
-#: ../src/utils/pactl.c:107
+#: ../src/utils/pactl.c:108
#, c-format
msgid "Failed to get statistics: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:113
+#: ../src/utils/pactl.c:114
#, c-format
msgid "Currently in use: %u blocks containing %s bytes total.\n"
msgstr ""
-#: ../src/utils/pactl.c:116
+#: ../src/utils/pactl.c:117
#, c-format
msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
msgstr ""
-#: ../src/utils/pactl.c:119
+#: ../src/utils/pactl.c:120
#, c-format
msgid "Sample cache size: %s\n"
msgstr "ਸੈਂਪਲ ਕੈਸ਼ ਸਾਈਜ਼: %s\n"
-#: ../src/utils/pactl.c:128
+#: ../src/utils/pactl.c:129
#, c-format
msgid "Failed to get server information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:135
+#: ../src/utils/pactl.c:137
#, c-format
msgid ""
"User name: %s\n"
@@ -1371,201 +1557,218 @@ msgid ""
"Server Name: %s\n"
"Server Version: %s\n"
"Default Sample Specification: %s\n"
+"Default Channel Map: %s\n"
"Default Sink: %s\n"
"Default Source: %s\n"
"Cookie: %08x\n"
msgstr ""
-#: ../src/utils/pactl.c:160
+#: ../src/utils/pactl.c:178
#, c-format
msgid "Failed to get sink information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:176
+#: ../src/utils/pactl.c:194
#, c-format
msgid ""
-"*** Sink #%u ***\n"
-"Name: %s\n"
-"Driver: %s\n"
-"Sample Specification: %s\n"
-"Channel Map: %s\n"
-"Owner Module: %u\n"
-"Volume: %s\n"
-"Monitor Source: %s\n"
-"Latency: %0.0f usec, configured %0.0f usec\n"
-"Flags: %s%s%s%s%s%s\n"
-"Properties:\n"
-"%s"
-msgstr ""
-
-#: ../src/utils/pactl.c:193 ../src/utils/pactl.c:371
-msgid "muted"
-msgstr "ਚà©à©±à¨ª"
-
-#: ../src/utils/pactl.c:212
+"Sink #%u\n"
+"\tState: %s\n"
+"\tName: %s\n"
+"\tDescription: %s\n"
+"\tDriver: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tOwner Module: %u\n"
+"\tMute: %s\n"
+"\tVolume: %s%s%s\n"
+"\t balance %0.2f\n"
+"\tBase Volume: %s%s%s\n"
+"\tMonitor Source: %s\n"
+"\tLatency: %0.0f usec, configured %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:258
#, c-format
msgid "Failed to get source information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:228
+#: ../src/utils/pactl.c:274
#, c-format
msgid ""
-"*** Source #%u ***\n"
-"Name: %s\n"
-"Driver: %s\n"
-"Sample Specification: %s\n"
-"Channel Map: %s\n"
-"Owner Module: %u\n"
-"Volume: %s\n"
-"Monitor of Sink: %s\n"
-"Latency: %0.0f usec, configured %0.0f usec\n"
-"Flags: %s%s%s%s%s%s\n"
-"Properties:\n"
-"%s"
-msgstr ""
-
-#: ../src/utils/pactl.c:246 ../src/utils/pactl.c:289 ../src/utils/pactl.c:322
-#: ../src/utils/pactl.c:366 ../src/utils/pactl.c:367 ../src/utils/pactl.c:374
-#: ../src/utils/pactl.c:418 ../src/utils/pactl.c:419 ../src/utils/pactl.c:425
-#: ../src/utils/pactl.c:468 ../src/utils/pactl.c:469 ../src/utils/pactl.c:473
+"Source #%u\n"
+"\tState: %s\n"
+"\tName: %s\n"
+"\tDescription: %s\n"
+"\tDriver: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tOwner Module: %u\n"
+"\tMute: %s\n"
+"\tVolume: %s%s%s\n"
+"\t balance %0.2f\n"
+"\tBase Volume: %s%s%s\n"
+"\tMonitor of Sink: %s\n"
+"\tLatency: %0.0f usec, configured %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:306 ../src/utils/pactl.c:350 ../src/utils/pactl.c:385
+#: ../src/utils/pactl.c:422 ../src/utils/pactl.c:481 ../src/utils/pactl.c:482
+#: ../src/utils/pactl.c:492 ../src/utils/pactl.c:536 ../src/utils/pactl.c:537
+#: ../src/utils/pactl.c:543 ../src/utils/pactl.c:586 ../src/utils/pactl.c:587
+#: ../src/utils/pactl.c:594
msgid "n/a"
msgstr "n/a"
-#: ../src/utils/pactl.c:263
+#: ../src/utils/pactl.c:324
#, c-format
msgid "Failed to get module information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:281
+#: ../src/utils/pactl.c:342
#, c-format
msgid ""
-"*** Module #%u ***\n"
-"Name: %s\n"
-"Argument: %s\n"
-"Usage counter: %s\n"
-"Auto unload: %s\n"
+"Module #%u\n"
+"\tName: %s\n"
+"\tArgument: %s\n"
+"\tUsage counter: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
msgstr ""
-#: ../src/utils/pactl.c:298
+#: ../src/utils/pactl.c:361
#, c-format
msgid "Failed to get client information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:316
+#: ../src/utils/pactl.c:379
#, c-format
msgid ""
-"*** Client #%u ***\n"
-"Driver: %s\n"
-"Owner Module: %s\n"
-"Properties:\n"
-"%s"
+"Client #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
msgstr ""
-#: ../src/utils/pactl.c:333
+#: ../src/utils/pactl.c:396
#, c-format
-msgid "Failed to get sink input information: %s\n"
+msgid "Failed to get card information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:352
+#: ../src/utils/pactl.c:414
#, c-format
msgid ""
-"*** Sink Input #%u ***\n"
-"Driver: %s\n"
-"Owner Module: %s\n"
-"Client: %s\n"
-"Sink: %u\n"
-"Sample Specification: %s\n"
-"Channel Map: %s\n"
-"Volume: %s\n"
-"Buffer Latency: %0.0f usec\n"
-"Sink Latency: %0.0f usec\n"
-"Resample method: %s\n"
-"Properties:\n"
-"%s"
-msgstr ""
-
-#: ../src/utils/pactl.c:385
-#, c-format
-msgid "Failed to get source output information: %s\n"
+"Card #%u\n"
+"\tName: %s\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
msgstr ""
-#: ../src/utils/pactl.c:405
-#, c-format
-msgid ""
-"*** Source Output #%u ***\n"
-"Driver: %s\n"
-"Owner Module: %s\n"
-"Client: %s\n"
-"Source: %u\n"
-"Sample Specification: %s\n"
-"Channel Map: %s\n"
-"Buffer Latency: %0.0f usec\n"
-"Source Latency: %0.0f usec\n"
-"Resample method: %s\n"
-"Properties:\n"
-"%s"
-msgstr ""
-
-#: ../src/utils/pactl.c:436
+#: ../src/utils/pactl.c:428
#, c-format
-msgid "Failed to get sample information: %s\n"
+msgid "\tProfiles:\n"
msgstr ""
-#: ../src/utils/pactl.c:455
-#, c-format
-msgid ""
-"*** Sample #%u ***\n"
-"Name: %s\n"
-"Volume: %s\n"
-"Sample Specification: %s\n"
-"Channel Map: %s\n"
-"Duration: %0.1fs\n"
-"Size: %s\n"
-"Lazy: %s\n"
-"Filename: %s\n"
-"Properties:\n"
-"%s"
-msgstr ""
+#: ../src/utils/pactl.c:434
+#, fuzzy, c-format
+msgid "\tActive Profile: %s\n"
+msgstr "pipe failed: %s"
-#: ../src/utils/pactl.c:481
+#: ../src/utils/pactl.c:445
#, c-format
-msgid "Failed to get autoload information: %s\n"
+msgid "Failed to get sink input information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:497
+#: ../src/utils/pactl.c:464
#, c-format
msgid ""
-"*** Autoload Entry #%u ***\n"
-"Name: %s\n"
-"Type: %s\n"
-"Module: %s\n"
-"Argument: %s\n"
+"Sink Input #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSink: %u\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t %s\n"
+"\t balance %0.2f\n"
+"\tBuffer Latency: %0.0f usec\n"
+"\tSink Latency: %0.0f usec\n"
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:503
+#, c-format
+msgid "Failed to get source output information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:504
-msgid "sink"
+#: ../src/utils/pactl.c:523
+#, c-format
+msgid ""
+"Source Output #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSource: %u\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tBuffer Latency: %0.0f usec\n"
+"\tSource Latency: %0.0f usec\n"
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:554
+#, c-format
+msgid "Failed to get sample information: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:504
-msgid "source"
-msgstr "ਸਰੋਤ"
-
-#: ../src/utils/pactl.c:511 ../src/utils/pactl.c:521
+#: ../src/utils/pactl.c:572
+#, c-format
+msgid ""
+"Sample #%u\n"
+"\tName: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tVolume: %s\n"
+"\t %s\n"
+"\t balance %0.2f\n"
+"\tDuration: %0.1fs\n"
+"\tSize: %s\n"
+"\tLazy: %s\n"
+"\tFilename: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:602 ../src/utils/pactl.c:612
#, c-format
msgid "Failure: %s\n"
msgstr "ਫੇਲà©à¨¹: %s\n"
-#: ../src/utils/pactl.c:545
+#: ../src/utils/pactl.c:636
#, c-format
msgid "Failed to upload sample: %s\n"
msgstr ""
-#: ../src/utils/pactl.c:562
+#: ../src/utils/pactl.c:653
#, c-format
msgid "Premature end of file\n"
msgstr ""
-#: ../src/utils/pactl.c:678
+#: ../src/utils/pactl.c:774
#, c-format
msgid ""
"%s [options] stat\n"
@@ -1580,6 +1783,7 @@ msgid ""
"%s [options] unload-module ID\n"
"%s [options] suspend-sink [SINK] 1|0\n"
"%s [options] suspend-source [SOURCE] 1|0\n"
+"%s [options] set-card-profile [CARD] [PROFILE] \n"
"\n"
" -h, --help Show this help\n"
" --version Show version\n"
@@ -1590,7 +1794,7 @@ msgid ""
"server\n"
msgstr ""
-#: ../src/utils/pactl.c:729
+#: ../src/utils/pactl.c:826
#, c-format
msgid ""
"pactl %s\n"
@@ -1598,61 +1802,66 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
-#: ../src/utils/pactl.c:768
+#: ../src/utils/pactl.c:865
#, c-format
msgid "Please specify a sample file to load\n"
msgstr "ਲੋਡ ਕਰਨ ਲਈ ਸੈਂਪਲ ਫਾਇਲ ਦਿਓ\n"
-#: ../src/utils/pactl.c:790
+#: ../src/utils/pactl.c:887
#, c-format
msgid "Failed to open sound file.\n"
msgstr "ਸਾਊਂਡ ਫਾਇਲ ਖੋਲà©à¨¹à¨£ ਲਈ ਫੇਲà©à¨¹ ਹੈ।\n"
-#: ../src/utils/pactl.c:802
+#: ../src/utils/pactl.c:899
#, c-format
msgid "You have to specify a sample name to play\n"
msgstr ""
-#: ../src/utils/pactl.c:814
+#: ../src/utils/pactl.c:911
#, c-format
msgid "You have to specify a sample name to remove\n"
msgstr ""
-#: ../src/utils/pactl.c:822
+#: ../src/utils/pactl.c:919
#, c-format
msgid "You have to specify a sink input index and a sink\n"
msgstr ""
-#: ../src/utils/pactl.c:831
+#: ../src/utils/pactl.c:928
#, c-format
msgid "You have to specify a source output index and a source\n"
msgstr ""
-#: ../src/utils/pactl.c:845
+#: ../src/utils/pactl.c:942
#, c-format
msgid "You have to specify a module name and arguments.\n"
msgstr ""
-#: ../src/utils/pactl.c:865
+#: ../src/utils/pactl.c:962
#, c-format
msgid "You have to specify a module index\n"
msgstr ""
-#: ../src/utils/pactl.c:875
+#: ../src/utils/pactl.c:972
#, c-format
msgid ""
-"You may not specify more than one sink. You have to specify at least one "
-"boolean value.\n"
+"You may not specify more than one sink. You have to specify a boolean "
+"value.\n"
msgstr ""
-#: ../src/utils/pactl.c:888
+#: ../src/utils/pactl.c:985
#, c-format
msgid ""
-"You may not specify more than one source. You have to specify at least one "
-"boolean value.\n"
+"You may not specify more than one source. You have to specify a boolean "
+"value.\n"
msgstr ""
-#: ../src/utils/pactl.c:904
+#: ../src/utils/pactl.c:997
+#, c-format
+msgid "You have to specify a card name/index and a profile name\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:1012
#, c-format
msgid "No valid command specified.\n"
msgstr ""
@@ -1747,17 +1956,17 @@ msgstr ""
msgid "Daemon not responding."
msgstr "ਡੈਮਨ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੀ।"
-#: ../src/utils/pacmd.c:112
+#: ../src/utils/pacmd.c:144
#, c-format
msgid "select(): %s"
msgstr "select(): %s"
-#: ../src/utils/pacmd.c:124 ../src/utils/pacmd.c:140
+#: ../src/utils/pacmd.c:154 ../src/utils/pacmd.c:171
#, c-format
msgid "read(): %s"
msgstr "read(): %s"
-#: ../src/utils/pacmd.c:153 ../src/utils/pacmd.c:167
+#: ../src/utils/pacmd.c:187 ../src/utils/pacmd.c:201
#, c-format
msgid "write(): %s"
msgstr "write(): %s"
@@ -1831,3 +2040,11 @@ msgstr ""
msgid "Cannot access autospawn lock."
msgstr ""
+#~ msgid "pa_stream_drop() failed: %s\n"
+#~ msgstr "pa_stream_drop() ਫੇਲà©à¨¹ ਹੈ: %s\n"
+
+#~ msgid "muted"
+#~ msgstr "ਚà©à©±à¨ª"
+
+#~ msgid "source"
+#~ msgstr "ਸਰੋਤ"
diff --git a/po/pl.po b/po/pl.po
index 5cb0744..492b1e8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2009-03-05 16:17+0100\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag at gmail.com>\n"
"Language-Team: Polish <pl at li.org>\n"
@@ -93,11 +93,11 @@ msgstr ""
"Prawdopodobnie jest to błąd sterownika ALSA \"%s\". Proszę zgłosić ten "
"problem programistom ALSA."
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
msgid "Internal Audio"
msgstr "Wewnętrzny dźwięk"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr "Modem"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6bb158c..5be2094 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2008-11-21 01:21-0300\n"
"Last-Translator: Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org>\n"
"Language-Team: Brazilian-Portuguese <fedora-trans-pt_br at redhat.com>\n"
@@ -89,12 +89,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "Erro interno"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 2e3d17e..c51bdf6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2008-09-05 18:24+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -86,12 +86,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "Internt fel"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cbf4eaf..71f21cb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PulseAudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 12:27+0100\n"
+"POT-Creation-Date: 2009-03-19 17:58+0100\n"
"PO-Revision-Date: 2009-01-24 12:47+0800\n"
"Last-Translator: 王泽国 <zak.zeguo.wang at gmail.com>\n"
"Language-Team: Chinese/Simplified\n"
@@ -88,12 +88,12 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/pulsecore/sink.c:1963
+#: ../src/pulsecore/sink.c:1965
#, fuzzy
msgid "Internal Audio"
msgstr "内部错误"
-#: ../src/pulsecore/sink.c:1969
+#: ../src/pulsecore/sink.c:1971
msgid "Modem"
msgstr ""
commit dd4000671808df746a3fd29090aad8cf939cf512
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Mar 19 18:05:26 2009 +0100
document things that need to be fixed with FIXME
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 912697e..ccc8bee 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -114,6 +114,8 @@ void pa_bluetooth_device_free(pa_bluetooth_device *d) {
static pa_bool_t device_is_loaded(pa_bluetooth_device *d) {
pa_assert(d);
+ /* FIXME: e83621724d7939b97b4f01f0d7e965d61ef8e55e, f1daa282f030e4e2381341e0f65faca47c4b891b is borked, probably needs to be reversed */
+
return d->device_info_valid && (d->audio_sink_info_valid || d->headset_info_valid);
}
@@ -123,6 +125,8 @@ static pa_bool_t device_is_audio(pa_bluetooth_device *d) {
pa_assert(d->device_info_valid);
pa_assert(d->audio_sink_info_valid || d->headset_info_valid);
+ /* FIXME: e83621724d7939b97b4f01f0d7e965d61ef8e55e, f1daa282f030e4e2381341e0f65faca47c4b891b is borked, probably needs to be reversed */
+
return d->device_info_valid > 0 &&
(d->audio_sink_info_valid > 0 || d->headset_info_valid > 0);
}
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 1b61a6f..8d066a9 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -876,7 +876,7 @@ static int hsp_process_render(struct userdata *u) {
pa_assert(l != 0);
if (l < 0) {
- if (errno == EINTR || errno == EAGAIN)
+ if (errno == EINTR || errno == EAGAIN) /*** FIXME: EAGAIN handling borked ***/
continue;
else {
pa_log_error("Failed to write data to SCO socket: %s", pa_cstrerror(errno));
@@ -921,7 +921,7 @@ static int hsp_process_push(struct userdata *u) {
pa_memblock_release(memchunk.memblock);
if (l <= 0) {
- if (l < 0 && (errno == EINTR || errno == EAGAIN))
+ if (l < 0 && (errno == EINTR || errno == EAGAIN)) /*** FIXME: EAGAIN handling borked ***/
continue;
else {
pa_log_error("Failed to read data from SCO socket: %s", l < 0 ? pa_cstrerror(errno) : "EOF");
@@ -1045,7 +1045,7 @@ static int a2dp_process_render(struct userdata *u) {
pa_assert(l != 0);
if (l < 0) {
- if (errno == EINTR || errno == EAGAIN)
+ if (errno == EINTR || errno == EAGAIN) /*** FIXME: EAGAIN handling borked ***/
continue;
else {
pa_log_error("Failed to write data to socket: %s", pa_cstrerror(errno));
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list