OpenShot · jonoomph · Feb 25, 2021 · Feb 18, 2021 · Feb 18, 2021 · Feb 18, 2021
diff --git a/src/effects/icons/bars.png b/src/effects/icons/bars.png
diff --git a/src/effects/icons/blur.png b/src/effects/icons/blur.png
diff --git a/src/effects/icons/brightness.png b/src/effects/icons/brightness.png
diff --git a/src/effects/icons/caption.png b/src/effects/icons/caption.png
diff --git a/src/effects/icons/chromakey.png b/src/effects/icons/chromakey.png
diff --git a/src/effects/icons/colorshift.png b/src/effects/icons/colorshift.png
diff --git a/src/effects/icons/crop.png b/src/effects/icons/crop.png
diff --git a/src/effects/icons/deinterlace.png b/src/effects/icons/deinterlace.png
diff --git a/src/effects/icons/hue.png b/src/effects/icons/hue.png
diff --git a/src/effects/icons/mask.png b/src/effects/icons/mask.png
diff --git a/src/effects/icons/negate.png b/src/effects/icons/negate.png
diff --git a/src/effects/icons/objectdetector.png b/src/effects/icons/objectdetector.png
diff --git a/src/effects/icons/pixelate.png b/src/effects/icons/pixelate.png
diff --git a/src/effects/icons/saturation.png b/src/effects/icons/saturation.png
diff --git a/src/effects/icons/shift.png b/src/effects/icons/shift.png
diff --git a/src/effects/icons/stabilizer.png b/src/effects/icons/stabilizer.png
diff --git a/src/effects/icons/tracker.png b/src/effects/icons/tracker.png
diff --git a/src/effects/icons/wave.png b/src/effects/icons/wave.png
diff --git a/src/images/cache/NewWebsite.png b/src/images/cache/NewWebsite.png
diff --git a/src/images/cache/bars.png b/src/images/cache/bars.png
diff --git a/src/images/cache/blur.png b/src/images/cache/blur.png
diff --git a/src/images/cache/brightness.png b/src/images/cache/brightness.png
diff --git a/src/images/cache/caption.png b/src/images/cache/caption.png
diff --git a/src/images/cache/chromakey.png b/src/images/cache/chromakey.png
diff --git a/src/images/cache/colorshift.png b/src/images/cache/colorshift.png
diff --git a/src/images/cache/crop.png b/src/images/cache/crop.png
diff --git a/src/images/cache/deinterlace.png b/src/images/cache/deinterlace.png
diff --git a/src/images/cache/hue.png b/src/images/cache/hue.png
diff --git a/src/images/cache/mask.png b/src/images/cache/mask.png
diff --git a/src/images/cache/negate.png b/src/images/cache/negate.png
diff --git a/src/images/cache/objectdetector.png b/src/images/cache/objectdetector.png
diff --git a/src/images/cache/pixelate.png b/src/images/cache/pixelate.png
diff --git a/src/images/cache/saturation.png b/src/images/cache/saturation.png
diff --git a/src/images/cache/shift.png b/src/images/cache/shift.png
diff --git a/src/images/cache/stabilizer.png b/src/images/cache/stabilizer.png
diff --git a/src/images/cache/tracker.png b/src/images/cache/tracker.png
diff --git a/src/images/cache/wave.png b/src/images/cache/wave.png
diff --git a/src/language/OpenShot/OpenShot.pot b/src/language/OpenShot/OpenShot.pot
diff --git a/src/language/OpenShot/OpenShot_blender.pot b/src/language/OpenShot/OpenShot_blender.pot
diff --git a/src/language/OpenShot/OpenShot_emojis.pot b/src/language/OpenShot/OpenShot_emojis.pot
diff --git a/src/language/OpenShot/OpenShot_transitions.pot b/src/language/OpenShot/OpenShot_transitions.pot
diff --git a/src/settings/_default.settings b/src/settings/_default.settings
@@ -422,14 +422,6 @@
     "values": [],
     "restart": true
   },
-  {
-    "value": true,
-    "title": "Process Video Frames in Parallel (Experimental)",
-    "type": "bool",
-    "restart": false,
-    "category": "Performance",
-    "setting": "omp_threads_enabled"
-  },
   {
     "min": 0,
     "max": 128,

diff --git a/src/windows/export.py b/src/windows/export.py
@@ -67,7 +67,7 @@ class Export(QDialog):
 
     ExportStarted = pyqtSignal(str, int, int)
     ExportFrame = pyqtSignal(str, int, int, int, str)
-    ExportEnded = pyqtSignal(str)        
+    ExportEnded = pyqtSignal(str)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -111,7 +111,6 @@ def __init__(self, *args, **kwargs):
         self.txtChannels.setVisible(False)
 
         # Set OMP thread disabled flag (for stability)
-        openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
         openshot.Settings.Instance().HIGH_QUALITY_SCALING = True
 
         project_timeline = get_app().window.timeline_sync.timeline
@@ -1012,12 +1011,6 @@ def titlestring(sec, fps, mess):
         # Clear all cache
         self.timeline.ClearAllCache()
 
-        # Re-set OMP thread enabled flag
-        if self.s.get("omp_threads_enabled"):
-            openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = False
-        else:
-            openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
-
         # Return scale mode to lower quality scaling (for faster previews)
         openshot.Settings.Instance().HIGH_QUALITY_SCALING = False
 
@@ -1066,14 +1059,6 @@ def reject(self):
                 # Resume export
                 return
 
-        # Re-set OMP thread enabled flag
-        # NOTE: This is always called when closing the export modal, and thus
-        # the keyframes are always scaled back to the original FPS if needed.
-        if self.s.get("omp_threads_enabled"):
-            openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = False
-        else:
-            openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
-
         # Return scale mode to lower quality scaling (for faster previews)
         openshot.Settings.Instance().HIGH_QUALITY_SCALING = False
 

diff --git a/src/windows/main_window.py b/src/windows/main_window.py
@@ -2927,12 +2927,6 @@ def __init__(self, *args, mode=None):
         else:
             openshot.Settings.Instance().PLAYBACK_AUDIO_DEVICE_NAME = ""
 
-        # Set OMP thread enabled flag (for stability)
-        if s.get("omp_threads_enabled"):
-            openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = False
-        else:
-            openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
-
         # Set scaling mode to lower quality scaling (for faster previews)
         openshot.Settings.Instance().HIGH_QUALITY_SCALING = False
 

diff --git a/src/windows/preferences.py b/src/windows/preferences.py
@@ -485,14 +485,6 @@ def bool_value_changed(self, widget, param, state):
                 # Stop autosave timer
                 get_app().window.auto_save_timer.stop()
 
-        elif param["setting"] == "omp_threads_enabled":
-            if (state == Qt.Checked):
-                # Enable OMP multi-threading
-                openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = False
-            else:
-                # Disable OMP multi-threading
-                openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
-
         # Check for restart
         self.check_for_restart(param)
 

diff --git a/src/windows/ui/main-window.ui b/src/windows/ui/main-window.ui
@@ -372,6 +372,9 @@
    <attribute name="dockWidgetArea">
     <number>4</number>
    </attribute>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
    <widget class="QWidget" name="dockWidgetContentsCaption">
     <layout class="QGridLayout" name="gridLayoutCaption">
      <property name="leftMargin">