Added timing jitter option to audio export

Author: RaphiMC

build.gradle

@@ -32,7 +32,7 @@ dependencies {
     }
     includeInJar "net.java.dev.jna:jna:5.18.1"
 
-    includeInJar "net.raphimc:thingl:0.1.0-20251227.185131-8"
+    includeInJar "net.raphimc:thingl:0.1.1-20260125.160939-1:java17"
     includeInJar "org.lwjgl:lwjgl-glfw:3.4.0"
     includeInJar "org.lwjgl:lwjgl-opengl:3.4.0"
     includeInJar "org.lwjgl:lwjgl-freetype:3.4.0"

src/main/java/net/raphimc/noteblocktool/audio/player/impl/SongRenderer.java

@@ -24,11 +24,13 @@
 import net.raphimc.noteblocktool.audio.system.AudioSystem;
 
 import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Function;
 
 public class SongRenderer extends AudioSystemSongPlayer {
 
     private boolean isRunning;
+    private boolean timingJitter;
 
     public SongRenderer(final Song song, final Function<Map<String, byte[]>, AudioSystem> audioSystemSupplier) {
         super(song, audioSystemSupplier);
@@ -55,11 +57,22 @@ public boolean isRunning() {
         return this.isRunning;
     }
 
+    public void setTimingJitter(final boolean timingJitter) {
+        this.timingJitter = timingJitter;
+    }
+
     public float[] renderTick() {
         if (this.isRunning()) {
             this.tick();
         }
-        return this.getAudioSystem().render(MathUtil.millisToFrameCount(this.getAudioSystem().getLoopbackAudioFormat(), 1000F / this.getCurrentTicksPerSecond()));
+        float millis = 1000F / this.getCurrentTicksPerSecond();
+        if (this.timingJitter) {
+            millis += ThreadLocalRandom.current().nextFloat(-1F, 1F);
+            if (millis <= 0F) {
+                millis = 0.1F;
+            }
+        }
+        return this.getAudioSystem().render(MathUtil.millisToFrameCount(this.getAudioSystem().getLoopbackAudioFormat(), millis));
     }
 
     public float[] renderSong() throws InterruptedException {

src/main/java/net/raphimc/noteblocktool/elements/VerticalFileChooser.java

@@ -28,8 +28,7 @@ public VerticalFileChooser() {
 
     private void changeListToVertical(final JComponent component) {
         for (Component c : component.getComponents()) {
-            if (c instanceof JList<?>) {
-                JList<?> list = (JList<?>) c;
+            if (c instanceof final JList<?> list) {
                 list.setLayoutOrientation(JList.VERTICAL);
             }
             if (c instanceof JComponent) {

src/main/java/net/raphimc/noteblocktool/frames/ExportFrame.java

@@ -76,6 +76,7 @@ public class ExportFrame extends JFrame {
     private final JComboBox<Channels> channels = new JComboBox<>(Channels.values());
     private final JLabel volumeLabel = new JLabel("Volume:");
     private final JSlider volume = new JSlider(0, 100, 50);
+    private final JCheckBox timingJitter = new JCheckBox("Artificial Timing Jitter");
     private JPanel progressPanel;
     private final JProgressBar progressBar = new JProgressBar();
     private final JButton exportButton = new JButton("Export");
@@ -138,6 +139,9 @@ private void initComponents() {
             this.volume.setPaintTicks(true);
             this.volume.setPaintLabels(true);
         });
+        GBC.create(root).grid(1, gridy++).insets(5, 0, 0, 5).anchor(GBC.LINE_START).add(this.timingJitter, () -> {
+            this.timingJitter.setToolTipText("Adds slight timing jitter (±1ms) to make the song sound more natural and less artificial.\nThis emulates the behaviour of playing the song in Note Block Studio.");
+        });
 
         GBC.create(root).grid(0, gridy++).insets(5, 5, 0, 5).width(1).width(2).weight(1, 1).fill(GBC.BOTH).add(() -> {
             JScrollPane scrollPane = new JScrollPane();
@@ -181,6 +185,7 @@ private void updateVisibility() {
 
         this.volumeLabel.setVisible(outputFormat.isAudioFile());
         this.volume.setVisible(outputFormat.isAudioFile());
+        this.timingJitter.setVisible(outputFormat.isAudioFile());
     }
 
     private void initFrameHandler() {
@@ -218,6 +223,7 @@ private void export() {
             this.bitDepth.setEnabled(true);
             this.channels.setEnabled(true);
             this.volume.setEnabled(true);
+            this.timingJitter.setEnabled(true);
             this.progressPanel.removeAll();
             this.exportButton.setText("Export");
             this.progressBar.setValue(0);
@@ -235,6 +241,7 @@ private void export() {
         this.bitDepth.setEnabled(false);
         this.channels.setEnabled(false);
         this.volume.setEnabled(false);
+        this.timingJitter.setEnabled(false);
         this.progressPanel.removeAll();
         this.exportButton.setText("Cancel");
         this.progressBar.setValue(0);
@@ -318,6 +325,9 @@ private void doExport(final File outFile) {
                     this.exportSong(this.loadedSongs.get(0), outFile, progressConsumer.apply(progressBar));
                 } catch (InterruptedException ignored) {
                 } catch (Throwable t) {
+                    if (t.getCause() instanceof InterruptedException) {
+                        return;
+                    }
                     t.printStackTrace();
                     JOptionPane.showMessageDialog(this, "Failed to export song:\n" + this.loadedSongs.get(0).file().getAbsolutePath() + "\n" + t.getClass().getSimpleName() + ": " + t.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
                 } finally {
@@ -350,6 +360,9 @@ private void doExport(final File outFile) {
                             });
                         } catch (InterruptedException ignored) {
                         } catch (Throwable t) {
+                            if (t.getCause() instanceof InterruptedException) {
+                                return;
+                            }
                             t.printStackTrace();
                             uiQueue.offer(() -> {
                                 songPanel.remove(progressBar);
@@ -384,6 +397,9 @@ private void doExport(final File outFile) {
             }
         } catch (InterruptedException ignored) {
         } catch (Throwable t) {
+            if (t.getCause() instanceof InterruptedException) {
+                return;
+            }
             t.printStackTrace();
             JOptionPane.showMessageDialog(this, "Failed to export songs:\n" + t.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
         } finally {
@@ -396,6 +412,7 @@ private void doExport(final File outFile) {
                 this.bitDepth.setEnabled(true);
                 this.channels.setEnabled(true);
                 this.volume.setEnabled(true);
+                this.timingJitter.setEnabled(true);
                 this.exportButton.setText("Export");
                 this.progressBar.setValue(this.loadedSongs.size());
                 this.progressBar.revalidate();
@@ -424,6 +441,7 @@ private void exportSong(final ListFrame.LoadedSong song, final File file, final
                 case BASS -> new ProgressSongRenderer(song.song(), progressConsumer, soundData -> new BassAudioSystem(soundData, MAX_SOUNDS, renderAudioFormat));
             };
             songRenderer.getAudioSystem().setMasterVolume(this.volume.getValue() / 100F);
+            songRenderer.setTimingJitter(this.timingJitter.isSelected());
             final float[] samples;
             try {
                 samples = songRenderer.renderSong();