smml 0.1.8 → 0.1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2a5f8a92f538689c4376fde815e064a7d4887ec
-  data.tar.gz: cb84d1b91997d306b5de5bbdb4033c3a01e0a1ca
+  metadata.gz: 21c1875b3d3c6af5a1ab009c3061b3b414fc38a7
+  data.tar.gz: 81e2af2f63f365d8e8023cce052b5568055a6eb2
 SHA512:
-  metadata.gz: d31c883cdba860e6dc39175eccad5d8ce55cfe95c31fba806042473ae9e5dff29bf3506f8b6c762c62d75fba36b6cfa20b56c257700e03b11fe4fe36d711fd95
-  data.tar.gz: 14dff95b8b0cdf6c81eedb3fa284cb16c9e0d9ed7250022b0eb0928e4c626f68849e1c6614c27896197e4a5825ce6856e8806b87adbe4b2f3e66df2d578ad589
+  metadata.gz: 05da008c658c956c680682349dc51ea61e82947d20d9f5ba9dff6e6c332adef2829ce81e27392bdd00be622e8bda06c7f16ceb38454200c409eb1ac81949223f
+  data.tar.gz: ba55e9d66319fb206069149b90b2b436714ddaaaf0b12318049531e3b4ff5fa4dd1f1fd548ef60aa87bd85b6bd55cf6c8461387d87fee8f63bd7931191234ae3

data/lib/smml/msm.rb

@@ -1059,14 +1059,16 @@ module MidiHex
     @basekey=0x3C
     @chordCenter=@chordCenterOrg=@basekey
     @basekeyRythm=@basekeyOrg=@basekey
+    @bendCentOn=false
     @bendrange=2
-    @bendCent=1
+    @bendNow=0
+    self.bendCentReset
     @pancenter=64
     @scalenotes=ScaleNotes.new.reset
     @gtune=guitarTuning
     self.setDefault
     @chmax=15
-    @bendrangemax=127
+    @bendrangemax=24
     file="midi-programChange-list.txt"
     pfile="midi-percussion-map.txt"
     base=File.dirname(__FILE__)
@@ -1076,13 +1078,16 @@ module MidiHex
     self.loadPercussionMap(pfile)
     self.dumpstatus if $DEBUG && $debuglevel>3
   end
+  def setBendRangeMax v
+    @bendrangemax=v
+  end
   def self.setDefault
     @prepareSet=[
-      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune,@expressionRest,@expressionDef
+      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef
     ]
   end
   def self.getDefault
-      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent,@scalenotes,@gtune,@expressionRest,@expressionDef=
+      @tbase,@ch,@velocity,@expression,@velocityFuzzy,@basekey,@gateRate,@bendCentOn,@bendrange,@bendCent,@bendNow,@scalenotes,@gtune,@expressionRest,@expressionDef=
       @prepareSet
   end
   def self.dumpstatus
@@ -1135,15 +1140,20 @@ module MidiHex
       @bendrange=v.to_i
     end
     @bendrange=[[@bendrange,@bendrangemax].min,0].max
+    self.bendCentReset
     r=[]
     r<<self.controlChange("101,0")
     r<<self.controlChange("100,0")
     r<<self.controlChange("6,#{@bendrange}")
     r
   end
+  def self.bendCentReset
+    cent= @bendCentOn ? 100.0 : 1
+    @bendCent=@bendHalfMax/@bendrange/cent
+  end
   def self.bendCent on
-    @bendCent=1
-    @bendCent=@bendHalfMax/@bendrange/100.0 if on
+    @bendCentOn=on
+    self.bendCentReset
     @lastbend=0
   end
   def self.trackPrepare tc=0
@@ -1235,11 +1245,13 @@ module MidiHex
     @waitingtime=0
     pos-=start
     depth=(key-@thereminNote)*100
+    depth=depth+@bendNow
     r<<self.bend(start,depth.to_s,ch)
     r<<self.bend(pos,depth.to_s,ch)
     r
   end
   def self.oneNote len=@tbase,key=@basekey,velocity=@velocity,ch=@ch,sharp=0
+    bendStart=@bendNow
     velocity=@preVelocity.shift if @preVelocity.size>0
     gate=@gateRate
     ch=[ch,0x0f].min
@@ -1275,7 +1287,8 @@ module MidiHex
     end
     @nowtime+=slen
     r<<Event.new(:e,slen," 8#{ch} #{key} 00 # #{slen}(gate:#{@gateRate})- #{len.to_i}(#{len.round(2)})ticks later, sound off [#{(@nowtime/@tbase).to_i}, #{@nowtime%@tbase}]\n")
-    r<<self.bend(0,0) if bends
+    r<<self.bend(0,bendStart) if bends
+    @bendNow=bendStart
     r<<self.expre(0,127) if expre
     if rest>0
       @nowtime+=rest
@@ -1316,6 +1329,7 @@ module MidiHex
     self.oneNote(len,key,vel,@rythmChannel,sharp)
   end
   def self.notes c,l=false,accent=false,sharp=0,sharpFloat=false
+    bendStart=@bendNow
     @lastnoteName=c
     n=@notes[c]
     if @octmode==:near && n.class != Array
@@ -1330,11 +1344,14 @@ module MidiHex
     end
     r=[]
     if sharpFloat && sharpFloat!=0
-      v=sharpFloat*@bendHalfMax
-      v=sharpFloat*100 if @bendCent>1
+      v=sharpFloat*@bendHalfMax/@bendrange
+      v=sharpFloat*100 if @bendCentOn
+      v+=bendStart
       r<<self.bend(0,v)
+      @bendNow=v
       r<<self.notekey(n,l,accent,sharp)
-      r<<self.bend(0,0)
+      r<<self.bend(0,bendStart)
+      @bendNow=bendStart
     else
       r<<self.notekey(n,l,accent,sharp)
     end
@@ -1594,6 +1611,7 @@ module MidiHex
     Event.new(:sys,len," #{ex} # GM\n")
   end
   def self.XGsystemOn len=0
+    @bendrangemax=127
     @nowtime+=len
     ex=self.sysExEvent("43 10 4C 00 00 7E 00")
     Event.new(:sys,len," #{ex} # XG\n")
@@ -1689,7 +1707,7 @@ module MidiHex
     end
     depth=@lastbend+depth if plus
     @lastbend=depth
-    depth=(depth*@bendCent).to_i
+    depth=(depth*@bendCent).to_i if @bendCentOn
     pos+=@waitingtime
     @waitingtime=0
     @nowtime+=pos
@@ -1896,7 +1914,7 @@ module MidiHex
       ch=format("%01x",@ch)
       vel=format("%02x",@velocity)
       r<<Event.new(:e,0," 9#{ch} #{key} #{vel} # theremin sound on note #{@thereminNote} velocity #{@velocity}\n")
-      r<<self.bendRange(12*4)
+      r<<self.bendRange(@bendrangemax)
       self.bendCent(true)
     else
       @thereminNote=false

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 class Smml
-  VERSION = "0.1.8"
+  VERSION = "0.1.8.2"
 end

data/sample/midi-test.mml

@@ -10,7 +10,7 @@ t:=abcde
 tt(x):=ee$xff
 
 a`b'cd (stroke:86) [ef{e,f,g}g_c!:cmaj7,<(stroke:3)]4>>>> (p:flut)(g:80)[/2:aAbcCdef/(g:20)-]2
- (bendCent:off)[c(bend:200.2)/cc/(bend:0)c(bendCent:on)]2
+ (bendCent:off)[c(bend:200.2)/cc/(bend:0)(+0.3)c(bendCent:on)]2
  (mark:tes)(p:guit)/2:c2gc/[/2:~{e,g}=f/] (g:100) f*240e*120d*60 --(p:organ) $t (+3)a(+)b(0)c $tt(4:1,2,3)
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.8.2
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler