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

added cut/copy/paste

Browse Source
This commit is contained in:
itsmattkc
2018-06-08 18:20:50 -07:00
parent 5f2ed68f7b
commit cf18e52e90
13 changed files with 312 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/clip.cpp
+18 -24
View File
@@ -15,36 +15,30 @@ Clip::Clip() {
init();
}
Clip::Clip(const Clip &c) {
init();
copy(c);
}
Clip* Clip::copy() {
Clip* copy = new Clip();
Clip& Clip::operator= (const Clip& c) {
init();
copy(c);
return *this;
}
copy->name = name;
copy->clip_in = clip_in;
copy->timeline_in = timeline_in;
copy->timeline_out = timeline_out;
copy->track = track;
copy->color_r = color_r;
copy->color_g = color_g;
copy->color_b = color_b;
copy->sequence = sequence;
copy->media = media;
copy->media_stream = media_stream;
void Clip::copy(const Clip& c) {
name = c.name;
clip_in = c.clip_in;
timeline_in = c.timeline_in;
timeline_out = c.timeline_out;
track = c.track;
color_r = c.color_r;
color_g = c.color_g;
color_b = c.color_b;
sequence = c.sequence;
media = c.media;
media_stream = c.media_stream;
for (int i=0;i<c.effects.size();i++) {
effects.append(c.effects.at(i)->copy());
for (int i=0;i<effects.size();i++) {
copy->effects.append(effects.at(i)->copy());
}
return copy;
}
void Clip::init() {
qDebug() << "init was called";
reset();
clip_in = timeline_in = timeline_out = track = undeletable = 0;
texture = NULL;
project/clip.h
+1 -3
View File
@@ -32,10 +32,8 @@ struct ClipCache {
struct Clip
{
Clip();
Clip(const Clip &c);
Clip& operator= (const Clip&); // explicitly defaulted copy assignment
~Clip();
void copy(const Clip& c);
Clip* copy();
void init();
void reset();
bool undeletable;
project/sequence.cpp
+69 -46
View File
@@ -9,24 +9,22 @@ Sequence::Sequence() {
}
Sequence::~Sequence() {
// dealloc all clips
for (int i=0;i<clips.size();i++) {
delete clips.at(i);
}
}
Clip& Sequence::new_clip() {
clips.append(Clip());
return clips[clips.size() - 1];
}
Clip& Sequence::insert_clip(const Clip& c) {
clips.append(c);
return clips[clips.size() - 1];
void Sequence::add_clip(Clip* c) {
clips.append(c);
}
int Sequence::clip_count() {
return clips.count();
return clips.size();
}
Clip& Sequence::get_clip(int i) {
return clips[i];
Clip* Sequence::get_clip(int i) {
return clips.at(i);
}
void Sequence::delete_clip(int i) {
@@ -41,15 +39,16 @@ void Sequence::delete_clip(int i) {
// }
// finally remove from vector
delete clips.at(i);
clips.removeAt(i);
}
long Sequence::getEndFrame() {
long end = 0;
for (int j=0;j<clip_count();j++) {
Clip& c = get_clip(j);
if (c.timeline_out > end) {
end = c.timeline_out;
Clip* c = get_clip(j);
if (c->timeline_out > end) {
end = c->timeline_out;
}
}
return end;
@@ -59,11 +58,11 @@ void Sequence::get_track_limits(int* video_tracks, int* audio_tracks) {
int vt = 0;
int at = 0;
for (int j=0;j<clip_count();j++) {
Clip& c = get_clip(j);
if (c.track < 0 && c.track < vt) { // video clip
vt = c.track;
} else if (c.track > at) {
at = c.track;
Clip* c = get_clip(j);
if (c->track < 0 && c->track < vt) { // video clip
vt = c->track;
} else if (c->track > at) {
at = c->track;
}
}
if (video_tracks != NULL) *video_tracks = vt;
@@ -72,61 +71,85 @@ void Sequence::get_track_limits(int* video_tracks, int* audio_tracks) {
void Sequence::delete_area(long in, long out, int track) {
for (int i=0;i<clip_count();i++) {
Clip& c = get_clip(i);
if (c.track == track && !c.undeletable) {
if (c.timeline_in >= in && c.timeline_out <= out) {
Clip* c = get_clip(i);
if (c->track == track && !c->undeletable) {
if (c->timeline_in >= in && c->timeline_out <= out) {
// clips falls entirely within deletion area
delete_clip(i);
i--;
} else if (c.timeline_in < in && c.timeline_out > out) {
// middle of clip is within deletion area
clips.append(clips.at(i)); // copy clip
} else if (c->timeline_in < in && c->timeline_out > out) {
// middle of clip is within deletion area
Clip& pre = get_clip(i);
Clip& post = get_clip(clips.size()-1);
// duplicate clip
Clip* pre = get_clip(i);
Clip* post = pre->copy();
pre.timeline_out = in;
post.timeline_in = out;
post.clip_in = pre.clip_in + pre.getLength() + (out - in);
} else if (c.timeline_in < in && c.timeline_out > in) {
pre->timeline_out = in;
post->timeline_in = out;
post->clip_in = pre->clip_in + pre->getLength() + (out - in);
add_clip(post);
} else if (c->timeline_in < in && c->timeline_out > in) {
// only out point is in deletion area
c.timeline_out = in;
} else if (c.timeline_in < out && c.timeline_out > out) {
c->timeline_out = in;
} else if (c->timeline_in < out && c->timeline_out > out) {
// only in point is in deletion area
c.clip_in += out - c.timeline_in;
c.timeline_in = out;
c->clip_in += out - c->timeline_in;
c->timeline_in = out;
}
}
}
}
void Sequence::split_clip(int i, long frame) {
Clip& pre = get_clip(i);
if (pre.timeline_in < frame && pre.timeline_out > frame) { // guard against attempts to split at in/out points
clips.append(pre); // copy clip
Clip* pre = get_clip(i);
if (pre->timeline_in < frame && pre->timeline_out > frame) { // guard against attempts to split at in/out points
Clip* post = pre->copy();
Clip& post = get_clip(clips.size()-1);
pre->timeline_out = frame;
post->timeline_in = frame;
post->clip_in = pre->clip_in + pre->getLength();
pre.timeline_out = frame;
post.timeline_in = frame;
post.clip_in = pre.clip_in + pre.getLength();
add_clip(post);
}
}
void Sequence::undo_add_current() {
if (undo_stack.size() == UNDO_LIMIT) {
delete undo_stack.at(0);
undo_stack.removeFirst();
} else {
undo_pointer++;
undo_stack.resize(undo_pointer);
for (int i=undo_stack.size()-1;i>undo_pointer;i--) {
delete undo_stack[i];
undo_stack.removeLast();
}
}
// copy clips
QVector<Clip*>* copied_clips = new QVector<Clip*>();
for (int i=0;i<clip_count();i++) {
copied_clips->append(get_clip(i)->copy());
}
undo_stack.append(copied_clips);
}
void Sequence::set_undo(int i) {
for (int i=0;i<clip_count();i++) {
delete clips.at(i);
}
clips.clear();
QVector<Clip*>* copy_from_list = undo_stack[undo_pointer];
for (int i=0;i<copy_from_list->size();i++) {
add_clip(copy_from_list->at(i));
}
undo_stack.append(clips);
}
void Sequence::undo() {
if (undo_pointer > 0) {
undo_pointer--;
clips = undo_stack[undo_pointer];
set_undo(undo_pointer);
} else {
qDebug() << "[INFO] No more undos";
}
@@ -136,6 +159,6 @@ void Sequence::redo() {
qDebug() << "[INFO] No more redos";
} else {
undo_pointer++;
clips = undo_stack[undo_pointer];
set_undo(undo_pointer);
}
}
project/sequence.h
+5 -5
View File
@@ -12,10 +12,9 @@ public:
Sequence();
~Sequence();
QString name;
Clip& new_clip();
Clip& insert_clip(const Clip& c);
void add_clip(Clip* c);
int clip_count();
Clip& get_clip(int i);
Clip* get_clip(int i);
void delete_clip(int i);
void delete_area(long in, long out, int track);
void split_clip(int i, long frame);
@@ -31,9 +30,10 @@ public:
void undo();
void redo();
private:
QList<Clip> clips;
QVector<Clip*> clips;
QVector<QList<Clip>> undo_stack;
void set_undo(int i);
QVector<QVector<Clip*>*> undo_stack;
int undo_pointer;
int undo_stack_start;
};