Changeset 32952 for lang/actionscript

Timestamp:

04/30/09 00:46:36 (3 years ago)

Author:

tekisuke

Message:

@x エクスプレッション（0-127）を追加しました。

Location:

lang/actionscript/flmml/trunk/src

Files:

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

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

@@ -8 +8 @@
         private var m_envelope1:MEnvelope;     // for VCO
         private var m_envelope2:MEnvelope;     // for VCF
-        private var m_oscSet1:MOscillator;         // for original wave
+        private var m_oscSet1:MOscillator;     // for original wave
         private var m_oscMod1:MOscMod;
-        private var m_oscSet2:MOscillator;         // for Pitch LFO
+        private var m_oscSet2:MOscillator;     // for Pitch LFO
         private var m_oscMod2:MOscMod;
         private var m_osc2Connect:int;
@@ -17 +17 @@
         private var m_filterConnect:int;
         private var m_formant:MFormant;
-        private var m_velocity:Number;    // velocity (max:1.0)
+        private var m_expression:Number;       // expression (max:1.0)
+        private var m_velocity:Number;         // velocity (max:1.0)
+        private var m_ampLevel:Number;         // amplifier level (max:1.0)
         private var m_panL:Number;
         private var m_panR:Number;
@@ -58 +60 @@
             m_filterConnect = 0;
             m_formant = new MFormant();
-            m_velocity = 100.0 / 127.0;
+            m_volMode  = 0;
+            setExpression(127);
+            setVelocity(100);
             setPan(64);
             m_onCounter = 0;
@@ -67 +71 @@
             m_lpfFrq   = 0;
             m_lpfRes   = 0;
-            m_volMode  = 0;
             setInput(0, 0);
             setOutput(0, 0);
@@ -101 +104 @@
             freqNo = (freqNo < 0) ? 0 : (freqNo >= s_frequencyLen) ? s_frequencyLen-1 : freqNo;
             return s_frequencyMap[freqNo];
+        }
+        public function setExpression(ex:int):void {
+            m_expression = (m_volMode) ? s_volumeMap[ex] : ex / 127.0;
+            m_ampLevel = m_velocity * m_expression;
+        }
+        public function setVelocity(velocity:int):void {
+            m_velocity = (m_volMode) ? s_volumeMap[velocity] : velocity / 127.0;
+            m_ampLevel = m_velocity * m_expression;
         }
         public function setNoteNo(noteNo:int):void {
@@ -119 +130 @@
             m_oscMod2.resetPhase();
             m_filter.reset();
-            m_velocity = (m_volMode) ? s_volumeMap[velocity] : velocity / 127.0;
+            setVelocity(velocity);
             m_onCounter = 0;
 
@@ -244 +255 @@
                     // no input, no LFO
                     m_oscMod1.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_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, start, end, m_ampLevel);
+                    else m_envelope1.ampSamplesNonLinear(s_samples, start, end, m_ampLevel);
                 }
                 else {
@@ -261 +272 @@
                         m_oscMod1.setFrequency(getFrequency(freqNo));
                         m_oscMod1.getSamples(s_samples, s, e);
-                        if (m_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, s, e, m_velocity);
-                        else m_envelope1.ampSamplesNonLinear(s_samples, s, e, m_velocity);
+                        if (m_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, s, e, m_ampLevel);
+                        else m_envelope1.ampSamplesNonLinear(s_samples, s, e, m_ampLevel);
                         m_onCounter += e - s;
                         s = e;
@@ -278 +289 @@
                         s_samples[i] = m_oscMod1.getNextSampleOfs(s_pipeArr[m_inPipe][i] * m_inSens);
                     }
-                    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_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, start, end, m_ampLevel);
+                    else m_envelope1.ampSamplesNonLinear(s_samples, start, end, m_ampLevel);
                 }
                 else {
@@ -292 +303 @@
                         m_onCounter++;
                     }
-                    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_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, start, end, m_ampLevel);
+                    else m_envelope1.ampSamplesNonLinear(s_samples, start, end, m_ampLevel);
                 }
             }

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

@@ -42 +42 @@
         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 setExpression(ex:int):void            { set(MStatus.EXPRESSION, ex, 0); }
         public function setDelta(delta:int):void              { m_delta = delta; }
         public function getStatus():int     { return m_status; }
@@ -75 +76 @@
         public function getOutputMode():int { return m_data0; }
         public function getOutputPipe():int { return m_data1; }
+        public function getExpression():int { return m_data0; }
     }
 }

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

@@ -94 +94 @@
                 m_velocity = getUInt(m_velocity);
                 if (m_velocity > 127) m_velocity = 127;
+                break;
+            case 'x': // Expression
+                next();
+                o = getUInt(127);
+                if (o > 127) o = 127;
+                m_tracks[m_trackNo].recExpression(o);
                 break;
             case 'e': // Envelope

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

@@ -27 +27 @@
         public static const INPUT:int        = 24;
         public static const OUTPUT:int       = 25;
+        public static const EXPRESSION:int   = 26;
     }
 }

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

@@ -137 +137 @@
                                 m_ch.setOutput(e.getOutputMode(), e.getOutputPipe());
                                 break;
+                            case MStatus.EXPRESSION:
+                                m_ch.setExpression(e.getExpression());
+                                break;
                             case MStatus.CLOSE:
                                 m_ch.close();
@@ -372 +375 @@
             recDelta(e);
             e.setOutput(mode, pipe);
+            m_events.push(e);
+        }
+
+        public function recExpression(ex:int):void {
+            var e:MEvent = new MEvent();
+            recDelta(e);
+            e.setExpression(ex);
             m_events.push(e);
         }