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
+4 -4
View File
@@ -4,10 +4,10 @@
#include <QOpenGLWidget>
#include <QFileDialog>
#include <QThread>
#include <QDebug>
#include <QMessageBox>
#include <QOpenGLContext>
#include "debug.h"
#include "panels/panels.h"
#include "panels/viewer.h"
#include "panels/timeline.h"
@@ -279,7 +279,7 @@ void ExportDialog::on_formatCombobox_currentIndexChanged(int index)
default_acodec = 1;
break;
default:
qDebug() << "[ERROR] Invalid format selection - this is a bug, please inform the developers";
dout << "[ERROR] Invalid format selection - this is a bug, please inform the developers";
}
AVCodec* codec_info;
@@ -384,7 +384,7 @@ void ExportDialog::on_pushButton_clicked() {
ext = "tif";
break;
default:
qDebug() << "[ERROR] Invalid codec selection for an image sequence";
dout << "[ERROR] Invalid codec selection for an image sequence";
QMessageBox::critical(this, "Invalid codec", "Couldn't determine output parameters for the selected codec. This is a bug, please contact the developers.", QMessageBox::Ok);
return;
}
@@ -446,7 +446,7 @@ void ExportDialog::on_pushButton_clicked() {
}
break;
default:
qDebug() << "[ERROR] Invalid format - this is a bug, please inform the developers";
dout << "[ERROR] Invalid format - this is a bug, please inform the developers";
QMessageBox::critical(this, "Invalid format", "Couldn't determine output format. This is a bug, please contact the developers.", QMessageBox::Ok);
return;
}
-1
View File
@@ -9,7 +9,6 @@
#include "playback/playback.h"
#include <QVariant>
#include <QDebug>
extern "C" {
#include <libavcodec/avcodec.h>
-1
View File
@@ -5,7 +5,6 @@
#include <QMenuBar>
#include <QAction>
#include <QDebug>
KeySequenceEditor::KeySequenceEditor(QAction* a)
: QKeySequenceEdit(0), action(a) {
-1
View File
@@ -16,7 +16,6 @@
#include <QPushButton>
#include <QMessageBox>
#include <QCheckBox>
#include <QDebug>
ReplaceClipMediaDialog::ReplaceClipMediaDialog(QWidget *parent, SourceTable *table, QTreeWidgetItem *old_media) :
QDialog(parent),
-1
View File
@@ -6,7 +6,6 @@
#include <QCheckBox>
#include <QPushButton>
#include <QDialogButtonBox>
#include <QDebug>
#include "ui/labelslider.h"
#include "project/clip.h"