fixed playback/export flickering and hanging

This commit is contained in:
itsmattkc
2018-10-29 17:01:52 +11:00
parent 2e2846597e
commit a54fee767d
32 changed files with 216 additions and 163 deletions
+2 -2
View File
@@ -2,7 +2,6 @@
#include "ui_effectcontrols.h"
#include <QMenu>
#include <QDebug>
#include <QVBoxLayout>
#include <QResizeEvent>
#include <QScrollBar>
@@ -19,6 +18,7 @@
#include "panels/timeline.h"
#include "panels/viewer.h"
#include "ui/viewerwidget.h"
#include "debug.h"
EffectControls::EffectControls(QWidget *parent) :
QDockWidget(parent),
@@ -278,7 +278,7 @@ bool EffectControls::is_focused() {
}
}
} else {
qDebug() << "[WARNING] Tried to check focus of a NULL clip";
dout << "[WARNING] Tried to check focus of a NULL clip";
}
}
return false;
+6 -6
View File
@@ -21,11 +21,11 @@
#include "dialogs/newsequencedialog.h"
#include "dialogs/mediapropertiesdialog.h"
#include "dialogs/loaddialog.h"
#include "debug.h"
#include <QFileDialog>
#include <QString>
#include <QVariant>
#include <QDebug>
#include <QCharRef>
#include <QMessageBox>
#include <QDropEvent>
@@ -573,7 +573,7 @@ void* get_media_from_tree(QTreeWidgetItem* item) {
switch (type) {
case MEDIA_TYPE_FOOTAGE: return get_footage_from_tree(item);
case MEDIA_TYPE_SEQUENCE: return get_sequence_from_tree(item);
default: qDebug() << "[ERROR] Invalid media type when retrieving media";
default: dout << "[ERROR] Invalid media type when retrieving media";
}
return NULL;*/
}
@@ -1011,7 +1011,7 @@ void Project::load_project() {
QFile file(project_url);
if (!file.open(QIODevice::ReadOnly)) {
qDebug() << "[ERROR] Could not open file";
dout << "[ERROR] Could not open file";
return;
}
@@ -1071,7 +1071,7 @@ void Project::load_project() {
if (!cont) {
if (show_err) QMessageBox::critical(this, "Project Load Error", "Error loading project: " + error_str, QMessageBox::Ok);
} else if (stream.hasError()) {
qDebug() << "[ERROR] Error parsing XML." << stream.errorString();
dout << "[ERROR] Error parsing XML." << stream.errorString();
QMessageBox::critical(this, "XML Parsing Error", "Couldn't load '" + project_url + "'. " + stream.errorString(), QMessageBox::Ok);
cont = false;
}
@@ -1251,7 +1251,7 @@ void Project::save_project(bool autorecovery) {
QFile file(autorecovery ? autorecovery_filename : project_url);
if (!file.open(QIODevice::WriteOnly/* | QIODevice::Text*/)) {
qDebug() << "[ERROR] Could not open file";
dout << "[ERROR] Could not open file";
return;
}
@@ -1304,7 +1304,7 @@ void Project::save_recent_projects() {
}
f.close();
} else {
qDebug() << "[WARNING] Could not save recent projects";
dout << "[WARNING] Could not save recent projects";
}
}
+3 -2
View File
@@ -11,6 +11,7 @@
#include "project/undo.h"
#include "ui/audiomonitor.h"
#include "ui_timeline.h"
#include "debug.h"
#define FRAMES_IN_ONE_MINUTE 1798 // 1800 - 2
#define FRAMES_IN_TEN_MINUTES 17978 // (FRAMES_IN_ONE_MINUTE * 10) - 2
@@ -98,7 +99,7 @@ long timecode_to_frame(const QString& s, int view, double frame_rate) {
QList<QString> list = s.split(QRegExp("[:;]"));
for (int i=0;i<list.size();i++) {
qDebug() << "list" << i << list.at(i);
dout << "list" << i << list.at(i);
}
if (view == TIMECODE_FRAMES || list.size() == 1) {
@@ -275,7 +276,7 @@ void Viewer::play() {
init_audio(seq);
}
if (is_recording_cued() && !start_recording()) {
qDebug() << "[ERROR] Failed to record audio";
dout << "[ERROR] Failed to record audio";
return;
}
playhead_start = seq->playhead;