oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrote undo system #72

Browse Source
This commit is contained in:
itsmattkc
2018-07-13 19:07:01 +01:00
parent 5297d4a5f7
commit c957780a9c
17 changed files with 613 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/sequence.cpp
+8 -120
View File
@@ -5,9 +5,7 @@
#include <QDebug>
Sequence::Sequence() {
reset_undo();
}
Sequence::Sequence() {}
Sequence::~Sequence() {
// dealloc all clips
@@ -48,23 +46,8 @@ Clip* Sequence::get_clip(int i) {
return clips.at(i);
}
void Sequence::delete_clip(int i) {
// remove any potential link references to clip
for (int j=0;j<clip_count();j++) {
Clip* c = get_clip(j);
if (c != NULL) {
for (int k=0;k<c->linked.size();k++) {
if (c->linked[k] == i) {
c->linked.removeAt(k);
break;
}
}
}
}
// finally remove from vector
delete clips.at(i);
clips[i] = NULL;
void Sequence::replace_clip(int i, Clip* c) {
clips[i] = c;
}
long Sequence::getEndFrame() {
@@ -78,6 +61,11 @@ long Sequence::getEndFrame() {
return end;
}
void Sequence::destroy_clip(int i, bool del) {
if (del) delete clips.at(i);
clips.removeAt(i);
}
void Sequence::get_track_limits(int* video_tracks, int* audio_tracks) {
int vt = 0;
int at = 0;
@@ -95,105 +83,5 @@ void Sequence::get_track_limits(int* video_tracks, int* audio_tracks) {
if (audio_tracks != NULL) *audio_tracks = at;
}
//void Sequence::delete_area(long in, long out, int track) {
//}
int Sequence::split_clip(int p, long frame) {
Clip* pre = get_clip(p);
if (pre != NULL && pre->timeline_in < frame && pre->timeline_out > frame) { // guard against attempts to split at in/out points
Clip* post = pre->copy();
pre->timeline_out = frame;
post->timeline_in = frame;
post->clip_in = pre->clip_in + pre->getLength();
long pre_length = pre->getLength();
if (pre->closing_transition != NULL) {
post->closing_transition = pre->closing_transition;
pre->closing_transition = NULL;
long post_length = post->getLength();
if (post->closing_transition->length > post_length) {
post->closing_transition->length = post_length;
}
}
if (pre->opening_transition != NULL && pre->opening_transition->length > pre_length) {
pre->opening_transition->length = pre_length;
}
return add_clip(post);
}
return -1;
}
void Sequence::reset_undo() {
while (undo_stack.size() > 0) {
delete undo_stack.last();
undo_stack.removeLast();
}
undo_pointer = -1;
undo_add_current();
}
void Sequence::undo_add_current() {
if (undo_stack.size() == UNDO_LIMIT) {
delete undo_stack.at(0);
undo_stack.removeFirst();
} else {
undo_pointer++;
while (undo_stack.size() > undo_pointer+1) {
delete undo_stack.last();
undo_stack.removeLast();
}
}
// copy clips
QVector<Clip*>* copied_clips = new QVector<Clip*>();
for (int i=0;i<clip_count();i++) {
Clip* original = get_clip(i);
if (original != NULL) {
Clip* copy = original->copy();
copy->linked = original->linked;
copied_clips->append(copy);
}
}
undo_stack.append(copied_clips);
}
void Sequence::set_undo() {
qDebug() << "[INFO] Setting undo pointer to" << undo_pointer;
for (int i=0;i<clip_count();i++) {
delete clips.at(i);
}
clips.clear();
QVector<Clip*>* copy_from_list = undo_stack.at(undo_pointer);
for (int i=0;i<copy_from_list->size();i++) {
Clip* original = copy_from_list->at(i);
Clip* copy = original->copy();
copy->linked = original->linked;
add_clip(copy);
}
}
void Sequence::undo() {
if (undo_pointer > 0) {
undo_pointer--;
set_undo();
} else {
qDebug() << "[INFO] No more undos";
}
}
void Sequence::redo() {
if (undo_pointer == undo_stack.size() - 1) {
qDebug() << "[INFO] No more redos";
} else {
undo_pointer++;
set_undo();
}
}
// static variable for the currently active sequence
Sequence* sequence = NULL;
project/sequence.h
+3 -12
View File
@@ -16,26 +16,17 @@ public:
int add_clip(Clip* c);
int clip_count();
Clip* get_clip(int i);
void delete_clip(int i);
int split_clip(int pre, long frame);
void replace_clip(int i, Clip* c);
void get_track_limits(int* video_tracks, int* audio_tracks);
void destroy_clip(int i, bool del);
long getEndFrame();
int width;
int height;
float frame_rate;
int audio_frequency;
int audio_layout;
void reset_undo();
void undo_add_current();
void undo();
void redo();
int audio_layout;
private:
QVector<Clip*> clips;
void set_undo();
QVector<QVector<Clip*>*> undo_stack;
int undo_pointer;
};
// static variable for the currently active sequence
project/undo.cpp
+228
View File
@@ -1,3 +1,231 @@
#include "undo.h"
#include <QDebug>
QUndoStack undo_stack;
#define TA_IN 0
#define TA_OUT 1
#define TA_CLIP_IN 2
#define TA_TRACK 3
#define TA_DELETE 4
#define TA_ADD_IN 5
#define TA_ADD_OUT 6
#define TA_ADD_CLIP_IN 7
#define TA_ADD_TRACK 8
TimelineAction::TimelineAction() : done(false) {}
TimelineAction::~TimelineAction() {
for (int i=0;i<clips_to_add.size();i++) {
delete clips_to_add.at(i);
}
if (done) {
for (int i=0;i<deleted_clips.size();i++) {
delete deleted_clips.at(i);
}
}
}
void TimelineAction::offset_links(QVector<Clip*>& clips, int offset) {
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
for (int j=0;j<c->linked.size();j++) {
c->linked[j] += offset;
}
}
}
void TimelineAction::add_clips(QVector<Clip*>& add) {
offset_links(add, clips_to_add.size());
clips_to_add.append(add);
}
void TimelineAction::new_action(int action, int clip, long old_val, long new_val) {
actions.append(action);
clips.append(clip);
old_values.append(old_val);
new_values.append(new_val);
}
void TimelineAction::set_timeline_in(int clip, long value) {
new_action(TA_IN, clip, sequence->get_clip(clip)->timeline_in, value);
}
void TimelineAction::set_timeline_out(int clip, long value) {
new_action(TA_OUT, clip, sequence->get_clip(clip)->timeline_out, value);
}
void TimelineAction::set_clip_in(int clip, long value) {
new_action(TA_CLIP_IN, clip, sequence->get_clip(clip)->clip_in, value);
}
void TimelineAction::set_track(int clip, int value) {
new_action(TA_TRACK, clip, sequence->get_clip(clip)->track, value);
}
void TimelineAction::increase_timeline_in(int clip, long value) {
new_action(TA_ADD_IN, clip, 0, value);
}
void TimelineAction::increase_timeline_out(int clip, long value) {
new_action(TA_ADD_OUT, clip, 0, value);
}
void TimelineAction::increase_clip_in(int clip, long value) {
new_action(TA_ADD_CLIP_IN, clip, 0, value);
}
void TimelineAction::increase_track(int clip, int value) {
new_action(TA_ADD_TRACK, clip, 0, value);
}
void TimelineAction::delete_clip(int clip) {
new_action(TA_DELETE, clip, 0, 0);
}
void TimelineAction::undo() {
for (int i=0;i<actions.size();i++) {
switch (actions.at(i)) {
case TA_IN:
sequence->get_clip(clips.at(i))->timeline_in = old_values.at(i);
break;
case TA_OUT:
sequence->get_clip(clips.at(i))->timeline_out = old_values.at(i);
break;
case TA_CLIP_IN:
sequence->get_clip(clips.at(i))->clip_in = old_values.at(i);
break;
case TA_TRACK:
sequence->get_clip(clips.at(i))->track = old_values.at(i);
break;
case TA_DELETE:
sequence->replace_clip(clips.at(i), deleted_clips.at(new_values.at(i)));
break;
case TA_ADD_IN:
sequence->get_clip(clips.at(i))->timeline_in -= new_values.at(i);
break;
case TA_ADD_OUT:
sequence->get_clip(clips.at(i))->timeline_out -= new_values.at(i);
break;
case TA_ADD_CLIP_IN:
sequence->get_clip(clips.at(i))->clip_in -= new_values.at(i);
break;
case TA_ADD_TRACK:
sequence->get_clip(clips.at(i))->track -= new_values.at(i);
break;
}
}
// restore link references to deleted clips
for (int i=0;i<removed_link_to.size();i++) {
sequence->get_clip(removed_link_from.at(i))->linked.append(removed_link_to.at(i));
}
// delete added clips
if (clips_to_add.size() > 0) {
int delete_count = 0;
for (int i=0;i<clips_to_add.size();i++) {
sequence->destroy_clip(added_indexes.at(i)-delete_count, true);
delete_count++;
}
}
done = false;
}
void TimelineAction::redo() {
removed_link_from.clear();
removed_link_to.clear();
deleted_clips.clear();
deleted_clips_indices.clear();
added_indexes.clear();
for (int i=0;i<actions.size();i++) {
switch (actions.at(i)) {
case TA_IN:
{
sequence->get_clip(clips.at(i))->timeline_in = new_values.at(i);
}
break;
case TA_OUT:
{
sequence->get_clip(clips.at(i))->timeline_out = new_values.at(i);
}
break;
case TA_CLIP_IN:
{
sequence->get_clip(clips.at(i))->clip_in = new_values.at(i);
}
break;
case TA_TRACK:
{
sequence->get_clip(clips.at(i))->track = new_values.at(i);
}
break;
case TA_DELETE:
{
new_values[i] = deleted_clips.size();
deleted_clips.append(sequence->get_clip(clips.at(i)));
deleted_clips_indices.append(clips.at(i));
sequence->replace_clip(clips.at(i), NULL);
}
break;
case TA_ADD_IN:
{
sequence->get_clip(clips.at(i))->timeline_in += new_values.at(i);
}
break;
case TA_ADD_OUT:
{
sequence->get_clip(clips.at(i))->timeline_out += new_values.at(i);
}
break;
case TA_ADD_CLIP_IN:
{
sequence->get_clip(clips.at(i))->clip_in += new_values.at(i);
}
break;
case TA_ADD_TRACK:
{
sequence->get_clip(clips.at(i))->track += new_values.at(i);
}
break;
}
}
// remove any potential link references from deleted clips
for (int i=0;i<deleted_clips_indices.size();i++) {
for (int j=0;j<sequence->clip_count();j++) {
Clip* c = sequence->get_clip(j);
if (c != NULL) {
for (int k=0;k<c->linked.size();k++) {
if (c->linked.at(k) == deleted_clips_indices.at(i)) {
removed_link_from.append(j);
removed_link_to.append(deleted_clips_indices.at(i));
c->linked.removeAt(k);
break;
}
}
}
}
}
// add any new clips
if (clips_to_add.size() > 0) {
int link_offset = sequence->clip_count();
for (int i=0;i<clips_to_add.size();i++) {
Clip* original = clips_to_add.at(i);
Clip* copy = original->copy();
copy->linked.resize(original->linked.size());
for (int j=0;j<original->linked.size();j++) {
copy->linked[j] = original->linked.at(j) + link_offset;
}
added_indexes.append(sequence->add_clip(copy));
}
}
done = true;
}
project/undo.h
+38
View File
@@ -10,4 +10,42 @@
extern QUndoStack undo_stack;
class TimelineAction : public QUndoCommand {
public:
TimelineAction();
~TimelineAction();
void add_clips(QVector<Clip*>& add);
void set_timeline_in(int clip, long value);
void increase_timeline_in(int clip, long value);
void set_timeline_out(int clip, long value);
void increase_timeline_out(int clip, long value);
void set_clip_in(int clip, long value);
void increase_clip_in(int clip, long value);
void set_track(int clip, int value);
void increase_track(int clip, int value);
void delete_clip(int clip);
void undo();
void redo();
private:
QVector<int> actions;
QVector<int> clips;
QVector<long> old_values;
QVector<long> new_values;
QVector<Clip*> deleted_clips;
QVector<int> deleted_clips_indices;
QVector<Clip*> clips_to_add;
QVector<int> added_indexes;
void new_action(int action, int clip, long old_val, long new_val);
void offset_links(QVector<Clip*>& clips, int offset);
QVector<int> removed_link_from;
QVector<int> removed_link_to;
bool done;
};
#endif // UNDO_H