From f75c3ca496fc512051847e7904316ad8b9c35814 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Fri, 25 Feb 2011 00:22:18 +0100
Subject: [PATCH] Added an option to manually specify the number of parallel
 instances.

---
 doc/Changelog.html            |   1 +
 etc/Translation/Blank.ts      |  20 +++
 etc/Translation/LameXP_DE.ts  |  20 +++
 etc/Translation/LameXP_ES.ts  |  20 +++
 etc/Translation/LameXP_FR.ts  |  20 +++
 etc/Translation/LameXP_IT.ts  |  20 +++
 etc/Translation/LameXP_RU.ts  |  20 +++
 etc/Translation/LameXP_UK.ts  |  20 +++
 gui/MainWindow.ui             | 378 ++++++++++++++++++++++++++++++++++--------
 res/localization/LameXP_DE.qm | Bin 51264 -> 51877 bytes
 src/Config.h                  |   2 +-
 src/Dialog_MainWindow.cpp     |  24 +++
 src/Dialog_MainWindow.h       |   2 +
 src/Dialog_Processing.cpp     |   9 +-
 src/Model_Settings.cpp        |   2 +
 src/Model_Settings.h          |   1 +
 16 files changed, 484 insertions(+), 75 deletions(-)

diff --git a/doc/Changelog.html b/doc/Changelog.html
index d6b5579b..9df5c04b 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -4,6 +4,7 @@
 <h3>LameXP - Version History</h3><br>
 
 Changes between v4.00 and v4.01:<br><ul>
+<li>Added an option to manually specify the number of parallel instances
 <li>Updated LAME encoder to v3.99.0.12 (2011-02-13), compiled with ICL 12.0.2
 <li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6.01 (2011-02-22), compiled with ICL 11.1 and MSVC 9.0
 <li>Updated language files (big "thank you" to all contributors !!!)
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 8add5035..8299ea30 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -606,6 +606,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source> Multi-Threading </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose the number of parallel instances based on the number of CPU cores (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewer Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Reset Advanced Options </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1058,6 +1074,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>%1 Instance(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Do you really want to disable the update reminder?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index f7b87cf2..767b2a9c 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -1146,6 +1146,26 @@
         <source>Warning: Custom parameters won&apos;t be checked at all. Use them at your own risk !!!</source>
         <translation>Achtung: Benutzerdefinierte Parameter werden nicht überprüft. Benutzung auf eigene Gefahr !!!</translation>
     </message>
+    <message>
+        <source> Multi-Threading </source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Choose the number of parallel instances based on the number of CPU cores (Recommended)</source>
+        <translation>Anzahl der parallelen Instanzen entsprechend der Anzahl der CPU Kerne festlegen (Empfohlen)</translation>
+    </message>
+    <message>
+        <source>Fewer Instances</source>
+        <translation>Weniger Instanzen</translation>
+    </message>
+    <message>
+        <source>More Instances</source>
+        <translation>Mehr Instanzen</translation>
+    </message>
+    <message>
+        <source>%1 Instance(s)</source>
+        <translation>%1 Instanz(en)</translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index a9d1a674..78ffb6e5 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1145,6 +1145,26 @@
         <source>Warning: Custom parameters won&apos;t be checked at all. Use them at your own risk !!!</source>
         <translation>Aviso: Los parámetros personalizados no se comprobarán en absoluto. ¡¡¡ Úselos bajo su propio riesgo !!!</translation>
     </message>
+    <message>
+        <source> Multi-Threading </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose the number of parallel instances based on the number of CPU cores (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewer Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Instance(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index a405d9fa..6d3a6cd0 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1154,6 +1154,26 @@ Sélection automatique (par défaut)</translation>
         <source>Warning: Custom parameters won&apos;t be checked at all. Use them at your own risk !!!</source>
         <translation>Avertissement : Les paramètres personnalisés ne peuvent pas être entièrement vérifiés. Vous les utilisez à votre propre risque !!!</translation>
     </message>
+    <message>
+        <source> Multi-Threading </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose the number of parallel instances based on the number of CPU cores (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewer Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Instance(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index b85f01e9..bceed85b 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1146,6 +1146,26 @@
         <source>Warning: Custom parameters won&apos;t be checked at all. Use them at your own risk !!!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Multi-Threading </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose the number of parallel instances based on the number of CPU cores (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewer Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Instance(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index 634477eb..c65d5b68 100644
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -1148,6 +1148,26 @@
         <source>The LameXP shell integration has been re-enabled.</source>
         <translation type="unfinished">Интегрирование в контекстное меню включено.</translation>
     </message>
+    <message>
+        <source> Multi-Threading </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose the number of parallel instances based on the number of CPU cores (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewer Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Instance(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index a3414878..c9b4341a 100644
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -1145,6 +1145,26 @@
         <source>Warning: Custom parameters won&apos;t be checked at all. Use them at your own risk !!!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> Multi-Threading </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose the number of parallel instances based on the number of CPU cores (Recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fewer Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More Instances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Instance(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 041030bf..8e6a8cbb 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -1058,7 +1058,7 @@
                <x>0</x>
                <y>0</y>
                <width>604</width>
-               <height>812</height>
+               <height>965</height>
               </rect>
              </property>
              <layout class="QGridLayout" name="gridLayout_22">
@@ -1223,7 +1223,7 @@
                   <layout class="QGridLayout" name="gridLayout_17">
                    <item row="0" column="1">
                     <layout class="QGridLayout" name="gridLayout_16">
-                     <item row="7" column="0">
+                     <item row="1" column="0">
                       <spacer name="horizontalSpacer_12">
                        <property name="orientation">
                         <enum>Qt::Horizontal</enum>
@@ -1239,7 +1239,7 @@
                        </property>
                       </spacer>
                      </item>
-                     <item row="7" column="4">
+                     <item row="1" column="4">
                       <spacer name="horizontalSpacer_13">
                        <property name="orientation">
                         <enum>Qt::Horizontal</enum>
@@ -1255,14 +1255,14 @@
                        </property>
                       </spacer>
                      </item>
-                     <item row="8" column="1">
+                     <item row="2" column="1">
                       <widget class="QLabel" name="label">
                        <property name="text">
                         <string>Faster Processing</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="8" column="2">
+                     <item row="2" column="2">
                       <widget class="QLabel" name="labelLameAlgoQuality">
                        <property name="font">
                         <font>
@@ -1278,7 +1278,7 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="8" column="3">
+                     <item row="2" column="3">
                       <widget class="QLabel" name="label_3">
                        <property name="text">
                         <string>Better quality</string>
@@ -1288,7 +1288,7 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="6" column="1" colspan="3">
+                     <item row="0" column="1" colspan="3">
                       <spacer name="verticalSpacer_4">
                        <property name="orientation">
                         <enum>Qt::Vertical</enum>
@@ -1304,7 +1304,7 @@
                        </property>
                       </spacer>
                      </item>
-                     <item row="7" column="1" colspan="3">
+                     <item row="1" column="1" colspan="3">
                       <widget class="QSlider" name="sliderLameAlgoQuality">
                        <property name="maximum">
                         <number>4</number>
@@ -2211,6 +2211,170 @@
                   </layout>
                  </widget>
                 </item>
+                <item row="7" column="0">
+                 <widget class="QGroupBox" name="groupBox_12">
+                  <property name="font">
+                   <font>
+                    <weight>50</weight>
+                    <bold>false</bold>
+                   </font>
+                  </property>
+                  <property name="title">
+                   <string> Multi-Threading </string>
+                  </property>
+                  <layout class="QGridLayout" name="gridLayout_32">
+                   <item row="0" column="0">
+                    <layout class="QGridLayout" name="gridLayout_31">
+                     <item row="1" column="1" colspan="3">
+                      <widget class="QSlider" name="sliderMaxInstances">
+                       <property name="minimum">
+                        <number>1</number>
+                       </property>
+                       <property name="maximum">
+                        <number>16</number>
+                       </property>
+                       <property name="pageStep">
+                        <number>1</number>
+                       </property>
+                       <property name="sliderPosition">
+                        <number>4</number>
+                       </property>
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="tickPosition">
+                        <enum>QSlider::TicksBelow</enum>
+                       </property>
+                       <property name="tickInterval">
+                        <number>1</number>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="0">
+                      <spacer name="horizontalSpacer_35">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>10</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="1" column="4">
+                      <spacer name="horizontalSpacer_36">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>10</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="0" column="1" colspan="3">
+                      <spacer name="verticalSpacer_17">
+                       <property name="orientation">
+                        <enum>Qt::Vertical</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>8</width>
+                         <height>8</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="5" column="1" colspan="3">
+                      <spacer name="verticalSpacer_18">
+                       <property name="orientation">
+                        <enum>Qt::Vertical</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>20</width>
+                         <height>8</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="4" column="1" colspan="3">
+                      <widget class="QCheckBox" name="checkBoxAutoDetectInstances">
+                       <property name="text">
+                        <string>Choose the number of parallel instances based on the number of CPU cores (Recommended)</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="2" column="1">
+                      <widget class="QLabel" name="labelMaxInstancesFewer">
+                       <property name="text">
+                        <string>Fewer Instances</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="2" column="2">
+                      <widget class="QLabel" name="labelMaxInstances">
+                       <property name="font">
+                        <font>
+                         <weight>75</weight>
+                         <bold>true</bold>
+                        </font>
+                       </property>
+                       <property name="text">
+                        <string notr="true">(VALUE)</string>
+                       </property>
+                       <property name="alignment">
+                        <set>Qt::AlignCenter</set>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="2" column="3">
+                      <widget class="QLabel" name="labelMaxInstancesMore">
+                       <property name="text">
+                        <string>More Instances</string>
+                       </property>
+                       <property name="alignment">
+                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="3" column="1" colspan="3">
+                      <spacer name="verticalSpacer_19">
+                       <property name="orientation">
+                        <enum>Qt::Vertical</enum>
+                       </property>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>20</width>
+                         <height>12</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                    </layout>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
                </layout>
               </item>
               <item row="6" column="0">
@@ -2790,6 +2954,12 @@
   <include location="../res/Icons.qrc"/>
   <include location="../res/Icons.qrc"/>
   <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -2835,8 +3005,8 @@
      <y>-1</y>
     </hint>
     <hint type="destinationlabel">
-     <x>67</x>
-     <y>460</y>
+     <x>81</x>
+     <y>382</y>
     </hint>
    </hints>
   </connection>
@@ -2851,8 +3021,8 @@
      <y>253</y>
     </hint>
     <hint type="destinationlabel">
-     <x>587</x>
-     <y>460</y>
+     <x>641</x>
+     <y>382</y>
     </hint>
    </hints>
   </connection>
@@ -2863,8 +3033,8 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>327</x>
-     <y>465</y>
+     <x>341</x>
+     <y>380</y>
     </hint>
     <hint type="destinationlabel">
      <x>327</x>
@@ -2879,8 +3049,8 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>327</x>
-     <y>465</y>
+     <x>341</x>
+     <y>380</y>
     </hint>
     <hint type="destinationlabel">
      <x>327</x>
@@ -2895,12 +3065,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>344</x>
-     <y>465</y>
+     <x>358</x>
+     <y>380</y>
     </hint>
     <hint type="destinationlabel">
-     <x>215</x>
-     <y>430</y>
+     <x>408</x>
+     <y>346</y>
     </hint>
    </hints>
   </connection>
@@ -2911,12 +3081,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>344</x>
-     <y>465</y>
+     <x>358</x>
+     <y>380</y>
     </hint>
     <hint type="destinationlabel">
-     <x>84</x>
-     <y>430</y>
+     <x>98</x>
+     <y>346</y>
     </hint>
    </hints>
   </connection>
@@ -2927,12 +3097,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>344</x>
-     <y>465</y>
+     <x>358</x>
+     <y>380</y>
     </hint>
     <hint type="destinationlabel">
-     <x>603</x>
-     <y>430</y>
+     <x>641</x>
+     <y>346</y>
     </hint>
    </hints>
   </connection>
@@ -2943,12 +3113,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>344</x>
-     <y>465</y>
+     <x>358</x>
+     <y>380</y>
     </hint>
     <hint type="destinationlabel">
-     <x>214</x>
-     <y>430</y>
+     <x>276</x>
+     <y>346</y>
     </hint>
    </hints>
   </connection>
@@ -2963,8 +3133,8 @@
      <y>-1</y>
     </hint>
     <hint type="destinationlabel">
-     <x>255</x>
-     <y>460</y>
+     <x>300</x>
+     <y>382</y>
     </hint>
    </hints>
   </connection>
@@ -2975,8 +3145,8 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>177</x>
-     <y>285</y>
+     <x>201</x>
+     <y>372</y>
     </hint>
     <hint type="destinationlabel">
      <x>336</x>
@@ -2991,12 +3161,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>183</x>
-     <y>465</y>
+     <x>207</x>
+     <y>372</y>
     </hint>
     <hint type="destinationlabel">
-     <x>596</x>
-     <y>404</y>
+     <x>632</x>
+     <y>315</y>
     </hint>
    </hints>
   </connection>
@@ -3007,12 +3177,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>183</x>
-     <y>465</y>
+     <x>207</x>
+     <y>372</y>
     </hint>
     <hint type="destinationlabel">
-     <x>299</x>
-     <y>404</y>
+     <x>344</x>
+     <y>315</y>
     </hint>
    </hints>
   </connection>
@@ -3023,12 +3193,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>183</x>
-     <y>465</y>
+     <x>207</x>
+     <y>372</y>
     </hint>
     <hint type="destinationlabel">
-     <x>39</x>
-     <y>404</y>
+     <x>47</x>
+     <y>315</y>
     </hint>
    </hints>
   </connection>
@@ -3039,12 +3209,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>183</x>
-     <y>465</y>
+     <x>207</x>
+     <y>372</y>
     </hint>
     <hint type="destinationlabel">
-     <x>500</x>
-     <y>404</y>
+     <x>536</x>
+     <y>315</y>
     </hint>
    </hints>
   </connection>
@@ -3055,12 +3225,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>70</x>
-     <y>79</y>
+     <x>84</x>
+     <y>380</y>
     </hint>
     <hint type="destinationlabel">
-     <x>70</x>
-     <y>79</y>
+     <x>397</x>
+     <y>372</y>
     </hint>
    </hints>
   </connection>
@@ -3071,12 +3241,12 @@
    <slot>click()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>70</x>
-     <y>79</y>
+     <x>93</x>
+     <y>159</y>
     </hint>
     <hint type="destinationlabel">
-     <x>65</x>
-     <y>79</y>
+     <x>599</x>
+     <y>315</y>
     </hint>
    </hints>
   </connection>
@@ -3087,12 +3257,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>70</x>
-     <y>79</y>
+     <x>84</x>
+     <y>380</y>
     </hint>
     <hint type="destinationlabel">
-     <x>70</x>
-     <y>79</y>
+     <x>459</x>
+     <y>380</y>
     </hint>
    </hints>
   </connection>
@@ -3103,8 +3273,8 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>123</x>
-     <y>214</y>
+     <x>163</x>
+     <y>231</y>
     </hint>
     <hint type="destinationlabel">
      <x>256</x>
@@ -3119,8 +3289,8 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>123</x>
-     <y>214</y>
+     <x>163</x>
+     <y>231</y>
     </hint>
     <hint type="destinationlabel">
      <x>465</x>
@@ -3135,8 +3305,8 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>123</x>
-     <y>214</y>
+     <x>163</x>
+     <y>231</y>
     </hint>
     <hint type="destinationlabel">
      <x>360</x>
@@ -3151,8 +3321,8 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>123</x>
-     <y>214</y>
+     <x>163</x>
+     <y>231</y>
     </hint>
     <hint type="destinationlabel">
      <x>569</x>
@@ -3192,5 +3362,69 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>checkBoxAutoDetectInstances</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>sliderMaxInstances</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>363</x>
+     <y>953</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>363</x>
+     <y>897</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkBoxAutoDetectInstances</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>labelMaxInstances</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>363</x>
+     <y>953</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>409</x>
+     <y>916</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkBoxAutoDetectInstances</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>labelMaxInstancesFewer</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>363</x>
+     <y>953</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>185</x>
+     <y>916</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkBoxAutoDetectInstances</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>labelMaxInstancesMore</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>363</x>
+     <y>953</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>588</x>
+     <y>916</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index a11f6ae3d656d23216c1852c8b0e7eabea8a4121..167a10c20a8c73601adb8cdbabf2e15e34ff141f 100644
GIT binary patch
delta 3667
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

delta 3217
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
KRrij~(*GY-(yb-{

diff --git a/src/Config.h b/src/Config.h
index 05c23b3e..26988fd3 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,7 +25,7 @@
 #define VER_LAMEXP_MAJOR				4
 #define VER_LAMEXP_MINOR_HI				0
 #define VER_LAMEXP_MINOR_LO				1
-#define VER_LAMEXP_BUILD				332
+#define VER_LAMEXP_BUILD				334
 #define VER_LAMEXP_SUFFIX				Beta-1
 
 /*
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 260b2305..aa4a8654 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -207,6 +207,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
 
 	//Setup "Advanced Options" tab
 	sliderLameAlgoQuality->setValue(m_settings->lameAlgoQuality());
+	if(m_settings->maximumInstances() > 0) sliderMaxInstances->setValue(m_settings->maximumInstances());
 	spinBoxBitrateManagementMin->setValue(m_settings->bitrateManagementMinRate());
 	spinBoxBitrateManagementMax->setValue(m_settings->bitrateManagementMaxRate());
 	spinBoxNormalizationFilter->setValue(static_cast<double>(m_settings->normalizationFilterMaxVolume()) / 100.0);
@@ -218,6 +219,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
 	while(checkBoxBitrateManagement->isChecked() != m_settings->bitrateManagementEnabled()) checkBoxBitrateManagement->click();
 	while(checkBoxNeroAAC2PassMode->isChecked() != m_settings->neroAACEnable2Pass()) checkBoxNeroAAC2PassMode->click();
 	while(checkBoxNormalizationFilter->isChecked() != m_settings->normalizationFilterEnabled()) checkBoxNormalizationFilter->click();
+	while(checkBoxAutoDetectInstances->isChecked() != (m_settings->maximumInstances() < 1)) checkBoxAutoDetectInstances->click();
 	lineEditCustomParamLAME->setText(m_settings->customParametersLAME());
 	lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEnc());
 	lineEditCustomParamNeroAAC->setText(m_settings->customParametersNeroAAC());
@@ -239,8 +241,11 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
 	connect(lineEditCustomParamOggEnc, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
 	connect(lineEditCustomParamNeroAAC, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
 	connect(lineEditCustomParamFLAC, SIGNAL(editingFinished()), this, SLOT(customParamsChanged()));
+	connect(sliderMaxInstances, SIGNAL(valueChanged(int)), this, SLOT(updateMaximumInstances(int)));
+	connect(checkBoxAutoDetectInstances, SIGNAL(clicked(bool)), this, SLOT(autoDetectInstancesChanged(bool)));
 	connect(buttonResetAdvancedOptions, SIGNAL(clicked()), this, SLOT(resetAdvancedOptionsButtonClicked()));
 	updateLameAlgoQuality(sliderLameAlgoQuality->value());
+	updateMaximumInstances(sliderMaxInstances->value());
 	toneAdjustTrebleChanged(spinBoxToneAdjustTreble->value());
 	toneAdjustBassChanged(spinBoxToneAdjustBass->value());
 	customParamsChanged();
@@ -607,6 +612,7 @@ void MainWindow::changeEvent(QEvent *e)
 		m_metaInfoModel->setData(m_metaInfoModel->index(4, 1), m_settings->metaInfoPosition());
 		updateEncoder(m_settings->compressionEncoder());
 		updateLameAlgoQuality(sliderLameAlgoQuality->value());
+		updateMaximumInstances(sliderMaxInstances->value());
 
 		//Re-install shell integration
 		if(m_settings->shellIntegrationEnabled())
@@ -1925,6 +1931,23 @@ void MainWindow::customParamsChanged(void)
 }
 
 /*
+ * Maximum number of instances changed
+ */
+void MainWindow::updateMaximumInstances(int value)
+{
+	labelMaxInstances->setText(tr("%1 Instance(s)").arg(QString::number(value)));
+	m_settings->maximumInstances(checkBoxAutoDetectInstances->isChecked() ? NULL : value);
+}
+
+/*
+ * Auto-detect number of instances
+ */
+void MainWindow::autoDetectInstancesChanged(bool checked)
+{
+	m_settings->maximumInstances(checked ? NULL : sliderMaxInstances->value());
+}
+
+/*
  * Reset all advanced options to their defaults
  */
 void MainWindow::resetAdvancedOptionsButtonClicked(void)
@@ -1941,6 +1964,7 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
 	while(checkBoxBitrateManagement->isChecked() != m_settings->bitrateManagementEnabledDefault()) checkBoxBitrateManagement->click();
 	while(checkBoxNeroAAC2PassMode->isChecked() != m_settings->neroAACEnable2PassDefault()) checkBoxNeroAAC2PassMode->click();
 	while(checkBoxNormalizationFilter->isChecked() != m_settings->normalizationFilterEnabledDefault()) checkBoxNormalizationFilter->click();
+	while(checkBoxAutoDetectInstances->isChecked() != (m_settings->maximumInstancesDefault() < 1)) checkBoxAutoDetectInstances->click();
 	lineEditCustomParamLAME->setText(m_settings->customParametersLAMEDefault());
 	lineEditCustomParamOggEnc->setText(m_settings->customParametersOggEncDefault());
 	lineEditCustomParamNeroAAC->setText(m_settings->customParametersNeroAACDefault());
diff --git a/src/Dialog_MainWindow.h b/src/Dialog_MainWindow.h
index 090c5211..f1693adc 100644
--- a/src/Dialog_MainWindow.h
+++ b/src/Dialog_MainWindow.h
@@ -93,6 +93,8 @@ private slots:
 	void toneAdjustTrebleChanged(double value);
 	void toneAdjustTrebleReset(void);
 	void customParamsChanged(void);
+	void updateMaximumInstances(int value);
+	void autoDetectInstancesChanged(bool checked);
 	void resetAdvancedOptionsButtonClicked(void);
 	void sourceModelChanged(void);
 	void metaTagsEnabledChanged(void);
diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index 6723bc91..228edab1 100644
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -267,9 +267,14 @@ void ProcessingDialog::initEncoding(void)
 	WinSevenTaskbar::setTaskbarProgress(this, 0, m_pendingJobs.count());
 	WinSevenTaskbar::setOverlayIcon(this, &QIcon(":/icons/control_play_blue.png"));
 
-	lamexp_cpu_t cpuFeatures = lamexp_detect_cpu_features();
-	int parallelThreadCount = max(min(min(cpuFeatures.count, m_pendingJobs.count()), 4), 1);
+	int maximumInstances = max(min(m_settings->maximumInstances(), 16), 0);
+	if(maximumInstances < 1)
+	{
+		lamexp_cpu_t cpuFeatures = lamexp_detect_cpu_features();
+		maximumInstances = max(min(cpuFeatures.count, 4), 1);
+	}
 
+	int parallelThreadCount = max(min(maximumInstances, m_pendingJobs.count()), 1);
 	if(parallelThreadCount > 1)
 	{
 		m_progressModel->addSystemMessage(tr("Multi-threading enabled: Running %1 instances in parallel!").arg(QString::number(parallelThreadCount)));
diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index 46962aa0..f6b91798 100644
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -100,6 +100,7 @@ MAKE_ID(customParametersOggEnc, "AdvancedOptions/CustomParameters/OggEnc");
 MAKE_ID(customParametersNeroAAC, "AdvancedOptions/CustomParameters/NeroAAC");
 MAKE_ID(customParametersFLAC, "AdvancedOptions/CustomParameters/FLAC");
 MAKE_ID(metaInfoPosition, "MetaInformation/PlaylistPosition");
+MAKE_ID(maximumInstances, "AdvancedOptions/Threading/MaximumInstances");
 
 //LUT
 const int SettingsModel::mp3Bitrates[15] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1};
@@ -258,3 +259,4 @@ MAKE_OPTION2(customParametersOggEnc, QString());
 MAKE_OPTION2(customParametersNeroAAC, QString());
 MAKE_OPTION2(customParametersFLAC, QString());
 MAKE_OPTION4(metaInfoPosition, UINT_MAX);
+MAKE_OPTION4(maximumInstances, 0);
diff --git a/src/Model_Settings.h b/src/Model_Settings.h
index 7c4b5c92..032a92f0 100644
--- a/src/Model_Settings.h
+++ b/src/Model_Settings.h
@@ -110,6 +110,7 @@ public:
 	MAKE_OPTION_DEC2(customParametersNeroAAC);
 	MAKE_OPTION_DEC2(customParametersFLAC);
 	MAKE_OPTION_DEC4(metaInfoPosition);
+	MAKE_OPTION_DEC4(maximumInstances);
 
 	//Misc
 	void validate(void);
-- 
2.11.0