Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
cd371679
Commit
cd371679
authored
Jun 04, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't warn about missing timeline preview chunks on project opening
parent
c68ab714
Pipeline
#4030
passed with stage
in 31 minutes and 49 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
src/doc/documentchecker.cpp
src/doc/documentchecker.cpp
+10
-6
No files found.
src/doc/documentchecker.cpp
View file @
cd371679
...
...
@@ -95,10 +95,11 @@ bool DocumentChecker::hasErrorInClips()
// Check if strorage folder for temp files exists
QString
storageFolder
;
QDir
projectDir
(
m_url
.
adjusted
(
QUrl
::
RemoveFilename
).
toLocalFile
());
QString
documentid
;
QDomNodeList
playlists
=
m_doc
.
elementsByTagName
(
QStringLiteral
(
"playlist"
));
for
(
int
i
=
0
;
i
<
playlists
.
count
();
++
i
)
{
if
(
playlists
.
at
(
i
).
toElement
().
attribute
(
QStringLiteral
(
"id"
))
==
BinPlaylist
::
binPlaylistId
)
{
QString
documentid
=
Xml
::
getXmlProperty
(
playlists
.
at
(
i
).
toElement
(),
QStringLiteral
(
"kdenlive:docproperties.documentid"
));
documentid
=
Xml
::
getXmlProperty
(
playlists
.
at
(
i
).
toElement
(),
QStringLiteral
(
"kdenlive:docproperties.documentid"
));
if
(
documentid
.
isEmpty
())
{
// invalid document id, recreate one
documentid
=
QString
::
number
(
QDateTime
::
currentMSecsSinceEpoch
());
...
...
@@ -177,12 +178,11 @@ bool DocumentChecker::hasErrorInClips()
}
else
{
Xml
::
setXmlProperty
(
e
,
QStringLiteral
(
"mlt_service"
),
QStringLiteral
(
"avformat"
));
}
}
}
continue
;
}
checkMissingImagesAndFonts
(
QStringList
(),
QStringList
(
Xml
::
getXmlProperty
(
e
,
QStringLiteral
(
"family"
))),
e
.
attribute
(
QStringLiteral
(
"id"
)),
e
.
attribute
(
QStringLiteral
(
"name"
)));
continue
;
...
...
@@ -264,9 +264,13 @@ bool DocumentChecker::hasErrorInClips()
resource
=
QFileInfo
(
resource
).
absolutePath
();
}
if
(
!
QFile
::
exists
(
resource
))
{
// Missing clip found
m_missingClips
.
append
(
e
);
missingPaths
.
append
(
resource
);
// Missing clip found, make sure to omit timeline preview
if
(
QFileInfo
(
resource
).
absolutePath
().
endsWith
(
QString
(
"/%1/preview"
).
arg
(
documentid
)))
{
// This is a timeline preview missing chunk, ignore
}
else
{
m_missingClips
.
append
(
e
);
missingPaths
.
append
(
resource
);
}
}
// Make sure we don't query same path twice
verifiedPaths
.
append
(
resource
);
...
...
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