From 71951c9f42ec62d52780acb081ea8670795dc123 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Tue, 25 Dec 2012 18:22:32 +0000
Subject: [PATCH] disable sound again (problems on win32..)

git-svn-id: https://xpra.org/svn/Xpra/trunk@2362 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 src/xpra/scripts/main.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/xpra/scripts/main.py b/src/xpra/scripts/main.py
index ba53801302..0dc3b8ea91 100644
--- a/src/xpra/scripts/main.py
+++ b/src/xpra/scripts/main.py
@@ -513,15 +513,17 @@ def sigusr2(*args):
 
 # we end up initializing gstreamer here and it does things
 # we don't want with sys.argv, so hack around it:
-saved_args = sys.argv
-sys.argv = sys.argv[:1]
-try:
-    from xpra.sound import gstreamer_util
-    has_sound = gstreamer_util is not None
-except:
-    pass
-    has_sound = False
-sys.argv = saved_args
+SOUND_ENABLED = os.environ.get("XPRA_SOUND", "0")!="0"
+has_sound = False
+if SOUND_ENABLED:
+    saved_args = sys.argv
+    sys.argv = sys.argv[:1]
+    try:
+        from xpra.sound import gstreamer_util
+        has_sound = gstreamer_util is not None
+    except:
+        pass
+    sys.argv = saved_args
 
 def get_codecs(is_speaker, is_server):
     if not has_sound: