WinGui:

# interop
- Fix Namespaces
- Changed so it's .NET 3.5 compatible.
- Removed usings which were not needed and placed usings inside the namespace.

git-svn-id: svn://localhost/HandBrake/trunk@3353 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/interop/DisplayStringAttribute.cs b/win/C#/interop/DisplayStringAttribute.cs
index 3f7e62d..7c1f547 100644 (file)
--- a/win/C#/interop/DisplayStringAttribute.cs
+++ b/win/C#/interop/DisplayStringAttribute.cs
@@ -1,10 +1,7 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop\r
 {\r
+    using System;\r
+\r
     [AttributeUsage(AttributeTargets.Field)]\r
     public sealed class DisplayStringAttribute : Attribute\r
     {\r

diff --git a/win/C#/interop/EncodeProgressEventArgs.cs b/win/C#/interop/EncodeProgressEventArgs.cs
index 7f08595..9500bda 100644 (file)
--- a/win/C#/interop/EncodeProgressEventArgs.cs
+++ b/win/C#/interop/EncodeProgressEventArgs.cs
@@ -1,10 +1,7 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop\r
 {\r
+    using System;\r
+\r
     public class EncodeProgressEventArgs : EventArgs\r
     {\r
         public float FractionComplete { get; set; }\r

diff --git a/win/C#/interop/HandBrakeInstance.cs b/win/C#/interop/HandBrakeInstance.cs
index c9d1e1a..c50fc04 100644 (file)
--- a/win/C#/interop/HandBrakeInstance.cs
+++ b/win/C#/interop/HandBrakeInstance.cs
@@ -1,16 +1,15 @@
-namespace HandBrake.Interop\r
+using HandBrake.Interop.Model;\r
+using HandBrake.Interop.Model.Encoding;\r
+using HandBrake.Interop.SourceData;\r
+\r
+namespace HandBrake.Interop\r
 {\r
     using System;\r
     using System.Collections.Generic;\r
     using System.IO;\r
     using System.Linq;\r
     using System.Runtime.InteropServices;\r
-    using System.Text;\r
-    using System.Timers;\r
-    using System.Threading;\r
     using System.Windows.Media.Imaging;\r
-    using HandBrake.SourceData;\r
-    using HandBrake.Interop;\r
 \r
     /// <summary>\r
     /// A wrapper for a HandBrake instance.\r
@@ -137,7 +136,7 @@
                 HbLib.hb_register_error_handler(errorCallback);\r
             }\r
 \r
-            this.hbHandle = HbLib.hb_init(verbosity, update_check: 0);\r
+            this.hbHandle = HbLib.hb_init(verbosity, 0);\r
         }\r
 \r
         /// <summary>\r
@@ -252,7 +251,7 @@
             for (int i = 0; i < nativeJob.height; i++)\r
             {\r
                 Marshal.Copy(managedBuffer, i * nativeJob.width * 4, ptr, nativeJob.width * 4);\r
-                ptr = IntPtr.Add(ptr, bitmapData.Stride);\r
+                ptr = AddOffset(ptr, bitmapData.Stride);\r
             }\r
 \r
             bitmap.UnlockBits(bitmapData);\r
@@ -273,6 +272,11 @@
             }\r
         }\r
 \r
+        public static IntPtr AddOffset(IntPtr src, int offset)\r
+        {\r
+            return new IntPtr(src.ToInt64() + offset);\r
+        }\r
+\r
         /// <summary>\r
         /// Starts an encode with the given job.\r
         /// </summary>\r

diff --git a/win/C#/interop/HandBrakeInterop.csproj b/win/C#/interop/HandBrakeInterop.csproj
index e2d6c08..9526847 100644 (file)
--- a/win/C#/interop/HandBrakeInterop.csproj
+++ b/win/C#/interop/HandBrakeInterop.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>HandBrake.Interop</RootNamespace>\r
     <AssemblyName>HandBrakeInterop</AssemblyName>\r
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
     <FileUpgradeFlags>\r
     </FileUpgradeFlags>\r

diff --git a/win/C#/interop/HbLib.cs b/win/C#/interop/HbLib.cs
index e916322..da72521 100644 (file)
--- a/win/C#/interop/HbLib.cs
+++ b/win/C#/interop/HbLib.cs
@@ -1,11 +1,7 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Runtime.InteropServices;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop\r
 {\r
+    using System;\r
+    using System.Runtime.InteropServices;\r
 \r
     internal partial class NativeConstants\r
     {\r

diff --git a/win/C#/interop/InteropUtilities.cs b/win/C#/interop/InteropUtilities.cs
index d53c688..05f5bfa 100644 (file)
--- a/win/C#/interop/InteropUtilities.cs
+++ b/win/C#/interop/InteropUtilities.cs
@@ -2,8 +2,6 @@
 {\r
     using System;\r
     using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Text;\r
     using System.Runtime.InteropServices;\r
 \r
     /// <summary>\r

diff --git a/win/C#/interop/Language.cs b/win/C#/interop/Language.cs
index 609a4ec..e361105 100644 (file)
--- a/win/C#/interop/Language.cs
+++ b/win/C#/interop/Language.cs
@@ -1,10 +1,5 @@
 namespace HandBrake.Interop\r
 {\r
-    using System;\r
-    using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Text;\r
-\r
     /// <summary>\r
     /// Represents a language.\r
     /// </summary>\r

diff --git a/win/C#/interop/LanguageCodes.cs b/win/C#/interop/LanguageCodes.cs
index 0d45cc1..e83edfc 100644 (file)
--- a/win/C#/interop/LanguageCodes.cs
+++ b/win/C#/interop/LanguageCodes.cs
@@ -1,9 +1,6 @@
 namespace HandBrake.Interop\r
 {\r
-    using System;\r
     using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Text;\r
 \r
     /// <summary>\r
     /// Contains utilities for converting language codes.\r

diff --git a/win/C#/interop/MessageLoggedEventArgs.cs b/win/C#/interop/MessageLoggedEventArgs.cs
index a73b5ca..3956827 100644 (file)
--- a/win/C#/interop/MessageLoggedEventArgs.cs
+++ b/win/C#/interop/MessageLoggedEventArgs.cs
@@ -1,10 +1,7 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop\r
 {\r
+    using System;\r
+\r
     public class MessageLoggedEventArgs : EventArgs\r
     {\r
         public string Message { get; set; }\r

diff --git a/win/C#/interop/Model/Cropping.cs b/win/C#/interop/Model/Cropping.cs
index 1ba0e8e..bc5aad2 100644 (file)
--- a/win/C#/interop/Model/Cropping.cs
+++ b/win/C#/interop/Model/Cropping.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model\r
 {\r
     public class Cropping\r
     {\r

diff --git a/win/C#/interop/Model/EncodeJob.cs b/win/C#/interop/Model/EncodeJob.cs
index 53058a9..54f8ec1 100644 (file)
--- a/win/C#/interop/Model/EncodeJob.cs
+++ b/win/C#/interop/Model/EncodeJob.cs
@@ -1,11 +1,9 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Serialization;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model\r
 {\r
+    using System;\r
+    using System.Collections.Generic;\r
+    using System.Xml.Serialization;\r
+\r
     public class EncodeJob\r
     {\r
         public SourceType SourceType { get; set; }\r

diff --git a/win/C#/interop/Model/Encoding/Anamorphic.cs b/win/C#/interop/Model/Encoding/Anamorphic.cs
index 65a7f23..2000729 100644 (file)
--- a/win/C#/interop/Model/Encoding/Anamorphic.cs
+++ b/win/C#/interop/Model/Encoding/Anamorphic.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum Anamorphic\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/AudioEncoder.cs b/win/C#/interop/Model/Encoding/AudioEncoder.cs
index b4eee52..cfa213f 100644 (file)
--- a/win/C#/interop/Model/Encoding/AudioEncoder.cs
+++ b/win/C#/interop/Model/Encoding/AudioEncoder.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum AudioEncoder\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/AudioEncoding.cs b/win/C#/interop/Model/Encoding/AudioEncoding.cs
index 8ff112c..b329ab4 100644 (file)
--- a/win/C#/interop/Model/Encoding/AudioEncoding.cs
+++ b/win/C#/interop/Model/Encoding/AudioEncoding.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public class AudioEncoding\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/Decomb.cs b/win/C#/interop/Model/Encoding/Decomb.cs
index 9060b01..263f937 100644 (file)
--- a/win/C#/interop/Model/Encoding/Decomb.cs
+++ b/win/C#/interop/Model/Encoding/Decomb.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum Decomb\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/Deinterlace.cs b/win/C#/interop/Model/Encoding/Deinterlace.cs
index 365f600..6729b27 100644 (file)
--- a/win/C#/interop/Model/Encoding/Deinterlace.cs
+++ b/win/C#/interop/Model/Encoding/Deinterlace.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum Deinterlace\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/Denoise.cs b/win/C#/interop/Model/Encoding/Denoise.cs
index 146cbfd..4a53d68 100644 (file)
--- a/win/C#/interop/Model/Encoding/Denoise.cs
+++ b/win/C#/interop/Model/Encoding/Denoise.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum Denoise\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/Detelecine.cs b/win/C#/interop/Model/Encoding/Detelecine.cs
index 028abf4..c9f6844 100644 (file)
--- a/win/C#/interop/Model/Encoding/Detelecine.cs
+++ b/win/C#/interop/Model/Encoding/Detelecine.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum Detelecine\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/EncodingProfile.cs b/win/C#/interop/Model/Encoding/EncodingProfile.cs
index 443abf4..57d7d5d 100644 (file)
--- a/win/C#/interop/Model/Encoding/EncodingProfile.cs
+++ b/win/C#/interop/Model/Encoding/EncodingProfile.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;\r
 using System.Linq;\r
 using System.Text;\r
+using HandBrake.Interop.Model;\r
+using HandBrake.Interop.Model.Encoding;\r
 \r
 namespace HandBrake.Interop\r
 {\r

diff --git a/win/C#/interop/Model/Encoding/Mixdown.cs b/win/C#/interop/Model/Encoding/Mixdown.cs
index 2049d09..aca5c67 100644 (file)
--- a/win/C#/interop/Model/Encoding/Mixdown.cs
+++ b/win/C#/interop/Model/Encoding/Mixdown.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum Mixdown\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/OutputExtension.cs b/win/C#/interop/Model/Encoding/OutputExtension.cs
index bcf7095..04fbea1 100644 (file)
--- a/win/C#/interop/Model/Encoding/OutputExtension.cs
+++ b/win/C#/interop/Model/Encoding/OutputExtension.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum OutputExtension\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/OutputFormat.cs b/win/C#/interop/Model/Encoding/OutputFormat.cs
index 52549e7..a0dc0dd 100644 (file)
--- a/win/C#/interop/Model/Encoding/OutputFormat.cs
+++ b/win/C#/interop/Model/Encoding/OutputFormat.cs
@@ -1,10 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.ComponentModel;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum OutputFormat\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/VideoEncodeRateType.cs b/win/C#/interop/Model/Encoding/VideoEncodeRateType.cs
index 6c39e54..fa081de 100644 (file)
--- a/win/C#/interop/Model/Encoding/VideoEncodeRateType.cs
+++ b/win/C#/interop/Model/Encoding/VideoEncodeRateType.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum VideoEncodeRateType\r
     {\r

diff --git a/win/C#/interop/Model/Encoding/VideoEncoder.cs b/win/C#/interop/Model/Encoding/VideoEncoder.cs
index 912117b..47f0b81 100644 (file)
--- a/win/C#/interop/Model/Encoding/VideoEncoder.cs
+++ b/win/C#/interop/Model/Encoding/VideoEncoder.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     public enum VideoEncoder\r
     {\r

diff --git a/win/C#/interop/Model/Size.cs b/win/C#/interop/Model/Size.cs
index f94cbd2..971365a 100644 (file)
--- a/win/C#/interop/Model/Size.cs
+++ b/win/C#/interop/Model/Size.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model\r
 {\r
     public class Size\r
     {\r

diff --git a/win/C#/interop/Model/SourceSubtitle.cs b/win/C#/interop/Model/SourceSubtitle.cs
index edfb68b..992209d 100644 (file)
--- a/win/C#/interop/Model/SourceSubtitle.cs
+++ b/win/C#/interop/Model/SourceSubtitle.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model\r
 {\r
     public class SourceSubtitle\r
     {\r

diff --git a/win/C#/interop/Model/SourceType.cs b/win/C#/interop/Model/SourceType.cs
index 1a53aab..f720a99 100644 (file)
--- a/win/C#/interop/Model/SourceType.cs
+++ b/win/C#/interop/Model/SourceType.cs
@@ -1,4 +1,4 @@
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model\r
 {\r
     public enum SourceType\r
     {\r

diff --git a/win/C#/interop/Model/SrtSubtitle.cs b/win/C#/interop/Model/SrtSubtitle.cs
index 199fe6a..8863582 100644 (file)
--- a/win/C#/interop/Model/SrtSubtitle.cs
+++ b/win/C#/interop/Model/SrtSubtitle.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model\r
 {\r
     public class SrtSubtitle\r
     {\r

diff --git a/win/C#/interop/Model/Subtitles.cs b/win/C#/interop/Model/Subtitles.cs
index 1fab735..10506d9 100644 (file)
--- a/win/C#/interop/Model/Subtitles.cs
+++ b/win/C#/interop/Model/Subtitles.cs
@@ -1,10 +1,7 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop.Model\r
 {\r
+    using System.Collections.Generic;\r
+\r
     public class Subtitles\r
     {\r
         public List<SrtSubtitle> SrtSubtitles { get; set; }\r

diff --git a/win/C#/interop/NativeList.cs b/win/C#/interop/NativeList.cs
index c16c099..e0fd1be 100644 (file)
--- a/win/C#/interop/NativeList.cs
+++ b/win/C#/interop/NativeList.cs
@@ -2,8 +2,6 @@
 {\r
     using System;\r
     using System.Collections.Generic;\r
-    using System.Linq;\r
-    using System.Text;\r
 \r
     /// <summary>\r
     /// Represents a HandBrake style native list.\r

diff --git a/win/C#/interop/ScanProgressEventArgs.cs b/win/C#/interop/ScanProgressEventArgs.cs
index f7e3a0f..5c0186b 100644 (file)
--- a/win/C#/interop/ScanProgressEventArgs.cs
+++ b/win/C#/interop/ScanProgressEventArgs.cs
@@ -1,10 +1,7 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.Interop\r
+namespace HandBrake.Interop\r
 {\r
+    using System;\r
+\r
     public class ScanProgressEventArgs : EventArgs\r
     {\r
         public int CurrentTitle { get; set; }\r

diff --git a/win/C#/interop/SourceData/AudioTrack.cs b/win/C#/interop/SourceData/AudioTrack.cs
index 735ddd9..13408b3 100644 (file)
--- a/win/C#/interop/SourceData/AudioTrack.cs
+++ b/win/C#/interop/SourceData/AudioTrack.cs
@@ -1,15 +1,9 @@
 /*  AudioTrack.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr>.\r
-          It may be used under the terms of the GNU General Public License. */\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
 \r
-using System;\r
-using System.Collections.Generic;\r
-using System.IO;\r
-using System.Text.RegularExpressions;\r
-\r
-namespace HandBrake.SourceData\r
+namespace HandBrake.Interop.SourceData\r
 {\r
     /// <summary>\r
     /// An object represending an AudioTrack associated with a Title, in a DVD\r

diff --git a/win/C#/interop/SourceData/Chapter.cs b/win/C#/interop/SourceData/Chapter.cs
index 8e41282..25c82c6 100644 (file)
--- a/win/C#/interop/SourceData/Chapter.cs
+++ b/win/C#/interop/SourceData/Chapter.cs
@@ -1,16 +1,12 @@
 /*  Chapter.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr>.\r
-          It may be used under the terms of the GNU General Public License. */\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
 \r
-using System;\r
-using System.Collections.Generic;\r
-using System.IO;\r
-using System.Text.RegularExpressions;\r
-\r
-namespace HandBrake.SourceData\r
+namespace HandBrake.Interop.SourceData\r
 {\r
+    using System;\r
+\r
     /// <summary>\r
     /// An object representing a Chapter aosciated with a Title, in a DVD\r
     /// </summary>\r

diff --git a/win/C#/interop/SourceData/Subtitle.cs b/win/C#/interop/SourceData/Subtitle.cs
index bf5d4e5..af9dc23 100644 (file)
--- a/win/C#/interop/SourceData/Subtitle.cs
+++ b/win/C#/interop/SourceData/Subtitle.cs
@@ -1,14 +1,9 @@
 /*  Subtitle.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr>.\r
-          It may be used under the terms of the GNU General Public License. */\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
 \r
-using System.Collections.Generic;\r
-using System.IO;\r
-using System.Text.RegularExpressions;\r
-\r
-namespace HandBrake.SourceData\r
+namespace HandBrake.Interop.SourceData\r
 {\r
     /// <summary>\r
     /// An object that represents a subtitle associated with a Title, in a DVD\r

diff --git a/win/C#/interop/SourceData/SubtitleType.cs b/win/C#/interop/SourceData/SubtitleType.cs
index 68904fe..8955c7a 100644 (file)
--- a/win/C#/interop/SourceData/SubtitleType.cs
+++ b/win/C#/interop/SourceData/SubtitleType.cs
@@ -1,9 +1,4 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-\r
-namespace HandBrake.SourceData\r
+namespace HandBrake.Interop.SourceData\r
 {\r
     public enum SubtitleType\r
     {\r

diff --git a/win/C#/interop/SourceData/Title.cs b/win/C#/interop/SourceData/Title.cs
index 8d69494..0d3da5d 100644 (file)
--- a/win/C#/interop/SourceData/Title.cs
+++ b/win/C#/interop/SourceData/Title.cs
@@ -1,18 +1,16 @@
 /*  Title.cs $\r
-       \r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.fr>.\r
-          It may be used under the terms of the GNU General Public License. */\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
 \r
-using System;\r
-using System.Collections.Generic;\r
-using System.Globalization;\r
-using System.IO;\r
-using System.Text.RegularExpressions;\r
-using HandBrake.Interop;\r
+using HandBrake.Interop.Model;\r
 \r
-namespace HandBrake.SourceData\r
+namespace HandBrake.Interop.SourceData\r
 {\r
+    using System;\r
+    using System.Collections.Generic;\r
+    using System.Globalization;\r
+\r
     /// <summary>\r
     /// An object that represents a single Title of a DVD\r
     /// </summary>\r