Merge pull request #8 from bgins/release-0.4.2

Release 0.4.2

Author: bgins

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "moon-forge",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "A forge for lunar instruments",
   "scripts": {
     "start": "npm install && npm run build:dev && npm run dev",
@@ -37,7 +37,7 @@
     "watcherGlob": "**"
   },
   "dependencies": {
-    "mousetrap-ts": "^1.0.0",
+    "rxjs": "^6.6.3",
     "standardized-audio-context": "^25.1.3",
     "webmidi": "^2.5.1",
     "webnative": "^0.20.3"

package.json

@@ -74,6 +74,7 @@ init shared { params } =
             Encode.object
                 [ ( "instrument", Instrument.encode Luna )
                 , ( "patch", Patch.encode Patch.init )
+                , ( "controller", Controller.encode Keyboard )
                 ]
         ]
     )

src/Pages/Luna.elm

@@ -48,7 +48,7 @@ view { params } =
                     , Font.family Fonts.cinzel
                     , Font.size 36
                     ]
-                    [ text "On a Far Off Planet" ]
+                    [ text "A Song of Moons" ]
                 , paragraph
                     [ Font.family Fonts.quattrocento
                     , Font.size 20
@@ -143,7 +143,8 @@ view { params } =
                     [ Font.family Fonts.quattrocento
                     , Font.size 20
                     ]
-                    [ newTabLink
+                    [ text "We use "
+                    , newTabLink
                         [ Font.color Colors.lightPurple
                         , Font.bold
                         , Border.widthEach { top = 0, right = 0, bottom = 1, left = 0 }
@@ -152,10 +153,10 @@ view { params } =
                             [ Border.color Colors.lightPurple
                             ]
                         ]
-                        { url = "https://guide.fission.codes/accounts", label = text "Fission" }
+                        { url = "https://fission.codes", label = text "Fission" }
                     , text
                         """
-                        provides us account and storage services. If you
+                        account and storage services. If you
                         want to save your creations, we will ask you to "Store with
                         Fission". A few things you should know about that:
                         """
@@ -189,7 +190,7 @@ view { params } =
                             Fission will ask you to set up an account and link a
                             second device. We highly recommend you set up a second
                             device to prevent data loss. Because we do not store
-                            your data on a server, this is on you.
+                            your data on a server, we cannot recover it.
                             """
                         ]
                     ]
@@ -209,6 +210,26 @@ view { params } =
                             """
                         ]
                     ]
+                , paragraph
+                    [ Font.family Fonts.quattrocento
+                    , Font.size 20
+                    ]
+                    [ text "Please see the "
+                    , newTabLink
+                        [ Font.color Colors.lightPurple
+                        , Font.bold
+                        , Border.widthEach { top = 0, right = 0, bottom = 1, left = 0 }
+                        , Border.color Colors.darkGrey
+                        , mouseOver
+                            [ Border.color Colors.lightPurple
+                            ]
+                        ]
+                        { url = "https://guide.fission.codes/accounts", label = text "Fission accounts guide" }
+                    , text
+                        """
+                        for more information on your Fission account.
+                        """
+                    ]
                 ]
             ]
         ]

src/Pages/Top.elm

@@ -4,6 +4,7 @@ import { Envelope } from './env-gen';
 interface IInstrument {
   playNote: (midiNote: number) => void;
   stopNote: (midiNote: number) => void;
+  stopAllNotes: () => void;
 }
 
 interface INote {

src/audio/audio.ts

@@ -73,7 +73,7 @@ class Envelope {
         this.valueAtGateClose =
           this.settings.initialLevel +
           (this.settings.attackFinalLevel - this.settings.initialLevel) *
-            ((gateClosedAt - this.gateOpenAt) / this.settings.attackTime);
+          ((gateClosedAt - this.gateOpenAt) / this.settings.attackTime);
       } else if (gateClosedAt >= this.startDecayAt && gateClosedAt < this.startSustainAt) {
         this.valueAtGateClose =
           this.settings.attackFinalLevel *
@@ -105,10 +105,8 @@ class Envelope {
     // reschedule, but this is not done here yet
     if (this.gateOpen) {
       if (retriggerAt < this.startDecayAt) {
-        console.log('retrigger in attack phase');
+        // console.log('retrigger in attack phase');
       } else if (retriggerAt >= this.startDecayAt && retriggerAt < this.startSustainAt) {
-        console.log('retrigger in decay phase');
-
         const currentValue =
           this.settings.attackFinalLevel *
           Math.pow(
@@ -118,13 +116,10 @@ class Envelope {
 
         this.reschedule(retriggerAt, currentValue, newSettings);
       } else {
-        console.log('retrigger in sustain phase');
         this.reschedule(retriggerAt, this.settings.sustainLevel, newSettings);
       }
     } else {
       if (retriggerAt > this.gateClosedAt && retriggerAt <= this.gateClosedAt + this.settings.releaseTime) {
-        console.log('retrigger in release phase');
-
         const currentValue =
           this.valueAtGateClose *
           Math.pow(
@@ -136,7 +131,7 @@ class Envelope {
         this.gateOpen = true;
         this.endAt = Infinity;
       } else {
-        console.log('retrigger after envelope completed');
+        // console.log('retrigger after envelope completed');
       }
     }
   }
@@ -147,8 +142,6 @@ class Envelope {
    * We calculate the time when the attack would have started to get the right ramps.
    */
   private reschedule(retriggerAt: number, currentValue: number, newSettings: IEnvelopeOptions): void {
-    console.log('rescheduling');
-
     // this.targetParam.cancelAndHoldAtTime(retriggerAt);
     this.targetParam.cancelScheduledValues(retriggerAt);
     this.targetParam.setValueAtTime(currentValue, retriggerAt);

src/audio/env-gen.ts

@@ -33,7 +33,6 @@ class Luna implements IInstrument {
    * Construct a new instance of Luna from flags and defaults
    */
   constructor(flags: any) {
-    console.log('New Luna', flags);
     this.oscillatorOptions = {
       type: flags.oscillator,
       detune: 0,
@@ -300,16 +299,24 @@ class Luna implements IInstrument {
    * and we may receive a retrigger from the user.
    */
   stopNote(midiNote: number): void {
-    const oscillator = this.notes[midiNote].oscillator;
-    const ampEnv = this.notes[midiNote].ampEnv;
-    const filterEnv = this.notes[midiNote].filterEnv;
+    if (this.notes[midiNote]) {
+      const oscillator = this.notes[midiNote].oscillator;
+      const ampEnv = this.notes[midiNote].ampEnv;
+      const filterEnv = this.notes[midiNote].filterEnv;
 
-    const now = this.audioContext.currentTime;
-    ampEnv.closeGate(now);
-    filterEnv.closeGate(now);
+      const now = this.audioContext.currentTime;
+      ampEnv.closeGate(now);
+      filterEnv.closeGate(now);
+
+      const stopAt = ampEnv.getEndTime();
+      oscillator.stop(stopAt);
+    }
+  }
 
-    const stopAt = ampEnv.getEndTime();
-    oscillator.stop(stopAt);
+  stopAllNotes(): void {
+    Object.keys(this.notes).forEach(midiNote => {
+      this.stopNote(+midiNote);
+    });
   }
 }