Add a way to pass arbitrary extra options to MultiDumper

Author: maxim-zhao

LibSidWiz/MultiDumperWrapper.cs

@@ -17,16 +17,18 @@ public class MultiDumperWrapper: IDisposable
         private readonly int _loopCount;
         private readonly int _fadeMs;
         private readonly int _gapMs;
+        private readonly string _extraOptions;
         private ProcessWrapper _processWrapper;
         private readonly HashSet<string> _allowedParameters;
 
-        public MultiDumperWrapper(string multiDumperPath, int samplingRate, int loopCount, int fadeMs, int gapMs)
+        public MultiDumperWrapper(string multiDumperPath, int samplingRate, int loopCount, int fadeMs, int gapMs, string extraOptions)
         {
             _multiDumperPath = multiDumperPath;
             _samplingRate = samplingRate;
             _loopCount = loopCount;
             _fadeMs = fadeMs;
             _gapMs = gapMs;
+            _extraOptions = extraOptions;
 
             // We parse the usage info first to check for allowed parameters
             var helpText = GetOutputText("", true);
@@ -201,6 +203,11 @@ public IEnumerable<string> Dump(Song song, Action<double> onProgress)
                 AddArgIfSupported(args, "play_length", (long)song.ForceLength.TotalMilliseconds);
             }
 
+            if (!string.IsNullOrEmpty(_extraOptions))
+            {
+                args.Append($" {_extraOptions}");
+            }
+
             _processWrapper = new ProcessWrapper(
                 _multiDumperPath,
                 args.ToString());

SidWiz/MultiDumperForm.cs

@@ -14,10 +14,10 @@ public partial class MultiDumperForm : Form
 
         public IEnumerable<string> Filenames { get; private set; }
 
-        public MultiDumperForm(string filename, string multiDumperPath, int samplingRate, int loopCount, int fadeMs, int gapMs)
+        public MultiDumperForm(string filename, string multiDumperPath, int samplingRate, int loopCount, int fadeMs, int gapMs, string extraOptions)
         {
             _filename = filename;
-            _wrapper = new MultiDumperWrapper(multiDumperPath, samplingRate, loopCount, fadeMs, gapMs);
+            _wrapper = new MultiDumperWrapper(multiDumperPath, samplingRate, loopCount, fadeMs, gapMs, extraOptions);
             InitializeComponent();
         }
 

SidWiz/SidWizPlusGUI.cs

@@ -63,6 +63,11 @@ public class ProgramSettings
             [Description("Default is 1000 (1s). Requires a build of MultiDumper that supports this!")]
             [DefaultValue(1000)]
             public int MultiDumperGapMs { get; set; } = 1000;
+            [Category("MultiDumper")]
+            [DisplayName("Extra settings")]
+            [Description("Extra settings to pass to MultiDumper")]
+            [DefaultValue("")]
+            public string MultiDumperExtraSettings { get; set; } = "";
 
             [Category("SidPlay")]
             [Editor(typeof(FileNameEditor), typeof(UITypeEditor))]
@@ -377,7 +382,7 @@ private void LoadMultiDumper(string filename)
                 // Normalize path
                 filename = Path.GetFullPath(filename);
 
-                using var form = new MultiDumperForm(filename, _programSettings.MultiDumperPath, _programSettings.MultiDumperSamplingRate, _programSettings.MultiDumperLoopCount, _programSettings.MultiDumperFadeMs, _programSettings.MultiDumperGapMs);
+                using var form = new MultiDumperForm(filename, _programSettings.MultiDumperPath, _programSettings.MultiDumperSamplingRate, _programSettings.MultiDumperLoopCount, _programSettings.MultiDumperFadeMs, _programSettings.MultiDumperGapMs, _programSettings.MultiDumperExtraSettings);
                 if (form.ShowDialog(this) != DialogResult.OK || form.Filenames == null)
                 {
                     return;

SidWizPlus/Program.cs

@@ -165,6 +165,11 @@ private class Settings
             // ReSharper disable once IdentifierTypo
             public int MultidumperGapMs { get; set; }
 
+            // ReSharper disable once StringLiteralTypo
+            [Option("multidumperoptions", Required = false, HelpText = "Extra arguments for MultiDumper. Surround value with quotes and start with a space, e.g. \" --default_filter\", to avoid conflicts with other parameters.", Default = "")]
+            // ReSharper disable once IdentifierTypo
+            public string MultidumperOptions { get; set; }
+
             // ReSharper disable once StringLiteralTypo
             [Option("backgroundcolor", Required = false, HelpText = "Background color, can be hex or a .net color name", Default = "black")]
             public string BackgroundColor { get; set; }
@@ -659,7 +664,8 @@ private static void RunMultiDumper(Settings settings)
                     settings.MultidumperSamplingRate, 
                     settings.MultidumperLoopCount, 
                     settings.MultidumperFadeOutMs,
-                    settings.MultidumperGapMs);
+                    settings.MultidumperGapMs,
+                    settings.MultidumperOptions);
                 var song = wrapper.GetSongs(settings.VgmFile).First();
                 var filenames = wrapper.Dump(song, d => Console.Write($"\r{d:P0}"));
                 settings.InputFiles = filenames.ToList();