Changeset 36224 for lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MML.as

Timestamp:

12/21/09 20:01:44 (3 years ago)

Author:

arche

Message:

多節エンベロープ･LFO出力先スイッチ･波形メモリ音源(@13)の追加。フォルマントフィルタ高速化。

Files:

• lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MML.as (modified) (5 diffs)

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MML.as

@@ -104 +104 @@
                 break;
             case 'e': // Envelope
-                next();
-                o = getUInt(o);
-                if (getChar() == ',') next();
-                a = getUInt(a);
-                if (getChar() == ',') next();
-                d = getUInt(d);
-                if (getChar() == ',') next();
-                s = getUInt(s);
-                if (getChar() == ',') next();
-                r = getUInt(r);
-                //trace("A"+a+",D"+d+",S"+s+",R"+r);
-                m_tracks[m_trackNo].recEnvelope(o, a, d, s, r);
+                {
+                        var releasePos:int;
+                        var t:Vector.<int> = new Vector.<int>(), l:Vector.<int> = new Vector.<int>();
+                        next();
+                        o = getUInt(o);
+                        if (getChar() == ',') next();
+                        a = getUInt(a);
+                        releasePos = m_letter;
+                        while(true){
+                                if (getChar() == ',') {
+                                        next();
+                                }else{
+                                        break;
+                                }
+                                releasePos = m_letter - 1;
+                        d = getUInt(d);
+                                if (getChar() == ',') {
+                                        next();
+                                }else{
+                                        m_letter = releasePos;
+                                        break;
+                                }
+                        s = getUInt(s);
+                        t.push(d);
+                        l.push(s);
+                    }
+                    if(t.length == 0){
+                        t.push(d);
+                        l.push(s);
+                    }
+                        if (getChar() == ',') next();
+                        r = getUInt(r);
+                        //trace("A"+a+",D"+d+",S"+s+",R"+r);
+                        m_tracks[m_trackNo].recEnvelope(o, a, t, l, r);
+                }
                 break;
             case 'n': // Noise frequency
@@ -162 +185 @@
             case 'l': // Low frequency oscillator (LFO)
                 {
-                    var dp:int = 0, wd:int = 0, fm:int = 1, sf:int = 0, rv:int = 1, dl:int = 0, tm:int = 0, cn:int = 0;
+                    var dp:int = 0, wd:int = 0, fm:int = 1, sf:int = 0, rv:int = 1, dl:int = 0, tm:int = 0, cn:int = 0, sw:int = 0;
                     next();
                     dp = getUInt(dp);
@@ -181 +204 @@
                                 next();
                                 tm = getUInt(tm);
+                                if (getChar() == ',') {
+                                        next();
+                                        sw = getUInt(sw);
+                                }
                             }
                         }
                     }
                     //trace("DePth"+dp+",WiDth"+wd+",ForM"+fm+",DeLay"+dl+",TiMe"+tm);
-                    m_tracks[m_trackNo].recLFO(dp, wd, fm, sf, dl, tm);
+                    m_tracks[m_trackNo].recLFO(dp, wd, fm, sf, dl, tm, sw);
                 }
                 break;
@@ -540 +567 @@
                         }
                         last = m_letter;
-                        args = m_string.substring(start + macro.id.length + 1, last - 1).split(",");
+                        var argstr:String = m_string.substring(start + macro.id.length + 1, last - 1);
+                        var curarg:String = "", quoted:Boolean = false;
+                        for(var pos:int = 0; pos < argstr.length; pos++){
+                                if(!quoted && argstr.charAt(pos) == '"'){
+                                        quoted = true;
+                                }else if(quoted && (pos + 1) < argstr.length && argstr.charAt(pos) == '\\' && argstr.charAt(pos + 1) == '"'){
+                                        curarg += '"';
+                                        pos++;
+                                }else if(quoted && argstr.charAt(pos) == '"'){
+                                        quoted = false;
+                                }else if(!quoted && argstr.charAt(pos) == ','){
+                                        args.push(curarg);
+                                        curarg = "";
+                                }else{
+                                        curarg += argstr.charAt(pos);
+                                }
+                        }
+                        args.push(curarg);
+                        if(quoted){
+                                warning(MWarning.UNCLOSED_ARGQUOTE, "");
+                        }
                     }
                     // 引数への置換
@@ -590 +637 @@
                         MOscGbWave.setWave(waveNo,
                                            (arg[1].toLowerCase()+"00000000000000000000000000000000").substr(0, 32));
+                    }
+                }
+                exp = /^#WAV13\s.*$/gm;
+                matched = m_string.match(exp);
+                if (matched) {
+                    for(i = 0; i < matched.length; i++) {
+                        m_string = m_string.replace(exp, "");
+                        //trace(matched[i]);
+                        wav = matched[i].split(" ");
+                        wavs = "";
+                        for(j = 1; j < wav.length; j++) wavs += wav[j];
+                        arg = wavs.split(",");
+                        waveNo = parseInt(arg[0]);
+                        if (waveNo < 0) waveNo = 0;
+                        if (waveNo >= MOscWave.MAX_WAVE) waveNo = MOscWave.MAX_WAVE-1;
+                        //trace(waveNo+":",arg[1].toLowerCase());
+                        MOscWave.setWave(waveNo,arg[1].toLowerCase());
                     }
                 }