From 38ca51cf10edffe102ee2c5c4257b2a0f4dcbe59 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 22 Jun 2018 02:45:52 -0700 Subject: [PATCH] added backend for disabling clips --- playback/playback.cpp | 2 +- project/clip.cpp | 2 ++ project/clip.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/playback/playback.cpp b/playback/playback.cpp index e84850290..48d89c6b9 100644 --- a/playback/playback.cpp +++ b/playback/playback.cpp @@ -287,7 +287,7 @@ void retrieve_next_frame_raw_data(Clip* c, AVFrame* output) { } bool is_clip_active(Clip* c, long playhead) { - return c->timeline_in < playhead + ceil(c->sequence->frame_rate) && c->timeline_out > playhead; + return c->timeline_in < playhead + ceil(c->sequence->frame_rate) && c->timeline_out > playhead && c->enabled; } void set_sequence(Sequence* s) { diff --git a/project/clip.cpp b/project/clip.cpp index 0919def30..021de08da 100644 --- a/project/clip.cpp +++ b/project/clip.cpp @@ -18,6 +18,7 @@ Clip::Clip() { Clip* Clip::copy() { Clip* copy = new Clip(); + copy->enabled = enabled; copy->name = QString(name); copy->clip_in = clip_in; copy->timeline_in = timeline_in; @@ -39,6 +40,7 @@ Clip* Clip::copy() { void Clip::init() { reset(); + enabled = true; clip_in = 0; timeline_in = 0; timeline_out = 0; diff --git a/project/clip.h b/project/clip.h index 4a4493a4b..3a5b0a911 100644 --- a/project/clip.h +++ b/project/clip.h @@ -39,6 +39,7 @@ struct Clip bool undeletable; // timeline variables + bool enabled; QString name; long clip_in; long timeline_in;