From 44ed971866b302b8770e4bce3a8c88174695b87b Mon Sep 17 00:00:00 2001
From: uvok
Date: Sat, 12 Jul 2025 10:55:48 +0200
Subject: Add measures and voices

---
 songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java     | 8 ++++++++
 songsterr-reader/src/main/java/de/uvok/tuxguitar/Song.java        | 6 ++++++
 .../src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java     | 2 +-
 .../src/main/java/de/uvok/tuxguitar/SongsterrSong.java            | 5 -----
 songsterr-reader/src/main/java/de/uvok/tuxguitar/Voice.java       | 5 +++++
 5 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java
 create mode 100644 songsterr-reader/src/main/java/de/uvok/tuxguitar/Song.java
 delete mode 100644 songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrSong.java
 create mode 100644 songsterr-reader/src/main/java/de/uvok/tuxguitar/Voice.java

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/Song.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Song.java
new file mode 100644
index 0000000..e2724e6
--- /dev/null
+++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Song.java
@@ -0,0 +1,6 @@
+package de.uvok.tuxguitar;
+
+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/SongsterrSong.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrSong.java
deleted file mode 100644
index 1693316..0000000
--- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrSong.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.uvok.tuxguitar;
-
-public class SongsterrSong {
-    public int strings;
-}
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 {
+    
+}
-- 
cgit v1.2.3