Skip to content

Commit

Permalink
#849: don't even try to use pulseaudio on win32 and osx
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@9634 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jun 15, 2015
1 parent db7a9fe commit cf6628e
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/xpra/sound/pulseaudio_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ def add_audio_tagging_env(icon_path=None):

#prefer the palib option which does everything in process:
try:
if os.environ.get("XPRA_USE_PACTL", "0")=="1":
raise ImportError("environment override: not using palib")
from xpra.sound import pulseaudio_palib_util as _pulseaudio_util
#use "none" on win32 and osx:
if sys.platform.startswith("win") or sys.platform.startswith("darwin"):
from xpra.sound import pulseaudio_none_util as _pulseaudio_util
else:
if os.environ.get("XPRA_USE_PACTL", "0")=="1":
raise ImportError("environment override: not using palib")
from xpra.sound import pulseaudio_palib_util as _pulseaudio_util
except ImportError as e:
#fallback forks a process and parses the output:
log.warn("palib not available, using legacy pactl fallback")
Expand Down

0 comments on commit cf6628e

Please sign in to comment.