refactored some classes

mengyuan3 · May 7, 2019 · 9a13776 · 9a13776
1 parent 127a773
commit 9a13776
Show file tree

Hide file tree

Showing 133 changed files with 1,698 additions and 1,627 deletions.
diff --git a/dialogs/speeddialog.cpp b/dialogs/speeddialog.cpp
@@ -33,7 +33,7 @@
 #include "panels/timeline.h"
 #include "undo/undo.h"
 #include "undo/undostack.h"
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "project/media.h"
 
 SpeedDialog::SpeedDialog(QWidget *parent, QVector<Clip*> clips) : QDialog(parent) {

diff --git a/effects/effectfield.cpp b/effects/effectfield.cpp
@@ -26,15 +26,15 @@
 #include "rendering/renderfunctions.h"
 #include "global/config.h"
 #include "global/timing.h"
-#include "effects/effectrow.h"
-#include "nodes/node.h"
+#include "nodes/nodeio.h"
+#include "nodes/oldeffectnode.h"
 #include "undo/undo.h"
 #include "timeline/clip.h"
 #include "timeline/sequence.h"
 #include "global/math.h"
 #include "global/debug.h"
 
-EffectField::EffectField(EffectRow* parent, EffectFieldType t) :
+EffectField::EffectField(NodeIO* parent, EffectFieldType t) :
   QObject(parent),
   type_(t),
   enabled_(true)
@@ -49,9 +49,9 @@ EffectField::EffectField(EffectRow* parent, EffectFieldType t) :
   connect(this, SIGNAL(Changed()), parent->GetParentEffect(), SLOT(FieldChanged()));
 }
 
-EffectRow *EffectField::GetParentRow()
+NodeIO *EffectField::GetParentRow()
 {
-  return static_cast<EffectRow*>(parent());
+  return static_cast<NodeIO*>(parent());
 }
 
 QVariant EffectField::ConvertStringToValue(const QString &s)

diff --git a/effects/effectfield.h b/effects/effectfield.h
@@ -29,7 +29,7 @@
 #include "undo/undostack.h"
 #include "nodes/nodedatatypes.h"
 
-class EffectRow;
+class NodeIO;
 class ComboAction;
 
 /**
@@ -106,7 +106,7 @@ class EffectField : public QObject {
    *
    * The type of data contained within this field. This is expected to be filled by a derived class.
    */
-  EffectField(EffectRow* parent, EffectFieldType t);
+  EffectField(NodeIO* parent, EffectFieldType t);
 
   /**
    * @brief Get the EffectRow that this field is a member of.
@@ -117,7 +117,7 @@ class EffectField : public QObject {
    *
    * The EffectRow that this field is a member of.
    */
-  EffectRow* GetParentRow();
+  NodeIO* GetParentRow();
 
   /**
    * @brief Get the type of data to expect from this field

diff --git a/effects/effectgizmo.cpp b/effects/effectgizmo.cpp
@@ -22,9 +22,9 @@
 
 #include "ui/labelslider.h"
 #include "effects/fields/doublefield.h"
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 
-EffectGizmo::EffectGizmo(Node *parent, int type) :
+EffectGizmo::EffectGizmo(OldEffectNode *parent, int type) :
   QObject(parent),
   x_field1(nullptr),
   x_field_multi1(1.0),

diff --git a/effects/effectgizmo.h b/effects/effectgizmo.h
@@ -39,12 +39,12 @@ enum GizmoType {
 #include <QColor>
 
 class DoubleField;
-class Node;
+class OldEffectNode;
 
 class EffectGizmo : public QObject {
   Q_OBJECT
 public:
-  EffectGizmo(Node* parent, int type);
+  EffectGizmo(OldEffectNode* parent, int type);
 
   QVector<QVector3D> world_pos;
   QVector<QPoint> screen_pos;

diff --git a/effects/effectloaders.cpp b/effects/effectloaders.cpp
@@ -24,7 +24,7 @@
 #include <QXmlStreamReader>
 #include <QDebug>
 
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "effects/transition.h"
 #include "global/path.h"
 #include "panels/panels.h"

diff --git a/effects/fields/boolfield.cpp b/effects/fields/boolfield.cpp
@@ -22,10 +22,10 @@
 
 #include <QCheckBox>
 
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "undo/undo.h"
 
-BoolField::BoolField(EffectRow *parent) :
+BoolField::BoolField(NodeIO *parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_BOOL)
 {}
 

diff --git a/effects/fields/boolfield.h b/effects/fields/boolfield.h
@@ -35,7 +35,7 @@ class BoolField : public EffectField
   /**
    * @brief Reimplementation of EffectField::EffectField().
    */
-  BoolField(EffectRow* parent);
+  BoolField(NodeIO* parent);
 
   /**
    * @brief Get the boolean value at a given timecode

diff --git a/effects/fields/buttonfield.cpp b/effects/fields/buttonfield.cpp
@@ -22,7 +22,7 @@
 
 #include <QPushButton>
 
-ButtonField::ButtonField(EffectRow *parent, const QString &string) :
+ButtonField::ButtonField(NodeIO *parent, const QString &string) :
   EffectField(parent, EffectField::EFFECT_FIELD_UI),
   button_text_(string)
 {}

diff --git a/effects/fields/buttonfield.h b/effects/fields/buttonfield.h
@@ -42,7 +42,7 @@ class ButtonField : public EffectField
   /**
    * @brief Reimplementation of EffectField::EffectField().
    */
-  ButtonField(EffectRow* parent, const QString& string);
+  ButtonField(NodeIO* parent, const QString& string);
 
   /**
    * @brief Set whether this pushbutton is checkable

diff --git a/effects/fields/colorfield.cpp b/effects/fields/colorfield.cpp
@@ -23,10 +23,10 @@
 #include <QColor>
 
 #include "ui/colorbutton.h"
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "undo/undo.h"
 
-ColorField::ColorField(EffectRow* parent) :
+ColorField::ColorField(NodeIO* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_COLOR)
 {}
 

diff --git a/effects/fields/colorfield.h b/effects/fields/colorfield.h
@@ -35,7 +35,7 @@ class ColorField : public EffectField
   /**
    * @brief Reimplementation of EffectField::EffectField().
    */
-  ColorField(EffectRow* parent);
+  ColorField(NodeIO* parent);
 
   /**
    * @brief Get the color value at a given timecode

diff --git a/effects/fields/combofield.cpp b/effects/fields/combofield.cpp
@@ -22,11 +22,11 @@
 
 #include <QDebug>
 
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "ui/comboboxex.h"
 #include "undo/undo.h"
 
-ComboField::ComboField(EffectRow* parent) :
+ComboField::ComboField(NodeIO* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_COMBO)
 {}
 

diff --git a/effects/fields/combofield.h b/effects/fields/combofield.h
@@ -48,7 +48,7 @@ class ComboField : public EffectField
   /**
    * @brief Reimplementation of EffectField::EffectField().
    */
-  ComboField(EffectRow* parent);
+  ComboField(NodeIO* parent);
 
   /**
    * @brief Add an item to this ComboField

diff --git a/effects/fields/doublefield.cpp b/effects/fields/doublefield.cpp
@@ -20,10 +20,10 @@
 
 #include "doublefield.h"
 
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "undo/undo.h"
 
-DoubleField::DoubleField(EffectRow* parent) :
+DoubleField::DoubleField(NodeIO* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_DOUBLE),
   min_(qSNaN()),
   max_(qSNaN()),

diff --git a/effects/fields/doublefield.h b/effects/fields/doublefield.h
@@ -39,7 +39,7 @@ class DoubleField : public EffectField
   /**
    * @brief Reimplementation of EffectField::EffectField().
    */
-  DoubleField(EffectRow* parent);
+  DoubleField(NodeIO* parent);
 
   /**
    * @brief Get double value at timecode

diff --git a/effects/fields/filefield.cpp b/effects/fields/filefield.cpp
@@ -23,10 +23,10 @@
 #include <QDebug>
 
 #include "ui/embeddedfilechooser.h"
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "undo/undo.h"
 
-FileField::FileField(EffectRow* parent) :
+FileField::FileField(NodeIO* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_FILE)
 {
   // Set default value to an empty string

diff --git a/effects/fields/filefield.h b/effects/fields/filefield.h
@@ -36,7 +36,7 @@ class FileField : public EffectField
   /**
    * @brief Reimplementation of EffectField::EffectField().
    */
-  FileField(EffectRow* parent);
+  FileField(NodeIO* parent);
 
   /**
    * @brief Get the filename at the given timecode

diff --git a/effects/fields/fontfield.cpp b/effects/fields/fontfield.cpp
@@ -24,12 +24,12 @@
 #include <QDebug>
 
 #include "ui/comboboxex.h"
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "undo/undo.h"
 
 // NOTE/TODO: This shares a lot of similarity with ComboInput, and could probably be a derived class of it
 
-FontField::FontField(EffectRow* parent) :
+FontField::FontField(NodeIO* parent) :
   EffectField(parent, EffectField::EFFECT_FIELD_FONT)
 {
   font_list = QFontDatabase().families();

diff --git a/effects/fields/fontfield.h b/effects/fields/fontfield.h
@@ -37,7 +37,7 @@ class FontField : public EffectField {
   /**
    * @brief Reimplementation of EffectField::EffectField().
    */
-  FontField(EffectRow* parent);
+  FontField(NodeIO* parent);
 
   /**
    * @brief Get the font family name at the given timecode

diff --git a/effects/fields/labelfield.cpp b/effects/fields/labelfield.cpp
@@ -22,7 +22,7 @@
 
 #include <QLabel>
 
-LabelField::LabelField(EffectRow *parent, const QString &string) :
+LabelField::LabelField(NodeIO *parent, const QString &string) :
   EffectField(parent, EffectField::EFFECT_FIELD_UI),
   label_text_(string)
 {}

diff --git a/effects/fields/labelfield.h b/effects/fields/labelfield.h
@@ -37,7 +37,7 @@ class LabelField : public EffectField
   /**
    * @brief Reimplementation of EffectField::EffectField().
    */
-  LabelField(EffectRow* parent, const QString& string);
+  LabelField(NodeIO* parent, const QString& string);
 
   /**
    * @brief Reimplementation of EffectField::CreateWidget()

diff --git a/effects/fields/stringfield.cpp b/effects/fields/stringfield.cpp
@@ -23,12 +23,12 @@
 #include <QtMath>
 #include <QDebug>
 
-#include "nodes/node.h"
+#include "nodes/oldeffectnode.h"
 #include "ui/texteditex.h"
 #include "global/config.h"
 #include "undo/undo.h"
 
-StringField::StringField(EffectRow* parent, bool rich_text) :
+StringField::StringField(NodeIO* parent, bool rich_text) :
   EffectField(parent, EffectField::EFFECT_FIELD_STRING),
   rich_text_(rich_text)
 {

diff --git a/effects/fields/stringfield.h b/effects/fields/stringfield.h
@@ -39,7 +39,7 @@ class StringField : public EffectField
    * Provides a setting for whether this StringField - and its attached TextEditEx objects - should operate in rich
    * text or plain text mode, defaulting to rich text mode.
    */
-  StringField(EffectRow* parent, bool rich_text = true);
+  StringField(NodeIO* parent, bool rich_text = true);
 
   /**
    * @brief Get the string at the given timecode

diff --git a/effects/internal/audionoiseeffect.cpp b/effects/internal/audionoiseeffect.cpp
@@ -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);
 }

diff --git a/effects/internal/audionoiseeffect.h b/effects/internal/audionoiseeffect.h
@@ -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 @@ class AudioNoiseEffect : public Node {
   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,

diff --git a/effects/internal/cornerpineffect.cpp b/effects/internal/cornerpineffect.cpp
@@ -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);
 }

diff --git a/effects/internal/cornerpineffect.h b/effects/internal/cornerpineffect.h
@@ -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 @@ class CornerPinEffect : public Node {
   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);

diff --git a/effects/internal/crossdissolvetransition.cpp b/effects/internal/crossdissolvetransition.cpp
@@ -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);
 }