commit 646ae233577e66ca3acf618e9ae7c6e4bbdff467
parent 61b79742d86451359671bde61c3d962caff778b9
Author: gstraube <gstraube@mailbox.org>
Date: Mon, 16 Oct 2017 16:54:07 +0200
Rename tunings
Diffstat:
9 files changed, 83 insertions(+), 83 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.StandardTuning.Pitch.*;
+import static com.github.cythara.GuitarTuning.Pitch.*;
import static java.lang.String.format;
@RunWith(AndroidJUnit4.class)
diff --git a/app/src/main/java/com/github/cythara/DropDGuitarTuning.java b/app/src/main/java/com/github/cythara/DropDGuitarTuning.java
@@ -0,0 +1,38 @@
+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/DropDTuning.java b/app/src/main/java/com/github/cythara/DropDTuning.java
@@ -1,38 +0,0 @@
-package com.github.cythara;
-
-class DropDTuning 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
@@ -0,0 +1,38 @@
+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
@@ -23,7 +23,7 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
public static final int RECORD_AUDIO_PERMISSION = 0;
private static final String TAG_LISTENER_FRAGMENT = "listener_fragment";
- static Tuning tuning = new StandardTuning();
+ static Tuning tuning = new GuitarTuning();
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/github/cythara/StandardTuning.java b/app/src/main/java/com/github/cythara/StandardTuning.java
@@ -1,38 +0,0 @@
-package com.github.cythara;
-
-class StandardTuning 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/TuningMapper.java b/app/src/main/java/com/github/cythara/TuningMapper.java
@@ -11,14 +11,14 @@ class TuningMapper {
static Tuning getTuningFromPosition(int position) {
switch (position) {
case GUITAR_TUNING_POSITION:
- return new StandardTuning();
+ return new GuitarTuning();
case DROP_D_TUNING_POSITION:
- return new DropDTuning();
+ return new DropDGuitarTuning();
case UKULELE_TUNING_POSITION:
return new UkuleleTuning();
default:
Log.w("com.github.cythara", "Unknown position for tuning dropdown list");
- return new StandardTuning();
+ return new GuitarTuning();
}
}
}
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.StandardTuning.Pitch.*;
+import static com.github.cythara.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,7 +5,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
-import static com.github.cythara.StandardTuning.Pitch.*;
+import static com.github.cythara.GuitarTuning.Pitch.*;
import static com.github.cythara.Sampler.*;
import static org.hamcrest.CoreMatchers.either;
import static org.hamcrest.CoreMatchers.is;
