fast_osc 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e928fde0a4bf601705f34f29aab9f788d2044cf9
-  data.tar.gz: 9ea87039d5da0efa5edb45e600ee985c5caee1df
+  metadata.gz: 268fcf3a70da8309727ef032b0434db61b8e6e23
+  data.tar.gz: 3df91b74cce13e82a908aadcd9f951bbb2ff39ce
 SHA512:
-  metadata.gz: 44b41b3ccf0c5aa9d35c0b586bb2e4df93710ecf7ac58a5c747c29f669bf510ebc8cb1a5438fd687344133a0185931de0b9027e829f4c1d09ff9ae853fa04b75
-  data.tar.gz: c7556261e6f6ac3895f86b4c0f5cb190eddef9b7ff3d7dfbe7ba44acf773cc8707a1b8a5b5540d47d9f0ac79dc38d424fb3c9de846a3365c88c4df855812ab0e
+  metadata.gz: 68be3a880de29bfe9e0d4870389cb75bb8f3c92a4dc174bb0ffe918ff5545525d9d08fa42d71aaa7f579ae37de49821aa48b7ad147a731fc780292f01752f426
+  data.tar.gz: 97ad3ab5853cbfa9424a16611e4c0a2a15198fdccbff61de897543f534cacc30d10401fad8be3044eeda41174ce4feaf9ea01bcf38e74182aa3b72f6e2d99704

data/ext/fast_osc/fast_osc_wrapper.c

@@ -118,7 +118,7 @@ VALUE method_fast_osc_encode_single_message(int argc, VALUE* argv, VALUE self) {
   int no_of_args = NUM2INT(LONG2NUM(RARRAY_LEN(args)));
   int i;
   int max_buffer_size = 0;
-  VALUE current_arg;
+  VALUE current_arg, strval;
 
   //output tags and args list
   VALUE tagstring = rb_str_new2(""); //rtosc will handle comma
@@ -154,6 +154,16 @@ VALUE method_fast_osc_encode_single_message(int argc, VALUE* argv, VALUE self) {
         rb_str_concat(tagstring, rb_str_new2("s"));
         output_args[i].s = StringValueCStr(current_arg);
         break;
+      case T_SYMBOL:
+        // now align to 4 byte boundary for sizing output buffer
+        strval = rb_sym_to_s(current_arg);
+        max_buffer_size += buffer_size_for_ruby_string(strval);
+
+        // encode as a string because not all implementation understand S as
+        // alternative string tag
+        rb_str_concat(tagstring, rb_str_new2("s"));
+        output_args[i].s = StringValueCStr(strval);
+        break;
     }
   }
 
@@ -200,9 +210,12 @@ uint64_t ruby_time_to_osc_timetag(VALUE rubytime) {
       // convert Time object to ntp
       floattime = JAN_1970 + NUM2DBL(rb_funcall(rubytime, rb_intern("to_f"), 0));
 
-      sec = NUM2UINT(DBL2NUM(floattime));
-      frac = (int)(fmod(floattime, 1.0) * 4294967296); // * (2 ** 32)
+      sec = floor(floattime);
+      frac = (uint32_t)(fmod(floattime, 1.0) * 4294967296); // * (2 ** 32)
+      /* printf("\nsec: %04x\n", sec); */
+      /* printf("\nfrac: %04x\n", frac); */
       timetag = (uint64_t)((uint64_t)sec << 32 | (uint64_t)frac);
+      /* printf("\ntimetag: %08llx\n", timetag); */
       break;
   }
 

data/lib/fast_osc/version.rb

@@ -1,3 +1,3 @@
 module FastOsc
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

data/test/fast_osc_test.rb

@@ -5,7 +5,7 @@ require 'date'
 class FastOscTest < Minitest::Test
   def setup
     @path = "/thisisatest"
-    @args = ["", 1, 2.0, "baz", ""]
+    @args = ["", 1, 2.0, "baz"]
     @timestamp = Date.parse("1st Jan 1990").to_time
 
     @msg0 = OSC::Message.new(@path).encode
@@ -64,4 +64,31 @@ class FastOscTest < Minitest::Test
 
     assert_equal bundle1, bundle2
   end
+
+  def test_that_it_encodes_and_decodes_messages_with_symbols
+    path = "/s_new"
+    args = ["sonic-pi-basic_mixer", 10, 0, 2, :amp, 1, :amp_slide, 0.1, :amp_slide_shape, 1, :amp_slide_curve, 0, "in_bus", 12, "amp", 0.3 , "out_bus", 10]
+    outpath, outargs = FastOsc.decode_single_message(FastOsc.encode_single_message(path, args))
+
+    assert_equal path, outpath
+    # normalize symbols to strings, round floats to 5 places
+    assert_equal args.map {|x| x.is_a?(Symbol) ? x.to_s : x}, outargs.map {|x| x.is_a?(Float) ? x.round(5) : x }
+  end
+
+  def test_that_encoded_timestamps_line_up
+    # this test is a bit convoluted but I found that fractional
+    # seconds weren't working when I plugged this into Sonic Pi
+    # This test ensures that the timestamp encoding matches to
+    # at least a tolerance of 0.001 seconds which should catch any
+    # major issues.
+    start = Time.at(1463234577.4387462) - 1.0
+    # assert_in_delta is 0.001 by default
+    assert_in_delta 1.25, Time.at(OSC::OSCPacket.messages_from_network(FastOsc.encode_single_bundle(1463234577.688746, "/foo", []), []).first.time - 2208988800) - start
+    assert_in_delta 1.5, Time.at(OSC::OSCPacket.messages_from_network(FastOsc.encode_single_bundle(1463234577.9387462, "/foo", []), []).first.time - 2208988800) - start
+    assert_in_delta 1.75, Time.at(OSC::OSCPacket.messages_from_network(FastOsc.encode_single_bundle(1463234578.188746, "/foo", []), []).first.time - 2208988800) - start
+    assert_in_delta 2.0,  Time.at(OSC::OSCPacket.messages_from_network(FastOsc.encode_single_bundle(1463234578.4387462, "/foo", []), []).first.time - 2208988800) - start
+    assert_in_delta 2.25, Time.at(OSC::OSCPacket.messages_from_network(FastOsc.encode_single_bundle(1463234578.688746, "/foo", []), []).first.time - 2208988800) - start
+    assert_in_delta 2.5,  Time.at(OSC::OSCPacket.messages_from_network(FastOsc.encode_single_bundle(1463234578.9387462, "/foo", []), []).first.time - 2208988800) - start
+    assert_in_delta 2.75, Time.at(OSC::OSCPacket.messages_from_network(FastOsc.encode_single_bundle(1463234579.188746, "/foo", []), []).first.time - 2208988800) - start
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_osc
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Xavier Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler