diff options
| author | bergstra <james@xo-05-28-3A.localdomain> | 2008-02-13 02:13:16 (GMT) |
|---|---|---|
| committer | bergstra <james@xo-05-28-3A.localdomain> | 2008-02-13 02:13:16 (GMT) |
| commit | 123dd9a8b35c9090b244bb6bae388707dbb2443e (patch) | |
| tree | 40f6121588437e50f2734f1273e05d4247357d87 | |
| parent | 4069e31deead331593be3827b696a98b6ea37e61 (diff) | |
| parent | d0e18e63595b6f4f5aabb659f372fa067e1e982f (diff) | |
Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam
| -rw-r--r-- | TamTamJam.activity/Jam/JamMain.py | 2 | ||||
| -rw-r--r-- | TamTamJam.activity/TamTamJam.py | 1 | ||||
| -rw-r--r-- | common/Util/Network.py | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py index 731c53f..a4d760e 100644 --- a/TamTamJam.activity/Jam/JamMain.py +++ b/TamTamJam.activity/Jam/JamMain.py @@ -1242,6 +1242,6 @@ class JamMain(gtk.EventBox): correct -= Config.TICKS_PER_BEAT elif correct < 0: correct += Config.TICKS_PER_BEAT - print "correct:: %f ticks, %f ticks in, %f expected, %f err, correct %f" % (curTick, curTicksIn, ticksIn, err, correct) + #print "correct:: %f ticks, %f ticks in, %f expected, %f err, correct %f" % (curTick, curTicksIn, ticksIn, err, correct) if abs(err) > 0.25: self.csnd.adjustTick(-err) diff --git a/TamTamJam.activity/TamTamJam.py b/TamTamJam.activity/TamTamJam.py index 6f28e43..a90b3c1 100644 --- a/TamTamJam.activity/TamTamJam.py +++ b/TamTamJam.activity/TamTamJam.py @@ -20,6 +20,7 @@ from sugar.activity import activity class TamTamJam(activity.Activity): def __init__(self, handle): + gtk.gdk.threads_init() activity.Activity.__init__(self, handle) self.ensure_dirs() diff --git a/common/Util/Network.py b/common/Util/Network.py index dbbc97d..65a15b0 100644 --- a/common/Util/Network.py +++ b/common/Util/Network.py @@ -80,7 +80,7 @@ class Listener( threading.Thread ): def run(self): while 1: # rely on the owner to kill us when necessary try: - inputReady, outputReady, exceptReady = select.select( self.inputSockets, self.outputSockets, self.exceptSockets ) + inputReady, outputReady, exceptReady = select.select( self.inputSockets, self.outputSockets, self.exceptSockets, 0.5 ) if not len( inputReady ): # timeout continue if self.listenerSocket in inputReady: @@ -549,6 +549,7 @@ class Network: if MSG_SIZE[con.message] == 0: con.recvBuf = con.recvBuf[1:] for func in self.processMessage[con.message]: + print "idle_add", func, con.message gobject.idle_add( func, sock, con.message, "" ) else: con.waitingForData = MSG_SIZE[con.message] |