synthdef 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c8588c67ed85ad21a8d99a8137c050943f0c2d
-  data.tar.gz: 89e2c2d3bd2cabcafa5b18c02200cbb0d7705b61
+  metadata.gz: d37a515d073dae65541a0d175d2c86332b10d96e
+  data.tar.gz: 18aa402610ceccb1bdb67ee77fbd0aecfaec3d31
 SHA512:
-  metadata.gz: 6c8aa4387cb4868107d233ff0773df514603c7ac1019a894526bf2c116a08955c3af04393f6bc6bad0841ba52d076d7aa400bb0354097ad6cb78b69e4ceac93a
-  data.tar.gz: 1aa642d35abdef185c5dfc1a5499a03d6d40e3e82c55e62b64ce57d6abe1a7c252659329c525ddf1d1c1755ad388622c409786e0a90a3300e44f24c228081731
+  metadata.gz: ce0d99d8bf7bc43949fff5581495c43b6007f4c3bab2c24d24d0d41551fb26887334811a9d62646a7f8dab78be4a1fe57136503b849a41f8da9b76bf3fe5d332
+  data.tar.gz: 31bdd62ce2a628cab2cf52996dc4e335c479c65f65edd678ce1e282552d4142f1c6d0e69c46f2d480fde03db08d8033071c968fff35e664aa7cf31f659db018b

data/README.md

@@ -44,6 +44,13 @@ The gem ships with a command line tool to print the contents of a synthdef file
 
 ```
 $ gem install synthdef
+$ synthdef -v
+synthdef gem version 0.0.5
+Manipulate SuperCollider synthdef files from the command line
+Usage: synthdef [options] [path]
+    -c, --convert [VERSION]          Specify synthdef version of output
+    -f, --format [FORMAT]            Specify output format: json,  raw
+    -v, --version                    Show version
 $ synthdef /path/to/synthdefs/foo.scsyndef
 => {
   "file_type_id": "SCgf",
@@ -56,6 +63,18 @@ $ synthdef /path/to/synthdefs/foo.scsyndef
       "constants": [
         0.0,
         ...
+$ synthdef --convert 2 /path/to/synthdefs/foo.scsyndef
+=> {
+  "file_type_id": "SCgf",
+  "file_version": 2,
+  "no_of_synthdefs": 1,
+  "synthdefs": [
+    {
+      "name": "sonic-pi-pretty_bell",
+      "no_of_constants": 15,
+      "constants": [
+        0.0,
+        ...
 ```
 
 ## Usage

data/bin/synthdef

@@ -2,6 +2,7 @@
 require 'synthdef'
 require 'json'
 require 'optparse'
+require 'pp'
 
 ARGV << '-h' if ARGV.empty?
 
@@ -13,7 +14,7 @@ OptionParser.new do |opts|
     options[:convert] = c
   end
 
-	opts.on("-f", "--format [FORMAT]", ["json", "raw"], "Specify output format: json,  raw") do |f|
+	opts.on("-f", "--format [FORMAT]", ["json", "ruby", "raw"], "Specify output format: json, ruby,  raw") do |f|
 		options[:format] = f
 	end
 
@@ -42,6 +43,8 @@ options[:format] ||= "json"
 case options[:format]
 when "json"
 	puts JSON.pretty_generate(sdef.snapshot)
+when "ruby"
+  pp sdef.snapshot
 when "raw"
   puts sdef.to_binary_s
 else

data/lib/synthdef.rb

@@ -9,6 +9,15 @@ class PascalString < BinData::Primitive
   def set(v) self.data = v; end
 end
 
+class SynthInt < BinData::Choice
+  endian :big
+  default_parameter :selection => :check_version
+  default_parameter :copy_on_change => true
+
+  int16 0
+  int32 1
+end
+
 class Synthdef < BinData::Record
   def check_version
     # Returns zero based index for choices
@@ -24,35 +33,35 @@ class Synthdef < BinData::Record
   array :synthdefs, initial_length: lambda { no_of_synthdefs } do
     pascal_string :name
 
-    choice        :no_of_constants, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+    synth_int     :no_of_constants
     array         :constants, initial_length: lambda { no_of_constants } do
       float :constant
     end
 
-    choice        :no_of_params, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+    synth_int    :no_of_params
     array        :params, initial_length: lambda { no_of_params } do
       float :initial_parameter_value
     end
 
-    choice        :no_of_param_names, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+    synth_int    :no_of_param_names
     array        :param_names, initial_length: lambda { no_of_param_names } do
       pascal_string :param_name
-      choice        :param_index, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+      synth_int    :param_index
     end
 
-    choice        :no_of_ugens, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+    synth_int    :no_of_ugens
     array        :ugens, initial_length: lambda { no_of_ugens } do
       pascal_string :ugen_name
       int8          :rate
-      choice        :no_of_inputs, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
-      choice        :no_of_outputs, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+      synth_int     :no_of_inputs
+      synth_int     :no_of_outputs
       int16         :special, initial_value: 0
       array         :inputs, initial_length: lambda { no_of_inputs } do
-        choice :src, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+        synth_int  :src
         if lambda { src == -1 }
-          choice :input_constant_index, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+          synth_int :input_constant_index
         else
-          choice :input_ugen_index, :selection => :check_version, :copy_on_change => true, :choices => {0 => :int16, 1 => :int32}
+          synth_int :input_ugen_index
         end
       end
       array         :outputs, initial_length: lambda { no_of_outputs } do

data/lib/synthdef/version.rb

@@ -1,5 +1,5 @@
 require 'bindata'
 
 class Synthdef < BinData::Record
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synthdef
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Xavier Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Work with SuperCollider's binary synthdef format