]> git.0d.be Git - jack_mixer.git/commitdiff
Merge branch 'master' of ssh://repo.or.cz/srv/git/jack_mixer
authorArnout Engelen <arnouten@bird.(none)>
Tue, 29 Dec 2009 17:37:37 +0000 (18:37 +0100)
committerArnout Engelen <arnouten@bird.(none)>
Tue, 29 Dec 2009 17:37:37 +0000 (18:37 +0100)
1  2 
jack_mixer.py

diff --cc jack_mixer.py
index f626bf151dab2c6e39aac3b8e2d74986367d5a28,24cd64cd8153ff35e51556ac2adf224394c8c3b1..15e497e418ff01dd7b5950134f2db325c7a6ece3
@@@ -685,9 -646,9 +715,9 @@@ def main()
          name = None
  
      if not name:
 -        name = "jack_mixer-%u" % os.getpid()
 +        name = "jack_mixer"
  
-     gtk.gdk.threads_init()
+     gtk.gdk.threads_init() # if this function is called, when SIGUSR1 is received, we enter tight loop...
      try:
          mixer = JackMixer(name, lash_client)
      except Exception, e: