summaryrefslogtreecommitdiffstats
path: root/win/CS
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS')
-rw-r--r--win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj8
-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
-rw-r--r--win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs8
8 files changed, 21 insertions, 21 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 6f7ad978c..6f32ad6b1 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -128,16 +128,16 @@
<Compile Include="Interop\Json\Encode\Video.cs" />
<Compile Include="Interop\Factories\AnamorphicFactory.cs" />
<Compile Include="Services\Encode\Factories\EncodeFactory.cs" />
- <Compile Include="Interop\Json\Scan\AudioList.cs" />
- <Compile Include="Interop\Json\Scan\ChapterList.cs" />
+ <Compile Include="Interop\Json\Scan\AudioTrack.cs" />
+ <Compile Include="Interop\Json\Scan\ChapterTrack.cs" />
<Compile Include="Interop\Json\Scan\Color.cs" />
<Compile Include="Interop\Json\Scan\Duration.cs" />
<Compile Include="Interop\Json\Scan\FrameRate.cs" />
<Compile Include="Interop\Json\Shared\Geometry.cs" />
<Compile Include="Interop\Json\Scan\JsonScanObject.cs" />
<Compile Include="Interop\Json\Scan\MetaData.cs" />
- <Compile Include="Interop\Json\Scan\SubtitleList.cs" />
- <Compile Include="Interop\Json\Scan\TitleList.cs" />
+ <Compile Include="Interop\Json\Scan\SubtitleTrack.cs" />
+ <Compile Include="Interop\Json\Scan\SourceTitle.cs" />
<Compile Include="Interop\Json\State\JsonState.cs" />
<Compile Include="Interop\Json\State\Scanning.cs" />
<Compile Include="Interop\Json\State\WorkDone.cs" />
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.
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index 09e2df18a..524042606 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
@@ -455,7 +455,7 @@ namespace HandBrake.ApplicationServices.Services.Scan
internal static List<Title> ConvertTitles(JsonScanObject titles)
{
List<Title> titleList = new List<Title>();
- foreach (TitleList title in titles.TitleList)
+ foreach (SourceTitle title in titles.TitleList)
{
Title converted = new Title
{
@@ -480,7 +480,7 @@ namespace HandBrake.ApplicationServices.Services.Scan
};
int currentTrack = 1;
- foreach (ChapterList chapter in title.ChapterList)
+ foreach (ChapterTrack chapter in title.ChapterList)
{
string chapterName = !string.IsNullOrEmpty(chapter.Name) ? chapter.Name : string.Empty;
converted.Chapters.Add(new Chapter(currentTrack, chapterName, new TimeSpan(chapter.Duration.Hours, chapter.Duration.Minutes, chapter.Duration.Seconds)));
@@ -488,14 +488,14 @@ namespace HandBrake.ApplicationServices.Services.Scan
}
int currentAudioTrack = 1;
- foreach (AudioList track in title.AudioList)
+ foreach (AudioTrack track in title.AudioList)
{
converted.AudioTracks.Add(new Audio(currentAudioTrack, track.Language, track.LanguageCode, track.Description, string.Empty, track.SampleRate, track.BitRate));
currentAudioTrack++;
}
int currentSubtitleTrack = 1;
- foreach (SubtitleList track in title.SubtitleList)
+ foreach (SubtitleTrack track in title.SubtitleList)
{
SubtitleType convertedType = new SubtitleType();