Code cleanup; Reader classes renamed to Decoders, Writers to Encoders, every Decoder must have a corresponding Settings class now just like Encoders. UserDefinedEncoders renamed to CommandLineEncoders, etc.

2025-12-16 18:14:25 +00:00 · 2018-03-24 12:15:49 -04:00
parent ca8bb2fff6
commit e1f8906170
65 changed files with 1713 additions and 1798 deletions
--- a/CUETools.Codecs/ViewModel/AudioDecoderSettingsViewModel.cs
+++ b/CUETools.Codecs/ViewModel/AudioDecoderSettingsViewModel.cs
@@ -8,7 +8,7 @@ namespace CUETools.Codecs
    public class AudioDecoderSettingsViewModel : INotifyPropertyChanged
    {
        [JsonProperty]
-        public AudioDecoderSettings decoderSettings = null;
+        public AudioDecoderSettings Settings = null;

        public event PropertyChangedEventHandler PropertyChanged;

@@ -19,14 +19,7 @@ namespace CUETools.Codecs

        public AudioDecoderSettingsViewModel(AudioDecoderSettings settings)
        {
-            decoderSettings = settings;
-        }
-
-        public AudioDecoderSettingsViewModel Clone()
-        {
-            var res = this.MemberwiseClone() as AudioDecoderSettingsViewModel;
-            if (decoderSettings != null) res.decoderSettings = decoderSettings.Clone();
-            return res;
+            this.Settings = settings;
        }

        public override string ToString()
@@ -40,14 +33,14 @@ namespace CUETools.Codecs
        {
            get
            {
-                if (decoderSettings is CommandLine.DecoderSettings)
-                    return (decoderSettings as CommandLine.DecoderSettings).Path;
+                if (Settings is CommandLine.DecoderSettings)
+                    return (Settings as CommandLine.DecoderSettings).Path;
                return "";
            }
            set
            {
-                if (decoderSettings is CommandLine.DecoderSettings)
-                    (decoderSettings as CommandLine.DecoderSettings).Path = value;
+                if (Settings is CommandLine.DecoderSettings)
+                    (Settings as CommandLine.DecoderSettings).Path = value;
                else throw new InvalidOperationException();
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Path"));
            }
@@ -56,14 +49,14 @@ namespace CUETools.Codecs
        {
            get
            {
-                if (decoderSettings is CommandLine.DecoderSettings)
-                    return (decoderSettings as CommandLine.DecoderSettings).Parameters;
+                if (Settings is CommandLine.DecoderSettings)
+                    return (Settings as CommandLine.DecoderSettings).Parameters;
                return "";
            }
            set
            {
-                if (decoderSettings is CommandLine.DecoderSettings)
-                    (decoderSettings as CommandLine.DecoderSettings).Parameters = value;
+                if (Settings is CommandLine.DecoderSettings)
+                    (Settings as CommandLine.DecoderSettings).Parameters = value;
                else throw new InvalidOperationException();
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Parameters"));
            }
@@ -79,11 +72,11 @@ namespace CUETools.Codecs

        public string Name
        {
-            get => decoderSettings.Name;
+            get => Settings.Name;
            set
            {
-                if (decoderSettings is CommandLine.DecoderSettings)
-                    (decoderSettings as CommandLine.DecoderSettings).name = value;
+                if (Settings is CommandLine.DecoderSettings)
+                    (Settings as CommandLine.DecoderSettings).name = value;
                else throw new InvalidOperationException();
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Name"));
            }
@@ -91,11 +84,11 @@ namespace CUETools.Codecs

        public string Extension
        {
-            get => decoderSettings.Extension;
+            get => Settings.Extension;
            set
            {
-                if (decoderSettings is CommandLine.DecoderSettings)
-                    (decoderSettings as CommandLine.DecoderSettings).extension = value;
+                if (Settings is CommandLine.DecoderSettings)
+                    (Settings as CommandLine.DecoderSettings).extension = value;
                else throw new InvalidOperationException();
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Extension"));
            }
@@ -103,10 +96,10 @@ namespace CUETools.Codecs

        public string DotExtension => "." + Extension;

-        public bool CanBeDeleted => decoderSettings is CommandLine.DecoderSettings;
+        public bool CanBeDeleted => Settings is CommandLine.DecoderSettings;

        public bool IsValid =>
-               (decoderSettings != null)
-            && (decoderSettings is CommandLine.DecoderSettings ? (decoderSettings as CommandLine.DecoderSettings).Path != "" : true);
+               (Settings != null)
+            && (Settings is CommandLine.DecoderSettings ? (Settings as CommandLine.DecoderSettings).Path != "" : true);
    }
 }
--- a/CUETools.Codecs/ViewModel/AudioEncoderSettingsViewModel.cs
+++ b/CUETools.Codecs/ViewModel/AudioEncoderSettingsViewModel.cs
@@ -8,7 +8,7 @@ namespace CUETools.Codecs
    public class AudioEncoderSettingsViewModel : INotifyPropertyChanged
    {
        [JsonProperty]
-        public AudioEncoderSettings settings = null;
+        public AudioEncoderSettings Settings = null;

        public event PropertyChangedEventHandler PropertyChanged;

@@ -17,31 +17,9 @@ namespace CUETools.Codecs
        {
        }

-        public AudioEncoderSettingsViewModel(
-            string _name,
-            string _extension,
-            bool _lossless,
-            string _supported_modes,
-            string _default_mode,
-            string _path,
-            string _parameters
-            )
+        public AudioEncoderSettingsViewModel(AudioEncoderSettings settings)
        {
-            settings = new CommandLine.EncoderSettings() { name = _name, extension = _extension, SupportedModes = _supported_modes, EncoderMode = _default_mode, Path = _path, Parameters = _parameters, lossless = _lossless };
-        }
-
-        public AudioEncoderSettingsViewModel(AudioEncoderClassAttribute enc)
-        {
-            settings = Activator.CreateInstance(enc.Settings) as AudioEncoderSettings;
-            if (settings == null)
-                throw new InvalidOperationException("invalid codec");
-        }
-
-        public AudioEncoderSettingsViewModel Clone()
-        {
-            var res = this.MemberwiseClone() as AudioEncoderSettingsViewModel;
-            if (settings != null) res.settings = settings.Clone();
-            return res;
+            this.Settings = settings;
        }

        public override string ToString()
@@ -55,13 +33,13 @@ namespace CUETools.Codecs
        {
            get
            {
-                if (settings is CommandLine.EncoderSettings)
-                    return (settings as CommandLine.EncoderSettings).Path;
+                if (Settings is CommandLine.EncoderSettings)
+                    return (Settings as CommandLine.EncoderSettings).Path;
                return "";
            }
            set
            {
-                var settings = this.settings as CommandLine.EncoderSettings;
+                var settings = this.Settings as CommandLine.EncoderSettings;
                if (settings == null) throw new InvalidOperationException();
                settings.Path = value;
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Path"));
@@ -72,13 +50,13 @@ namespace CUETools.Codecs
        {
            get
            {
-                if (settings is CommandLine.EncoderSettings)
-                    return (settings as CommandLine.EncoderSettings).Parameters;
+                if (Settings is CommandLine.EncoderSettings)
+                    return (Settings as CommandLine.EncoderSettings).Parameters;
                return "";
            }
            set
            {
-                var settings = this.settings as CommandLine.EncoderSettings;
+                var settings = this.Settings as CommandLine.EncoderSettings;
                if (settings == null) throw new InvalidOperationException();
                settings.Parameters = value;
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Parameters"));
@@ -87,10 +65,10 @@ namespace CUETools.Codecs

        public bool Lossless
        {
-            get => settings.Lossless;
+            get => Settings.Lossless;
            set
            {
-                var settings = this.settings as CommandLine.EncoderSettings;
+                var settings = this.Settings as CommandLine.EncoderSettings;
                if (settings == null) throw new InvalidOperationException();
                settings.lossless = value;
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Lossless"));
@@ -100,10 +78,10 @@ namespace CUETools.Codecs
        
        public string Name
        {
-            get => settings.Name;
+            get => Settings.Name;
            set
            {
-                var settings = this.settings as CommandLine.EncoderSettings;
+                var settings = this.Settings as CommandLine.EncoderSettings;
                if (settings == null) throw new InvalidOperationException();
                settings.name = value;
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Name"));
@@ -112,10 +90,10 @@ namespace CUETools.Codecs

        public string Extension
        {
-            get => settings.Extension;
+            get => Settings.Extension;
            set
            {
-                var settings = this.settings as CommandLine.EncoderSettings;
+                var settings = this.Settings as CommandLine.EncoderSettings;
                if (settings == null) throw new InvalidOperationException();
                settings.extension = value;
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Extension"));
@@ -129,11 +107,11 @@ namespace CUETools.Codecs
            get
            {
                string defaultMode;
-                return this.settings.GetSupportedModes(out defaultMode);
+                return this.Settings.GetSupportedModes(out defaultMode);
            }
            set
            {
-                var settings = this.settings as CommandLine.EncoderSettings;
+                var settings = this.Settings as CommandLine.EncoderSettings;
                if (settings == null) throw new InvalidOperationException();
                settings.SupportedModes = value;
                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("SupportedModesStr"));
@@ -150,16 +128,16 @@ namespace CUETools.Codecs
                if (modes == null || modes.Length < 2)
                    return -1;
                for (int i = 0; i < modes.Length; i++)
-                    if (modes[i] == this.settings.EncoderMode)
+                    if (modes[i] == this.Settings.EncoderMode)
                        return i;
                return -1;
            }
        }

-        public bool CanBeDeleted => settings is CommandLine.EncoderSettings;
+        public bool CanBeDeleted => Settings is CommandLine.EncoderSettings;

        public bool IsValid =>
-               (settings != null)
-            && (settings is CommandLine.EncoderSettings ? (settings as CommandLine.EncoderSettings).Path != "" : true);
+               (Settings != null)
+            && (Settings is CommandLine.EncoderSettings ? (Settings as CommandLine.EncoderSettings).Path != "" : true);
    }
 }
--- a/CUETools.Codecs/ViewModel/DecoderListViewModel.cs
+++ b/CUETools.Codecs/ViewModel/DecoderListViewModel.cs
@@ -1,26 +1,33 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;

 namespace CUETools.Codecs
 {
    public class DecoderListViewModel : BindingList<AudioDecoderSettingsViewModel>
    {
-        public DecoderListViewModel()
+        private List<AudioDecoderSettings> model;
+
+        public DecoderListViewModel(List<AudioDecoderSettings> model)
            : base()
        {
+            this.model = model;
+            model.ForEach(item => Add(new AudioDecoderSettingsViewModel(item)));
            AddingNew += OnAddingNew;
        }

        private void OnAddingNew(object sender, AddingNewEventArgs e)
        {
-            e.NewObject = new AudioDecoderSettingsViewModel(new CommandLine.DecoderSettings("new", "wav", "", ""));
+            var item = new CommandLine.DecoderSettings("new", "wav", "", "");
+            model.Add(item);
+            e.NewObject = new AudioDecoderSettingsViewModel(item);
        }

        public bool TryGetValue(string extension, bool lossless, string name, out AudioDecoderSettingsViewModel result)
        {
            foreach (AudioDecoderSettingsViewModel udc in this)
            {
-                if (udc.decoderSettings.Extension == extension && udc.decoderSettings.Lossless == lossless && udc.decoderSettings.Name == name)
+                if (udc.Settings.Extension == extension && udc.Settings.Lossless == lossless && udc.Settings.Name == name)
                {
                    result = udc;
                    return true;
@@ -35,7 +42,7 @@ namespace CUETools.Codecs
            AudioDecoderSettingsViewModel result = null;
            foreach (AudioDecoderSettingsViewModel udc in this)
            {
-                if (udc.decoderSettings.Extension == extension && udc.decoderSettings.Lossless == lossless && (result == null || result.decoderSettings.Priority < udc.decoderSettings.Priority))
+                if (udc.Settings.Extension == extension && udc.Settings.Lossless == lossless && (result == null || result.Settings.Priority < udc.Settings.Priority))
                {
                    result = udc;
                }
--- a/CUETools.Codecs/ViewModel/EncoderListViewModel.cs
+++ b/CUETools.Codecs/ViewModel/EncoderListViewModel.cs
@@ -1,19 +1,26 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;

 namespace CUETools.Codecs
 {
    public class EncoderListViewModel : BindingList<AudioEncoderSettingsViewModel>
    {
-        public EncoderListViewModel()
+        private List<AudioEncoderSettings> model;
+
+        public EncoderListViewModel(List<AudioEncoderSettings> model)
            : base()
        {
+            this.model = model;
+            model.ForEach(item => Add(new AudioEncoderSettingsViewModel(item)));
            AddingNew += OnAddingNew;
        }

        private void OnAddingNew(object sender, AddingNewEventArgs e)
        {
-            e.NewObject = new AudioEncoderSettingsViewModel("new", "wav", true, "", "", "", "");
+            var item = new CommandLine.EncoderSettings("new", "wav", true, "", "", "", "");
+            model.Add(item);
+            e.NewObject = new AudioEncoderSettingsViewModel(item);
        }

        public bool TryGetValue(string extension, bool lossless, string name, out AudioEncoderSettingsViewModel result)
@@ -21,7 +28,7 @@ namespace CUETools.Codecs
            //result = this.Where(udc => udc.settings.Extension == extension && udc.settings.Lossless == lossless && udc.settings.Name == name).First();
            foreach (AudioEncoderSettingsViewModel udc in this)
            {
-                if (udc.settings.Extension == extension && udc.settings.Lossless == lossless && udc.settings.Name == name)
+                if (udc.Settings.Extension == extension && udc.Settings.Lossless == lossless && udc.Settings.Name == name)
                {
                    result = udc;
                    return true;
@@ -36,7 +43,7 @@ namespace CUETools.Codecs
            AudioEncoderSettingsViewModel result = null;
            foreach (AudioEncoderSettingsViewModel udc in this)
            {
-                if (udc.settings.Extension == extension && udc.settings.Lossless == lossless && (result == null || result.settings.Priority < udc.settings.Priority))
+                if (udc.Settings.Extension == extension && udc.Settings.Lossless == lossless && (result == null || result.Settings.Priority < udc.Settings.Priority))
                {
                    result = udc;
                }