Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/miniTamTam
diff options
context:
space:
mode:
authoramartin <olpc@xo-00-CE-12.localdomain>2007-07-17 16:45:59 (GMT)
committer amartin <olpc@xo-00-CE-12.localdomain>2007-07-17 16:45:59 (GMT)
commit5588049fb01afc32023facf1003efc566797dc91 (patch)
treeac66e7d89a9ae03709ac2cff27d8e5a5b38fa17a /miniTamTam
parenta2f7a2b41791c2222b5b5a286dd71ee7d0fef2cd (diff)
network sync
Diffstat (limited to 'miniTamTam')
-rw-r--r--miniTamTam/miniTamTamMain.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index 15078e5..845e4d5 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -614,6 +614,7 @@ class miniTamTamMain(SubActivity):
print "buddy joined " + str(buddy)
print buddy.props.ip4_address
if self.network.isHost():
+ # TODO how do I figure out if this buddy is me?
if buddy.props.ip4_address:
self.network.introducePeer( buddy.props.ip4_address )
else:
@@ -668,7 +669,7 @@ class miniTamTamMain(SubActivity):
self.syncQueryStart.pop(hash)
def processHT_TEMPO_UPDATE( self, sock, message, data ):
- print "got tempo update"
+ #print "got tempo update"
self.unpacker.reset(data)
self.tempoAdjustment.set_value( self.unpacker.unpack_int() )
self.sendSyncQuery()
@@ -730,10 +731,8 @@ class miniTamTamMain(SubActivity):
elif correct < 0:
correct += ticksPerLoop
#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)
+ self.csnd.loopAdjustTick(-err)
if __name__ == "__main__":