discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=fc9e8865cfb17a556a8a7efd1983ba211c16e545

commit fc9e8865cfb17a556a8a7efd1983ba211c16e545
Author: Mike Blumenkrantz <[email protected]>
Date:   Sat Nov 30 16:37:27 2013 -0500

    only try to start pulseaudio once
---
 src/modules/mixer/sys_pulse.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/modules/mixer/sys_pulse.c b/src/modules/mixer/sys_pulse.c
index 078a53c..c6c01c1 100644
--- a/src/modules/mixer/sys_pulse.c
+++ b/src/modules/mixer/sys_pulse.c
@@ -288,13 +288,23 @@ e_mixer_pulse_init(void)
    conn = pulse_new();
    if ((!conn) || (!pulse_connect(conn)))
      {
+        pulse_free(conn);
+        conn = NULL;
+        pulse_shutdown();
+
+        if (pulse_inst)
+          {
+             ecore_exe_free(pulse_inst->exe);
+             pulse_inst = NULL;
+             e_mod_mixer_pulse_ready(EINA_FALSE);
+             return EINA_FALSE;
+          }
+
         pulse_inst = e_exec(NULL, NULL, "pulseaudio -D", NULL, NULL);
         if (!pulse_inst) return EINA_FALSE;
 
         E_LIST_HANDLER_APPEND(handlers, E_EVENT_EXEC_NEW, 
(Ecore_Event_Handler_Cb)_pulse_started, NULL);
-        pulse_free(conn);
-        conn = NULL;
-        pulse_shutdown();
+
         return EINA_TRUE;
      }
    E_LIST_HANDLER_APPEND(handlers, PULSE_EVENT_CONNECTED, 
(Ecore_Event_Handler_Cb)_pulse_connected, conn);

-- 


Reply via email to