[CUETools.Codecs.FLACCL] Fix constructor

c72578 · c72578 · commit cef4ea93f65c · 2021-02-24T06:39:10.000+01:00
The constructor parameters of Activator.CreateInstance() were updated in CUETools.Processor\AudioReadWrite.cs as of commits 16fccfe and e1f8906. The parameter "settings" was added in front of path and IO, which required an update to the order of constructor parameters in several codecs. - Fixes the following error message, when using FLACCL codec: Exception: Constructor on type 'CUETools.Codecs.FLACCL.AudioEncoder' not found. - This is a follow-up commit to 18c6c1a - Resolves #82
diff --git a/CUETools.Codecs.FLACCL/FLACCLWriter.cs b/CUETools.Codecs.FLACCL/FLACCLWriter.cs
@@ -372,7 +372,7 @@ public class AudioEncoder : IAudioDest
 
         public const int MAX_BLOCKSIZE = 65536;
 
-        public AudioEncoder(string path, Stream IO, EncoderSettings settings)
+        public AudioEncoder(EncoderSettings settings, string path, Stream IO)
         {
             m_settings = settings.Clone() as EncoderSettings;
             m_settings.Validate();
@@ -396,11 +396,6 @@ public AudioEncoder(string path, Stream IO, EncoderSettings settings)
             crc8 = new Crc8();
         }
 
-        public AudioEncoder(string path, EncoderSettings settings)
-            : this(path, null, settings)
-        {
-        }
-
         public int TotalSize
         {
             get
diff --git a/CUETools.FLACCL.cmd/Program.cs b/CUETools.FLACCL.cmd/Program.cs
@@ -276,10 +276,9 @@ static int Main(string[] args)
 			{
                 if (device_type != null)
                     settings.DeviceType = (OpenCLDeviceType)(Enum.Parse(typeof(OpenCLDeviceType), device_type, true));
-                encoder = new Codecs.FLACCL.AudioEncoder((output_file == "-" || output_file == "nul") ? "" : output_file,
+                encoder = new Codecs.FLACCL.AudioEncoder(settings, (output_file == "-" || output_file == "nul") ? "" : output_file,
                     output_file == "-" ? Console.OpenStandardOutput() :
-                    output_file == "nul" ? new NullStream() : null,
-                    settings);
+                    output_file == "nul" ? new NullStream() : null);
                 settings = encoder.Settings as Codecs.FLACCL.EncoderSettings;
                 encoder.FinalSampleCount = audioSource.Length;
 				if (stereo_method != null)

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ public class AudioEncoder : IAudioDest`
`372`	`372`
`373`	`373`	`public const int MAX_BLOCKSIZE = 65536;`
`374`	`374`
`375`		`- public AudioEncoder(string path, Stream IO, EncoderSettings settings)`
	`375`	`+ public AudioEncoder(EncoderSettings settings, string path, Stream IO)`
`376`	`376`	`{`
`377`	`377`	`m_settings = settings.Clone() as EncoderSettings;`
`378`	`378`	`m_settings.Validate();`
`@@ -396,11 +396,6 @@ public AudioEncoder(string path, Stream IO, EncoderSettings settings)`
`396`	`396`	`crc8 = new Crc8();`
`397`	`397`	`}`
`398`	`398`
`399`		`- public AudioEncoder(string path, EncoderSettings settings)`
`400`		`- : this(path, null, settings)`
`401`		`- {`
`402`		`- }`
`403`		`-`
`404`	`399`	`public int TotalSize`
`405`	`400`	`{`
`406`	`401`	`get`