From 623b8d9d78f887225bfcf0214c9a2c8a8924c551 Mon Sep 17 00:00:00 2001
From: amartin <olpc@xo-02-2E-11.localdomain>
Date: Tue, 19 Jun 2007 06:40:13 +0000
Subject: network

---
diff --git a/TamTam.py b/TamTam.py
index 4747c71..8a56f4b 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -17,7 +17,6 @@ from   Edit.MainWindow import MainWindow
 from   Welcome import Welcome
 from   SynthLab.SynthLabWindow import SynthLabWindow
 from   Util.Trackpad import Trackpad
-import Util.Network
 
 if __name__ != '__main__':
     try: 
@@ -64,8 +63,6 @@ class TamTam(Activity):
         self.instrumentPanel = InstrumentPanel( force_load = False )
         self.preloadList = [ self.instrumentPanel ]
 
-        self.network = Util.Network.Network()
-
         self.set_mode(mode)
 
     def onPreloadTimeout( self ):
diff --git a/Util/Network.py b/Util/Network.py
index 2c5f53c..00e641b 100644
--- a/Util/Network.py
+++ b/Util/Network.py
@@ -488,12 +488,13 @@ class Network:
 
     def processHT_SYNC_REPLY( self, sock, data ):
         t = time.time()
-        latency = t - self.latencyQueryStart[data[0:4]]
+        hash = data[0:4]
+        latency = t - self.latencyQueryStart[hash]
         print "got sync reply %d" % (latency*1000)
-        self.unpacker.reset(data[4,8])
-        self.latencyQueryHandler[data]( latency, self.unpacker.unpack_float() )
-        self.latencyQueryHandler.pop(data)
-        self.latencyQueryStart.pop(data)
+        self.unpacker.reset(data[4:8])
+        self.latencyQueryHandler[hash]( latency, self.unpacker.unpack_float() )
+        self.latencyQueryHandler.pop(hash)
+        self.latencyQueryStart.pop(hash)
  
         
 
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index 23da5ee..ce7e9ad 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -9,6 +9,8 @@ from types import *
 from math import sqrt
 from Util.NoteDB import PARAMETER
 
+import Util.Network
+
 import Config
 
 from Util.ThemeWidgets import *
@@ -34,8 +36,8 @@ class miniTamTamMain(SubActivity):
     
     def __init__(self, activity, set_mode):
         SubActivity.__init__(self, set_mode)
-        self.activity = activity
-        self.network = self.activity.network
+
+        self.network = Util.Network.Network()
 
         self.set_border_width(Config.MAIN_WINDOW_PADDING)
 
@@ -87,7 +89,7 @@ class miniTamTamMain(SubActivity):
         self.synthLabWindow = None
 
         if self.network.isPeer():
-            self.network.querySync( )
+            self.network.querySync( self.handleSync )
                 
     def drawSliders( self ):     
         mainSliderBox = RoundHBox(fillcolor = Config.PANEL_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
--
cgit v0.9.1