Changeset 4856

Timestamp:

08/27/07 11:23:25 (6 years ago)

Author:

DrewCormier

Message:

need to distinguish this method for voice data

Location:

experimental/components/rc2007_gui

Files:

• WorkModule.py (modified) (3 diffs)
• rc2007_gui.py (modified) (4 diffs)

experimental/components/rc2007_gui/WorkModule.py

@@ -53 +53 @@
         pass
         
-    def AddData(self, data):
+    def AddVoiceData(self, data):
         '''Generally called by parent.  Adds data to a buffer.
         The Process() method will wait for this buffer to be set.
@@ -69 +69 @@
         while self.is_running:
             self.data_signal.wait()  # wait for data to be aded to the 
-                                     # buffer in self.AddData()
+                                     # buffer in self.AddVoiceData()
             while len(self.data_queue) > 0:
                 # get the data from the buffer:
@@ -76 +76 @@
                 self.data_queue_lock.release()
                                 
+                # forwarding voice data:
                 if self.rc2007_gui_ref.talk_flag:
                     if self.rc2007_gui_ref.outPort0_active:
+                        # TODO: send voice metadata 
                         self.rc2007_gui_ref.outPort0_servant.send_data(data)    
 

experimental/components/rc2007_gui/rc2007_gui.py

@@ -120 +120 @@
 
 #------------------------------------------------------------------
-# dataIn_complexShort_i class definition
-#------------------------------------------------------------------
-class dataIn_complexShort_i(standardInterfaces__POA.complexShort):
+# dataIn_realChar_i class definition
+#------------------------------------------------------------------
+class dataIn_realChar_i(standardInterfaces__POA.realChar):
     def __init__(self, parent, name):
         self.parent = parent
         self.name = name
 
-    def pushPacket(self, I, Q):
-        self.parent.work_mod.AddData(I, Q)
-
-
-#------------------------------------------------------------------
-# dataOut_complexShort_i class definition
-#------------------------------------------------------------------
-class dataOut_complexShort_i(CF__POA.Port):
+    def pushPacket(self, data):
+        self.parent.work_mod.AddVoiceData(data)
+
+
+#------------------------------------------------------------------
+# dataOut_realChar_i class definition
+#------------------------------------------------------------------
+class dataOut_realChar_i(CF__POA.Port):
     def __init__(self, parent, name):
         self.parent = parent
@@ -149 +149 @@
 
     def connectPort(self, connection, connectionId):
-        port = connection._narrow(standardInterfaces__POA.complexShort)
+        port = connection._narrow(standardInterfaces__POA.realChar)
         self.outPorts[str(connectionId)] = port
         self.parent.outPort0_active = True
@@ -163 +163 @@
         self.data_event.set()
 
-    def send_data(self, I, Q):
+    def send_data(self, data):
         self.data_buffer_lock.acquire()
-        self.data_buffer.insert(0, (I,Q))
+        self.data_buffer.insert(0, data)
         self.data_buffer_lock.release()
         self.data_event.set()
@@ -176 +176 @@
             while len(self.data_buffer) > 0:
                 self.data_buffer_lock.acquire()
-                new_data = self.data_buffer.pop()
+                data = self.data_buffer.pop()
                 self.data_buffer_lock.release()
                
                 # send the data to all outPort connections 
                 for port in self.outPorts.values():
-                    port.pushPacket(new_data[0], new_data[1])
+                    port.pushPacket(data)
             
                 self.data_event.clear()