fast_osc 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268fcf3a70da8309727ef032b0434db61b8e6e23
-  data.tar.gz: 3df91b74cce13e82a908aadcd9f951bbb2ff39ce
+  metadata.gz: 508967c0e5e99fef79f7f3cc09bbe81fa82e0ee3
+  data.tar.gz: 281e6bae19a455de611780448a9238afde2f66d7
 SHA512:
-  metadata.gz: 68be3a880de29bfe9e0d4870389cb75bb8f3c92a4dc174bb0ffe918ff5545525d9d08fa42d71aaa7f579ae37de49821aa48b7ad147a731fc780292f01752f426
-  data.tar.gz: 97ad3ab5853cbfa9424a16611e4c0a2a15198fdccbff61de897543f534cacc30d10401fad8be3044eeda41174ce4feaf9ea01bcf38e74182aa3b72f6e2d99704
+  metadata.gz: bc96c488b7ea7b0c7e357e692efdc16351c2596731307ea51bc57d4ea52b2369d0367102170a73ab2c57f8bce6fbf27485e6123b71ea99a3f4f8cd94b53b8c5b
+  data.tar.gz: f2b0e4f6104a27077c48dafe65584e42628c6ab88e6def545cc1f6bfdf2a46e50977df2acef945b7f5dae77503c2e8ad80cbd374c07e089ab50d7672971fba22

data/ext/fast_osc/fast_osc_wrapper.c

@@ -38,6 +38,35 @@ const char *rtosc_path(const char *msg)
   return msg;
 }
 
+#define JAN_1970 2208988800.0     /* 2208988800 time from 1900 to 1970 in seconds */
+
+uint64_t ruby_time_to_osc_timetag(VALUE rubytime) {
+  uint64_t timetag;
+  double floattime;
+  uint32_t sec;
+  uint32_t frac;
+
+  switch(TYPE(rubytime)) {
+    case T_NIL:
+      timetag = 1;
+      break;
+    default:
+      // convert Time object to ntp
+      floattime = JAN_1970 + NUM2DBL(rb_funcall(rubytime, rb_intern("to_f"), 0));
+
+      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;
+  }
+
+  return timetag;
+}
+
+
 VALUE method_fast_osc_decode_single_message(VALUE self, VALUE msg) {
   rtosc_arg_itr_t itr;
   char* data = StringValuePtr(msg);
@@ -49,6 +78,9 @@ VALUE method_fast_osc_decode_single_message(VALUE self, VALUE msg) {
 
   rtosc_arg_val_t next_val;
 
+  // for timestamp arg decoding
+  uint64_t tt, secs, frac;
+
   while(!rtosc_itr_end(itr)) {
 
     next_val = rtosc_itr_next(&itr);
@@ -73,7 +105,21 @@ VALUE method_fast_osc_decode_single_message(VALUE self, VALUE msg) {
         break;
       case 't' :
         // OSC time tag
-        // not implemented
+        // need to decode OSC (ntp style time) to unix timestamp
+        // then call Time.now with that
+        tt = next_val.val.t;
+        secs = (tt >> 32) - JAN_1970;
+        // taken from this SO post on how to convert NTP to Unix epoch
+        // http://stackoverflow.com/a/29138806
+        frac = ((tt & 0xFFFFFFFF) * 1000000) >> 32;
+        // example call from grpc ruby extension
+        // https://github.com/grpc/grpc/blob/master/src/ruby/ext/grpc/rb_grpc.c
+        //   return rb_funcall(rb_cTime, id_at, 2, INT2NUM(real_time.tv_sec),
+        //                       INT2NUM(real_time.tv_nsec / 1000));
+        // printf("\noutsec: %08llx\n", secs);
+        // printf("\noutfrac: %08llx\n", frac);
+        // printf("\nouttimetag: %08llx\n", tt);
+        rb_ary_push(args_output, rb_funcall(rb_cTime, rb_intern("at"), 2, LONG2NUM(secs), LONG2NUM(frac)));
         break;
       case 'd' :
         rb_ary_push(args_output, rb_float_new(next_val.val.d));
@@ -164,6 +210,15 @@ 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(strval);
         break;
+      case T_DATA:
+        if (CLASS_OF(current_arg) == rb_cTime) {
+          // at present I only care about the Time as an object arg
+          max_buffer_size += 8;
+
+          rb_str_concat(tagstring, rb_str_new2("t"));
+          output_args[i].t = ruby_time_to_osc_timetag(current_arg);
+        }
+        break;
     }
   }
 
@@ -194,34 +249,6 @@ VALUE method_fast_osc_encode_single_message(int argc, VALUE* argv, VALUE self) {
   return output;
 }
 
-#define JAN_1970 2208988800.0     /* 2208988800 time from 1900 to 1970 in seconds */
-
-uint64_t ruby_time_to_osc_timetag(VALUE rubytime) {
-  uint64_t timetag;
-  double floattime;
-  uint32_t sec;
-  uint32_t frac;
-
-  switch(TYPE(rubytime)) {
-    case T_NIL:
-      timetag = 1;
-      break;
-    default:
-      // convert Time object to ntp
-      floattime = JAN_1970 + NUM2DBL(rb_funcall(rubytime, rb_intern("to_f"), 0));
-
-      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;
-  }
-
-  return timetag;
-}
-
 VALUE method_fast_osc_encode_single_bundle(int argc, VALUE* argv, VALUE self) {
   VALUE timetag, path, args;
   rb_scan_args(argc, argv, "21", &timetag, &path, &args);

data/lib/fast_osc/version.rb

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

data/test/fast_osc_test.rb

@@ -75,6 +75,16 @@ class FastOscTest < Minitest::Test
     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_it_encodes_and_decodes_messages_with_timestamps
+    path = "/s_new"
+    args = [Time.at(1463234577.488746)]
+    #args = [Time.at(1463234577.0)]
+    outpath, outargs = FastOsc.decode_single_message(FastOsc.encode_single_message(path, args))
+
+    assert_equal path, outpath
+    assert_equal args.first.to_f.round(5), outargs.first.to_f.round(5)
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_osc
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Xavier Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Serialize and deserialize Open Sound Control messages