diff options
author | sr55 <[email protected]> | 2014-12-20 14:36:56 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2014-12-20 14:36:56 +0000 |
commit | 064322050804f20792408bcd45609276d4ba4240 (patch) | |
tree | 2612d590804ad45dc3eed848ba349696cf80384d /win/CS/HandBrake.Interop/HandBrakeInterop/Model | |
parent | 541c3053f07d7cf9b90f168ee27fa121082d677b (diff) |
WinGui: Switch to using the new JSON based scan API.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6622 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.Interop/HandBrakeInterop/Model')
6 files changed, 9 insertions, 89 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioCodec.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioCodec.cs deleted file mode 100644 index 41b363dac..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioCodec.cs +++ /dev/null @@ -1,53 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AudioCodec.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>
-// Defines the AudioCodec type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model.Scan
-{
- /// <summary>
- /// The audio codec.
- /// Only contains 2 real codecs at the moment as those are what we care about. More will be added later.
- /// </summary>
- public enum AudioCodec
- {
- /// <summary>
- /// The ac 3.
- /// </summary>
- Ac3,
-
- /// <summary>
- /// The dts.
- /// </summary>
- Dts,
-
- /// <summary>
- /// The dts hd.
- /// </summary>
- DtsHD,
-
- /// <summary>
- /// The mp 3.
- /// </summary>
- Mp3,
-
- /// <summary>
- /// The aac.
- /// </summary>
- Aac,
-
- /// <summary>
- /// The other.
- /// </summary>
- Other,
-
- /// <summary>
- /// The flac.
- /// </summary>
- Flac,
- }
-}
\ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioTrack.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioTrack.cs index 2bf275fdd..db1ef5549 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioTrack.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioTrack.cs @@ -20,11 +20,6 @@ namespace HandBrake.Interop.Model.Scan public int TrackNumber { get; set; }
/// <summary>
- /// Gets or sets the audio codec of this Track.
- /// </summary>
- public AudioCodec Codec { get; set; }
-
- /// <summary>
/// Gets or sets the audio codec ID for this track.
/// </summary>
public uint CodecId { get; set; }
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/InputType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/InputType.cs index e3156ea8e..b3bc96d42 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/InputType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/InputType.cs @@ -23,6 +23,9 @@ namespace HandBrake.Interop.Model.Scan Dvd,
[Display(Name = "Blu-ray")]
- Bluray
+ Bluray,
+
+ [Display(Name = "File")]
+ FFStream
}
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Subtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Subtitle.cs index fda0dbb6c..03caf765f 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Subtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Subtitle.cs @@ -32,11 +32,6 @@ namespace HandBrake.Interop.Model.Scan public string LanguageCode { get; set; }
/// <summary>
- /// Gets or sets the subtitle type.
- /// </summary>
- public SubtitleType SubtitleType { get; set; }
-
- /// <summary>
/// Gets or sets the subtitle source.
/// </summary>
public SubtitleSource SubtitleSource { get; set; }
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/SubtitleType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/SubtitleType.cs deleted file mode 100644 index 4486e029d..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/SubtitleType.cs +++ /dev/null @@ -1,20 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <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>
-// Defines the SubtitleType type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model.Scan
-{
- /// <summary>
- /// The subtitle type.
- /// </summary>
- public enum SubtitleType
- {
- Picture,
- Text
- }
-}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs index fb2a67b64..8f5880123 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs @@ -89,11 +89,6 @@ namespace HandBrake.Interop.Model.Scan public TimeSpan Duration { get; set; }
/// <summary>
- /// Gets or sets the duration of the title in PTS.
- /// </summary>
- public ulong DurationPts { get; set; }
-
- /// <summary>
/// Gets or sets the resolution (width/height) of this Title
/// </summary>
public Size Resolution { get; set; }
@@ -185,5 +180,10 @@ namespace HandBrake.Interop.Model.Scan return this.ToString();
}
}
+
+ /// <summary>
+ /// Gets or sets a value indicating whether is main feature.
+ /// </summary>
+ public bool IsMainFeature { get; set; }
}
}
\ No newline at end of file |