many changes, mostly to export

This commit is contained in:
itsmattkc
2018-06-06 03:30:22 -07:00
parent 81bf111037
commit 0ea7c43e53
26 changed files with 404 additions and 206 deletions
+7 -3
View File
@@ -38,6 +38,10 @@ void Clip::copy(const Clip& c) {
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());
}
}
void Clip::init() {
@@ -68,9 +72,9 @@ Clip::~Clip() {
open_lock.lock();
open_lock.unlock();
for (int i=0;i<effects.size();i++) {
delete effects.at(i);
}
for (int i=0;i<effects.size();i++) {
delete effects.at(i);
}
av_packet_unref(pkt);
delete pkt;
}
+1 -1
View File
@@ -57,7 +57,7 @@ struct Clip
Sequence* sequence;
// other variables (should be "duplicated" in copy())
QList<Effect*> effects;
QList<Effect*> effects;
// QVector<Clip&> linkedClips;
// media handling
+7
View File
@@ -14,5 +14,12 @@ void Effect::field_changed() {
panel_viewer->viewer_widget->update();
}
Effect* Effect::copy() {
Effect* e = new Effect(parent_clip);
name = e->name;
type = e->type;
return e;
}
void Effect::process_gl(int* anchor_x, int* anchor_y) {}
void Effect::process_audio(uint8_t* samples, int nb_bytes) {}
+4 -2
View File
@@ -14,12 +14,14 @@ class Effect : public QObject
{
Q_OBJECT
public:
Effect(Clip* c);
Effect(Clip* c); // default constructor
int type;
QString name;
CollapsibleWidget* container;
QWidget* ui;
Clip* parent_clip;
Clip* parent_clip;
virtual Effect* copy();
virtual void process_gl(int* anchor_x, int* anchor_y);
virtual void process_audio(uint8_t* samples, int nb_bytes);