WinGui: Some further work removing duplicate models, updating the libscan/encode services, fixes to the EnumHelper

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4215 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 19 insertions, 95 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs
deleted file mode 100644
index 6dfff1076..000000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  AudioEncoder.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

-

-namespace HandBrake.ApplicationServices.Model.Encoding

-{

-    using System.ComponentModel;

-

-    using HandBrake.ApplicationServices.Converters;

-

-    [TypeConverter(typeof(EnumToDescConveter))]

-    public enum AudioEncoder

-    {

-        [Description("AAC (faac)")]

-        Faac = 0,

-

-        [Description("AAC (ffmpeg)")]

-        ffaac,

-

-        [Description("MP3 (lame)")]

-        Lame,

-

-        [Description("AC3 (ffmpeg)")]

-        Ac3,

-

-        [Description("Passthru")]

-        Passthrough,

-

-        [Description("AC3 Passthru")]

-        Ac3Passthrough,

-

-        [Description("DTS Passthru")]

-        DtsPassthrough,

-

-        [Description("DTS-HD Passthru")]

-        DtsHDPassthrough,

-

-        [Description("AAC Passthru")]

-        AacPassthru,

-

-        [Description("MP3 Passthru")]

-        Mp3Passthru,

-

-        [Description("Vorbis (vorbis)")]

-        Vorbis

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
index a6e83735b..6fcc57e2a 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
@@ -9,6 +9,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding
     using System.ComponentModel;

 

     using HandBrake.ApplicationServices.Parsing;

+    using HandBrake.Interop.Model.Encoding;

 

     /// <summary>

     /// An Audio Track for the Audio Panel

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs
deleted file mode 100644
index d2e13e52e..000000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/Mixdown.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Mixdown.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

-

-namespace HandBrake.ApplicationServices.Model.Encoding

-{

-    using System.ComponentModel;

-

-    using HandBrake.ApplicationServices.Converters;

-

-    /// <summary>

-    /// The Mixdown Mode

-    /// </summary>

-    [TypeConverter(typeof(EnumToDescConveter))]

-    public enum Mixdown

-    {

-        [Description("Dolby Pro Logic II")]

-        DolbyProLogicII = 0,

-

-        [Description("Auto")]

-        Auto,

-

-        [Description("Mono")]

-        Mono,

-

-        [Description("Stereo")]

-        Stereo,

-

-        [Description("Dolby Surround")]

-        DolbySurround,

-

-        [Description("6 Channel Discrete")]

-        SixChannelDiscrete,

-

-        [Description("Passthru")]

-        Passthrough,

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
index cee9ad36f..245a3171d 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
@@ -5,18 +5,17 @@
 

 namespace HandBrake.ApplicationServices.Model

 {

-    using System;

+    using HandBrake.ApplicationServices.Utilities;

 

     /// <summary>

     /// The QueueTask.

     /// </summary>

     public class QueueTask

     {

-        /*

-         * TODO

-         * - Update the Query property to generate the query from the EncodeTask object.

-         * - Remove Sourcee, Destination and Title when they are no longer used.

-         */

+        /// <summary>

+        /// The Encode task backing field.

+        /// </summary>

+        private EncodeTask task;

 

         /// <summary>

         /// Initializes a new instance of the <see cref="QueueTask"/> class.

@@ -72,9 +71,20 @@ namespace HandBrake.ApplicationServices.Model
         public QueueItemStatus Status { get; set; }

 

         /// <summary>

-        /// Gets or sets the Encode Task.

+        /// Gets the Encode Task.

         /// </summary>

-        public EncodeTask Task { get; set; }

+        public EncodeTask Task

+        {

+            get

+            {

+                if (this.task == null)

+                {

+                    task = QueryParserUtility.Parse(this.Query);

+                }

+

+                return this.task;

+            }

+        }

 

         /// <summary>

         /// Gets a value indicating whether or not this instance is empty.