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
21f8ddbc
Commit
21f8ddbc
authored
Nov 12, 2021
by
Jean-Baptiste Mardelle
Browse files
Attempt to fix slideshow detection on Windows.
Related to
#1247
parent
5bc3f895
Pipeline
#96651
canceled with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/doc/documentchecker.cpp
View file @
21f8ddbc
...
...
@@ -261,7 +261,7 @@ bool DocumentChecker::hasErrorInClips()
original
.
prepend
(
root
);
}
// Check for slideshows
bool
slideshow
=
original
.
contains
(
QStringLiteral
(
"/.all."
))
||
original
.
contains
(
QLatin1Char
(
'?'
))
||
original
.
contains
(
QLatin1Char
(
'%'
));
bool
slideshow
=
original
.
contains
(
QStringLiteral
(
"/.all."
))
||
original
.
contains
(
QStringLiteral
(
"
\\
.all."
))
||
original
.
contains
(
QLatin1Char
(
'?'
))
||
original
.
contains
(
QLatin1Char
(
'%'
));
if
(
slideshow
&&
Xml
::
hasXmlProperty
(
e
,
QStringLiteral
(
"ttl"
)))
{
original
=
QFileInfo
(
original
).
absolutePath
();
}
...
...
@@ -282,7 +282,7 @@ bool DocumentChecker::hasErrorInClips()
}
// Check for slideshows
QString
slidePattern
;
bool
slideshow
=
resource
.
contains
(
QStringLiteral
(
"/.all."
))
||
resource
.
contains
(
QLatin1Char
(
'?'
))
||
resource
.
contains
(
QLatin1Char
(
'%'
));
bool
slideshow
=
resource
.
contains
(
QStringLiteral
(
"/.all."
))
||
resource
.
contains
(
QStringLiteral
(
"
\\
.all."
))
||
resource
.
contains
(
QLatin1Char
(
'?'
))
||
resource
.
contains
(
QLatin1Char
(
'%'
));
if
(
slideshow
)
{
if
(
service
==
QLatin1String
(
"qimage"
)
||
service
==
QLatin1String
(
"pixbuf"
))
{
slidePattern
=
QFileInfo
(
resource
).
fileName
();
...
...
@@ -505,7 +505,7 @@ bool DocumentChecker::hasErrorInClips()
resource
=
service
==
QLatin1String
(
"timewarp"
)
?
Xml
::
getXmlProperty
(
e
,
QStringLiteral
(
"warp_resource"
))
:
Xml
::
getXmlProperty
(
e
,
QStringLiteral
(
"resource"
));
}
bool
slideshow
=
resource
.
contains
(
QStringLiteral
(
"/.all."
))
||
resource
.
contains
(
QLatin1Char
(
'?'
))
||
resource
.
contains
(
QLatin1Char
(
'%'
));
bool
slideshow
=
resource
.
contains
(
QStringLiteral
(
"/.all."
))
||
resource
.
contains
(
QStringLiteral
(
"
\\
.all."
))
||
resource
.
contains
(
QLatin1Char
(
'?'
))
||
resource
.
contains
(
QLatin1Char
(
'%'
));
if
(
service
.
startsWith
(
QLatin1String
(
"avformat"
))
||
service
==
QLatin1String
(
"framebuffer"
)
||
service
==
QLatin1String
(
"timewarp"
))
{
clipType
=
i18n
(
"Video clip"
);
...
...
src/mltcontroller/clipcontroller.cpp
View file @
21f8ddbc
...
...
@@ -213,7 +213,7 @@ void ClipController::getInfoForProducer()
}
}
}
else
if
(
m_service
==
QLatin1String
(
"qimage"
)
||
m_service
==
QLatin1String
(
"pixbuf"
))
{
if
(
m_path
.
contains
(
QLatin1Char
(
'%'
))
||
m_path
.
contains
(
QStringLiteral
(
"/.all."
)))
{
if
(
m_path
.
contains
(
QLatin1Char
(
'%'
))
||
m_path
.
contains
(
QStringLiteral
(
"/.all."
))
||
m_path
.
contains
(
QStringLiteral
(
"
\\
.all."
))
)
{
m_clipType
=
ClipType
::
SlideShow
;
m_hasLimitedDuration
=
true
;
}
else
{
...
...
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