diff --git a/.DS_Store b/.DS_Store index ca1e61b..dd306f7 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/App/app.mlapp b/App/app.mlapp index 9473056..85352a0 100644 Binary files a/App/app.mlapp and b/App/app.mlapp differ diff --git a/src/.DS_Store b/src/.DS_Store index 14624d2..a262e39 100644 Binary files a/src/.DS_Store and b/src/.DS_Store differ diff --git a/src/DarellAmplitudeEnvelope.m b/src/AmpEnvelope/DarellAmplitudeEnvelope.m similarity index 100% rename from src/DarellAmplitudeEnvelope.m rename to src/AmpEnvelope/DarellAmplitudeEnvelope.m diff --git a/src/DarellbandpassFilter.m b/src/Filter/DarellbandpassFilter.m similarity index 100% rename from src/DarellbandpassFilter.m rename to src/Filter/DarellbandpassFilter.m diff --git a/src/amplifyFreqRange.m b/src/Filter/amplifyFreqRange.m similarity index 100% rename from src/amplifyFreqRange.m rename to src/Filter/amplifyFreqRange.m diff --git a/src/bandreject_filter.m b/src/Filter/bandreject_filter.m similarity index 100% rename from src/bandreject_filter.m rename to src/Filter/bandreject_filter.m diff --git a/src/epic_effect_schluep.m b/src/Filter/epic_effect_schluep.m similarity index 100% rename from src/epic_effect_schluep.m rename to src/Filter/epic_effect_schluep.m diff --git a/src/muffled_effect_schluep.m b/src/Filter/muffled_effect_schluep.m similarity index 100% rename from src/muffled_effect_schluep.m rename to src/Filter/muffled_effect_schluep.m diff --git a/src/seperate_prevalent_schluep.m b/src/Filter/seperate_prevalent_schluep.m similarity index 100% rename from src/seperate_prevalent_schluep.m rename to src/Filter/seperate_prevalent_schluep.m diff --git a/src/generate_halfCircles.m b/src/Generators/generate_halfCircles.m similarity index 100% rename from src/generate_halfCircles.m rename to src/Generators/generate_halfCircles.m diff --git a/src/generate_sawtooth.m b/src/Generators/generate_sawtooth.m similarity index 100% rename from src/generate_sawtooth.m rename to src/Generators/generate_sawtooth.m diff --git a/src/generate_sine.m b/src/Generators/generate_sine.m similarity index 100% rename from src/generate_sine.m rename to src/Generators/generate_sine.m diff --git a/src/generate_square.m b/src/Generators/generate_square.m similarity index 100% rename from src/generate_square.m rename to src/Generators/generate_square.m diff --git a/src/generate_triangle.m b/src/Generators/generate_triangle.m similarity index 100% rename from src/generate_triangle.m rename to src/Generators/generate_triangle.m diff --git a/src/generate_white.m b/src/Generators/generate_white.m similarity index 100% rename from src/generate_white.m rename to src/Generators/generate_white.m diff --git a/src/Helper/.DS_Store b/src/Helper/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/src/Helper/.DS_Store differ diff --git a/src/Equalizer_Darell.m b/src/Helper/Equalizer_Darell.m similarity index 100% rename from src/Equalizer_Darell.m rename to src/Helper/Equalizer_Darell.m diff --git a/src/MIDIDarell.m b/src/Helper/MIDIDarell.m similarity index 100% rename from src/MIDIDarell.m rename to src/Helper/MIDIDarell.m diff --git a/src/amplify.m b/src/Helper/amplify.m similarity index 100% rename from src/amplify.m rename to src/Helper/amplify.m diff --git a/src/play_continuous.m b/src/Helper/play_continuous.m similarity index 100% rename from src/play_continuous.m rename to src/Helper/play_continuous.m diff --git a/src/play_wave.m b/src/Helper/play_wave.m similarity index 100% rename from src/play_wave.m rename to src/Helper/play_wave.m diff --git a/src/plot_wave.m b/src/Helper/plot_wave.m similarity index 100% rename from src/plot_wave.m rename to src/Helper/plot_wave.m diff --git a/src/reverse.m b/src/Helper/reverse.m similarity index 100% rename from src/reverse.m rename to src/Helper/reverse.m diff --git a/src/lfo_sawtooth.m b/src/LFO/lfo_sawtooth.m similarity index 100% rename from src/lfo_sawtooth.m rename to src/LFO/lfo_sawtooth.m diff --git a/src/lfo_sine.m b/src/LFO/lfo_sine.m similarity index 100% rename from src/lfo_sine.m rename to src/LFO/lfo_sine.m diff --git a/src/NotWorking/.DS_Store b/src/NotWorking/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/src/NotWorking/.DS_Store differ diff --git a/src/Daniel_Doan_convolution.m b/src/NotWorking/Daniel_Doan_convolution.m similarity index 100% rename from src/Daniel_Doan_convolution.m rename to src/NotWorking/Daniel_Doan_convolution.m diff --git a/src/add_sine.m b/src/NotWorking/add_sine.m similarity index 100% rename from src/add_sine.m rename to src/NotWorking/add_sine.m diff --git a/src/fade_in.m b/src/NotWorking/fade_in.m similarity index 100% rename from src/fade_in.m rename to src/NotWorking/fade_in.m diff --git a/src/fade_out.m b/src/NotWorking/fade_out.m similarity index 100% rename from src/fade_out.m rename to src/NotWorking/fade_out.m diff --git a/src/Meghaj_Echo.m b/src/Offset/Meghaj_Echo.m similarity index 100% rename from src/Meghaj_Echo.m rename to src/Offset/Meghaj_Echo.m diff --git a/src/Petha_Hsu_PitchOffset.m b/src/Offset/Petha_Hsu_PitchOffset.m similarity index 100% rename from src/Petha_Hsu_PitchOffset.m rename to src/Offset/Petha_Hsu_PitchOffset.m diff --git a/src/DarellAnneLinearPitchEnvelope.m b/src/PitchEnvelope/DarellAnneLinearPitchEnvelope.m similarity index 100% rename from src/DarellAnneLinearPitchEnvelope.m rename to src/PitchEnvelope/DarellAnneLinearPitchEnvelope.m diff --git a/src/DarellAnnePitchEnvelope.m b/src/PitchEnvelope/DarellAnnePitchEnvelope.m similarity index 100% rename from src/DarellAnnePitchEnvelope.m rename to src/PitchEnvelope/DarellAnnePitchEnvelope.m diff --git a/src/AmpEnvelopeSelect.m b/src/Select/AmpEnvelopeSelect.m similarity index 100% rename from src/AmpEnvelopeSelect.m rename to src/Select/AmpEnvelopeSelect.m diff --git a/src/Select/FilterSelect.m b/src/Select/FilterSelect.m new file mode 100644 index 0000000..659a0d1 --- /dev/null +++ b/src/Select/FilterSelect.m @@ -0,0 +1,26 @@ +%Written by Darell + +% CONTRIBUTORS: +% Person1: Darell + +% DOCUMENTATION: +%Pass-through function used by app + +function output = FilterSelect(input,Fs,LOW,MED,HIGH,number) + if(number == "Option 1") + output = DarellbandpassFilter(input,Fs,LOW,MED,HIGH); + elseif(number == "Option 2") + output = amplifyFreqRange(input, Fs, LOW, MED, HIGH); + elseif(number == "Option 3") + output = epic_effect_schluep(input, Fs, LOW, MED, HIGH); + elseif(number == "Option 4") + output = muffled_effect_schluep(input, Fs, LOW, MED, HIGH); + elseif(number == "Option 5") + output = seperate_prevalent_schluep(input, Fs, LOW, MED, HIGH); + elseif(number == "Option 6") + output = bandreject_filter(input, Fs, LOW, HIGH); + else + output = input; + end +end + diff --git a/src/Select/LFOSelect.m b/src/Select/LFOSelect.m new file mode 100644 index 0000000..fbe132e --- /dev/null +++ b/src/Select/LFOSelect.m @@ -0,0 +1,20 @@ +%Written by Darell + +% CONTRIBUTORS: +% Person1: Darell + +% DOCUMENTATION: +%Pass-through function used by app + +function output = LFOSelect(amplitude, frequency, phase, fs, duration, input,number) +%UNTITLED Summary of this function goes here +% Detailed explanation goes here + if(number == "Option 1") + output = lfo_sawtooth(amplitude, frequency, phase, fs, duration, input); + elseif(number == "Option 2") + output = lfo_sine(amplitude, frequency, phase, fs, duration, input); + else + output = input; + end +end + diff --git a/src/FilterSelect.m b/src/Select/OffsetSelect.m similarity index 54% rename from src/FilterSelect.m rename to src/Select/OffsetSelect.m index cc37307..a8b982c 100644 --- a/src/FilterSelect.m +++ b/src/Select/OffsetSelect.m @@ -6,13 +6,14 @@ % DOCUMENTATION: %Pass-through function used by app -function output = FilterSelect(input,Fs,LOW,MED,HIGH,number) +function output = OffsetSelect(input,value,number) if(number == "Option 1") - output = DarellbandpassFilter(input,Fs,LOW,MED,HIGH); + output = Meghaj_Echo(input, value); elseif(number == "Option 2") - output = amplifyFreqRange(input, Fs, LOW, MED, HIGH); + output = Petha_Hsu_PitchOffset(input, value); else output = input; end end + diff --git a/src/PitchEnvelopeSelect.m b/src/Select/PitchEnvelopeSelect.m similarity index 100% rename from src/PitchEnvelopeSelect.m rename to src/Select/PitchEnvelopeSelect.m diff --git a/src/SoundGeneratorSelect.m b/src/Select/SoundGeneratorSelect.m similarity index 80% rename from src/SoundGeneratorSelect.m rename to src/Select/SoundGeneratorSelect.m index df0c711..3fe715a 100644 --- a/src/SoundGeneratorSelect.m +++ b/src/Select/SoundGeneratorSelect.m @@ -16,7 +16,9 @@ function output = SoundGeneratorSelect(amplitude, frequency, phase, fs, duration elseif(number == "Option 4") output = generate_sawtooth(amplitude, frequency, phase, fs, duration, duty); elseif(number == "Option 5") - output = generate_white(amplitude, frequency, phase, fs, duration, duty); + output = generate_white(amplitude, fs, duration); + elseif(number == "Option 6") + output = generate_halfCircles(amplitude, frequency, phase, fs, duration, duty); else output = 0; end