plectrum

commit 3f539522d05cb040437f41ebb9ec35d26ae0cac9
parent 3291ea02c0240e44cdc2ccfc8094bbd2188e8c6f
Author: gstraube <gstraube@mailbox.org>
Date:   Sat,  1 Aug 2020 10:23:00 +0200

Merge branch 'romgarb-master'

Diffstat:
M
app/src/main/java/com/github/cythara/TuningMapper.java
 | 
4
++++
A
app/src/main/java/com/github/cythara/tuning/OudStdTurkishTuning.java
 | 
60
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
app/src/main/res/values/strings.xml
 | 
1
+

3 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/github/cythara/TuningMapper.java b/app/src/main/java/com/github/cythara/TuningMapper.java
@@ -11,6 +11,7 @@ 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.OudStdTurkishTuning;
 import com.github.cythara.tuning.UkuleleDTuning;
 import com.github.cythara.tuning.UkuleleTuning;
 import com.github.cythara.tuning.ViolinTuning;
@@ -31,6 +32,7 @@ class TuningMapper {
     private static final int VIOLIN_TUNING_POSITION = 10;
     private static final int CELLO_TUNING_POSITION = 11;
     private static final int VIOLA_TUNING_POSITION = 12;
+    private static final int OUDSTDTR_TUNING_POSITION = 13;
 
     static Tuning getTuningFromPosition(int position) {
         switch (position) {
@@ -60,6 +62,8 @@ class TuningMapper {
                 return new CelloTuning();
             case VIOLA_TUNING_POSITION:
                 return new ViolaTuning();
+            case OUDSTDTR_TUNING_POSITION:
+                return new OudStdTurkishTuning();
             default:
                 Log.w("com.github.cythara", "Unknown position for tuning dropdown list");
                 return new ChromaticTuning();
diff --git a/app/src/main/java/com/github/cythara/tuning/OudStdTurkishTuning.java b/app/src/main/java/com/github/cythara/tuning/OudStdTurkishTuning.java
@@ -0,0 +1,60 @@
+package com.github.cythara.tuning;
+
+import com.github.cythara.Note;
+import com.github.cythara.NoteName;
+import com.github.cythara.Tuning;
+
+import static com.github.cythara.NoteName.*;
+
+public class OudStdTurkishTuning implements Tuning {
+
+    @Override
+    public Note[] getNotes() {
+        return Pitch.values();
+    }
+
+    @Override
+    public Note findNote(String name) {
+        return Pitch.valueOf(name);
+    }
+
+    public enum Pitch implements Note {
+
+        C2_SHARP(C, 2, "#"),
+        F2_SHARP(F, 2, "#"),
+        B3(B, 3),
+        E3(E, 3),
+        A3(A, 3),
+        D4(D, 4);
+
+        private final String sign;
+        private final int octave;
+        private NoteName name;
+
+        Pitch(NoteName name, int octave, String sign) {
+            this.name = name;
+            this.octave = octave;
+            this.sign = sign;
+        }
+
+        Pitch(NoteName name, int octave) {
+            this.name = name;
+            this.octave = octave;
+            this.sign = "";
+        }
+
+        public NoteName getName() {
+            return name;
+        }
+
+        @Override
+        public int getOctave() {
+            return octave;
+        }
+
+        @Override
+        public String getSign() {
+            return sign;
+        }
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
         <item>Violin (standard)</item>
         <item>Cello (standard)</item>
         <item>Viola (standard)</item>
+        <item>Oud (Turkish standard)</item>
     </string-array>
     <string-array name="notations">
         <item name="scientific">Scientific pitch notation</item>