diff options
-rw-r--r-- | songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java | 8 | ||||
-rw-r--r-- | songsterr-reader/src/main/java/de/uvok/tuxguitar/Song.java (renamed from songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrSong.java) | 3 | ||||
-rw-r--r-- | songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java | 2 | ||||
-rw-r--r-- | songsterr-reader/src/main/java/de/uvok/tuxguitar/Voice.java | 5 |
4 files changed, 16 insertions, 2 deletions
diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java new file mode 100644 index 0000000..8bdcfa2 --- /dev/null +++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java @@ -0,0 +1,8 @@ +package de.uvok.tuxguitar; + +public class Measure { + public int index; + public int[] signature; + public boolean rest; + public Voice voices[]; +} diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrSong.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Song.java index 1693316..e2724e6 100644 --- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrSong.java +++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Song.java @@ -1,5 +1,6 @@ package de.uvok.tuxguitar; -public class SongsterrSong { +public class Song { public int strings; + public Measure[] measures; } diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java index d822aba..c1f581c 100644 --- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java +++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java @@ -24,7 +24,7 @@ public class SongsterrInputStream implements TGSongReader { InputStream is = arg0.getInputStream(); try { ObjectMapper om = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - SongsterrSong song = om.readValue(is, SongsterrSong.class); + Song song = om.readValue(is, Song.class); System.out.println(song); } catch (IOException e) { throw new TGFileFormatException(); diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/Voice.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Voice.java new file mode 100644 index 0000000..9dec72d --- /dev/null +++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Voice.java @@ -0,0 +1,5 @@ +package de.uvok.tuxguitar; + +public class Voice { + +} |