[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-150-gfa93cb7
Lennart Poettering
gitmailer-noreply at 0pointer.de
Sun Oct 5 18:44:22 PDT 2008
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 branch has been updated
from be667af03f37205faacc9a5ecd19928f9d2201f5 (commit)
- Log -----------------------------------------------------------------
fa93cb7... make distcheck pass
e26ffc9... Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
f64d6af... Merge commit 'vudentz/master'
fef63d7... Fix loading module-bluetooth-device with an invalid parameter.
0c998b0... Replace handlers of deprecated Connected signals with new PropertyChanged.
b205fcc... Cleanup module-bluetooth-discover.
20f68bc... Fix Connected signal handler.
04677cb... Fix match rule problems.
0be845f... Remove PropertyChanged signal handler.
3b427b7... Add signal handlers for Connected signals.
443ea47... Add match rules for org.bluez.Headset and org.bluez.AudioSink.
-----------------------------------------------------------------------
Summary of changes:
po/POTFILES.in | 4 +-
po/de.po | 356 +++++++-----
po/el.po | 138 +++--
po/fr.po | 175 ++++---
po/sv.po | 357 ++++++-----
src/Makefile.am | 2 +-
src/modules/bluetooth/module-bluetooth-device.c | 9 +-
src/modules/bluetooth/module-bluetooth-discover.c | 624 ++++----------------
src/modules/bluetooth/module-bluetooth-proximity.c | 2 +-
9 files changed, 700 insertions(+), 967 deletions(-)
-----------------------------------------------------------------------
commit 443ea47ee07f990616f3a367842b16aa739c6283
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Wed Oct 1 11:29:50 2008 -0300
Add match rules for org.bluez.Headset and org.bluez.AudioSink.
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 1494431..cb5ee35 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -918,6 +918,18 @@ int pa__init(pa_module* m) {
goto fail;
}
+ dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset,member='Connected''", &err);
+ if (dbus_error_is_set(&err)) {
+ pa_log_error("Unable to subscribe to org.bluez.Headset signals: %s: %s", err.name, err.message);
+ goto fail;
+ }
+
+ dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink,member='Connected''", &err);
+ if (dbus_error_is_set(&err)) {
+ pa_log_error("Unable to subscribe to org.bluez.AudioSink signals: %s: %s", err.name, err.message);
+ goto fail;
+ }
+
return 0;
fail:
commit 3b427b7014ffe8d449a3a1336e483b4f949c9417
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Wed Oct 1 11:35:51 2008 -0300
Add signal handlers for Connected signals.
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index cb5ee35..ae414a7 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -843,6 +843,18 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
load_module_for_device(u, d);
}
}
+
+ } else if (dbus_message_is_signal(msg, "org.bluez.Headset", "Connected") ||
+ dbus_message_is_signal(msg, "org.bluez.AudioSink", "Connected")) {
+
+ if (!dbus_message_iter_init(msg, &arg_i))
+ pa_log("dbus: message has no parameters");
+ else {
+ struct device *d;
+
+ if ((d = device_find(u, dbus_message_get_path(msg))))
+ load_module_for_device(u, d);
+ }
}
dbus_error_free(&err);
commit 0be845f3a94aaf271583629d395d298589def3fd
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Wed Oct 1 11:37:00 2008 -0300
Remove PropertyChanged signal handler.
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index ae414a7..9c61ed2 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -828,22 +828,6 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
}
}
- } else if (dbus_message_is_signal(msg, "org.bluez.Device", "PropertyChanged")) {
-
- if (!dbus_message_iter_init(msg, &arg_i))
- pa_log("dbus: message has no parameters");
- else {
- struct device *d;
-
- if ((d = device_find(u, dbus_message_get_path(msg)))) {
- parse_device_property(u, d, &arg_i);
-
- /* Hmm, something changed, let's try to reconnect if we
- * aren't connected yet */
- load_module_for_device(u, d);
- }
- }
-
} else if (dbus_message_is_signal(msg, "org.bluez.Headset", "Connected") ||
dbus_message_is_signal(msg, "org.bluez.AudioSink", "Connected")) {
commit 04677cb9259126ae3f63878963583b7af34daf69
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Wed Oct 1 12:04:55 2008 -0300
Fix match rule problems.
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 9c61ed2..90c50da 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -914,13 +914,13 @@ int pa__init(pa_module* m) {
goto fail;
}
- dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset,member='Connected''", &err);
+ dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset',member='Connected'", &err);
if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.Headset signals: %s: %s", err.name, err.message);
goto fail;
}
- dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink,member='Connected''", &err);
+ dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='Connected'", &err);
if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.AudioSink signals: %s: %s", err.name, err.message);
goto fail;
commit 20f68bcc461fd20926f8339c97217720f94d57df
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Wed Oct 1 12:16:16 2008 -0300
Fix Connected signal handler.
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 90c50da..985a1d2 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -831,14 +831,10 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
} else if (dbus_message_is_signal(msg, "org.bluez.Headset", "Connected") ||
dbus_message_is_signal(msg, "org.bluez.AudioSink", "Connected")) {
- if (!dbus_message_iter_init(msg, &arg_i))
- pa_log("dbus: message has no parameters");
- else {
- struct device *d;
+ struct device *d;
- if ((d = device_find(u, dbus_message_get_path(msg))))
+ if ((d = device_find(u, dbus_message_get_path(msg))))
load_module_for_device(u, d);
- }
}
dbus_error_free(&err);
commit b205fcc17c9958ece69d0038ad282a109c201686
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Wed Oct 1 20:15:09 2008 -0300
Cleanup module-bluetooth-discover.
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 395d54f..bf9bad6 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -497,13 +497,6 @@ static int bt_getstreamfd(struct userdata *u) {
return -errno;
}
- if (u->transport == BT_CAPABILITIES_TRANSPORT_A2DP) {
- if (pa_socket_set_sndbuf(u->stream_fd, 10U*u->link_mtu) < 0) {
- pa_log_error("Failed to set socket options for A2DP: %s (%d)",pa_cstrerror(errno), errno);
- return -errno;
- }
- }
-
// if (setsockopt(u->stream_fd, SOL_SCO, SCO_TXBUFS, &period_count, sizeof(period_count)) == 0)
// return 0;
// if (setsockopt(u->stream_fd, SOL_SCO, SO_SNDBUF, &period_count, sizeof(period_count)) == 0)
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 985a1d2..88d4eef 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -42,10 +42,11 @@ PA_MODULE_DESCRIPTION("Detect available bluetooth audio devices and load bluetoo
PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE("");
-#define HSP_HS_UUID "00001108-0000-1000-8000-00805F9B34FB"
-#define HFP_HS_UUID "0000111E-0000-1000-8000-00805F9B34FB"
-#define A2DP_SOURCE_UUID "0000110A-0000-1000-8000-00805F9B34FB"
-#define A2DP_SINK_UUID "0000110B-0000-1000-8000-00805F9B34FB"
+struct module {
+ char *profile;
+ pa_module *pa_m;
+ PA_LLIST_FIELDS(struct module);
+};
struct uuid {
char *uuid;
@@ -56,33 +57,40 @@ struct device {
char *name;
char *object_path;
int paired;
- struct adapter *adapter;
char *alias;
int connected;
PA_LLIST_HEAD(struct uuid, uuid_list);
char *address;
int class;
int trusted;
- const char *audio_profile;
- uint32_t module_index;
+ PA_LLIST_HEAD(struct module, module_list);
PA_LLIST_FIELDS(struct device);
};
-struct adapter {
- char *object_path;
- char *name;
- char *mode;
- char *address;
- PA_LLIST_HEAD(struct device, device_list);
- PA_LLIST_FIELDS(struct adapter);
-};
-
struct userdata {
pa_module *module;
pa_dbus_connection *conn;
- PA_LLIST_HEAD(struct adapter, adapter_list);
+ PA_LLIST_HEAD(struct device, device_list);
};
+static struct module *module_new(const char *profile, pa_module *pa_m) {
+ struct module *m;
+
+ m = pa_xnew(struct module, 1);
+ m->profile = pa_xstrdup(profile);
+ m->pa_m = pa_m;
+ PA_LLIST_INIT(struct module, m);
+
+ return m;
+}
+
+static void module_free(struct module *m) {
+ pa_assert(m);
+
+ pa_xfree(m->profile);
+ pa_xfree(m);
+}
+
static struct uuid *uuid_new(const char *uuid) {
struct uuid *node;
@@ -100,32 +108,36 @@ static void uuid_free(struct uuid *uuid) {
pa_xfree(uuid);
}
-static struct device *device_new(struct adapter *adapter, const char *object_path) {
+static struct device *device_new(const char *object_path) {
struct device *node;
node = pa_xnew(struct device, 1);
node->name = NULL;
node->object_path = pa_xstrdup(object_path);
node->paired = -1;
- node->adapter = adapter;
node->alias = NULL;
node->connected = -1;
PA_LLIST_HEAD_INIT(struct uuid, node->uuid_list);
node->address = NULL;
node->class = -1;
node->trusted = -1;
- node->audio_profile = NULL;
- node->module_index = PA_INVALID_INDEX;
+ PA_LLIST_HEAD_INIT(struct module, node->module_list);
PA_LLIST_INIT(struct device, node);
return node;
}
static void device_free(struct device *device) {
+ struct module *m;
struct uuid *i;
pa_assert(device);
+ while ((m = device->module_list)) {
+ PA_LLIST_REMOVE(struct module, device->module_list, m);
+ module_free(m);
+ }
+
while ((i = device->uuid_list)) {
PA_LLIST_REMOVE(struct uuid, device->uuid_list, i);
uuid_free(i);
@@ -138,350 +150,16 @@ static void device_free(struct device *device) {
pa_xfree(device);
}
-static struct adapter *adapter_new(const char *object_path) {
- struct adapter *node;
-
- node = pa_xnew(struct adapter, 1);
- node->object_path = pa_xstrdup(object_path);
- node->mode = NULL;
- node->address = NULL;
- node->name = NULL;
-
- PA_LLIST_HEAD_INIT(struct device, node->device_list);
- PA_LLIST_INIT(struct adapter, node);
-
- return node;
-}
-
-static void adapter_free(struct adapter *adapter) {
+static struct device* device_find(struct userdata *u, const char *path) {
struct device *i;
- pa_assert(adapter);
-
- while ((i = adapter->device_list)) {
- PA_LLIST_REMOVE(struct device, adapter->device_list, i);
- device_free(i);
- }
-
- pa_xfree(adapter->object_path);
- pa_xfree(adapter->mode);
- pa_xfree(adapter->address);
- pa_xfree(adapter->name);
- pa_xfree(adapter);
-}
-
-static struct adapter* adapter_find(struct userdata *u, const char *path) {
- struct adapter *i;
-
- for (i = u->adapter_list; i; i = i->next)
+ for (i = u->device_list; i; i = i->next)
if (pa_streq(i->object_path, path))
return i;
return NULL;
}
-static struct device* device_find(struct userdata *u, const char *path) {
- struct adapter *j;
- struct device *i;
-
- for (j = u->adapter_list; j; j = j->next)
- for (i = j->device_list; i; i = i->next)
- if (pa_streq(i->object_path, path))
- return i;
-
- return NULL;
-}
-
-static const char *yes_no_na(int b) {
- if (b < 0)
- return "n/a";
-
- return pa_yes_no(b);
-}
-
-static void print_devices(struct adapter *a) {
- struct device *i;
-
- pa_assert(a);
-
- for (i = a->device_list; i; i = i->next) {
- struct uuid *j;
-
- if (pa_streq(i->object_path, "/DEVICE_HEAD"))
- continue;
-
- pa_log_debug("\t[ %s ]\n"
- "\t\tName = %s\n"
- "\t\tPaired = %s\n"
- "\t\tAdapter = %s\n"
- "\t\tAlias = %s\n"
- "\t\tConnected = %s\n"
- "\t\tAudio = %s\n",
- i->object_path,
- pa_strnull(i->name),
- yes_no_na(i->paired),
- i->adapter->object_path,
- pa_strnull(i->alias),
- yes_no_na(i->connected),
- pa_strnull(i->audio_profile));
-
- pa_log_debug("\t\tUUIDs = ");
- for (j = i->uuid_list; j; j = j->next) {
-
- if (pa_streq(j->uuid, "UUID_HEAD"))
- continue;
-
- pa_log_debug("\t\t %s", j->uuid);
- }
-
- pa_log_debug("\t\tAddress = %s\n"
- "\t\tClass = 0x%x\n"
- "\t\tTrusted = %s",
- i->address,
- i->class,
- yes_no_na(i->trusted));
- }
-}
-
-static void print_adapters(struct userdata *u) {
- struct adapter *i;
-
- pa_assert(u);
-
- for (i = u->adapter_list; i; i = i->next) {
-
- if (pa_streq(i->object_path, "/ADAPTER_HEAD"))
- continue;
-
- pa_log_debug(
- "[ %s ]\n"
- "\tName = %s\n"
- "\tMode = %s\n"
- "\tAddress = %s\n",
- i->object_path,
- pa_strnull(i->name),
- pa_strnull(i->mode),
- pa_strnull(i->address));
-
- print_devices(i);
- }
-}
-
-static const char *strip_object_path(const char *op) {
- const char *slash;
-
- if ((slash = strrchr(op, '/')))
- return slash+1;
-
- return op;
-}
-
-static void load_module_for_device(struct userdata *u, struct device *d) {
- char *args;
- pa_module *m;
-
- pa_assert(u);
- pa_assert(d);
-
- /* Check whether we already loaded a module for this device */
- if (d->module_index != PA_INVALID_INDEX &&
- pa_idxset_get_by_index(u->module->core->modules, d->module_index))
- return;
-
- /* Check whether this is an audio device */
- if (!d->audio_profile) {
- pa_log_debug("Ignoring %s since it is not an audio device.", d->object_path);
- return;
- }
-
- args = pa_sprintf_malloc("sink_name=%s address=%s profile=%s", strip_object_path(d->object_path), d->address, d->audio_profile);
- m = pa_module_load(u->module->core, "module-bluetooth-device", args);
- pa_xfree(args);
-
- if (!m) {
- pa_log_debug("Failed to load module for device %s", d->object_path);
- return;
- }
-
- d->module_index = m->index;
-}
-
-static void load_modules(struct userdata *u) {
- struct device *d;
- struct adapter *a;
-
- pa_assert(u);
-
- for (a = u->adapter_list; a; a = a->next)
- for (d = a->device_list; d; d = d->next)
- load_module_for_device(u, d);
-}
-
-static int parse_adapter_property(struct userdata *u, struct adapter *a, DBusMessageIter *i) {
- const char *key;
- DBusMessageIter variant_i;
-
- pa_assert(u);
- pa_assert(a);
- pa_assert(i);
-
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING) {
- pa_log("Property name not a string.");
- return -1;
- }
-
- dbus_message_iter_get_basic(i, &key);
-
- if (!dbus_message_iter_next(i)) {
- pa_log("Property value missing");
- return -1;
- }
-
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_VARIANT) {
- pa_log("Property value not a variant.");
- return -1;
- }
-
- dbus_message_iter_recurse(i, &variant_i);
-
- if (dbus_message_iter_get_arg_type(&variant_i) == DBUS_TYPE_STRING) {
- const char *value;
- dbus_message_iter_get_basic(&variant_i, &value);
-
- if (pa_streq(key, "Mode")) {
- pa_xfree(a->mode);
- a->mode = pa_xstrdup(value);
- } else if (pa_streq(key, "Address")) {
- pa_xstrdup(a->address);
- a->address = pa_xstrdup(value);
- } else if (pa_streq(key, "Name")) {
- pa_xfree(a->name);
- a->name = pa_xstrdup(value);
- }
- }
-
- return 0;
-}
-
-static int get_adapter_properties(struct userdata *u, struct adapter *a) {
- DBusError e;
- DBusMessage *m = NULL, *r = NULL;
- DBusMessageIter arg_i, element_i;
- int ret = -1;
-
- pa_assert(u);
- pa_assert(a);
- dbus_error_init(&e);
-
- pa_assert_se(m = dbus_message_new_method_call("org.bluez", a->object_path, "org.bluez.Adapter", "GetProperties"));
-
- r = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(u->conn), m, -1, &e);
-
- if (!r) {
- pa_log("org.bluez.Adapter.GetProperties failed: %s", e.message);
- goto finish;
- }
-
- if (!dbus_message_iter_init(r, &arg_i)) {
- pa_log("org.bluez.Adapter.GetProperties reply has no arguments");
- goto finish;
- }
-
- if (dbus_message_iter_get_arg_type(&arg_i) != DBUS_TYPE_ARRAY) {
- pa_log("org.bluez.Adapter.GetProperties argument is not an array");
- goto finish;
- }
-
- dbus_message_iter_recurse(&arg_i, &element_i);
- while (dbus_message_iter_get_arg_type(&element_i) != DBUS_TYPE_INVALID) {
-
- if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter dict_i;
-
- dbus_message_iter_recurse(&element_i, &dict_i);
-
- if (parse_adapter_property(u, a, &dict_i) < 0)
- goto finish;
- }
-
- if (!dbus_message_iter_next(&element_i))
- break;
- }
-
- ret = 0;
-
-finish:
- if (m)
- dbus_message_unref(m);
- if (r)
- dbus_message_unref(r);
-
- dbus_error_free(&e);
-
- return ret;
-}
-
-static int detect_adapters(struct userdata *u) {
- DBusError e;
- DBusMessage *m = NULL, *r = NULL;
- DBusMessageIter arg_i, element_i;
- struct adapter *adapter_list_i;
- int ret = -1;
-
- pa_assert(u);
- dbus_error_init(&e);
-
- /* get adapters */
- pa_assert_se(m = dbus_message_new_method_call("org.bluez", "/", "org.bluez.Manager", "ListAdapters"));
- r = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(u->conn), m, -1, &e);
-
- if (!r) {
- pa_log("org.bluez.Manager.ListAdapters failed: %s", e.message);
- goto finish;
- }
-
- if (!dbus_message_iter_init(r, &arg_i)) {
- pa_log("org.bluez.Manager.ListAdapters reply has no arguments");
- goto finish;
- }
-
- if (dbus_message_iter_get_arg_type(&arg_i) != DBUS_TYPE_ARRAY) {
- pa_log("org.bluez.Manager.ListAdapters argument is not an array");
- goto finish;
- }
-
- dbus_message_iter_recurse(&arg_i, &element_i);
- while (dbus_message_iter_get_arg_type(&element_i) != DBUS_TYPE_INVALID) {
- if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_OBJECT_PATH) {
-
- struct adapter *node;
- const char *value;
-
- dbus_message_iter_get_basic(&element_i, &value);
- node = adapter_new(value);
- PA_LLIST_PREPEND(struct adapter, u->adapter_list, node);
- }
-
- if (!dbus_message_iter_next(&element_i))
- break;
- }
-
- ret = 0;
-
- /* get adapter properties */
- for (adapter_list_i = u->adapter_list; adapter_list_i; adapter_list_i = adapter_list_i->next)
- get_adapter_properties(u, adapter_list_i);
-
-finish:
- if (m)
- dbus_message_unref(m);
- if (r)
- dbus_message_unref(r);
-
- dbus_error_free(&e);
- return ret;
-}
-
static int parse_device_property(struct userdata *u, struct device *d, DBusMessageIter *i) {
const char *key;
DBusMessageIter variant_i;
@@ -566,8 +244,6 @@ static int parse_device_property(struct userdata *u, struct device *d, DBusMessa
if (dbus_message_iter_get_arg_type(&ai) == DBUS_TYPE_STRING &&
pa_streq(key, "UUIDs")) {
- d->audio_profile = NULL;
-
while (dbus_message_iter_get_arg_type(&ai) != DBUS_TYPE_INVALID) {
struct uuid *node;
const char *value;
@@ -576,14 +252,6 @@ static int parse_device_property(struct userdata *u, struct device *d, DBusMessa
node = uuid_new(value);
PA_LLIST_PREPEND(struct uuid, d->uuid_list, node);
- if ((strcasecmp(value, A2DP_SOURCE_UUID) == 0) ||
- (strcasecmp(value, A2DP_SINK_UUID) == 0))
- d->audio_profile = "a2dp";
- else if (((strcasecmp(value, HSP_HS_UUID) == 0) ||
- (strcasecmp(value, HFP_HS_UUID) == 0)) &&
- !d->audio_profile)
- d->audio_profile = "hsp";
-
if (!dbus_message_iter_next(&ai))
break;
}
@@ -655,70 +323,26 @@ finish:
return ret;
}
-static int detect_devices(struct userdata *u) {
- DBusError e;
- DBusMessage *m = NULL, *r = NULL;
- DBusMessageIter arg_i, element_i;
- struct adapter *adapter_list_i;
- struct device *device_list_i;
- const char *value;
- int ret = -1;
+static void load_module_for_device(struct userdata *u, struct device *d, const char *profile) {
+ char *args;
+ pa_module *pa_m;
+ struct module *m;
pa_assert(u);
- dbus_error_init(&e);
-
- /* get devices of each adapter */
- for (adapter_list_i = u->adapter_list; adapter_list_i; adapter_list_i = adapter_list_i->next) {
-
- pa_assert_se(m = dbus_message_new_method_call("org.bluez", adapter_list_i->object_path, "org.bluez.Adapter", "ListDevices"));
-
- r = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(u->conn), m, -1, &e);
-
- if (!r) {
- pa_log("org.bluez.Adapter.ListDevices failed: %s", e.message);
- goto finish;
- }
-
- if (!dbus_message_iter_init(r, &arg_i)) {
- pa_log("org.bluez.Adapter.ListDevices reply has no arguments");
- goto finish;
- }
-
- if (dbus_message_iter_get_arg_type(&arg_i) != DBUS_TYPE_ARRAY) {
- pa_log("org.bluez.Adapter.ListDevices argument is not an array");
- goto finish;
- }
+ pa_assert(d);
- dbus_message_iter_recurse(&arg_i, &element_i);
- while (dbus_message_iter_get_arg_type(&element_i) != DBUS_TYPE_INVALID) {
- if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_OBJECT_PATH) {
- struct device *node;
- dbus_message_iter_get_basic(&element_i, &value);
- node = device_new(adapter_list_i, value);
- PA_LLIST_PREPEND(struct device, adapter_list_i->device_list, node);
- }
+ get_device_properties(u, d);
+ args = pa_sprintf_malloc("sink_name=%s address=%s profile=%s", d->name, d->address, profile);
+ pa_m = pa_module_load(u->module->core, "module-bluetooth-device", args);
+ pa_xfree(args);
- if (!dbus_message_iter_next(&element_i))
- break;
- }
+ if (!m) {
+ pa_log_debug("Failed to load module for device %s", d->object_path);
+ return;
}
- /* get device properties */
- for (adapter_list_i = u->adapter_list; adapter_list_i; adapter_list_i = adapter_list_i->next)
- for (device_list_i = adapter_list_i->device_list; device_list_i; device_list_i = device_list_i->next)
- get_device_properties(u, device_list_i);
-
- ret = 0;
-
-finish:
- if (m)
- dbus_message_unref(m);
- if (r)
- dbus_message_unref(r);
-
- dbus_error_free(&e);
-
- return ret;
+ m = module_new(profile, pa_m);
+ PA_LLIST_PREPEND(struct module, d->module_list, m);
}
static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *userdata) {
@@ -739,78 +363,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
dbus_message_get_path(msg),
dbus_message_get_member(msg));
- if (dbus_message_is_signal(msg, "org.bluez.Manager", "AdapterAdded")) {
-
- if (!dbus_message_iter_init(msg, &arg_i))
- pa_log("dbus: message has no parameters");
- else if (dbus_message_iter_get_arg_type(&arg_i) != DBUS_TYPE_OBJECT_PATH)
- pa_log("dbus: argument is not object path");
- else {
- struct adapter *node;
-
- dbus_message_iter_get_basic(&arg_i, &value);
- pa_log_debug("hcid: adapter %s added", value);
-
- node = adapter_new(value);
- PA_LLIST_PREPEND(struct adapter, u->adapter_list, node);
-
- get_adapter_properties(u, node);
- }
-
- } else if (dbus_message_is_signal(msg, "org.bluez.Manager", "AdapterRemoved")) {
- if (!dbus_message_iter_init(msg, &arg_i))
- pa_log("dbus: message has no parameters");
- else if (dbus_message_iter_get_arg_type(&arg_i) != DBUS_TYPE_OBJECT_PATH)
- pa_log("dbus: argument is not object path");
- else {
- struct adapter *a;
-
- dbus_message_iter_get_basic(&arg_i, &value);
- pa_log_debug("hcid: adapter %s removed", value);
-
- if ((a = adapter_find(u, value))) {
- PA_LLIST_REMOVE(struct adapter, u->adapter_list, a);
- adapter_free(a);
- }
- }
-
- } else if (dbus_message_is_signal(msg, "org.bluez.Adapter", "PropertyChanged")) {
-
- if (!dbus_message_iter_init(msg, &arg_i))
- pa_log("dbus: message has no parameters");
- else {
- struct adapter *a;
-
- if ((a = adapter_find(u, dbus_message_get_path(msg))))
- parse_adapter_property(u, a, &arg_i);
- }
-
- } else if (dbus_message_is_signal(msg, "org.bluez.Adapter", "DeviceCreated")) {
-
- if (!dbus_message_iter_init(msg, &arg_i))
- pa_log("dbus: message has no parameters");
- else if (dbus_message_iter_get_arg_type(&arg_i) != DBUS_TYPE_OBJECT_PATH)
- pa_log("dbus: argument is not object path");
- else {
- struct adapter *adapter;
-
- if (!(adapter = adapter_find(u, dbus_message_get_path(msg))))
- pa_log("dbus: failed to find adapter for object path");
- else {
- struct device *node;
-
- dbus_message_iter_get_basic(&arg_i, &value);
- pa_log_debug("hcid: device %s created", value);
-
- node = device_new(adapter, value);
- PA_LLIST_PREPEND(struct device, adapter->device_list, node);
-
- get_device_properties(u, node);
- load_module_for_device(u, node);
- }
- }
-
- } else if (dbus_message_is_signal(msg, "org.bluez.Adapter", "DeviceRemoved")) {
+ if (dbus_message_is_signal(msg, "org.bluez.Adapter", "DeviceRemoved")) {
if (!dbus_message_iter_init(msg, &arg_i))
pa_log("dbus: message has no parameters");
@@ -823,7 +376,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
pa_log_debug("hcid: device %s removed", value);
if ((d = device_find(u, value))) {
- PA_LLIST_REMOVE(struct device, d->adapter->device_list, d);
+ PA_LLIST_REMOVE(struct device, u->device_list, d);
device_free(d);
}
}
@@ -832,9 +385,19 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
dbus_message_is_signal(msg, "org.bluez.AudioSink", "Connected")) {
struct device *d;
+ const char *profile;
+
+ if (!(d = device_find(u, dbus_message_get_path(msg)))) {
+ d = device_new(dbus_message_get_path(msg));
+ PA_LLIST_PREPEND(struct device, u->device_list, d);
+ }
+
+ if (dbus_message_is_signal(msg, "org.bluez.Headset", "Connected"))
+ profile = "hsp";
+ else
+ profile = "a2dp";
- if ((d = device_find(u, dbus_message_get_path(msg))))
- load_module_for_device(u, d);
+ load_module_for_device(u, d, profile);
}
dbus_error_free(&err);
@@ -843,16 +406,16 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
void pa__done(pa_module* m) {
struct userdata *u;
- struct adapter *i;
+ struct device *i;
pa_assert(m);
if (!(u = m->userdata))
return;
- while ((i = u->adapter_list)) {
- PA_LLIST_REMOVE(struct adapter, u->adapter_list, i);
- adapter_free(i);
+ while ((i = u->device_list)) {
+ PA_LLIST_REMOVE(struct device, u->device_list, i);
+ device_free(i);
}
if (u->conn)
@@ -870,7 +433,7 @@ int pa__init(pa_module* m) {
m->userdata = u = pa_xnew(struct userdata, 1);
u->module = m;
- PA_LLIST_HEAD_INIT(struct adapter, u->adapter_list);
+ PA_LLIST_HEAD_INIT(struct device, u->device_list);
/* connect to the bus */
u->conn = pa_dbus_bus_get(m->core, DBUS_BUS_SYSTEM, &err);
@@ -879,37 +442,18 @@ int pa__init(pa_module* m) {
goto fail;
}
- /* static detection of bluetooth audio devices */
- detect_adapters(u);
- detect_devices(u);
-
- print_adapters(u);
- load_modules(u);
-
/* dynamic detection of bluetooth audio devices */
if (!dbus_connection_add_filter(pa_dbus_connection_get(u->conn), filter_cb, u, NULL)) {
pa_log_error("Failed to add filter function");
goto fail;
}
- dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Manager'", &err);
- if (dbus_error_is_set(&err)) {
- pa_log_error("Unable to subscribe to org.bluez.Manager signals: %s: %s", err.name, err.message);
- goto fail;
- }
-
- dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Adapter'", &err);
+ dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Adapter',member='DeviceRemoved'", &err);
if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.Adapter signals: %s: %s", err.name, err.message);
goto fail;
}
- dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Device'", &err);
- if (dbus_error_is_set(&err)) {
- pa_log_error("Unable to subscribe to org.bluez.Device signals: %s: %s", err.name, err.message);
- goto fail;
- }
-
dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset',member='Connected'", &err);
if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.Headset signals: %s: %s", err.name, err.message);
commit 0c998b089111ef1f1d9cc73dc0b05e22d049b4c7
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Fri Oct 3 12:15:26 2008 -0300
Replace handlers of deprecated Connected signals with new PropertyChanged.
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 88d4eef..dbbcb13 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -381,18 +381,51 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
}
}
- } else if (dbus_message_is_signal(msg, "org.bluez.Headset", "Connected") ||
- dbus_message_is_signal(msg, "org.bluez.AudioSink", "Connected")) {
+ } else if (dbus_message_is_signal(msg, "org.bluez.Headset", "PropertyChanged") ||
+ dbus_message_is_signal(msg, "org.bluez.AudioSink", "PropertyChanged")) {
struct device *d;
const char *profile;
+ DBusMessageIter variant_i;
+
+ if (!dbus_message_iter_init(msg, &arg_i)) {
+ pa_log("dbus: message has no parameters");
+ goto done;
+ }
+
+ if (dbus_message_iter_get_arg_type(&arg_i) != DBUS_TYPE_STRING) {
+ pa_log("Property name not a string.");
+ goto done;
+ }
+
+ dbus_message_iter_get_basic(&arg_i, &value);
+
+ if (!dbus_message_iter_next(&arg_i)) {
+ pa_log("Property value missing");
+ goto done;
+ }
+
+ if (dbus_message_iter_get_arg_type(&arg_i) != DBUS_TYPE_VARIANT) {
+ pa_log("Property value not a variant.");
+ goto done;
+ }
+
+ dbus_message_iter_recurse(&arg_i, &variant_i);
+
+ if (dbus_message_iter_get_arg_type(&variant_i) == DBUS_TYPE_BOOLEAN) {
+ dbus_bool_t connected;
+ dbus_message_iter_get_basic(&variant_i, &connected);
+
+ if (!pa_streq(value, "Connected") || !connected)
+ goto done;
+ }
if (!(d = device_find(u, dbus_message_get_path(msg)))) {
d = device_new(dbus_message_get_path(msg));
PA_LLIST_PREPEND(struct device, u->device_list, d);
}
- if (dbus_message_is_signal(msg, "org.bluez.Headset", "Connected"))
+ if (dbus_message_is_signal(msg, "org.bluez.Headset", "PropertyChanged"))
profile = "hsp";
else
profile = "a2dp";
@@ -400,6 +433,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *msg, void *
load_module_for_device(u, d, profile);
}
+done:
dbus_error_free(&err);
return DBUS_HANDLER_RESULT_HANDLED;
}
@@ -454,13 +488,13 @@ int pa__init(pa_module* m) {
goto fail;
}
- dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset',member='Connected'", &err);
+ dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset',member='PropertyChanged'", &err);
if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.Headset signals: %s: %s", err.name, err.message);
goto fail;
}
- dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='Connected'", &err);
+ dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='PropertyChanged'", &err);
if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.AudioSink signals: %s: %s", err.name, err.message);
goto fail;
commit fef63d77b4eed2562e94735399716cb99d8b22cc
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Fri Oct 3 18:04:53 2008 -0300
Fix loading module-bluetooth-device with an invalid parameter.
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index dbbcb13..03abf26 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -332,7 +332,7 @@ static void load_module_for_device(struct userdata *u, struct device *d, const c
pa_assert(d);
get_device_properties(u, d);
- args = pa_sprintf_malloc("sink_name=%s address=%s profile=%s", d->name, d->address, profile);
+ args = pa_sprintf_malloc("sink_name=\"%s\" address=\"%s\" profile=\"%s\"", d->name, d->address, profile);
pa_m = pa_module_load(u->module->core, "module-bluetooth-device", args);
pa_xfree(args);
commit f64d6af0b70a85e2a825023956c893cc886b0042
Merge: aa43739... fef63d7...
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Oct 6 02:28:17 2008 +0200
Merge commit 'vudentz/master'
commit e26ffc9b507b6bee831a54d93bbd5cc18a4e2ae0
Merge: f64d6af... be667af...
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Oct 6 02:39:36 2008 +0200
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
commit fa93cb71e83df6ee9e91d04687829a049ea18ec5
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Oct 6 03:35:46 2008 +0200
make distcheck pass
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6efb1d0..c20340e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,7 +17,7 @@ src/modules/module-solaris.c
src/modules/module-default-device-restore.c
src/modules/module-x11-xsmp.c
src/modules/module-remap-sink.c
-src/modules/module-bt-proximity.c
+src/modules/bluetooth/module-bluetooth-proximity.c
src/modules/module-detect.c
src/modules/module-always-sink.c
src/modules/module-lirc.c
@@ -39,7 +39,7 @@ src/modules/module-esound-compat-spawnfd.c
src/modules/module-esound-compat-spawnpid.c
#src/modules/module-waveout.c
src/modules/module-combine.c
-src/modules/bt-proximity-helper.c
+src/modules/bluetooth/proximity-helper.c
src/modules/module-x11-publish.c
src/modules/rtp/module-rtp-recv.c
src/modules/rtp/sdp.c
diff --git a/po/de.po b/po/de.po
index 0a80206..9643d04 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-29 11:33+0000\n"
+"POT-Creation-Date: 2008-10-06 03:21+0200\n"
"PO-Revision-Date: 2008-08-31 12:22+0100\n"
"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
"Language-Team: German <fedora-trans-de at redhat.com>\n"
@@ -17,8 +17,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: German\n"
-#: ../src/daemon/ltdl-bind-now.c:177
-#: ../src/daemon/ltdl-bind-now.c:197
+#: ../src/daemon/ltdl-bind-now.c:177 ../src/daemon/ltdl-bind-now.c:197
msgid "Failed to add bind-now-loader."
msgstr "Hinzufügen von bind-now-loader fehlgeschlagen."
@@ -114,8 +113,7 @@ msgstr ""
msgid "Home directory of user '%s' is not '%s', ignoring."
msgstr "Benutzerverzeichnis von Benutzer '%s' ist nicht '%s', ignoriere."
-#: ../src/daemon/main.c:201
-#: ../src/daemon/main.c:206
+#: ../src/daemon/main.c:201 ../src/daemon/main.c:206
#, c-format
msgid "Failed to create '%s': %s"
msgstr "Erzeugen von '%s' fehlgeschlagen: %s"
@@ -180,22 +178,14 @@ msgstr ""
#: ../src/daemon/main.c:479
msgid ""
-"Called SUID root and real-time/high-priority scheduling was requested in the configuration. However, we lack the necessary priviliges:\n"
+"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 '"
msgstr ""
-#: ../src/daemon/main.c:480
-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."
-msgstr ""
-
#: ../src/daemon/main.c:497
-msgid "High-priority scheduling enabled in configuration but not allowed by policy."
+msgid ""
+"High-priority scheduling enabled in configuration but not allowed by policy."
msgstr ""
#: ../src/daemon/main.c:522
@@ -212,7 +202,8 @@ msgid "Giving up CAP_NICE"
msgstr ""
#: ../src/daemon/main.c:539
-msgid "Real-time scheduling enabled in configuration but not allowed by policy."
+msgid ""
+"Real-time scheduling enabled in configuration but not allowed by policy."
msgstr ""
#: ../src/daemon/main.c:597
@@ -230,7 +221,9 @@ msgid "Failed to kill daemon: %s"
msgstr ""
#: ../src/daemon/main.c:627
-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 ""
#: ../src/daemon/main.c:629
@@ -291,71 +284,109 @@ msgstr "Dies ist PulseAudio %s"
#: ../src/daemon/main.c:781
#, c-format
+msgid "Compilation host: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:782
+#, c-format
+msgid "Compilation CFLAGS: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:785
+#, c-format
+msgid "Running on host: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:788
+#, c-format
msgid "Page size is %lu bytes"
msgstr "Seitengröße ist %lu Bytes."
-#: ../src/daemon/main.c:784
+#: ../src/daemon/main.c:791
+msgid "Compiled with Valgrind support: yes"
+msgstr ""
+
+#: ../src/daemon/main.c:793
+msgid "Compiled with Valgrind support: no"
+msgstr ""
+
+#: ../src/daemon/main.c:796
+#, c-format
+msgid "Running in valgrind mode: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:799
+msgid "Optimized build: yes"
+msgstr ""
+
+#: ../src/daemon/main.c:801
+msgid "Optimized build: no"
+msgstr ""
+
+#: ../src/daemon/main.c:805
msgid "Failed to get machine ID"
msgstr ""
-#: ../src/daemon/main.c:787
+#: ../src/daemon/main.c:808
#, c-format
msgid "Machine ID is %s."
msgstr "System- ID ist %s."
-#: ../src/daemon/main.c:792
+#: ../src/daemon/main.c:813
#, c-format
msgid "Using runtime directory %s."
msgstr ""
-#: ../src/daemon/main.c:797
+#: ../src/daemon/main.c:818
#, c-format
msgid "Using state directory %s."
msgstr ""
-#: ../src/daemon/main.c:800
+#: ../src/daemon/main.c:821
#, c-format
msgid "Running in system mode: %s"
msgstr ""
-#: ../src/daemon/main.c:815
+#: ../src/daemon/main.c:836
msgid "pa_pid_file_create() failed."
msgstr "pa_pid_file_create() fehlgeschlagen."
-#: ../src/daemon/main.c:827
+#: ../src/daemon/main.c:848
msgid "Fresh high-resolution timers available! Bon appetit!"
msgstr ""
-#: ../src/daemon/main.c:829
-msgid "Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"
+#: ../src/daemon/main.c:850
+msgid ""
+"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
+"resolution timers enabled!"
msgstr ""
-#: ../src/daemon/main.c:839
+#: ../src/daemon/main.c:860
msgid "pa_core_new() failed."
msgstr "pa_core_new() fehlgeschlagen."
-#: ../src/daemon/main.c:899
+#: ../src/daemon/main.c:921
msgid "Failed to initialize daemon."
msgstr ""
-#: ../src/daemon/main.c:904
+#: ../src/daemon/main.c:926
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
-#: ../src/daemon/main.c:909
+#: ../src/daemon/main.c:931
#, c-format
msgid "Default sink name (%s) does not exist in name register."
msgstr ""
-#: ../src/daemon/main.c:922
+#: ../src/daemon/main.c:944
msgid "Daemon startup complete."
msgstr "Start des Dämons abgeschlossen."
-#: ../src/daemon/main.c:928
+#: ../src/daemon/main.c:950
msgid "Daemon shutdown initiated."
msgstr ""
-#: ../src/daemon/main.c:949
+#: ../src/daemon/main.c:971
msgid "Daemon terminated."
msgstr "Dämon beendet."
@@ -370,8 +401,10 @@ 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\n"
"\n"
@@ -380,24 +413,31 @@ msgid ""
" -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"
-" --module-idle-time=SECS Unload autoloaded modules when idle and\n"
+" --module-idle-time=SECS Unload autoloaded modules when idle "
+"and\n"
" this 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} Specify the log target\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"
@@ -408,10 +448,12 @@ 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"
@@ -426,7 +468,9 @@ msgid "--fail expects boolean argument"
msgstr ""
#: ../src/daemon/cmdline.c:262
-msgid "--log-level expects log level argument (either numeric in range 0..4 or one of 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 ""
#: ../src/daemon/cmdline.c:274
@@ -510,76 +554,76 @@ msgstr "Lade einmalig: %s\n"
msgid "Path: %s\n"
msgstr "Pfad: %s\n"
-#: ../src/daemon/daemon-conf.c:203
+#: ../src/daemon/daemon-conf.c:205
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:219
+#: ../src/daemon/daemon-conf.c:221
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:235
+#: ../src/daemon/daemon-conf.c:237
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:258
+#: ../src/daemon/daemon-conf.c:260
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:265
+#: ../src/daemon/daemon-conf.c:267
#, c-format
msgid "[%s:%u] rlimit not supported on this platform."
msgstr ""
-#: ../src/daemon/daemon-conf.c:281
+#: ../src/daemon/daemon-conf.c:283
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:299
+#: ../src/daemon/daemon-conf.c:301
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:317
+#: ../src/daemon/daemon-conf.c:319
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:335
+#: ../src/daemon/daemon-conf.c:337
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:353
+#: ../src/daemon/daemon-conf.c:355
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:371
+#: ../src/daemon/daemon-conf.c:373
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:564
+#: ../src/daemon/daemon-conf.c:570
#, c-format
msgid "Failed to open configuration file: %s"
msgstr ""
-#: ../src/daemon/daemon-conf.c:638
+#: ../src/daemon/daemon-conf.c:644
#, c-format
msgid "### Read from configuration file: %s ###\n"
msgstr ""
-#: ../src/daemon/caps.c:62
+#: ../src/daemon/caps.c:63
msgid "Dropping root priviliges."
msgstr "Verlasse Root-Berechtigungen."
-#: ../src/daemon/caps.c:102
+#: ../src/daemon/caps.c:103
msgid "Limited capabilities successfully to CAP_SYS_NICE."
msgstr ""
@@ -787,6 +831,12 @@ msgstr "Oben Hinten Links"
msgid "Top Rear Right"
msgstr "Oben Hinten Rechts"
+#: ../src/pulse/channelmap.c:472 ../src/pulse/sample.c:144
+#: ../src/pulse/volume.c:163 ../src/pulse/volume.c:194
+#, fuzzy
+msgid "(invalid)"
+msgstr "Ungültig"
+
#: ../src/pulse/error.c:43
msgid "OK"
msgstr "OK"
@@ -875,12 +925,7 @@ msgstr "Unbekannter Fehlercode"
msgid "No such extension"
msgstr "Erweiterung nicht vorhanden"
-#: ../src/pulse/sample.c:134
-msgid "Invalid"
-msgstr "Ungültig"
-
-#: ../src/pulse/client-conf-x11.c:55
-#: ../src/utils/pax11publish.c:100
+#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:100
msgid "XOpenDisplay() failed"
msgstr "XOpenDisplay() fehlgeschlagen"
@@ -888,31 +933,26 @@ msgstr "XOpenDisplay() fehlgeschlagen"
msgid "Failed to parse cookie data"
msgstr ""
-#: ../src/pulse/client-conf.c:117
+#: ../src/pulse/client-conf.c:120
#, c-format
msgid "Failed to open configuration file '%s': %s"
msgstr ""
-#: ../src/pulse/context.c:542
+#: ../src/pulse/context.c:516
msgid "No cookie loaded. Attempting to connect without."
msgstr ""
-#: ../src/pulse/context.c:596
-#, c-format
-msgid "socketpair(): %s"
-msgstr "socketpair(): %s"
-
-#: ../src/pulse/context.c:610
+#: ../src/pulse/context.c:642
#, c-format
msgid "fork(): %s"
msgstr "fork(): %s"
-#: ../src/pulse/context.c:673
+#: ../src/pulse/context.c:695
#, c-format
msgid "waitpid(): %s"
msgstr "waitpid(): %s"
-#: ../src/pulse/context.c:1354
+#: ../src/pulse/context.c:1256
#, c-format
msgid "Received message for unknown extension '%s'"
msgstr ""
@@ -1026,28 +1066,23 @@ msgstr "pa_stream_connect_playback() fehlgeschlagen: %s\n"
msgid "pa_stream_connect_record() failed: %s\n"
msgstr "pa_stream_connect_record() fehlgeschlagen: %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:307 ../src/utils/pasuspender.c:159
+#: ../src/utils/pactl.c:666 ../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:328 ../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:333 ../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:343 ../src/utils/paplay.c:92
#, c-format
msgid "Draining connection to server.\n"
msgstr ""
@@ -1105,27 +1140,44 @@ 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 (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 "
+"(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"
+" --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"
msgstr ""
#: ../src/utils/pacat.c:591
@@ -1189,10 +1241,8 @@ msgstr "dup2(): %s\n"
msgid "Too many arguments.\n"
msgstr "Zu viele Argumente.\n"
-#: ../src/utils/pacat.c:742
-#: ../src/utils/pasuspender.c:280
-#: ../src/utils/pactl.c:909
-#: ../src/utils/paplay.c:381
+#: ../src/utils/pacat.c:742 ../src/utils/pasuspender.c:280
+#: ../src/utils/pactl.c:909 ../src/utils/paplay.c:381
#, c-format
msgid "pa_mainloop_new() failed.\n"
msgstr "pa_mainloop_new() fehlgeschlagen.\n"
@@ -1202,23 +1252,24 @@ msgstr "pa_mainloop_new() fehlgeschlagen.\n"
msgid "io_new() failed.\n"
msgstr "io_new() fehlgeschlagen.\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:769 ../src/utils/pasuspender.c:293
+#: ../src/utils/pactl.c:923 ../src/utils/paplay.c:396
#, c-format
msgid "pa_context_new() failed.\n"
msgstr "pa_context_new() fehlgeschlagen.\n"
-#: ../src/utils/pacat.c:785
+#: ../src/utils/pacat.c:777
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s"
+msgstr "pa_context_new() fehlgeschlagen.\n"
+
+#: ../src/utils/pacat.c:788
#, c-format
msgid "time_new() failed.\n"
msgstr "time_new() fehlgeschlagen.\n"
-#: ../src/utils/pacat.c:792
-#: ../src/utils/pasuspender.c:301
-#: ../src/utils/pactl.c:931
-#: ../src/utils/paplay.c:407
+#: ../src/utils/pacat.c:795 ../src/utils/pasuspender.c:301
+#: ../src/utils/pactl.c:931 ../src/utils/paplay.c:407
#, c-format
msgid "pa_mainloop_run() failed.\n"
msgstr "pa_mainloop_run() fehlgeschlagen.\n"
@@ -1248,8 +1299,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:672
#: ../src/utils/paplay.c:191
#, c-format
msgid "Got SIGINT, exiting.\n"
@@ -1267,7 +1317,8 @@ 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 ""
@@ -1339,8 +1390,7 @@ msgid ""
"%s"
msgstr ""
-#: ../src/utils/pactl.c:193
-#: ../src/utils/pactl.c:371
+#: ../src/utils/pactl.c:193 ../src/utils/pactl.c:371
msgid "muted"
msgstr "stumm"
@@ -1366,18 +1416,10 @@ msgid ""
"%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
+#: ../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
msgid "n/a"
msgstr "k.A."
@@ -1500,8 +1542,7 @@ msgstr ""
msgid "source"
msgstr "Quelle"
-#: ../src/utils/pactl.c:511
-#: ../src/utils/pactl.c:521
+#: ../src/utils/pactl.c:511 ../src/utils/pactl.c:521
#, c-format
msgid "Failure: %s\n"
msgstr ""
@@ -1535,8 +1576,10 @@ 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 ""
#: ../src/utils/pactl.c:729
@@ -1589,12 +1632,16 @@ msgstr ""
#: ../src/utils/pactl.c:875
#, c-format
-msgid "You may not specify more than one sink. You have to specify at least one boolean value.\n"
+msgid ""
+"You may not specify more than one sink. You have to specify at least one "
+"boolean value.\n"
msgstr ""
#: ../src/utils/pactl.c:888
#, c-format
-msgid "You may not specify more than one source. You have to specify at least one boolean value.\n"
+msgid ""
+"You may not specify more than one source. You have to specify at least one "
+"boolean value.\n"
msgstr ""
#: ../src/utils/pactl.c:904
@@ -1609,7 +1656,8 @@ 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 ""
@@ -1696,14 +1744,12 @@ msgstr ""
msgid "select(): %s"
msgstr "select(): %s"
-#: ../src/utils/pacmd.c:124
-#: ../src/utils/pacmd.c:140
+#: ../src/utils/pacmd.c:124 ../src/utils/pacmd.c:140
#, c-format
msgid "read(): %s"
msgstr "read(): %s"
-#: ../src/utils/pacmd.c:153
-#: ../src/utils/pacmd.c:167
+#: ../src/utils/pacmd.c:153 ../src/utils/pacmd.c:167
#, c-format
msgid "write(): %s"
msgstr "write(): %s"
@@ -1733,11 +1779,15 @@ msgid ""
"\n"
" -v, --verbose Enable verbose operation\n"
"\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"
" -d, --device=DEVICE The name of the sink 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"
+" -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"
" --channel-map=CHANNELMAP Set the channel map to the use\n"
msgstr ""
@@ -1769,3 +1819,9 @@ msgstr ""
msgid "Using sample spec '%s'\n"
msgstr ""
+#: ../src/pulsecore/lock-autospawn.c:126 ../src/pulsecore/lock-autospawn.c:207
+msgid "Cannot access autospawn lock."
+msgstr ""
+
+#~ msgid "socketpair(): %s"
+#~ msgstr "socketpair(): %s"
diff --git a/po/el.po b/po/el.po
index b664491..fed9ba9 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: 2008-08-22 19:36+0300\n"
+"POT-Creation-Date: 2008-10-06 03:21+0200\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"
@@ -283,42 +283,78 @@ msgstr "Αυτό είναι το PulseAudio %s"
#: ../src/daemon/main.c:781
#, c-format
+msgid "Compilation host: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:782
+#, c-format
+msgid "Compilation CFLAGS: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:785
+#, c-format
+msgid "Running on host: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:788
+#, c-format
msgid "Page size is %lu bytes"
msgstr ""
-#: ../src/daemon/main.c:784
+#: ../src/daemon/main.c:791
+msgid "Compiled with Valgrind support: yes"
+msgstr ""
+
+#: ../src/daemon/main.c:793
+msgid "Compiled with Valgrind support: no"
+msgstr ""
+
+#: ../src/daemon/main.c:796
+#, c-format
+msgid "Running in valgrind mode: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:799
+msgid "Optimized build: yes"
+msgstr ""
+
+#: ../src/daemon/main.c:801
+msgid "Optimized build: no"
+msgstr ""
+
+#: ../src/daemon/main.c:805
msgid "Failed to get machine ID"
msgstr ""
-#: ../src/daemon/main.c:787
+#: ../src/daemon/main.c:808
#, c-format
msgid "Machine ID is %s."
msgstr ""
-#: ../src/daemon/main.c:792
+#: ../src/daemon/main.c:813
#, c-format
msgid "Using runtime directory %s."
msgstr ""
-#: ../src/daemon/main.c:797
+#: ../src/daemon/main.c:818
#, c-format
msgid "Using state directory %s."
msgstr ""
-#: ../src/daemon/main.c:800
+#: ../src/daemon/main.c:821
#, c-format
msgid "Running in system mode: %s"
msgstr ""
-#: ../src/daemon/main.c:815
+#: ../src/daemon/main.c:836
msgid "pa_pid_file_create() failed."
msgstr ""
-#: ../src/daemon/main.c:827
+#: ../src/daemon/main.c:848
msgid "Fresh high-resolution timers available! Bon appetit!"
msgstr ""
-#: ../src/daemon/main.c:829
+#: ../src/daemon/main.c:850
msgid ""
"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
"resolution timers enabled!"
@@ -326,32 +362,32 @@ msgstr ""
"ΔικΠμου, ο πυÏήνας σου είναι για τα μπάζα! Η Ï€Ïόταση του σεφ σήμεÏα είναι "
"Linux με ενεÏγοποιημÎνα τα high-resolution timers!"
-#: ../src/daemon/main.c:839
+#: ../src/daemon/main.c:860
msgid "pa_core_new() failed."
msgstr ""
-#: ../src/daemon/main.c:899
+#: ../src/daemon/main.c:921
msgid "Failed to initialize daemon."
msgstr ""
-#: ../src/daemon/main.c:904
+#: ../src/daemon/main.c:926
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
-#: ../src/daemon/main.c:909
+#: ../src/daemon/main.c:931
#, c-format
msgid "Default sink name (%s) does not exist in name register."
msgstr ""
-#: ../src/daemon/main.c:922
+#: ../src/daemon/main.c:944
msgid "Daemon startup complete."
msgstr ""
-#: ../src/daemon/main.c:928
+#: ../src/daemon/main.c:950
msgid "Daemon shutdown initiated."
msgstr ""
-#: ../src/daemon/main.c:949
+#: ../src/daemon/main.c:971
msgid "Daemon terminated."
msgstr ""
@@ -519,76 +555,76 @@ msgstr ""
msgid "Path: %s\n"
msgstr ""
-#: ../src/daemon/daemon-conf.c:203
+#: ../src/daemon/daemon-conf.c:205
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:219
+#: ../src/daemon/daemon-conf.c:221
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:235
+#: ../src/daemon/daemon-conf.c:237
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:258
+#: ../src/daemon/daemon-conf.c:260
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:265
+#: ../src/daemon/daemon-conf.c:267
#, c-format
msgid "[%s:%u] rlimit not supported on this platform."
msgstr ""
-#: ../src/daemon/daemon-conf.c:281
+#: ../src/daemon/daemon-conf.c:283
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:299
+#: ../src/daemon/daemon-conf.c:301
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:317
+#: ../src/daemon/daemon-conf.c:319
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:335
+#: ../src/daemon/daemon-conf.c:337
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:353
+#: ../src/daemon/daemon-conf.c:355
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:371
+#: ../src/daemon/daemon-conf.c:373
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:564
+#: ../src/daemon/daemon-conf.c:570
#, c-format
msgid "Failed to open configuration file: %s"
msgstr ""
-#: ../src/daemon/daemon-conf.c:638
+#: ../src/daemon/daemon-conf.c:644
#, c-format
msgid "### Read from configuration file: %s ###\n"
msgstr ""
-#: ../src/daemon/caps.c:62
+#: ../src/daemon/caps.c:63
msgid "Dropping root priviliges."
msgstr ""
-#: ../src/daemon/caps.c:102
+#: ../src/daemon/caps.c:103
msgid "Limited capabilities successfully to CAP_SYS_NICE."
msgstr ""
@@ -796,6 +832,11 @@ msgstr ""
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
+msgid "(invalid)"
+msgstr ""
+
#: ../src/pulse/error.c:43
msgid "OK"
msgstr ""
@@ -884,10 +925,6 @@ msgstr ""
msgid "No such extension"
msgstr ""
-#: ../src/pulse/sample.c:134
-msgid "Invalid"
-msgstr ""
-
#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:100
msgid "XOpenDisplay() failed"
msgstr ""
@@ -896,31 +933,26 @@ msgstr ""
msgid "Failed to parse cookie data"
msgstr ""
-#: ../src/pulse/client-conf.c:117
+#: ../src/pulse/client-conf.c:120
#, c-format
msgid "Failed to open configuration file '%s': %s"
msgstr ""
-#: ../src/pulse/context.c:542
+#: ../src/pulse/context.c:516
msgid "No cookie loaded. Attempting to connect without."
msgstr ""
-#: ../src/pulse/context.c:596
-#, c-format
-msgid "socketpair(): %s"
-msgstr ""
-
-#: ../src/pulse/context.c:610
+#: ../src/pulse/context.c:642
#, c-format
msgid "fork(): %s"
msgstr ""
-#: ../src/pulse/context.c:673
+#: ../src/pulse/context.c:695
#, c-format
msgid "waitpid(): %s"
msgstr ""
-#: ../src/pulse/context.c:1354
+#: ../src/pulse/context.c:1256
#, c-format
msgid "Received message for unknown extension '%s'"
msgstr ""
@@ -1122,8 +1154,8 @@ msgid ""
"44100)\n"
" --format=SAMPLEFORMAT The sample type, one of s16le, "
"s16be, u8, float32le,\n"
-" float32be, ulaw, alaw (defaults to "
-"s16ne)\n"
+" float32be, ulaw, alaw, s32le, s32be "
+"(defaults to s16ne)\n"
" --channels=CHANNELS The number of channels, 1 for mono, "
"2 for stereo\n"
" (defaults to 2)\n"
@@ -1226,12 +1258,17 @@ msgstr ""
msgid "pa_context_new() failed.\n"
msgstr ""
-#: ../src/utils/pacat.c:785
+#: ../src/utils/pacat.c:777
+#, c-format
+msgid "pa_context_connect() failed: %s"
+msgstr ""
+
+#: ../src/utils/pacat.c:788
#, c-format
msgid "time_new() failed.\n"
msgstr ""
-#: ../src/utils/pacat.c:792 ../src/utils/pasuspender.c:301
+#: ../src/utils/pacat.c:795 ../src/utils/pasuspender.c:301
#: ../src/utils/pactl.c:931 ../src/utils/paplay.c:407
#, c-format
msgid "pa_mainloop_run() failed.\n"
@@ -1782,3 +1819,6 @@ msgstr ""
msgid "Using sample spec '%s'\n"
msgstr ""
+#: ../src/pulsecore/lock-autospawn.c:126 ../src/pulsecore/lock-autospawn.c:207
+msgid "Cannot access autospawn lock."
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 9cd91bf..4dc57d6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pulseaudio trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 06:06+0000\n"
+"POT-Creation-Date: 2008-10-06 03:21+0200\n"
"PO-Revision-Date: 2008-09-06 10:49+0200\n"
"Last-Translator: Robert-André Mauchin <zebob.m at pengzone.org>\n"
"Language-Team: Fedora French <fedora-trans-fr at redhat.com>\n"
@@ -192,22 +192,6 @@ msgstr ""
"nécessaires :\n"
"nous ne somme pas dans le groupe "
-#: ../src/daemon/main.c:480
-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 ""
-" et PolicyKit refuse de nous accorder les permissions. Abandon du SUID Ã nouveau.\n"
-"Pour activer la planification en temps réel, veuillez aquérir les permissions "
-"PolicyKit appropriées, ou devenez membre de "
-
-#: ../src/daemon/main.c:481
-msgid ""
-"', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user."
-msgstr ""
-", ou augmentez les limites de ressource RLIMIT_NICE/RLIMIT_RTPRIO pour cet utilisateur."
-
#: ../src/daemon/main.c:497
msgid ""
"High-priority scheduling enabled in configuration but not allowed by policy."
@@ -319,65 +303,80 @@ msgid "This is PulseAudio %s"
msgstr "Pulseaudio %s"
#: ../src/daemon/main.c:781
+#, fuzzy, c-format
+msgid "Compilation host: %s"
+msgstr "CFLAGS de compilation : %s"
+
+#: ../src/daemon/main.c:782
#, c-format
msgid "Compilation CFLAGS: %s"
msgstr "CFLAGS de compilation : %s"
-#: ../src/daemon/main.c:784
+#: ../src/daemon/main.c:785
+#, fuzzy, c-format
+msgid "Running on host: %s"
+msgstr "Exécution en mode système : %s"
+
+#: ../src/daemon/main.c:788
+#, c-format
+msgid "Page size is %lu bytes"
+msgstr "La taille de la page est de %lu octets"
+
+#: ../src/daemon/main.c:791
msgid "Compiled with Valgrind support: yes"
msgstr "Compilé avec la prise en charge Valgrind : oui"
-#: ../src/daemon/main.c:786
+#: ../src/daemon/main.c:793
msgid "Compiled with Valgrind support: no"
msgstr "Compilé avec la prise en charge Valgrind : non"
-#: ../src/daemon/main.c:790
+#: ../src/daemon/main.c:796
+#, fuzzy, c-format
+msgid "Running in valgrind mode: %s"
+msgstr "Exécution en mode système : %s"
+
+#: ../src/daemon/main.c:799
msgid "Optimized build: yes"
msgstr "Construction optimisée : oui"
-#: ../src/daemon/main.c:792
+#: ../src/daemon/main.c:801
msgid "Optimized build: no"
msgstr "Construction optimisée : non"
-#: ../src/daemon/main.c:795
-#, c-format
-msgid "Page size is %lu bytes"
-msgstr "La taille de la page est de %lu octets"
-
-#: ../src/daemon/main.c:798
+#: ../src/daemon/main.c:805
msgid "Failed to get machine ID"
msgstr "Échec lors de l'obtention de l'ID de la machine"
-#: ../src/daemon/main.c:801
+#: ../src/daemon/main.c:808
#, c-format
msgid "Machine ID is %s."
msgstr "L'ID de la machine est %s."
-#: ../src/daemon/main.c:806
+#: ../src/daemon/main.c:813
#, c-format
msgid "Using runtime directory %s."
msgstr "Utilisation du répertoire d'exécution %s."
-#: ../src/daemon/main.c:811
+#: ../src/daemon/main.c:818
#, c-format
msgid "Using state directory %s."
msgstr "Utilisation du répertoire d'état %s."
-#: ../src/daemon/main.c:814
+#: ../src/daemon/main.c:821
#, c-format
msgid "Running in system mode: %s"
msgstr "Exécution en mode système : %s"
-#: ../src/daemon/main.c:829
+#: ../src/daemon/main.c:836
msgid "pa_pid_file_create() failed."
msgstr "Échec de pa_pid_file_create()."
-#: ../src/daemon/main.c:841
+#: ../src/daemon/main.c:848
msgid "Fresh high-resolution timers available! Bon appetit!"
msgstr ""
"De nouvelles horloges à haute résolution sont disponibles ! Bon appétit !"
-#: ../src/daemon/main.c:843
+#: ../src/daemon/main.c:850
msgid ""
"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
"resolution timers enabled!"
@@ -385,34 +384,34 @@ msgstr ""
"Eh mec, ton noyau il pue ! La recommandation d'aujourd'hui du patron est "
"d'activer les horloges à haute résolution sur ton Linux."
-#: ../src/daemon/main.c:853
+#: ../src/daemon/main.c:860
msgid "pa_core_new() failed."
msgstr "Échec de pa_core_new()."
-#: ../src/daemon/main.c:913
+#: ../src/daemon/main.c:921
msgid "Failed to initialize daemon."
msgstr "Échec lors de l'initialisation du démon"
-#: ../src/daemon/main.c:918
+#: ../src/daemon/main.c:926
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr "Démarrage du démon sans aucun module chargé : refus de fonctionner."
-#: ../src/daemon/main.c:923
+#: ../src/daemon/main.c:931
#, c-format
msgid "Default sink name (%s) does not exist in name register."
msgstr ""
"Le nom de la destination par défaut (%s) n'existe pas dans le registre des "
"noms."
-#: ../src/daemon/main.c:936
+#: ../src/daemon/main.c:944
msgid "Daemon startup complete."
msgstr "Démarrage du démon effectué."
-#: ../src/daemon/main.c:942
+#: ../src/daemon/main.c:950
msgid "Daemon shutdown initiated."
msgstr "Fermeture du démon initiée."
-#: ../src/daemon/main.c:963
+#: ../src/daemon/main.c:971
msgid "Daemon terminated."
msgstr "Démon terminé."
@@ -664,76 +663,76 @@ msgid "Path: %s\n"
msgstr "Chemin : %s\n"
# dans les lignes suivantes [%s = nom de fichier: %u = ligne dans celui-ci]
-#: ../src/daemon/daemon-conf.c:203
+#: ../src/daemon/daemon-conf.c:205
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
msgstr "[%s:%u] Cible du journal « %s » invalide."
-#: ../src/daemon/daemon-conf.c:219
+#: ../src/daemon/daemon-conf.c:221
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
msgstr "[%s:%u] Niveau du journal « %s » invalide."
-#: ../src/daemon/daemon-conf.c:235
+#: ../src/daemon/daemon-conf.c:237
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
msgstr "[%s:%u] Méthode de rééchantillonnage « %s » invalide."
-#: ../src/daemon/daemon-conf.c:258
+#: ../src/daemon/daemon-conf.c:260
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
msgstr "[%s:%u] rlimit « %s » invalide."
-#: ../src/daemon/daemon-conf.c:265
+#: ../src/daemon/daemon-conf.c:267
#, c-format
msgid "[%s:%u] rlimit not supported on this platform."
msgstr "[%s:%u] rlimit n'est pas pris en charge sur cette plateforme."
-#: ../src/daemon/daemon-conf.c:281
+#: ../src/daemon/daemon-conf.c:283
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
msgstr "[%s:%u] Format d'échantillon « %s » invalide."
-#: ../src/daemon/daemon-conf.c:299
+#: ../src/daemon/daemon-conf.c:301
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
msgstr "[%s:%u] Taux d'échantillonnage « %s » invalide."
-#: ../src/daemon/daemon-conf.c:317
+#: ../src/daemon/daemon-conf.c:319
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
msgstr "[%s:%u] Canaux d'échantillonnage « %s » invalide."
-#: ../src/daemon/daemon-conf.c:335
+#: ../src/daemon/daemon-conf.c:337
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
msgstr "[%s:%u] Nombre de fragments « %s » invalide."
-#: ../src/daemon/daemon-conf.c:353
+#: ../src/daemon/daemon-conf.c:355
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
msgstr "[%s:%u] Taille du fragment « %s » invalide."
-#: ../src/daemon/daemon-conf.c:371
+#: ../src/daemon/daemon-conf.c:373
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
msgstr "[%s:%u] Niveau de priorité (nice) « %s » invalide."
-#: ../src/daemon/daemon-conf.c:564
+#: ../src/daemon/daemon-conf.c:570
#, c-format
msgid "Failed to open configuration file: %s"
msgstr "Échec lors de l'ouverture du fichier de configuration : %s"
-#: ../src/daemon/daemon-conf.c:638
+#: ../src/daemon/daemon-conf.c:644
#, c-format
msgid "### Read from configuration file: %s ###\n"
msgstr "### Lecture à partir du fichier de configuration : %s ###\n"
-#: ../src/daemon/caps.c:62
+#: ../src/daemon/caps.c:63
msgid "Dropping root priviliges."
msgstr "Abandon des permissions root."
-#: ../src/daemon/caps.c:102
+#: ../src/daemon/caps.c:103
msgid "Limited capabilities successfully to CAP_SYS_NICE."
msgstr "Limitation des capacités à CAP_SYS_NICE réussie."
@@ -941,6 +940,12 @@ msgstr "Arrière gauche haut"
msgid "Top Rear Right"
msgstr "Arrière droit haut"
+#: ../src/pulse/channelmap.c:472 ../src/pulse/sample.c:144
+#: ../src/pulse/volume.c:163 ../src/pulse/volume.c:194
+#, fuzzy
+msgid "(invalid)"
+msgstr "Invalide"
+
#: ../src/pulse/error.c:43
msgid "OK"
msgstr "OK"
@@ -1029,10 +1034,6 @@ msgstr "Code d'erreur inconnu"
msgid "No such extension"
msgstr "Aucune extension de ce type"
-#: ../src/pulse/sample.c:134
-msgid "Invalid"
-msgstr "Invalide"
-
#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:100
msgid "XOpenDisplay() failed"
msgstr "Échec de XOpenDisplay()"
@@ -1041,31 +1042,26 @@ msgstr "Échec de XOpenDisplay()"
msgid "Failed to parse cookie data"
msgstr "Échec lors de l'analyse des données du cookie"
-#: ../src/pulse/client-conf.c:117
+#: ../src/pulse/client-conf.c:120
#, c-format
msgid "Failed to open configuration file '%s': %s"
msgstr "Échec lors de l'ouverture du fichier de configuration « %s » :%s"
-#: ../src/pulse/context.c:542
+#: ../src/pulse/context.c:516
msgid "No cookie loaded. Attempting to connect without."
msgstr "Aucun cookie chargé. Tentative de connexion sans celui-ci."
-#: ../src/pulse/context.c:596
-#, c-format
-msgid "socketpair(): %s"
-msgstr "socketpair()Â : %s"
-
-#: ../src/pulse/context.c:610
+#: ../src/pulse/context.c:642
#, c-format
msgid "fork(): %s"
msgstr "fork()Â : %s"
-#: ../src/pulse/context.c:673
+#: ../src/pulse/context.c:695
#, c-format
msgid "waitpid(): %s"
msgstr "waitpid()Â : %s"
-#: ../src/pulse/context.c:1354
+#: ../src/pulse/context.c:1256
#, c-format
msgid "Received message for unknown extension '%s'"
msgstr "Message reçu pour une extension inconnue « %s »"
@@ -1247,7 +1243,7 @@ msgstr "Échec de pa_stream_update_timing_info() : %s\n"
# upmixer = par ex. convertir 2 canaux en 5 canaux
# https://bugzilla.redhat.com/show_bug.cgi?id=460798
#: ../src/utils/pacat.c:490
-#, c-format
+#, fuzzy, c-format
msgid ""
"%s [options]\n"
"\n"
@@ -1273,8 +1269,8 @@ msgid ""
"44100)\n"
" --format=SAMPLEFORMAT The sample type, one of s16le, "
"s16be, u8, float32le,\n"
-" float32be, ulaw, alaw (defaults to "
-"s16ne)\n"
+" float32be, ulaw, alaw, s32le, s32be "
+"(defaults to s16ne)\n"
" --channels=CHANNELS The number of channels, 1 for mono, "
"2 for stereo\n"
" (defaults to 2)\n"
@@ -1431,12 +1427,17 @@ msgstr "Échec de io_new().\n"
msgid "pa_context_new() failed.\n"
msgstr "Échec de pa_context_new().\n"
-#: ../src/utils/pacat.c:785
+#: ../src/utils/pacat.c:777
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s"
+msgstr "Échec de pa_context_new().\n"
+
+#: ../src/utils/pacat.c:788
#, c-format
msgid "time_new() failed.\n"
msgstr "Échec de time_new().\n"
-#: ../src/utils/pacat.c:792 ../src/utils/pasuspender.c:301
+#: ../src/utils/pacat.c:795 ../src/utils/pasuspender.c:301
#: ../src/utils/pactl.c:931 ../src/utils/paplay.c:407
#, c-format
msgid "pa_mainloop_run() failed.\n"
@@ -2151,3 +2152,27 @@ msgstr "Le plan des canaux ne correspond pas au fichier.\n"
#, c-format
msgid "Using sample spec '%s'\n"
msgstr "Utilisation de la spécification de l'échantillon « %s »\n"
+
+#: ../src/pulsecore/lock-autospawn.c:126 ../src/pulsecore/lock-autospawn.c:207
+msgid "Cannot access autospawn lock."
+msgstr ""
+
+#~ 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 ""
+#~ " et PolicyKit refuse de nous accorder les permissions. Abandon du SUID Ã "
+#~ "nouveau.\n"
+#~ "Pour activer la planification en temps réel, veuillez aquérir les "
+#~ "permissions PolicyKit appropriées, ou devenez membre de "
+
+#~ msgid ""
+#~ "', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this "
+#~ "user."
+#~ msgstr ""
+#~ ", ou augmentez les limites de ressource RLIMIT_NICE/RLIMIT_RTPRIO pour "
+#~ "cet utilisateur."
+
+#~ msgid "socketpair(): %s"
+#~ msgstr "socketpair()Â : %s"
diff --git a/po/sv.po b/po/sv.po
index 11f6e13..269a225 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: 2008-09-04 19:30+0000\n"
+"POT-Creation-Date: 2008-10-06 03:21+0200\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"
@@ -15,8 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/daemon/ltdl-bind-now.c:177
-#: ../src/daemon/ltdl-bind-now.c:197
+#: ../src/daemon/ltdl-bind-now.c:177 ../src/daemon/ltdl-bind-now.c:197
msgid "Failed to add bind-now-loader."
msgstr ""
@@ -112,8 +111,7 @@ msgstr ""
msgid "Home directory of user '%s' is not '%s', ignoring."
msgstr "Hemkatalogen för användaren \"%s\" är inte \"%s\", ignorerar."
-#: ../src/daemon/main.c:201
-#: ../src/daemon/main.c:206
+#: ../src/daemon/main.c:201 ../src/daemon/main.c:206
#, c-format
msgid "Failed to create '%s': %s"
msgstr "Misslyckades med att skapa \"%s\": %s"
@@ -178,22 +176,14 @@ msgstr ""
#: ../src/daemon/main.c:479
msgid ""
-"Called SUID root and real-time/high-priority scheduling was requested in the configuration. However, we lack the necessary priviliges:\n"
+"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 '"
msgstr ""
-#: ../src/daemon/main.c:480
-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."
-msgstr ""
-
#: ../src/daemon/main.c:497
-msgid "High-priority scheduling enabled in configuration but not allowed by policy."
+msgid ""
+"High-priority scheduling enabled in configuration but not allowed by policy."
msgstr ""
#: ../src/daemon/main.c:522
@@ -210,7 +200,8 @@ msgid "Giving up CAP_NICE"
msgstr ""
#: ../src/daemon/main.c:539
-msgid "Real-time scheduling enabled in configuration but not allowed by policy."
+msgid ""
+"Real-time scheduling enabled in configuration but not allowed by policy."
msgstr ""
#: ../src/daemon/main.c:597
@@ -228,8 +219,12 @@ msgid "Failed to kill daemon: %s"
msgstr ""
#: ../src/daemon/main.c:627
-msgid "This program is not intended to be run as root (unless --system is specified)."
-msgstr "Detta program är inte tänkt att köras som root (såvida inte --system har angivits)."
+msgid ""
+"This program is not intended to be run as root (unless --system is "
+"specified)."
+msgstr ""
+"Detta program är inte tänkt att köras som root (såvida inte --system har "
+"angivits)."
#: ../src/daemon/main.c:629
msgid "Root priviliges required."
@@ -289,92 +284,109 @@ msgstr "Detta är PulseAudio %s"
#: ../src/daemon/main.c:781
#, c-format
+msgid "Compilation host: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:782
+#, c-format
msgid "Compilation CFLAGS: %s"
msgstr ""
-#: ../src/daemon/main.c:784
+#: ../src/daemon/main.c:785
+#, c-format
+msgid "Running on host: %s"
+msgstr ""
+
+#: ../src/daemon/main.c:788
+#, c-format
+msgid "Page size is %lu bytes"
+msgstr ""
+
+#: ../src/daemon/main.c:791
msgid "Compiled with Valgrind support: yes"
msgstr ""
-#: ../src/daemon/main.c:786
+#: ../src/daemon/main.c:793
msgid "Compiled with Valgrind support: no"
msgstr ""
-#: ../src/daemon/main.c:790
-msgid "Optimized build: yes"
+#: ../src/daemon/main.c:796
+#, c-format
+msgid "Running in valgrind mode: %s"
msgstr ""
-#: ../src/daemon/main.c:792
-msgid "Optimized build: no"
+#: ../src/daemon/main.c:799
+msgid "Optimized build: yes"
msgstr ""
-#: ../src/daemon/main.c:795
-#, c-format
-msgid "Page size is %lu bytes"
+#: ../src/daemon/main.c:801
+msgid "Optimized build: no"
msgstr ""
-#: ../src/daemon/main.c:798
+#: ../src/daemon/main.c:805
msgid "Failed to get machine ID"
msgstr ""
-#: ../src/daemon/main.c:801
+#: ../src/daemon/main.c:808
#, c-format
msgid "Machine ID is %s."
msgstr ""
-#: ../src/daemon/main.c:806
+#: ../src/daemon/main.c:813
#, c-format
msgid "Using runtime directory %s."
msgstr ""
-#: ../src/daemon/main.c:811
+#: ../src/daemon/main.c:818
#, c-format
msgid "Using state directory %s."
msgstr ""
-#: ../src/daemon/main.c:814
+#: ../src/daemon/main.c:821
#, c-format
msgid "Running in system mode: %s"
msgstr ""
-#: ../src/daemon/main.c:829
+#: ../src/daemon/main.c:836
msgid "pa_pid_file_create() failed."
msgstr "pa_pid_file_create() misslyckades."
-#: ../src/daemon/main.c:841
+#: ../src/daemon/main.c:848
msgid "Fresh high-resolution timers available! Bon appetit!"
msgstr ""
-#: ../src/daemon/main.c:843
-msgid "Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"
+#: ../src/daemon/main.c:850
+msgid ""
+"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
+"resolution timers enabled!"
msgstr ""
-#: ../src/daemon/main.c:853
+#: ../src/daemon/main.c:860
msgid "pa_core_new() failed."
msgstr "pa_core_new() misslyckades."
-#: ../src/daemon/main.c:913
+#: ../src/daemon/main.c:921
msgid "Failed to initialize daemon."
msgstr ""
-#: ../src/daemon/main.c:918
+#: ../src/daemon/main.c:926
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
-#: ../src/daemon/main.c:923
+#: ../src/daemon/main.c:931
#, c-format
msgid "Default sink name (%s) does not exist in name register."
msgstr ""
-#: ../src/daemon/main.c:936
+#: ../src/daemon/main.c:944
msgid "Daemon startup complete."
msgstr ""
-#: ../src/daemon/main.c:942
+#: ../src/daemon/main.c:950
msgid "Daemon shutdown initiated."
msgstr ""
-#: ../src/daemon/main.c:963
+#: ../src/daemon/main.c:971
msgid "Daemon terminated."
msgstr ""
@@ -389,8 +401,10 @@ 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\n"
"\n"
@@ -399,24 +413,31 @@ msgid ""
" -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"
-" --module-idle-time=SECS Unload autoloaded modules when idle and\n"
+" --module-idle-time=SECS Unload autoloaded modules when idle "
+"and\n"
" this 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} Specify the log target\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"
@@ -427,10 +448,12 @@ 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"
@@ -445,7 +468,9 @@ msgid "--fail expects boolean argument"
msgstr "--fail förväntar sig ett booleskt argument"
#: ../src/daemon/cmdline.c:262
-msgid "--log-level expects log level argument (either numeric in range 0..4 or one of 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 ""
#: ../src/daemon/cmdline.c:274
@@ -529,76 +554,76 @@ msgstr ""
msgid "Path: %s\n"
msgstr "Sökväg: %s\n"
-#: ../src/daemon/daemon-conf.c:203
+#: ../src/daemon/daemon-conf.c:205
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:219
+#: ../src/daemon/daemon-conf.c:221
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:235
+#: ../src/daemon/daemon-conf.c:237
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:258
+#: ../src/daemon/daemon-conf.c:260
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:265
+#: ../src/daemon/daemon-conf.c:267
#, c-format
msgid "[%s:%u] rlimit not supported on this platform."
msgstr ""
-#: ../src/daemon/daemon-conf.c:281
+#: ../src/daemon/daemon-conf.c:283
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:299
+#: ../src/daemon/daemon-conf.c:301
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:317
+#: ../src/daemon/daemon-conf.c:319
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:335
+#: ../src/daemon/daemon-conf.c:337
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:353
+#: ../src/daemon/daemon-conf.c:355
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:371
+#: ../src/daemon/daemon-conf.c:373
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:564
+#: ../src/daemon/daemon-conf.c:570
#, c-format
msgid "Failed to open configuration file: %s"
msgstr "Misslyckades med att öppna konfigurationsfil: %s"
-#: ../src/daemon/daemon-conf.c:638
+#: ../src/daemon/daemon-conf.c:644
#, c-format
msgid "### Read from configuration file: %s ###\n"
msgstr ""
-#: ../src/daemon/caps.c:62
+#: ../src/daemon/caps.c:63
msgid "Dropping root priviliges."
msgstr "Släpper root-behörighet."
-#: ../src/daemon/caps.c:102
+#: ../src/daemon/caps.c:103
msgid "Limited capabilities successfully to CAP_SYS_NICE."
msgstr ""
@@ -806,6 +831,12 @@ msgstr ""
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
+#, fuzzy
+msgid "(invalid)"
+msgstr "Ogiltig"
+
#: ../src/pulse/error.c:43
msgid "OK"
msgstr "OK"
@@ -894,12 +925,7 @@ msgstr "Okänd felkod"
msgid "No such extension"
msgstr ""
-#: ../src/pulse/sample.c:134
-msgid "Invalid"
-msgstr "Ogiltig"
-
-#: ../src/pulse/client-conf-x11.c:55
-#: ../src/utils/pax11publish.c:100
+#: ../src/pulse/client-conf-x11.c:55 ../src/utils/pax11publish.c:100
msgid "XOpenDisplay() failed"
msgstr "XOpenDisplay() misslyckades"
@@ -907,31 +933,26 @@ msgstr "XOpenDisplay() misslyckades"
msgid "Failed to parse cookie data"
msgstr ""
-#: ../src/pulse/client-conf.c:117
+#: ../src/pulse/client-conf.c:120
#, c-format
msgid "Failed to open configuration file '%s': %s"
msgstr "Misslyckades med att öppna konfigurationsfilen \"%s\": %s"
-#: ../src/pulse/context.c:542
+#: ../src/pulse/context.c:516
msgid "No cookie loaded. Attempting to connect without."
msgstr ""
-#: ../src/pulse/context.c:596
-#, c-format
-msgid "socketpair(): %s"
-msgstr "socketpair(): %s"
-
-#: ../src/pulse/context.c:610
+#: ../src/pulse/context.c:642
#, c-format
msgid "fork(): %s"
msgstr "fork(): %s"
-#: ../src/pulse/context.c:673
+#: ../src/pulse/context.c:695
#, c-format
msgid "waitpid(): %s"
msgstr "waitpid(): %s"
-#: ../src/pulse/context.c:1354
+#: ../src/pulse/context.c:1256
#, c-format
msgid "Received message for unknown extension '%s'"
msgstr ""
@@ -1045,28 +1066,23 @@ msgstr "pa_stream_connect_playback() misslyckades: %s\n"
msgid "pa_stream_connect_record() failed: %s\n"
msgstr "pa_stream_connect_record() misslyckades: %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:307 ../src/utils/pasuspender.c:159
+#: ../src/utils/pactl.c:666 ../src/utils/paplay.c:183
#, c-format
msgid "Connection failure: %s\n"
msgstr "Anslutningsfel: %s\n"
-#: ../src/utils/pacat.c:328
-#: ../src/utils/paplay.c:75
+#: ../src/utils/pacat.c:328 ../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:333 ../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:343 ../src/utils/paplay.c:92
#, c-format
msgid "Draining connection to server.\n"
msgstr ""
@@ -1124,27 +1140,44 @@ 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 (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 "
+"(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"
+" --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"
msgstr ""
#: ../src/utils/pacat.c:591
@@ -1208,10 +1241,8 @@ msgstr "dup2(): %s\n"
msgid "Too many arguments.\n"
msgstr "För många argument.\n"
-#: ../src/utils/pacat.c:742
-#: ../src/utils/pasuspender.c:280
-#: ../src/utils/pactl.c:909
-#: ../src/utils/paplay.c:381
+#: ../src/utils/pacat.c:742 ../src/utils/pasuspender.c:280
+#: ../src/utils/pactl.c:909 ../src/utils/paplay.c:381
#, c-format
msgid "pa_mainloop_new() failed.\n"
msgstr "pa_mainloop_new() misslyckades.\n"
@@ -1221,23 +1252,24 @@ msgstr "pa_mainloop_new() misslyckades.\n"
msgid "io_new() failed.\n"
msgstr "io_new() misslyckades.\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:769 ../src/utils/pasuspender.c:293
+#: ../src/utils/pactl.c:923 ../src/utils/paplay.c:396
#, c-format
msgid "pa_context_new() failed.\n"
msgstr "pa_context_new() misslyckades.\n"
-#: ../src/utils/pacat.c:785
+#: ../src/utils/pacat.c:777
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s"
+msgstr "pa_context_new() misslyckades.\n"
+
+#: ../src/utils/pacat.c:788
#, c-format
msgid "time_new() failed.\n"
msgstr "time_new() misslyckades.\n"
-#: ../src/utils/pacat.c:792
-#: ../src/utils/pasuspender.c:301
-#: ../src/utils/pactl.c:931
-#: ../src/utils/paplay.c:407
+#: ../src/utils/pacat.c:795 ../src/utils/pasuspender.c:301
+#: ../src/utils/pactl.c:931 ../src/utils/paplay.c:407
#, c-format
msgid "pa_mainloop_run() failed.\n"
msgstr "pa_mainloop_run() misslyckades.\n"
@@ -1267,8 +1299,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:672
#: ../src/utils/paplay.c:191
#, c-format
msgid "Got SIGINT, exiting.\n"
@@ -1286,7 +1317,8 @@ 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 ""
@@ -1361,8 +1393,7 @@ msgid ""
"%s"
msgstr ""
-#: ../src/utils/pactl.c:193
-#: ../src/utils/pactl.c:371
+#: ../src/utils/pactl.c:193 ../src/utils/pactl.c:371
msgid "muted"
msgstr "tystad"
@@ -1388,18 +1419,10 @@ msgid ""
"%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
+#: ../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
msgid "n/a"
msgstr ""
@@ -1522,8 +1545,7 @@ msgstr "sink"
msgid "source"
msgstr "källa"
-#: ../src/utils/pactl.c:511
-#: ../src/utils/pactl.c:521
+#: ../src/utils/pactl.c:511 ../src/utils/pactl.c:521
#, c-format
msgid "Failure: %s\n"
msgstr "Fel: %s\n"
@@ -1557,8 +1579,10 @@ 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 ""
#: ../src/utils/pactl.c:729
@@ -1614,12 +1638,16 @@ msgstr ""
#: ../src/utils/pactl.c:875
#, c-format
-msgid "You may not specify more than one sink. You have to specify at least one boolean value.\n"
+msgid ""
+"You may not specify more than one sink. You have to specify at least one "
+"boolean value.\n"
msgstr ""
#: ../src/utils/pactl.c:888
#, c-format
-msgid "You may not specify more than one source. You have to specify at least one boolean value.\n"
+msgid ""
+"You may not specify more than one source. You have to specify at least one "
+"boolean value.\n"
msgstr ""
#: ../src/utils/pactl.c:904
@@ -1634,7 +1662,8 @@ 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 ""
@@ -1721,14 +1750,12 @@ msgstr ""
msgid "select(): %s"
msgstr "select(): %s"
-#: ../src/utils/pacmd.c:124
-#: ../src/utils/pacmd.c:140
+#: ../src/utils/pacmd.c:124 ../src/utils/pacmd.c:140
#, c-format
msgid "read(): %s"
msgstr "read(): %s"
-#: ../src/utils/pacmd.c:153
-#: ../src/utils/pacmd.c:167
+#: ../src/utils/pacmd.c:153 ../src/utils/pacmd.c:167
#, c-format
msgid "write(): %s"
msgstr "write(): %s"
@@ -1758,11 +1785,15 @@ msgid ""
"\n"
" -v, --verbose Enable verbose operation\n"
"\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"
" -d, --device=DEVICE The name of the sink 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"
+" -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"
" --channel-map=CHANNELMAP Set the channel map to the use\n"
msgstr ""
@@ -1797,3 +1828,9 @@ msgstr ""
msgid "Using sample spec '%s'\n"
msgstr ""
+#: ../src/pulsecore/lock-autospawn.c:126 ../src/pulsecore/lock-autospawn.c:207
+msgid "Cannot access autospawn lock."
+msgstr ""
+
+#~ msgid "socketpair(): %s"
+#~ msgstr "socketpair(): %s"
diff --git a/src/Makefile.am b/src/Makefile.am
index 9cbb9c7..f277198 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1590,7 +1590,7 @@ libbluetooth_ipc_la_LDFLAGS = -avoid-version
libbluetooth_ipc_la_LIBADD = $(AM_LIBADD)
libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS)
-module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c
+module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c modules/bluetooth/rtp.h
module_bluetooth_device_la_LDFLAGS = -module -avoid-version
module_bluetooth_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la libbluetooth-ipc.la libbluetooth-sbc.la libsocket-util.la
module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index bf9bad6..3460fe9 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -44,7 +44,7 @@
#include <pulsecore/time-smoother.h>
#include <pulsecore/rtclock.h>
-#include "dbus-util.h"
+#include "../dbus-util.h"
#include "module-bluetooth-device-symdef.h"
#include "ipc.h"
#include "sbc.h"
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 03abf26..0601e9a 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -34,7 +34,7 @@
#include <pulsecore/llist.h>
#include <pulsecore/core-util.h>
-#include "dbus-util.h"
+#include "../dbus-util.h"
#include "module-bluetooth-discover-symdef.h"
PA_MODULE_AUTHOR("Joao Paulo Rechi Vita");
diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c
index 5cca36e..4cfaaf5 100644
--- a/src/modules/bluetooth/module-bluetooth-proximity.c
+++ b/src/modules/bluetooth/module-bluetooth-proximity.c
@@ -43,7 +43,7 @@
#include <pulsecore/core-error.h>
#include <pulsecore/start-child.h>
-#include "dbus-util.h"
+#include "../dbus-util.h"
#include "module-bluetooth-proximity-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering");
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list