Skip to content

Commit 5e95b86

Browse files
committed
Removing some unused settings
1 parent 14ecc51 commit 5e95b86

File tree

5 files changed

+1
-42
lines changed

5 files changed

+1
-42
lines changed

src/language/OpenShot/OpenShot.pot

-4
Original file line numberDiff line numberDiff line change
@@ -2231,10 +2231,6 @@ msgstr ""
22312231
msgid "Debug Mode (Verbose)"
22322232
msgstr ""
22332233

2234-
#: Settings for omp_threads_enabled
2235-
msgid "Process Video Frames in Parallel (Experimental)"
2236-
msgstr ""
2237-
22382234
#: Settings for debug-port
22392235
msgid "Debug Mode (Port)"
22402236
msgstr ""

src/settings/_default.settings

-8
Original file line numberDiff line numberDiff line change
@@ -422,14 +422,6 @@
422422
"values": [],
423423
"restart": true
424424
},
425-
{
426-
"value": true,
427-
"title": "Process Video Frames in Parallel (Experimental)",
428-
"type": "bool",
429-
"restart": false,
430-
"category": "Performance",
431-
"setting": "omp_threads_enabled"
432-
},
433425
{
434426
"min": 0,
435427
"max": 128,

src/windows/export.py

+1-16
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class Export(QDialog):
6767

6868
ExportStarted = pyqtSignal(str, int, int)
6969
ExportFrame = pyqtSignal(str, int, int, int, str)
70-
ExportEnded = pyqtSignal(str)
70+
ExportEnded = pyqtSignal(str)
7171

7272
def __init__(self, *args, **kwargs):
7373
super().__init__(*args, **kwargs)
@@ -111,7 +111,6 @@ def __init__(self, *args, **kwargs):
111111
self.txtChannels.setVisible(False)
112112

113113
# Set OMP thread disabled flag (for stability)
114-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
115114
openshot.Settings.Instance().HIGH_QUALITY_SCALING = True
116115

117116
project_timeline = get_app().window.timeline_sync.timeline
@@ -1012,12 +1011,6 @@ def titlestring(sec, fps, mess):
10121011
# Clear all cache
10131012
self.timeline.ClearAllCache()
10141013

1015-
# Re-set OMP thread enabled flag
1016-
if self.s.get("omp_threads_enabled"):
1017-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = False
1018-
else:
1019-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
1020-
10211014
# Return scale mode to lower quality scaling (for faster previews)
10221015
openshot.Settings.Instance().HIGH_QUALITY_SCALING = False
10231016

@@ -1066,14 +1059,6 @@ def reject(self):
10661059
# Resume export
10671060
return
10681061

1069-
# Re-set OMP thread enabled flag
1070-
# NOTE: This is always called when closing the export modal, and thus
1071-
# the keyframes are always scaled back to the original FPS if needed.
1072-
if self.s.get("omp_threads_enabled"):
1073-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = False
1074-
else:
1075-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
1076-
10771062
# Return scale mode to lower quality scaling (for faster previews)
10781063
openshot.Settings.Instance().HIGH_QUALITY_SCALING = False
10791064

src/windows/main_window.py

-6
Original file line numberDiff line numberDiff line change
@@ -2927,12 +2927,6 @@ def __init__(self, *args, mode=None):
29272927
else:
29282928
openshot.Settings.Instance().PLAYBACK_AUDIO_DEVICE_NAME = ""
29292929

2930-
# Set OMP thread enabled flag (for stability)
2931-
if s.get("omp_threads_enabled"):
2932-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = False
2933-
else:
2934-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
2935-
29362930
# Set scaling mode to lower quality scaling (for faster previews)
29372931
openshot.Settings.Instance().HIGH_QUALITY_SCALING = False
29382932

src/windows/preferences.py

-8
Original file line numberDiff line numberDiff line change
@@ -485,14 +485,6 @@ def bool_value_changed(self, widget, param, state):
485485
# Stop autosave timer
486486
get_app().window.auto_save_timer.stop()
487487

488-
elif param["setting"] == "omp_threads_enabled":
489-
if (state == Qt.Checked):
490-
# Enable OMP multi-threading
491-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = False
492-
else:
493-
# Disable OMP multi-threading
494-
openshot.Settings.Instance().WAIT_FOR_VIDEO_PROCESSING_TASK = True
495-
496488
# Check for restart
497489
self.check_for_restart(param)
498490

0 commit comments

Comments
 (0)