Commit 5a9a7184 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen
Browse files

Tracks can now be removed when we're not rendering.

parent d8ceef5a
...@@ -277,12 +277,17 @@ float WorkflowRenderer::getFps() const ...@@ -277,12 +277,17 @@ float WorkflowRenderer::getFps() const
void WorkflowRenderer::removeClip( const QUuid& uuid, uint32_t trackId, MainWorkflow::TrackType trackType ) void WorkflowRenderer::removeClip( const QUuid& uuid, uint32_t trackId, MainWorkflow::TrackType trackType )
{ {
if ( m_isRendering == true )
{
StackedAction* act = new StackedAction( RemoveClip ); StackedAction* act = new StackedAction( RemoveClip );
act->uuid = uuid; act->uuid = uuid;
act->trackId = trackId; act->trackId = trackId;
act->trackType = trackType; act->trackType = trackType;
QMutexLocker lock( m_actionsMutex ); QMutexLocker lock( m_actionsMutex );
m_actions.push( act ); m_actions.push( act );
}
else
m_mainWorkflow->removeClip( uuid, trackId, trackType );
} }
void WorkflowRenderer::addClip( Clip* clip, uint32_t trackNumber, qint64 startingPos, MainWorkflow::TrackType trackType ) void WorkflowRenderer::addClip( Clip* clip, uint32_t trackNumber, qint64 startingPos, MainWorkflow::TrackType trackType )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment