Skip to content

Commit 466ee08

Browse files
Revert "new instrument - mandolin (#4581)"
1 parent 86bf94a commit 466ee08

File tree

4 files changed

+3
-32
lines changed

4 files changed

+3
-32
lines changed

js/js-export/interface.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,6 @@ class JSInterface {
519519
const instruments = [
520520
"piano",
521521
"harmonuium",
522-
"mandolin",
523522
"violin",
524523
"viola",
525524
"cello",

js/utils/musicutils.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,6 @@ const SELECTORSTRINGS = [
11131113
_("guitar"),
11141114
_("sitar"),
11151115
_("harmoiunm"),
1116-
_("mandolin"),
11171116
_("acoustic guitar"),
11181117
_("flute"),
11191118
_("clarinet"),

js/utils/synthutils.js

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ const VOICENAMES = [
8484
[_("sitar"), "sitar", "images/synth.svg", "string"],
8585
//.TRANS: harmonium musical instrument
8686
[_("harmonium"), "harmonium", "images/voices.svg", "string"],
87-
//.TRANS: mandolin musical instrument
88-
[_("mandolin"), "mandolin", "images/voices.svg", "string"],
8987
//.TRANS: musical instrument
9088
[_("guitar"), "guitar", "images/voices.svg", "string"],
9189
//.TRANS: musical instrument
@@ -272,8 +270,7 @@ const SOUNDSAMPLESDEFINES = [
272270
"samples/trombone",
273271
"samples/doublebass",
274272
"samples/sitar",
275-
"samples/harmonium",
276-
"samples/mandolin"
273+
"samples/harmonium"
277274
];
278275

279276
// Some samples have a default volume other than 50 (See #1697)
@@ -311,8 +308,7 @@ const DEFAULTSYNTHVOLUME = {
311308
"xylophone": 100,
312309
"japanese drum": 90,
313310
"sitar": 100,
314-
"harmonium": 100,
315-
"mandolin": 100,
311+
"harmonium": 100
316312
};
317313

318314
/**
@@ -349,15 +345,6 @@ const SAMPLECENTERNO = {
349345
"harmonium": ["C4", 39] // pitchToNumber('C', 4, 'C Major')]
350346
};
351347

352-
/**
353-
* The sample has multiple pitch which is subsequently transposed.
354-
* This object defines the starting pitch for different samples.
355-
* @constant
356-
* @type {Object.<string, Array<string>>}
357-
*/
358-
const MULTIPITCH = {
359-
"mandolin": ["A4", "A5", "A6"]
360-
};
361348

362349
/**
363350
* Array to store custom samples.
@@ -852,8 +839,7 @@ function Synth() {
852839
{ name: "vibraphone", data: VIBRAPHONE_SAMPLE },
853840
{ name: "xylophone", data: XYLOPHONE_SAMPLE },
854841
{ name: "sitar", data: SITAR_SAMPLE },
855-
{ name: "harmonium", data: HARMONIUM_SAMPLE },
856-
{ name: "mandolin", data: MANDOLIN_SAMPLE }
842+
{ name: "harmonium", data: HARMONIUM_SAMPLE }
857843
],
858844
drum: [
859845
{ name: "bottle", data: BOTTLE_SAMPLE },
@@ -1227,11 +1213,6 @@ function Synth() {
12271213
const noteDict = {};
12281214
if (sourceName in SAMPLECENTERNO) {
12291215
noteDict[SAMPLECENTERNO[sourceName][0]] = this.samples.voice[sourceName];
1230-
} else if (sourceName in MULTIPITCH) {
1231-
for (let i = 0; i < MULTIPITCH[sourceName].length; i++) {
1232-
noteDict[MULTIPITCH[sourceName][i]] = this.samples.voice[sourceName][i];
1233-
}
1234-
tempSynth = new Tone.Sampler(noteDict);
12351216
} else {
12361217
noteDict["C4"] = this.samples.voice[sourceName];
12371218
}

sounds/samples/mandolin.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)