removed disable in/out, fixes #426

This commit is contained in:
itsmattkc
2019-02-04 16:10:19 +11:00
parent 53f6d2278f
commit 4ac2f2b5ca
13 changed files with 128 additions and 156 deletions
+1 -2
View File
@@ -10,7 +10,6 @@
Sequence::Sequence() :
playhead(0),
using_workarea(false),
enable_workarea(true),
workarea_in(0),
workarea_out(0),
wrapper_sequence(false)
@@ -26,7 +25,7 @@ Sequence::~Sequence() {
Sequence* Sequence::copy() {
Sequence* s = new Sequence();
s->name = QCoreApplication::translate("Sequence", "%1 (copy)").arg(name);
s->name = QCoreApplication::translate("Sequence", "%1 (copy)").arg(name);
s->width = width;
s->height = height;
s->frame_rate = frame_rate;
-1
View File
@@ -28,7 +28,6 @@ struct Sequence {
long playhead;
bool using_workarea;
bool enable_workarea;
long workarea_in;
long workarea_out;
-3
View File
@@ -210,7 +210,6 @@ SetTimelineInOutCommand::SetTimelineInOutCommand(Sequence *s, bool enabled, long
void SetTimelineInOutCommand::undo() {
seq->using_workarea = old_enabled;
seq->enable_workarea = old_workarea_enabled;
seq->workarea_in = old_in;
seq->workarea_out = old_out;
@@ -227,11 +226,9 @@ void SetTimelineInOutCommand::undo() {
void SetTimelineInOutCommand::redo() {
old_enabled = seq->using_workarea;
old_workarea_enabled = seq->enable_workarea;
old_in = seq->workarea_in;
old_out = seq->workarea_out;
if (!seq->using_workarea) seq->enable_workarea = true;
seq->using_workarea = new_enabled;
seq->workarea_in = new_in;
seq->workarea_out = new_out;
-2
View File
@@ -174,8 +174,6 @@ public:
private:
Sequence* seq;
bool old_workarea_enabled;
bool old_enabled;
long old_in;
long old_out;