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

Timestamp:

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

Author:

tekisuke

Message:

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

Files:

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

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;
             }
         }