refactored some classes

This commit is contained in:
itsmattkc
2019-05-08 00:41:44 +10:00
parent 127a773c54
commit 9a13776b2c
133 changed files with 1698 additions and 1627 deletions
+2 -2
View File
@@ -23,7 +23,7 @@
#include <QDateTime>
#include <QtMath>
AudioNoiseEffect::AudioNoiseEffect(Clip* c) : Node(c) {
AudioNoiseEffect::AudioNoiseEffect(Clip* c) : OldEffectNode(c) {
amount_val = new DoubleInput(this, "amount", tr("Amount"));
amount_val->SetMinimum(0);
amount_val->SetDefault(20);
@@ -58,7 +58,7 @@ olive::TrackType AudioNoiseEffect::subtype()
return olive::kTypeAudio;
}
NodePtr AudioNoiseEffect::Create(Clip *c)
OldEffectNodePtr AudioNoiseEffect::Create(Clip *c)
{
return std::make_shared<AudioNoiseEffect>(c);
}
+3 -3
View File
@@ -21,9 +21,9 @@
#ifndef AUDIONOISEEFFECT_H
#define AUDIONOISEEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class AudioNoiseEffect : public Node {
class AudioNoiseEffect : public OldEffectNode {
Q_OBJECT
public:
AudioNoiseEffect(Clip* c);
@@ -33,7 +33,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_audio(double timecode_start,
double timecode_end,
+3 -3
View File
@@ -24,8 +24,8 @@
#include "timeline/clip.h"
#include "global/debug.h"
CornerPinEffect::CornerPinEffect(Clip* c) : Node(c) {
SetFlags(Node::CoordsFlag | Node::ShaderFlag);
CornerPinEffect::CornerPinEffect(Clip* c) : OldEffectNode(c) {
SetFlags(OldEffectNode::CoordsFlag | OldEffectNode::ShaderFlag);
top_left = new Vec2Input(this, "topleft", tr("Top Left"));
@@ -88,7 +88,7 @@ olive::TrackType CornerPinEffect::subtype()
return olive::kTypeVideo;
}
NodePtr CornerPinEffect::Create(Clip *c)
OldEffectNodePtr CornerPinEffect::Create(Clip *c)
{
return std::make_shared<CornerPinEffect>(c);
}
+3 -3
View File
@@ -21,9 +21,9 @@
#ifndef CORNERPINEFFECT_H
#define CORNERPINEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class CornerPinEffect : public Node {
class CornerPinEffect : public OldEffectNode {
Q_OBJECT
public:
CornerPinEffect(Clip* c);
@@ -34,7 +34,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
void process_coords(double timecode, GLTextureCoords& coords, int data);
void process_shader(double timecode, GLTextureCoords& coords, int iterations);
+2 -2
View File
@@ -23,7 +23,7 @@
#include <QOpenGLFunctions>
CrossDissolveTransition::CrossDissolveTransition(Clip* c) : Transition(c) {
SetFlags(Node::CoordsFlag);
SetFlags(OldEffectNode::CoordsFlag);
}
QString CrossDissolveTransition::name()
@@ -56,7 +56,7 @@ olive::TrackType CrossDissolveTransition::subtype()
return olive::kTypeVideo;
}
NodePtr CrossDissolveTransition::Create(Clip *c)
OldEffectNodePtr CrossDissolveTransition::Create(Clip *c)
{
return std::make_shared<CrossDissolveTransition>(c);
}
+1 -1
View File
@@ -33,7 +33,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_coords(double timecode, GLTextureCoords &, int data) override;
};
@@ -52,7 +52,7 @@ olive::TrackType ExponentialFadeTransition::subtype()
return olive::kTypeAudio;
}
NodePtr ExponentialFadeTransition::Create(Clip *c)
OldEffectNodePtr ExponentialFadeTransition::Create(Clip *c)
{
return std::make_shared<ExponentialFadeTransition>(c);
}
+1 -1
View File
@@ -32,7 +32,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_audio(double timecode_start,
double timecode_end,
+2 -2
View File
@@ -25,7 +25,7 @@ enum FillType {
FILL_TYPE_RIGHT
};
FillLeftRightEffect::FillLeftRightEffect(Clip* c) : Node(c) {
FillLeftRightEffect::FillLeftRightEffect(Clip* c) : OldEffectNode(c) {
fill_type = new ComboInput(this, "type", tr("Type"));
fill_type->AddItem(tr("Fill Left with Right"), FILL_TYPE_LEFT);
fill_type->AddItem(tr("Fill Right with Left"), FILL_TYPE_RIGHT);
@@ -56,7 +56,7 @@ olive::TrackType FillLeftRightEffect::subtype()
return olive::kTypeAudio;
}
NodePtr FillLeftRightEffect::Create(Clip *c)
OldEffectNodePtr FillLeftRightEffect::Create(Clip *c)
{
return std::make_shared<FillLeftRightEffect>(c);
}
+3 -3
View File
@@ -21,9 +21,9 @@
#ifndef FILLLEFTRIGHTEFFECT_H
#define FILLLEFTRIGHTEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class FillLeftRightEffect : public Node {
class FillLeftRightEffect : public OldEffectNode {
Q_OBJECT
public:
FillLeftRightEffect(Clip* c);
@@ -33,7 +33,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_audio(double timecode_start,
double timecode_end,
+1 -1
View File
@@ -47,7 +47,7 @@ olive::TrackType LinearFadeTransition::subtype()
return olive::kTypeAudio;
}
NodePtr LinearFadeTransition::Create(Clip *c)
OldEffectNodePtr LinearFadeTransition::Create(Clip *c)
{
return std::make_shared<LinearFadeTransition>(c);
}
+1 -1
View File
@@ -32,7 +32,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_audio(double timecode_start,
double timecode_end,
@@ -52,7 +52,7 @@ olive::TrackType LogarithmicFadeTransition::subtype()
return olive::kTypeAudio;
}
NodePtr LogarithmicFadeTransition::Create(Clip *c)
OldEffectNodePtr LogarithmicFadeTransition::Create(Clip *c)
{
return std::make_shared<LogarithmicFadeTransition>(c);
}
+1 -1
View File
@@ -32,7 +32,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip* c) override;
virtual OldEffectNodePtr Create(Clip* c) override;
virtual void process_audio(double timecode_start,
double timecode_end,
+2 -2
View File
@@ -28,7 +28,7 @@
#include "ui/labelslider.h"
#include "ui/collapsiblewidget.h"
PanEffect::PanEffect(Clip* c) : Node(c) {
PanEffect::PanEffect(Clip* c) : OldEffectNode(c) {
pan_val = new DoubleInput(this, "pan", tr("Pan"));
pan_val->SetMinimum(-100);
pan_val->SetDefault(0);
@@ -60,7 +60,7 @@ olive::TrackType PanEffect::subtype()
return olive::kTypeAudio;
}
NodePtr PanEffect::Create(Clip *c)
OldEffectNodePtr PanEffect::Create(Clip *c)
{
return std::make_shared<PanEffect>(c);
}
+3 -3
View File
@@ -21,9 +21,9 @@
#ifndef PANEFFECT_H
#define PANEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class PanEffect : public Node {
class PanEffect : public OldEffectNode {
Q_OBJECT
public:
PanEffect(Clip* c);
@@ -33,7 +33,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_audio(double timecode_start,
double timecode_end,
+3 -3
View File
@@ -35,9 +35,9 @@ enum AutoscrollDirection {
};
RichTextEffect::RichTextEffect(Clip *c) :
Node(c)
OldEffectNode(c)
{
SetFlags(Node::SuperimposeFlag);
SetFlags(OldEffectNode::SuperimposeFlag);
text_val = new StringInput(this, "text", tr("Text"));
@@ -112,7 +112,7 @@ olive::TrackType RichTextEffect::subtype()
return olive::kTypeVideo;
}
NodePtr RichTextEffect::Create(Clip *c)
OldEffectNodePtr RichTextEffect::Create(Clip *c)
{
return std::make_shared<RichTextEffect>(c);
}
+3 -3
View File
@@ -21,9 +21,9 @@
#ifndef RICHTEXTEFFECT_H
#define RICHTEXTEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class RichTextEffect : public Node {
class RichTextEffect : public OldEffectNode {
Q_OBJECT
public:
RichTextEffect(Clip* c);
@@ -34,7 +34,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void redraw(double timecode) override;
+3 -3
View File
@@ -32,8 +32,8 @@
#include "panels/timeline.h"
#include "global/debug.h"
ShakeEffect::ShakeEffect(Clip* c) : Node(c) {
SetFlags(Node::CoordsFlag);
ShakeEffect::ShakeEffect(Clip* c) : OldEffectNode(c) {
SetFlags(OldEffectNode::CoordsFlag);
intensity_val = new DoubleInput(this, "intensity", tr("Intensity"));
intensity_val->SetMinimum(0);
@@ -110,7 +110,7 @@ olive::TrackType ShakeEffect::subtype()
return olive::kTypeVideo;
}
NodePtr ShakeEffect::Create(Clip *c)
OldEffectNodePtr ShakeEffect::Create(Clip *c)
{
return std::make_shared<ShakeEffect>(c);
}
+3 -3
View File
@@ -21,11 +21,11 @@
#ifndef SHAKEEFFECT_H
#define SHAKEEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#define RANDOM_VAL_SIZE 30
class ShakeEffect : public Node {
class ShakeEffect : public OldEffectNode {
Q_OBJECT
public:
ShakeEffect(Clip* c);
@@ -37,7 +37,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
DoubleInput* intensity_val;
DoubleInput* rotation_val;
+3 -3
View File
@@ -35,9 +35,9 @@ const int SMPTE_STRIP_COUNT = 3;
const int SMPTE_LOWER_BARS = 4;
SolidEffect::SolidEffect(Clip* c) :
Node(c)
OldEffectNode(c)
{
SetFlags(Node::SuperimposeFlag);
SetFlags(OldEffectNode::SuperimposeFlag);
// Field for solid type
solid_type = new ComboInput(this, "type", tr("Type"));
@@ -99,7 +99,7 @@ olive::TrackType SolidEffect::subtype()
return olive::kTypeVideo;
}
NodePtr SolidEffect::Create(Clip *c)
OldEffectNodePtr SolidEffect::Create(Clip *c)
{
return std::make_shared<SolidEffect>(c);
}
+3 -3
View File
@@ -21,11 +21,11 @@
#ifndef SOLIDEFFECT_H
#define SOLIDEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include <QImage>
class SolidEffect : public Node {
class SolidEffect : public OldEffectNode {
Q_OBJECT
public:
enum SolidType {
@@ -42,7 +42,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void redraw(double timecode) override;
+3 -3
View File
@@ -43,9 +43,9 @@
#include "global/config.h"
TextEffect::TextEffect(Clip* c) :
Node(c)
OldEffectNode(c)
{
SetFlags(Node::SuperimposeFlag);
SetFlags(OldEffectNode::SuperimposeFlag);
text_val = new StringInput(this, "text", tr("Text"), false);
@@ -151,7 +151,7 @@ olive::TrackType TextEffect::subtype()
return olive::kTypeVideo;
}
NodePtr TextEffect::Create(Clip *c)
OldEffectNodePtr TextEffect::Create(Clip *c)
{
return std::make_shared<TextEffect>(c);
}
+3 -3
View File
@@ -21,12 +21,12 @@
#ifndef TEXTEFFECT_H
#define TEXTEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include <QFont>
#include <QImage>
class TextEffect : public Node {
class TextEffect : public OldEffectNode {
Q_OBJECT
public:
TextEffect(Clip* c);
@@ -37,7 +37,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void redraw(double timecode) override;
private slots:
+3 -3
View File
@@ -43,9 +43,9 @@
#include "global/config.h"
TimecodeEffect::TimecodeEffect(Clip* c) :
Node(c)
OldEffectNode(c)
{
SetFlags(Node::SuperimposeFlag);
SetFlags(OldEffectNode::SuperimposeFlag);
tc_select = new ComboInput(this, "tc_selector", tr("Timecode"));
tc_select->AddItem(tr("Sequence"), true);
@@ -104,7 +104,7 @@ olive::TrackType TimecodeEffect::subtype()
return olive::kTypeVideo;
}
NodePtr TimecodeEffect::Create(Clip *c)
OldEffectNodePtr TimecodeEffect::Create(Clip *c)
{
return std::make_shared<TimecodeEffect>(c);
}
+3 -3
View File
@@ -21,12 +21,12 @@
#ifndef TIMECODEEFFECT_H
#define TIMECODEEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include <QFont>
#include <QImage>
class TimecodeEffect : public Node {
class TimecodeEffect : public OldEffectNode {
Q_OBJECT
public:
TimecodeEffect(Clip* c);
@@ -37,7 +37,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void redraw(double timecode) override;
DoubleInput* scale_val;
+2 -2
View File
@@ -27,7 +27,7 @@
#include "timeline/clip.h"
#include "timeline/sequence.h"
ToneEffect::ToneEffect(Clip* c) : Node(c), sinX(INT_MIN) {
ToneEffect::ToneEffect(Clip* c) : OldEffectNode(c), sinX(INT_MIN) {
type_val = new ComboInput(this, "type", tr("Type"));
type_val->AddItem(tr("Sine"), TONE_TYPE_SINE);
@@ -70,7 +70,7 @@ olive::TrackType ToneEffect::subtype()
return olive::kTypeAudio;
}
NodePtr ToneEffect::Create(Clip *c)
OldEffectNodePtr ToneEffect::Create(Clip *c)
{
return std::make_shared<ToneEffect>(c);
}
+3 -3
View File
@@ -21,9 +21,9 @@
#ifndef TONEEFFECT_H
#define TONEEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class ToneEffect : public Node {
class ToneEffect : public OldEffectNode {
Q_OBJECT
public:
ToneEffect(Clip* c);
@@ -33,7 +33,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_audio(double timecode_start,
double timecode_end,
+4 -4
View File
@@ -43,8 +43,8 @@
#include "panels/viewer.h"
#include "ui/viewerwidget.h"
TransformEffect::TransformEffect(Clip* c) : Node(c) {
SetFlags(Node::CoordsFlag);
TransformEffect::TransformEffect(Clip* c) : OldEffectNode(c) {
SetFlags(OldEffectNode::CoordsFlag);
position = new Vec2Input(this, "pos", tr("Position"));
@@ -68,7 +68,7 @@ TransformEffect::TransformEffect(Clip* c) : Node(c) {
opacity->SetDefault(100);
// TEMP - Create matrix output
EffectRow* matrix_output = new EffectRow(this, "matrix", "Matrix", false, false);
NodeIO* matrix_output = new NodeIO(this, "matrix", "Matrix", false, false);
matrix_output->SetOutputDataType(olive::nodes::kMatrix);
// set up gizmos
@@ -155,7 +155,7 @@ olive::TrackType TransformEffect::subtype()
return olive::kTypeVideo;
}
NodePtr TransformEffect::Create(Clip *c)
OldEffectNodePtr TransformEffect::Create(Clip *c)
{
return std::make_shared<TransformEffect>(c);
}
+3 -3
View File
@@ -21,9 +21,9 @@
#ifndef TRANSFORMEFFECT_H
#define TRANSFORMEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class TransformEffect : public Node {
class TransformEffect : public OldEffectNode {
Q_OBJECT
public:
TransformEffect(Clip* c);
@@ -34,7 +34,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void refresh() override;
virtual void process_coords(double timecode, GLTextureCoords& coords, int data) override;
+4 -4
View File
@@ -28,7 +28,7 @@
#include "global/debug.h"
VoidEffect::VoidEffect(Clip* c, const QString& n, const QString& id) :
Node(c),
OldEffectNode(c),
display_name_(n),
id_(id)
{
@@ -69,13 +69,13 @@ bool VoidEffect::IsCreatable()
return false;
}
NodePtr VoidEffect::Create(Clip *)
OldEffectNodePtr VoidEffect::Create(Clip *)
{
return nullptr;
}
NodePtr VoidEffect::copy(Clip* c) {
NodePtr copy = std::make_shared<VoidEffect>(c, display_name_, id_);
OldEffectNodePtr VoidEffect::copy(Clip* c) {
OldEffectNodePtr copy = std::make_shared<VoidEffect>(c, display_name_, id_);
copy->SetEnabled(IsEnabled());
copy_field_keyframes(copy);
return copy;
+4 -4
View File
@@ -27,9 +27,9 @@
* isn't lost if the user saves over the project.
*/
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class VoidEffect : public Node {
class VoidEffect : public OldEffectNode {
Q_OBJECT
public:
VoidEffect(Clip* c, const QString& n, const QString &id);
@@ -40,8 +40,8 @@ public:
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual bool IsCreatable() override;
virtual NodePtr Create(Clip *c) override;
virtual NodePtr copy(Clip* c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual OldEffectNodePtr copy(Clip* c) override;
virtual void load(QXmlStreamReader &stream) override;
virtual void save(QXmlStreamWriter &stream) override;
+2 -2
View File
@@ -28,7 +28,7 @@
#include "ui/labelslider.h"
#include "ui/collapsiblewidget.h"
VolumeEffect::VolumeEffect(Clip* c) : Node(c) {
VolumeEffect::VolumeEffect(Clip* c) : OldEffectNode(c) {
volume_val = new DoubleInput(this, "volume", tr("Volume"));
// set defaults
@@ -61,7 +61,7 @@ olive::TrackType VolumeEffect::subtype()
return olive::kTypeAudio;
}
NodePtr VolumeEffect::Create(Clip *c)
OldEffectNodePtr VolumeEffect::Create(Clip *c)
{
return std::make_shared<VolumeEffect>(c);
}
+3 -3
View File
@@ -21,9 +21,9 @@
#ifndef VOLUMEEFFECT_H
#define VOLUMEEFFECT_H
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
class VolumeEffect : public Node {
class VolumeEffect : public OldEffectNode {
Q_OBJECT
public:
VolumeEffect(Clip* c);
@@ -33,7 +33,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_audio(double timecode_start,
double timecode_end,
+3 -3
View File
@@ -228,7 +228,7 @@ void VSTHost::send_data_cache_to_plugin()
}
VSTHost::VSTHost(Clip* c) :
Node(c),
OldEffectNode(c),
plugin(nullptr),
dialog(nullptr),
input_cache(BLOCK_SIZE),
@@ -274,7 +274,7 @@ olive::TrackType VSTHost::subtype()
return olive::kTypeAudio;
}
NodePtr VSTHost::Create(Clip *c)
OldEffectNodePtr VSTHost::Create(Clip *c)
{
return std::make_shared<VSTHost>(c);
}
@@ -321,7 +321,7 @@ void VSTHost::custom_load(QXmlStreamReader &stream) {
}
void VSTHost::save(QXmlStreamWriter &stream) {
Node::save(stream);
OldEffectNode::save(stream);
if (plugin != nullptr) {
char* p = nullptr;
int32_t length = int32_t(dispatcher(plugin, effGetChunk, 0, 0, &p, 0));
+3 -3
View File
@@ -24,7 +24,7 @@
#include <QDialog>
#include <QLibrary>
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include "include/vestige.h"
// Plugin's dispatcher function
@@ -46,7 +46,7 @@ private:
void destroy();
};
class VSTHost : public Node {
class VSTHost : public OldEffectNode {
Q_OBJECT
public:
VSTHost(Clip* c);
@@ -57,7 +57,7 @@ public:
virtual QString description() override;
virtual EffectType type() override;
virtual olive::TrackType subtype() override;
virtual NodePtr Create(Clip *c) override;
virtual OldEffectNodePtr Create(Clip *c) override;
virtual void process_audio(double timecode_start,
double timecode_end,