[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-165-g81cd219
Lennart Poettering
gitmailer-noreply at 0pointer.de
Wed Jan 7 14:50:18 PST 2009
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from 78e636e629518f67b667222bd92197f52c151b38 (commit)
- Log -----------------------------------------------------------------
81cd219... --check: Updated manpage slightly and pulseaudio --help slightly.
2f681a3... Merge commit 'vudentz/master'
e7e6f86... Fix sending wrong codec capability length.
1a96c9b... Fix send and recv message sizes.
be49c92... Send packets with proper size.
-----------------------------------------------------------------------
Summary of changes:
man/pulseaudio.1.xml.in | 6 ++++--
src/daemon/cmdline.c | 2 +-
src/modules/bluetooth/module-bluetooth-device.c | 14 +++++++++++---
3 files changed, 16 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
commit be49c92a381d433704438c810ce8e1b09b9aa550
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Mon Jan 5 19:12:43 2009 -0300
Send packets with proper size.
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 5974d48..492ee20 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -127,7 +127,7 @@ static int bt_audioservice_send(int sk, const bt_audio_msg_header_t *msg) {
type = bt_audio_strtype(msg->type);
name = bt_audio_strname(msg->name);
pa_log_debug("sending: %s -> %s", type, name);
- if (send(sk, msg, BT_SUGGESTED_BUFFER_SIZE, 0) > 0)
+ if (send(sk, msg, msg->length, 0) > 0)
e = 0;
else {
e = -errno;
commit 1a96c9b0a6dceeeb1701703fef8bdb15572662cf
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Tue Jan 6 11:00:44 2009 -0300
Fix send and recv message sizes.
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 492ee20..2546c69 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -123,11 +123,13 @@ static const char* const valid_modargs[] = {
static int bt_audioservice_send(int sk, const bt_audio_msg_header_t *msg) {
int e;
const char *type, *name;
+ uint16_t length;
+ length = msg->length ? msg->length : BT_SUGGESTED_BUFFER_SIZE;
type = bt_audio_strtype(msg->type);
name = bt_audio_strname(msg->name);
pa_log_debug("sending: %s -> %s", type, name);
- if (send(sk, msg, msg->length, 0) > 0)
+ if (send(sk, msg, length, 0) > 0)
e = 0;
else {
e = -errno;
@@ -139,9 +141,12 @@ static int bt_audioservice_send(int sk, const bt_audio_msg_header_t *msg) {
static int bt_audioservice_recv(int sk, bt_audio_msg_header_t *inmsg, uint16_t expected_length) {
int e;
const char *type, *name;
+ uint16_t length;
+
+ length = expected_length ? expected_length : BT_SUGGESTED_BUFFER_SIZE;
pa_log_debug("trying to receive msg from audio service...");
- if (recv(sk, inmsg, expected_length ? : BT_SUGGESTED_BUFFER_SIZE, 0) > 0) {
+ if (recv(sk, inmsg, length, 0) > 0) {
type = bt_audio_strtype(inmsg->type);
name = bt_audio_strname(inmsg->name);
if (type && name) {
commit e7e6f86bbe0dda37e906ed31144b44a83327ee02
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date: Tue Jan 6 11:02:16 2009 -0300
Fix sending wrong codec capability length.
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 2546c69..cb4746a 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -458,9 +458,12 @@ static int bt_setconf(struct userdata *u) {
strncpy(msg.setconf_req.device, u->addr, 18);
msg.setconf_req.codec.transport = u->transport;
- if (u->transport == BT_CAPABILITIES_TRANSPORT_A2DP)
+ if (u->transport == BT_CAPABILITIES_TRANSPORT_A2DP) {
memcpy(&msg.setconf_req.codec, &u->a2dp.sbc_capabilities,
sizeof(u->a2dp.sbc_capabilities));
+ msg.setconf_req.h.length += msg.setconf_req.codec.length
+ - sizeof(msg.setconf_req.codec);
+ }
msg.setconf_req.access_mode = BT_CAPABILITIES_ACCESS_MODE_WRITE;
e = bt_audioservice_send(u->audioservice_fd, &msg.setconf_req.h);
commit 2f681a3d18cf403eb8c3a3d2352ab5bfc0264cfd
Merge: 78e636e... e7e6f86...
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jan 7 22:59:25 2009 +0100
Merge commit 'vudentz/master'
commit 81cd21969ade4d8f14dd0e4c99ec9a2857a15b79
Author: Sean McNamara <smcnam at gmail.com>
Date: Wed Jan 7 23:29:16 2009 +0100
--check: Updated manpage slightly and pulseaudio --help slightly.
It's good for new users - I didn't know about the convention for
daemon checks to only bump the exit code until, say, a year after I
first installed Linux. Of course, we could also put an entire guide to
using Linux in our manpage, or tell users how to check the exit code
with $?, or how to get to the terminal, or an example script, ... (you
can see how this would quickly get out of control). So just a little
bit more hint should be good for now. John? Does this work for you?
Sean
Signed-off-by: Lennart Poettering <lennart at poettering.net>
diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index df82824..8810e90 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -72,7 +72,7 @@ USA.
</option>
<option>
- <p><opt>--dump-resampe-methods</opt></p>
+ <p><opt>--dump-resample-methods</opt></p>
<optdesc><p>List available audio resamplers.</p></optdesc>
</option>
@@ -110,7 +110,9 @@ USA.
<p><opt>--check</opt></p>
<optdesc><p>Return 0 as return code when the PulseAudio daemon
- is already running for the calling user.</p></optdesc>
+ is already running for the calling user, or non-zero
+ otherwise. Produces no output on the console except for errors
+ to stderr.</p></optdesc>
</option>
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 0bfc8a9..cc3d714 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -130,7 +130,7 @@ void pa_cmdline_help(const char *argv0) {
" --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"
+ " --check Check for a running daemon (only returns exit code)\n\n"
"OPTIONS:\n"
" --system[=BOOL] Run as system-wide instance\n"
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list