From 285b4e2cc15e9c993ee48736b7de068b567d195d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 27 Jul 2025 14:48:48 +0200 Subject: [PATCH] Removed: Resample wav to 44kHz feature from GUI --- CHANGELOG.md | 3 +++ src/com/jpexs/decompiler/flash/gui/ExportDialog.java | 5 +++-- src/com/jpexs/decompiler/flash/gui/ImagePanel.java | 2 +- src/com/jpexs/decompiler/flash/gui/MainPanel.java | 2 +- .../jpexs/decompiler/flash/gui/player/PlayerControls.java | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bb6ce601..a85e2f4cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,9 @@ All notable changes to this project will be documented in this file. - Quotes in tree node parameter values that need them - The label of option "automatic deobfuscation" changed to "deobfuscate code" +### Removed +- Resample wav to 44kHz feature from GUI + ## [24.0.1] - 2025-06-27 ### Fixed - [#2476] Dark interface skins identifiers highlighter visibility diff --git a/src/com/jpexs/decompiler/flash/gui/ExportDialog.java b/src/com/jpexs/decompiler/flash/gui/ExportDialog.java index 2034c0991..12121113f 100644 --- a/src/com/jpexs/decompiler/flash/gui/ExportDialog.java +++ b/src/com/jpexs/decompiler/flash/gui/ExportDialog.java @@ -401,12 +401,13 @@ public class ExportDialog extends AppDialog { resampleWavCheckBox.setVisible(false); if (embedCheckBox.isVisible() || visibleOptionClasses.contains(SoundExportMode.class)) { - gbc.gridy++; + /*gbc.gridy++; resampleWavCheckBox.setVisible(true); comboPanel.add(resampleWavCheckBox, gbc); if (Configuration.lastExportResampleWav.get()) { resampleWavCheckBox.setSelected(true); - } + }*/ + resampleWavCheckBox.setSelected(false); } transparentFrameBackgroundCheckBox = new JCheckBox(translate("transparentFrameBackground")); diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java index b9443e06e..ee3200915 100644 --- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java +++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java @@ -4788,7 +4788,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay { this.frozen = frozen; this.frozenButtons = frozenButtons; this.muted = muted; - this.resample = Configuration.previewResampleSound.get(); + this.resample = false; //Configuration.previewResampleSound.get(); this.mutable = mutable; depthStateUnderCursor = null; hilightedEdge = null; diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index 7fc6e10be..21962a2ac 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -6146,7 +6146,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se previewPanel.setImageReplaceButtonVisible(false, false, false, !((SoundTag) treeItem).isReadOnly() && ((SoundTag) treeItem).importSupported(), false, false, false); if (!(treeItem instanceof SoundStreamHeadTypeTag)) { try { - SoundTagPlayer soundThread = new SoundTagPlayer(null, (SoundTag) treeItem, Configuration.loopMedia.get() ? Integer.MAX_VALUE : 1, true, Configuration.previewResampleSound.get()); + SoundTagPlayer soundThread = new SoundTagPlayer(null, (SoundTag) treeItem, Configuration.loopMedia.get() ? Integer.MAX_VALUE : 1, true, false); // Configuration.previewResampleSound.get()); if (!Configuration.autoPlaySounds.get()) { soundThread.pause(); } diff --git a/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java b/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java index 05df888a5..14e2c6281 100644 --- a/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java +++ b/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java @@ -297,12 +297,12 @@ public class PlayerControls extends JPanel implements MediaDisplayListener { resampleButton.setToolTipText(AppStrings.translate("preview.resample")); resampleButton.setMargin(new Insets(4, 2, 2, 2)); resampleButton.addActionListener(this::resampleButtonActionPerformed); - resampleButton.setSelected(Configuration.previewResampleSound.get()); + resampleButton.setSelected(false); //Configuration.previewResampleSound.get()); buttonsPanel.add(pauseButton); buttonsPanel.add(stopButton); buttonsPanel.add(loopButton); - buttonsPanel.add(resampleButton); + //buttonsPanel.add(resampleButton); controlPanel.add(buttonsPanel, BorderLayout.CENTER); progress = new JProgressBar();