1.8.2.3

0ceal0t · Feb 24, 2024 · 84ae9a2 · 84ae9a2
1 parent e59c22a
commit 84ae9a2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/VFXEditor/Formats/ScdFormat/Music/AudioPlayer.cs b/VFXEditor/Formats/ScdFormat/Music/AudioPlayer.cs
@@ -1,7 +1,7 @@
 using Dalamud.Interface;
+using Dalamud.Interface.Utility.Raii;
 using ImGuiNET;
 using NAudio.Wave;
-using Dalamud.Interface.Utility.Raii;
 using System;
 using System.IO;
 using System.Numerics;
@@ -54,27 +54,25 @@ public void Draw() {
             DrawPlayer();
             DrawChannels();
             DrawConverter();
-
-            ProcessQueue();
+            ProcessQueue(); // Loop, etc.
         }
 
-        private void DrawPlayer() {
-            using var tabItem = ImRaii.TabItem( "Music" );
-            if( !tabItem ) return;
-
+        public void DrawMiniPlayer() {
             using var _ = ImRaii.PushId( "Music" );
+            DrawControls();
+            ProcessQueue(); // Loop, etc.
+        }
 
-            // Controls
-            using( var font = ImRaii.PushFont( UiBuilder.IconFont ) ) {
-                if( State == PlaybackState.Stopped ) {
-                    if( ImGui.Button( FontAwesomeIcon.Play.ToIconString() ) ) Play();
-                }
-                else if( State == PlaybackState.Playing ) {
-                    if( ImGui.Button( FontAwesomeIcon.Pause.ToIconString() ) ) CurrentOutput.Pause();
-                }
-                else if( State == PlaybackState.Paused ) {
-                    if( ImGui.Button( FontAwesomeIcon.Play.ToIconString() ) ) CurrentOutput.Play();
-                }
+        private void DrawControls() {
+            using var font = ImRaii.PushFont( UiBuilder.IconFont );
+            if( State == PlaybackState.Stopped ) {
+                if( ImGui.Button( FontAwesomeIcon.Play.ToIconString() ) ) Play();
+            }
+            else if( State == PlaybackState.Playing ) {
+                if( ImGui.Button( FontAwesomeIcon.Pause.ToIconString() ) ) CurrentOutput.Pause();
+            }
+            else if( State == PlaybackState.Paused ) {
+                if( ImGui.Button( FontAwesomeIcon.Play.ToIconString() ) ) CurrentOutput.Play();
             }
 
             var selectedTime = ( float )CurrentTime;
@@ -105,6 +103,15 @@ private void DrawPlayer() {
                 drawList.AddRectFilled( startPos, startPos + new Vector2( 4, height ), 0xFFFF0000, 1 );
                 drawList.AddRectFilled( endPos, endPos + new Vector2( 4, height ), 0xFFFF0000, 1 );
             }
+        }
+
+        private void DrawPlayer() {
+            using var tabItem = ImRaii.TabItem( "Music" );
+            if( !tabItem ) return;
+
+            using var _ = ImRaii.PushId( "Music" );
+
+            DrawControls();
 
             // Save
             ImGui.SameLine();
@@ -210,7 +217,6 @@ private void ProcessQueue() {
 
             if( currentState == PlaybackState.Stopped && PrevState == PlaybackState.Playing &&
                 ( ( IsVorbis && Plugin.Configuration.LoopMusic ) || ( !IsVorbis && Plugin.Configuration.LoopSoundEffects ) ) ) {
-                Dalamud.Log( "Looping..." );
                 Play();
                 if( !Entry.NoLoop && Plugin.Configuration.SimulateScdLoop && LoopTimeInitialized && LoopStartTime > 0 ) {
                     if( QueueSeek == -1 ) {

diff --git a/VFXEditor/VFXEditor.csproj b/VFXEditor/VFXEditor.csproj
@@ -6,8 +6,8 @@
         <Company></Company>
         <Product>VFXEditor</Product>
         <Copyright>Copyright © 2020</Copyright>
-        <FileVersion>1.8.2.2</FileVersion>
-        <AssemblyVersion>1.8.2.2</AssemblyVersion>
+        <FileVersion>1.8.2.3</FileVersion>
+        <AssemblyVersion>1.8.2.3</AssemblyVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

diff --git a/VFXEditor/VFXEditor.json b/VFXEditor/VFXEditor.json
@@ -4,7 +4,7 @@
     "Punchline": "VFX editor and viewer",
     "Description": "VFX, animation, and sound editing plugin. Icon by PAPACHIN",
     "InternalName": "VFXEditor",
-    "AssemblyVersion": "1.8.2.2",
+    "AssemblyVersion": "1.8.2.3",
     "RepoUrl": "https://github.com/0ceal0t/Dalamud-VFXEditor",
     "ApplicableVersion": "any",
     "Tags": [ "VFX", "AVFX" ],