Changeset 34488 for lang/actionscript

Timestamp:

07/19/09 23:25:57 (3 years ago)

Author:

arche

Message:

Ring(@r)とSync(@s)機能の追加

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MChannel.as (modified) (8 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/MOscFcTri.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MOscGbWave.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MOscMod.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MOscPulse.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MOscSaw.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MOscSine.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MOscTriangle.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MSequencer.as (modified) (3 diffs)
• 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

@@ -34 +34 @@
         private var m_outMode:int;
         private var m_outPipe:int;
+        private var m_ringSens:Number;
+        private var m_ringPipe:int;
+        private var m_syncMode:int;
+        private var m_syncPipe:int;
         public    static var PITCH_RESOLUTION:int = 100;
         protected static var s_init:int = 0;
@@ -42 +46 @@
         protected static var s_samples:Vector.<Number>;            // mono
         protected static var s_pipeArr:Vector.<Vector.<Number>>;
+        protected static var s_syncSources:Vector.<Vector.<Boolean>>;
         protected static var s_lfoDelta:int = 245;
 
@@ -73 +78 @@
             setInput(0, 0);
             setOutput(0, 0);
+            setRing(0, 0);
+            setSync(0, 0);
         }
         public static function boot(numSamples:int):void {
@@ -100 +107 @@
                 }
             }
+        }
+        public static function createSyncSources(num:int):void {
+                s_syncSources = new Vector.<Vector.<Boolean>>(num);
+                for (var i:int = 0; i < num; i++) {
+                        s_syncSources[i] = new Vector.<Boolean>(s_samples.length);
+                        for (var j:int = 0; j < s_samples.length; j++) {
+                                s_syncSources[i][j] = false;
+                        }
+                }
         }
         public static function getFrequency(freqNo:int):Number {
@@ -241 +257 @@
             m_outPipe = p;
         }
+        public function setRing(s:int, p:int):void {
+                m_ringSens = (1 << (s - 1)) / 8.0;
+                m_ringPipe = p;
+        }
+        public function setSync(m:int, p:int):void {
+                m_syncMode = m;
+                m_syncPipe = p;
+        }
         protected function getNextCutoff():Number {
             var cut:Number = m_lpfFrq + m_lpfAmt * m_envelope2.getNextAmplitudeLinear();
@@ -260 +284 @@
                 if (m_osc2Connect == 0) {
                     // no input, no LFO
-                    m_oscMod1.getSamples(s_samples, start, end);
+                    if(m_syncMode == 1){
+                        // sync out
+                            m_oscMod1.getSamplesWithSyncOut(s_samples, s_syncSources[m_syncPipe], start, end);
+                    }else if(m_syncMode == 2){
+                        // sync in
+                            m_oscMod1.getSamplesWithSyncIn(s_samples, s_syncSources[m_syncPipe], start, end);
+                    }else{
+                            m_oscMod1.getSamples(s_samples, start, end);
+                        }
                     if (m_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, start, end, m_ampLevel);
                     else m_envelope1.ampSamplesNonLinear(s_samples, start, end, m_ampLevel);
@@ -277 +309 @@
                         }
                         m_oscMod1.setFrequency(getFrequency(freqNo));
-                        m_oscMod1.getSamples(s_samples, s, e);
+                        if(m_syncMode == 1){
+                                // sync out
+                                m_oscMod1.getSamplesWithSyncOut(s_samples, s_syncSources[m_syncPipe], s, e);
+                        }else if(m_syncMode == 2){
+                                // sync in
+                                m_oscMod1.getSamplesWithSyncIn(s_samples, s_syncSources[m_syncPipe], s, e);
+                            }else{
+                                m_oscMod1.getSamples(s_samples, s, e);
+                            }
                         if (m_volMode == 0) m_envelope1.ampSamplesLinear(s_samples, s, e, m_ampLevel);
                         else m_envelope1.ampSamplesNonLinear(s_samples, s, e, m_ampLevel);
@@ -313 +353 @@
                 }
             }
+            if (m_ringSens >= 0.000001) {
+                // with ring
+                for(i = start; i < end; i++){
+                                        s_samples[i] *= s_pipeArr[m_ringPipe][i] * m_ringSens;
+                                }
+            }
             m_formant.run(s_samples, start, end);
             m_filter.run(s_samples, start, end, m_envelope2, m_lpfFrq, m_lpfAmt, m_lpfRes, key);

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

@@ -43 +43 @@
         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 setRing(sens:int, pipe:int):void      { set(MStatus.RINGMODULATE, sens, pipe); }
+        public function setSync(mode:int, pipe:int):void      { set(MStatus.SYNC, mode, pipe); }
         public function setDelta(delta:int):void              { m_delta = delta; }
         public function getStatus():int     { return m_status; }
@@ -77 +79 @@
         public function getOutputPipe():int { return m_data1; }
         public function getExpression():int { return m_data0; }
+        public function getRingSens():int   { return m_data0; }
+        public function getRingInput():int  { return m_data1; }
+        public function getSyncMode():int   { return m_data0; }
+        public function getSyncPipe():int   { return m_data1; }
     }
 }

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

@@ -24 +24 @@
         protected var m_warning:String;
         protected var m_maxPipe:int;
+        protected var m_maxSyncSource:int;
         protected static var MAX_PIPE:int = 3;
+        protected static var MAX_SYNCSOURCE:int = 3;
 
         public function MML() {
@@ -87 +89 @@
         protected function atmark():void {
             var c:String = getChar();
-            var o:int = 1, a:int = 0, d:int = 64, s:int = 32, r:int = 0;
+            var o:int = 1, a:int = 0, d:int = 64, s:int = 32, r:int = 0, sens:int = 0, mode:int = 0;
             switch(c) {
             case 'v': // Volume
@@ -212 +214 @@
                 case 'i': // Input
                 {
-                    var sens:int = 0;
+                        sens = 0;
                     next();
                     sens = getUInt(sens);
@@ -228 +230 @@
             case 'o': // Output
                 {
-                    var mode:int = 0;
+                    mode = 0;
                     next();
                     mode = getUInt(mode);
@@ -245 +247 @@
                 // if (n == 1) overwrite
                 // if (n == 2) add
+                break;
+            case 'r': // Ring
+                {
+                        sens = 0;
+                        next();
+                        sens = getUInt(sens);
+                        if (getChar() == ',') {
+                                next();
+                                a = getUInt(a);
+                                if (a > m_maxPipe) a = m_maxPipe;
+                        }
+                        m_tracks[m_trackNo].recRing(sens, a);
+                }
+                break;
+            case 's': // Sync
+                {
+                        mode = 0;
+                        next();
+                        mode = getUInt(mode);
+                        if (getChar() == ',') {
+                                next();
+                                a = getUInt(a);
+                                if (mode == 1) {
+                                // Sync out
+                                if (a > m_maxSyncSource) {
+                                        m_maxSyncSource = a;
+                                        if (m_maxSyncSource >= MAX_SYNCSOURCE) m_maxSyncSource = a = MAX_SYNCSOURCE;
+                                }
+                                } else if (mode == 2) {
+                                // Sync in
+                                if (a > m_maxSyncSource) a = m_maxSyncSource;
+                                }
+                        }
+                        m_tracks[m_trackNo].recSync(mode, a);
+                }
                 break;
             default:
@@ -749 +786 @@
             m_noteShift = 0;
             m_maxPipe = 0;
+            m_maxSyncSource = 0;
 
             processComment(str);
@@ -776 +814 @@
             // initialize modules
             m_sequencer.createPipes(m_maxPipe+1);
+            m_sequencer.createSyncSources(m_maxSyncSource + 1);
 
             // dispatch event

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

@@ -35 +35 @@
             }
         }
+        public override function getSamplesWithSyncIn(samples:Vector.<Number>, syncin:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                                if(syncin[i]){
+                                        resetPhase();
+                                }
+                samples[i] = s_table[m_phase >> (PHASE_SFT+11)];
+                m_phase = (m_phase + m_freqShift) & PHASE_MSK;
+                        }               
+        }
+        public override function getSamplesWithSyncOut(samples:Vector.<Number>, syncout:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                samples[i] = s_table[m_phase >> (PHASE_SFT+11)];
+                m_phase += m_freqShift;
+                syncout[i] = (m_phase > PHASE_MSK);
+                m_phase &= PHASE_MSK;
+                        }               
+        }
     }
 }

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

@@ -59 +59 @@
             }
         }
+        public override function getSamplesWithSyncIn(samples:Vector.<Number>, syncin:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                                if(syncin[i]){
+                                        resetPhase();
+                                }
+                samples[i] = s_table[m_waveNo][m_phase >> (PHASE_SFT+11)];
+                m_phase = (m_phase + m_freqShift) & PHASE_MSK;
+                        }               
+        }
+        public override function getSamplesWithSyncOut(samples:Vector.<Number>, syncout:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                samples[i] = s_table[m_waveNo][m_phase >> (PHASE_SFT+11)];
+                m_phase += m_freqShift;
+                syncout[i] = (m_phase > PHASE_MSK);
+                m_phase &= PHASE_MSK;
+                        }               
+        }
     }
 }

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

@@ -31 +31 @@
         public function getSamples(samples:Vector.<Number>, start:int, end:int):void {
         }
+        public function getSamplesWithSyncIn(samples:Vector.<Number>, syncin:Vector.<Boolean>, start:int, end:int):void {
+                getSamples(samples, start, end);
+        }
+        public function getSamplesWithSyncOut(samples:Vector.<Number>, syncout:Vector.<Boolean>, start:int, end:int):void {
+                getSamples(samples, start, end);
+        }
         public function getFrequency():Number {
             return m_frequency;

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

@@ -29 +29 @@
             }
         }
+        public override function getSamplesWithSyncIn(samples:Vector.<Number>, syncin:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                                if(syncin[i]){
+                                        resetPhase();
+                                }
+                samples[i] = (m_phase < m_pwm) ? 1.0 : -1.0;
+                m_phase = (m_phase + m_freqShift) & PHASE_MSK;
+                        }               
+        }
+        public override function getSamplesWithSyncOut(samples:Vector.<Number>, syncout:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                samples[i] = (m_phase < m_pwm) ? 1.0 : -1.0;
+                m_phase += m_freqShift;
+                syncout[i] = (m_phase > PHASE_MSK);
+                m_phase &= PHASE_MSK;
+                        }               
+        }
         public function setPWM(pwm:Number):void {
             m_pwm = pwm * PHASE_LEN;

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

@@ -39 +39 @@
             }
         }
+        public override function getSamplesWithSyncIn(samples:Vector.<Number>, syncin:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                                if(syncin[i]){
+                                        resetPhase();
+                                }
+                samples[i] = s_table[m_phase >> PHASE_SFT];
+                m_phase = (m_phase + m_freqShift) & PHASE_MSK;
+                        }               
+        }
+        public override function getSamplesWithSyncOut(samples:Vector.<Number>, syncout:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                samples[i] = s_table[m_phase >> PHASE_SFT];
+                m_phase += m_freqShift;
+                syncout[i] = (m_phase > PHASE_MSK);
+                m_phase &= PHASE_MSK;
+                        }               
+        }
     }
 }

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

@@ -38 +38 @@
             }
         }
+        public override function getSamplesWithSyncIn(samples:Vector.<Number>, syncin:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                                if(syncin[i]){
+                                        resetPhase();
+                                }
+                samples[i] = s_table[m_phase >> PHASE_SFT];
+                m_phase = (m_phase + m_freqShift) & PHASE_MSK;
+                        }               
+        }
+        public override function getSamplesWithSyncOut(samples:Vector.<Number>, syncout:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                samples[i] = s_table[m_phase >> PHASE_SFT];
+                m_phase += m_freqShift;
+                syncout[i] = (m_phase > PHASE_MSK);
+                m_phase &= PHASE_MSK;
+                        }               
+        }
     }
 }

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

@@ -38 +38 @@
             }
         }
+        public override function getSamplesWithSyncIn(samples:Vector.<Number>, syncin:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                                if(syncin[i]){
+                                        resetPhase();
+                                }
+                samples[i] = s_table[m_phase >> PHASE_SFT];
+                m_phase = (m_phase + m_freqShift) & PHASE_MSK;
+                        }               
+        }
+        public override function getSamplesWithSyncOut(samples:Vector.<Number>, syncout:Vector.<Boolean>, start:int, end:int):void {
+                        var i:int;
+                        for(i = start; i < end; i++) {
+                samples[i] = s_table[m_phase >> PHASE_SFT];
+                m_phase += m_freqShift;
+                syncout[i] = (m_phase > PHASE_MSK);
+                m_phase &= PHASE_MSK;
+                        }               
+        }
     }
 }

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

@@ -1 +1 @@
 package com.txt_nifty.sketch.flmml {
+    import __AS3__.vec.Vector;
+    
+    import flash.events.Event;
     import flash.events.EventDispatcher;
     import flash.events.SampleDataEvent;
-    import flash.events.Event;
     import flash.events.TimerEvent;
     import flash.media.Sound;
@@ -9 +11 @@
     import flash.media.SoundTransform;
     import flash.utils.*;
-    import __AS3__.vec.Vector;
 
     public class MSequencer extends EventDispatcher {
@@ -302 +303 @@
             MChannel.createPipes(num);
         }
+        public function createSyncSources(num:int):void {
+                MChannel.createSyncSources(num);
+        }
         public function getTotalMSec():uint {
             return m_trackArr[MTrack.TEMPO_TRACK].getTotalMSec();

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

@@ -28 +28 @@
         public static const OUTPUT:int       = 25;
         public static const EXPRESSION:int   = 26;
+        public static const RINGMODULATE:int = 27;
+        public static const SYNC:int         = 28;
     }
 }

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

@@ -140 +140 @@
                                 m_ch.setExpression(e.getExpression());
                                 break;
+                            case MStatus.RINGMODULATE:
+                                m_ch.setRing(e.getRingSens(), e.getRingInput());
+                                break;
+                            case MStatus.SYNC:
+                                m_ch.setSync(e.getSyncMode(), e.getSyncPipe());
+                                break;
                             case MStatus.CLOSE:
                                 m_ch.close();
@@ -383 +389 @@
             e.setExpression(ex);
             m_events.push(e);
+        }
+        
+        public function recRing(sens:int, pipe:int):void {
+                var e:MEvent = new MEvent();
+                recDelta(e);
+                e.setRing(sens, pipe);
+                m_events.push(e);
+        }
+        
+        public function recSync(mode:int, pipe:int):void {
+                var e:MEvent = new MEvent();
+                recDelta(e);
+                e.setSync(mode, pipe);
+                m_events.push(e);
         }