Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
a048e250
Commit
a048e250
authored
May 06, 2019
by
Jean-Baptiste Mardelle
Browse files
Disable threaded rendering with movit
parent
7249f2fa
Pipeline
#3125
passed with stage
in 14 minutes and 8 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/dialogs/renderwidget.cpp
View file @
a048e250
...
...
@@ -358,6 +358,10 @@ RenderWidget::RenderWidget(bool enableProxy, QWidget *parent)
#endif
m_view
.
parallel_process
->
setChecked
(
KdenliveSettings
::
parallelrender
());
connect
(
m_view
.
parallel_process
,
&
QCheckBox
::
stateChanged
,
[](
int
state
)
{
KdenliveSettings
::
setParallelrender
(
state
==
Qt
::
Checked
);
});
if
(
KdenliveSettings
::
gpu_accel
())
{
// Disable parallel rendering for movit
m_view
.
parallel_process
->
setEnabled
(
false
);
}
m_view
.
field_order
->
setEnabled
(
false
);
connect
(
m_view
.
scanning_list
,
QOverload
<
int
>::
of
(
&
QComboBox
::
currentIndexChanged
),
[
this
](
int
index
)
{
m_view
.
field_order
->
setEnabled
(
index
==
2
);
});
refreshView
();
...
...
@@ -1456,7 +1460,7 @@ void RenderWidget::generateRenderFiles(QDomDocument doc, const QString &playlist
}
int
threadCount
=
QThread
::
idealThreadCount
();
if
(
threadCount
<
2
||
!
m_view
.
parallel_process
->
isChecked
())
{
if
(
threadCount
<
2
||
!
m_view
.
parallel_process
->
isChecked
()
||
!
m_view
.
parallel_process
->
isEnabled
()
)
{
threadCount
=
1
;
}
...
...
@@ -1866,7 +1870,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
}
int
threadCount
=
QThread
::
idealThreadCount
();
if
(
threadCount
>
2
&&
m_view
.
parallel_process
->
isChecked
())
{
if
(
threadCount
>
2
&&
m_view
.
parallel_process
->
isChecked
()
&&
m_view
.
parallel_process
->
isEnabled
()
)
{
threadCount
=
qMin
(
threadCount
-
1
,
4
);
}
else
{
threadCount
=
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment