Changeset 573:af59e3bbe92e

Timestamp:

12/06/14 14:01:58 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added function to properly deinitialize sound handling on Linux

Location:

src/mlx

Files:

• mlx.py (modified) (2 diffs)
• sound.py (modified) (4 diffs)

src/mlx/mlx.py

@@ -2 +2 @@
 from config import Config
 from i18n import setLanguage
-from sound import initializeSound
+from sound import initializeSound, finalizeSound
 from util import secondaryInstallation
 from const import VERSION
@@ -96 +96 @@
 
         gui.run()
+
+        finalizeSound()
     finally:
         gui.flushStdIO()

src/mlx/sound.py

@@ -172 +172 @@
                              extra = extra)
 
+    def finalizeSound():
+        """Finalize the sound handling."""
+        pass
+
 #------------------------------------------------------------------------------
 
@@ -243 +247 @@
                 super(SoundThread, self).__init__()
 
-                self.daemon = True
+                self.daemon = False
                 self.eventLoop = SoundThread.EventLoop(soundsDirectory)
 
@@ -269 +273 @@
                                extra = extra)
 
+        def finalizeSound():
+            """Finalize the sound handling."""
+            pyglet.app.exit()
+
     except:
         print "The pyglet library is missing from your system. It is needed for sound playback on Linux"
@@ -281 +289 @@
             FIXME: it does not do anything currently, but it should."""
             print "sound.startSound:", name
+
+        def finalizeSound():
+            """Finalize the sound handling."""
+            pass
 
 #------------------------------------------------------------------------------