Changeset 20421

Timestamp:

10/02/08 01:32:37 (3 months ago)

Author:

tekisuke

Message:

lang/actionscript/flmml/: マクロを再帰的定義したときのバグをとりあえず修正。FM音源はまだ封印。

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MChannel.as (modified) (7 diffs)
• com/txt_nifty/sketch/flmml/MEvent.as (modified) (2 diffs)
• com/txt_nifty/sketch/flmml/MML.as (modified) (7 diffs)
• com/txt_nifty/sketch/flmml/MSequencer.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MStatus.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MTrack.as (modified) (2 diffs)
• com/txt_nifty/sketch/flmml/MWarning.as (modified) (1 diff)
• flmml.swf (modified) (previous)

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

@@ -26 +26 @@
         private var m_lpfRes:Number;
         private var m_volMode:int;
+        private var m_inSens:int;
+        private var m_inPipe:int;
+        private var m_outMode:int;
+        private var m_outPipe:int;
         public    static var PITCH_RESOLUTION:int = 100;
         protected static var s_init:int = 0;
@@ -33 +37 @@
         protected static var s_volumeLen:int;
         protected static var s_samples:Array;
+        protected static var s_pipeArr:Array;
 
         public function MChannel() {
@@ -58 +63 @@
             m_lpfRes   = 0;
             m_volMode  = 0;
+            setInput(0, 0);
+            setOutput(0, 0);
         }
         public static function boot(numSamples:int):void {
@@ -75 +82 @@
             }
             s_samples = new Array(numSamples);
+        }
+        public static function createPipes(num:int):void {
+            s_pipeArr = new Array(num);
+            for (var i:int = 0; i < num; i++) {
+                s_pipeArr[i] = new Array(s_samples.length);
+                for (var j:int = 0; j < s_samples.length; j++) {
+                    var arr:Array = s_pipeArr[i];
+                    arr[j] = 0;
+                }
+            }
         }
         public static function getFrequency(freqNo:int):Number {
@@ -169 +186 @@
         public function setVolMode(m:int):void {
             m_volMode = m;
+        }
+        public function setInput(i:int, p:int):void {
+            m_inSens = i * 100;
+            m_inPipe = p;
+        }
+        public function setOutput(o:int, p:int):void {
+            m_outMode = o;
+            m_outPipe = p;
         }
         protected function getNextSampleLinear():Number {
@@ -189 +214 @@
             var freqNo:int;
             var i:int;
+            var arr:Array;
             if (end >= max) end = max;
             var key:Number = m_oscillator1.getFrequency();
-            if (m_osc2Connect == 0) {
-                // no LFO
-                m_oscillator1.getSamples(s_samples, start, end);
-                if (m_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, start, end, m_velocity);
-                else m_envelope1.ampSamplesNonLinear(s_samples, start, end, m_velocity);
-            }
+            if (m_inSens == 0) {
+                if (m_osc2Connect == 0) {
+                    // no input, no LFO
+                    m_oscillator1.getSamples(s_samples, start, end);
+                    if (m_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, start, end, m_velocity);
+                    else m_envelope1.ampSamplesNonLinear(s_samples, start, end, m_velocity);
+                }
+                else {
+                    // no input, with LFO, linear
+                    if (m_volMode == 0) {
+                        for(i = start; i < end; i++) {
+                            freqNo = m_freqNo;
+                            if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
+                                freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
+                            }
+                            m_oscillator1.setFrequency(getFrequency(freqNo));
+                            s_samples[i] = getNextSampleLinear();
+                            m_onCounter++;
+                        }
+                    }
+                    // no input, with LFO, non linear
+                    else {
+                        for(i = start; i < end; i++) {
+                            freqNo = m_freqNo;
+                            if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
+                                freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
+                            }
+                            m_oscillator1.setFrequency(getFrequency(freqNo));
+                            s_samples[i] = getNextSampleNonLinear();
+                            m_onCounter++;
+                        }
+                    }
+                }
+            }
+            // with input
             else {
-                // with LFO, linear
-                if (m_volMode == 0) {
-                    for(i = start; i < end; i++) {
-                        freqNo = m_freqNo;
-                        if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
-                            freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
-                        }
-                        m_oscillator1.setFrequency(getFrequency(freqNo));
-                        s_samples[i] = getNextSampleLinear();
-                        m_onCounter++;
-                    }
-                }
-                // with LFO, non linear
+                //trace("input "+m_inPipe);
+                if (m_osc2Connect == 0) {
+                    // with input, no LFO
+                    arr = s_pipeArr[m_inPipe];
+                    freqNo = getFrequency(m_freqNo);
+                    if (m_volMode == 0) {
+                        for(i = start; i < end; i++) {
+                            m_oscillator1.setFrequency(freqNo + arr[i] * m_inSens);
+                            s_samples[i] = getNextSampleLinear();
+                        }
+                    }
+                    else {
+                        for(i = start; i < end; i++) {
+                            m_oscillator1.setFrequency(freqNo + arr[i] * m_inSens);
+                            s_samples[i] = getNextSampleNonLinear();
+                        }
+                    }
+                }
                 else {
-                    for(i = start; i < end; i++) {
-                        freqNo = m_freqNo;
-                        if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
-                            freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
-                        }
-                        m_oscillator1.setFrequency(getFrequency(freqNo));
-                        s_samples[i] = getNextSampleNonLinear();
-                        m_onCounter++;
+                    // with input, with LFO, linear
+                    if (m_volMode == 0) {
+                        arr = s_pipeArr[m_inPipe];
+                        for(i = start; i < end; i++) {
+                            freqNo = m_freqNo;
+                            if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
+                                freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
+                            }
+                            m_oscillator1.setFrequency(getFrequency(freqNo) + arr[i] * m_inSens);
+                            s_samples[i] = getNextSampleLinear();
+                            m_onCounter++;
+                        }
+                    }
+                    // with input, with LFO, non linear
+                    else {
+                        arr = s_pipeArr[m_inPipe];
+                        for(i = start; i < end; i++) {
+                            freqNo = m_freqNo;
+                            if (m_onCounter >= m_lfoDelay && (m_lfoEnd == 0 || m_onCounter < m_lfoEnd)) {
+                                freqNo += m_oscillator2.getNextSample() * m_osc2Sign * m_lfoDepth;
+                            }
+                            m_oscillator1.setFrequency(getFrequency(freqNo) + arr[i] * m_inSens);
+                            s_samples[i] = getNextSampleNonLinear();
+                            m_onCounter++;
+                        }
                     }
                 }
@@ -225 +302 @@
             m_formant.run(s_samples, start, end);
             m_filter.run(s_samples, start, end, m_envelope2, m_lpfFrq, m_lpfAmt, m_lpfRes, key);
-            for(i = start; i < end; i++) {
-                amplitude = s_samples[i];
-                sample = samples[i];
-                sample.left  += amplitude * m_panL;
-                sample.right += amplitude * m_panR;
+            switch(m_outMode) {
+            case 0:
+                //trace("output audio");
+                for(i = start; i < end; i++) {
+                    amplitude = s_samples[i];
+                    sample = samples[i];
+                    sample.left  += amplitude * m_panL;
+                    sample.right += amplitude * m_panR;
+                }
+                break;
+            case 1: // overwrite
+                //trace("output "+m_outPipe);
+                arr = s_pipeArr[m_outPipe];
+                for(i = start; i < end; i++) {
+                    arr[i] = s_samples[i];
+                }
+                break;
+            case 2: // add
+                arr = s_pipeArr[m_outPipe];
+                for(i = start; i < end; i++) {
+                    arr[i] += s_samples[i];
+                }
+                break;
+            default:
+                break;
             }
         }

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

@@ -40 +40 @@
         public function setClose():void                       { set(MStatus.CLOSE, 0, 0); }
         public function setVolMode(m:int):void                { set(MStatus.VOL_MODE, m, 0); }
+        public function setInput(sens:int, pipe:int):void     { set(MStatus.INPUT, sens, pipe); }
+        public function setOutput(mode:int, pipe:int):void    { set(MStatus.OUTPUT, mode, pipe); }
         public function setDelta(delta:int):void              { m_delta = delta; }
         public function getStatus():int     { return m_status; }
@@ -68 +70 @@
         public function getLPFRes():int     { return m_data1; }
         public function getVolMode():int    { return m_data0; }
+        public function getInputSens():int  { return m_data0; }
+        public function getInputPipe():int  { return m_data1; }
+        public function getOutputMode():int { return m_data0; }
+        public function getOutputPipe():int { return m_data1; }
     }
 }

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

@@ -21 +21 @@
         protected var m_noteShift:int;
         protected var m_warning:String;
+        protected var m_maxPipe:int;
+        protected static var MAX_PIPE:int = 3;
 
         public function MML() {
@@ -191 +193 @@
                 m_tracks[m_trackNo].recGate2(getUInt(2) * 2); // '*2' according to TSSCP
                 break;
+                /*case 'i': // Input
+                {
+                    var sens:int = 0;
+                    next();
+                    sens = getUInt(sens);
+                    if (getChar() == ',') {
+                        next();
+                        a = getUInt(a);
+                        if (a > m_maxPipe) a = m_maxPipe;
+                    }
+                    m_tracks[m_trackNo].recInput(sens, a);
+                }
+                // @i[n],[m]   m:pipe no
+                // if (n == 0) off
+                // else sensitivity = n (max:8)
+                break;
+            case 'o': // Output
+                {
+                    var mode:int = 0;
+                    next();
+                    mode = getUInt(mode);
+                    if (getChar() == ',') {
+                        next();
+                        a = getUInt(a);
+                        if (a > m_maxPipe) {
+                            m_maxPipe = a;
+                            if (m_maxPipe >= MAX_PIPE) m_maxPipe = a = MAX_PIPE;
+                        }
+                    }
+                    m_tracks[m_trackNo].recOutput(mode, a);
+                }
+                // @o[n],[m]   m:pipe no
+                // if (n == 0) off
+                // if (n == 1) overwrite
+                // if (n == 2) add
+                break;*/
             default:
                 m_form = getUInt(m_form);
@@ -436 +474 @@
         }
 
-        protected function macroInMacro(str:String, idArr:Array, valArr:Array):String {
+        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);
-                var idx:int = str.indexOf(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) + valArr[i] + str.substring(idx + id0.length);
+                idx = str.indexOf(id0, idx);
+                warning(MWarning.RECURSIVE_MACRO, id0);
             }
             return str;
@@ -454 +501 @@
             var idArr:Array = new Array();
             var valArr:Array = new Array();
-            var i:int;
             var last:int;
             // [a-zA-Z][a-zA-Z0-9#\+\(\)_]*
@@ -483 +529 @@
                                         // first definition
                                         if (idx < 0) {
-                                            token[1] = macroInMacro(token[1], idArr, valArr);
+                                            token[1] = macroInMacro(token[1], idArr, valArr, id[0]);
                                             //trace("define $"+id[i]+"="+token[1]);
-                                            insertLenOrder(idArr, valArr, id[i], token[1]);
+                                            insertLenOrder(idArr, valArr, id[0], token[1]);
                                         }
                                         // macro redefinition
                                         else {
-                                            token[1] = macroInMacro(token[1], idArr, valArr);
+                                            token[1] = macroInMacro(token[1], idArr, valArr, id[0]);
                                             //trace("redefine $"+id[i]+"="+token[1]);
                                             valArr[idx] = token[1];
@@ -592 +638 @@
             m_form = MOscillator.PULSE;
             m_noteShift = 0;
+            m_maxPipe = 0;
 
             processComment(str);
@@ -616 +663 @@
                 m_sequencer.connect(m_tracks[i]);
             }
+            m_sequencer.createPipes(m_maxPipe+1);
 
             // dispatch event

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

@@ -157 +157 @@
             //trace((endtime.getTime() - starttime.getTime()) + "msec.");
         }
+
+        public function createPipes(num:int):void {
+            MChannel.createPipes(num);
+        }
     }
 }

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

@@ -25 +25 @@
         public static const ENVELOPE2_AD:int = 22;
         public static const ENVELOPE2_SR:int = 23;
+        public static const INPUT:int        = 24;
+        public static const OUTPUT:int       = 25;
     }
 }

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

@@ -128 +128 @@
                                 m_ch.setVolMode(e.getVolMode());
                                 break;
+                            case MStatus.INPUT:
+                                m_ch.setInput(e.getInputSens(), e.getInputPipe());
+                                break;
+                            case MStatus.OUTPUT:
+                                m_ch.setOutput(e.getOutputMode(), e.getOutputPipe());
+                                break;
                             case MStatus.CLOSE:
                                 m_ch.close();
@@ -345 +351 @@
             recDelta(e);
             e.setVolMode(m);
+            m_events.push(e);
+        }
+
+        public function recInput(sens:int, pipe:int):void {
+            var e:MEvent = new MEvent();
+            recDelta(e);
+            e.setInput(sens, pipe);
+            m_events.push(e);
+        }
+
+        public function recOutput(mode:int, pipe:int):void {
+            var e:MEvent = new MEvent();
+            recDelta(e);
+            e.setOutput(mode, pipe);
             m_events.push(e);
         }

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

@@ -5 +5 @@
         public static const UNOPENED_COMMENT:int = 2;
         public static const UNCLOSED_COMMENT:int = 3;
+        public static const RECURSIVE_MACRO:int  = 4;
         public static const s_string:Array = [
                                               "対応していないコマンド '%s' があります。",
                                               "終わりが見つからない繰り返しがあります。",
                                               "始まりが見つからないコメントがあります。",
-                                              "終わりが見つからないコメントがあります。"
+                                              "終わりが見つからないコメントがあります。",
+                                              "マクロが再帰的に呼び出されています。",
                                               ];
         public static function getString(warnId:int, str:String):String {