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

nested sequence enhancements

Browse Source
This commit is contained in:
itsmattkc
2019-01-22 14:15:12 +11:00
parent b4b1b8f95c
commit 584b8670c0
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/playback.cpp
+9 -3
View File
@@ -61,10 +61,15 @@ void open_clip(Clip* clip, bool multithreaded) {
}
} else {
clip->open = true;
clip->finished_opening = true;
}
}
void close_clip(Clip* clip, bool wait) {
// qDebug() << "closing" << clip->name;
clip->finished_opening = false;
// destroy opengl texture in main thread
if (clip->texture != nullptr) {
delete clip->texture;
@@ -94,8 +99,9 @@ void close_clip(Clip* clip, bool wait) {
close_clip_worker(clip);
}
} else {
if (clip->media != nullptr && clip->media->get_type() == MEDIA_TYPE_SEQUENCE)
if (clip->media != nullptr && clip->media->get_type() == MEDIA_TYPE_SEQUENCE) {
closeActiveClips(clip->media->to_sequence());
}
clip->open = false;
}
@@ -385,8 +391,8 @@ void closeActiveClips(Sequence *s) {
if (c != nullptr) {
if (c->media != nullptr && c->media->get_type() == MEDIA_TYPE_SEQUENCE) {
closeActiveClips(c->media->to_sequence());
if (c->open) close_clip(c, true);
} else if (c->open) {
if (c->finished_opening) close_clip(c, true);
} else if (c->finished_opening) {
close_clip(c, true);
}
}