]> granicus.if.org Git - handbrake/commitdiff
WinGui: Move the Encoders class to the root level of the Interop Library and Rename...
authorsr55 <sr55.hb@outlook.com>
Fri, 9 Jan 2015 21:24:39 +0000 (21:24 +0000)
committersr55 <sr55.hb@outlook.com>
Fri, 9 Jan 2015 21:24:39 +0000 (21:24 +0000)
Remove some region from small classes where they don't offer any benifit.

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

15 files changed:
win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeEncoderHelpers.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs with 93% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBContainer.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Profile.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/RangeLimits.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs

index 100ea1554f291a9adc1a734c71ab0a507557d43a..8f7003c29dd6f57803fb1a2583a4aaf1f1683a0b 100644 (file)
@@ -36,7 +36,7 @@ namespace HandBrake.Interop.Converters
                        HandBrakeUtils.EnsureGlobalInit();\r
 \r
                        VideoRates = new Dictionary<double, int>();\r
-                       foreach (var framerate in Encoders.VideoFramerates)\r
+            foreach (var framerate in HandBrakeEncoderHelpers.VideoFramerates)\r
                        {\r
                                VideoRates.Add(double.Parse(framerate.Name, CultureInfo.InvariantCulture), framerate.Rate);\r
                        }\r
@@ -100,10 +100,10 @@ namespace HandBrake.Interop.Converters
                                             Id = encoder.codec, \r
                                             ShortName = encoder.short_name, \r
                                             DisplayName = encoder.name, \r
-                                            CompatibleContainers = encoder.muxers, \r
-                                            QualityLimits = Encoders.GetAudioQualityLimits(encoder.codec), \r
+                                            CompatibleContainers = encoder.muxers,\r
+                                 QualityLimits = HandBrakeEncoderHelpers.GetAudioQualityLimits(encoder.codec), \r
                                             DefaultQuality = HBFunctions.hb_audio_quality_get_default((uint)encoder.codec), \r
-                                            CompressionLimits = Encoders.GetAudioCompressionLimits(encoder.codec), \r
+                                            CompressionLimits = HandBrakeEncoderHelpers.GetAudioCompressionLimits(encoder.codec), \r
                                             DefaultCompression =\r
                                             HBFunctions.hb_audio_compression_get_default((uint)encoder.codec)\r
                                         };\r
similarity index 93%
rename from win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs
rename to win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeEncoderHelpers.cs
index 8a4c737f062f750fddd4a10e64134f9073929c16..80b1fc3ad5f05b2198c15a92659bbb0ab4ceca42 100644 (file)
@@ -7,21 +7,21 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.Interop.Model\r
+namespace HandBrake.Interop\r
 {\r
     using System.Collections.Generic;\r
     using System.Linq;\r
 \r
-    using HandBrake.Interop.Converters;\r
     using HandBrake.Interop.HbLib;\r
     using HandBrake.Interop.Helpers;\r
+    using HandBrake.Interop.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Scan;\r
 \r
     /// <summary>\r
        /// The encoders.\r
        /// </summary>\r
-       public static class Encoders\r
+       public static class HandBrakeEncoderHelpers\r
        {\r
                /// <summary>\r
                /// The audio encoders.\r
@@ -59,9 +59,9 @@ namespace HandBrake.Interop.Model
                private static List<HBRate> audioSampleRates; \r
 \r
                /// <summary>\r
-               /// Initializes static members of the Encoders class.\r
+        /// Initializes static members of the EncoderHelpers class.\r
                /// </summary>\r
-               static Encoders()\r
+        static HandBrakeEncoderHelpers()\r
                {\r
                        HandBrakeUtils.EnsureGlobalInit();\r
                }\r
@@ -75,7 +75,7 @@ namespace HandBrake.Interop.Model
                        {\r
                                if (audioEncoders == null)\r
                                {\r
-                                       audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(HBFunctions.hb_audio_encoder_get_next, Converters.NativeToAudioEncoder);\r
+                                       audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(HBFunctions.hb_audio_encoder_get_next, Converters.Converters.NativeToAudioEncoder);\r
                                }\r
 \r
                                return audioEncoders;\r
@@ -91,7 +91,7 @@ namespace HandBrake.Interop.Model
                        {\r
                                if (videoEncoders == null)\r
                                {\r
-                                       videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(HBFunctions.hb_video_encoder_get_next, Converters.NativeToVideoEncoder);\r
+                                       videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(HBFunctions.hb_video_encoder_get_next, Converters.Converters.NativeToVideoEncoder);\r
                                }\r
 \r
                                return videoEncoders;\r
@@ -107,7 +107,7 @@ namespace HandBrake.Interop.Model
                        {\r
                                if (videoFramerates == null)\r
                                {\r
-                                       videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_video_framerate_get_next, Converters.NativeToRate);\r
+                                       videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_video_framerate_get_next, Converters.Converters.NativeToRate);\r
                                }\r
 \r
                                return videoFramerates;\r
@@ -123,7 +123,7 @@ namespace HandBrake.Interop.Model
                        {\r
                                if (mixdowns == null)\r
                                {\r
-                                       mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(HBFunctions.hb_mixdown_get_next, Converters.NativeToMixdown);\r
+                                       mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(HBFunctions.hb_mixdown_get_next, Converters.Converters.NativeToMixdown);\r
                                }\r
 \r
                                return mixdowns;\r
@@ -155,7 +155,7 @@ namespace HandBrake.Interop.Model
                        {\r
                                if (audioSampleRates == null)\r
                                {\r
-                                       audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_audio_samplerate_get_next, Converters.NativeToRate);\r
+                                       audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_audio_samplerate_get_next, Converters.Converters.NativeToRate);\r
                                }\r
 \r
                                return audioSampleRates;\r
@@ -171,7 +171,7 @@ namespace HandBrake.Interop.Model
                        {\r
                                if (containers == null)\r
                                {\r
-                                       containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(HBFunctions.hb_container_get_next, Converters.NativeToContainer);\r
+                                       containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(HBFunctions.hb_container_get_next, Converters.Converters.NativeToContainer);\r
                                }\r
 \r
                                return containers;\r
index 936cff5bbaa24a4e84d557a19f3cc31a7be29c29..da3060766db5e96a91c967258d87b1c808bc08e7 100644 (file)
     <Compile Include="EventArgs\MessageLoggedEventArgs.cs" />\r
     <Compile Include="Model\Cropping.cs" />\r
     <Compile Include="Model\EncodeJob.cs" />\r
-    <Compile Include="Model\Encoders.cs" />\r
+    <Compile Include="HandBrakeEncoderHelpers.cs" />\r
     <Compile Include="Model\Encoding\Anamorphic.cs" />\r
     <Compile Include="Model\Encoding\AudioEncodeRateType.cs" />\r
     <Compile Include="Model\Encoding\CroppingType.cs" />\r
index c1f5a5cadc8b2a13ec76ce562e544286ccdc9a80..4cb51886d556b8f5a96a148471f43172ac06e16a 100644 (file)
@@ -393,7 +393,7 @@ namespace HandBrake.Interop
                 int samplesPerFrame = GetAudioSamplesPerFrame(encoding.Encoder);\r
                 int audioBitrate;\r
 \r
-                HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(encoding.Encoder);\r
+                HBAudioEncoder audioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(encoding.Encoder);\r
 \r
                 if (audioEncoder.IsPassthrough)\r
                 {\r
@@ -414,10 +414,10 @@ namespace HandBrake.Interop
                     }\r
                     else\r
                     {\r
-                        outputBitrate = Encoders.GetDefaultBitrate(\r
+                        outputBitrate = HandBrakeEncoderHelpers.GetDefaultBitrate(\r
                             audioEncoder, \r
-                            encoding.SampleRateRaw == 0 ? track.SampleRate : encoding.SampleRateRaw, \r
-                            Encoders.SanitizeMixdown(Encoders.GetMixdown(encoding.Mixdown), audioEncoder, track.ChannelLayout));\r
+                            encoding.SampleRateRaw == 0 ? track.SampleRate : encoding.SampleRateRaw,\r
+                            HandBrakeEncoderHelpers.SanitizeMixdown(HandBrakeEncoderHelpers.GetMixdown(encoding.Mixdown), audioEncoder, track.ChannelLayout));\r
                     }\r
 \r
                     // Output bitrate is in kbps.\r
index f9e3ef074e6a974e9e25518e73a2945e8e40656e..88bae4116f090f50f6013a9f09da44584997f60e 100644 (file)
@@ -216,7 +216,7 @@ namespace HandBrake.Interop.Json.Factories
         {\r
             Video video = new Video();\r
 \r
-            HBVideoEncoder videoEncoder = Encoders.VideoEncoders.FirstOrDefault(e => e.ShortName == job.EncodingProfile.VideoEncoder);\r
+            HBVideoEncoder videoEncoder = HandBrakeEncoderHelpers.VideoEncoders.FirstOrDefault(e => e.ShortName == job.EncodingProfile.VideoEncoder);\r
             Validate.NotNull(videoEncoder, "Video encoder " + job.EncodingProfile.VideoEncoder + " not recognized.");\r
             if (videoEncoder != null)\r
             {\r
@@ -251,7 +251,7 @@ namespace HandBrake.Interop.Json.Factories
 \r
             if (!string.IsNullOrEmpty(job.EncodingProfile.AudioEncoderFallback))\r
             {\r
-                HBAudioEncoder audioEncoder = Encoders.GetAudioEncoder(job.EncodingProfile.AudioEncoderFallback);\r
+                HBAudioEncoder audioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(job.EncodingProfile.AudioEncoderFallback);\r
                 Validate.NotNull(audioEncoder, "Unrecognized fallback audio encoder: " + job.EncodingProfile.AudioEncoderFallback);\r
                 audio.FallbackEncoder = audioEncoder.Id;\r
             }\r
@@ -262,10 +262,10 @@ namespace HandBrake.Interop.Json.Factories
             int numTracks = 0;\r
             foreach (AudioEncoding item in job.EncodingProfile.AudioEncodings)\r
             {\r
-                HBAudioEncoder encoder = Encoders.GetAudioEncoder(item.Encoder);\r
+                HBAudioEncoder encoder = HandBrakeEncoderHelpers.GetAudioEncoder(item.Encoder);\r
                 Validate.NotNull(encoder, "Unrecognized audio encoder:" + item.Encoder);\r
 \r
-                HBMixdown mixdown = Encoders.GetMixdown(item.Mixdown);\r
+                HBMixdown mixdown = HandBrakeEncoderHelpers.GetMixdown(item.Mixdown);\r
                 Validate.NotNull(mixdown, "Unrecognized audio mixdown:" + item.Mixdown);\r
 \r
                 AudioList audioTrack = new AudioList\r
index 6017b872c8c61a36c69fe4116371866e2420eb2c..dbd62560458cb554d88e73c335307d0333c57a79 100644 (file)
@@ -5,16 +5,16 @@
 // <summary>\r
 //   The audio encode rate type.\r
 // </summary>\r
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model.Encoding
+// --------------------------------------------------------------------------------------------------------------------\r
+\r
+namespace HandBrake.Interop.Model.Encoding\r
 {\r
     /// <summary>\r
     /// The audio encode rate type.\r
     /// </summary>\r
-    public enum AudioEncodeRateType
-       {
-               Bitrate,
-               Quality
-       }
-}
+    public enum AudioEncodeRateType\r
+       {\r
+               Bitrate,\r
+               Quality\r
+       }\r
+}\r
index 50261cfdc8344d02591af5ce37ffe1583fbaa9b7..59b4277c1317331b41f9ad0462f61b5f1f05c14d 100644 (file)
@@ -5,24 +5,24 @@
 // <summary>\r
 //   Defines the Container type.\r
 // </summary>\r
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model.Encoding
-{
-       using System;
+// --------------------------------------------------------------------------------------------------------------------\r
+\r
+namespace HandBrake.Interop.Model.Encoding\r
+{\r
+       using System;\r
        using System.ComponentModel.DataAnnotations;\r
 \r
     /// <summary>\r
     /// The container.\r
     /// </summary>\r
-    [Flags]
-       public enum Container
-       {
-               None = 0x0,
-
-               [Display(Name = "MP4")]
-               MP4,
-               [Display(Name = "MKV")]
-               MKV
-       }
-}
+    [Flags]\r
+       public enum Container\r
+       {\r
+               None = 0x0,\r
+\r
+               [Display(Name = "MP4")]\r
+               MP4,\r
+               [Display(Name = "MKV")]\r
+               MKV\r
+       }\r
+}\r
index 6bcd8e0d744c958eae49dcc047e04a8d4eddabe7..088f448c596057614c4d1ae5beba5529c2372b4e 100644 (file)
@@ -16,8 +16,6 @@ namespace HandBrake.Interop.Model.Encoding
     /// </summary>\r
     public class HBAudioEncoder\r
     {\r
-        #region Public Properties\r
-\r
         /// <summary>\r
         /// Gets or sets the compatible containers.\r
         /// </summary>\r
@@ -90,7 +88,5 @@ namespace HandBrake.Interop.Model.Encoding
                 return this.QualityLimits.High >= 0;\r
             }\r
         }\r
-\r
-        #endregion\r
     }\r
 }
\ No newline at end of file
index 3b6feea484a684adbaaac8d25a2d24691cc38a47..18fc3911ec1a0c4d713a75094fd01c47e9126b2e 100644 (file)
@@ -14,8 +14,6 @@ namespace HandBrake.Interop.Model.Encoding
     /// </summary>\r
     public class HBContainer\r
     {\r
-        #region Public Properties\r
-\r
         /// <summary>\r
         /// Gets or sets the default extension.\r
         /// </summary>\r
@@ -35,7 +33,5 @@ namespace HandBrake.Interop.Model.Encoding
         /// Gets or sets the short name.\r
         /// </summary>\r
         public string ShortName { get; set; }\r
-\r
-        #endregion\r
     }\r
 }
\ No newline at end of file
index ad2bc90631c3b59d13d94612bd517be7b15413a0..bc0983ff16ebf706f65508d39168e70df2667926 100644 (file)
@@ -26,15 +26,6 @@ namespace HandBrake.Interop.Model.Encoding.x264
         Main,\r
 \r
         [Display(Name = "High")]\r
-        High,\r
-\r
-        //[Display(Name = "High 10")]\r
-        //High10,  HandBrake does not yet support 10bit.\r
-\r
-        //[Display(Name = "High 422")]\r
-        //High422,  Not supported\r
-\r
-        //[Display(Name = "High 444")]\r
-       // High444, Use Auto Instead.\r
+        High\r
     }\r
 }\r
index 2c30b2b448f794a8d70e6be0a2e60eb746bc15bd..420126ccacedd263d238256d27cc408227837c24 100644 (file)
@@ -14,8 +14,6 @@ namespace HandBrake.Interop.Model
     /// </summary>\r
     public class RangeLimits\r
     {\r
-        #region Properties\r
-\r
         /// <summary>\r
         /// Gets or sets a value indicating whether ascending.\r
         /// </summary>\r
@@ -35,7 +33,5 @@ namespace HandBrake.Interop.Model
         /// Gets or sets the low.\r
         /// </summary>\r
         public float Low { get; set; }\r
-\r
-        #endregion\r
     }\r
 }
\ No newline at end of file
index dcc58e0e3c6dd2262b558e54b93cdda0753f81ff..0cf7eb5b0900df46c6413012ca70704bf827f4b5 100644 (file)
@@ -14,8 +14,6 @@ namespace HandBrake.Interop.Model
     /// </summary>\r
     public class Size\r
     {\r
-        #region Constructors and Destructors\r
-\r
         /// <summary>\r
         /// Initializes a new instance of the <see cref="Size"/> class.\r
         /// </summary>\r
@@ -31,10 +29,6 @@ namespace HandBrake.Interop.Model
             this.Height = height;\r
         }\r
 \r
-        #endregion\r
-\r
-        #region Properties\r
-\r
         /// <summary>\r
         /// Gets or sets the height.\r
         /// </summary>\r
@@ -44,7 +38,5 @@ namespace HandBrake.Interop.Model
         /// Gets or sets the width.\r
         /// </summary>\r
         public int Width { get; set; }\r
-\r
-        #endregion\r
     }\r
 }
\ No newline at end of file
index e4bb3c39e1351b532fc663d21b11b924328a244f..ab5f8c610784e92cd36e6e9387d5868e5a36e966 100644 (file)
@@ -14,8 +14,6 @@ namespace HandBrake.Interop.Model
     /// </summary>\r
     public class SourceSubtitle\r
     {\r
-        #region Properties\r
-\r
         /// <summary>\r
         /// Gets or sets a value indicating whether the subtitle track should be burned in.\r
         /// </summary>\r
@@ -36,10 +34,6 @@ namespace HandBrake.Interop.Model
         /// </summary>\r
         public int TrackNumber { get; set; }\r
 \r
-        #endregion\r
-\r
-        #region Public Methods\r
-\r
         /// <summary>\r
         /// The clone.\r
         /// </summary>\r
@@ -56,7 +50,5 @@ namespace HandBrake.Interop.Model
                            BurnedIn = this.BurnedIn\r
                        };\r
         }\r
-\r
-        #endregion\r
     }\r
 }
\ No newline at end of file
index 9a60c8ab35fd443cce230eaefafe18ad880dde4d..336f7ccacbd8d565b4f636435c09a04097e1cce4 100644 (file)
@@ -25,7 +25,7 @@ namespace HandBrake.Interop.Model
         public bool Default { get; set; }\r
 \r
                /// <summary>\r
-               /// Gets or sets a value indicating the subtitle track should be burned in.\r
+               /// Gets or sets a value indicating whether the subtitle track should be burned in.\r
                /// </summary>\r
                public bool BurnedIn { get; set; }\r
 \r
index 843d0d4428b8d0e60790d29a50d5cb3fc8313a92..0d16c4c41958254c4320ba308fd8b94b0b0aef37 100644 (file)
@@ -16,8 +16,6 @@ namespace HandBrake.Interop.Model
     /// </summary>\r
     public class Subtitles\r
     {\r
-        #region Properties\r
-\r
         /// <summary>\r
         /// Gets or sets the source subtitles.\r
         /// </summary>\r
@@ -27,7 +25,5 @@ namespace HandBrake.Interop.Model
         /// Gets or sets the srt subtitles.\r
         /// </summary>\r
         public List<SrtSubtitle> SrtSubtitles { get; set; }\r
-\r
-        #endregion\r
     }\r
 }
\ No newline at end of file