LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-23 14:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added #1917 Better error message for sound import on unsupported sampling rate

Browse Source
This commit is contained in:
Jindra Petřík
2022-12-25 11:40:25 +01:00
parent 87f4baf554
commit 1bdc9d5218
9 changed files with 113 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
View File

@@ -222,6 +222,8 @@ import com.jpexs.decompiler.flash.gui.translator.Translator;
import com.jpexs.decompiler.flash.importers.SymbolClassImporter;
import com.jpexs.decompiler.flash.tags.base.HasSeparateAlphaChannel;
import com.jpexs.decompiler.flash.tags.base.RenderContext;
import com.jpexs.decompiler.flash.tags.base.SoundImportException;
import com.jpexs.decompiler.flash.tags.base.UnsupportedSamplingRateException;
import com.jpexs.decompiler.flash.timeline.Timeline;
import com.jpexs.helpers.SerializableImage;
import gnu.jpdf.PDFGraphics;
@@ -3185,7 +3187,21 @@ public class CommandLineArgumentParser {
if (repFile.toLowerCase(Locale.ENGLISH).endsWith(".mp3")) {
soundFormat = SoundFormat.FORMAT_MP3;
}
boolean ok = st.setSound(new ByteArrayInputStream(data), soundFormat);
boolean ok = false;
try {
ok = st.setSound(new ByteArrayInputStream(data), soundFormat);
} catch (UnsupportedSamplingRateException usre) {
List<String> supportedRatesStr = new ArrayList<>();
for (int i : usre.getSupportedRates()) {
supportedRatesStr.add("" + i);
}
System.err.println("Import FAILED. Input file has unsupported sampling rate ("+usre.getSoundRate()+"). Supported rates for this sound format: "+String.join(", ", supportedRatesStr)+".");
System.exit(2);
} catch (SoundImportException sie) {
ok = false;
}
if (!ok) {
System.err.println("Import FAILED. Maybe unsuppoted media type? Only MP3 and uncompressed WAV are available.");
System.exit(1);