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

Timestamp:

12/19/07 03:00:18 (5 years ago)

Author:

tekisuke

Message:

lang/actionscript/flmml/:
LFOの実装と、OCTAVE REVERSEの実装。

Files:

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

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

@@ -10 +10 @@
         protected var m_trackNo:int;
         protected var m_octave:int;
-        protected var m_velocity:int;       // default velocity
-        protected var m_length:int;         // default length
+        protected var m_relativeDir:Boolean; //
+        protected var m_velocity:int;        // default velocity
+        protected var m_length:int;          // default length
         protected var m_tempo:int;
         protected var m_letter:int;
@@ -138 +139 @@
                 break;
             case 'l': // Low frequency oscillator (LFO)
-                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("FR"+a+",DP"+d+",DL"+s+",TM"+r);
-                m_tracks[m_trackNo].recLFO(a, d, s, r);
+                {
+                    var dp:int = 0, wd:int = 0, fm:int = 1, rv:int = 1, dl:int = 0, tm:int = 0, cn:int = 0;
+                    next();
+                    dp = getUInt(dp);
+                    if (getChar() == ',') next();
+                    wd = getUInt(wd);
+                    if (getChar() == ',') {
+                        next();
+                        if (getChar() == '-') { rv = -1; next(); }
+                        fm = (getUInt(fm) + 1) * rv;
+                        if (getChar() == ',') {
+                            next();
+                            dl = getUInt(dl);
+                            if (getChar() == ',') {
+                                next();
+                                tm = getUInt(tm);
+                            }
+                        }
+                    }
+                    //trace("DePth"+dp+",WiDth"+wd+",ForM"+fm+",DeLay"+dl+",TiMe"+tm);
+                    m_tracks[m_trackNo].recLFO(dp, wd, fm, dl, tm);
+                }
                 break;
             default:
@@ -194 +205 @@
                 break;
             case "<" :
-                m_octave++;
+                if (m_relativeDir) m_octave++; else m_octave--;
                 break;
             case ">":
-                m_octave--;
+                if (m_relativeDir) m_octave--; else m_octave++;
                 break;
             case ';':
@@ -403 +414 @@
             var valArr:Array = new Array();
             var i:int;
+            var last:int;
             // [a-zA-Z][a-zA-Z0-9#\+\(\)_]*
             // ex.) $Am    =/:4a<ce>a:/;
@@ -415 +427 @@
                     // macro definition?
                     if (top) {
-                        var last:int = m_string.indexOf(";", m_letter);
+                        last = m_string.indexOf(";", m_letter);
                         if (last > m_letter) {
                             var macro:String = m_string.substring(m_letter, last);
@@ -457 +469 @@
                         replaceMacro(idArr, valArr);
                     }
+                    top = 0;
                     break;
                 case ';':
@@ -465 +478 @@
                     break;
                 }
+            }
+            //
+            var exp:RegExp = /[\n\r\f]*#OCTAVE\s+REVERSE\s*[\n\r\f]/;
+            if (m_string.match(exp)) {
+                m_string = m_string.replace(exp, "");
+                m_relativeDir = false;
             }
         }
@@ -519 +538 @@
             m_trackNo = MTrack.FIRST_TRACK;
             m_octave = 4;
+            m_relativeDir = true;
             m_velocity = 100;
             m_length = 4;