diff options
| author | amartin <olpc@xo-02-2E-11.localdomain> | 2007-07-09 23:14:33 (GMT) |
|---|---|---|
| committer | amartin <olpc@xo-02-2E-11.localdomain> | 2007-07-09 23:14:33 (GMT) |
| commit | 5a764dcf2585ff14921acea098144aa0d60e93e9 (patch) | |
| tree | 2686679f58ba8a95d92368048aa0e41a83ab0f1f | |
| parent | 9a55157090cbdd9b568dcf5e126caf343a0cf545 (diff) | |
netowrk
| -rw-r--r-- | Util/Network.py | 2 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Util/Network.py b/Util/Network.py index 252bbe1..d8da5e6 100644 --- a/Util/Network.py +++ b/Util/Network.py @@ -511,7 +511,7 @@ class Network: for s in inputReady: try: peer, address = self.socket.accept() - self.setMode( MD_PEER, address ) + self.setMode( MD_PEER, (address[0], PORT) ) except socket.error, (value, message): print "Network:: error accepting connection: " + message diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index 836c704..47059c7 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -669,7 +669,7 @@ class miniTamTamMain(SubActivity): curTick = self.csnd.loopGetTick() curTicksIn = curTick % Config.TICKS_PER_BEAT ticksIn = self.heartbeatElapsedTicks() - err = curTicksIn - int(round(ticksIn)) + err = curTicksIn - ticksIn if err > Config.TICKS_PER_BEAT_DIV2: err -= Config.TICKS_PER_BEAT elif err < -Config.TICKS_PER_BEAT_DIV2: @@ -680,9 +680,11 @@ class miniTamTamMain(SubActivity): correct -= ticksPerLoop elif correct < 0: correct += ticksPerLoop - #print "correct:: %d ticks, %d ticks in, %f expected, %d err, correct %d" % (curTick, curTicksIn, ticksIn, err, correct) - if correct != curTick: - self.csnd.loopSetTick(correct) + print "correct:: %f ticks, %f ticks in, %f expected, %f err, correct %f" % (curTick, curTicksIn, ticksIn, err, correct) + #if correct != curTick: + #self.csnd.loopSetTick(correct) + if abs(err) > 0.25: + self.csnd.loopAdjustTick(err) if __name__ == "__main__": |