plectrum

commit 6b8ce80bde2b08b25e4e8f3b9d0b66843a97a4d8
parent 1a0564b3ce718f2378a509a20b840d37f83a02af
Author: gstraube <gstraube@mailbox.org>
Date:   Thu, 28 Dec 2017 13:12:13 +0100

Merge branch 'mtbu-master'

Diffstat:
M
app/src/main/java/com/github/cythara/TuningMapper.java
 | 
6
+++++-
A
app/src/main/java/com/github/cythara/tuning/ViolinTuning.java
 | 
54
++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
app/src/main/res/values/strings.xml
 | 
1
+

3 files changed, 60 insertions(+), 1 deletion(-)
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.GuitarTuning;
 import com.github.cythara.tuning.OpenGGuitarTuning;
 import com.github.cythara.tuning.UkuleleDTuning;
 import com.github.cythara.tuning.UkuleleTuning;
+import com.github.cythara.tuning.ViolinTuning;
 
 class TuningMapper {
 
@@ -22,7 +23,8 @@ class TuningMapper {
     private static final int BASS_TUNING_POSITION = 5;
     private static final int UKULELE_TUNING_POSITION = 6;
     private static final int D_TUNING_POSITION = 7;
-    private static final int CHROMATIC_TUNING_POSITION = 8;
+    private static final int VIOLIN_TUNING_POSITION = 8;
+    private static final int CHROMATIC_TUNING_POSITION = 9;
 
     static Tuning getTuningFromPosition(int position) {
         switch (position) {
@@ -42,6 +44,8 @@ class TuningMapper {
                 return new UkuleleTuning();
             case D_TUNING_POSITION:
                 return new UkuleleDTuning();
+            case VIOLIN_TUNING_POSITION:
+                return new ViolinTuning();
             case CHROMATIC_TUNING_POSITION:
                 return new ChromaticTuning();
             default:
diff --git a/app/src/main/java/com/github/cythara/tuning/ViolinTuning.java b/app/src/main/java/com/github/cythara/tuning/ViolinTuning.java
@@ -0,0 +1,54 @@
+package com.github.cythara.tuning;
+
+import com.github.cythara.Tuning;
+
+public class ViolinTuning implements Tuning {
+
+    private enum Pitch implements com.github.cythara.Note {
+
+        G3("G", "3", 196f),
+        D4("D", "4", 293.66f),
+        A4("A", "4", 440f),
+        E5("E", "5", 659.26f);
+
+        private String name;
+        private final String sign;
+        private final String octave;
+        private final float frequency;
+
+        Pitch(String name, String octave, float frequency) {
+            this.name = name;
+            this.octave = octave;
+            this.sign = "";
+            this.frequency = frequency;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public float getFrequency() {
+            return frequency;
+        }
+
+        @Override
+        public String getOctave() {
+            return octave;
+        }
+
+        @Override
+        public String getSign() {
+            return sign;
+        }
+    }
+
+    @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/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
         <item>Bass (standard)</item>
         <item>Ukulele (standard)</item>
         <item>Ukulele (D tuning)</item>
+        <item>Violin (standard)</item>
         <item>Chromatic</item>
     </string-array>