summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/C#/Functions/QueryGenerator.cs9
-rw-r--r--win/C#/Properties/Settings.Designer.cs12
-rw-r--r--win/C#/Properties/Settings.settings3
-rw-r--r--win/C#/app.config15
-rw-r--r--win/C#/frmMain.Designer.cs2
-rw-r--r--win/C#/frmOptions.Designer.cs62
-rw-r--r--win/C#/frmOptions.cs8
7 files changed, 17 insertions, 94 deletions
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 7e17299cb..e14b52b79 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -435,18 +435,13 @@ namespace Handbrake.Functions
// X264 Panel
query += mainWindow.x264Panel.X264Query;
- #region Processors / Other
-
- string processors = Properties.Settings.Default.Processors;
- if (processors != "Automatic")
- query += " -C " + processors + " ";
-
+ // Verbosity Level
query += " -v " + Properties.Settings.Default.verboseLevel;
+ // LibDVDNav
if (Properties.Settings.Default.noDvdNav)
query += " --no-dvdnav";
- #endregion
return query;
}
diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index d5d4173fb..1a159140c 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -37,18 +37,6 @@ namespace Handbrake.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("Automatic")]
- public string Processors {
- get {
- return ((string)(this["Processors"]));
- }
- set {
- this["Processors"] = value;
- }
- }
-
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool updateStatus {
get {
diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index de0057e8b..c9c75d01e 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -5,9 +5,6 @@
<Setting Name="processPriority" Type="System.String" Scope="User">
<Value Profile="(Default)">Below Normal</Value>
</Setting>
- <Setting Name="Processors" Type="System.String" Scope="User">
- <Value Profile="(Default)">Automatic</Value>
- </Setting>
<Setting Name="updateStatus" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
diff --git a/win/C#/app.config b/win/C#/app.config
index 2696c0fa7..d1401d03f 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -11,9 +11,6 @@
<setting name="processPriority" serializeAs="String">
<value>Below Normal</value>
</setting>
- <setting name="Processors" serializeAs="String">
- <value>Automatic</value>
- </setting>
<setting name="updateStatus" serializeAs="String">
<value>True</value>
</setting>
@@ -42,14 +39,10 @@
<value />
</setting>
<setting name="appcast" serializeAs="String">
- <value>
- http://handbrake.fr/appcast.xml
- </value>
+ <value>http://handbrake.fr/appcast.xml</value>
</setting>
<setting name="appcast_unstable" serializeAs="String">
- <value>
- http://handbrake.fr/appcast_unstable.xml
- </value>
+ <value>http://handbrake.fr/appcast_unstable.xml</value>
</setting>
<setting name="cli_minimized" serializeAs="String">
<value>False</value>
@@ -67,9 +60,7 @@
<value>False</value>
</setting>
<setting name="VLC_Path" serializeAs="String">
- <value>
- C:\Program Files\VideoLAN\vlc\vlc.exe
- </value>
+ <value>C:\Program Files\VideoLAN\vlc\vlc.exe</value>
</setting>
<setting name="MainWindowMinimize" serializeAs="String">
<value>True</value>
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index dad2201f2..106aaa039 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1077,7 +1077,7 @@ namespace Handbrake
this.x264Panel.Name = "x264Panel";
this.x264Panel.Size = new System.Drawing.Size(720, 306);
this.x264Panel.TabIndex = 0;
- this.x264Panel.X264Query = " -x ";
+ this.x264Panel.X264Query = " -x -x -x -x ";
//
// tab_query
//
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index f7866caaf..4e99bae61 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -72,8 +72,6 @@ namespace Handbrake
this.label12 = new System.Windows.Forms.Label();
this.check_cli_minimized = new System.Windows.Forms.CheckBox();
this.btn_viewLogs = new System.Windows.Forms.Button();
- this.drp_processors = new System.Windows.Forms.ComboBox();
- this.Label11 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.Label4 = new System.Windows.Forms.Label();
this.btn_clearLogs = new System.Windows.Forms.Button();
@@ -582,8 +580,6 @@ namespace Handbrake
this.tab_cli.Controls.Add(this.label12);
this.tab_cli.Controls.Add(this.check_cli_minimized);
this.tab_cli.Controls.Add(this.btn_viewLogs);
- this.tab_cli.Controls.Add(this.drp_processors);
- this.tab_cli.Controls.Add(this.Label11);
this.tab_cli.Controls.Add(this.label9);
this.tab_cli.Controls.Add(this.Label4);
this.tab_cli.Controls.Add(this.btn_clearLogs);
@@ -607,7 +603,7 @@ namespace Handbrake
//
this.check_clearOldLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.check_clearOldLogs.AutoSize = true;
- this.check_clearOldLogs.Location = new System.Drawing.Point(73, 265);
+ this.check_clearOldLogs.Location = new System.Drawing.Point(73, 226);
this.check_clearOldLogs.Name = "check_clearOldLogs";
this.check_clearOldLogs.Size = new System.Drawing.Size(166, 17);
this.check_clearOldLogs.TabIndex = 90;
@@ -647,7 +643,7 @@ namespace Handbrake
this.btn_viewLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.btn_viewLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_viewLogs.ForeColor = System.Drawing.Color.DarkOrange;
- this.btn_viewLogs.Location = new System.Drawing.Point(129, 227);
+ this.btn_viewLogs.Location = new System.Drawing.Point(129, 188);
this.btn_viewLogs.Name = "btn_viewLogs";
this.btn_viewLogs.Size = new System.Drawing.Size(139, 23);
this.btn_viewLogs.TabIndex = 89;
@@ -655,46 +651,12 @@ namespace Handbrake
this.btn_viewLogs.UseVisualStyleBackColor = true;
this.btn_viewLogs.Click += new System.EventHandler(this.btn_viewLogs_Click);
//
- // drp_processors
- //
- this.drp_processors.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.drp_processors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.drp_processors.FormattingEnabled = true;
- this.drp_processors.Items.AddRange(new object[] {
- "Automatic",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7",
- "8"});
- this.drp_processors.Location = new System.Drawing.Point(177, 69);
- this.drp_processors.Name = "drp_processors";
- this.drp_processors.Size = new System.Drawing.Size(111, 21);
- this.drp_processors.TabIndex = 41;
- this.ToolTip.SetToolTip(this.drp_processors, "The number of processor\'s / processor cores. Unless your having problems, leave o" +
- "n Automatic.");
- this.drp_processors.SelectedIndexChanged += new System.EventHandler(this.drp_processors_SelectedIndexChanged);
- //
- // Label11
- //
- this.Label11.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.Label11.AutoSize = true;
- this.Label11.BackColor = System.Drawing.Color.Transparent;
- this.Label11.Location = new System.Drawing.Point(70, 72);
- this.Label11.Name = "Label11";
- this.Label11.Size = new System.Drawing.Size(87, 13);
- this.Label11.TabIndex = 40;
- this.Label11.Text = "Processor cores:";
- //
// label9
//
this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label9.Location = new System.Drawing.Point(7, 123);
+ this.label9.Location = new System.Drawing.Point(7, 84);
this.label9.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(36, 13);
@@ -717,7 +679,7 @@ namespace Handbrake
this.btn_clearLogs.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.btn_clearLogs.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_clearLogs.ForeColor = System.Drawing.Color.DarkOrange;
- this.btn_clearLogs.Location = new System.Drawing.Point(274, 227);
+ this.btn_clearLogs.Location = new System.Drawing.Point(274, 188);
this.btn_clearLogs.Name = "btn_clearLogs";
this.btn_clearLogs.Size = new System.Drawing.Size(135, 23);
this.btn_clearLogs.TabIndex = 88;
@@ -749,7 +711,7 @@ namespace Handbrake
//
this.check_logsInSpecifiedLocation.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.check_logsInSpecifiedLocation.AutoSize = true;
- this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 170);
+ this.check_logsInSpecifiedLocation.Location = new System.Drawing.Point(73, 131);
this.check_logsInSpecifiedLocation.Name = "check_logsInSpecifiedLocation";
this.check_logsInSpecifiedLocation.Size = new System.Drawing.Size(306, 17);
this.check_logsInSpecifiedLocation.TabIndex = 87;
@@ -762,7 +724,7 @@ namespace Handbrake
//
this.check_saveLogWithVideo.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.check_saveLogWithVideo.AutoSize = true;
- this.check_saveLogWithVideo.Location = new System.Drawing.Point(73, 147);
+ this.check_saveLogWithVideo.Location = new System.Drawing.Point(73, 108);
this.check_saveLogWithVideo.Name = "check_saveLogWithVideo";
this.check_saveLogWithVideo.Size = new System.Drawing.Size(382, 17);
this.check_saveLogWithVideo.TabIndex = 83;
@@ -776,7 +738,7 @@ namespace Handbrake
this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(70, 123);
+ this.label3.Location = new System.Drawing.Point(70, 84);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(101, 13);
this.label3.TabIndex = 85;
@@ -788,7 +750,7 @@ namespace Handbrake
this.btn_saveLog.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_saveLog.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_saveLog.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_saveLog.Location = new System.Drawing.Point(437, 200);
+ this.btn_saveLog.Location = new System.Drawing.Point(437, 161);
this.btn_saveLog.Name = "btn_saveLog";
this.btn_saveLog.Size = new System.Drawing.Size(77, 22);
this.btn_saveLog.TabIndex = 82;
@@ -805,7 +767,7 @@ namespace Handbrake
"0",
"1",
"2"});
- this.cb_logVerboseLvl.Location = new System.Drawing.Point(177, 120);
+ this.cb_logVerboseLvl.Location = new System.Drawing.Point(177, 81);
this.cb_logVerboseLvl.Name = "cb_logVerboseLvl";
this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21);
this.cb_logVerboseLvl.TabIndex = 86;
@@ -815,7 +777,7 @@ namespace Handbrake
// text_logPath
//
this.text_logPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.text_logPath.Location = new System.Drawing.Point(129, 200);
+ this.text_logPath.Location = new System.Drawing.Point(129, 161);
this.text_logPath.Name = "text_logPath";
this.text_logPath.Size = new System.Drawing.Size(302, 21);
this.text_logPath.TabIndex = 80;
@@ -826,7 +788,7 @@ namespace Handbrake
//
this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(70, 203);
+ this.label14.Location = new System.Drawing.Point(70, 164);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(53, 13);
this.label14.TabIndex = 81;
@@ -1515,7 +1477,6 @@ namespace Handbrake
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.TabPage tab_general;
private System.Windows.Forms.FolderBrowserDialog pathFinder;
- internal System.Windows.Forms.Label Label11;
internal System.Windows.Forms.Label Label4;
internal System.Windows.Forms.CheckBox check_tooltip;
internal System.Windows.Forms.CheckBox check_updateCheck;
@@ -1588,7 +1549,6 @@ namespace Handbrake
internal System.Windows.Forms.CheckBox check_m4v;
internal System.Windows.Forms.ComboBox drop_updateCheckDays;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
- internal System.Windows.Forms.ComboBox drp_processors;
internal System.Windows.Forms.ComboBox drp_Priority;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
private System.Windows.Forms.CheckBox check_promptOnUnmatchingQueries;
diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index aef755514..6aa612dbc 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -108,9 +108,6 @@ namespace Handbrake
if (Properties.Settings.Default.cli_minimized)
check_cli_minimized.CheckState = CheckState.Checked;
- // Number of processor cores
- drp_processors.Text = Properties.Settings.Default.Processors;
-
// Priority level for encodes
drp_Priority.Text = Properties.Settings.Default.processPriority;
@@ -314,11 +311,6 @@ namespace Handbrake
Properties.Settings.Default.cli_minimized = check_cli_minimized.Checked;
}
- private void drp_processors_SelectedIndexChanged(object sender, EventArgs e)
- {
- Properties.Settings.Default.Processors = drp_processors.Text;
- }
-
private void drp_Priority_SelectedIndexChanged(object sender, EventArgs e)
{
Properties.Settings.Default.processPriority = drp_Priority.Text;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 08:28:47 +0000