smml 0.0.1.5 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ff5842372ded20636c957cecf250fd9281aeaa
-  data.tar.gz: 9fa770527ddb702083efc7e8fadf3de322d2018c
+  metadata.gz: e9e4b5e286515548fd779124d93a0e4af0033544
+  data.tar.gz: 1d03edbde6611b9765734e39876c150bbd18174e
 SHA512:
-  metadata.gz: 85190158c8daf8d4348b4b9a3bdab554296646d2177cd461cea9b31906b27c3595e23b7d12e4bb35a134f232c0822949eeb04271b873fff81e9c250aca2e03c3
-  data.tar.gz: aaad50efe9d52991caf0742f0144091cd4f407f8bb51feb14a91fe3cf1a91a07494c573e0bbbb0ee9c924682855174b311ef23a702f7af8268dc03d40b42728a
+  metadata.gz: a4594fbee45fd10fc83d777f96771f6a9c8f661bd6ff8de91530798541ae6c3f072aff4a62c8e2104720c9bfe3e1d05154e494391359a42e64d1e8f867832df8
+  data.tar.gz: 16ac496ecb4c88b4d357371dd02efd3f4f67b6e65b7d478415f1aab981a893ed273a961b1a4d3ba6181a8aca52265c10040ed95b8c11318547818d9d22d82f44

data/lib/smml/msm.rb

@@ -3,6 +3,8 @@
 require 'kconv'
 require 'optparse'
 
+$debuglevel=0
+
 def hint
   cmd=File.basename($0)
   puts <<EOF
@@ -140,7 +142,7 @@ class String
   def cmark
     @@cmark
   end
-  def trim ofs="",com=@@cmark
+  def commentoff ofs="",com=@@cmark
     lines=self.split("\n")
     d=multilineTrim(lines,com)
     d=d.map{|i|i.sub(/(#{com}).*/){}.chomp}*ofs
@@ -269,7 +271,7 @@ def rawdata d
   d.gsub(","){" "}
 end
 def trackSizeHex d,cmark="#"
-  d=d.trim("",cmark).split.join
+  d=d.commentoff("",cmark).split.join
   i=(d.size+8)/2
 #  p [d,i,i.to_s(16)]
   #("00000000"+i.to_s(16))[-8..-1]
@@ -646,6 +648,7 @@ end
 module MidiHex
   # 設定のため最初に呼ばなければならない
   def self.prepare bpm,tbase=480,vel=0x40,oct=:near,vfuzzy=2
+    @autopan=true
     @startBpm=bpm
     @midiname=false
     @cmark="#"
@@ -684,6 +687,7 @@ module MidiHex
     @basekeyRythm=@basekeyOrg=@basekey
     @bendrange=2
     @bendCent=1
+    @pancenter=64
     @prepareSet=[@tbase,@ch,@velocity,@velocityFuzzy,@basekey,@gateRate,@bendrange,@bendCent]
     @chmax=15
     @bendrangemax=127
@@ -714,7 +718,7 @@ module MidiHex
         @midiname+=".mid" if @midiname !~ /\.mid$/
       end
     end
-    @data=File.read(name).trim(" ;").toutf8 if name && File.exist?(name)
+    @data=File.read(name).commentoff(" ;").toutf8 if name && File.exist?(name)
   end
   def self.getdata
     @data
@@ -758,8 +762,9 @@ module MidiHex
     @preBefore=[]
     @preAfter=[]
     @tracknum=tc+1
-    tc+=1 if tc>=9 # ch10 is drum kit channel
+    tc+=1 if tc>=@rythmChannel # ch10 is drum kit channel
     tc=@chmax if tc>@chmax
+    @panoftrack=panbytrack(tc)
     @ch=tc
   end
   def self.header format,track,tbase=@tbase
@@ -1352,6 +1357,19 @@ module MidiHex
       end
     }
   end
+  def self.autopan v
+    @autopan=v
+  end
+  def self.autopanset tnum
+    @panstep=0x7f/(tnum+2)
+  end
+  def self.panbytrack tc
+    if @autopan
+      tc==@rythmChannel ? @pancenter : (tc+1)*@panstep
+    else
+      @pancenter
+    end
+  end
   def self.strokeSpeed s
     s=s.to_i
     @strokespeed=s
@@ -1451,6 +1469,7 @@ module MidiHex
     @shiftbase=40
     accent=false
     sharp=0
+    @h<<[:controlChange,"10,#{@panoftrack}"] if @autopan
     cmd=rundata.scan(/&\([^)]+\)|\([-+]*[[:digit:]]?\)|:[^\(,]+\([^\)\(]+\),|:[^,]+,|\([^:]*:[^)\(]*\)|_[^!_]+!|_[^_]__[^\?]+\?|v[[:digit:]]+|[<>][[:digit:]]*|\*?[[:digit:]]+\.[[:digit:]]+|\*?[[:digit:]]+|[-+[:alpha:]]|\^|`|'|./)
     cmd<<" " # dummy
     p "make start: ",cmd if $DEBUG
@@ -2166,7 +2185,7 @@ end
 
 class MmlTracks
   attr_accessor :tracknum, :tbase, :rundatas, :rawdatas, :mx
-  attr_accessor :bpm, :velocity, :octave, :vfuzzy, :data, :infile, :outfile
+  attr_accessor :bpm, :velocity, :octave, :vfuzzy, :data, :infile, :outfile, :autopan
   def initialize tbase=480,pagesep='///',expfile=false,cmark=';;'
     String.new.setcmark(cmark)
     @mx=MidiHex
@@ -2183,6 +2202,7 @@ class MmlTracks
     @velocity=0x40
     @octave=:near
     @vfuzzy=2
+    @autopan=true
   end
   def init test,fz
     @mx.prepare(@bpm,@tbase,@velocity,@octave,@vfuzzy)
@@ -2238,6 +2258,9 @@ class MmlTracks
   end
   def settracks
     @htracks=[]
+    tcall=@rundatas.size
+    @mx.autopanset(tcall)
+    @mx.autopan(@autopan)
     tc=0
     # remember starting position check if data exist before sound
     @htracks << @mx.metaTitle + @mx.generaterText + @mx.starttempo.data + @mx.makefraze(@rundatas[0],tc) + @mx.lastrest
@@ -2250,7 +2273,7 @@ class MmlTracks
     @header=@mx.header(1, @tracknum, @tbase)
     alla=[@header]+@htracks.map{|t|@mx.trackMake(t)}.flatten
     puts alla if $DEBUG
-    all=alla.map{|i|i.trim("","#")}*""
+    all=alla.map{|i|i.commentoff("","#")}*""
     array=[all.split.join]
     @binary = array.pack( "H*" )
   end

data/lib/smml/version.rb

@@ -1,3 +1,3 @@
 module Smml
-  VERSION = "0.0.1.5"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smml
 version: !ruby/object:Gem::Version
-  version: 0.0.1.5
+  version: 0.0.2
 platform: ruby
 authors:
 - tabasano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler