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
d085180e
Commit
d085180e
authored
Feb 24, 2018
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup insertZone function
parent
f09ff1cd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
src/timeline2/view/timelinecontroller.cpp
src/timeline2/view/timelinecontroller.cpp
+10
-3
No files found.
src/timeline2/view/timelinecontroller.cpp
View file @
d085180e
...
...
@@ -1347,11 +1347,18 @@ bool TimelineController::insertZone(const QString &binId, QPoint zone, bool over
if
(
targetTrack
==
-
1
)
{
targetTrack
=
m_activeTrack
;
}
qDebug
()
<<
" // / /INSERTING BIN CLIP: "
<<
binId
;
int
insertPoint
;
QPoint
sourceZone
;
if
(
KdenliveSettings
::
useTimelineZoneToEdit
())
{
return
TimelineFunctions
::
insertZone
(
m_model
,
targetTrack
,
binId
,
m_zone
.
x
(),
QPoint
(
zone
.
x
(),
zone
.
x
()
+
m_zone
.
y
()
-
m_zone
.
x
()),
overwrite
);
// We want to use timeline zone for in/out insert points
insertPoint
=
m_zone
.
x
();
sourceZone
=
QPoint
(
zone
.
x
(),
zone
.
x
()
+
m_zone
.
y
()
-
m_zone
.
x
());
}
else
{
// Use curent timeline pos and clip zone for in/out
insertPoint
=
timelinePosition
();
sourceZone
=
zone
;
}
return
TimelineFunctions
::
insertZone
(
m_model
,
targetTrack
,
binId
,
timelinePosition
(),
z
one
,
overwrite
);
return
TimelineFunctions
::
insertZone
(
m_model
,
targetTrack
,
binId
,
insertPoint
,
sourceZ
one
,
overwrite
);
}
void
TimelineController
::
updateClip
(
int
clipId
,
QVector
<
int
>
roles
)
...
...
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