summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices/Interop
diff options
context:
space:
mode:
authorsr55 <[email protected]>2015-04-01 20:23:13 +0000
committersr55 <[email protected]>2015-04-01 20:23:13 +0000
commit4a8a81180d8dbc0d06a1834712e59314a8c18c37 (patch)
tree97a3359ee9c51e227aa23cc77730d8f3ffa2540e /win/CS/HandBrake.ApplicationServices/Interop
parent459e06e2e6099a882d0eff225fd36ddce02aab70 (diff)
WinGui: Refactor the JSON scan model names to be a bit clearer.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7034 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Interop')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs2
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioTrack.cs (renamed from win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioList.cs)4
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterTrack.cs (renamed from win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs)4
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs2
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceTitle.cs (renamed from win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs)10
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleTrack.cs (renamed from win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleList.cs)4
6 files changed, 13 insertions, 13 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index dfa33fbd8..97193c8dd 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
@@ -247,7 +247,7 @@ namespace HandBrake.ApplicationServices.Interop
[HandleProcessCorruptedStateExceptions]
public BitmapImage GetPreview(PreviewSettings job, int previewNumber)
{
- TitleList title = this.Titles.TitleList.FirstOrDefault(t => t.Index == job.Title);
+ SourceTitle title = this.Titles.TitleList.FirstOrDefault(t => t.Index == job.Title);
Validate.NotNull(title, "GetPreview: Title should not have been null. This is probably a bug.");
// Creat the Expected Output Geometry details for libhb.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioTrack.cs
index 544f49226..b0491c734 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioTrack.cs
@@ -1,5 +1,5 @@
// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AudioList.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="AudioTrack.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>
@@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
/// <summary>
/// The audio list.
/// </summary>
- public class AudioList
+ public class AudioTrack
{
/// <summary>
/// Gets or sets the bit rate.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterTrack.cs
index 90ec33cc8..dc50f2dc8 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterTrack.cs
@@ -1,5 +1,5 @@
// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ChapterList.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="ChapterTrack.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>
@@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
/// <summary>
/// The chapter list.
/// </summary>
- public class ChapterList
+ public class ChapterTrack
{
/// <summary>
/// Gets or sets the duration.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs
index 8d38c51a1..4232ee49f 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs
@@ -24,6 +24,6 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
/// <summary>
/// Gets or sets the title list.
/// </summary>
- public List<TitleList> TitleList { get; set; }
+ public List<SourceTitle> TitleList { get; set; }
}
} \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceTitle.cs
index 451275729..f70a15584 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SourceTitle.cs
@@ -1,5 +1,5 @@
// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="TitleList.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="SourceTitle.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>
@@ -16,7 +16,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
/// <summary>
/// The title list.
/// </summary>
- public class TitleList
+ public class SourceTitle
{
/// <summary>
/// Gets or sets the angle count.
@@ -26,12 +26,12 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
/// <summary>
/// Gets or sets the audio list.
/// </summary>
- public List<AudioList> AudioList { get; set; }
+ public List<AudioTrack> AudioList { get; set; }
/// <summary>
/// Gets or sets the chapter list.
/// </summary>
- public List<ChapterList> ChapterList { get; set; }
+ public List<ChapterTrack> ChapterList { get; set; }
/// <summary>
/// Gets or sets the color.
@@ -91,7 +91,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
/// <summary>
/// Gets or sets the subtitle list.
/// </summary>
- public List<SubtitleList> SubtitleList { get; set; }
+ public List<SubtitleTrack> SubtitleList { get; set; }
/// <summary>
/// Gets or sets the type.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleTrack.cs
index a6ec067e8..247801468 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleTrack.cs
@@ -1,5 +1,5 @@
// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SubtitleList.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="SubtitleTrack.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>
@@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan
/// <summary>
/// The subtitle list.
/// </summary>
- public class SubtitleList
+ public class SubtitleTrack
{
/// <summary>
/// Gets or sets the format.