Tweak format names

libertyernie · Dec 21, 2021 · ad2a1e7 · ad2a1e7
1 parent 4eeda99
commit ad2a1e7
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 41 deletions.
diff --git 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<short> 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
@@ -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/OptionsForm.cs b/LoopingAudioConverter/OptionsForm.cs
@@ -60,32 +60,38 @@ public OptionsForm() {
 			hcaOptions = new HcaOptions();
 			adxOptions = new AdxOptions();
 
+			string effectEngineName = Program.BuildImporters()
+				.OfType<IEffectEngine>()
+				.Select(x => x.GetImporterName())
+				.DefaultIfEmpty("???")
+				.First();
+
 			var exporters = new[] {
-				new NVPair<ExporterType>(ExporterType.BRSTM, "BRSTM"),
-				new NVPair<ExporterType>(ExporterType.BCSTM, "BCSTM"),
-				new NVPair<ExporterType>(ExporterType.BFSTM, "BFSTM"),
-				new NVPair<ExporterType>(ExporterType.DSP, "DSP (Nintendo)"),
-				new NVPair<ExporterType>(ExporterType.IDSP, "IDSP (Nintendo)"),
-				new NVPair<ExporterType>(ExporterType.HPS, "HPS (HAL)"),
-				new NVPair<ExporterType>(ExporterType.ADX, "CRI ADX"),
-				new NVPair<ExporterType>(ExporterType.HCA, "CRI HCA"),
-				new NVPair<ExporterType>(ExporterType.BrawlLib_BRSTM_ADPCM, "BRSTM (ADPCM) [BrawlLib]"),
-				new NVPair<ExporterType>(ExporterType.BrawlLib_BRSTM_PCM16, "BRSTM (PCM16) [BrawlLib]"),
-				new NVPair<ExporterType>(ExporterType.BrawlLib_BCSTM, "BCSTM (ADPCM) [BrawlLib]"),
-				new NVPair<ExporterType>(ExporterType.BrawlLib_BFSTM, "BFSTM (ADPCM) [BrawlLib]"),
-				new NVPair<ExporterType>(ExporterType.BrawlLib_BRWAV, "BRWAV (ADPCM) [BrawlLib]"),
+				new NVPair<ExporterType>(ExporterType.BRSTM, "[VGAudio] BRSTM"),
+				new NVPair<ExporterType>(ExporterType.BCSTM, "[VGAudio] BCSTM"),
+				new NVPair<ExporterType>(ExporterType.BFSTM, "[VGAudio] BFSTM"),
+				new NVPair<ExporterType>(ExporterType.DSP, "[VGAudio] DSP (Nintendo)"),
+				new NVPair<ExporterType>(ExporterType.IDSP, "[VGAudio] IDSP (Nintendo)"),
+				new NVPair<ExporterType>(ExporterType.HPS, "[VGAudio] HPS (HAL)"),
+				new NVPair<ExporterType>(ExporterType.ADX, "[VGAudio] CRI ADX"),
+				new NVPair<ExporterType>(ExporterType.HCA, "[VGAudio] CRI HCA"),
+				new NVPair<ExporterType>(ExporterType.BrawlLib_BRSTM_ADPCM, "[BrawlLib] BRSTM (ADPCM)"),
+				new NVPair<ExporterType>(ExporterType.BrawlLib_BRSTM_PCM16, "[BrawlLib] BRSTM (PCM16)"),
+				new NVPair<ExporterType>(ExporterType.BrawlLib_BCSTM, "[BrawlLib] BCSTM (ADPCM)"),
+				new NVPair<ExporterType>(ExporterType.BrawlLib_BFSTM, "[BrawlLib] BFSTM (ADPCM)"),
+				new NVPair<ExporterType>(ExporterType.BrawlLib_BRWAV, "[BrawlLib] BRWAV (ADPCM)"),
 				new NVPair<ExporterType>(ExporterType.MSF_PCM16BE, "MSF (PCM16, big-endian)"),
 				new NVPair<ExporterType>(ExporterType.MSF_PCM16LE, "MSF (PCM16, little-endian)"),
 				new NVPair<ExporterType>(ExporterType.MSU1, "MSU-1"),
 				new NVPair<ExporterType>(ExporterType.WAV, "WAV"),
-				new NVPair<ExporterType>(ExporterType.FLAC, "FLAC"),
-				new NVPair<ExporterType>(ExporterType.FFmpeg_MP3, "MP3"),
-				new NVPair<ExporterType>(ExporterType.MP3, "MP3 [LAME]"),
-				new NVPair<ExporterType>(ExporterType.FFmpeg_AAC_M4A, "AAC (.m4a)"),
-				new NVPair<ExporterType>(ExporterType.AAC_M4A, "AAC (.m4a) [qaac]"),
-				new NVPair<ExporterType>(ExporterType.FFmpeg_AAC_ADTS, "AAC (ADTS .aac)"),
-				new NVPair<ExporterType>(ExporterType.AAC_ADTS, "AAC (ADTS .aac) [qaac]"),
-				new NVPair<ExporterType>(ExporterType.OggVorbis, "Vorbis (.ogg)"),
+				new NVPair<ExporterType>(ExporterType.FLAC, $"[{effectEngineName}] FLAC"),
+				new NVPair<ExporterType>(ExporterType.FFmpeg_MP3, $"[{effectEngineName}] MP3"),
+				new NVPair<ExporterType>(ExporterType.FFmpeg_AAC_M4A, $"[{effectEngineName}] AAC (.m4a)"),
+				new NVPair<ExporterType>(ExporterType.FFmpeg_AAC_ADTS, $"[{effectEngineName}] AAC (ADTS .aac)"),
+				new NVPair<ExporterType>(ExporterType.OggVorbis, $"[{effectEngineName}] Vorbis (.ogg)"),
+				new NVPair<ExporterType>(ExporterType.MP3, "[LAME] MP3"),
+				new NVPair<ExporterType>(ExporterType.AAC_M4A, "[qaac] AAC (.m4a)"),
+				new NVPair<ExporterType>(ExporterType.AAC_ADTS, "[qaac] AAC (ADTS .aac)"),
 			};
 			comboBox1.DataSource = exporters;
 			if (comboBox1.SelectedIndex < 0) comboBox1.SelectedIndex = 0;

diff --git a/LoopingAudioConverter/Program.cs b/LoopingAudioConverter/Program.cs
@@ -51,6 +51,24 @@ static void Main(string[] args) {
 			}
 		}
 
+		public static IEnumerable<IAudioImporter> 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);
+		}
+
 		/// <summary>
 		/// Runs a batch conversion process.
 		/// </summary>
@@ -61,25 +79,7 @@ public static async Task RunAsync(Options o, bool showEndDialog = true, IWin32Wi
 					"Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 			}
 
-			IEnumerable <IAudioImporter> 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<IAudioImporter> importers = buildImporters().ToList();
+			List<IAudioImporter> importers = BuildImporters().ToList();
 
 			IEffectEngine effectEngine = importers.OfType<IEffectEngine>().FirstOrDefault() ?? throw new AudioImporterException("Could not find either ffmpeg or SoX - please specify ffmpeg_path or sox_path in .config file");