WinGui: Moving the Interop Converts to the Top level as well since it's considered the core api of this library.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6707 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 15 insertions, 15 deletions

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeEncoderHelpers.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeEncoderHelpers.cs
index 80b1fc3ad..c42203566 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeEncoderHelpers.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeEncoderHelpers.cs
@@ -75,7 +75,7 @@ namespace HandBrake.Interop
 			{

 				if (audioEncoders == null)

 				{

-					audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(HBFunctions.hb_audio_encoder_get_next, Converters.Converters.NativeToAudioEncoder);

+                    audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(HBFunctions.hb_audio_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToAudioEncoder);

 				}

 

 				return audioEncoders;

@@ -91,7 +91,7 @@ namespace HandBrake.Interop
 			{

 				if (videoEncoders == null)

 				{

-					videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(HBFunctions.hb_video_encoder_get_next, Converters.Converters.NativeToVideoEncoder);

+                    videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(HBFunctions.hb_video_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToVideoEncoder);

 				}

 

 				return videoEncoders;

@@ -107,7 +107,7 @@ namespace HandBrake.Interop
 			{

 				if (videoFramerates == null)

 				{

-					videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_video_framerate_get_next, Converters.Converters.NativeToRate);

+                    videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_video_framerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);

 				}

 

 				return videoFramerates;

@@ -123,7 +123,7 @@ namespace HandBrake.Interop
 			{

 				if (mixdowns == null)

 				{

-					mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(HBFunctions.hb_mixdown_get_next, Converters.Converters.NativeToMixdown);

+                    mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(HBFunctions.hb_mixdown_get_next, HandBrakeUnitConversionHelpers.NativeToMixdown);

 				}

 

 				return mixdowns;

@@ -155,7 +155,7 @@ namespace HandBrake.Interop
 			{

 				if (audioSampleRates == null)

 				{

-					audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_audio_samplerate_get_next, Converters.Converters.NativeToRate);

+                    audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_audio_samplerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);

 				}

 

 				return audioSampleRates;

@@ -171,7 +171,7 @@ namespace HandBrake.Interop
 			{

 				if (containers == null)

 				{

-					containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(HBFunctions.hb_container_get_next, Converters.Converters.NativeToContainer);

+                    containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(HBFunctions.hb_container_get_next, HandBrakeUnitConversionHelpers.NativeToContainer);

 				}

 

 				return containers;

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
index da3060766..6df1d6a36 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
@@ -152,7 +152,7 @@
   </ItemGroup>

   <ItemGroup>

     <Compile Include="Attributes\ShortName.cs" />

-    <Compile Include="Converters\Converters.cs" />

+    <Compile Include="HandBrakeUnitConversionHelpers.cs" />

     <Compile Include="EventArgs\EncodeCompletedEventArgs.cs" />

     <Compile Include="EventArgs\EncodeProgressEventArgs.cs" />

     <Compile Include="HandBrakeUtils.cs" />

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUnitConversionHelpers.cs
index 8f7003c29..630b6e6e5 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUnitConversionHelpers.cs
@@ -1,13 +1,13 @@
 // --------------------------------------------------------------------------------------------------------------------

-// <copyright file="Converters.cs" company="HandBrake Project (http://handbrake.fr)">

+// <copyright file="HandBrakeUnitConversionHelpers.cs" company="HandBrake Project (http://handbrake.fr)">

 //   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

 // </copyright>

 // <summary>

-//   Defines the Converters type.

+//   Defines the HandrakeUnitConversionHelpers type.

 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.Interop.Converters

+namespace HandBrake.Interop

 {

     using System;

     using System.Collections.Generic;

@@ -21,7 +21,7 @@ namespace HandBrake.Interop.Converters
     /// <summary>

 	/// Converters for various encoding values.

 	/// </summary>

-	public static class Converters

+    public static class HandBrakeUnitConversionHelpers

 	{

 		/// <summary>

 		/// Video Frame Rates

@@ -29,9 +29,9 @@ namespace HandBrake.Interop.Converters
 		private static readonly Dictionary<double, int> VideoRates;

 

 		/// <summary>

-		/// Initializes static members of the Converters class.

+        /// Initializes static members of the HandBrakeUnitConversionHelpers class.

 		/// </summary>

-		static Converters()

+        static HandBrakeUnitConversionHelpers()

 		{

 			HandBrakeUtils.EnsureGlobalInit();

 

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs
index 7dfe40301..3bc522e2a 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs
@@ -33,7 +33,7 @@ namespace HandBrake.Interop.Helpers
 			{

 			    return allLanguages

 			           ?? (allLanguages =

-			               InteropUtilities.ToListFromIterator<iso639_lang_t, Language>(HBFunctions.lang_get_next, Converters.Converters.NativeToLanguage));

+			               InteropUtilities.ToListFromIterator<iso639_lang_t, Language>(HBFunctions.lang_get_next, Converters.NativeToLanguage));

 			}

 		}

 

@@ -45,7 +45,7 @@ namespace HandBrake.Interop.Helpers
 		public static Language Get(string code)

 		{

 			iso639_lang_t language = InteropUtilities.ToStructureFromPtr<iso639_lang_t>(HBFunctions.lang_for_code2(code));

-			return Converters.Converters.NativeToLanguage(language);

+			return Converters.NativeToLanguage(language);

 		}

 	}

 }