Skip to content
GitLab
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
69ea21c0
Commit
69ea21c0
authored
Nov 21, 2016
by
Jean-Baptiste Mardelle
Browse files
Fix render sometimes incorrectly using proxies
CCBUG: 371064
parent
7075020d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/mainwindow.cpp
View file @
69ea21c0
...
...
@@ -3312,7 +3312,6 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
temp
.
open
();
playlistPath
=
temp
.
fileName
();
}
QString
playlistContent
=
pCore
->
projectManager
()
->
projectSceneList
(
project
->
url
().
adjusted
(
QUrl
::
RemoveFilename
).
path
());
if
(
!
chapterFile
.
isEmpty
())
{
int
in
=
0
;
...
...
@@ -3394,7 +3393,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
// Do we want proxy rendering
if
(
project
->
useProxy
()
&&
!
m_renderWidget
->
proxyRendering
())
{
QString
root
=
pCore
->
binController
()
->
documentRoot
(
);
QString
root
=
doc
.
documentElement
().
attribute
(
QStringLiteral
(
"root"
))
+
QStringLiteral
(
"/"
);
// replace proxy clips with originals
//TODO
...
...
@@ -3409,7 +3408,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
QDomElement
e
=
producers
.
item
(
n
).
toElement
();
producerResource
=
EffectsList
::
property
(
e
,
QStringLiteral
(
"resource"
));
producerService
=
EffectsList
::
property
(
e
,
QStringLiteral
(
"mlt_service"
));
if
(
producerResource
.
isEmpty
())
{
if
(
producerResource
.
isEmpty
()
||
producerService
==
QLatin1String
(
"color"
)
)
{
continue
;
}
if
(
producerService
==
QLatin1String
(
"timewarp"
))
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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