WinGui: Some fixes to the Queue Current encoding information display and removal of another duplicate model.

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

1 files changed, 11 insertions, 5 deletions

diff --git a/win/CS/frmQueue.cs b/win/CS/frmQueue.cs
index 2d94d266c..6bc7081f5 100644
--- a/win/CS/frmQueue.cs
+++ b/win/CS/frmQueue.cs
@@ -21,9 +21,12 @@ namespace Handbrake
     using HandBrake.ApplicationServices.Services;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Utilities;

+    using HandBrake.Interop.Model.Encoding;

 

     using Model;

 

+    using AudioEncoder = HandBrake.ApplicationServices.Model.Encoding.AudioEncoder;

+

     /// <summary>

     /// The Queue Window

     /// </summary>

@@ -354,14 +357,14 @@ namespace Handbrake
                 item.SubItems.Add(chapters); // Chapters

                 item.SubItems.Add(queueItem.Source); // Source

                 item.SubItems.Add(queueItem.Destination); // Destination

-                item.SubItems.Add(EnumHelper<VideoEncoder>.GetDescription(parsed.VideoEncoder));

+                item.SubItems.Add(EnumHelper<VideoEncoder>.GetDisplayValue(parsed.VideoEncoder));

 

                 // Display The Audio Track Information

                 string audio = string.Empty;

                 foreach (AudioTrack track in parsed.AudioTracks)

                 {

                     if (audio != string.Empty)

-                        audio += ", " + track.Encoder;

+                        audio += ", " + EnumHelper<AudioEncoder>.GetDescription(track.Encoder);

                     else

                         audio = EnumHelper<AudioEncoder>.GetDescription(track.Encoder);

                 }

@@ -429,7 +432,7 @@ namespace Handbrake
                 foreach (AudioTrack track in parsed.AudioTracks)

                 {

                     if (audio != string.Empty)

-                        audio += ", " + track.Encoder;

+                        audio += ", " + EnumHelper<AudioEncoder>.GetDescription(track.Encoder);

                     else

                         audio = EnumHelper<AudioEncoder>.GetDescription(track.Encoder);

                 }

@@ -438,8 +441,11 @@ namespace Handbrake
                 lbl_encodeStatus.Text = "Encoding ...";

                 lbl_source.Text = queue.QueueManager.LastProcessedJob.Source + "(Title: " + title + " Chapters: " + chapterlbl + ")";

                 lbl_dest.Text = queue.QueueManager.LastProcessedJob.Destination;

-                lbl_encodeOptions.Text = "Video: " + parsed.VideoEncoder + " Audio: " + audio + Environment.NewLine +

-                                    "x264 Options: " + parsed.AdvancedEncoderOptions;

+                lbl_encodeOptions.Text = string.Format("Video: {0},  Audio: {1}\nx264 Options: {2}",

+                    EnumHelper<VideoEncoder>.GetDisplayValue(parsed.VideoEncoder),

+                    audio, 

+                    parsed.AdvancedEncoderOptions);

+

             }

             catch (Exception)

             {