From f295fddd788346bee58d6955aabac8faea5e9371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 22 Sep 2024 14:42:47 +0200 Subject: [PATCH] Fixed: #2290 FLA export - not generating sound bin files causing sound compression setting to be ignored --- CHANGELOG.md | 2 ++ .../src/com/jpexs/decompiler/flash/xfl/XFLConverter.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdd847682..27df5bed1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. - [#2304] GFX files truncated - [#2297] AS1/2/3 direct editation - if..else clause broken when using continue/break - [#2291] AS1/2 Incorrect var keyword placement causing registers to compile wrong +- [#2290] FLA export - not generating sound bin files causing sound compression setting to be ignored ## [21.0.5] - 2024-09-05 ### Fixed @@ -3563,6 +3564,7 @@ Major version of SWF to XML export changed to 2. [#2304]: https://www.free-decompiler.com/flash/issues/2304 [#2297]: https://www.free-decompiler.com/flash/issues/2297 [#2291]: https://www.free-decompiler.com/flash/issues/2291 +[#2290]: https://www.free-decompiler.com/flash/issues/2290 [#2293]: https://www.free-decompiler.com/flash/issues/2293 [#2294]: https://www.free-decompiler.com/flash/issues/2294 [#2299]: https://www.free-decompiler.com/flash/issues/2299 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index c32450ed8..bfd363e80 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -1915,7 +1915,7 @@ public class XFLConverter { SoundTag st = (SoundTag) symbol; byte[] data = SWFInputStream.BYTE_ARRAY_EMPTY; try { - data = new SoundExporter().exportSound(st, convertMp3ToWav ? SoundExportMode.WAV : SoundExportMode.MP3_WAV, true); + data = new SoundExporter().exportSound(st, convertMp3ToWav ? SoundExportMode.WAV : SoundExportMode.MP3_WAV, false); } catch (IOException ex) { logger.log(Level.SEVERE, null, ex); } @@ -1931,7 +1931,7 @@ public class XFLConverter { } String datFileName = null; - if (convertMp3ToWav && decodedData != null) { + if (decodedData != null) { long ts = getTimestamp(swf); datFileName = "M " + (datfiles.size() + 1) + " " + ts + ".dat"; datfiles.put(datFileName, decodedData);