Changeset 34284 for lang/actionscript/flmml/trunk/src

Timestamp:

07/04/09 04:28:41 (4 years ago)

Author:

arche

Message:

休符のみのトラックの次トラックがずれる現象と&のついたノートで終わるトラックの次トラックの先頭ノートが無視される現象の修正

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MML.as (modified) (5 diffs)
• flmml.swf (modified) (previous)

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

@@ -310 +310 @@
                 break;
             case ";": // end of track
+                m_keyoff = 1;
                 if (m_tracks[m_trackNo].getNumEvents() > 0) {
-                    m_tracks[++m_trackNo] = createTrack();
-                }
+                        m_trackNo++;
+                }
+                m_tracks[m_trackNo] = createTrack();
                 break;
             case "@":
@@ -481 +483 @@
             return -1;
         }
-/* 09/04/03 arche [DEL]
-        protected function insertLenOrder(idArr:Array, valArr:Array, id:String, val:String):void {
-            var len:int = id.length;
-            var i:int;
-            for(i = 0; i < idArr.length; i++) {
-                if (len >= ((String)(idArr[i])).length) break;
-            }
-            idArr.splice(i, 0, id);
-            valArr.splice(i, 0, val);
-        }
-
-        protected function replaceMacro(idArr:Array, valArr:Array):void {
-            var i:int;
-            for(i = 0; i < idArr.length; i++) {
-                var id:String = idArr[i];
-                //trace("["+m_string.substr(m_letter, id.length)+"]");
-                if (m_string.substr(m_letter, id.length) == idArr[i]) {
-                    //trace("["+m_string.substr(m_letter, id.length)+"]");
-                    m_string = m_string.substring(0, m_letter-1) + valArr[i] + m_string.substring(m_letter + id.length);
-                    //m_letter += valArr[i].length;
-                    break;
-                }
-            }
-        }
-        protected function macroInMacro(str:String, idArr:Array, valArr:Array, id0:String):String {
-            var idx:int;
-            for(var i:int = 0; i < idArr.length; i++) {
-                var id:String = "$"+idArr[i];
-                //trace("id:"+id);
-                idx = str.indexOf(id);
-                while(idx >= 0) {
-                    str = str.substring(0, idx) + valArr[i] + str.substring(idx + id.length);
-                    idx = str.indexOf(id, idx);
-                }
-            }
-            // recursive call is prevented.
-            id0 = "$" + id0;
-            idx = str.indexOf(id0);
-            while(idx >= 0) {
-                str = str.substring(0, idx) + str.substring(idx + id0.length);
-                idx = str.indexOf(id0, idx);
-                warning(MWarning.RECURSIVE_MACRO, id0);
-            }
-            return str;
-        }
-*/
-
-        // 09/04/03 arche [ADD] begin
+
         protected function replaceMacro(macroTable:Array):Boolean {
             for each(var macro:Object in macroTable){
@@ -571 +526 @@
             return false;
         }
-        // 09/04/03 arche [ADD] end
 
         protected function processMacro():void {
@@ -638 +592 @@
             // macro
             begin();
-            // 09/04/03 arche [ADD] begin
             var top:Boolean = true;
             var macroTable:Array = new Array();
@@ -730 +683 @@
                 }
             }
-            // 09/04/03 arche [ADD] end
         }