Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
252
Issues
252
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
83ab6e7b
Commit
83ab6e7b
authored
Jun 14, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix crash loading playlist with different fps.
Related to
#250
parent
61bde8d5
Pipeline
#4322
passed with stage
in 20 minutes and 42 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
6 deletions
+14
-6
src/jobs/loadjob.cpp
src/jobs/loadjob.cpp
+14
-6
No files found.
src/jobs/loadjob.cpp
View file @
83ab6e7b
...
...
@@ -135,9 +135,11 @@ std::shared_ptr<Mlt::Producer> LoadJob::loadPlaylist(QString &resource)
//resource.prepend(QStringLiteral("xml:"));
}
else
{
// This is currently crashing so I guess we'd better reject it for now
qDebug
()
<<
"////// ERROR, INCOMPATIBLE PROFILE: "
<<
resource
;
return
nullptr
;
// path.prepend(QStringLiteral("consumer:"));
m_errorMessage
.
append
(
i18n
(
"Playlist has a different framerate (%1/%2fps), not recommended."
,
xmlProfile
->
frame_rate_num
(),
xmlProfile
->
frame_rate_den
()));
QString
loader
=
resource
;
loader
.
prepend
(
QStringLiteral
(
"consumer:"
));
pCore
->
getCurrentProfile
()
->
set_explicit
(
1
);
return
std
::
make_shared
<
Mlt
::
Producer
>
(
pCore
->
getCurrentProfile
()
->
profile
(),
loader
.
toUtf8
().
constData
());
}
pCore
->
getCurrentProfile
()
->
set_explicit
(
1
);
return
std
::
make_shared
<
Mlt
::
Producer
>
(
pCore
->
getCurrentProfile
()
->
profile
(),
"xml"
,
resource
.
toUtf8
().
constData
());
...
...
@@ -269,6 +271,10 @@ bool LoadJob::startJob()
break
;
case
ClipType
::
Playlist
:
{
m_producer
=
loadPlaylist
(
m_resource
);
if
(
!
m_errorMessage
.
isEmpty
())
{
QMetaObject
::
invokeMethod
(
pCore
.
get
(),
"displayBinMessage"
,
Qt
::
QueuedConnection
,
Q_ARG
(
const
QString
&
,
m_errorMessage
),
Q_ARG
(
int
,
(
int
)
KMessageWidget
::
Warning
));
}
if
(
m_resource
.
endsWith
(
QLatin1String
(
".kdenlive"
)))
{
QFile
f
(
m_resource
);
QDomDocument
doc
;
...
...
@@ -283,12 +289,14 @@ bool LoadJob::startJob()
if
(
!
offsetData
.
isEmpty
())
{
bool
ok
=
false
;
int
offset
=
offsetData
.
toInt
(
&
ok
);
qDebug
()
<<
" / / /GET OFFSET DATA: "
<<
offset
;
if
(
ok
)
{
qDebug
()
<<
" / / / FIXING OFFSET DATA: "
<<
offset
;
offset
=
m_producer
->
get_playtime
()
-
offset
-
1
;
m_producer
->
set
(
"out"
,
offset
-
1
);
m_producer
->
set
(
"length"
,
offset
);
m_producer
->
parent
().
set
(
"out"
,
offset
-
1
);
m_producer
->
parent
().
set
(
"length"
,
offset
);
}
}
else
{
qDebug
()
<<
"// NO OFFSET DAT FOUND
\n\n
"
;
}
}
else
{
qDebug
()
<<
":_______
\n
______<nEMPTY PLAYLIST
\n
----"
;
...
...
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