arrows playback controls

ImAxel0 · May 26, 2024 · 32fcc99 · 32fcc99
1 parent 70a24fd
commit 32fcc99
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/Openthesia/ProgramData.cs b/Openthesia/ProgramData.cs
@@ -8,7 +8,7 @@ namespace Openthesia;
 
 public class ProgramData
 {
-    public static readonly string ProgramVersion = "1.0.0";
+    public static readonly string ProgramVersion = "1.1.0";
     public static IntPtr LogoImage;
     public static string SettingsPath = Path.Combine(KnownFolders.RoamingAppData.Path, "Openthesia", "Settings.json");
     public static string HandsDataPath = Path.Combine(KnownFolders.RoamingAppData.Path, "Openthesia\\HandsData");

diff --git a/Openthesia/ScreenCanvas.cs b/Openthesia/ScreenCanvas.cs
@@ -469,15 +469,6 @@ private static void GetPlaybackInputs()
                 MidiPlayer.Playback.Speed = cValue;
             }
         }
-        /*
-        if (ImGui.IsMouseDown(ImGuiMouseButton.Right) && ImGui.GetIO().MouseDelta.Y != 0 && !MidiPlayer.IsTimerRunning)
-        {
-            float n = ImGui.GetIO().MouseDelta.Y < 0 ? -1 : 1;
-            if (UpDirection) n = -n;
-            MidiPlayer.Seconds = Math.Clamp(MidiPlayer.Seconds + n, 0, (int)MidiPlayer.Playback.GetDuration<MetricTimeSpan>().TotalSeconds);
-            MidiPlayer.Playback.MoveToTime(new MetricTimeSpan(0, 0, (int)MidiPlayer.Seconds));
-            MidiPlayer.Timer = MidiPlayer.Seconds * 100 * _fallSpeed;
-        } */
 
         if (ImGui.IsKeyPressed(ImGuiKey.Space, false))
         {
@@ -501,6 +492,20 @@ private static void GetPlaybackInputs()
         {
             _showTextNotes = !_showTextNotes;
         }
+
+        if (ImGui.IsKeyPressed(ImGuiKey.RightArrow))
+        {
+            var newTime = Math.Clamp(MidiPlayer.Seconds + 1, 0, (float)MidiFileData.MidiFile.GetDuration<MetricTimeSpan>().TotalSeconds);
+            MidiPlayer.Playback.MoveToTime(new MetricTimeSpan(0, 0, (int)newTime));
+            MidiPlayer.Timer = (int)newTime * 100 * _fallSpeed;
+        }
+
+        if (ImGui.IsKeyPressed(ImGuiKey.LeftArrow))
+        {
+            var newTime = Math.Clamp(MidiPlayer.Seconds - 1, 0, (float)MidiFileData.MidiFile.GetDuration<MetricTimeSpan>().TotalSeconds);
+            MidiPlayer.Playback.MoveToTime(new MetricTimeSpan(0, 0, (int)newTime));
+            MidiPlayer.Timer = (int)newTime * 100 * _fallSpeed;
+        }
     }
 
     private static void GetInputs()
@@ -661,7 +666,7 @@ public static void RenderScreen(bool playMode = false)
                 {
                     MidiPlayer.Playback.MoveToTime(new MetricTimeSpan(0, 0, (int)MidiPlayer.Seconds));
                     //MidiPlayer.Playback.MoveToTime(new MetricTimeSpan(MidiPlayer.Time.Milliseconds));
-                    MidiPlayer.Timer = MidiPlayer.Seconds * 100 * _fallSpeed;
+                    MidiPlayer.Timer = (int)MidiPlayer.Seconds * 100 * _fallSpeed;
                 }
 
                 ImGui.SetNextWindowPos(new(ImGui.GetIO().DisplaySize.X / 2 - 85, CanvasPos.Y + 50));