gmane.comp.audio.pulseaudio.general

Re: Is it OK for PulseAudio to crashwhenBlueZ is buggy?

Tanu Kaskinen — 2012-05-23T13:11:33

Thanks for the information. I had the assumption[1] that the device
addresses should be unique, but if they're not, the code that I've
written is certainly broken.

[1] I tried to verify my assumption first by asking on the #bluez irc
channel, and after getting no responses, I checked the bluetoothd code
and it seemed like the addresses would be guaranteed to be unique. The
device objects were put in a map with the address as the key, so there
could be no duplicates, but I guess I missed the fact that there are
multiple of those maps, one for each adapter.

Re: [RFC v0 0/5] Multiple Bluetooth SCOconnections

Luiz Augusto von Dentz — 2012-05-23T09:55:30

Hi Mikel,

On Wed, Apr 11, 2012 at 10:00 AM, Mikel Astiz <mikel.astiz.oss< at >gmail.com> wrote:

Patches 1-3 I can ack, but the changes to MTU we need to investigate a
bit better what is going on, so I would leave them out for now.

Re: [PATCH] bluetooth: Let PulseAudio always handle the transition to SINK_STATE_PLAYING.

Luiz Augusto von Dentz — 2012-05-23T09:39:34

Hi Jarkko,

On Thu, Apr 19, 2012 at 3:52 PM, Jarkko Suontausta
<jarkko.suontausta< at >digia.com> wrote:

I don't get what exactly is wrong here, if it is playing we should not
do anything, perhaps this is a problem with the frequency being
different when the headset is the initiator. Btw, do you have any logs
about this problem?

Re: [PATCH] Add profile argument tomodule-bluetooth-discover

Luiz Augusto von Dentz — 2012-05-23T09:24:06

Hi Jess,

On Sat, Apr 21, 2012 at 12:23 AM, Jess Haas <pa< at >jesshaas.com> wrote:

I guess we need the policy module to handle this case, the policy
should be if there is no voice/call default A2DP otherwise HFP should
be used.

Re: Is it OK for PulseAudio to crash when BlueZ is buggy?

Luiz Augusto von Dentz — 2012-05-23T09:20:28

Hi Tanu,

On Wed, May 9, 2012 at 8:26 PM, Tanu Kaskinen <tanuk< at >iki.fi> wrote:

Btw, are you sure this is a problem? We can have the same address in
different devices if they are paired with different adapters,
otherwise it is a bug and we should be able to fix it.

Re: [PATCH] bluetooth: Release transport when the pa_rtpoll_run loop finishes.

Luiz Augusto von Dentz — 2012-05-23T09:15:41

Hi Jarkko,

On Tue, May 22, 2012 at 3:58 PM, Jarkko Suontausta
<jarkko.suontausta< at >digia.com> wrote:

Looks good, ack.

Re: Patches for Solaris

Brian Cameron — 2012-05-23T02:01:10

Apologies, but I had an error in my previous patch.  The #if test
was reversed.  Sorry about this.  The attached patch is correct.

Brian


On 05/22/12 08:55 PM, Brian Cameron wrote:

--- pulseaudio-1.1/src/pulsecore/shm.c-orig2011-10-24 19:42:44.692685416 -0500
+++ pulseaudio-1.1/src/pulsecore/shm.c2011-10-24 20:24:30.605598557 -0500
< at >< at > -68,8 +68,13 < at >< at >
  * /dev/shm. We can use that information to list all blocks and
  * cleanup unused ones */
 #define SHM_PATH "/dev/shm/"
+#define SHM_ID_LEN 10
+#elif defined(__sun)
+#define SHM_PATH "/tmp"
+#define SHM_ID_LEN 15
 #else
 #undef SHM_PATH
+#define SHM_ID_LEN 0
 #endif
 
 #define SHM_MARKER ((int) 0xbeefcafe)
< at >< at > -359,10 +364,14 < at >< at > int pa_shm_cleanup(void) {
         char fn[128];
         struct shm_marker *m;
 
-        if (strncmp(de->d_name, "pulse-shm-", 10))
+#ifdef defined(__sun)
+        if (strncmp(de->d_name, ".SHMDpulse-shm-", SHM_ID_LEN))
+#else
+        if (strncmp(de->d_name, "pulse-shm-", SHM_ID_LEN))
+#endif
             continue;
 
-        if (pa_atou(de->d_name + 10, &id) < 0)
+        if (pa_atou(de->d_name + SHM_ID_LEN, &id) < 0)
             continue;
 
         if (pa_shm_attach_ro(&seg, id) < 0)
_______________________________________________
pulseaudio-discuss mailing list
pulseaudio-discuss< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss

Patches for Solaris

Brian Cameron — 2012-05-23T01:55:45

I am attaching 3 patches for consideration upstream:

- pulseaudio-05-shm.diff
   The shm files on Solaris end up with a different name.  This patch
   makes the code work on Solaris too.

- pulseaudio-07-sada.diff
   Fixes to improve the SunAudio plugin so it works better.

- pulsaudio-10-endian.diff
   On Sparc, WORDS_BIGENDIAN needs to get set if _BIG_ENDIAN is set.

Brian
--- pulseaudio-1.1/src/pulsecore/shm.c-orig2011-10-24 19:42:44.692685416 -0500
+++ pulseaudio-1.1/src/pulsecore/shm.c2011-10-24 20:24:30.605598557 -0500
< at >< at > -68,8 +68,13 < at >< at >
  * /dev/shm. We can use that information to list all blocks and
  * cleanup unused ones */
 #define SHM_PATH "/dev/shm/"
+#define SHM_ID_LEN 10
+#elif defined(__sun)
+#define SHM_PATH "/tmp"
+#define SHM_ID_LEN 15
 #else
 #undef SHM_PATH
+#define SHM_ID_LEN 0
 #endif
 
 #define SHM_MARKER ((int) 0xbeefcafe)
< at >< at > -359,10 +364,14 < at >< at > int pa_shm_cleanup(void) {
         char fn[128];
         struct shm_marker *m;
 
-        if (strncmp(de->d_name, "pulse-shm-", 10))
+#ifdef defined(__sun)
+        if (strncmp(de->d_name, "pulse-shm-", SHM_ID_LEN))
+#else
+        if (strncmp(de->d_name, ".SHMDpulse-shm-", SHM_ID_LEN))
+#endif
             continue;
 
-        if (pa_atou(de->d_name + 10, &id) < 0)
+        if (pa_atou(de->d_name + SHM_ID_LEN, &id) < 0)
             continue;
 
         if (pa_shm_attach_ro(&seg, id) < 0)
--- pulseaudio-1.1/src/modules/module-solaris.c-orig2012-05-14 20:28:17.916336872 -0500
+++ pulseaudio-1.1/src/modules/module-solaris.c2012-05-14 20:28:38.353786471 -0500
< at >< at > -137,6 +137,7 < at >< at > static const char* const valid_modargs[]
 static uint64_t get_playback_buffered_bytes(struct userdata *u) {
     audio_info_t info;
     uint64_t played_bytes;
+    int64_t buffered_bytes;
     int err;
 
     pa_assert(u->sink);
< at >< at > -163,7 +164,13 < at >< at > static uint64_t get_playback_buffered_by
 
     pa_smoother_put(u->smoother, pa_rtclock_now(), pa_bytes_to_usec(played_bytes, &u->sink->sample_spec));
 
-    return u->written_bytes - played_bytes;
+    buffered_bytes = u->written_bytes - played_bytes;
+
+    if (buffered_bytes < 0) {
+        buffered_bytes = 0;
+    }
+
+    return (uint64_t) buffered_bytes;
 }
 
 static pa_usec_t sink_get_latency(struct userdata *u, pa_sample_spec *ss) {
< at >< at > -348,7 +355,7 < at >< at > static int suspend(struct userdata *u) {
 
     pa_log_info("Suspending...");
 
-    ioctl(u->fd, AUDIO_DRAIN, NULL);
+    ioctl(u->fd, I_FLUSH, FLUSHRW);
     pa_close(u->fd);
     u->fd = -1;
 
< at >< at > -485,14 +492,26 < at >< at > static int source_process_msg(pa_msgobje
 static void sink_set_volume(pa_sink *s) {
     struct userdata *u;
     audio_info_t info;
+    pa_volume_t v;
 
     pa_assert_se(u = s->userdata);
 
+    if (u->fd < 0) {
+       u->fd = pa_open_cloexec(u->device_name, u->mode | O_NONBLOCK, 0);
+    }
+
     if (u->fd >= 0) {
         AUDIO_INITINFO(&info);
 
-        info.play.gain = pa_cvolume_max(&s->real_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
-        assert(info.play.gain <= AUDIO_MAX_GAIN);
+        v = pa_cvolume_max(&s->real_volume);
+        if (v > PA_VOLUME_NORM) {
+                v = PA_VOLUME_NORM;
+        }
+
+        info.play.gain = v * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
+
+        pa_log_debug("PA_VOLUME_NORM is %ld", PA_VOLUME_NORM);
+        pa_log_debug("Setting volume %ld %ld", v, info.play.gain);
 
         if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
             if (errno == EINVAL)
< at >< at > -513,6 +532,7 < at >< at > static void sink_get_volume(pa_sink *s) 
         if (ioctl(u->fd, AUDIO_GETINFO, &info) < 0)
             pa_log("AUDIO_SETINFO: %s", pa_cstrerror(errno));
         else
+            pa_log_debug("Getting volume %ld %ld", info.play.gain, (info.play.gain * PA_VOLUME_NORM / AUDIO_MAX_GAIN));
             pa_cvolume_set(&s->real_volume, s->sample_spec.channels, info.play.gain * PA_VOLUME_NORM / AUDIO_MAX_GAIN);
     }
 }
< at >< at > -520,14 +540,19 < at >< at > static void sink_get_volume(pa_sink *s) 
 static void source_set_volume(pa_source *s) {
     struct userdata *u;
     audio_info_t info;
+    pa_volume_t v;
 
     pa_assert_se(u = s->userdata);
 
     if (u->fd >= 0) {
         AUDIO_INITINFO(&info);
 
-        info.play.gain = pa_cvolume_max(&s->real_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
-        assert(info.play.gain <= AUDIO_MAX_GAIN);
+        v = pa_cvolume_max(&s->real_volume);
+        if (v > PA_VOLUME_NORM) {
+                v = PA_VOLUME_NORM;
+        }
+
+        info.play.gain = v * AUDIO_MAX_GAIN / PA_VOLUME_NORM;
 
         if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
             if (errno == EINVAL)
--- pulseaudio-1.1/src/pulse/sample.h-orig2012-05-14 20:24:44.242497036 -0500
+++ pulseaudio-1.1/src/pulse/sample.h2012-05-14 20:24:27.792501491 -0500
< at >< at > -117,6 +117,9 < at >< at > PA_C_DECL_BEGIN
 #define WORDS_BIGENDIAN
 #endif
 #endif
+#if defined(_BIG_ENDIAN)
+#define WORDS_BIGENDIAN
+#endif
 #endif
 
 /** Maximum number of allowed channels */
_______________________________________________
pulseaudio-discuss mailing list
pulseaudio-discuss< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss

Re: [PATCH] udev modules: don't use deprecatedfunctions

Marc-Antoine Perennou — 2012-05-23T08:41:38

Btw, these values have been unconditionnaly returned by udev for a while.

On 17 May 2012 22:50, Marc-Antoine Perennou <Marc-Antoine< at >perennou.com>wrote:

_______________________________________________
pulseaudio-discuss mailing list
pulseaudio-discuss< at >lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss

Re: [PATCH] protocol-native: Use foreach to iterate trough modules.

Tanu Kaskinen — 2012-05-23T03:35:53

Thanks, applied.

Re: [PATCH] protocol-native: Use foreach toiterate trough modules.

2012-05-22T16:27:43

I accidentally sent a bad patch, sorry for the spam.
This one should work.
From bfc8131e575f4ba50fdb899573bd5d3812c344af Mon Sep 17 00:00:00 2001
From: poljar <poljarinho< at >gmail.com>
Date: Mon, 21 May 2012 21:42:20 +0200
Subject: [PATCH] protocol-native: Use foreach to iterate trough modules.

The PA_IDXSET_FOREACH is easier to read than the standard for loop.
Also pa_streq() should be used for checking string equality.
---
 src/pulsecore/protocol-native.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 396e143..b0fc8c8 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
< at >< at > -4623,11 +4623,10 < at >< at > static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag,
 
     if (idx != PA_INVALID_INDEX)
         m = pa_idxset_get_by_index(c->protocol->core->modules, idx);
-    else {
-        for (m = pa_idxset_first(c->protocol->core->modules, &idx); m; m = pa_idxset_next(c->protocol->core->modules, &idx))
-            if (strcmp(name, m->name) == 0)
+    else
+        PA_IDXSET_FOREACH(m, c->protocol->core->modules, idx)
+            if (pa_streq(name, m->name))
                 break;
-    }
 
     CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION);
     CHECK_VALIDITY(c->pstream, m->load_once || idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID);

[PATCH 3/3] pactl: Add unloading modules byname

poljar — 2012-05-22T16:06:14

pactl was updated to make use of the recently added support for
unloading modules by name.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=48289
---
 man/pactl.1.xml.in |    4 ++--
 src/utils/pactl.c  |   15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in
index 86e7609..693a5c5 100644
--- a/man/pactl.1.xml.in
+++ b/man/pactl.1.xml.in
< at >< at > -119,8 +119,8 < at >< at > USA.
     </option>
 
     <option>
-      <p><opt>unload-module</opt> <arg>ID</arg></p>
-      <optdesc><p>Unload the module instance identified by the specified numeric index.</p></optdesc>
+      <p><opt>unload-module</opt> <arg>ID|NAME</arg></p>
+      <optdesc><p>Unload the module instance identified by the specified numeric index or unload all modules by the sepcified name.</p></optdesc>
     </option>
 
     <option>
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 05a1519..5af4563 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
< at >< at > -32,6 +32,7 < at >< at >
 #include <stdlib.h>
 #include <getopt.h>
 #include <locale.h>
+#include <ctype.h>
 
 #include <sndfile.h>
 
< at >< at > -1152,7 +1153,10 < at >< at > static void context_state_callback(pa_context *c, void *userdata) {
                     break;
 
                 case UNLOAD_MODULE:
-                    pa_operation_unref(pa_context_unload_module(c, module_index, simple_callback, NULL));
+                    if (module_name)
+                        pa_operation_unref(pa_context_unload_module_by_name(c, module_name, simple_callback, NULL));
+                    else
+                        pa_operation_unref(pa_context_unload_module_by_index(c, module_index, simple_callback, NULL));
                     break;
 
                 case SUSPEND_SINK:
< at >< at > -1345,7 +1349,7 < at >< at > static void help(const char *argv0) {
     printf("%s %s %s %s\n", argv0, _("[options]"), "play-sample ", _("NAME [SINK]"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "remove-sample ", _("NAME"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "load-module ", _("NAME [ARGS ...]"));
-    printf("%s %s %s %s\n", argv0, _("[options]"), "unload-module ", _("#N"));
+    printf("%s %s %s %s\n", argv0, _("[options]"), "unload-module ", _("NAME|#N"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "move-(sink-input|source-output)", _("#N SINK|SOURCE"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "suspend-(sink|source)", _("NAME|#N 1|0"));
     printf("%s %s %s %s\n", argv0, _("[options]"), "set-card-profile ", _("CARD PROFILE"));
< at >< at > -1568,11 +1572,14 < at >< at > int main(int argc, char *argv[]) {
             action = UNLOAD_MODULE;
 
             if (argc != optind+2) {
-                pa_log(_("You have to specify a module index"));
+                pa_log(_("You have to specify a module index or name"));
                 goto quit;
             }
 
-            module_index = (uint32_t) atoi(argv[optind+1]);
+            if (isdigit(argv[optind+1][0]))
+                module_index = (uint32_t) atoi(argv[optind+1]);
+            else
+                module_name = argv[optind+1];
 
         } else if (pa_streq(argv[optind], "suspend-sink")) {
             action = SUSPEND_SINK;

[PATCH 2/3] introspect: Add unloading modulesby name

poljar — 2012-05-22T16:06:13

The native protocol should handle unloading modules by name. This
updates the protocol and client API.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=48289
---
 PROTOCOL                        |    7 +++++++
 configure.ac                    |    2 +-
 src/map-file                    |    2 ++
 src/pulse/introspect.c          |   31 ++++++++++++++++++++++++++++++-
 src/pulse/introspect.h          |   12 +++++++++---
 src/pulsecore/native-common.h   |    5 ++++-
 src/pulsecore/protocol-native.c |   30 ++++++++++++++++++++++++++----
 7 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/PROTOCOL b/PROTOCOL
index acd53ba..9b8c9fe 100644
--- a/PROTOCOL
+++ b/PROTOCOL
< at >< at > -321,6 +321,13 < at >< at > PA_COMMAND_GET_CARD_INFO_LIST), the following is added:
 
 Profile names must match earlier sent profile names for the same card.
 
+## v27, implemented by >= 3.0
+
+Renamed opcodes:
+    PA_COMMAND_UNLOAD_MODULE -> PA_COMMAND_UNLOAD_MODULE_BY_INDEX
+
+New opcodes:
+    PA_COMMAND_UNLOAD_MODULE_BY_NAME
 
 #### If you just changed the protocol, read this
 ## module-tunnel depends on the sink/source/sink-input/source-input protocol
diff --git a/configure.ac b/configure.ac
index f5f9b76..62cc5f8 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -36,7 +36,7 < at >< at > AC_SUBST(PA_MINOR, pa_minor)
 AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)
 
 AC_SUBST(PA_API_VERSION, 12)
-AC_SUBST(PA_PROTOCOL_VERSION, 26)
+AC_SUBST(PA_PROTOCOL_VERSION, 27)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
diff --git a/src/map-file b/src/map-file
index 69cf25b..4a9b95b 100644
--- a/src/map-file
+++ b/src/map-file
< at >< at > -114,6 +114,8 < at >< at > pa_context_suspend_sink_by_name;
 pa_context_suspend_source_by_index;
 pa_context_suspend_source_by_name;
 pa_context_unload_module;
+pa_context_unload_module_by_index;
+pa_context_unload_module_by_name;
 pa_context_unref;
 pa_cvolume_avg;
 pa_cvolume_avg_mask;
diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index 38a9d1c..e251bcc 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
< at >< at > -1864,8 +1864,37 < at >< at > pa_operation* pa_context_load_module(pa_context *c, const char*name, const char
     return o;
 }
 
+PA_WARN_REFERENCE(pa_context_unload_module, "This function is deprecated, use pa_context_unload_module_by_{name,index}");
+
 pa_operation* pa_context_unload_module(pa_context *c, uint32_t idx, pa_context_success_cb_t cb, void *userdata) {
-    return command_kill(c, PA_COMMAND_UNLOAD_MODULE, idx, cb, userdata);
+    return command_kill(c, PA_COMMAND_UNLOAD_MODULE_BY_INDEX, idx, cb, userdata);
+}
+
+pa_operation* pa_context_unload_module_by_index(pa_context *c, uint32_t idx, pa_context_success_cb_t cb, void *userdata) {
+    return command_kill(c, PA_COMMAND_UNLOAD_MODULE_BY_INDEX, idx, cb, userdata);
+}
+
+pa_operation* pa_context_unload_module_by_name(pa_context *c, const char *name, pa_context_success_cb_t cb, void *userdata) {
+    pa_operation *o;
+    pa_tagstruct *t;
+    uint32_t tag;
+
+    pa_assert(c);
+    pa_assert(PA_REFCNT_VALUE(c) >= 1);
+
+    PA_CHECK_VALIDITY_RETURN_NULL(c, !pa_detect_fork(), PA_ERR_FORKED);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, name && *name, PA_ERR_INVALID);
+    PA_CHECK_VALIDITY_RETURN_NULL(c, c->version >= 27, PA_ERR_NOTSUPPORTED);
+
+    o = pa_operation_new(c, NULL, (pa_operation_cb_t) cb, userdata);
+
+    t = pa_tagstruct_command(c, PA_COMMAND_UNLOAD_MODULE_BY_NAME, &tag);
+    pa_tagstruct_puts(t, name);
+    pa_pstream_send_tagstruct(c->pstream, t);
+    pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, pa_operation_ref(o), (pa_free_cb_t) pa_operation_unref);
+
+    return o;
 }
 
 /*** Autoload stuff ***/
diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h
index 0072f5d..203798c 100644
--- a/src/pulse/introspect.h
+++ b/src/pulse/introspect.h
< at >< at > -176,7 +176,7 < at >< at >
  * \subsection module_subsec Modules
  *
  * Server modules can be remotely loaded and unloaded using
- * pa_context_load_module() and pa_context_unload_module().
+ * pa_context_load_module() and pa_context_unload_module_by_{name|index}().
  *
  * \subsection client_subsec Clients
  *
< at >< at > -409,8 +409,14 < at >< at > typedef void (*pa_context_index_cb_t)(pa_context *c, uint32_t idx, void *userdat
 /** Load a module. */
 pa_operation* pa_context_load_module(pa_context *c, const char*name, const char *argument, pa_context_index_cb_t cb, void *userdata);
 
-/** Unload a module. */
-pa_operation* pa_context_unload_module(pa_context *c, uint32_t idx, pa_context_success_cb_t cb, void *userdata);
+/** \deprecated Unload a module. */
+pa_operation* pa_context_unload_module(pa_context *c, uint32_t idx, pa_context_success_cb_t cb, void *userdata) PA_GCC_DEPRECATED;
+
+/** Unload a module by its index. \since 3.0 */
+pa_operation* pa_context_unload_module_by_index(pa_context *c, uint32_t idx, pa_context_success_cb_t cb, void *userdata);
+
+/** Unload a module by its name. \since 3.0 */
+pa_operation* pa_context_unload_module_by_name(pa_context *c, const char*name, pa_context_success_cb_t cb, void *userdata);
 
 /** < at >} */
 
diff --git a/src/pulsecore/native-common.h b/src/pulsecore/native-common.h
index 8fde023..1b50e01 100644
--- a/src/pulsecore/native-common.h
+++ b/src/pulsecore/native-common.h
< at >< at > -92,7 +92,7 < at >< at > enum {
     PA_COMMAND_KILL_SOURCE_OUTPUT,
 
     PA_COMMAND_LOAD_MODULE,
-    PA_COMMAND_UNLOAD_MODULE,
+    PA_COMMAND_UNLOAD_MODULE_BY_INDEX,
 
     /* Obsolete */
     PA_COMMAND_ADD_AUTOLOAD___OBSOLETE,
< at >< at > -173,6 +173,9 < at >< at > enum {
     PA_COMMAND_SET_SOURCE_OUTPUT_VOLUME,
     PA_COMMAND_SET_SOURCE_OUTPUT_MUTE,
 
+    /* Supported since protocol v27 (3.0) */
+    PA_COMMAND_UNLOAD_MODULE_BY_NAME,
+
     PA_COMMAND_MAX
 };
 
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 396e143..6ec1cbc 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
< at >< at > -280,7 +280,8 < at >< at > static void command_set_default_sink_or_source(pa_pdispatch *pd, uint32_t comman
 static void command_set_stream_name(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 static void command_kill(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 static void command_load_module(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_unload_module(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_unload_module_by_index(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_unload_module_by_name(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 static void command_cork_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 static void command_flush_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
 static void command_move_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
< at >< at > -364,7 +365,8 < at >< at > static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
     [PA_COMMAND_KILL_SINK_INPUT] = command_kill,
     [PA_COMMAND_KILL_SOURCE_OUTPUT] = command_kill,
     [PA_COMMAND_LOAD_MODULE] = command_load_module,
-    [PA_COMMAND_UNLOAD_MODULE] = command_unload_module,
+    [PA_COMMAND_UNLOAD_MODULE_BY_INDEX] = command_unload_module_by_index,
+    [PA_COMMAND_UNLOAD_MODULE_BY_NAME] = command_unload_module_by_name,
 
     [PA_COMMAND_GET_AUTOLOAD_INFO___OBSOLETE] = NULL,
     [PA_COMMAND_GET_AUTOLOAD_INFO_LIST___OBSOLETE] = NULL,
< at >< at > -393,7 +395,7 < at >< at > static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
     [PA_COMMAND_SET_SINK_PORT] = command_set_sink_or_source_port,
     [PA_COMMAND_SET_SOURCE_PORT] = command_set_sink_or_source_port,
 
-    [PA_COMMAND_EXTENSION] = command_extension
+    [PA_COMMAND_EXTENSION] = command_extension,
 };
 
 /* structure management */
< at >< at > -4431,7 +4433,7 < at >< at > static void command_load_module(pa_pdispatch *pd, uint32_t command, uint32_t tag
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_unload_module(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
+static void command_unload_module_by_index(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
     uint32_t idx;
     pa_module *m;
< at >< at > -4453,6 +4455,26 < at >< at > static void command_unload_module(pa_pdispatch *pd, uint32_t command, uint32_t t
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
+static void command_unload_module_by_name(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
+    pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
+    const char *name;
+
+    pa_native_connection_assert_ref(c);
+    pa_assert(t);
+
+    if (pa_tagstruct_gets(t, &name) < 0 ||
+        !pa_tagstruct_eof(t)) {
+        protocol_error(c);
+    }
+
+    CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);
+    CHECK_VALIDITY(c->pstream, name, tag, PA_ERR_INVALID);
+
+    /** Todo add error reporting if no module is unloaded */
+    pa_module_unload_request_by_name(c->protocol->core, name, FALSE);
+    pa_pstream_send_simple_ack(c->pstream, tag);
+}
+
 static void command_move_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
     uint32_t idx = PA_INVALID_INDEX, idx_device = PA_INVALID_INDEX;

[PATCH 1/3] module: Add support for unloadingby name.

poljar — 2012-05-22T16:06:12

The request for unloading modules by name was added to module.c.
If there are more modules with the same name all of them are unloaded.
---
 src/pulsecore/module.c |   11 +++++++++++
 src/pulsecore/module.h |    1 +
 2 files changed, 12 insertions(+)

diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c
index 8b3ff8f..332bc2b 100644
--- a/src/pulsecore/module.c
+++ b/src/pulsecore/module.c
< at >< at > -252,6 +252,17 < at >< at > void pa_module_unload_request_by_index(pa_core *c, uint32_t idx, pa_bool_t force
     pa_module_unload_request(m, force);
 }
 
+void pa_module_unload_request_by_name(pa_core *c, const char *name, pa_bool_t force) {
+    pa_module *m;
+    uint32_t idx;
+
+    pa_assert(c);
+
+    PA_IDXSET_FOREACH(m, c->modules, idx)
+        if (pa_streq(name, m->name))
+            pa_module_unload_request(m, force);
+}
+
 int pa_module_get_n_used(pa_module*m) {
     pa_assert(m);
 
diff --git a/src/pulsecore/module.h b/src/pulsecore/module.h
index 0b6cb7c..2ba452c 100644
--- a/src/pulsecore/module.h
+++ b/src/pulsecore/module.h
< at >< at > -57,6 +57,7 < at >< at > void pa_module_unload_by_index(pa_core *c, uint32_t idx, pa_bool_t force);
 
 void pa_module_unload_request(pa_module *m, pa_bool_t force);
 void pa_module_unload_request_by_index(pa_core *c, uint32_t idx, pa_bool_t force);
+void pa_module_unload_request_by_name(pa_core *c, const char *name, pa_bool_t force);
 
 void pa_module_unload_all(pa_core *c);

[PATCH 0/3] Unloading modules by name

poljar — 2012-05-22T16:06:11

A new function was added to module.c to handle unload requests by name.
The native protocol was extended and a new opcode was introduced, and 
finally pactl was extended to make use of the new functionality.

 PROTOCOL                        |    7 +++++++
 configure.ac                    |    2 +-
 man/pactl.1.xml.in              |    4 ++--
 src/map-file                    |    2 ++
 src/pulse/introspect.c          |   31 ++++++++++++++++++++++++++++++-
 src/pulse/introspect.h          |   12 +++++++++---
 src/pulsecore/module.c          |   11 +++++++++++
 src/pulsecore/module.h          |    1 + 
 src/pulsecore/native-common.h   |    5 ++++-
 src/pulsecore/protocol-native.c |   30 ++++++++++++++++++++++++++----
 src/utils/pactl.c               |   15 +++++++++++----

[PATCH] bluetooth: Release transport when thepa_rtpoll_run loop finishes.

Jarkko Suontausta — 2012-05-22T12:58:33

Based on a patch by Marko Ollonen.
---
 src/modules/bluetooth/module-bluetooth-device.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 0b12cc7..68c4efc 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
< at >< at > -1731,11 +1731,18 < at >< at > static void thread_func(void *userdata) {
             pollfd->events = (short) (((u->sink && PA_SINK_IS_LINKED(u->sink->thread_info.state) && !writable) ? POLLOUT : 0) |
                                       (u->source && PA_SOURCE_IS_LINKED(u->source->thread_info.state) ? POLLIN : 0));
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) {
+            pa_log_debug("pa_rtpoll_run failed with: %d", ret);
             goto fail;
-
-        if (ret == 0)
+        }
+        if (ret == 0) {
+            pa_log_debug("IO thread shutdown requested, stopping cleanly");
+            if (u->transport)
+                bt_transport_release(u);
+            else
+                stop_stream_fd(u);
             goto finish;
+        }
 
         pollfd = u->rtpoll_item ? pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL) : NULL;

[PATCH] protocol-native: Use foreach toiterate trough modules.

poljar — 2012-05-22T12:37:09

The PA_IDXSET_FOREACH is easier to read than the standard for loop.
Also pa_streq() should be used for checking string equality.
---
 src/pulsecore/protocol-native.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index c2d5fcf..f221d21 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
< at >< at > -4621,8 +4621,8 < at >< at > static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag,
     if (idx != PA_INVALID_INDEX)
         m = pa_idxset_get_by_index(c->protocol->core->modules, idx);
     else {
-        for (m = pa_idxset_first(c->protocol->core->modules, &idx); m; m = pa_idxset_next(c->protocol->core->modules, &idx))
-            if (strcmp(name, m->name) == 0)
+        PA_IDXSET_FOREACH(m, c->protocol->core->modules, idx) {
+            if (pa_streq(name, m->name))
                 break;
     }

Re: About My Blog Space

Colin Guthrie — 2012-05-22T08:36:28

Hi Deng,

'Twas brillig, and rong deng at 21/05/12 16:45 did gyre and gimble:

That's perfect!!

Your feed is now included here:
http://freedesktop.org/software/pulseaudio/planet/

If you would like a little face icon to go with your posts (e.g. see
what Arun's posts look like) please email me a suitable png file. Size
isn't too important but about 80x100px is probably about right.

Also, I have momentarily forgotten your IRC nick name, so please let me
know that when you get a sec and I'll add it into the feed. It's not all
that important but it's a nice to have :)

Cheers

Col

Failed to load module "module-bluetooth-device"

Juha Heinanen — 2012-05-22T08:04:56

when i give command

aplay gong.wav

the file plays ok via bluetooth speaker, but i get to console:

Playing WAVE 'gong.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo
May 22 10:57:59 siika kernel: [27439.133117] input: 00:02:3C:30:37:DE as /devices/virtual/input/input28
May 22 10:57:59 siika pulseaudio[4416]: [pulseaudio] module.c: Failed to load module "module-bluetooth-device" (argument: "address="00:02:3C:30:37:DE" path="/org/bluez/2553/hci0/dev_00_02_3C_30_37_DE""): initialization failed.
May 22 10:57:59 siika pulseaudio[4416]: [pulseaudio] module.c: Failed to load module "module-bluetooth-device" (argument: "address="00:02:3C:30:37:DE" path="/org/bluez/2553/hci0/dev_00_02_3C_30_37_DE""): initialization failed.
May 22 10:57:59 siika pulseaudio[4416]: [pulseaudio] module.c: Failed to load module "module-bluetooth-device" (argument: "address="00:02:3C:30:37:DE" path="/org/bluez/2553/hci0/dev_00_02_3C_30_37_DE""): initialization failed.
jh< at >siika:~$ May 22 10:58:04 siika rtkit-daemon[4418]: Successfully made thread 24411 of process 4416 (/usr/bin/pulseaudio (deleted)) owned by '1000' RT at priority 5.

why is that?

and then when i give command

paplay gong.wav

the file gets played via internal speaker, not bluetooth
speaker. pavucontrol does show bluetooth speaker after aplay command,
but then it disappears.  how do i tell to paplay to use by
default the bluetooth speaker if it is turned on?

Re: [PATCH] pactl: Added unloading modules by name

Tanu Kaskinen — 2012-05-22T01:56:28

Ok. The check in the module loading command is probably done because the
name will be used when accessing the file system. With module unloading
there's no need to worry about that.


Thanks!

Re: My attempt to reduce latency with pacat and tvtime

Steven Elliott — 2012-05-22T01:30:04

That's an interesting idea.  I suppose the audio frames would have to be
queued up and then rendered after the appropriate delay.  I'm not sure
if that would be simpler than my patch or not.  I'd have to know more
about how tvtime handles audio.

One concern is that tvtime has not had a release since 2005.  Also, are
there other programs that don't maintain A/V sync?  Perhaps it would
benefit them as well.


Fair enough.  My hope was just to keep it low enough.