- .wav
+ | .wav
.lwav |
- WAVE |
+ RIFF WAVE |
16-bit PCM (little endian) |
LoopingAudioConverter |
✓ |
- .bfstm
+ | .bfstm
.bcstm
.brstm |
BFSTM
BCSTM
BRSTM |
ADPCM (Nintendo)
- 16-bit PCM (big endian)
- 16-bit PCM (little endian)
+ 16-bit PCM
8-bit PCM |
- VGAudio |
+ VGAudio |
✓ |
- | .dsp |
+ .dsp |
DSP (Nintendo) |
- ADPCM (Nintendo) |
- VGAudio |
+ ADPCM (Nintendo) |
✓ |
- | .idsp |
+ .idsp |
DSP (Nintendo) (interleaved) |
- ADPCM (Nintendo) |
- VGAudio |
✓ |
- | .hps |
+ .hps |
HPS (HAL) |
- ADPCM (Nintendo) |
- VGAudio |
✓ |
- | .adx |
+ .adx |
CRI ADX |
- VGAudio |
✓ |
- | .hca |
+ .hca |
CRI HCA |
- VGAudio |
✓ |
- | .mp3 |
+ .brstm
+ |
+ BRSTM
+ |
+ ADPCM (Nintendo)
+ 16-bit PCM (big endian)
+ |
+ BrawlLib
+ |
+ ✓ |
+
+
+ .bcstm
+ |
+ BCSTM
+ |
+ ADPCM (Nintendo) |
+ ✓ |
+
+
+ .bfstm
+ |
+ BFSTM
+ |
+ ✓ |
+
+
+ .brwav
+ |
+ BRWAV
+ |
+ ✓ |
+
+
+ | .mp3 |
MP3 |
lame |
|
- | .aac |
+ .aac |
AAC |
- AAC |
- qaac |
+ AAC |
+ qaac |
|
- | .m4a |
+ .m4a |
MP4 |
- AAC |
- qaac |
|
- | .pcm |
+ .pcm |
MSU-1 |
16-bit PCM (little endian) |
LoopingAudioConverter |
✓ |
- | .msf |
+ .msf |
MSF (PlayStation 3) |
16-bit PCM (big endian)
16-bit PCM (little endian) |
@@ -299,17 +320,17 @@ Looping Audio Converter 2.4
✓ |
- | .ogg |
+ .ogg |
Ogg |
Vorbis |
- SoX + ffmpeg or SoX + VorbisCommentSharp |
✓ |
- | .flac |
+ .flac |
FLAC |
- SoX |
+ ffmpeg or SoX |
|
@@ -336,7 +357,11 @@ Looping Audio Converter 2.4
Only files ending with: This option will remove any
file not ending with the given extension from the list when you
click Filter. Useful after you use the "add folder" button to
- add all files in a folder, recursively.
+ add all files in a folder, recursively.
+ Input directory: Used in conjunction with the "Add
+ Folder" workflow; allows Looping Audio Converter to more
+ accurately mirror the structure of subdirectories under the
+ original input directory.
Output directory
@@ -376,13 +401,13 @@ Looping Audio Converter 2.4
non-looping (including VGM, BRSTM, etc.) or lack loop
information (MP3, usually WAV) will result in a non-looping
output.
- - Ask: The audio import dialog from BrawlBox will be
+
- Ask: The audio import dialog from BrawlCrate will be
shown for each input file without loop information after
decoding so you can specify your own loop point.
- Ask for all files: The audio import dialog from
- BrawlBox will be shown for all input files. For looping files,
- the loop point will be pre-populated.
+ BrawlCrate will be shown for all input files. For looping
+ files, the loop point will be pre-populated.
Channel export options
@@ -436,6 +461,9 @@ Looping Audio Converter 2.4
allows Looping Audio Converter to skip re-encoding audio in
certain circumstances:
+ -
+ A BrawlLib B*STM output format is used and the input format is also B*STM
+
-
A VGAudio output format is used and VGAudio also supports the input format
@@ -453,7 +481,7 @@ Looping Audio Converter 2.4
operation. The default value (recommended) is the number of
logical processor cores in your PC.
- Load Options and Save Options: These buttons
- allow you to load and save the options listed above to a .ini
+ allow you to load and save the options listed above to an .xml
file. If there is a file in the current directory named
LoopingAudioConverter.xml when the program starts, it will try
to load options from this file automatically.
diff --git a/LoopingAudioConverter/Exporters/BrawlLibRSTMExporter.cs b/LoopingAudioConverter/Exporters/BrawlLibRSTMExporter.cs
new file mode 100644
index 0000000..c769de6
--- /dev/null
+++ b/LoopingAudioConverter/Exporters/BrawlLibRSTMExporter.cs
@@ -0,0 +1,83 @@
+using BrawlLib.Internal.IO;
+using BrawlLib.Internal.Windows.Forms;
+using BrawlLib.SSBB.Types.Audio;
+using BrawlLib.Wii.Audio;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace LoopingAudioConverter {
+ public class BrawlLibRSTMExporter : IAudioExporter {
+ public enum Container { RSTM, CSTM, FSTM }
+
+ public class SilentProgressTracker : IProgressTracker {
+ public float MinValue { get; set; }
+ public float MaxValue { get; set; }
+ public float CurrentValue { get; set; }
+ public bool Cancelled { get; set; }
+
+ public void Begin(float min, float max, float current) { }
+
+ public void Cancel() => throw new NotImplementedException();
+
+ public void Finish() { }
+
+ public void Update(float value) { }
+ }
+
+ private readonly WaveEncoding _waveEncoding;
+ private readonly Container _container;
+
+ public BrawlLibRSTMExporter(WaveEncoding waveEncoding, Container container) {
+ _waveEncoding = waveEncoding;
+ _container = container;
+ }
+
+ private unsafe byte[] Encode(PCM16Audio lwav) {
+ using (var ms = new MemoryStream()) {
+ var wrapper = new PCM16LoopWrapper(lwav);
+
+ using (var fileMap = RSTMConverter.Encode(wrapper, new SilentProgressTracker(), _waveEncoding))
+ using (var inputStream = new UnmanagedMemoryStream((byte*)fileMap.Address.address, fileMap.Length)) {
+ inputStream.CopyTo(ms);
+ }
+
+ return ms.ToArray();
+ }
+ }
+
+ private byte[] Read(PCM16Audio lwav) {
+ string orig_path = lwav.OriginalPath?.ToLowerInvariant() ?? "";
+ if (orig_path.EndsWith(".brstm")) {
+ return File.ReadAllBytes(orig_path);
+ } else if (orig_path.EndsWith(".bcstm")) {
+ return CSTMConverter.ToRSTM(File.ReadAllBytes(orig_path));
+ } else if (orig_path.EndsWith(".bfstm")) {
+ return FSTMConverter.ToRSTM(File.ReadAllBytes(orig_path));
+ } else {
+ return Encode(lwav);
+ }
+ }
+
+ public void WriteFile(PCM16Audio lwav, string output_dir, string original_filename_no_ext) {
+ byte[] data = Read(lwav);
+ string ext = ".brstm";
+ if (_container == Container.CSTM) {
+ data = CSTMConverter.FromRSTM(data);
+ ext = ".bcstm";
+ }
+ if (_container == Container.FSTM) {
+ data = FSTMConverter.FromRSTM(data);
+ ext = ".bfstm";
+ }
+ File.WriteAllBytes(
+ Path.Combine(output_dir, original_filename_no_ext + ext),
+ data);
+ }
+
+ async Task IAudioExporter.WriteFileAsync(PCM16Audio lwav, string output_dir, string original_filename_no_ext) {
+ await Task.Yield();
+ await Task.Run(() => WriteFile(lwav, output_dir, original_filename_no_ext));
+ }
+ }
+}
diff --git a/LoopingAudioConverter/Exporters/BrawlLibRWAVExporter.cs b/LoopingAudioConverter/Exporters/BrawlLibRWAVExporter.cs
new file mode 100644
index 0000000..02fffd3
--- /dev/null
+++ b/LoopingAudioConverter/Exporters/BrawlLibRWAVExporter.cs
@@ -0,0 +1,22 @@
+using BrawlLib.Wii.Audio;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace LoopingAudioConverter {
+ public class BrawlLibRWAVExporter : IAudioExporter {
+ public unsafe void WriteFile(PCM16Audio lwav, string output_dir, string original_filename_no_ext) {
+ string outputPath = Path.Combine(output_dir, original_filename_no_ext + ".brwav");
+ var wrapper = new PCM16LoopWrapper(lwav);
+
+ using (var fileMap = RWAVConverter.Encode(wrapper, null))
+ using (var inputStream = new UnmanagedMemoryStream((byte*)fileMap.Address.address, fileMap.Length))
+ using (var outputStream = new FileStream(outputPath, FileMode.Create, FileAccess.Write)) {
+ inputStream.CopyTo(outputStream);
+ }
+ }
+
+ Task IAudioExporter.WriteFileAsync(PCM16Audio lwav, string output_dir, string original_filename_no_ext) {
+ return Task.Run(() => WriteFile(lwav, output_dir, original_filename_no_ext));
+ }
+ }
+}
diff --git a/LoopingAudioConverter/Exporters/MP3Exporter.cs b/LoopingAudioConverter/Exporters/MP3Exporter.cs
index 6af550e..16cc74e 100644
--- a/LoopingAudioConverter/Exporters/MP3Exporter.cs
+++ b/LoopingAudioConverter/Exporters/MP3Exporter.cs
@@ -1,4 +1,6 @@
-using RunProcessAsTask;
+using MSFContainerLib;
+using RunProcessAsTask;
+using System;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
@@ -19,6 +21,15 @@ public async Task WriteFileAsync(PCM16Audio lwav, string output_dir, string orig
throw new AudioExporterException("Invalid character (\") found in output filename");
}
+ if (Path.GetExtension(lwav.OriginalPath ?? "").Equals(".msf", StringComparison.InvariantCultureIgnoreCase)) {
+ byte[] data = File.ReadAllBytes(lwav.OriginalPath);
+ IPcmAudioSource msf = MSF.Parse(data);
+ if (msf is MSF_MP3 mp3) {
+ File.WriteAllBytes(outPath, mp3.Body);
+ return;
+ }
+ }
+
string infile = TempFiles.Create("wav");
File.WriteAllBytes(infile, lwav.Export());
diff --git a/LoopingAudioConverter/Interfaces.cs b/LoopingAudioConverter/Interfaces.cs
index ceaa92e..e09fa3c 100644
--- a/LoopingAudioConverter/Interfaces.cs
+++ b/LoopingAudioConverter/Interfaces.cs
@@ -21,6 +21,7 @@ public interface IRenderingAudioImporter : IAudioImporter {
}
public interface IEffectEngine {
+ string GetImporterName();
PCM16Audio ApplyEffects(PCM16Audio lwav, int channels = int.MaxValue, decimal db = 0, decimal amplitude = 1, int rate = int.MaxValue, decimal pitch_semitones = 0, decimal tempo_ratio = 1);
Task WriteFileAsync(PCM16Audio lwav, string output_filename, string encodingParameters);
}
diff --git a/LoopingAudioConverter/LoopingAudioConverter.csproj b/LoopingAudioConverter/LoopingAudioConverter.csproj
index 887ea77..157f88a 100644
--- a/LoopingAudioConverter/LoopingAudioConverter.csproj
+++ b/LoopingAudioConverter/LoopingAudioConverter.csproj
@@ -40,30 +40,17 @@
-
- true
- bin\Debug\
- DEBUG;TRACE
- true
- full
- AnyCPU
- prompt
- MinimumRecommendedRules.ruleset
-
-
- bin\Release\
- TRACE
- true
- true
- pdbonly
- AnyCPU
- prompt
- MinimumRecommendedRules.ruleset
-
+
+ False
+ ..\lib\BrawlLib.dll
+
..\packages\MP3Sharp.1.0.5\lib\netstandard2.0\MP3Sharp.dll
+
+ ..\lib\OpenTK.dll
+
..\packages\RunProcessAsTask.1.2.4\lib\net45\RunProcessAsTask.dll
@@ -82,6 +69,8 @@
+
+
@@ -187,10 +176,6 @@
-
- {41c94979-ce5a-4582-888a-1bee98dd43d3}
- BrawlLib.LoopSelection
-
{31bd3716-2d0b-49e4-a0e8-2c4e0add93f5}
MSFContainerLib
diff --git a/LoopingAudioConverter/Options.cs b/LoopingAudioConverter/Options.cs
index a34d470..3718c38 100644
--- a/LoopingAudioConverter/Options.cs
+++ b/LoopingAudioConverter/Options.cs
@@ -1,11 +1,7 @@
-using LoopingAudioConverter.VGAudioOptions;
-using System;
+using BrawlLib.SSBB.Types.Audio;
+using LoopingAudioConverter.VGAudioOptions;
using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
using System.Xml.Serialization;
-using VGAudio.Containers.NintendoWare;
namespace LoopingAudioConverter {
public enum ExporterType {
@@ -17,6 +13,11 @@ public enum ExporterType {
HPS,
HCA,
ADX,
+ BrawlLib_BRSTM_ADPCM,
+ BrawlLib_BRSTM_PCM16,
+ BrawlLib_BCSTM,
+ BrawlLib_BFSTM,
+ BrawlLib_BRWAV,
MSF_PCM16LE,
MSF_PCM16BE,
MSU1,
@@ -66,6 +67,7 @@ public class Options {
public AdxOptions AdxOptions { get; set; }
public HcaOptions HcaOptions { get; set; }
public BxstmOptions BxstmOptions { get; set; }
+ public WaveEncoding? WaveEncoding { get; set; }
public UnknownLoopBehavior UnknownLoopBehavior { get; set; }
public bool ExportWholeSong { get; set; }
public string WholeSongSuffix { get; set; }
diff --git a/LoopingAudioConverter/OptionsForm.Designer.cs b/LoopingAudioConverter/OptionsForm.Designer.cs
index 7f4ffd0..30fa30f 100644
--- a/LoopingAudioConverter/OptionsForm.Designer.cs
+++ b/LoopingAudioConverter/OptionsForm.Designer.cs
@@ -762,8 +762,6 @@ private void InitializeComponent() {
// chkShortCircuit
//
this.chkShortCircuit.AutoSize = true;
- this.chkShortCircuit.Checked = true;
- this.chkShortCircuit.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkShortCircuit.Location = new System.Drawing.Point(233, 192);
this.chkShortCircuit.Name = "chkShortCircuit";
this.chkShortCircuit.Size = new System.Drawing.Size(259, 17);
diff --git a/LoopingAudioConverter/OptionsForm.cs b/LoopingAudioConverter/OptionsForm.cs
index ab2c510..6f34275 100644
--- a/LoopingAudioConverter/OptionsForm.cs
+++ b/LoopingAudioConverter/OptionsForm.cs
@@ -1,4 +1,5 @@
-using LoopingAudioConverter.VGAudioOptions;
+using BrawlLib.SSBB.Types.Audio;
+using LoopingAudioConverter.VGAudioOptions;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -43,6 +44,8 @@ public string
private AdxOptions adxOptions = new AdxOptions();
private BxstmOptions bxstmOptions = new BxstmOptions();
+ private WaveEncoding waveEncoding = 0;
+
public IEnumerable RunningTasks {
get {
return runningTasks;
@@ -57,27 +60,38 @@ public OptionsForm() {
hcaOptions = new HcaOptions();
adxOptions = new AdxOptions();
+ string effectEngineName = Program.BuildImporters()
+ .OfType()
+ .Select(x => x.GetImporterName())
+ .DefaultIfEmpty("???")
+ .First();
+
var exporters = new[] {
- new NVPair(ExporterType.BRSTM, "BRSTM"),
- new NVPair(ExporterType.BCSTM, "BCSTM"),
- new NVPair(ExporterType.BFSTM, "BFSTM"),
- new NVPair(ExporterType.DSP, "DSP (Nintendo)"),
- new NVPair(ExporterType.IDSP, "IDSP (Nintendo)"),
- new NVPair(ExporterType.HPS, "HPS (HAL)"),
- new NVPair(ExporterType.ADX, "CRI ADX"),
- new NVPair(ExporterType.HCA, "CRI HCA"),
+ new NVPair(ExporterType.BRSTM, "[VGAudio] BRSTM"),
+ new NVPair(ExporterType.BCSTM, "[VGAudio] BCSTM"),
+ new NVPair(ExporterType.BFSTM, "[VGAudio] BFSTM"),
+ new NVPair(ExporterType.DSP, "[VGAudio] DSP (Nintendo)"),
+ new NVPair(ExporterType.IDSP, "[VGAudio] IDSP (Nintendo)"),
+ new NVPair(ExporterType.HPS, "[VGAudio] HPS (HAL)"),
+ new NVPair(ExporterType.ADX, "[VGAudio] CRI ADX"),
+ new NVPair(ExporterType.HCA, "[VGAudio] CRI HCA"),
+ new NVPair(ExporterType.BrawlLib_BRSTM_ADPCM, "[BrawlLib] BRSTM (ADPCM)"),
+ new NVPair(ExporterType.BrawlLib_BRSTM_PCM16, "[BrawlLib] BRSTM (PCM16)"),
+ new NVPair(ExporterType.BrawlLib_BCSTM, "[BrawlLib] BCSTM (ADPCM)"),
+ new NVPair(ExporterType.BrawlLib_BFSTM, "[BrawlLib] BFSTM (ADPCM)"),
+ new NVPair(ExporterType.BrawlLib_BRWAV, "[BrawlLib] BRWAV (ADPCM)"),
new NVPair(ExporterType.MSF_PCM16BE, "MSF (PCM16, big-endian)"),
new NVPair(ExporterType.MSF_PCM16LE, "MSF (PCM16, little-endian)"),
new NVPair(ExporterType.MSU1, "MSU-1"),
new NVPair(ExporterType.WAV, "WAV"),
- new NVPair(ExporterType.FLAC, "FLAC"),
- new NVPair(ExporterType.FFmpeg_MP3, "MP3"),
- new NVPair(ExporterType.MP3, "MP3 [LAME]"),
- new NVPair(ExporterType.FFmpeg_AAC_M4A, "AAC (.m4a)"),
- new NVPair(ExporterType.AAC_M4A, "AAC (.m4a) [qaac]"),
- new NVPair(ExporterType.FFmpeg_AAC_ADTS, "AAC (ADTS .aac)"),
- new NVPair(ExporterType.AAC_ADTS, "AAC (ADTS .aac) [qaac]"),
- new NVPair(ExporterType.OggVorbis, "Vorbis (.ogg)"),
+ new NVPair(ExporterType.FLAC, $"[{effectEngineName}] FLAC"),
+ new NVPair(ExporterType.FFmpeg_MP3, $"[{effectEngineName}] MP3"),
+ new NVPair(ExporterType.FFmpeg_AAC_M4A, $"[{effectEngineName}] AAC (.m4a)"),
+ new NVPair(ExporterType.FFmpeg_AAC_ADTS, $"[{effectEngineName}] AAC (ADTS .aac)"),
+ new NVPair(ExporterType.OggVorbis, $"[{effectEngineName}] Vorbis (.ogg)"),
+ new NVPair(ExporterType.MP3, "[LAME] MP3"),
+ new NVPair(ExporterType.AAC_M4A, "[qaac] AAC (.m4a)"),
+ new NVPair(ExporterType.AAC_ADTS, "[qaac] AAC (ADTS .aac)"),
};
comboBox1.DataSource = exporters;
if (comboBox1.SelectedIndex < 0) comboBox1.SelectedIndex = 0;
@@ -172,6 +186,7 @@ public void LoadOptions(string filename) {
hcaOptions = o.HcaOptions ?? new HcaOptions();
adxOptions = o.AdxOptions ?? new AdxOptions();
bxstmOptions = o.BxstmOptions ?? new BxstmOptions();
+ waveEncoding = o.WaveEncoding ?? WaveEncoding.ADPCM;
ddlUnknownLoopBehavior.SelectedValue = o.UnknownLoopBehavior;
chk0End.Checked = o.ExportWholeSong;
txt0EndFilenamePattern.Text = o.WholeSongSuffix;
@@ -215,6 +230,7 @@ public Options GetOptions() {
HcaOptions = hcaOptions,
AdxOptions = adxOptions,
BxstmOptions = bxstmOptions,
+ WaveEncoding = waveEncoding,
UnknownLoopBehavior = (UnknownLoopBehavior)ddlUnknownLoopBehavior.SelectedValue,
ExportWholeSong = chk0End.Checked,
WholeSongSuffix = txt0EndFilenamePattern.Text,
diff --git a/LoopingAudioConverter/PCM16LoopWrapper.cs b/LoopingAudioConverter/PCM16LoopWrapper.cs
index 137d322..f799ab1 100644
--- a/LoopingAudioConverter/PCM16LoopWrapper.cs
+++ b/LoopingAudioConverter/PCM16LoopWrapper.cs
@@ -1,4 +1,5 @@
-using BrawlLib.LoopSelection;
+using BrawlLib.Internal;
+using BrawlLib.Internal.Audio;
using System;
using System.Runtime.InteropServices;
@@ -7,8 +8,8 @@ namespace LoopingAudioConverter {
/// A wrapper for PCM16Audio to conform to BrawlLib's IAudioStream interface.
/// IAudioStream maintains a "current position" in the audio stream, while PCM16Audio does not, so this class handles SamplePosition, Wrap, and ReadSamples.
///
- class PCM16LoopWrapper : IAudioStream {
- private PCM16Audio lwav;
+ public class PCM16LoopWrapper : IAudioStream {
+ private readonly PCM16Audio lwav;
public PCM16LoopWrapper(PCM16Audio lwav) {
this.lwav = lwav;
@@ -56,6 +57,8 @@ public int ReadSamples(IntPtr destAddr, int numSamples) {
return numSamples;
}
+ unsafe int IAudioStream.ReadSamples(VoidPtr destAddr, int numSamples) => ReadSamples(destAddr, numSamples);
+
public int SamplePosition { get; set; }
public int Samples => lwav.Samples.Length / lwav.Channels;
diff --git a/LoopingAudioConverter/Program.cs b/LoopingAudioConverter/Program.cs
index 933495a..b606283 100644
--- a/LoopingAudioConverter/Program.cs
+++ b/LoopingAudioConverter/Program.cs
@@ -1,4 +1,5 @@
-using BrawlLib.LoopSelection;
+using BrawlLib.Internal.Windows.Forms;
+using BrawlLib.SSBB.Types.Audio;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -50,6 +51,24 @@ static void Main(string[] args) {
}
}
+ public static IEnumerable BuildImporters() {
+ yield return new WAVImporter();
+ yield return new VGAudioImporter();
+ yield return new MP3Importer();
+ if (ConfigurationManager.AppSettings["faad_path"] is string faad_path)
+ yield return new MP4Importer(faad_path);
+ if (ConfigurationManager.AppSettings["vgmplay_path"] is string vgmplay_path)
+ yield return new VGMImporter(vgmplay_path);
+ yield return new MSU1();
+ yield return new MSFImporter();
+ if (ConfigurationManager.AppSettings["vgmstream_path"] is string vgmstream_path)
+ yield return new VGMStreamImporter(vgmstream_path);
+ if (ConfigurationManager.AppSettings["ffmpeg_path"] is string ffmpeg_path)
+ yield return new FFmpeg(ffmpeg_path);
+ if (ConfigurationManager.AppSettings["sox_path"] is string sox_path)
+ yield return new SoX(sox_path);
+ }
+
///
/// Runs a batch conversion process.
///
@@ -60,25 +79,7 @@ public static async Task RunAsync(Options o, bool showEndDialog = true, IWin32Wi
"Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
- IEnumerable buildImporters() {
- yield return new WAVImporter();
- yield return new VGAudioImporter();
- yield return new MP3Importer();
- if (ConfigurationManager.AppSettings["faad_path"] is string faad_path)
- yield return new MP4Importer(faad_path);
- if (ConfigurationManager.AppSettings["vgmplay_path"] is string vgmplay_path)
- yield return new VGMImporter(vgmplay_path);
- yield return new MSU1();
- yield return new MSFImporter();
- if (ConfigurationManager.AppSettings["vgmstream_path"] is string vgmstream_path)
- yield return new VGMStreamImporter(vgmstream_path);
- if (ConfigurationManager.AppSettings["ffmpeg_path"] is string ffmpeg_path)
- yield return new FFmpeg(ffmpeg_path);
- if (ConfigurationManager.AppSettings["sox_path"] is string sox_path)
- yield return new SoX(sox_path);
- }
-
- List importers = buildImporters().ToList();
+ List importers = BuildImporters().ToList();
IEffectEngine effectEngine = importers.OfType().FirstOrDefault() ?? throw new AudioImporterException("Could not find either ffmpeg or SoX - please specify ffmpeg_path or sox_path in .config file");
@@ -100,6 +101,16 @@ IAudioExporter getExporter() {
return new HCAExporter(o.HcaOptions?.Configuration);
case ExporterType.ADX:
return new ADXExporter(o.AdxOptions?.Configuration);
+ case ExporterType.BrawlLib_BRSTM_ADPCM:
+ return new BrawlLibRSTMExporter(WaveEncoding.ADPCM, BrawlLibRSTMExporter.Container.RSTM);
+ case ExporterType.BrawlLib_BRSTM_PCM16:
+ return new BrawlLibRSTMExporter(WaveEncoding.PCM16, BrawlLibRSTMExporter.Container.RSTM);
+ case ExporterType.BrawlLib_BCSTM:
+ return new BrawlLibRSTMExporter(WaveEncoding.ADPCM, BrawlLibRSTMExporter.Container.CSTM);
+ case ExporterType.BrawlLib_BFSTM:
+ return new BrawlLibRSTMExporter(WaveEncoding.ADPCM, BrawlLibRSTMExporter.Container.FSTM);
+ case ExporterType.BrawlLib_BRWAV:
+ return new BrawlLibRWAVExporter();
case ExporterType.MSF_PCM16BE:
return new MSFPCM16Exporter(big_endian: true);
case ExporterType.MSF_PCM16LE:
diff --git a/LoopingAudioConverter/Properties/AssemblyInfo.cs b/LoopingAudioConverter/Properties/AssemblyInfo.cs
index ed3e469..8fbcb7c 100644
--- a/LoopingAudioConverter/Properties/AssemblyInfo.cs
+++ b/LoopingAudioConverter/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("LoopingAudioConverter")]
-[assembly: AssemblyCopyright("Copyright © 2020 libertyernie")]
+[assembly: AssemblyCopyright("Copyright © 2021 libertyernie")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.5.0.0")]
diff --git a/lib/BrawlLib.dll b/lib/BrawlLib.dll
new file mode 100644
index 0000000..28c5811
Binary files /dev/null and b/lib/BrawlLib.dll differ
diff --git a/lib/OpenTK.dll b/lib/OpenTK.dll
new file mode 100644
index 0000000..afff0dd
Binary files /dev/null and b/lib/OpenTK.dll differ
diff --git a/lib/OpenTK.dll.config b/lib/OpenTK.dll.config
new file mode 100644
index 0000000..2d48c0e
--- /dev/null
+++ b/lib/OpenTK.dll.config
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file