commit 5473c12bac488830fa475ddbe5c29efa57affa19 parent 1f9e75e441ccadec85de6200c1ee87b42f0cca22 Author: gstraube <gstraube@mailbox.org> Date: Mon, 30 Oct 2017 14:02:43 +0100 Create package for tunings Diffstat:
23 files changed, 337 insertions(+), 307 deletions(-)
diff --git a/app/src/androidTest/java/com/github/cythara/TunerViewTest.java b/app/src/androidTest/java/com/github/cythara/TunerViewTest.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import static android.support.test.rule.GrantPermissionRule.grant; -import static com.github.cythara.GuitarTuning.Pitch.*; +import static com.github.cythara.tuning.GuitarTuning.Pitch.*; import static java.lang.String.format; @RunWith(AndroidJUnit4.class) diff --git a/app/src/main/java/com/github/cythara/BassTuning.java b/app/src/main/java/com/github/cythara/BassTuning.java @@ -1,36 +0,0 @@ -package com.github.cythara; - -public class BassTuning implements Tuning { - - enum Pitch implements com.github.cythara.Note { - - E1(41.204f), - A1(55f), - D2(73.416f), - G2(97.999f); - - private final float frequency; - - Pitch(float frequency) { - this.frequency = frequency; - } - - public String getName() { - return this.name(); - } - - public float getFrequency() { - return frequency; - } - } - - @Override - public com.github.cythara.Note[] getNotes() { - return Pitch.values(); - } - - @Override - public com.github.cythara.Note findNote(String name) { - return Pitch.valueOf(name); - } -} diff --git a/app/src/main/java/com/github/cythara/DropCGuitarTuning.java b/app/src/main/java/com/github/cythara/DropCGuitarTuning.java @@ -1,38 +0,0 @@ -package com.github.cythara; - -public class DropCGuitarTuning implements Tuning { - - private enum Pitch implements com.github.cythara.Note { - - C2(65.406f), - G2(97.999f), - C3(130.813f), - F3(174.614f), - A3(220f), - D4(293.665f); - - private final float frequency; - - Pitch(float frequency) { - this.frequency = frequency; - } - - public String getName() { - return this.name(); - } - - public float getFrequency() { - return frequency; - } - } - - @Override - public com.github.cythara.Note[] getNotes() { - return Pitch.values(); - } - - @Override - public com.github.cythara.Note findNote(String name) { - return Pitch.valueOf(name); - } -} diff --git a/app/src/main/java/com/github/cythara/DropCSharpGuitarTuning.java b/app/src/main/java/com/github/cythara/DropCSharpGuitarTuning.java @@ -1,40 +0,0 @@ -package com.github.cythara; - -public class DropCSharpGuitarTuning implements Tuning { - - private enum Pitch implements com.github.cythara.Note { - - C2_SHARP("C2#", 69.30f), - A2("A2", 110f), - D3("D3", 146.832f), - G3("G3", 195.998f), - B3("B3", 246.942f), - E4("E4", 329.628f); - - private String name; - private final float frequency; - - Pitch(String name, float frequency) { - this.name = name; - this.frequency = frequency; - } - - public String getName() { - return name; - } - - public float getFrequency() { - return frequency; - } - } - - @Override - public com.github.cythara.Note[] getNotes() { - return Pitch.values(); - } - - @Override - public com.github.cythara.Note findNote(String name) { - return Pitch.valueOf(name); - } -} diff --git a/app/src/main/java/com/github/cythara/DropDGuitarTuning.java b/app/src/main/java/com/github/cythara/DropDGuitarTuning.java @@ -1,38 +0,0 @@ -package com.github.cythara; - -class DropDGuitarTuning implements Tuning { - - private enum Pitch implements com.github.cythara.Note { - - D2(73.416f), - A2(110f), - D3(146.832f), - G3(195.998f), - B3(246.942f), - E4(329.628f); - - private final float frequency; - - Pitch(float frequency) { - this.frequency = frequency; - } - - public String getName() { - return this.name(); - } - - public float getFrequency() { - return frequency; - } - } - - @Override - public com.github.cythara.Note[] getNotes() { - return Pitch.values(); - } - - @Override - public com.github.cythara.Note findNote(String name) { - return Pitch.valueOf(name); - } -} diff --git a/app/src/main/java/com/github/cythara/GuitarTuning.java b/app/src/main/java/com/github/cythara/GuitarTuning.java @@ -1,38 +0,0 @@ -package com.github.cythara; - -class GuitarTuning implements Tuning { - - enum Pitch implements com.github.cythara.Note { - - E2(82.407f), - A2(110f), - D3(146.832f), - G3(195.998f), - B3(246.942f), - E4(329.628f); - - private final float frequency; - - Pitch(float frequency) { - this.frequency = frequency; - } - - public String getName() { - return this.name(); - } - - public float getFrequency() { - return frequency; - } - } - - @Override - public com.github.cythara.Note[] getNotes() { - return Pitch.values(); - } - - @Override - public com.github.cythara.Note findNote(String name) { - return Pitch.valueOf(name); - } -} diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java @@ -14,6 +14,7 @@ import android.support.v7.app.AppCompatActivity; import android.view.WindowManager; import android.widget.ArrayAdapter; +import com.github.cythara.tuning.GuitarTuning; import com.jaredrummler.materialspinner.MaterialSpinner; import static android.widget.ArrayAdapter.createFromResource; diff --git a/app/src/main/java/com/github/cythara/Note.java b/app/src/main/java/com/github/cythara/Note.java @@ -1,6 +1,6 @@ package com.github.cythara; -interface Note { +public interface Note { String getName(); float getFrequency(); diff --git a/app/src/main/java/com/github/cythara/OpenGGuitarTuning.java b/app/src/main/java/com/github/cythara/OpenGGuitarTuning.java @@ -1,38 +0,0 @@ -package com.github.cythara; - -public class OpenGGuitarTuning implements Tuning { - - enum Pitch implements com.github.cythara.Note { - - D2(73.416f), - G2(97.999f), - D3(146.832f), - G3(195.998f), - B3(246.942f), - D4(293.665f); - - private final float frequency; - - Pitch(float frequency) { - this.frequency = frequency; - } - - public String getName() { - return this.name(); - } - - public float getFrequency() { - return frequency; - } - } - - @Override - public com.github.cythara.Note[] getNotes() { - return Pitch.values(); - } - - @Override - public com.github.cythara.Note findNote(String name) { - return Pitch.valueOf(name); - } -} diff --git a/app/src/main/java/com/github/cythara/Tuning.java b/app/src/main/java/com/github/cythara/Tuning.java @@ -1,6 +1,6 @@ package com.github.cythara; -interface Tuning { +public interface Tuning { Note[] getNotes(); diff --git a/app/src/main/java/com/github/cythara/TuningMapper.java b/app/src/main/java/com/github/cythara/TuningMapper.java @@ -2,6 +2,15 @@ package com.github.cythara; import android.util.Log; +import com.github.cythara.tuning.BassTuning; +import com.github.cythara.tuning.DropCGuitarTuning; +import com.github.cythara.tuning.DropCSharpGuitarTuning; +import com.github.cythara.tuning.DropDGuitarTuning; +import com.github.cythara.tuning.GuitarTuning; +import com.github.cythara.tuning.OpenGGuitarTuning; +import com.github.cythara.tuning.UkuleleDTuning; +import com.github.cythara.tuning.UkuleleTuning; + class TuningMapper { private static final int GUITAR_TUNING_POSITION = 0; diff --git a/app/src/main/java/com/github/cythara/UkuleleDTuning.java b/app/src/main/java/com/github/cythara/UkuleleDTuning.java @@ -1,38 +0,0 @@ -package com.github.cythara; - -public class UkuleleDTuning implements Tuning { - - private enum Pitch implements com.github.cythara.Note { - - A4("A4", 440f), - D4("D4", 293.665f), - F3_SHARP("F3#", 369.99f), - B4("B4", 493.88f); - - private String name; - private final float frequency; - - Pitch(String name, float frequency) { - this.name = name; - this.frequency = frequency; - } - - public String getName() { - return name; - } - - public float getFrequency() { - return frequency; - } - } - - @Override - public Note[] getNotes() { - return Pitch.values(); - } - - @Override - public Note findNote(String name) { - return Pitch.valueOf(name); - } -} diff --git a/app/src/main/java/com/github/cythara/UkuleleTuning.java b/app/src/main/java/com/github/cythara/UkuleleTuning.java @@ -1,36 +0,0 @@ -package com.github.cythara; - -class UkuleleTuning implements Tuning { - - private enum Pitch implements Note { - - G4(391.995f), - C4(261.626f), - E4(329.628f), - A4(440f); - - private final float frequency; - - Pitch(float frequency) { - this.frequency = frequency; - } - - public String getName() { - return this.name(); - } - - public float getFrequency() { - return frequency; - } - } - - @Override - public Note[] getNotes() { - return Pitch.values(); - } - - @Override - public Note findNote(String name) { - return Pitch.valueOf(name); - } -} diff --git a/app/src/main/java/com/github/cythara/tuning/BassTuning.java b/app/src/main/java/com/github/cythara/tuning/BassTuning.java @@ -0,0 +1,38 @@ +package com.github.cythara.tuning; + +import com.github.cythara.Tuning; + +public class BassTuning implements Tuning { + + enum Pitch implements com.github.cythara.Note { + + E1(41.204f), + A1(55f), + D2(73.416f), + G2(97.999f); + + private final float frequency; + + Pitch(float frequency) { + this.frequency = frequency; + } + + public String getName() { + return this.name(); + } + + public float getFrequency() { + return frequency; + } + } + + @Override + public com.github.cythara.Note[] getNotes() { + return Pitch.values(); + } + + @Override + public com.github.cythara.Note findNote(String name) { + return Pitch.valueOf(name); + } +} diff --git a/app/src/main/java/com/github/cythara/tuning/DropCGuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/DropCGuitarTuning.java @@ -0,0 +1,40 @@ +package com.github.cythara.tuning; + +import com.github.cythara.Tuning; + +public class DropCGuitarTuning implements Tuning { + + private enum Pitch implements com.github.cythara.Note { + + C2(65.406f), + G2(97.999f), + C3(130.813f), + F3(174.614f), + A3(220f), + D4(293.665f); + + private final float frequency; + + Pitch(float frequency) { + this.frequency = frequency; + } + + public String getName() { + return this.name(); + } + + public float getFrequency() { + return frequency; + } + } + + @Override + public com.github.cythara.Note[] getNotes() { + return Pitch.values(); + } + + @Override + public com.github.cythara.Note findNote(String name) { + return Pitch.valueOf(name); + } +} diff --git a/app/src/main/java/com/github/cythara/tuning/DropCSharpGuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/DropCSharpGuitarTuning.java @@ -0,0 +1,42 @@ +package com.github.cythara.tuning; + +import com.github.cythara.Tuning; + +public class DropCSharpGuitarTuning implements Tuning { + + private enum Pitch implements com.github.cythara.Note { + + C2_SHARP("C2#", 69.30f), + A2("A2", 110f), + D3("D3", 146.832f), + G3("G3", 195.998f), + B3("B3", 246.942f), + E4("E4", 329.628f); + + private String name; + private final float frequency; + + Pitch(String name, float frequency) { + this.name = name; + this.frequency = frequency; + } + + public String getName() { + return name; + } + + public float getFrequency() { + return frequency; + } + } + + @Override + public com.github.cythara.Note[] getNotes() { + return Pitch.values(); + } + + @Override + public com.github.cythara.Note findNote(String name) { + return Pitch.valueOf(name); + } +} diff --git a/app/src/main/java/com/github/cythara/tuning/DropDGuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/DropDGuitarTuning.java @@ -0,0 +1,40 @@ +package com.github.cythara.tuning; + +import com.github.cythara.Tuning; + +public class DropDGuitarTuning implements Tuning { + + private enum Pitch implements com.github.cythara.Note { + + D2(73.416f), + A2(110f), + D3(146.832f), + G3(195.998f), + B3(246.942f), + E4(329.628f); + + private final float frequency; + + Pitch(float frequency) { + this.frequency = frequency; + } + + public String getName() { + return this.name(); + } + + public float getFrequency() { + return frequency; + } + } + + @Override + public com.github.cythara.Note[] getNotes() { + return Pitch.values(); + } + + @Override + public com.github.cythara.Note findNote(String name) { + return Pitch.valueOf(name); + } +} diff --git a/app/src/main/java/com/github/cythara/tuning/GuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/GuitarTuning.java @@ -0,0 +1,40 @@ +package com.github.cythara.tuning; + +import com.github.cythara.Tuning; + +public class GuitarTuning implements Tuning { + + public enum Pitch implements com.github.cythara.Note { + + E2(82.407f), + A2(110f), + D3(146.832f), + G3(195.998f), + B3(246.942f), + E4(329.628f); + + private final float frequency; + + Pitch(float frequency) { + this.frequency = frequency; + } + + public String getName() { + return this.name(); + } + + public float getFrequency() { + return frequency; + } + } + + @Override + public com.github.cythara.Note[] getNotes() { + return Pitch.values(); + } + + @Override + public com.github.cythara.Note findNote(String name) { + return Pitch.valueOf(name); + } +} diff --git a/app/src/main/java/com/github/cythara/tuning/OpenGGuitarTuning.java b/app/src/main/java/com/github/cythara/tuning/OpenGGuitarTuning.java @@ -0,0 +1,40 @@ +package com.github.cythara.tuning; + +import com.github.cythara.Tuning; + +public class OpenGGuitarTuning implements Tuning { + + enum Pitch implements com.github.cythara.Note { + + D2(73.416f), + G2(97.999f), + D3(146.832f), + G3(195.998f), + B3(246.942f), + D4(293.665f); + + private final float frequency; + + Pitch(float frequency) { + this.frequency = frequency; + } + + public String getName() { + return this.name(); + } + + public float getFrequency() { + return frequency; + } + } + + @Override + public com.github.cythara.Note[] getNotes() { + return Pitch.values(); + } + + @Override + public com.github.cythara.Note findNote(String name) { + return Pitch.valueOf(name); + } +} diff --git a/app/src/main/java/com/github/cythara/tuning/UkuleleDTuning.java b/app/src/main/java/com/github/cythara/tuning/UkuleleDTuning.java @@ -0,0 +1,41 @@ +package com.github.cythara.tuning; + +import com.github.cythara.Note; +import com.github.cythara.Tuning; + +public class UkuleleDTuning implements Tuning { + + private enum Pitch implements com.github.cythara.Note { + + A4("A4", 440f), + D4("D4", 293.665f), + F3_SHARP("F3#", 369.99f), + B4("B4", 493.88f); + + private String name; + private final float frequency; + + Pitch(String name, float frequency) { + this.name = name; + this.frequency = frequency; + } + + public String getName() { + return name; + } + + public float getFrequency() { + return frequency; + } + } + + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } +} diff --git a/app/src/main/java/com/github/cythara/tuning/UkuleleTuning.java b/app/src/main/java/com/github/cythara/tuning/UkuleleTuning.java @@ -0,0 +1,39 @@ +package com.github.cythara.tuning; + +import com.github.cythara.Note; +import com.github.cythara.Tuning; + +public class UkuleleTuning implements Tuning { + + private enum Pitch implements Note { + + G4(391.995f), + C4(261.626f), + E4(329.628f), + A4(440f); + + private final float frequency; + + Pitch(float frequency) { + this.frequency = frequency; + } + + public String getName() { + return this.name(); + } + + public float getFrequency() { + return frequency; + } + } + + @Override + public Note[] getNotes() { + return Pitch.values(); + } + + @Override + public Note findNote(String name) { + return Pitch.valueOf(name); + } +} diff --git a/app/src/test/java/com/github/cythara/PitchComparatorTest.java b/app/src/test/java/com/github/cythara/PitchComparatorTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import java.util.HashMap; import java.util.Map; -import static com.github.cythara.GuitarTuning.Pitch.*; +import static com.github.cythara.tuning.GuitarTuning.Pitch.*; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.closeTo; diff --git a/app/src/test/java/com/github/cythara/SamplerTest.java b/app/src/test/java/com/github/cythara/SamplerTest.java @@ -5,8 +5,10 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static com.github.cythara.GuitarTuning.Pitch.*; import static com.github.cythara.Sampler.*; +import static com.github.cythara.tuning.GuitarTuning.Pitch.B3; +import static com.github.cythara.tuning.GuitarTuning.Pitch.E2; +import static com.github.cythara.tuning.GuitarTuning.Pitch.G3; import static org.hamcrest.CoreMatchers.either; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.closeTo;