Ticket #533: osx-sound-autoreleasepool.patch

src/xpra/net/subprocess_wrapper.py

@@ -36 +36 @@
 #avoids showing a new console window on win32:
 WIN32_SHOWWINDOW = os.environ.get("XPRA_WIN32_SHOWWINDOW", "0")=="1"
 
+import gtk
+gtk.threads_init()
+class mainloop(object):
+    def run(self):
+        gtk.main()
+    def quit(self):
+        gtk.main_quit()
 
+
 class subprocess_callee(object):
     """
     This is the callee side, wrapping the gobject we want to interact with.
@@ -47 +55 @@
     (there is no validation of which signals are valid or not)
     """
     def __init__(self, input_filename="-", output_filename="-", wrapped_object=None, method_whitelist=None):
-        self.mainloop = gobject.MainLoop()
+        self.mainloop = mainloop()
         self.name = ""
         self.input_filename = input_filename
         self.output_filename = output_filename

src/xpra/sound/wrapper.py

@@ -3 +3 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+import sys
 import os
 import time
 
@@ -103 +104 @@
     else:
         raise Exception("unknown mode: %s" % mode)
 
+    #ugly OSX code to avoid auto-release warnings
+    auto_release_pool = None
+    if sys.platform.startswith("darwin"):
+        try:
+            import objc             #@UnresolvedImport
+            NSAutoreleasePool = objc.lookUpClass("NSAutoreleasePool")
+            auto_release_pool = NSAutoreleasePool.alloc()
+            auto_release_pool.init()
+            log("autorelease pool=%s", auto_release_pool)
+        except:
+            log.warn("failed to allocate autorelease pool", exc_info=True)
+            auto_release_pool = None
+
     #the plugin to use (ie: 'pulsesrc' for src.py or 'autoaudiosink' for sink.py)
     plugin = args[2]
     #plugin options (ie: "device=monitor_device,something=value")
@@ -127 +141 @@
         log.error("run_sound%s error", (mode, error_cb, options, args), exc_info=True)
         return 1
     finally:
+        del auto_release_pool
         if ss:
             ss.stop()