Changeset 5534

Timestamp:

10/26/07 17:27:49 (6 years ago)

Author:

jgaeddert

Message:

forwarding input data based upon its metadata content, removing antiquated playAudio method, cleaning up output

Location:

experimental/components/rc2007_gui

Files:

• WorkModules.py (modified) (4 diffs)
• port_impl.py (modified) (3 diffs)

experimental/components/rc2007_gui/WorkModules.py

@@ -171 +171 @@
     
     def SendTextData(self,text):
-        # TODO: pack/depack
-        # tmp: False for text
-        # configure meta data here
-        self.text_metadata.eom = False
+        # TODO: configure meta data here
+        self.text_metadata.app_id = 2
         self.text_metadata.packet_id += 1
-        #print "text " + str(self.text_metadata.packet_id) + "  " + text
         self.rc2007_gui_ref.to_radio_port_servant.send_data(
                 text,
@@ -207 +204 @@
                         data += struct.pack('B', b);
                     # tmp: true for voice
-                    # configure meta data here
-                    self.audio_metadata.eom = True
+                    # TODO: configure meta data here
+                    self.audio_metadata.app_id = 1
                     self.audio_metadata.packet_id += 1
 
-                    #print ">"*4 + " audio enc " + str(self.audio_metadata.packet_id) + \
-                    #      "  " + str(data_int[0:10])
-        
                     if self.rc2007_gui_ref.to_radio_port_active:
                         #print "audio length: " + str(len(data))
@@ -286 +280 @@
         unpacked_audio = self.my_decoder.Decode(data)
 
-        # The old method
-        #self.playAudio(left_channel, right_channel)
-
         # the new method
-        #print " output audio energy : " + str(int(energy(data)))
         packed_audio = pack_audio(unpacked_audio, self.num_channels)
         self.speaker_driver.writeall(packed_audio)        
-
-    def playAudio(self,Left_channel, Right_channel):
-            # play on speaker
-            my_string = ''
-            if Right_channel[0]==0:     # using the left channel
-                for y in range(0,len(Left_channel)):
-                    upper_val = Left_channel[y]/256
-                    lower_val = Left_channel[y] - (upper_val * 256)
-                    my_string += struct.pack('h', Left_channel[y])
-                    #my_string += struct.pack('B',lower_val)
-                    #my_string += struct.pack('b',upper_val)
-                    if self.channels == 2:
-                        my_string += '\0'
-                        my_string += '\0'
-                    else:
-                        my_string += struct.pack('h', Left_channel[y])
-                        #my_string += struct.pack('B',lower_val)
-                        #my_string += struct.pack('b',upper_val)
-            else:     # using the right channel
-                for y in range(0,len(Right_channel)):
-                    upper_val = Right_channel[y]/256
-                    lower_val = Right_channel[y] - (upper_val * 256)
-                    my_string += struct.pack('h', Right_channel[y])
-                    #my_string += struct.pack('B',lower_val)
-                    #my_string += struct.pack('b',upper_val)
-                    if self.channels == 2:
-                        my_string += '\0'
-                        my_string += '\0'
-                    else:
-                        my_string += struct.pack('h', Right_channel[y])
-                        #my_string += struct.pack('B',lower_val)
-                        #my_string += struct.pack('b',upper_val)
-            self.sound_driver.writeall(my_string)
 
     def Release(self):
@@ -342 +299 @@
                 self.data_queue_lock.release()
         
-                # temp: if EOM is true data are voice, otherwise text
-                voice = metadata.eom
-                text = not voice
-
-                # TODO: look at the metadata and decide if it's voice or text        
-                # forwarding voice data:
-                if voice:
+                # Use metadata application identifier to forward
+                # data appropriately
+                if metadata.app_id==1:
+                    # voice data
                     # convert string to list of integers
                     data_int = []
                     for c in data:
                         data_int.append( int(struct.unpack('B', c)[0]) )
-                    #print "<"*4 + " audio dec " + str(metadata.packet_id) + \
-                    #      "  " + str(data_int[0:10])
 
                     self.CVSDDecode(data_int)
 
-                if text:
+                elif metadata.app_id==2:
+                    # text data
                     self.rc2007_gui_ref.prnt_app.frame.DisplayText(data)
 
+                else:
+                    # unknown application identifier
+                    print "ERROR! rc2007_gui: unknown app_id: " + str(metadata.app_id)
+
             self.data_signal.clear()  # done reading the buffer
 

experimental/components/rc2007_gui/port_impl.py

@@ -45 +45 @@
         #print "rx packet " + str(metadata.packet_id) + \
         #      ", len = " + str(len(data)) + \
-        #      "  voice? " + str(metadata.eom)
+        #      "  app: " + str(metadata.app_id)
         self.parent.rx_work_mod.AddMetaData(data, metadata)
 
@@ -99 +99 @@
                 (data, metadata) = self.data_buffer.pop()
                 self.data_buffer_lock.release()
-                #print "this is my data: " + str(data) + "\n\n"
-                #print "this is my meta data: " + str(metadata) + "\n\n"
                 
                 # send the data to all outPort connections 
@@ -106 +104 @@
                     #print "tx packet " + str(metadata.packet_id) + \
                     #      ", len = " + str(len(data)) + \
-                    #      "  voice? " + str(metadata.eom)
+                    #      "  app: " + str(metadata.app_id)
                     port.pushPacketMetaData(data, metadata)