Ticket #849: sound-gstreamer1-as-default.patch

scripts/xpra

@@ -1 +1 @@
 #!/usr/bin/env python
 
-from xpra.platform import init
-init("Xpra")
-
 import sys
 from xpra.scripts.main import main
 sys.exit(main(sys.argv[0], sys.argv))

xpra/scripts/main.py

@@ -101 +101 @@
 
 
 def main(script_file, cmdline):
-    from xpra.platform import init as platform_init, clean as platform_clean, command_error, command_info, get_main_fallback
+    from xpra.platform import clean as platform_clean, command_error, command_info, get_main_fallback
     if len(cmdline)==1:
         fm = get_main_fallback()
         if fm:
@@ -108 +108 @@
             return fm()
 
     try:
-        platform_init("Xpra")
         try:
             defaults = make_defaults_struct()
             fixup_defaults(defaults)
@@ -864 +863 @@
             prevent_import()
         except:
             pass
+        from xpra.platform import init
+        init("Xpra")
 
     try:
         ssh_display = len(args)>0 and (args[0].startswith("ssh/") or args[0].startswith("ssh:"))

xpra/sound/gstreamer_util.py

@@ -28 +28 @@
 
 
 ALLOW_SOUND_LOOP = os.environ.get("XPRA_ALLOW_SOUND_LOOP", "0")=="1"
-GSTREAMER1 = os.environ.get("XPRA_GSTREAMER1", "0")=="1"
+DEFAULT_GSTREAMER1 = not sys.platform.startswith("win") and not sys.platform.startswith("darwin")
+GSTREAMER1 = os.environ.get("XPRA_GSTREAMER1", str(int(DEFAULT_GSTREAMER1)))=="1"
 MONITOR_DEVICE_NAME = os.environ.get("XPRA_MONITOR_DEVICE_NAME", "")
 def force_enabled(codec_name):
     return os.environ.get("XPRA_SOUND_CODEC_ENABLE_%s" % codec_name.upper(), "0")=="1"