lib/osc-ruby/osc_packet.rb in osc-ruby-0.2.0 vs lib/osc-ruby/osc_packet.rb in osc-ruby-0.6.0

@@ -1,116 +1,116 @@
 require File.join( File.dirname( __FILE__ ), 'network_packet')
 require 'ostruct'
 
 module OSC
   class OSCPacket
-        
+
     def self.messages_from_network( string )
       messages = []
       osc = new( string )
-      
+
       if osc.bundle?
         bundle = osc.get_string
         time = osc.get_timestamp
-        
+
         osc.get_bundle_messages.each do | message |
           messages << decode_simple_message( time, OSCPacket.new( message ) )
         end
-        
+
       else
         messages << decode_simple_message( time, osc )
       end
-      
+
       return messages
     end
-    
+
     def self.decode_simple_message( time, osc_packet )
       address = osc_packet.get_string
-      args = osc_packet.get_arguments 
+      args = osc_packet.get_arguments
 
       Message.new_with_time(address, time, nil, *args )
     end
-    
+
     def initialize( string )
       @packet = NetworkPacket.new( string )
-      
-      @types = { "i" => lambda{  OSCInt32.new(   get_int32 ) }, 
+
+      @types = { "i" => lambda{  OSCInt32.new(   get_int32 ) },
                  "f" => lambda{  OSCFloat32.new( get_float32 ) },
                  "s" => lambda{  OSCString.new(  get_string ) },
                  "b" => lambda{  OSCBlob.new(    get_blob )}
                 }
     end
-    
+
     def get_bundle_messages
       bundle_messages = []
-      
+
       until @packet.eof?
         l = @packet.getn(4).unpack('N')[0]
         bundle_messages << @packet.getn(l)
       end
       bundle_messages
     end
-    
+
     def get_string
       result = ''
       until (c = @packet.getc) == string_delemeter
 	      result << c
       end
       @packet.skip_padding
       result
     end
-    
+
     def get_timestamp
       t1 = @packet.getn(4).unpack('N')[0]
       t2 = @packet.getn(4).unpack('N')[0]
       @packet.skip_padding
-      
+
       if t1 == 0 && t2 == 1
         time = nil
       else
         time = t1 + t2.to_f / (2**32)
       end
-      
+
       time
     end
-    
+
     def get_arguments
       if @packet.getc == ?,
-        
+
         tags = get_string
         args = []
-        
+
         tags.scan(/./) do | tag |
           args << @types[tag].call
         end
         args
       end
     end
-    
+
     def get_int32
       i = @packet.getn(4).unpack('N')[0]
       i -= 2**32 if i > (2**31-1)
       @packet.skip_padding
       i
     end
-    
+
     def get_float32
       f = @packet.getn(4).unpack('g')[0]
       @packet.skip_padding
       f
     end
-    
+
     def get_blob
       l = @packet.getn(4).unpack('N')[0]
       b = @packet.getn(l)
       @packet.skip_padding
       b
     end
-    
+
     def bundle?
       !(@packet.to_s =~ /\A\#bundle/).nil?
     end
-    
+
     def string_delemeter
       # ruby 1.9 has multicharacter support
       RUBY_VERSION.include?( '1.9' ) ? "\x00" : 0
     end
   end
\ No newline at end of file