diff options
| -rw-r--r-- | Util/Clooper/Makefile | 4 | ||||
| -rwxr-xr-x | Util/Clooper/aclient.so | bin | 47590 -> 47718 bytes | |||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Util/Clooper/Makefile b/Util/Clooper/Makefile index 5d5ac39..6ea2e2c 100644 --- a/Util/Clooper/Makefile +++ b/Util/Clooper/Makefile @@ -8,8 +8,8 @@ LDFLAGS+= -L/usr/local/lib -lcsound CPPFLAGS+=-I/home/james/cvs/sugar-jhbuild/build/include/python2.5 LDFLAGS+=-L/home/james/cvs/sugar-jhbuild/build/lib -CPPFLAGS+=-I/usr/include/python2.4 -LDFLAGS+=-lpython2.4 +CPPFLAGS+=-I/usr/include/python2.5 +LDFLAGS+=-lpython2.5 all : aclient.so diff --git a/Util/Clooper/aclient.so b/Util/Clooper/aclient.so Binary files differindex 7c91b74..5143f9d 100755 --- a/Util/Clooper/aclient.so +++ b/Util/Clooper/aclient.so 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__": |