diff --git a/App/app.mlapp b/App/app.mlapp index 4ad8776..9bc2cf5 100644 Binary files a/App/app.mlapp and b/App/app.mlapp differ diff --git a/src/NotWorking/generate_arcoStrings.m b/src/Instruments/generate_arcoStrings.m similarity index 100% rename from src/NotWorking/generate_arcoStrings.m rename to src/Instruments/generate_arcoStrings.m diff --git a/src/NotWorking/generate_bassoon.m b/src/Instruments/generate_bassoon.m similarity index 100% rename from src/NotWorking/generate_bassoon.m rename to src/Instruments/generate_bassoon.m diff --git a/src/NotWorking/generate_clarinet.m b/src/Instruments/generate_clarinet.m similarity index 100% rename from src/NotWorking/generate_clarinet.m rename to src/Instruments/generate_clarinet.m diff --git a/src/NotWorking/generate_flute.m b/src/Instruments/generate_flute.m similarity index 100% rename from src/NotWorking/generate_flute.m rename to src/Instruments/generate_flute.m diff --git a/src/NotWorking/generate_horn.m b/src/Instruments/generate_horn.m similarity index 100% rename from src/NotWorking/generate_horn.m rename to src/Instruments/generate_horn.m diff --git a/src/NotWorking/generate_oboe.m b/src/Instruments/generate_oboe.m similarity index 100% rename from src/NotWorking/generate_oboe.m rename to src/Instruments/generate_oboe.m diff --git a/src/NotWorking/generate_organ.m b/src/Instruments/generate_organ.m similarity index 100% rename from src/NotWorking/generate_organ.m rename to src/Instruments/generate_organ.m diff --git a/src/NotWorking/generate_saxophone.m b/src/Instruments/generate_saxophone.m similarity index 100% rename from src/NotWorking/generate_saxophone.m rename to src/Instruments/generate_saxophone.m diff --git a/src/NotWorking/generate_shepardsCarillon.m b/src/Instruments/generate_shepardsCarillon.m similarity index 100% rename from src/NotWorking/generate_shepardsCarillon.m rename to src/Instruments/generate_shepardsCarillon.m diff --git a/src/NotWorking/generate_shepardsOrgan.m b/src/Instruments/generate_shepardsOrgan.m similarity index 100% rename from src/NotWorking/generate_shepardsOrgan.m rename to src/Instruments/generate_shepardsOrgan.m diff --git a/src/NotWorking/generate_shepardsStrings.m b/src/Instruments/generate_shepardsStrings.m similarity index 100% rename from src/NotWorking/generate_shepardsStrings.m rename to src/Instruments/generate_shepardsStrings.m diff --git a/src/NotWorking/generate_trumpet.m b/src/Instruments/generate_trumpet.m similarity index 100% rename from src/NotWorking/generate_trumpet.m rename to src/Instruments/generate_trumpet.m diff --git a/src/NotWorking/generate_tubularBells.m b/src/Instruments/generate_tubularBells.m similarity index 100% rename from src/NotWorking/generate_tubularBells.m rename to src/Instruments/generate_tubularBells.m diff --git a/src/Select/SoundGeneratorSelect.m b/src/Select/SoundGeneratorSelect.m index b3355a8..35ebd64 100644 --- a/src/Select/SoundGeneratorSelect.m +++ b/src/Select/SoundGeneratorSelect.m @@ -28,6 +28,34 @@ function output = SoundGeneratorSelect(amplitude, frequency, phase, fs, duration output = generate_cosine(amplitude, frequency, phase, fs, duration, duty); elseif(number == "Heartbeat") output = generate_heartbeat(amplitude, frequency, phase, fs, duration, duty); + + % instruments: + elseif(number == "ArcoStrings") + output = generate_arcoStrings(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "Bassoon") + output = generate_bassoon(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "Clarinet") + output = generate_clarinet(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "Flute") + output = generate_flute(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "Horn") + output = generate_horn(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "Oboe") + output = generate_oboe(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "Organ") + output = generate_organ(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "Saxophone") + output = generate_saxophone(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "ShepardsCarillon") + output = generate_shepardsCarillon(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "ShepardsOrgan") + output = generate_shepardsOrgan(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "ShepardsStrings") + output = generate_shepardsStrings(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "Trumpet") + output = generate_trumpet(amplitude, frequency, phase, fs, duration, duty); + elseif(number == "TubularBells") + output = generate_tubularBells(amplitude, frequency, phase, fs, duration, duty); else output = zeros(1, fs * duration); end