diff options
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Model')
17 files changed, 141 insertions, 131 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/DriveInformation.cs b/win/CS/HandBrake.ApplicationServices/Model/DriveInformation.cs index 65708cee2..25ff6930b 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/DriveInformation.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/DriveInformation.cs @@ -1,7 +1,11 @@ -/* DriveInformation.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="DriveInformation.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Information about a DVD drive
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs index f2d5828f5..6ed3bf2e1 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs @@ -1,7 +1,11 @@ -/* EncodeTask.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeTask.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// An Encode Task
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs index 31447355b..7b407f297 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs @@ -1,7 +1,11 @@ -/* AllowedPassthru.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AllowedPassthru.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Allowed Passthru Options
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model.Encoding
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs index a9d42861a..49348048f 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs @@ -13,6 +13,8 @@ namespace HandBrake.ApplicationServices.Model.Encoding using System.ComponentModel;
using System.Globalization;
+ using Caliburn.Micro;
+
using HandBrake.ApplicationServices.Functions;
using HandBrake.ApplicationServices.Parsing;
using HandBrake.Interop.Model.Encoding;
@@ -20,7 +22,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding /// <summary>
/// An Audio Track for the Audio Panel
/// </summary>
- public class AudioTrack : ModelBase
+ public class AudioTrack : PropertyChangedBase
{
#region Constants and Fields
@@ -100,7 +102,6 @@ namespace HandBrake.ApplicationServices.Model.Encoding this.mixDown = track.MixDown;
this.sampleRate = track.SampleRate;
this.scannedTrack = new Audio();
- this.trackName = track.TrackName;
}
#endregion
@@ -159,7 +160,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding set
{
this.bitrate = value;
- this.OnPropertyChanged("Bitrate");
+ this.NotifyOfPropertyChange("Bitrate");
}
}
@@ -178,7 +179,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding if (!object.Equals(value, this.drc))
{
this.drc = value;
- this.OnPropertyChanged("DRC");
+ this.NotifyOfPropertyChange("DRC");
}
}
}
@@ -196,9 +197,9 @@ namespace HandBrake.ApplicationServices.Model.Encoding set
{
this.encoder = value;
- this.OnPropertyChanged("Encoder");
- this.OnPropertyChanged("IsPassthru");
- this.OnPropertyChanged("TrackReference");
+ this.NotifyOfPropertyChange(() => this.Encoder);
+ this.NotifyOfPropertyChange("IsPassthru");
+ this.NotifyOfPropertyChange("TrackReference");
}
}
@@ -217,7 +218,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding if (!object.Equals(value, this.gain))
{
this.gain = value;
- this.OnPropertyChanged("Gain");
+ this.NotifyOfPropertyChange("Gain");
}
}
}
@@ -235,8 +236,8 @@ namespace HandBrake.ApplicationServices.Model.Encoding set
{
this.mixDown = value;
- this.OnPropertyChanged("MixDown");
- this.OnPropertyChanged("TrackReference");
+ this.NotifyOfPropertyChange("MixDown");
+ this.NotifyOfPropertyChange("TrackReference");
}
}
@@ -253,7 +254,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding set
{
this.sampleRate = value;
- this.OnPropertyChanged("SampleRate");
+ this.NotifyOfPropertyChange("SampleRate");
}
}
@@ -295,8 +296,8 @@ namespace HandBrake.ApplicationServices.Model.Encoding set
{
this.scannedTrack = value;
- this.OnPropertyChanged("ScannedTrack");
- this.OnPropertyChanged("TrackDisplay");
+ this.NotifyOfPropertyChange("ScannedTrack");
+ this.NotifyOfPropertyChange("TrackDisplay");
}
}
@@ -317,34 +318,6 @@ namespace HandBrake.ApplicationServices.Model.Encoding }
/// <summary>
- /// Gets the Display Value for this model.
- /// </summary>
- public string TrackDisplay
- {
- get
- {
- return this.ScannedTrack == null ? string.Empty : this.ScannedTrack.ToString();
- }
- }
-
- /// <summary>
- /// Gets or sets TrackName.
- /// </summary>
- public string TrackName
- {
- get
- {
- return this.trackName;
- }
-
- set
- {
- this.trackName = value;
- this.OnPropertyChanged("TrackName");
- }
- }
-
- /// <summary>
/// Gets a value indicating whether IsPassthru.
/// </summary>
public bool IsPassthru
@@ -361,6 +334,9 @@ namespace HandBrake.ApplicationServices.Model.Encoding }
}
+ /// <summary>
+ /// Gets a value indicating whether IsLossless.
+ /// </summary>
public bool IsLossless
{
get
@@ -369,6 +345,9 @@ namespace HandBrake.ApplicationServices.Model.Encoding }
}
+ /// <summary>
+ /// Gets TrackReference.
+ /// </summary>
public AudioTrack TrackReference
{
get { return this; }
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs index 0e0eb4b12..db3794151 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs @@ -1,7 +1,11 @@ -/* ChapterMarker.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ChapterMarker.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// A Movie Chapter
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model.Encoding
{
@@ -30,12 +34,12 @@ namespace HandBrake.ApplicationServices.Model.Encoding /// <param name="number">
/// The number.
/// </param>
- /// <param name="Name">
+ /// <param name="name">
/// The name.
/// </param>
- public ChapterMarker(int number, string Name)
+ public ChapterMarker(int number, string name)
{
- this.ChapterName = Name;
+ this.ChapterName = name;
this.ChapterNumber = number;
}
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs index 508e63ced..6392578a6 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs @@ -1,7 +1,11 @@ -/* VideoEncoderMode.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="FramerateMode.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The Mode of Video Encoding. CFR, VFR, PFR
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model.Encoding
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs index fa5c3225f..813418264 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs @@ -1,7 +1,11 @@ -/* OutputFormat.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OutputFormat.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The Output format.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model.Encoding
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs index 00eac35f0..df0bc437c 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs @@ -1,7 +1,11 @@ -/* PointToPoint.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PointToPointMode.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Point to Point Mode
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model.Encoding
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs index d944dea97..92eb55b73 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs @@ -155,7 +155,6 @@ namespace HandBrake.ApplicationServices.Model.Encoding /// </summary>
public string SrtCharCode { get; set; }
-
/// <summary>
/// Gets or sets the SRT Filename
/// </summary>
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs index 5b533f829..64e8f8ff8 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs @@ -1,7 +1,11 @@ -/* SubtitleType.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitleType.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Subtitle Type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model.Encoding
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckInformation.cs b/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckInformation.cs index 5932aa402..86045c938 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckInformation.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckInformation.cs @@ -1,7 +1,11 @@ -/* UpdateCheckInformation.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="UpdateCheckInformation.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Provides information about an update check.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model.General
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckResult.cs b/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckResult.cs index 2f7c7e874..f29cc8560 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckResult.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/General/UpdateCheckResult.cs @@ -1,7 +1,11 @@ -/* UpdateCheckResult.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="UpdateCheckResult.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Used in EndUpdateCheck() for update checking and the IAsyncResult design pattern.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model.General
{
@@ -22,7 +26,7 @@ namespace HandBrake.ApplicationServices.Model.General /// <param name="info">
/// The info.
/// </param>
- public UpdateCheckResult(object asyncState, ApplicationServices.Model.General.UpdateCheckInformation info)
+ public UpdateCheckResult(object asyncState, UpdateCheckInformation info)
{
this.AsyncState = asyncState;
this.Result = info;
@@ -36,12 +40,13 @@ namespace HandBrake.ApplicationServices.Model.General /// <summary>
/// Gets the result of the update check.
/// </summary>
- public ApplicationServices.Model.General.UpdateCheckInformation Result { get; private set; }
+ public UpdateCheckInformation Result { get; private set; }
/// <summary>
/// Gets AsyncWaitHandle.
/// </summary>
/// <exception cref="NotImplementedException">
+ /// This is not implemented as it is not used.
/// </exception>
public WaitHandle AsyncWaitHandle
{
@@ -52,6 +57,7 @@ namespace HandBrake.ApplicationServices.Model.General /// Gets a value indicating whether CompletedSynchronously.
/// </summary>
/// <exception cref="NotImplementedException">
+ /// This is not implemented as it is not used.
/// </exception>
public bool CompletedSynchronously
{
@@ -62,6 +68,7 @@ namespace HandBrake.ApplicationServices.Model.General /// Gets a value indicating whether IsCompleted.
/// </summary>
/// <exception cref="NotImplementedException">
+ /// This is not implemented as it is not used.
/// </exception>
public bool IsCompleted
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/ModelBase.cs b/win/CS/HandBrake.ApplicationServices/Model/ModelBase.cs deleted file mode 100644 index 041b18eb3..000000000 --- a/win/CS/HandBrake.ApplicationServices/Model/ModelBase.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* ModelBase.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
-{
- using System.ComponentModel;
-
- public class ModelBase : INotifyPropertyChanged
- {
- public event PropertyChangedEventHandler PropertyChanged;
-
- protected virtual void OnPropertyChanged(string propertyName)
- {
- if (null != PropertyChanged)
- {
- PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
- }
- }
- }
-}
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs index 5d165ae94..2a9a1693e 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs @@ -1,14 +1,14 @@ -/* Preset.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Preset.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// A Preset for encoding with.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model
{
- using System;
-
- using Encoding;
-
/// <summary>
/// A Preset for encoding with.
/// </summary>
@@ -29,7 +29,6 @@ namespace HandBrake.ApplicationServices.Model /// </summary>
public string Query { get; set; }
-
/// <summary>
/// Gets or sets The version number which associates this preset with a HB build
/// </summary>
diff --git a/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs b/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs index fc2798fd1..a79f4b0e3 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs @@ -1,7 +1,11 @@ -/* PresetPictureSettingsMode.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PresetPictureSettingsMode.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Picture Settings Mode when adding presets
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model
{
diff --git a/win/CS/HandBrake.ApplicationServices/Model/QueueItemStatus.cs b/win/CS/HandBrake.ApplicationServices/Model/QueueItemStatus.cs index bfaad7eaa..c60945abd 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/QueueItemStatus.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/QueueItemStatus.cs @@ -1,7 +1,11 @@ -/* QueueItemStatus.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueItemStatus.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Queue Item Status
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model
{
@@ -13,7 +17,7 @@ namespace HandBrake.ApplicationServices.Model /// <summary>
/// Queue Item Status
/// </summary>
- [TypeConverter(typeof(EnumToDescConveter))]
+ [TypeConverter(typeof(EnumToDescConverter))]
public enum QueueItemStatus
{
[Description("Waiting")]
diff --git a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs index 0fce6eaeb..a62115109 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs @@ -1,7 +1,11 @@ -/* QueueTask.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. */
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueTask.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The QueueTask.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.ApplicationServices.Model
{
|