From 0b14b5646566aa90026466dd7c4b3430dec7c093 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 14 Mar 2015 17:16:58 +0000 Subject: WinGui: Remove the Caliburn Micro / Castle dependency in The services library, and make the low-level json api public. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6986 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs | 2 +- .../Interop/Json/Encode/JsonEncodeObject.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioList.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Color.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration2.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/FrameRate.cs | 3 +-- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Geometry.cs | 2 +- .../HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/MetaData.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/PAR.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleList.cs | 2 +- win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) (limited to 'win/CS/HandBrake.ApplicationServices/Interop') diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs index 379e461c3..9c99087f2 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs @@ -41,7 +41,7 @@ namespace HandBrake.ApplicationServices.Interop /// /// A wrapper for a HandBrake instance. /// - internal class HandBrakeInstance : IHandBrakeInstance, IDisposable + public class HandBrakeInstance : IHandBrakeInstance, IDisposable { /// /// The number of MS between status polls when scanning. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs index 7b9a1f953..0accd19cf 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs @@ -14,7 +14,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode /// /// The root object. /// - internal class JsonEncodeObject + public class JsonEncodeObject { /// /// Gets or sets the audio. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioList.cs index 18ad084f3..544f49226 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioList.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/AudioList.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The audio list. /// - internal class AudioList + public class AudioList { /// /// 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/ChapterList.cs index c4da099e5..01a0068fc 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The chapter list. /// - internal class ChapterList + public class ChapterList { /// /// Gets or sets the duration. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Color.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Color.cs index 8709dcbdd..b99495440 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Color.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Color.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The color. /// - internal class Color + public class Color { /// /// Gets or sets the matrix. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs index 7785fff05..4eea32e12 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The duration. /// - internal class Duration + public class Duration { /// /// Gets or sets the hours. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration2.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration2.cs index 444ea3e2f..3bf6827f5 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration2.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration2.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The duration 2. /// - internal class Duration2 + public class Duration2 { /// /// Gets or sets the hours. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/FrameRate.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/FrameRate.cs index 937738076..a85042320 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/FrameRate.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/FrameRate.cs @@ -12,9 +12,8 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The frame rate. /// - internal class FrameRate + public class FrameRate { - /// /// Gets or sets the den. /// diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Geometry.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Geometry.cs index 9f7bc95d4..0f7f35ee8 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Geometry.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Geometry.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The geometry. /// - internal class Geometry + public class Geometry { /// /// Gets or sets the height. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs index 397e5ce9e..8d38c51a1 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/JsonScanObject.cs @@ -14,7 +14,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The root object. /// - internal class JsonScanObject + public class JsonScanObject { /// /// Gets or sets the main feature. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/MetaData.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/MetaData.cs index 46b312a5a..ecd26bd8f 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/MetaData.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/MetaData.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The meta data. /// - internal class MetaData + public class MetaData { } } \ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/PAR.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/PAR.cs index 2eca81fc6..9149604d9 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/PAR.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/PAR.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The par. /// - internal class PAR + public class PAR { /// /// Gets or sets the width. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleList.cs index f727fd15e..a6ec067e8 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleList.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/SubtitleList.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The subtitle list. /// - internal class SubtitleList + public class SubtitleList { /// /// Gets or sets the format. diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs index f6668eb24..731d715c2 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs @@ -14,7 +14,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// /// The title list. /// - internal class TitleList + public class TitleList { /// /// Gets or sets the angle count. -- cgit v1.2.3