Make strings play correct notes in new tunings

Author: salmacodecomputerlove

apps/fretonator-web/src/app/common/fretonator/fretboard/fretboard.component.html

@@ -26,7 +26,7 @@
           [attr.data-display-note]="noteNameDisplay === NoteDisplays.noteNames ? ((fretMap | getFretFromFretMap: string.name:fret:stringNamesAreCaseSensitive)?.displayName) : ((fretMap | getFretFromFretMap: string.name:fret:stringNamesAreCaseSensitive)?.degreeNumber)"
           [attr.data-mode]="mode"
           [attr.data-highlight]="highlightedDegrees.has((fretMap | getFretFromFretMap: string.name:fret:stringNamesAreCaseSensitive)?.degree)"
-          (click)="playbackService.playNote(string.name, fret)"
+          (click)="playbackService.playNote(string.frequencyMarker, fret)"
         ></div>
       </ng-container>
     </ng-container>

apps/fretonator-web/src/app/common/fretonator/fretboard/fretboard.component.ts

@@ -37,31 +37,31 @@ enum Tunings {
   dadgad = 'dadgad'
 }
 
-//string are in reverse order
+//strings are in reverse order
 const TuningReturner = {
   'standard': [
-    { name: 'e', note: 'E' },
-    { name: 'B', note: 'B' },
-    { name: 'G', note: 'G' },
-    { name: 'D', note: 'D' },
-    { name: 'A', note: 'A' },
-    { name: 'E', note: 'E' },
+    { name: 'e', note: 'E', frequencyMarker: 'e' },
+    { name: 'B', note: 'B', frequencyMarker: 'B' },
+    { name: 'G', note: 'G', frequencyMarker: 'G' },
+    { name: 'D', note: 'D', frequencyMarker: 'D' },
+    { name: 'A', note: 'A', frequencyMarker: 'A' },
+    { name: 'E', note: 'E', frequencyMarker: 'E' },
   ],
   'dropd': [
-    { name: 'e', note: 'E' },
-    { name: 'B', note: 'B' },
-    { name: 'G', note: 'G' },
-    { name: 'D', note: 'D' },
-    { name: 'A', note: 'A' },
-    { name: 'D', note: 'D' },
+    { name: 'e', note: 'E', frequencyMarker: 'e' },
+    { name: 'B', note: 'B', frequencyMarker: 'B' },
+    { name: 'G', note: 'G', frequencyMarker: 'G' },
+    { name: 'D', note: 'D', frequencyMarker: 'D' },
+    { name: 'A', note: 'A', frequencyMarker: 'A' },
+    { name: 'D', note: 'D', frequencyMarker: 'D_' },
   ],
   'dadgad': [
-    { name: 'd', note: 'D' },
-    { name: 'A', note: 'A' },
-    { name: 'G', note: 'G' },
-    { name: 'D', note: 'D' },
-    { name: 'A', note: 'A' },
-    { name: 'D', note: 'D' },
+    { name: 'd', note: 'D', frequencyMarker: 'd' },
+    { name: 'A', note: 'A', frequencyMarker: 'A' },
+    { name: 'G', note: 'G', frequencyMarker: 'G' },
+    { name: 'D', note: 'D', frequencyMarker: 'D' },
+    { name: 'A', note: 'A', frequencyMarker: 'A' },
+    { name: 'D', note: 'D', frequencyMarker: 'D_' },
   ]
 };
 

apps/fretonator-web/src/app/common/playback/note-playback.service.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { StringFrequencies } from '../../util/constants';
-import { ModeMap } from '../../util/types';
 
 const SYNTH_BUFFER_SIZE = 4096;
 const SYNTH_PLAY_DURATION = 2000;
@@ -14,7 +13,7 @@ export class NotePlaybackService {
   constructor() {
   }
 
-  playNote(stringName, fret) {
+  playNote(stringFrequencyMarker, fret) {
     if (!this.context) {
       try {
         // Feature sniff for web audio API
@@ -24,19 +23,14 @@ export class NotePlaybackService {
       }
     }
     if (this.context) {
-      const noteFrequency = this.getFrequency(stringName, fret);
+      const noteFrequency = this.getFrequency(stringFrequencyMarker, fret);
       this.pluckString(noteFrequency);
     }
   }
 
-  playMode(modeMap: ModeMap) {
-    console.log('playMode called!');
-    console.log(modeMap);
-  }
-
-  private getFrequency(stringName, fret) {
-    // We're using stringName here, the case sensitive alt to string, to differentiate E/e strings.
-    const stringFrequency = StringFrequencies[stringName];
+  private getFrequency(stringFrequencyMarker, fret) {
+    // We're using stringFrequencyMarker here, the case sensitive alt to string, to differentiate E/e strings.
+    const stringFrequency = StringFrequencies[stringFrequencyMarker];
     const fretCents = fret * 100;
     return stringFrequency * Math.pow(2, (fretCents / 1200));
   }

apps/fretonator-web/src/app/util/constants.ts

@@ -640,11 +640,13 @@ export const Enharmonics = [
 
 export const StringFrequencies = {
   'e': 329.63,
+  'd': 293.66,
   'B': 246.94,
   'G': 196.00,
   'D': 146.83,
   'A': 110.00,
-  'E': 82.41
+  'E': 82.41,
+  'D_': 73.42,
 };
 
 export const StandardModePatterns = [