diff options
Diffstat (limited to 'win/CS')
15 files changed, 46 insertions, 43 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs index 6311c79e3..3a17e093a 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs @@ -24,7 +24,7 @@ namespace HandBrake.ApplicationServices.Services.Scan using HandBrake.Interop.EventArgs;
using HandBrake.Interop.Interfaces;
using HandBrake.Interop.Model;
- using HandBrake.Interop.SourceData;
+ using HandBrake.Interop.Model.Scan;
using Chapter = HandBrake.ApplicationServices.Services.Scan.Model.Chapter;
using ScanProgressEventArgs = HandBrake.Interop.EventArgs.ScanProgressEventArgs;
@@ -466,10 +466,10 @@ namespace HandBrake.ApplicationServices.Services.Scan /// <returns>
/// The convert titles.
/// </returns>
- private static List<Title> ConvertTitles(IEnumerable<Interop.SourceData.Title> titles, int featureTitle)
+ private static List<Title> ConvertTitles(IEnumerable<Interop.Model.Scan.Title> titles, int featureTitle)
{
List<Title> titleList = new List<Title>();
- foreach (Interop.SourceData.Title title in titles)
+ foreach (Interop.Model.Scan.Title title in titles)
{
Title converted = new Title
{
@@ -486,45 +486,45 @@ namespace HandBrake.ApplicationServices.Services.Scan Playlist = title.InputType == InputType.Bluray ? string.Format(" {0:d5}.MPLS", title.Playlist).Trim() : null
};
- foreach (Interop.SourceData.Chapter chapter in title.Chapters)
+ foreach (Interop.Model.Scan.Chapter chapter in title.Chapters)
{
string chapterName = !string.IsNullOrEmpty(chapter.Name) ? chapter.Name : string.Empty;
converted.Chapters.Add(new Chapter(chapter.ChapterNumber, chapterName, chapter.Duration));
}
- foreach (Interop.SourceData.AudioTrack track in title.AudioTracks)
+ foreach (AudioTrack track in title.AudioTracks)
{
converted.AudioTracks.Add(new Audio(track.TrackNumber, track.Language, track.LanguageCode, track.Description, string.Empty, track.SampleRate, track.Bitrate));
}
- foreach (Interop.SourceData.Subtitle track in title.Subtitles)
+ foreach (Interop.Model.Scan.Subtitle track in title.Subtitles)
{
SubtitleType convertedType = new SubtitleType();
switch (track.SubtitleSource)
{
- case Interop.SourceData.SubtitleSource.VobSub:
+ case SubtitleSource.VobSub:
convertedType = SubtitleType.VobSub;
break;
- case Interop.SourceData.SubtitleSource.UTF8:
+ case SubtitleSource.UTF8:
convertedType = SubtitleType.UTF8Sub;
break;
- case Interop.SourceData.SubtitleSource.TX3G:
+ case SubtitleSource.TX3G:
convertedType = SubtitleType.TX3G;
break;
- case Interop.SourceData.SubtitleSource.SSA:
+ case SubtitleSource.SSA:
convertedType = SubtitleType.SSA;
break;
- case Interop.SourceData.SubtitleSource.SRT:
+ case SubtitleSource.SRT:
convertedType = SubtitleType.SRT;
break;
- case Interop.SourceData.SubtitleSource.CC608:
+ case SubtitleSource.CC608:
convertedType = SubtitleType.CC;
break;
- case Interop.SourceData.SubtitleSource.CC708:
+ case SubtitleSource.CC708:
convertedType = SubtitleType.CC;
break;
- case Interop.SourceData.SubtitleSource.PGS:
+ case SubtitleSource.PGS:
convertedType = SubtitleType.PGS;
break;
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs index d0468ec27..a5c2be460 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs @@ -17,7 +17,7 @@ namespace HandBrake.Interop.Converters using HandBrake.Interop.Helpers;
using HandBrake.Interop.Model;
using HandBrake.Interop.Model.Encoding;
- using HandBrake.Interop.SourceData;
+ using HandBrake.Interop.Model.Scan;
/// <summary>
/// Converters for various encoding values.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs index 95590c71b..b51b6d470 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs @@ -26,7 +26,7 @@ namespace HandBrake.Interop using HandBrake.Interop.Interfaces;
using HandBrake.Interop.Model;
using HandBrake.Interop.Model.Encoding;
- using HandBrake.Interop.SourceData;
+ using HandBrake.Interop.Model.Scan;
/// <summary>
/// A wrapper for a HandBrake instance.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj index 650361e5f..a9b72db13 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj @@ -223,14 +223,14 @@ <Compile Include="Helpers\NativeList.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="EventArgs\ScanProgressEventArgs.cs" />
- <Compile Include="SourceData\AudioCodec.cs" />
- <Compile Include="SourceData\AudioTrack.cs" />
- <Compile Include="SourceData\Chapter.cs" />
- <Compile Include="SourceData\InputType.cs" />
- <Compile Include="SourceData\Subtitle.cs" />
- <Compile Include="SourceData\SubtitleSource.cs" />
- <Compile Include="SourceData\SubtitleType.cs" />
- <Compile Include="SourceData\Title.cs" />
+ <Compile Include="Model\Scan\AudioCodec.cs" />
+ <Compile Include="Model\Scan\AudioTrack.cs" />
+ <Compile Include="Model\Scan\Chapter.cs" />
+ <Compile Include="Model\Scan\InputType.cs" />
+ <Compile Include="Model\Scan\Subtitle.cs" />
+ <Compile Include="Model\Scan\SubtitleSource.cs" />
+ <Compile Include="Model\Scan\SubtitleType.cs" />
+ <Compile Include="Model\Scan\Title.cs" />
<Compile Include="Helpers\Utilities.cs" />
</ItemGroup>
<ItemGroup>
@@ -250,6 +250,9 @@ <Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="SourceData\" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs index 0a82fb980..4070d8802 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs @@ -17,7 +17,7 @@ namespace HandBrake.Interop using HandBrake.Interop.HbLib;
using HandBrake.Interop.Model;
using HandBrake.Interop.Model.Encoding;
- using HandBrake.Interop.SourceData;
+ using HandBrake.Interop.Model.Scan;
/// <summary>
/// HandBrake Interop Utilities
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs index 3123a6671..ea86eb85c 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs @@ -15,7 +15,7 @@ namespace HandBrake.Interop.Interfaces using HandBrake.Interop.EventArgs;
using HandBrake.Interop.Model;
- using HandBrake.Interop.SourceData;
+ using HandBrake.Interop.Model.Scan;
/// <summary>
/// The Interface for HandBrakeInstance
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs index 295586c8f..036617ce0 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs @@ -17,9 +17,9 @@ namespace HandBrake.Interop.Model using HandBrake.Interop.HbLib;
using HandBrake.Interop.Helpers;
using HandBrake.Interop.Model.Encoding;
- using HandBrake.Interop.SourceData;
+ using HandBrake.Interop.Model.Scan;
- /// <summary>
+ /// <summary>
/// The encoders.
/// </summary>
public static class Encoders
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioCodec.cs index d24c9998b..41b363dac 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioCodec.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.SourceData
+namespace HandBrake.Interop.Model.Scan
{
/// <summary>
/// The audio codec.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioTrack.cs index 4c4e64fd7..2bf275fdd 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/AudioTrack.cs @@ -7,9 +7,9 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.SourceData
+namespace HandBrake.Interop.Model.Scan
{
- /// <summary>
+ /// <summary>
/// An object represending an AudioTrack associated with a Title, in a DVD
/// </summary>
public class AudioTrack
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Chapter.cs index 25d5b811b..70e35e6f3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Chapter.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.SourceData
+namespace HandBrake.Interop.Model.Scan
{
using System;
using System.Globalization;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/InputType.cs index aec194533..e3156ea8e 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/InputType.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.SourceData
+namespace HandBrake.Interop.Model.Scan
{
using System.ComponentModel.DataAnnotations;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Subtitle.cs index fbb08402f..fda0dbb6c 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Subtitle.cs @@ -7,11 +7,11 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.SourceData
+namespace HandBrake.Interop.Model.Scan
{
- using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.HbLib;
- /// <summary>
+ /// <summary>
/// An object that represents a subtitle associated with a Title, in a DVD
/// </summary>
public class Subtitle
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/SubtitleSource.cs index e169e8882..517025934 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/SubtitleSource.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.SourceData
+namespace HandBrake.Interop.Model.Scan
{
/// <summary>
/// The subtitle source.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/SubtitleType.cs index 422f9001d..4486e029d 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/SubtitleType.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.SourceData
+namespace HandBrake.Interop.Model.Scan
{
/// <summary>
/// The subtitle type.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs index 6137199d8..fb2a67b64 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Scan/Title.cs @@ -7,14 +7,14 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.SourceData
+namespace HandBrake.Interop.Model.Scan
{
- using System;
- using System.Collections.Generic;
+ using System;
+ using System.Collections.Generic;
- using HandBrake.Interop.Model;
+ using HandBrake.Interop.Model;
- /// <summary>
+ /// <summary>
/// An object that represents a single Title of a DVD
/// </summary>
public class Title
|