Skip to content

Commit

Permalink
disable sound again (problems on win32..)
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@2362 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Dec 25, 2012
1 parent 51625fe commit 71951c9
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions src/xpra/scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 71951c9

Please sign in to comment.