Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
3d188d57
Commit
3d188d57
authored
Feb 22, 2018
by
Nicolas Carion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apply the same fixes for requestClipInsertion
parent
cc59d0ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
src/timeline2/model/timelinemodel.cpp
src/timeline2/model/timelinemodel.cpp
+5
-1
tests/modeltest.cpp
tests/modeltest.cpp
+1
-1
No files found.
src/timeline2/model/timelinemodel.cpp
View file @
3d188d57
...
...
@@ -611,7 +611,11 @@ bool TimelineModel::requestClipInsertion(const QString &binClipId, int trackId,
bool
res
=
false
;
ClipType
type
=
ClipType
::
Unknown
;
if
(
KdenliveSettings
::
splitaudio
())
{
std
::
shared_ptr
<
ProjectClip
>
master
=
pCore
->
projectItemModel
()
->
getClipByBinID
(
binClipId
.
section
(
QLatin1Char
(
'/'
),
0
,
0
));
QString
bid
=
binClipId
.
section
(
QLatin1Char
(
'/'
),
0
,
0
);
if
(
!
pCore
->
projectItemModel
()
->
hasClip
(
bid
))
{
return
false
;
}
std
::
shared_ptr
<
ProjectClip
>
master
=
pCore
->
projectItemModel
()
->
getClipByBinID
(
bid
);
type
=
master
->
clipType
();
}
if
(
type
==
ClipType
::
AV
)
{
...
...
tests/modeltest.cpp
View file @
3d188d57
...
...
@@ -977,7 +977,7 @@ TEST_CASE("Undo and Redo", "[ClipModel]")
};
state1
();
QString
binId4
=
binId3
+
"
#1#
10"
;
QString
binId4
=
binId3
+
"
/1/
10"
;
int
cid4
;
REQUIRE
(
timeline
->
requestClipInsertion
(
binId4
,
tid2
,
17
,
cid4
,
true
));
...
...
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