This commit is contained in:
itsmattkc
2019-02-02 14:37:27 +11:00
parent f5ae3d88b1
commit 3b9f2bb4ca
9 changed files with 35 additions and 12 deletions
+10
View File
@@ -18,6 +18,16 @@ VoidEffect::VoidEffect(Clip *c, const QString& n) : Effect(c, nullptr) {
EffectRow* row = add_row(tr("Missing Effect"), false, false);
row->add_widget(new QLabel(display_name));
container->setText(display_name);
void_meta.type = EFFECT_TYPE_EFFECT;
meta = &void_meta;
}
Effect *VoidEffect::copy(Clip *c) {
Effect* copy = new VoidEffect(c, name);
copy->set_enabled(is_enabled());
copy_field_keyframes(copy);
return copy;
}
void VoidEffect::load(QXmlStreamReader &stream) {
+7 -4
View File
@@ -11,11 +11,14 @@
class VoidEffect : public Effect {
public:
VoidEffect(Clip* c, const QString& n);
void load(QXmlStreamReader &stream) override;
void save(QXmlStreamWriter &stream) override;
VoidEffect(Clip* c, const QString& n);
virtual Effect* copy(Clip* c) override;
virtual void load(QXmlStreamReader &stream) override;
virtual void save(QXmlStreamWriter &stream) override;
private:
QByteArray bytes;
QByteArray bytes;
EffectMeta void_meta;
};
#endif // VOIDEFFECT_H
+2 -2
View File
@@ -42,8 +42,8 @@ public slots:
void toggle_bool_action();
protected:
void closeEvent(QCloseEvent *);
void paintEvent(QPaintEvent *event);
virtual void closeEvent(QCloseEvent *) override;
virtual void paintEvent(QPaintEvent *event) override;
private slots:
void clear_undo_stack();
+1
View File
@@ -618,6 +618,7 @@ void Viewer::setup_ui() {
current_timecode_container_layout->setSpacing(0);
current_timecode_container_layout->setMargin(0);
current_timecode_slider = new LabelSlider();
current_timecode_container_layout->addWidget(current_timecode_slider);
lower_control_layout->addWidget(current_timecode_container);
QWidget* playback_controls = new QWidget();
+1 -1
View File
@@ -227,7 +227,7 @@ double Clip::getMediaFrameRate() {
}
void Clip::recalculateMaxLength() {
if (sequence != nullptr) {
if (this->sequence != nullptr) {
double fr = this->sequence->frame_rate;
fr /= speed;
+1 -1
View File
@@ -165,7 +165,7 @@ public:
virtual void refresh();
Effect* copy(Clip* c);
virtual Effect* copy(Clip* c);
void copy_field_keyframes(Effect *e);
virtual void load(QXmlStreamReader& stream);
+1
View File
@@ -1187,6 +1187,7 @@ void TimelineWidget::init_ghosts() {
}
// used for trim ops
c->recalculateMaxLength();
g.media_length = c->getMaximumLength();
}
for (int i=0;i<sequence->selections.size();i++) {
+8
View File
@@ -3,6 +3,12 @@
#include <QMutex>
#include <QKeyEvent>
#include <QPainter>
#include <QApplication>
#include <QMenuBar>
#include <QDebug>
#include "mainwindow.h"
ViewerWindow::ViewerWindow(QOpenGLContext *share) :
QOpenGLWindow(share),
@@ -12,6 +18,8 @@ ViewerWindow::ViewerWindow(QOpenGLContext *share) :
{
fullscreen_msg_timer.setInterval(2000);
connect(&fullscreen_msg_timer, SIGNAL(timeout()), this, SLOT(fullscreen_msg_timeout()));
installEventFilter(mainWindow);
}
void ViewerWindow::set_texture(GLuint t, double iar, QMutex* imutex) {
+4 -4
View File
@@ -12,11 +12,11 @@ public:
ViewerWindow(QOpenGLContext* share);
void set_texture(GLuint t, double iar, QMutex *imutex);
protected:
void keyPressEvent(QKeyEvent*);
void mousePressEvent(QMouseEvent*);
void mouseMoveEvent(QMouseEvent*);
virtual void keyPressEvent(QKeyEvent*) override;
virtual void mousePressEvent(QMouseEvent*) override;
virtual void mouseMoveEvent(QMouseEvent*) override;
private:
void paintGL();
virtual void paintGL() override;
GLuint texture;
double ar;
QMutex* mutex;