Changeset 408

Timestamp:

01/17/15 18:02:49 (6 years ago)

Author:

sc

Message:

• packets starting to flow from MuseIO

Location:

trunk/Puzzlebox/Synapse/Muse

Files:

• Client.py (modified) (5 diffs)
• Server.py (modified) (1 diff)

trunk/Puzzlebox/Synapse/Muse/Client.py

@@ -65 +65 @@
                 self.parent=parent
                 
-                self.server_host = server_host
-                self.server_port = server_port
+                #self.server_host = server_host
+                #self.server_port = server_port
+                self.server_host = '127.0.0.1'
+                self.server_port = 5002
                 
                 self.packet_count = 0
@@ -72 +74 @@
                 
                 self.name = "Synapse:Muse:Client"
+                
+                self.protocol = None
                 
                 #self.configureNetwork()
@@ -99 +103 @@
                 if muse_protocol != None:
                         
-                        muse_protocol.start(host=self.server_host, \
+                        #muse_protocol.start(self.log, host=self.server_host, \
+                                              #port=self.server_port, \
+                                              #DEBUG=self.DEBUG, \
+                                              #parent=self)
+                                                                         
+                        ##print dir(muse_protocol.puzzlebox_synapse_protocol_muse)
+                        
+                        ##muse_protocol.puzzlebox_synapse_protocol_muse.start()
+                        
+                        ##muse_protocol.puzzlebox_synapse_protocol_muse.start(host=self.server_host, \
+                                              ##port=self.server_port, \
+                                              ##DEBUG=self.DEBUG, \
+                                              ##parent=self)
+                                ##muse_protocol.puzzlebox_synapse_protocol_muse( \
+                                                                                        ##port=self.server_port, \
+                                                                                        ##DEBUG=self.DEBUG, \
+                                                                                        ##parent=self)
+
+                        self.protocol = muse_protocol.puzzlebox_synapse_protocol_muse(\
+                                self.log, \
+                                host=self.server_host, \
                                               port=self.server_port, \
-                                              initialized=False, \
+                                              DEBUG=self.DEBUG, \
                                               parent=self)
+                        
+                        ##self.plugin_session = self.parent.plugin_session # for Jigsaw compatability
+                        
+                        #self.protocol.start()
+                        self.protocol.run()
+                        #self.protocol.run(self.protocol)
+                        
+                        ##self.protocol.start(host=self.server_host, \
+                                              ##port=self.server_port, \
+                                              ##DEBUG=self.DEBUG, \
+                                              ##parent=self)
         
         
@@ -133 +168 @@
                 
                 if muse_protocol != None:
-                        muse_protocol.KEEP_RUNNING = False
+                        #muse_protocol.KEEP_RUNNING = False
+                        muse_protocol.keep_running = False
                         
                         count = 1
@@ -152 +188 @@
                         QtCore.QThread.quit(self)
 
+        def setPacketCount(self, count):
+                self.packet_count = count
+        
+        def setBadPackets(self, count):
+                self.bad_packets = count
+                
+        def resetSessionStartTime(self):
+                pass

trunk/Puzzlebox/Synapse/Muse/Server.py

@@ -202 +202 @@
                 self.customDataHeaders = ['Concentration', \
                                           'Mellow', \
-                                         ]       
+                                         ]