From 3042c7672d4a2ff9ffe23f50d36855c948d28d06 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 28 Feb 2015 19:51:01 +0000 Subject: [PATCH] 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 --- .../HandBrake.ApplicationServices.csproj | 4 +- .../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 --------- .../HandBrake.Interop/HandBrakeInterop.vsmdi | 6 -- ...nterop.csproj => HandBrake.Interop.csproj} | 0 win/CS/HandBrake.Interop/Local.testsettings | 20 ---- win/CS/HandBrake10.sln | 4 +- win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 4 +- 12 files changed, 6 insertions(+), 320 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 rename win/CS/HandBrake.Interop/HandBrakeInterop/{HandBrakeInterop.csproj => HandBrake.Interop.csproj} (100%) delete mode 100644 win/CS/HandBrake.Interop/Local.testsettings diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index e3436d19f..a14112886 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -184,9 +184,9 @@ - + {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1} - HandBrakeInterop + 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 b717a7c364559f78e96e3af39c8ca71eaf37bc37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5250 zcmbtY+j1L45bbBG_y-m57>5GmxD=&q2|EVghy;WxUUXU8BDzJpzVY!1=S*uf)3dv> zTs$O_rca-~PS1?Ld~V8Hd6cP4q#^f`$x?C|%UoviM!u0(vLn0rY(O%TA=XEb&g8~P z@1&4x`4*@>VBShgzLu|~DL=2VnfwBs!AjBqPgA;Bxr3b{ID7IW3w*ZZ!r9Cq|E>l> z?lQxb^x?%V7&>wwf5X2ym~(tvz{Xtu0s9aLuKWStN7BaX2&+r1yo2@(zmD*$FCVdb zir zc+b28^gXoFEQKtDEcJjZoF6Szh#K)qz#Y1J(qE5@R|4+6%he5Vp=w?HVplMSxwBD) z3LK2PkGyJzyZG!Q?qY4ZUS7w+UK`cuds)!6{#yIHtE|Qm#fUlUJ6s=3l;H5$P z*!9{Jnak1XAp@#iC#}}^?5~B^%M4x~w3%V{VurjOVjprp&rwnK{}4MMM=m{DcN_P6 zsF45VF^u>noZSC+msq@OWJ_RlX1z=^WbYCT1$G4g54$*>W&d|>=rpn2-$1``cJE@wPf_`M*S*#L z1b^94@i}mX9L$j|op@<=Vzy)8maxQm-IDW4ix%UpY9G=P>%#fSZzG&DkKke_`!kEY z3;DrCvK`*q;PfA&>f9GuQu%XuzI0~<&&ZbRkcsOT_SH)?t<5vX%em^$jg-3zVL2|{ zOdTV;WBC_MDMMLq^-s}zJQaVG6SqGX;A6E|Dei$M~V4Vr@UUJXPIM7E3vw5bVUyT=E!mzx#9g_0k3%*O0%>XoARby zv0Qt<=dAfW`d?+-5pc!IM~}8^Wt}tR{yNHg_+7@nFI6dCiSc?aY>KRj^Jj)SPT}(s znY;z}5SiqexOCqOw~wn))|Q{XV^nB?Ztde<8Fz>6;pfnny8~aUS+#TO<(B7Hhgp~<$OP`hZ!+HnS%eUeA>lq%(Ezdb>JHo!1=SA6aSzhLt!7lrz ztQ||rdIMPI3+CfG*Nin@wK^xr5W78x4(D`v_E#Y+hrWyWMhT}oGvAUAxL5A2&eM97 zW%D}z%;D>Rwb#@84HysHImJF5;Rd4XIbM{zkPJ{^Mx=KvMLz)PPlv$@m!qQw@(I88 zptX;#-v=9CddkBY!YWQ&6}ZN}tMko9P#q~>HmrPj{j`xW#>P85@5sNwC)R-Pt|w=2 zTPADY^0eIDp5CYHR;vfwOPoa+tassq-UEI@T=>ore3#&Y%K z0r}ybHh1;6GdPu|y8H{l0Q$TW@xG^!|uq^}~q2h`*3PH= - - - - - \ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrake.Interop.csproj similarity index 100% rename from win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj rename to win/CS/HandBrake.Interop/HandBrakeInterop/HandBrake.Interop.csproj 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 diff --git a/win/CS/HandBrake10.sln b/win/CS/HandBrake10.sln index 395e71bac..59cc0e38c 100644 --- a/win/CS/HandBrake10.sln +++ b/win/CS/HandBrake10.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServices", "HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeInterop", "HandBrake.Interop\HandBrakeInterop\HandBrakeInterop.csproj", "{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Interop", "HandBrake.Interop\HandBrakeInterop\HandBrake.Interop.csproj", "{F0A61F62-2C3B-4A87-AFF4-0C4256253DA1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CB7BC74-449C-4E95-98AB-E1E4387E514B}" ProjectSection(SolutionItems) = preProject diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index b7d4a8a85..681bd9d1b 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -535,9 +535,9 @@ {087A2BA8-BAC2-4577-A46F-07FF9D420016} HandBrake.ApplicationServices - + {F0A61F62-2C3B-4A87-AFF4-0C4256253DA1} - HandBrakeInterop + HandBrake.Interop -- 2.40.0