ship wasapi plugins, but don't use them (broken?)

git-svn-id: https://xpra.org/svn/Xpra/trunk@15928 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 23, 2017 · 9d87332 · 9d87332
1 parent 4febad4
commit 9d87332
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/setup.py b/src/setup.py
@@ -1265,7 +1265,7 @@ def do_add_DLLs(*dll_names):
                            #muxers:
                            "gdp", "matroska", "ogg", "isomp4",
                            "audioparsers", "audiorate", "audioconvert", "audioresample", "audiotestsrc",
-                           "coreelements", "directsoundsink", "directsoundsrc",
+                           "coreelements", "directsoundsink", "directsoundsrc", "wasapi",
                            #codecs:
                            "opus", "flac", "lame", "mad", "mpg123", "speex", "faac", "faad",
                            "volume", "vorbis", "wavenc", "wavpack", "wavparse",

diff --git a/src/xpra/sound/gstreamer_util.py b/src/xpra/sound/gstreamer_util.py
@@ -59,6 +59,7 @@ def force_enabled(codec_name):
     "test"          : "audiotestsrc",
     "pulse"         : "pulsesrc",
     "direct"        : "directsoundsrc",
+    "wasapi"        : "wasapisrc",
     }
 SRC_HAS_DEVICE_NAME = ["alsasrc", "osssrc", "oss4src", "jackaudiosrc", "pulsesrc", "directsoundsrc", "osxaudiosrc"]
 SRC_TO_NAME_PLUGIN = {}
@@ -79,6 +80,7 @@ def force_enabled(codec_name):
     "test"          : "Test signal",
     "pulse"         : "PulseAudio",
     "direct"        : "Microsoft Windows Direct Sound",
+    "wasapi"        : "Windows Audio Session API",
     }
 
 
@@ -537,6 +539,7 @@ def get_source_plugins():
         sources.append("osxaudiosrc")
     elif WIN32:
         sources.append("directsoundsrc")
+        #sources.append("wasapisrc")
     sources.append("autoaudiosrc")
     if os.name=="posix":
         sources += ["alsasrc",
@@ -551,6 +554,7 @@ def get_sink_plugins():
         SINKS.append("osxaudiosink")
     elif WIN32:
         SINKS.append("directsoundsink")
+        #SINKS.append("wasapisink")
     SINKS.append("autoaudiosink")
     try:
         from xpra.sound.pulseaudio.pulseaudio_util import has_pa