]> granicus.if.org Git - handbrake/commitdiff
WinGui:
authorsr55 <sr55.hb@outlook.com>
Sat, 16 Apr 2011 15:21:42 +0000 (15:21 +0000)
committersr55 <sr55.hb@outlook.com>
Sat, 16 Apr 2011 15:21:42 +0000 (15:21 +0000)
- Moved DRC onto the advanced audio panel and tweaked the UI slightly.
- Updated to Stylecop 4.5

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

12 files changed:
win/CS/Controls/AudioPanel.Designer.cs
win/CS/Controls/AudioPanel.cs
win/CS/Controls/AudioPanel.resx
win/CS/HandBrake.5.1.ReSharper [deleted file]
win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
win/CS/HandBrake.ApplicationServices/Settings.StyleCop
win/CS/HandBrakeCS.5.0.ReSharper [deleted file]
win/CS/HandBrakeCS.csproj
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/ToolWindows/AdvancedAudio.Designer.cs
win/CS/ToolWindows/AdvancedAudio.cs

index dd6dc768ece3a813f4df6c01c46f2238021bc735..dbc1e84c97180d2952883178a3f81e5b7ff7ddf9 100644 (file)
@@ -35,7 +35,6 @@ namespace Handbrake.Controls
         private void InitializeComponent()\r
         {\r
             this.components = new System.ComponentModel.Container();\r
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AudioPanel));\r
             this.audioMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.audioList_moveup = new System.Windows.Forms.ToolStripMenuItem();\r
             this.audioList_movedown = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -43,8 +42,6 @@ namespace Handbrake.Controls
             this.audioList_remove = new System.Windows.Forms.ToolStripMenuItem();\r
             this.btn_RemoveAudioTrack = new System.Windows.Forms.Button();\r
             this.btn_addAudioTrack = new System.Windows.Forms.Button();\r
-            this.lbl_drc = new System.Windows.Forms.Label();\r
-            this.tb_drc = new System.Windows.Forms.TrackBar();\r
             this.label68 = new System.Windows.Forms.Label();\r
             this.drp_audioEncoder = new System.Windows.Forms.ComboBox();\r
             this.drp_audioMix = new System.Windows.Forms.ComboBox();\r
@@ -65,7 +62,6 @@ namespace Handbrake.Controls
             this.DRC = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.Gain = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.audioMenu.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.audioList)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
@@ -132,30 +128,6 @@ namespace Handbrake.Controls
             this.btn_addAudioTrack.UseVisualStyleBackColor = false;\r
             this.btn_addAudioTrack.Click += new System.EventHandler(this.AddAudioTrack_Click);\r
             // \r
-            // lbl_drc\r
-            // \r
-            this.lbl_drc.AutoSize = true;\r
-            this.lbl_drc.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_drc.Location = new System.Drawing.Point(666, 90);\r
-            this.lbl_drc.Name = "lbl_drc";\r
-            this.lbl_drc.Size = new System.Drawing.Size(13, 13);\r
-            this.lbl_drc.TabIndex = 62;\r
-            this.lbl_drc.Text = "0";\r
-            // \r
-            // tb_drc\r
-            // \r
-            this.tb_drc.BackColor = System.Drawing.SystemColors.Window;\r
-            this.tb_drc.LargeChange = 0;\r
-            this.tb_drc.Location = new System.Drawing.Point(608, 84);\r
-            this.tb_drc.Margin = new System.Windows.Forms.Padding(0);\r
-            this.tb_drc.Maximum = 31;\r
-            this.tb_drc.Name = "tb_drc";\r
-            this.tb_drc.Size = new System.Drawing.Size(57, 45);\r
-            this.tb_drc.TabIndex = 60;\r
-            this.tb_drc.TickFrequency = 10;\r
-            this.ToolTips.SetToolTip(this.tb_drc, resources.GetString("tb_drc.ToolTip"));\r
-            this.tb_drc.Scroll += new System.EventHandler(this.ControlChanged);\r
-            // \r
             // label68\r
             // \r
             this.label68.AutoSize = true;\r
@@ -321,9 +293,9 @@ namespace Handbrake.Controls
             this.btn_AdvancedAudio.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_AdvancedAudio.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_AdvancedAudio.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_AdvancedAudio.Location = new System.Drawing.Point(630, 38);\r
+            this.btn_AdvancedAudio.Location = new System.Drawing.Point(607, 86);\r
             this.btn_AdvancedAudio.Name = "btn_AdvancedAudio";\r
-            this.btn_AdvancedAudio.Size = new System.Drawing.Size(71, 23);\r
+            this.btn_AdvancedAudio.Size = new System.Drawing.Size(94, 23);\r
             this.btn_AdvancedAudio.TabIndex = 70;\r
             this.btn_AdvancedAudio.Text = "Advanced";\r
             this.btn_AdvancedAudio.UseVisualStyleBackColor = false;\r
@@ -394,31 +366,29 @@ namespace Handbrake.Controls
             this.Gain.DataPropertyName = "Gain";\r
             this.Gain.HeaderText = "Gain (dB)";\r
             this.Gain.Name = "Gain";\r
+            this.Gain.ReadOnly = true;\r
             this.Gain.Width = 60;\r
             // \r
             // AudioPanel\r
             // \r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
             this.BackColor = System.Drawing.Color.Transparent;\r
-            this.Controls.Add(this.btn_AdvancedAudio);\r
             this.Controls.Add(this.label1);\r
             this.Controls.Add(this.lbl_audioTrack);\r
             this.Controls.Add(this.drp_audioTrack);\r
+            this.Controls.Add(this.btn_AdvancedAudio);\r
             this.Controls.Add(this.drp_audioSample);\r
             this.Controls.Add(this.audioList);\r
             this.Controls.Add(this.label68);\r
             this.Controls.Add(this.drp_audioBitrate);\r
             this.Controls.Add(this.drp_audioMix);\r
             this.Controls.Add(this.btn_addAudioTrack);\r
-            this.Controls.Add(this.lbl_drc);\r
             this.Controls.Add(this.btn_RemoveAudioTrack);\r
             this.Controls.Add(this.drp_audioEncoder);\r
-            this.Controls.Add(this.tb_drc);\r
             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Name = "AudioPanel";\r
             this.Size = new System.Drawing.Size(720, 310);\r
             this.audioMenu.ResumeLayout(false);\r
-            ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.audioList)).EndInit();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
@@ -429,8 +399,6 @@ namespace Handbrake.Controls
 \r
         private System.Windows.Forms.Button btn_RemoveAudioTrack;\r
         private System.Windows.Forms.Button btn_addAudioTrack;\r
-        internal System.Windows.Forms.Label lbl_drc;\r
-        internal System.Windows.Forms.TrackBar tb_drc;\r
         internal System.Windows.Forms.Label label68;\r
         internal System.Windows.Forms.ComboBox drp_audioEncoder;\r
         internal System.Windows.Forms.ComboBox drp_audioMix;\r
index ddd75d7030ae4eb1fdec313d85ee10494255fa88..ed38c368f1ea7734abf56d4a8bc0f89aaedbadcc 100644 (file)
@@ -230,11 +230,13 @@ namespace Handbrake.Controls
                     // Configure the widgets with values\r
                     if (drp_audioEncoder.Text.Contains(AC3Passthru) || drp_audioEncoder.Text.Contains(DTSPassthru))\r
                     {\r
-                        drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = tb_drc.Enabled = false;\r
+                        drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = false;\r
+                        track.Gain = 0;\r
+                        track.DRC = 0;\r
                     }\r
                     else\r
                     {\r
-                        drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = tb_drc.Enabled = true;\r
+                        drp_audioMix.Enabled = drp_audioBitrate.Enabled = drp_audioSample.Enabled = btn_AdvancedAudio.Enabled = true;\r
                     }\r
 \r
                     // Update an item in the Audio list if required.\r
@@ -259,17 +261,6 @@ namespace Handbrake.Controls
 \r
                     track.Bitrate = bitrate;\r
                     break;\r
-                case "tb_drc":\r
-                    double value;\r
-                    if (tb_drc.Value == 0) value = 0;\r
-                    else\r
-                        value = ((tb_drc.Value - 1) / 10.0) + 1;\r
-\r
-                    lbl_drc.Text = value.ToString();\r
-                    track.DRC = value;\r
-                    audioList.Select();\r
-                    audioList.Refresh();\r
-                    break;\r
             }\r
 \r
             audioList.Refresh();\r
@@ -303,14 +294,6 @@ namespace Handbrake.Controls
                     drp_audioMix.SelectedItem = EnumHelper<Mixdown>.GetDescription(track.MixDown);\r
                     drp_audioSample.SelectedItem = track.SampleRate;\r
                     drp_audioBitrate.SelectedItem = track.Bitrate;\r
-                    double drcValue = 0;\r
-                    int drcCalculated;\r
-                    if (track.DRC != 0)\r
-                        drcValue = ((track.DRC * 10) + 1) - 10;\r
-                    int.TryParse(drcValue.ToString(Culture), out drcCalculated);\r
-                    tb_drc.Value = drcCalculated;\r
-                    lbl_drc.Text = track.DRC.ToString();\r
-\r
                     lbl_audioTrack.Text = track.SourceTrack;\r
 \r
                     // Set the Advanced Control.\r
@@ -349,10 +332,6 @@ namespace Handbrake.Controls
             }\r
 \r
             // Get Some Values\r
-            double drcValue = 0;\r
-            if (tb_drc.Value != 0)\r
-                drcValue = ((tb_drc.Value - 1) / 10.0) + 1;\r
-\r
             int bitrate;\r
             double samplerate;\r
 \r
@@ -368,7 +347,7 @@ namespace Handbrake.Controls
                     SampleRate = samplerate,\r
                     Bitrate = bitrate,\r
                     Gain = 0,\r
-                    DRC = drcValue\r
+                    DRC = 0,\r
                 };\r
 \r
             this.audioTracks.Add(track);\r
index 483d3e97c6f5c25c376d2cc6e55edc21633e93d0..6b186fbc061eed274e1f60cc724e25f3c2bd288d 100644 (file)
   <metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>330, 16</value>\r
   </metadata>\r
-  <data name="tb_drc.ToolTip" xml:space="preserve">\r
-    <value>Dynamic Range Compression\r
-Adjust the dynamic range of the output audio track.\r
-\r
-For source audio that has a wide dynamic range (very loud and very soft\r
-sequences), DRC allows you to 'compress' the range by making loud\r
-sections softer and soft sections louder</value>\r
-  </data>\r
   <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>35, 17</value>\r
   </metadata>\r
@@ -155,4 +147,7 @@ sections softer and soft sections louder</value>
   <metadata name="Gain.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
+  <metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>330, 16</value>\r
+  </metadata>\r
 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrake.5.1.ReSharper b/win/CS/HandBrake.5.1.ReSharper
deleted file mode 100644 (file)
index 22ca799..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-<Configuration>\r
-  <CodeStyleSettings>\r
-    <ExternalPath IsNull="False">\r
-    </ExternalPath>\r
-    <Sharing>SOLUTION</Sharing>\r
-    <CSharp>\r
-      <FormatSettings>\r
-        <ALIGN_MULTILINE_ARGUMENT>False</ALIGN_MULTILINE_ARGUMENT>\r
-        <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>1</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>\r
-        <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>1</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>\r
-        <BLANK_LINES_BETWEEN_USING_GROUPS>1</BLANK_LINES_BETWEEN_USING_GROUPS>\r
-        <FORCE_ATTRIBUTE_STYLE>SEPARATE</FORCE_ATTRIBUTE_STYLE>\r
-        <FORCE_FOR_BRACES_STYLE>ALWAYS_ADD</FORCE_FOR_BRACES_STYLE>\r
-        <FORCE_FOREACH_BRACES_STYLE>ALWAYS_ADD</FORCE_FOREACH_BRACES_STYLE>\r
-        <FORCE_IFELSE_BRACES_STYLE>ALWAYS_ADD</FORCE_IFELSE_BRACES_STYLE>\r
-        <FORCE_WHILE_BRACES_STYLE>ALWAYS_ADD</FORCE_WHILE_BRACES_STYLE>\r
-        <INDENT_ANONYMOUS_METHOD_BLOCK>False</INDENT_ANONYMOUS_METHOD_BLOCK>\r
-        <INDENT_EMBRACED_INITIALIZER_BLOCK>False</INDENT_EMBRACED_INITIALIZER_BLOCK>\r
-        <KEEP_BLANK_LINES_IN_CODE>1</KEEP_BLANK_LINES_IN_CODE>\r
-        <KEEP_BLANK_LINES_IN_DECLARATIONS>1</KEEP_BLANK_LINES_IN_DECLARATIONS>\r
-        <KEEP_USER_LINEBREAKS>False</KEEP_USER_LINEBREAKS>\r
-        <MODIFIERS_ORDER IsNull="False">\r
-          <Item>public</Item>\r
-          <Item>protected</Item>\r
-          <Item>internal</Item>\r
-          <Item>private</Item>\r
-          <Item>new</Item>\r
-          <Item>abstract</Item>\r
-          <Item>virtual</Item>\r
-          <Item>override</Item>\r
-          <Item>sealed</Item>\r
-          <Item>static</Item>\r
-          <Item>readonly</Item>\r
-          <Item>extern</Item>\r
-          <Item>unsafe</Item>\r
-          <Item>volatile</Item>\r
-        </MODIFIERS_ORDER>\r
-        <PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>False</PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>\r
-        <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>\r
-        <PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>False</PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>\r
-        <PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>False</PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>\r
-        <PLACE_WHILE_ON_NEW_LINE>True</PLACE_WHILE_ON_NEW_LINE>\r
-        <REDUNDANT_THIS_QUALIFIER_STYLE>ALWAYS_USE</REDUNDANT_THIS_QUALIFIER_STYLE>\r
-        <SIMPLE_EMBEDDED_STATEMENT_STYLE>ON_SINGLE_LINE</SIMPLE_EMBEDDED_STATEMENT_STYLE>\r
-        <SPACE_AFTER_TYPECAST_PARENTHESES>False</SPACE_AFTER_TYPECAST_PARENTHESES>\r
-        <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP>\r
-        <SPACE_BEFORE_SIZEOF_PARENTHESES>False</SPACE_BEFORE_SIZEOF_PARENTHESES>\r
-        <SPACE_BEFORE_TYPEOF_PARENTHESES>False</SPACE_BEFORE_TYPEOF_PARENTHESES>\r
-        <SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>True</SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>\r
-        <STICK_COMMENT>False</STICK_COMMENT>\r
-        <WRAP_AFTER_DECLARATION_LPAR>True</WRAP_AFTER_DECLARATION_LPAR>\r
-        <WRAP_AFTER_INVOCATION_LPAR>True</WRAP_AFTER_INVOCATION_LPAR>\r
-        <WRAP_ARGUMENTS_STYLE>CHOP_IF_LONG</WRAP_ARGUMENTS_STYLE>\r
-        <WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>True</WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>\r
-        <WRAP_EXTENDS_LIST_STYLE>CHOP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>\r
-        <WRAP_PARAMETERS_STYLE>CHOP_IF_LONG</WRAP_PARAMETERS_STYLE>\r
-      </FormatSettings>\r
-      <UsingsSettings>\r
-        <AddImportsToDeepestScope>True</AddImportsToDeepestScope>\r
-        <QualifiedUsingAtNestedScope>True</QualifiedUsingAtNestedScope>\r
-      </UsingsSettings>\r
-      <Naming2>\r
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-        <ExceptionName IsNull="False">\r
-        </ExceptionName>\r
-        <OverrideDefaultSettings>True</OverrideDefaultSettings>\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
-        <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
-        <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />\r
-      </Naming2>\r
-      <CustomMemberReorderingPatterns><![CDATA[<?xml version="1.0" encoding="utf-8"?>\r
-<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns">\r
-\r
-    <!-- Do not reorder COM interfaces -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Kind Is="interface"/>\r
-                <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"\r
-                              Inherit="true"/>\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- Do not reorder P/Invoke structs -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Or>\r
-                    <Kind Is="struct"/>\r
-                    <Kind Is="class"/>\r
-                </Or>\r
-                <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"\r
-                              Inherit="true"/>\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- Do not reorder P/Invoke classes (called xxxNativeMethods) -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Kind Is="class"/>\r
-                <Name Is=".*NativeMethods" />\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- StyleCop pattern -->\r
-    <Pattern RemoveAllRegions="true">\r
-        <Match>\r
-            <Or Weight="1000" >\r
-                <Kind Is="class" />\r
-                <Kind Is="struct" />\r
-                <Kind Is="interface"/>\r
-            </Or>\r
-        </Match>\r
-\r
-        <!-- constants and fields -->\r
-        <Entry>\r
-            <Match>\r
-                <Or>\r
-                    <Kind Is="constant"/>\r
-                    <Kind Is="field"/>\r
-                </Or>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Kind Order="constant field"/>\r
-                <Readonly/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Constants and Fields"/>\r
-        </Entry>\r
-\r
-        <!-- constructors -->\r
-        <Entry>\r
-            <Match>\r
-                <Or Weight="200">\r
-                    <Kind Is="constructor"/>\r
-                    <Kind Is="destructor"/>\r
-                </Or>\r
-            </Match>\r
-            <Sort>\r
-                <Static/>\r
-                <Kind Order="constructor destructor"/>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-            </Sort>\r
-            <Group Region="Constructors and Destructors"/>\r
-        </Entry>\r
-\r
-        <!-- delegates -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="delegate"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Delegates"/>\r
-        </Entry>\r
-\r
-        <!-- events -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="event"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Events"/>\r
-        </Entry>\r
-\r
-        <!-- enum -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="enum"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Enums"/>\r
-        </Entry>\r
-\r
-        <!-- interfaces -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="interface" />\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Interfaces"/>\r
-        </Entry>\r
-\r
-        <!-- properties -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="property"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Properties"/>\r
-        </Entry>\r
-\r
-        <!-- indexers -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="indexer"\r
-                      Weight="300" />\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Indexers"/>\r
-        </Entry>\r
-\r
-        <!-- operator -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="operator"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Operators"/>\r
-        </Entry>\r
-\r
-        <!-- public methods -->\r
-        <Entry>\r
-            <Match>\r
-                <And>\r
-                    <Kind Is="method"/>\r
-                    <Access Is="public"/>\r
-                </And>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Public Methods"/>\r
-        </Entry>\r
-\r
-        <!-- Implemented Interfaces -->\r
-        <Entry>\r
-            <Match>\r
-                <And Weight="500">\r
-                    <Kind Is="method"/>\r
-                    <ImplementsInterface CLRName=".*"/>\r
-                </And>\r
-            </Match>\r
-            <Sort>\r
-                <ImplementsInterface />\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Implemented Interfaces">\r
-                <ImplementsInterface Region="${ImplementsInterface}" />\r
-            </Group>\r
-        </Entry>\r
-\r
-        <!-- other methods -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="method"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Methods"/>\r
-        </Entry>\r
-\r
-        <!-- Nested structs -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="struct"\r
-                      Weight="600" />\r
-            </Match>\r
-            <Sort>\r
-                <Static />\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-        </Entry>\r
-\r
-        <!-- Nested classes -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="class"\r
-                      Weight="700" />\r
-            </Match>\r
-            <Sort>\r
-                <Static />\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-        </Entry>\r
-\r
-        <!-- all other members -->\r
-        <Entry/>\r
-\r
-    </Pattern>\r
-</Patterns>\r
-]]></CustomMemberReorderingPatterns>\r
-    </CSharp>\r
-    <VB>\r
-      <FormatSettings />\r
-      <ImportsSettings />\r
-      <Naming2>\r
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-      </Naming2>\r
-    </VB>\r
-    <Web>\r
-      <Naming2 />\r
-    </Web>\r
-    <Xaml>\r
-      <Naming2 />\r
-    </Xaml>\r
-    <XML>\r
-      <FormatSettings />\r
-    </XML>\r
-    <GenerateMemberBody />\r
-    <Naming2>\r
-      <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-      <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-      <ExceptionName IsNull="False">\r
-      </ExceptionName>\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
-      <PredefinedRule Inspect="False" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
-      <PredefinedRule Inspect="False" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />\r
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />\r
-    </Naming2>\r
-  </CodeStyleSettings>\r
-</Configuration>
\ No newline at end of file
index 7f459224168bf72ef54992f1c5744d4e49b99e22..65a1b3e5f6f4cee171a3def56c31f2e3b84afd5f 100644 (file)
   </ItemGroup>\r
   <ItemGroup />\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.targets" />\r
+  <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.5\StyleCop.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
index a6db51572a067a4767140738d4cba0e36ca80be4..159beb8e8c8923ee8a98ed7a0045f8e97c44c059 100644 (file)
@@ -15,6 +15,11 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         /// The gain value\r
         /// </summary>\r
         private int gain;\r
+\r
+        /// <summary>\r
+        ///  The DRC Value\r
+        /// </summary>\r
+        private double drc;\r
         #endregion\r
 \r
         /// <summary>\r
@@ -99,7 +104,21 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         /// <summary>\r
         /// Gets or sets Dynamic Range Compression\r
         /// </summary>\r
-        public double DRC { get; set; }\r
+        public double DRC\r
+        {\r
+            get\r
+            {\r
+                return this.drc;\r
+            }\r
+            set\r
+            {\r
+                if (!object.Equals(value, this.drc))\r
+                {\r
+                    this.drc = value;\r
+                    this.OnPropertyChanged("DRC");\r
+                }\r
+            }\r
+        }\r
 \r
         /// <summary>\r
         /// Gets or sets the Gain for the audio track\r
index 7f55ce6c690defa9a5168f5f32fe29bd4d184233..c8383e5691032c43d1dec6eabcdec3071d72677d 100644 (file)
@@ -1 +1,9 @@
-<StyleCopSettings Version="4.3" />
\ No newline at end of file
+<StyleCopSettings Version="105">\r
+  <Parsers>\r
+    <Parser ParserId="StyleCop.CSharp.CsParser">\r
+      <ParserSettings>\r
+        <BooleanProperty Name="AnalyzeDesignerFiles">False</BooleanProperty>\r
+      </ParserSettings>\r
+    </Parser>\r
+  </Parsers>\r
+</StyleCopSettings>
\ No newline at end of file
diff --git a/win/CS/HandBrakeCS.5.0.ReSharper b/win/CS/HandBrakeCS.5.0.ReSharper
deleted file mode 100644 (file)
index 59f6819..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-<Configuration>\r
-  <CodeStyleSettings>\r
-    <ExternalPath IsNull="False">\r
-    </ExternalPath>\r
-    <Sharing>SOLUTION</Sharing>\r
-    <CSharp>\r
-      <FormatSettings>\r
-        <ALIGN_MULTILINE_ARGUMENT>False</ALIGN_MULTILINE_ARGUMENT>\r
-        <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>1</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>\r
-        <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>1</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>\r
-        <BLANK_LINES_BETWEEN_USING_GROUPS>1</BLANK_LINES_BETWEEN_USING_GROUPS>\r
-        <FORCE_ATTRIBUTE_STYLE>SEPARATE</FORCE_ATTRIBUTE_STYLE>\r
-        <FORCE_FOR_BRACES_STYLE>ALWAYS_ADD</FORCE_FOR_BRACES_STYLE>\r
-        <FORCE_FOREACH_BRACES_STYLE>ALWAYS_ADD</FORCE_FOREACH_BRACES_STYLE>\r
-        <FORCE_IFELSE_BRACES_STYLE>ALWAYS_ADD</FORCE_IFELSE_BRACES_STYLE>\r
-        <FORCE_WHILE_BRACES_STYLE>ALWAYS_ADD</FORCE_WHILE_BRACES_STYLE>\r
-        <INDENT_ANONYMOUS_METHOD_BLOCK>False</INDENT_ANONYMOUS_METHOD_BLOCK>\r
-        <INDENT_EMBRACED_INITIALIZER_BLOCK>False</INDENT_EMBRACED_INITIALIZER_BLOCK>\r
-        <KEEP_BLANK_LINES_IN_CODE>1</KEEP_BLANK_LINES_IN_CODE>\r
-        <KEEP_BLANK_LINES_IN_DECLARATIONS>1</KEEP_BLANK_LINES_IN_DECLARATIONS>\r
-        <KEEP_USER_LINEBREAKS>False</KEEP_USER_LINEBREAKS>\r
-        <MODIFIERS_ORDER IsNull="False">\r
-          <Item>public</Item>\r
-          <Item>protected</Item>\r
-          <Item>internal</Item>\r
-          <Item>private</Item>\r
-          <Item>new</Item>\r
-          <Item>abstract</Item>\r
-          <Item>virtual</Item>\r
-          <Item>override</Item>\r
-          <Item>sealed</Item>\r
-          <Item>static</Item>\r
-          <Item>readonly</Item>\r
-          <Item>extern</Item>\r
-          <Item>unsafe</Item>\r
-          <Item>volatile</Item>\r
-        </MODIFIERS_ORDER>\r
-        <PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>False</PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>\r
-        <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>\r
-        <PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>False</PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>\r
-        <PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>False</PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>\r
-        <PLACE_WHILE_ON_NEW_LINE>True</PLACE_WHILE_ON_NEW_LINE>\r
-        <REDUNDANT_THIS_QUALIFIER_STYLE>ALWAYS_USE</REDUNDANT_THIS_QUALIFIER_STYLE>\r
-        <SIMPLE_EMBEDDED_STATEMENT_STYLE>ON_SINGLE_LINE</SIMPLE_EMBEDDED_STATEMENT_STYLE>\r
-        <SPACE_AFTER_TYPECAST_PARENTHESES>False</SPACE_AFTER_TYPECAST_PARENTHESES>\r
-        <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP>\r
-        <SPACE_BEFORE_SIZEOF_PARENTHESES>False</SPACE_BEFORE_SIZEOF_PARENTHESES>\r
-        <SPACE_BEFORE_TYPEOF_PARENTHESES>False</SPACE_BEFORE_TYPEOF_PARENTHESES>\r
-        <SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>True</SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>\r
-        <STICK_COMMENT>False</STICK_COMMENT>\r
-        <WRAP_AFTER_DECLARATION_LPAR>True</WRAP_AFTER_DECLARATION_LPAR>\r
-        <WRAP_AFTER_INVOCATION_LPAR>True</WRAP_AFTER_INVOCATION_LPAR>\r
-        <WRAP_ARGUMENTS_STYLE>CHOP_IF_LONG</WRAP_ARGUMENTS_STYLE>\r
-        <WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>True</WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>\r
-        <WRAP_EXTENDS_LIST_STYLE>CHOP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>\r
-        <WRAP_PARAMETERS_STYLE>CHOP_IF_LONG</WRAP_PARAMETERS_STYLE>\r
-      </FormatSettings>\r
-      <UsingsSettings>\r
-        <AddImportsToDeepestScope>True</AddImportsToDeepestScope>\r
-        <QualifiedUsingAtNestedScope>True</QualifiedUsingAtNestedScope>\r
-      </UsingsSettings>\r
-      <Naming2>\r
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-        <ExceptionName IsNull="False">\r
-        </ExceptionName>\r
-        <OverrideDefaultSettings>True</OverrideDefaultSettings>\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
-        <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
-        <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />\r
-      </Naming2>\r
-      <CustomMemberReorderingPatterns><![CDATA[<?xml version="1.0" encoding="utf-8"?>\r
-<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns">\r
-\r
-    <!-- Do not reorder COM interfaces -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Kind Is="interface"/>\r
-                <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"\r
-                              Inherit="true"/>\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- Do not reorder P/Invoke structs -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Or>\r
-                    <Kind Is="struct"/>\r
-                    <Kind Is="class"/>\r
-                </Or>\r
-                <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"\r
-                              Inherit="true"/>\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- Do not reorder P/Invoke classes (called xxxNativeMethods) -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Kind Is="class"/>\r
-                <Name Is=".*NativeMethods" />\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- StyleCop pattern -->\r
-    <Pattern RemoveAllRegions="true">\r
-        <Match>\r
-            <Or Weight="1000" >\r
-                <Kind Is="class" />\r
-                <Kind Is="struct" />\r
-                <Kind Is="interface"/>\r
-            </Or>\r
-        </Match>\r
-\r
-        <!-- constants and fields -->\r
-        <Entry>\r
-            <Match>\r
-                <Or>\r
-                    <Kind Is="constant"/>\r
-                    <Kind Is="field"/>\r
-                </Or>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Kind Order="constant field"/>\r
-                <Readonly/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Constants and Fields"/>\r
-        </Entry>\r
-\r
-        <!-- constructors -->\r
-        <Entry>\r
-            <Match>\r
-                <Or Weight="200">\r
-                    <Kind Is="constructor"/>\r
-                    <Kind Is="destructor"/>\r
-                </Or>\r
-            </Match>\r
-            <Sort>\r
-                <Static/>\r
-                <Kind Order="constructor destructor"/>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-            </Sort>\r
-            <Group Region="Constructors and Destructors"/>\r
-        </Entry>\r
-\r
-        <!-- delegates -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="delegate"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Delegates"/>\r
-        </Entry>\r
-\r
-        <!-- events -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="event"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Events"/>\r
-        </Entry>\r
-\r
-        <!-- enum -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="enum"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Enums"/>\r
-        </Entry>\r
-\r
-        <!-- interfaces -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="interface" />\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Interfaces"/>\r
-        </Entry>\r
-\r
-        <!-- properties -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="property"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Properties"/>\r
-        </Entry>\r
-\r
-        <!-- indexers -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="indexer"\r
-                      Weight="300" />\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Indexers"/>\r
-        </Entry>\r
-\r
-        <!-- operator -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="operator"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Operators"/>\r
-        </Entry>\r
-\r
-        <!-- public methods -->\r
-        <Entry>\r
-            <Match>\r
-                <And>\r
-                    <Kind Is="method"/>\r
-                    <Access Is="public"/>\r
-                </And>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Public Methods"/>\r
-        </Entry>\r
-\r
-        <!-- Implemented Interfaces -->\r
-        <Entry>\r
-            <Match>\r
-                <And Weight="500">\r
-                    <Kind Is="method"/>\r
-                    <ImplementsInterface CLRName=".*"/>\r
-                </And>\r
-            </Match>\r
-            <Sort>\r
-                <ImplementsInterface />\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Implemented Interfaces">\r
-                <ImplementsInterface Region="${ImplementsInterface}" />\r
-            </Group>\r
-        </Entry>\r
-\r
-        <!-- other methods -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="method"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Methods"/>\r
-        </Entry>\r
-\r
-        <!-- Nested structs -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="struct"\r
-                      Weight="600" />\r
-            </Match>\r
-            <Sort>\r
-                <Static />\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-        </Entry>\r
-\r
-        <!-- Nested classes -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="class"\r
-                      Weight="700" />\r
-            </Match>\r
-            <Sort>\r
-                <Static />\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-        </Entry>\r
-\r
-        <!-- all other members -->\r
-        <Entry/>\r
-\r
-    </Pattern>\r
-</Patterns>\r
-]]></CustomMemberReorderingPatterns>\r
-    </CSharp>\r
-    <VB>\r
-      <FormatSettings />\r
-      <ImportsSettings />\r
-      <Naming2>\r
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-      </Naming2>\r
-    </VB>\r
-    <Web>\r
-      <Naming2 />\r
-    </Web>\r
-    <Xaml>\r
-      <Naming2 />\r
-    </Xaml>\r
-    <XML>\r
-      <FormatSettings />\r
-    </XML>\r
-    <FileHeader><![CDATA[/*  file.cs$\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. */]]></FileHeader>\r
-    <GenerateMemberBody />\r
-    <Naming2>\r
-      <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-      <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-      <ExceptionName IsNull="False">\r
-      </ExceptionName>\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
-      <PredefinedRule Inspect="False" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
-      <PredefinedRule Inspect="False" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />\r
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />\r
-      <Abbreviation Text="CLI" />\r
-      <Abbreviation Text="DRC" />\r
-      <Abbreviation Text="ID" />\r
-      <Abbreviation Text="MP" />\r
-      <Abbreviation Text="DVD" />\r
-    </Naming2>\r
-  </CodeStyleSettings>\r
-</Configuration>
\ No newline at end of file
index dec9da341073e66f6c3bdffc2c8cb51c4c63bb24..87229cfa66ada0fccc7afcfae01a85331e523e67 100644 (file)
   <Target Name="AfterBuild">\r
   </Target>\r
   -->\r
-  <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.targets" />\r
+  <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.5\StyleCop.targets" />\r
   <PropertyGroup Condition=" '$(Configuration)' == 'Install' ">\r
     <PostBuildEvent>\r
        makensis Installer.nsi\r
index 0937aea292a04585da660318e1d7418b1e464ea3..65b49753491c846762077adf4ce597894956204b 100644 (file)
     </ProjectReference>\r
   </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.5\StyleCop.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
index aac2bd5746bdd8b38f56ee079a62d4f20fe117b9..41e28429a67a3d9c976d23ace53e69166da90df8 100644 (file)
             this.gainTrackBar = new System.Windows.Forms.TrackBar();\r
             this.lbl_GainValue = new System.Windows.Forms.Label();\r
             this.btn_close = new System.Windows.Forms.Button();\r
+            this.label2 = new System.Windows.Forms.Label();\r
+            this.lbl_drc = new System.Windows.Forms.Label();\r
+            this.tb_drc = new System.Windows.Forms.TrackBar();\r
             ((System.ComponentModel.ISupportInitialize)(this.gainTrackBar)).BeginInit();\r
+            ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
             // label1\r
             // \r
             this.label1.AutoSize = true;\r
-            this.label1.Location = new System.Drawing.Point(12, 22);\r
+            this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label1.Location = new System.Drawing.Point(12, 9);\r
             this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(54, 13);\r
+            this.label1.Size = new System.Drawing.Size(97, 13);\r
             this.label1.TabIndex = 1;\r
-            this.label1.Text = "Gain (dB):";\r
+            this.label1.Text = "Audio Gain (dB):";\r
             // \r
             // gainTrackBar\r
             // \r
-            this.gainTrackBar.Location = new System.Drawing.Point(72, 12);\r
+            this.gainTrackBar.Location = new System.Drawing.Point(12, 25);\r
             this.gainTrackBar.Maximum = 41;\r
             this.gainTrackBar.Name = "gainTrackBar";\r
-            this.gainTrackBar.Size = new System.Drawing.Size(171, 45);\r
+            this.gainTrackBar.Size = new System.Drawing.Size(231, 45);\r
             this.gainTrackBar.TabIndex = 2;\r
             this.gainTrackBar.Value = 21;\r
             this.gainTrackBar.Scroll += new System.EventHandler(this.gainTrackBar_Scroll);\r
             // lbl_GainValue\r
             // \r
             this.lbl_GainValue.AutoSize = true;\r
-            this.lbl_GainValue.Location = new System.Drawing.Point(249, 22);\r
+            this.lbl_GainValue.Location = new System.Drawing.Point(249, 31);\r
             this.lbl_GainValue.Name = "lbl_GainValue";\r
-            this.lbl_GainValue.Size = new System.Drawing.Size(29, 13);\r
+            this.lbl_GainValue.Size = new System.Drawing.Size(28, 13);\r
             this.lbl_GainValue.TabIndex = 3;\r
             this.lbl_GainValue.Text = "0 dB";\r
             // \r
             // btn_close\r
             // \r
+            this.btn_close.DialogResult = System.Windows.Forms.DialogResult.Cancel;\r
             this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_close.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(207, 52);\r
+            this.btn_close.Location = new System.Drawing.Point(207, 133);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(71, 22);\r
             this.btn_close.TabIndex = 5;\r
             this.btn_close.UseVisualStyleBackColor = true;\r
             this.btn_close.Click += new System.EventHandler(this.btn_close_Click);\r
             // \r
+            // label2\r
+            // \r
+            this.label2.AutoSize = true;\r
+            this.label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label2.Location = new System.Drawing.Point(12, 69);\r
+            this.label2.Name = "label2";\r
+            this.label2.Size = new System.Drawing.Size(98, 13);\r
+            this.label2.TabIndex = 6;\r
+            this.label2.Text = "Dynamic Range:";\r
+            // \r
+            // lbl_drc\r
+            // \r
+            this.lbl_drc.AutoSize = true;\r
+            this.lbl_drc.Location = new System.Drawing.Point(249, 95);\r
+            this.lbl_drc.Name = "lbl_drc";\r
+            this.lbl_drc.Size = new System.Drawing.Size(13, 13);\r
+            this.lbl_drc.TabIndex = 8;\r
+            this.lbl_drc.Text = "0";\r
+            // \r
+            // tb_drc\r
+            // \r
+            this.tb_drc.LargeChange = 0;\r
+            this.tb_drc.Location = new System.Drawing.Point(15, 89);\r
+            this.tb_drc.Margin = new System.Windows.Forms.Padding(0);\r
+            this.tb_drc.Maximum = 31;\r
+            this.tb_drc.Name = "tb_drc";\r
+            this.tb_drc.Size = new System.Drawing.Size(228, 45);\r
+            this.tb_drc.TabIndex = 61;\r
+            this.tb_drc.Scroll += new System.EventHandler(this.tb_drc_Scroll);\r
+            // \r
             // AdvancedAudio\r
             // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(295, 83);\r
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);\r
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;\r
+            this.ClientSize = new System.Drawing.Size(289, 164);\r
+            this.Controls.Add(this.tb_drc);\r
+            this.Controls.Add(this.lbl_drc);\r
+            this.Controls.Add(this.label2);\r
             this.Controls.Add(this.btn_close);\r
             this.Controls.Add(this.lbl_GainValue);\r
             this.Controls.Add(this.gainTrackBar);\r
             this.Controls.Add(this.label1);\r
+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
+            this.ImeMode = System.Windows.Forms.ImeMode.NoControl;\r
             this.MaximizeBox = false;\r
             this.MinimizeBox = false;\r
             this.Name = "AdvancedAudio";\r
+            this.Opacity = 0.95D;\r
             this.ShowIcon = false;\r
+            this.ShowInTaskbar = false;\r
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Advanced Audio";\r
             this.TopMost = true;\r
             ((System.ComponentModel.ISupportInitialize)(this.gainTrackBar)).EndInit();\r
+            ((System.ComponentModel.ISupportInitialize)(this.tb_drc)).EndInit();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
         private System.Windows.Forms.TrackBar gainTrackBar;\r
         private System.Windows.Forms.Label lbl_GainValue;\r
         internal System.Windows.Forms.Button btn_close;\r
+        private System.Windows.Forms.Label label2;\r
+        private System.Windows.Forms.Label lbl_drc;\r
+        internal System.Windows.Forms.TrackBar tb_drc;\r
     }\r
 }
\ No newline at end of file
index 616d40f70855659bae776a1835273fc359e455d7..5adc7c49ee18ae496d734d99c368ac0513927b9b 100644 (file)
@@ -6,6 +6,7 @@
 namespace Handbrake.ToolWindows\r
 {\r
     using System;\r
+    using System.Globalization;\r
     using System.Windows.Forms;\r
 \r
     using HandBrake.ApplicationServices.Model.Encoding;\r
@@ -15,6 +16,12 @@ namespace Handbrake.ToolWindows
     /// </summary>\r
     public partial class AdvancedAudio : Form\r
     {\r
+        // Culture Info\r
+        private static readonly CultureInfo Culture = new CultureInfo("en-US", false);\r
+\r
+        /// <summary>\r
+        /// The Advanced Audio Panel\r
+        /// </summary>\r
         public AdvancedAudio()\r
         {\r
             InitializeComponent();\r
@@ -55,6 +62,15 @@ namespace Handbrake.ToolWindows
                 }\r
 \r
                 lbl_GainValue.Text = string.Format("{0} dB", track.Gain);\r
+\r
+                // Set the DRC Control\r
+                double drcValue = 0;\r
+                int drcCalculated;\r
+                if (track.DRC != 0)\r
+                    drcValue = ((track.DRC * 10) + 1) - 10;\r
+                int.TryParse(drcValue.ToString(Culture), out drcCalculated);\r
+                tb_drc.Value = drcCalculated;\r
+                lbl_drc.Text = track.DRC.ToString();\r
             }\r
         }\r
 \r
@@ -93,6 +109,14 @@ namespace Handbrake.ToolWindows
 \r
             lbl_GainValue.Text = string.Format("{0} dB", gain);\r
 \r
+            // Figure out the DRC Value\r
+            double drcValue = 0;\r
+            int drcCalculated;\r
+            if (track.DRC != 0)\r
+                drcValue = ((track.DRC * 10) + 1) - 10;\r
+            int.TryParse(drcValue.ToString(Culture), out drcCalculated);\r
+            tb_drc.Value = drcCalculated;\r
+\r
             // Set the model.\r
             if (this.track == null)\r
             {\r
@@ -100,5 +124,21 @@ namespace Handbrake.ToolWindows
             }\r
             this.Track.Gain = gain;\r
         }\r
+\r
+        /// <summary>\r
+        /// The Dynamic Range Controller\r
+        /// </summary>\r
+        /// <param name="sender">The Sender</param>\r
+        /// <param name="e">The Event Args</param>\r
+        private void tb_drc_Scroll(object sender, EventArgs e)\r
+        {\r
+            double value;\r
+            if (tb_drc.Value == 0) value = 0;\r
+            else\r
+                value = ((tb_drc.Value - 1) / 10.0) + 1;\r
+\r
+            lbl_drc.Text = value.ToString();\r
+            track.DRC = value;\r
+        }\r
     }\r
 }\r