Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
6957f7de
Commit
6957f7de
authored
Sep 23, 2009
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Force repositionnement when moving a clip from a track to another
parent
f823b33d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
src/Workflow/MainWorkflow.cpp
src/Workflow/MainWorkflow.cpp
+6
-0
src/Workflow/TrackWorkflow.cpp
src/Workflow/TrackWorkflow.cpp
+6
-2
src/Workflow/TrackWorkflow.h
src/Workflow/TrackWorkflow.h
+1
-0
No files found.
src/Workflow/MainWorkflow.cpp
View file @
6957f7de
...
...
@@ -275,8 +275,14 @@ void MainWorkflow::moveClip( const QUuid& clipUuid, unsigned int oldTr
}
else
{
bool
needRepo
;
if
(
m_tracks
[
oldTrack
]
->
getClipPosition
(
clipUuid
)
!=
startingFrame
)
needRepo
=
true
;
ClipWorkflow
*
cw
=
m_tracks
[
oldTrack
]
->
removeClipWorkflow
(
clipUuid
);
m_tracks
[
newTrack
]
->
addClip
(
cw
,
startingFrame
);
if
(
needRepo
==
true
)
m_tracks
[
newTrack
]
->
forceRepositionning
();
activateTrack
(
oldTrack
);
activateTrack
(
newTrack
);
}
...
...
src/Workflow/TrackWorkflow.cpp
View file @
6957f7de
...
...
@@ -136,9 +136,7 @@ void TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
cw
->
getStateLock
()
->
unlock
();
if
(
needRepositioning
==
true
)
{
adjustClipTime
(
currentFrame
,
start
,
cw
);
}
QMutexLocker
lock
(
cw
->
getSleepMutex
()
);
cw
->
wake
();
}
...
...
@@ -616,3 +614,9 @@ void TrackWorkflow::disconnectClipWorkflow( ClipWorkflow* cw )
disconnect
(
cw
,
SIGNAL
(
paused
()
),
this
,
SLOT
(
clipWorkflowPaused
()
)
);
disconnect
(
cw
,
SIGNAL
(
unpaused
()
),
this
,
SLOT
(
clipWorkflowUnpaused
()
)
);
}
void
TrackWorkflow
::
forceRepositionning
()
{
QMutexLocker
lock
(
m_forceRepositionningMutex
);
m_forceRepositionning
=
true
;
}
src/Workflow/TrackWorkflow.h
View file @
6957f7de
...
...
@@ -75,6 +75,7 @@ class TrackWorkflow : public QObject
void
clear
();
void
setFullSpeedRender
(
bool
value
);
void
forceRepositionning
();
private:
void
computeLength
();
...
...
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