All of lore.kernel.org
 help / color / mirror / Atom feed
* Pulseaudio alsa configure hook
@ 2008-04-27 20:37 Sjoerd Simons
  2008-04-28  8:53 ` Colin Guthrie
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Sjoerd Simons @ 2008-04-27 20:37 UTC (permalink / raw)
  To: alsa-devel, pulseaudio-discuss

[-- Attachment #1: Type: text/plain, Size: 1305 bytes --]

Hi,

  The attached patch extends the alsa pulse plugin set with a alsa
  configuration hook. Allowing one to specify some configuration parameters
  that only come into effect when pulseaudio is running.

  For example a configution file like:

    @hooks [ {
       func on_pulse_is_running
         pcm.!default { type pulse }
         ctl.!default { type pulse }
       }
   ]

  will redirect the default alsa pcm and ctl to pulse iff pulse is running.
  (Assuming you defined the hook function correctly ofcourse)

  This is usefull for distributions that don't want to force their users to
  switch completely to pulseaudio, but have things a bit more dynamic :)

  The solutions isn't optimal though. It will mean that every program loading
  accessing alsa will try to make an (extra) connection to pulse to decide what
  to do. But i think it's the best we can do for now (or at least that i can do
  with my minimal knowledge of alsa).

  A nicer solution would be a way to always specify the pulse plugin as default
  and have a sort of fallback for when that fails.

  Comments on the patch appreciated :)

  Sjoerd
PS: I'm not on alsa-devel, so please keep me in the CC
-- 
GREAT MOMENTS IN HISTORY (#7):  April 2, 1751

Issac Newton becomes discouraged when he falls up a flight of stairs.

[-- Attachment #2: pulse-running-hook.patch --]
[-- Type: text/x-diff, Size: 3417 bytes --]

diff -r 1c30b7b2a8a3 pulse/Makefile.am
--- a/pulse/Makefile.am	Tue Apr 22 18:34:03 2008 +0200
+++ b/pulse/Makefile.am	Sun Apr 27 22:19:32 2008 +0200
@@ -1,8 +1,10 @@
 asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la
 asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la
+asound_module_conf_LTLIBRARIES = libasound_module_conf_pulse.la
 
 asound_module_pcmdir = @ALSA_PLUGIN_DIR@
 asound_module_ctldir = @ALSA_PLUGIN_DIR@
+asound_module_confdir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE
 AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined
@@ -12,3 +14,6 @@
 
 libasound_module_ctl_pulse_la_SOURCES = ctl_pulse.c pulse.c pulse.h
 libasound_module_ctl_pulse_la_LIBADD = @ALSA_LIBS@ $(PTHREAD_LIBS) $(pulseaudio_LIBS)
+
+libasound_module_conf_pulse_la_SOURCES = conf_pulse.c
+libasound_module_conf_pulse_la_LIBADD = @ALSA_LIBS@ $(PTHREAD_LIBS) $(pulseaudio_LIBS)
diff -r 1c30b7b2a8a3 pulse/conf_pulse.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pulse/conf_pulse.c	Sun Apr 27 22:19:32 2008 +0200
@@ -0,0 +1,88 @@
+/*
+ * ALSA configuration function extensions for pulse
+ *
+ * Copyright (c) 2008 by Sjoerd Simons <sjoerd@luon.net>
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA
+ *
+ */
+
+#include <stdio.h>
+
+#include <alsa/asoundlib.h>
+#include <pulse/pulseaudio.h>
+
+
+int
+conf_pulse_hook_on_is_running (snd_config_t *root, snd_config_t *config,
+    snd_config_t **dst, snd_config_t *private_data) {
+  snd_config_t *n = NULL;
+  pa_mainloop *loop = NULL;
+  pa_context *context = NULL;
+  int ret = 0, err, state;
+
+
+  /* Defined if we're called inside the pulsedaemon itself */
+  if (getenv("PULSE_INTERNAL") != NULL)
+    goto out;
+
+  loop = pa_mainloop_new();
+  if (loop == NULL)
+    goto out;
+
+  context = pa_context_new(pa_mainloop_get_api(loop), "Alsa hook");
+  if (context == NULL)
+    goto out;
+
+  err = pa_context_connect (context, NULL, 0, NULL);
+  if (err < 0)
+    goto out;
+
+  do {
+    err = pa_mainloop_prepare (loop, -1);
+    if (err < 0)
+       goto out;
+
+    err = pa_mainloop_poll (loop);
+    if (err < 0)
+      goto out;
+
+    err = pa_mainloop_dispatch (loop);
+    if (err < 0)
+      goto out;
+
+    state = pa_context_get_state(context);
+  } while (state < PA_CONTEXT_READY);
+
+  if (state != PA_CONTEXT_READY)
+    goto out;
+
+  ret = snd_config_expand(config, root, NULL, private_data, &n);
+
+out:
+  if (context != NULL)
+    pa_context_unref(context);
+
+  if (loop != NULL)
+    pa_mainloop_free(loop);
+
+  *dst = n;
+
+  return ret;
+}
+
+SND_DLSYM_BUILD_VERSION(conf_pulse_hook_on_is_running,
+  SND_CONFIG_DLSYM_VERSION_HOOK);

[-- Attachment #3: Type: text/plain, Size: 178 bytes --]

_______________________________________________
pulseaudio-discuss mailing list
pulseaudio-discuss@mail.0pointer.de
https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Pulseaudio alsa configure hook
  2008-04-27 20:37 Pulseaudio alsa configure hook Sjoerd Simons
@ 2008-04-28  8:53 ` Colin Guthrie
  2008-04-30 16:20 ` Takashi Iwai
  2008-05-01 13:58 ` Colin Guthrie
  2 siblings, 0 replies; 6+ messages in thread
From: Colin Guthrie @ 2008-04-28  8:53 UTC (permalink / raw)
  To: pulseaudio-discuss; +Cc: alsa-devel

Sjoerd Simons wrote:
>   The attached patch extends the alsa pulse plugin set with a alsa
>   configuration hook. Allowing one to specify some configuration parameters
>   that only come into effect when pulseaudio is running.

I was waiting with baited breath after your chat on IRC as to what your
solution would actually be!

I like it!

I think the overhead at initialisation is probably OK, although I guess
it depends on how an application works - e.g. if it constant opens and
closes alsa connections then does this overhead mount up? If not then
this looks like a good solution.

That said Lennart has said in the past that he didn't like the idea of
Alsa  automatically falling back to h/w access if pulse isn't
responding. (this was in reference to tweaking the alsa plugin itself,
rather than this approach which is slightly different conceptually,
albeit with the same end goal). I think his comment at the time was "it
masks configuration problems".

Do you have any thoughts on this Lennart?

Col

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Pulseaudio alsa configure hook
  2008-04-27 20:37 Pulseaudio alsa configure hook Sjoerd Simons
  2008-04-28  8:53 ` Colin Guthrie
@ 2008-04-30 16:20 ` Takashi Iwai
  2008-05-10 19:46   ` [alsa-devel] " Sjoerd Simons
  2008-05-01 13:58 ` Colin Guthrie
  2 siblings, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2008-04-30 16:20 UTC (permalink / raw)
  To: Sjoerd Simons; +Cc: pulseaudio-discuss, alsa-devel

At Sun, 27 Apr 2008 22:37:09 +0200,
Sjoerd Simons wrote:
> 
> Hi,
> 
>   The attached patch extends the alsa pulse plugin set with a alsa
>   configuration hook. Allowing one to specify some configuration parameters
>   that only come into effect when pulseaudio is running.
> 
>   For example a configution file like:
> 
>     @hooks [ {
>        func on_pulse_is_running
>          pcm.!default { type pulse }
>          ctl.!default { type pulse }
>        }
>    ]
> 
>   will redirect the default alsa pcm and ctl to pulse iff pulse is running.
>   (Assuming you defined the hook function correctly ofcourse)
> 
>   This is usefull for distributions that don't want to force their users to
>   switch completely to pulseaudio, but have things a bit more dynamic :)
> 
>   The solutions isn't optimal though. It will mean that every program loading
>   accessing alsa will try to make an (extra) connection to pulse to decide what
>   to do. But i think it's the best we can do for now (or at least that i can do
>   with my minimal knowledge of alsa).
> 
>   A nicer solution would be a way to always specify the pulse plugin as default
>   and have a sort of fallback for when that fails.
> 
>   Comments on the patch appreciated :)

This looks pretty interesting.
I forgot that this kind of stuff can be also a plugin :)

Applied to HG tree now.


Thanks!

Takashi

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Pulseaudio alsa configure hook
  2008-04-27 20:37 Pulseaudio alsa configure hook Sjoerd Simons
  2008-04-28  8:53 ` Colin Guthrie
  2008-04-30 16:20 ` Takashi Iwai
@ 2008-05-01 13:58 ` Colin Guthrie
  2 siblings, 0 replies; 6+ messages in thread
From: Colin Guthrie @ 2008-05-01 13:58 UTC (permalink / raw)
  To: pulseaudio-discuss; +Cc: alsa-devel

Sjoerd Simons wrote:
> Hi,
> 
>   The attached patch extends the alsa pulse plugin set with a alsa
>   configuration hook. Allowing one to specify some configuration parameters
>   that only come into effect when pulseaudio is running.
> 
>   For example a configution file like:
> 
>     @hooks [ {
>        func on_pulse_is_running
>          pcm.!default { type pulse }
>          ctl.!default { type pulse }
>        }
>    ]

Just a quick question as I've not had a chance to try this out yet!

Does your code consider pulse as unavailable if it's suspended?

e.g. by running:

$ pasuspender <annoying application that uses alsa in a weird way>

Would the hook still try and push alsa sound via pulse?


It would rock if it didn't but I suspect it will :)

Col

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [alsa-devel] Pulseaudio alsa configure hook
  2008-04-30 16:20 ` Takashi Iwai
@ 2008-05-10 19:46   ` Sjoerd Simons
  2008-05-13 13:35     ` Takashi Iwai
  0 siblings, 1 reply; 6+ messages in thread
From: Sjoerd Simons @ 2008-05-10 19:46 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: pulseaudio-discuss, alsa-devel

[-- Attachment #1: Type: text/plain, Size: 1531 bytes --]

On Wed, Apr 30, 2008 at 06:20:40PM +0200, Takashi Iwai wrote:
> At Sun, 27 Apr 2008 22:37:09 +0200,
> >   The attached patch extends the alsa pulse plugin set with a alsa
> >   configuration hook. Allowing one to specify some configuration parameters
> >   that only come into effect when pulseaudio is running.
> > 
> >   For example a configution file like:
> > 
> >     @hooks [ {
> >        func on_pulse_is_running
> >          pcm.!default { type pulse }
> >          ctl.!default { type pulse }
> >        }
> >    ]
> > 
> >   will redirect the default alsa pcm and ctl to pulse iff pulse is running.
> >   (Assuming you defined the hook function correctly ofcourse)

> This looks pretty interesting.
> I forgot that this kind of stuff can be also a plugin :)
> 
> Applied to HG tree now.

Thanks :).. Unfortunately some more testing revealed some issues with it,
specifically if pulse is running your complete config is replaced the bits in
the on_pulse_is_running directive. Which might not be what one actually wants :)

I couldn't find a proper solution for this. So i've changed the code to
optionally load config files. Just like the load hook does. Actually i just
optionally call the snd_config_hook_load function, but that's not actually in
the alsa API....

Also it now decides pulse is running as soon as the authorizing step begins
(just after the actually connection is setup), which should save some
round-trips and overhead.

Updated patch attached :)

  Sjoerd
-- 
For fast-acting relief, try slowing down.

[-- Attachment #2: alsa-pulse-conf.patch --]
[-- Type: text/x-diff, Size: 1503 bytes --]

diff -r 8b8cd8912f67 pulse/conf_pulse.c
--- a/pulse/conf_pulse.c	Wed Apr 30 20:18:15 2008 +0200
+++ b/pulse/conf_pulse.c	Sat May 10 21:28:23 2008 +0200
@@ -26,14 +26,19 @@
 #include <pulse/pulseaudio.h>
 
 
+/* Not actually part of the alsa api....  */
+extern int
+snd_config_hook_load (snd_config_t *root, snd_config_t *config,
+  snd_config_t **dst, snd_config_t *private_data);
+
 int
-conf_pulse_hook_on_is_running (snd_config_t *root, snd_config_t *config,
+conf_pulse_hook_load_if_running (snd_config_t *root, snd_config_t *config,
     snd_config_t **dst, snd_config_t *private_data) {
-  snd_config_t *n = NULL;
   pa_mainloop *loop = NULL;
   pa_context *context = NULL;
   int ret = 0, err, state;
 
+  *dst = NULL;
 
   /* Defined if we're called inside the pulsedaemon itself */
   if (getenv("PULSE_INTERNAL") != NULL)
@@ -65,12 +70,12 @@
       goto out;
 
     state = pa_context_get_state(context);
-  } while (state < PA_CONTEXT_READY);
+  } while (state < PA_CONTEXT_AUTHORIZING);
 
-  if (state != PA_CONTEXT_READY)
+  if (state > PA_CONTEXT_READY)
     goto out;
 
-  ret = snd_config_expand(config, root, NULL, private_data, &n);
+  ret = snd_config_hook_load(root, config, dst, private_data);
 
 out:
   if (context != NULL)
@@ -79,10 +84,8 @@
   if (loop != NULL)
     pa_mainloop_free(loop);
 
-  *dst = n;
-
   return ret;
 }
 
-SND_DLSYM_BUILD_VERSION(conf_pulse_hook_on_is_running,
+SND_DLSYM_BUILD_VERSION(conf_pulse_hook_load_if_running,
   SND_CONFIG_DLSYM_VERSION_HOOK);

[-- Attachment #3: Type: text/plain, Size: 178 bytes --]

_______________________________________________
pulseaudio-discuss mailing list
pulseaudio-discuss@mail.0pointer.de
https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [alsa-devel] Pulseaudio alsa configure hook
  2008-05-10 19:46   ` [alsa-devel] " Sjoerd Simons
@ 2008-05-13 13:35     ` Takashi Iwai
  0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2008-05-13 13:35 UTC (permalink / raw)
  To: Sjoerd Simons; +Cc: pulseaudio-discuss, alsa-devel

At Sat, 10 May 2008 21:46:25 +0200,
Sjoerd Simons wrote:
> 
> On Wed, Apr 30, 2008 at 06:20:40PM +0200, Takashi Iwai wrote:
> > At Sun, 27 Apr 2008 22:37:09 +0200,
> > >   The attached patch extends the alsa pulse plugin set with a alsa
> > >   configuration hook. Allowing one to specify some configuration parameters
> > >   that only come into effect when pulseaudio is running.
> > > 
> > >   For example a configution file like:
> > > 
> > >     @hooks [ {
> > >        func on_pulse_is_running
> > >          pcm.!default { type pulse }
> > >          ctl.!default { type pulse }
> > >        }
> > >    ]
> > > 
> > >   will redirect the default alsa pcm and ctl to pulse iff pulse is running.
> > >   (Assuming you defined the hook function correctly ofcourse)
> 
> > This looks pretty interesting.
> > I forgot that this kind of stuff can be also a plugin :)
> > 
> > Applied to HG tree now.
> 
> Thanks :).. Unfortunately some more testing revealed some issues with it,
> specifically if pulse is running your complete config is replaced the bits in
> the on_pulse_is_running directive. Which might not be what one actually wants :)
> 
> I couldn't find a proper solution for this. So i've changed the code to
> optionally load config files. Just like the load hook does. Actually i just
> optionally call the snd_config_hook_load function, but that's not actually in
> the alsa API....
> 
> Also it now decides pulse is running as soon as the authorizing step begins
> (just after the actually connection is setup), which should save some
> round-trips and overhead.
> 
> Updated patch attached :)

Thanks.  Applied to ALSA tree again.


Takashi

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-05-13 13:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-27 20:37 Pulseaudio alsa configure hook Sjoerd Simons
2008-04-28  8:53 ` Colin Guthrie
2008-04-30 16:20 ` Takashi Iwai
2008-05-10 19:46   ` [alsa-devel] " Sjoerd Simons
2008-05-13 13:35     ` Takashi Iwai
2008-05-01 13:58 ` Colin Guthrie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.