This commit is contained in:
itsmattkc
2019-01-24 22:42:05 +11:00
parent 58b1a4af18
commit cb3098e89d
12 changed files with 73 additions and 40 deletions
+4 -1
View File
@@ -436,6 +436,7 @@ void cache_audio_worker(Clip* c, bool scrubbing, QVector<Clip*>& nests, int play
}
}
qDebug() << "hello?";
QMetaObject::invokeMethod(panel_footage_viewer, "play_wake", Qt::QueuedConnection);
QMetaObject::invokeMethod(panel_sequence_viewer, "play_wake", Qt::QueuedConnection);
}
@@ -961,11 +962,13 @@ void Cacher::run() {
clip->open = true;
caching = true;
interrupt = false;
queued = false;
open_clip_worker(clip);
while (caching) {
clip->can_cache.wait(&clip->lock);
if (!queued) clip->can_cache.wait(&clip->lock);
queued = false;
if (!caching) {
break;
} else {
+1
View File
@@ -20,6 +20,7 @@ public:
bool reset;
bool scrubbing;
bool interrupt;
bool queued;
int playback_speed;
QVector<Clip*> nests;
+1
View File
@@ -113,6 +113,7 @@ void cache_clip(Clip* clip, long playhead, bool reset, bool scrubbing, QVector<C
clip->cacher->nests = nests;
clip->cacher->scrubbing = scrubbing;
clip->cacher->playback_speed = playback_speed;
clip->cacher->queued = true;
if (reset && clip->queue.size() > 0) clip->cacher->interrupt = true;
clip->can_cache.wakeAll();