diff options
36 files changed, 79 insertions, 209 deletions
diff --git a/win/C#/interop/DisplayStringAttribute.cs b/win/C#/interop/DisplayStringAttribute.cs index 3f7e62d87..7c1f54768 100644 --- a/win/C#/interop/DisplayStringAttribute.cs +++ b/win/C#/interop/DisplayStringAttribute.cs @@ -1,10 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop
{
+ using System;
+
[AttributeUsage(AttributeTargets.Field)]
public sealed class DisplayStringAttribute : Attribute
{
diff --git a/win/C#/interop/EncodeProgressEventArgs.cs b/win/C#/interop/EncodeProgressEventArgs.cs index 7f08595a7..9500bdaaf 100644 --- a/win/C#/interop/EncodeProgressEventArgs.cs +++ b/win/C#/interop/EncodeProgressEventArgs.cs @@ -1,10 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop
{
+ using System;
+
public class EncodeProgressEventArgs : EventArgs
{
public float FractionComplete { get; set; }
diff --git a/win/C#/interop/HandBrakeInstance.cs b/win/C#/interop/HandBrakeInstance.cs index c9d1e1a45..c50fc043b 100644 --- a/win/C#/interop/HandBrakeInstance.cs +++ b/win/C#/interop/HandBrakeInstance.cs @@ -1,16 +1,15 @@ -namespace HandBrake.Interop
+using HandBrake.Interop.Model;
+using HandBrake.Interop.Model.Encoding;
+using HandBrake.Interop.SourceData;
+
+namespace HandBrake.Interop
{
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
- using System.Text;
- using System.Timers;
- using System.Threading;
using System.Windows.Media.Imaging;
- using HandBrake.SourceData;
- using HandBrake.Interop;
/// <summary>
/// A wrapper for a HandBrake instance.
@@ -137,7 +136,7 @@ HbLib.hb_register_error_handler(errorCallback);
}
- this.hbHandle = HbLib.hb_init(verbosity, update_check: 0);
+ this.hbHandle = HbLib.hb_init(verbosity, 0);
}
/// <summary>
@@ -252,7 +251,7 @@ for (int i = 0; i < nativeJob.height; i++)
{
Marshal.Copy(managedBuffer, i * nativeJob.width * 4, ptr, nativeJob.width * 4);
- ptr = IntPtr.Add(ptr, bitmapData.Stride);
+ ptr = AddOffset(ptr, bitmapData.Stride);
}
bitmap.UnlockBits(bitmapData);
@@ -273,6 +272,11 @@ }
}
+ public static IntPtr AddOffset(IntPtr src, int offset)
+ {
+ return new IntPtr(src.ToInt64() + offset);
+ }
+
/// <summary>
/// Starts an encode with the given job.
/// </summary>
diff --git a/win/C#/interop/HandBrakeInterop.csproj b/win/C#/interop/HandBrakeInterop.csproj index e2d6c0868..95268478b 100644 --- a/win/C#/interop/HandBrakeInterop.csproj +++ b/win/C#/interop/HandBrakeInterop.csproj @@ -10,7 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HandBrake.Interop</RootNamespace>
<AssemblyName>HandBrakeInterop</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/win/C#/interop/HbLib.cs b/win/C#/interop/HbLib.cs index e91632258..da72521dd 100644 --- a/win/C#/interop/HbLib.cs +++ b/win/C#/interop/HbLib.cs @@ -1,11 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Runtime.InteropServices;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop
{
+ using System;
+ using System.Runtime.InteropServices;
internal partial class NativeConstants
{
diff --git a/win/C#/interop/InteropUtilities.cs b/win/C#/interop/InteropUtilities.cs index d53c68883..05f5bfa6e 100644 --- a/win/C#/interop/InteropUtilities.cs +++ b/win/C#/interop/InteropUtilities.cs @@ -2,8 +2,6 @@ {
using System;
using System.Collections.Generic;
- using System.Linq;
- using System.Text;
using System.Runtime.InteropServices;
/// <summary>
diff --git a/win/C#/interop/Language.cs b/win/C#/interop/Language.cs index 609a4ec64..e36110585 100644 --- a/win/C#/interop/Language.cs +++ b/win/C#/interop/Language.cs @@ -1,10 +1,5 @@ namespace HandBrake.Interop
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Text;
-
/// <summary>
/// Represents a language.
/// </summary>
diff --git a/win/C#/interop/LanguageCodes.cs b/win/C#/interop/LanguageCodes.cs index 0d45cc1da..e83edfc1b 100644 --- a/win/C#/interop/LanguageCodes.cs +++ b/win/C#/interop/LanguageCodes.cs @@ -1,9 +1,6 @@ namespace HandBrake.Interop
{
- using System;
using System.Collections.Generic;
- using System.Linq;
- using System.Text;
/// <summary>
/// Contains utilities for converting language codes.
diff --git a/win/C#/interop/MessageLoggedEventArgs.cs b/win/C#/interop/MessageLoggedEventArgs.cs index a73b5ca0b..3956827ff 100644 --- a/win/C#/interop/MessageLoggedEventArgs.cs +++ b/win/C#/interop/MessageLoggedEventArgs.cs @@ -1,10 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop
{
+ using System;
+
public class MessageLoggedEventArgs : EventArgs
{
public string Message { get; set; }
diff --git a/win/C#/interop/Model/Cropping.cs b/win/C#/interop/Model/Cropping.cs index 1ba0e8ee1..bc5aad24e 100644 --- a/win/C#/interop/Model/Cropping.cs +++ b/win/C#/interop/Model/Cropping.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model
{
public class Cropping
{
diff --git a/win/C#/interop/Model/EncodeJob.cs b/win/C#/interop/Model/EncodeJob.cs index 53058a921..54f8ec194 100644 --- a/win/C#/interop/Model/EncodeJob.cs +++ b/win/C#/interop/Model/EncodeJob.cs @@ -1,11 +1,9 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Serialization;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model
{
+ using System;
+ using System.Collections.Generic;
+ using System.Xml.Serialization;
+
public class EncodeJob
{
public SourceType SourceType { get; set; }
diff --git a/win/C#/interop/Model/Encoding/Anamorphic.cs b/win/C#/interop/Model/Encoding/Anamorphic.cs index 65a7f2352..20007296e 100644 --- a/win/C#/interop/Model/Encoding/Anamorphic.cs +++ b/win/C#/interop/Model/Encoding/Anamorphic.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum Anamorphic
{
diff --git a/win/C#/interop/Model/Encoding/AudioEncoder.cs b/win/C#/interop/Model/Encoding/AudioEncoder.cs index b4eee5249..cfa213f16 100644 --- a/win/C#/interop/Model/Encoding/AudioEncoder.cs +++ b/win/C#/interop/Model/Encoding/AudioEncoder.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum AudioEncoder
{
diff --git a/win/C#/interop/Model/Encoding/AudioEncoding.cs b/win/C#/interop/Model/Encoding/AudioEncoding.cs index 8ff112c35..b329ab419 100644 --- a/win/C#/interop/Model/Encoding/AudioEncoding.cs +++ b/win/C#/interop/Model/Encoding/AudioEncoding.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public class AudioEncoding
{
diff --git a/win/C#/interop/Model/Encoding/Decomb.cs b/win/C#/interop/Model/Encoding/Decomb.cs index 9060b01eb..263f9375f 100644 --- a/win/C#/interop/Model/Encoding/Decomb.cs +++ b/win/C#/interop/Model/Encoding/Decomb.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum Decomb
{
diff --git a/win/C#/interop/Model/Encoding/Deinterlace.cs b/win/C#/interop/Model/Encoding/Deinterlace.cs index 365f6003c..6729b274a 100644 --- a/win/C#/interop/Model/Encoding/Deinterlace.cs +++ b/win/C#/interop/Model/Encoding/Deinterlace.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum Deinterlace
{
diff --git a/win/C#/interop/Model/Encoding/Denoise.cs b/win/C#/interop/Model/Encoding/Denoise.cs index 146cbfd6f..4a53d6870 100644 --- a/win/C#/interop/Model/Encoding/Denoise.cs +++ b/win/C#/interop/Model/Encoding/Denoise.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum Denoise
{
diff --git a/win/C#/interop/Model/Encoding/Detelecine.cs b/win/C#/interop/Model/Encoding/Detelecine.cs index 028abf44b..c9f68442a 100644 --- a/win/C#/interop/Model/Encoding/Detelecine.cs +++ b/win/C#/interop/Model/Encoding/Detelecine.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum Detelecine
{
diff --git a/win/C#/interop/Model/Encoding/EncodingProfile.cs b/win/C#/interop/Model/Encoding/EncodingProfile.cs index 443abf477..57d7d5dfe 100644 --- a/win/C#/interop/Model/Encoding/EncodingProfile.cs +++ b/win/C#/interop/Model/Encoding/EncodingProfile.cs @@ -2,6 +2,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
+using HandBrake.Interop.Model;
+using HandBrake.Interop.Model.Encoding;
namespace HandBrake.Interop
{
diff --git a/win/C#/interop/Model/Encoding/Mixdown.cs b/win/C#/interop/Model/Encoding/Mixdown.cs index 2049d0921..aca5c6717 100644 --- a/win/C#/interop/Model/Encoding/Mixdown.cs +++ b/win/C#/interop/Model/Encoding/Mixdown.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum Mixdown
{
diff --git a/win/C#/interop/Model/Encoding/OutputExtension.cs b/win/C#/interop/Model/Encoding/OutputExtension.cs index bcf709576..04fbea13a 100644 --- a/win/C#/interop/Model/Encoding/OutputExtension.cs +++ b/win/C#/interop/Model/Encoding/OutputExtension.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum OutputExtension
{
diff --git a/win/C#/interop/Model/Encoding/OutputFormat.cs b/win/C#/interop/Model/Encoding/OutputFormat.cs index 52549e763..a0dc0dd00 100644 --- a/win/C#/interop/Model/Encoding/OutputFormat.cs +++ b/win/C#/interop/Model/Encoding/OutputFormat.cs @@ -1,10 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum OutputFormat
{
diff --git a/win/C#/interop/Model/Encoding/VideoEncodeRateType.cs b/win/C#/interop/Model/Encoding/VideoEncodeRateType.cs index 6c39e54d6..fa081de59 100644 --- a/win/C#/interop/Model/Encoding/VideoEncodeRateType.cs +++ b/win/C#/interop/Model/Encoding/VideoEncodeRateType.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum VideoEncodeRateType
{
diff --git a/win/C#/interop/Model/Encoding/VideoEncoder.cs b/win/C#/interop/Model/Encoding/VideoEncoder.cs index 912117b48..47f0b81c1 100644 --- a/win/C#/interop/Model/Encoding/VideoEncoder.cs +++ b/win/C#/interop/Model/Encoding/VideoEncoder.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model.Encoding
{
public enum VideoEncoder
{
diff --git a/win/C#/interop/Model/Size.cs b/win/C#/interop/Model/Size.cs index f94cbd2fa..971365aff 100644 --- a/win/C#/interop/Model/Size.cs +++ b/win/C#/interop/Model/Size.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model
{
public class Size
{
diff --git a/win/C#/interop/Model/SourceSubtitle.cs b/win/C#/interop/Model/SourceSubtitle.cs index edfb68bf7..992209dfe 100644 --- a/win/C#/interop/Model/SourceSubtitle.cs +++ b/win/C#/interop/Model/SourceSubtitle.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model
{
public class SourceSubtitle
{
diff --git a/win/C#/interop/Model/SourceType.cs b/win/C#/interop/Model/SourceType.cs index 1a53aab32..f720a99ea 100644 --- a/win/C#/interop/Model/SourceType.cs +++ b/win/C#/interop/Model/SourceType.cs @@ -1,4 +1,4 @@ -namespace HandBrake.Interop
+namespace HandBrake.Interop.Model
{
public enum SourceType
{
diff --git a/win/C#/interop/Model/SrtSubtitle.cs b/win/C#/interop/Model/SrtSubtitle.cs index 199fe6ac6..88635821e 100644 --- a/win/C#/interop/Model/SrtSubtitle.cs +++ b/win/C#/interop/Model/SrtSubtitle.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model
{
public class SrtSubtitle
{
diff --git a/win/C#/interop/Model/Subtitles.cs b/win/C#/interop/Model/Subtitles.cs index 1fab7354e..10506d9af 100644 --- a/win/C#/interop/Model/Subtitles.cs +++ b/win/C#/interop/Model/Subtitles.cs @@ -1,10 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model
{
+ using System.Collections.Generic;
+
public class Subtitles
{
public List<SrtSubtitle> SrtSubtitles { get; set; }
diff --git a/win/C#/interop/NativeList.cs b/win/C#/interop/NativeList.cs index c16c09950..e0fd1bed0 100644 --- a/win/C#/interop/NativeList.cs +++ b/win/C#/interop/NativeList.cs @@ -2,8 +2,6 @@ {
using System;
using System.Collections.Generic;
- using System.Linq;
- using System.Text;
/// <summary>
/// Represents a HandBrake style native list.
diff --git a/win/C#/interop/ScanProgressEventArgs.cs b/win/C#/interop/ScanProgressEventArgs.cs index f7e3a0f67..5c0186bb0 100644 --- a/win/C#/interop/ScanProgressEventArgs.cs +++ b/win/C#/interop/ScanProgressEventArgs.cs @@ -1,10 +1,7 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.Interop
+namespace HandBrake.Interop
{
+ using System;
+
public class ScanProgressEventArgs : EventArgs
{
public int CurrentTitle { get; set; }
diff --git a/win/C#/interop/SourceData/AudioTrack.cs b/win/C#/interop/SourceData/AudioTrack.cs index 735ddd965..13408b3dd 100644 --- a/win/C#/interop/SourceData/AudioTrack.cs +++ b/win/C#/interop/SourceData/AudioTrack.cs @@ -1,15 +1,9 @@ /* AudioTrack.cs $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.RegularExpressions;
-
-namespace HandBrake.SourceData
+namespace HandBrake.Interop.SourceData
{
/// <summary>
/// An object represending an AudioTrack associated with a Title, in a DVD
diff --git a/win/C#/interop/SourceData/Chapter.cs b/win/C#/interop/SourceData/Chapter.cs index 8e41282c4..25c82c6e4 100644 --- a/win/C#/interop/SourceData/Chapter.cs +++ b/win/C#/interop/SourceData/Chapter.cs @@ -1,16 +1,12 @@ /* Chapter.cs $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.RegularExpressions;
-
-namespace HandBrake.SourceData
+namespace HandBrake.Interop.SourceData
{
+ using System;
+
/// <summary>
/// An object representing a Chapter aosciated with a Title, in a DVD
/// </summary>
diff --git a/win/C#/interop/SourceData/Subtitle.cs b/win/C#/interop/SourceData/Subtitle.cs index bf5d4e548..af9dc2311 100644 --- a/win/C#/interop/SourceData/Subtitle.cs +++ b/win/C#/interop/SourceData/Subtitle.cs @@ -1,14 +1,9 @@ /* Subtitle.cs $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
-using System.Collections.Generic;
-using System.IO;
-using System.Text.RegularExpressions;
-
-namespace HandBrake.SourceData
+namespace HandBrake.Interop.SourceData
{
/// <summary>
/// An object that represents a subtitle associated with a Title, in a DVD
diff --git a/win/C#/interop/SourceData/SubtitleType.cs b/win/C#/interop/SourceData/SubtitleType.cs index 68904fed4..8955c7aff 100644 --- a/win/C#/interop/SourceData/SubtitleType.cs +++ b/win/C#/interop/SourceData/SubtitleType.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HandBrake.SourceData
+namespace HandBrake.Interop.SourceData
{
public enum SubtitleType
{
diff --git a/win/C#/interop/SourceData/Title.cs b/win/C#/interop/SourceData/Title.cs index 8d69494ef..0d3da5d3a 100644 --- a/win/C#/interop/SourceData/Title.cs +++ b/win/C#/interop/SourceData/Title.cs @@ -1,18 +1,16 @@ /* Title.cs $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr>.
+ It may be used under the terms of the GNU General Public License. */
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text.RegularExpressions;
-using HandBrake.Interop;
+using HandBrake.Interop.Model;
-namespace HandBrake.SourceData
+namespace HandBrake.Interop.SourceData
{
+ using System;
+ using System.Collections.Generic;
+ using System.Globalization;
+
/// <summary>
/// An object that represents a single Title of a DVD
/// </summary>
|