added cross dissolve transitions (but they're uneditable)
This commit is contained in:
+14
-13
@@ -12,7 +12,17 @@ extern "C" {
|
||||
}
|
||||
|
||||
Clip::Clip() {
|
||||
init();
|
||||
reset();
|
||||
enabled = true;
|
||||
clip_in = 0;
|
||||
timeline_in = 0;
|
||||
timeline_out = 0;
|
||||
track = 0;
|
||||
undeletable = 0;
|
||||
texture = NULL;
|
||||
opening_transition = NULL;
|
||||
closing_transition = NULL;
|
||||
pkt = new AVPacket();
|
||||
}
|
||||
|
||||
Clip* Clip::copy() {
|
||||
@@ -39,18 +49,6 @@ Clip* Clip::copy() {
|
||||
return copy;
|
||||
}
|
||||
|
||||
void Clip::init() {
|
||||
reset();
|
||||
enabled = true;
|
||||
clip_in = 0;
|
||||
timeline_in = 0;
|
||||
timeline_out = 0;
|
||||
track = 0;
|
||||
undeletable = 0;
|
||||
texture = NULL;
|
||||
pkt = new AVPacket();
|
||||
}
|
||||
|
||||
void Clip::reset() {
|
||||
cache_size = false;
|
||||
audio_just_reset = false;
|
||||
@@ -87,6 +85,9 @@ Clip::~Clip() {
|
||||
open_lock.lock();
|
||||
open_lock.unlock();
|
||||
|
||||
if (opening_transition != NULL) delete opening_transition;
|
||||
if (closing_transition != NULL) delete closing_transition;
|
||||
|
||||
for (int i=0;i<effects.size();i++) {
|
||||
delete effects.at(i);
|
||||
}
|
||||
|
||||
+3
-1
@@ -7,6 +7,7 @@
|
||||
|
||||
class Cacher;
|
||||
class Effect;
|
||||
class Transition;
|
||||
struct Sequence;
|
||||
struct Media;
|
||||
struct MediaStream;
|
||||
@@ -34,7 +35,6 @@ struct Clip
|
||||
Clip();
|
||||
~Clip();
|
||||
Clip* copy();
|
||||
void init();
|
||||
void reset();
|
||||
bool undeletable;
|
||||
|
||||
@@ -59,6 +59,8 @@ struct Clip
|
||||
// other variables (should be "duplicated" in copy())
|
||||
QList<Effect*> effects;
|
||||
QVector<int> linked;
|
||||
Transition* opening_transition;
|
||||
Transition* closing_transition;
|
||||
|
||||
// media handling
|
||||
AVFormatContext* formatCtx;
|
||||
|
||||
Reference in New Issue
Block a user