Merge branch 'nodeview-redux' of https://github.com/olive-editor/olive into nodeview-redux

This commit is contained in:
itsmattkc
2021-07-16 20:30:51 -07:00
5 changed files with 109 additions and 104 deletions
+1 -1
View File
@@ -811,7 +811,7 @@ void PreviewAutoCacher::QueueNextAudioTask()
watcher->setProperty("job", QVariant::fromValue(last_update_time_));
connect(watcher, &RenderTicketWatcher::Finished, this, &PreviewAutoCacher::AudioRendered);
audio_tasks_.insert(watcher, r);
watcher->SetTicket(RenderManager::instance()->RenderAudio(copied_viewer_node_, r, RenderMode::kOffline, false));
watcher->SetTicket(RenderManager::instance()->RenderAudio(copied_viewer_node_, r, RenderMode::kOffline, true));
audio_iterator_.remove(r);
}
+1
View File
@@ -44,6 +44,7 @@ private:
class TimeRangeWithJob : public TimeRange
{
public:
TimeRangeWithJob() = default;
TimeRangeWithJob(const TimeRange &range, const JobTime &job_time)
{
set_range(range.in(), range.out());