From 3042c7672d4a2ff9ffe23f50d36855c948d28d06 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 28 Feb 2015 19:51:01 +0000 Subject: WinGui: Rename interop library to match naming convention. Remove some old test files that are not used. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6947 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../HandBrakeInterop.Test/EncodeJobsPersist.cs | 31 --- .../HandBrakeInterop.Test.csproj | 68 ----- .../Properties/AssemblyInfo.cs | 35 --- .../HandBrakeInterop.Test/TestEncodes.cs | 102 -------- .../TestFiles/Jobs/Normal.xml | Bin 5250 -> 0 bytes win/CS/HandBrake.Interop/HandBrakeInterop.sln | 52 ---- win/CS/HandBrake.Interop/HandBrakeInterop.vsmdi | 6 - .../HandBrakeInterop/HandBrake.Interop.csproj | 291 +++++++++++++++++++++ .../HandBrakeInterop/HandBrakeInterop.csproj | 291 --------------------- win/CS/HandBrake.Interop/Local.testsettings | 20 -- 10 files changed, 291 insertions(+), 605 deletions(-) delete mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop.Test/EncodeJobsPersist.cs delete mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop.Test/HandBrakeInterop.Test.csproj delete mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop.Test/Properties/AssemblyInfo.cs delete mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestEncodes.cs delete mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestFiles/Jobs/Normal.xml delete mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop.sln delete mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop.vsmdi create mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop/HandBrake.Interop.csproj delete mode 100644 win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj delete mode 100644 win/CS/HandBrake.Interop/Local.testsettings (limited to 'win/CS/HandBrake.Interop') diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/EncodeJobsPersist.cs b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/EncodeJobsPersist.cs deleted file mode 100644 index 37ca233c4..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/EncodeJobsPersist.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Xml; -using System.Xml.Linq; -using System.Xml.Serialization; -using HandBrake.Interop; -using HandBrake.Interop.Model; - -namespace HandBrakeInterop.Test -{ - public static class EncodeJobsPersist - { - private static XmlSerializer xmlSerializer = new XmlSerializer(typeof(EncodeJob)); - - public static EncodeJob GetJob(string jobName) - { - XDocument doc = XDocument.Load(jobName + ".xml"); - using (XmlReader reader = doc.CreateReader()) - { - var job = xmlSerializer.Deserialize(reader) as EncodeJob; - - - - return job; - } - } - } -} diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/HandBrakeInterop.Test.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/HandBrakeInterop.Test.csproj deleted file mode 100644 index 5b7a8b72c..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/HandBrakeInterop.Test.csproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - Debug - AnyCPU - - - 2.0 - {D721824C-CAFA-40B1-83C9-83E4B1215D60} - Library - Properties - HandBrakeInterop.Test - HandBrakeInterop.Test - v4.0 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - 3.5 - - - - - - - False - - - - - - - - - - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1} - HandBrakeInterop - - - - - \ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/Properties/AssemblyInfo.cs b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 2352dc269..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("HandBrakeInterop.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("HandBrakeInterop.Test")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("2731c894-c1fc-4690-9557-aa56591b17ab")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestEncodes.cs b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestEncodes.cs deleted file mode 100644 index 3e625a986..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestEncodes.cs +++ /dev/null @@ -1,102 +0,0 @@ -using System; -using System.IO; -using System.Text; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using HandBrake.Interop; -using HandBrake.Interop.Model; -using HandBrake.Interop.Model.Encoding; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace HandBrakeInterop.Test -{ - [TestClass] - public class TestEncodes - { - public const string OutputVideoDirectoryName = "OutputVideos"; - private static readonly string OutputVideoDirectory = Path.Combine(Environment.CurrentDirectory, OutputVideoDirectoryName); - - private ManualResetEvent resetEvent = new ManualResetEvent(false); - - [ClassInitialize] - public static void Init(TestContext context) - { - EnsureOutputVideoDirectoryExists(); - - FileInfo[] files = new DirectoryInfo(OutputVideoDirectory).GetFiles(); - foreach (FileInfo file in files) - { - file.Delete(); - } - } - - [TestMethod] - public void Normal() - { - this.RunJob("Normal"); - } - - private void RunJob(string jobName) - { - this.resetEvent.Reset(); - - EncodeJob job = EncodeJobsPersist.GetJob("Normal"); - - if (job.SourceType == SourceType.VideoFolder) - { - job.SourcePath = Path.Combine(Environment.CurrentDirectory, Path.GetFileName(job.SourcePath)); - } - - if (job.SourceType == SourceType.File) - { - job.SourcePath = Path.Combine(Environment.CurrentDirectory, Path.GetFileName(job.SourcePath)); - } - - string extension; - if (job.EncodingProfile.OutputFormat == Container.Mkv) - { - extension = ".mkv"; - } - else - { - extension = ".mp4"; - } - - job.OutputPath = Path.Combine(OutputVideoDirectory, jobName + extension); - - var instance = new HandBrakeInstance(); - instance.Initialize(0); - instance.ScanCompleted += (sender, e) => - { - this.resetEvent.Set(); - }; - - instance.StartScan(job.SourcePath, 10); - this.resetEvent.WaitOne(); - - this.resetEvent.Reset(); - instance.EncodeCompleted += (sender, e) => - { - Assert.IsFalse(e.Error); - this.resetEvent.Set(); - }; - - instance.StartEncode(job); - this.resetEvent.WaitOne(); - - Assert.IsTrue(File.Exists(job.OutputPath)); - - var fileInfo = new FileInfo(job.OutputPath); - Assert.IsTrue(fileInfo.Length > 1024); - } - - private static void EnsureOutputVideoDirectoryExists() - { - if (!Directory.Exists(OutputVideoDirectory)) - { - Directory.CreateDirectory(OutputVideoDirectory); - } - } - } -} diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestFiles/Jobs/Normal.xml b/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestFiles/Jobs/Normal.xml deleted file mode 100644 index b717a7c36..000000000 Binary files a/win/CS/HandBrake.Interop/HandBrakeInterop.Test/TestFiles/Jobs/Normal.xml and /dev/null differ diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.sln b/win/CS/HandBrake.Interop/HandBrakeInterop.sln deleted file mode 100644 index 194b8f5a9..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop.sln +++ /dev/null @@ -1,52 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeInterop", "HandBrakeInterop\HandBrakeInterop.csproj", "{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeInterop.Test", "HandBrakeInterop.Test\HandBrakeInterop.Test.csproj", "{D721824C-CAFA-40B1-83C9-83E4B1215D60}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F9A6B796-8476-4F7D-BD4E-A1B73A42E2F7}" - ProjectSection(SolutionItems) = preProject - HandBrakeInterop.vsmdi = HandBrakeInterop.vsmdi - Local.testsettings = Local.testsettings - EndProjectSection -EndProject -Global - GlobalSection(TestCaseManagementSettings) = postSolution - CategoryFile = HandBrakeInterop.vsmdi - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Mixed Platforms = Release|Mixed Platforms - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.ActiveCfg = Debug|x64 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x64.Build.0 = Debug|x64 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.ActiveCfg = Debug|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Debug|x86.Build.0 = Debug|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|Mixed Platforms.Build.0 = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x64.ActiveCfg = Release|x64 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x64.Build.0 = Release|x64 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.ActiveCfg = Release|x86 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}.Release|x86.Build.0 = Release|x86 - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x64.ActiveCfg = Debug|Any CPU - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x64.Build.0 = Debug|Any CPU - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Debug|x86.ActiveCfg = Debug|Any CPU - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|x64.ActiveCfg = Release|Any CPU - {D721824C-CAFA-40B1-83C9-83E4B1215D60}.Release|x86.ActiveCfg = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop.vsmdi b/win/CS/HandBrake.Interop/HandBrakeInterop.vsmdi deleted file mode 100644 index bbe274502..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop.vsmdi +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrake.Interop.csproj new file mode 100644 index 000000000..133620409 --- /dev/null +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrake.Interop.csproj @@ -0,0 +1,291 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1} + Library + Properties + HandBrake.Interop + HandBrakeInterop + v4.0 + 512 + + + + + 3.5 + Client + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + true + bin\x64\Debug\ + TRACE;DEBUG;X64 + full + x64 + bin\Debug\HandBrakeInterop.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + false + true + + + bin\x64\Release\ + TRACE;X64 + true + pdbonly + x64 + bin\Release\HandBrakeInterop.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + bin\Debug\HandBrakeInterop.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + bin\x86\Release\ + DEBUG;TRACE + true + pdbonly + x86 + bin\Release\HandBrakeInterop.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + false + + + true + bin\x64\Debug31\ + TRACE;DEBUG;X64 + full + x64 + prompt + AllRules.ruleset + false + false + + + true + bin\x86\Debug31\ + DEBUG;TRACE + full + x86 + prompt + AllRules.ruleset + false + false + + + + False + ..\..\libraries\json\Net40\Newtonsoft.Json.dll + + + 3.0 + + + + + 3.5 + + + + + 3.5 + + + 3.5 + + + + + 3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + + \ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj deleted file mode 100644 index 133620409..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj +++ /dev/null @@ -1,291 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1} - Library - Properties - HandBrake.Interop - HandBrakeInterop - v4.0 - 512 - - - - - 3.5 - Client - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - bin\x64\Debug\ - TRACE;DEBUG;X64 - full - x64 - bin\Debug\HandBrakeInterop.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - AllRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - false - true - - - bin\x64\Release\ - TRACE;X64 - true - pdbonly - x64 - bin\Release\HandBrakeInterop.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - AllRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - bin\Debug\HandBrakeInterop.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - AllRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - - - bin\x86\Release\ - DEBUG;TRACE - true - pdbonly - x86 - bin\Release\HandBrakeInterop.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - AllRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - false - - - true - bin\x64\Debug31\ - TRACE;DEBUG;X64 - full - x64 - prompt - AllRules.ruleset - false - false - - - true - bin\x86\Debug31\ - DEBUG;TRACE - full - x86 - prompt - AllRules.ruleset - false - false - - - - False - ..\..\libraries\json\Net40\Newtonsoft.Json.dll - - - 3.0 - - - - - 3.5 - - - - - 3.5 - - - 3.5 - - - - - 3.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - \ No newline at end of file diff --git a/win/CS/HandBrake.Interop/Local.testsettings b/win/CS/HandBrake.Interop/Local.testsettings deleted file mode 100644 index a371a9d4a..000000000 --- a/win/CS/HandBrake.Interop/Local.testsettings +++ /dev/null @@ -1,20 +0,0 @@ - - - These are default test settings for a local test run. - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3