diff options
| author | sr55 <[email protected]> | 2012-05-12 22:00:52 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-05-12 22:00:52 +0000 |
| commit | d70eae0c6909bca688d1ed5091673b525cc2dc06 (patch) | |
| tree | cfab419dac689afd2d041796ac9ca5a4c1e1a394 /win/CS/HandBrake.ApplicationServices/Model | |
| parent | b3723d62f9a7cba1162dd56598e6be7a53083786 (diff) | |
WinGui: Make the new WPF UI default. (the old UI exe is still included in the build. Handbrake_old.exe)
Also includes bug fixes to the audio and subtitles panels.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4667 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Model')
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs | 17 | ||||
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs | 22 |
2 files changed, 38 insertions, 1 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs index 3fcf7cb5a..14a87bd00 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs @@ -7,6 +7,8 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
+using System.Collections.Generic;
+
namespace HandBrake.ApplicationServices.Model.Encoding
{
using System;
@@ -198,6 +200,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding this.encoder = value;
this.OnPropertyChanged("Encoder");
this.OnPropertyChanged("IsPassthru");
+ this.OnPropertyChanged("TrackReference");
}
}
@@ -235,6 +238,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding {
this.mixDown = value;
this.OnPropertyChanged("MixDown");
+ this.OnPropertyChanged("TrackReference");
}
}
@@ -358,6 +362,19 @@ namespace HandBrake.ApplicationServices.Model.Encoding return false;
}
}
+
+ public bool IsLossless
+ {
+ get
+ {
+ return this.IsPassthru || this.Encoder == AudioEncoder.ffflac;
+ }
+ }
+
+ public AudioTrack TrackReference
+ {
+ get { return this; }
+ }
#endregion
}
}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs index b1ae05a0d..ab716e5fd 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs @@ -7,6 +7,8 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
+using System.IO;
+
namespace HandBrake.ApplicationServices.Model.Encoding
{
using System;
@@ -38,6 +40,11 @@ namespace HandBrake.ApplicationServices.Model.Encoding /// </summary>
private Subtitle sourceTrack;
+ /// <summary>
+ /// Backing field for the srt file name.
+ /// </summary>
+ private string srtFileName;
+
#endregion
#region Constructors and Destructors
@@ -170,10 +177,23 @@ namespace HandBrake.ApplicationServices.Model.Encoding /// </summary>
public string SrtCharCode { get; set; }
+
/// <summary>
/// Gets or sets the SRT Filename
/// </summary>
- public string SrtFileName { get; set; }
+ public string SrtFileName
+ {
+ get
+ {
+ return srtFileName;
+ }
+
+ set
+ {
+ srtFileName = value;
+ this.NotifyOfPropertyChange(() => this.IsSrtSubtitle);
+ }
+ }
/// <summary>
/// Gets or sets the SRT Language
|