[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.0.39.0-79-g58bf7d1

[X2Go dev team]

The branch, build-baikal has been updated
       via  58bf7d15e71c97b16f2b20da44cbebdd0a317da9 (commit)
      from  a3949b4960204dcc14b33ace7af749ce94bfb33b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/pulseaudio.py |   45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py
index 0c563f4..f595e0d 100644
--- a/x2go/pulseaudio.py
+++ b/x2go/pulseaudio.py
@@ -79,21 +79,38 @@ class X2goPulseAudio(threading.Thread):
             '-L module-esound-protocol-tcp port=16001',
             '-L module-waveout',
         ]
-        cmd_line = [cmd]
-        cmd_line.extend(cmd_options)
-        self.logger('starting PulseAudio server with command line: %s' % ' '.join(cmd_line), loglevel=log.loglevel_DEBUG)
-        if _X2GOCLIENT_OS == 'Windows':
-            _stdin = file('nul', 'r')
-            _shell = True
-        p = subprocess.Popen(cmd_line,
-                             stdin=_stdin,
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.STDOUT,
-                             shell=_shell,
-                             cwd=self.path,
-                            )
+        #cmd_line = [cmd]
+        #cmd_line.extend(cmd_options)
+        #self.logger('starting PulseAudio server with command line: %s' % ' '.join(cmd_line), loglevel=log.loglevel_DEBUG)
+        #if _X2GOCLIENT_OS == 'Windows':
+        #    _stdin = file('nul', 'r')
+        #    _shell = True
+        #p = subprocess.Popen(cmd_line,
+        #                     stdin=_stdin,
+        #                     stdout=subprocess.PIPE,
+        #                     stderr=subprocess.STDOUT,
+        #                     shell=_shell,
+        #                     cwd=self.path,
+        #                    )
+        cmd_options = " %s" % " ".join(cmd_options)
+        self.logger('starting PulseAudio server with command line: %s%s' % (cmd, cmd_options), loglevel=log.loglevel_DEBUG)
+        p = win32api.CreateProcess(cmd,
+                                   cmd_options,
+                                   0,
+                                   0,
+                                   False,
+                                   win32api.CREATE_DEFAULT_ERROR_MODE,
+                                   0,
+                                   0,
+                                
+                                   ".",
+                                   0
+                                   )
+
         gevent.sleep(5)
-        _is_alive = p and (p.poll() is None)
+        #_is_alive = p and (p.poll() is None)
+        _is_alive = p is not None
+
         if self.client_instance and not _is_alive:
             if os.environ.has_key('CLIENTNAME'):
                 self.client_instance.HOOK_pulseaudio_not_supported_in_RDPsession()


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).