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
+4 -4
View File
@@ -22,7 +22,7 @@
#include <QtMath>
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include "effects/transition.h"
#include "project/footage.h"
#include "global/config.h"
@@ -220,7 +220,7 @@ QVector<Marker> &Clip::get_markers() {
return markers;
}
int Clip::IndexOfEffect(Node *e)
int Clip::IndexOfEffect(OldEffectNode *e)
{
for (int i=0;i<effects.size();i++) {
if (effects.at(i).get() == e) {
@@ -517,9 +517,9 @@ void Clip::refactor_frame_rate(ComboAction* ca, double multiplier, bool change_t
// move keyframes
for (int i=0;i<effects.size();i++) {
NodePtr e = effects.at(i);
OldEffectNodePtr e = effects.at(i);
for (int j=0;j<e->row_count();j++) {
EffectRow* r = e->row(j);
NodeIO* r = e->row(j);
for (int l=0;l<r->FieldCount();l++) {
EffectField* f = r->Field(l);
for (int k=0;k<f->keyframes.size();k++) {
+3 -3
View File
@@ -30,7 +30,7 @@
#include "rendering/cacher.h"
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include "effects/transition.h"
#include "undo/comboaction.h"
#include "project/media.h"
@@ -129,8 +129,8 @@ public:
QVector<Marker>& get_markers();
// other variables (should be deep copied/duplicated in copy())
int IndexOfEffect(Node* e);
QList<NodePtr> effects;
int IndexOfEffect(OldEffectNode* e);
QList<OldEffectNodePtr> effects;
QVector<Clip*> linked;
TransitionPtr opening_transition;
TransitionPtr closing_transition;
+3 -3
View File
@@ -905,9 +905,9 @@ void Sequence::RippleDeleteArea(ComboAction* ca, long ripple_point, long ripple_
}
Node *Sequence::GetSelectedGizmo()
OldEffectNode *Sequence::GetSelectedGizmo()
{
Node* gizmo_ptr = nullptr;
OldEffectNode* gizmo_ptr = nullptr;
QVector<Clip*> clips = GetAllClips();
@@ -923,7 +923,7 @@ Node *Sequence::GetSelectedGizmo()
// none selected
for (int j=0;j<c->effects.size();j++) {
Node* e = c->effects.at(j).get();
OldEffectNode* e = c->effects.at(j).get();
// retrieve gizmo data from effect
if (e->are_gizmos_enabled()) {
+1 -1
View File
@@ -97,7 +97,7 @@ public:
void RippleDeleteEmptySpace(ComboAction *ca, Track *track, long point);
void RippleDeleteArea(ComboAction* ca, long ripple_point, long ripple_length);
Node* GetSelectedGizmo();
OldEffectNode* GetSelectedGizmo();
bool IsClipSelected(Clip* clip, bool containing = true);
bool IsTransitionSelected(Transition* t);
+2 -2
View File
@@ -4,7 +4,7 @@
#include <QVector>
#include <memory>
#include "nodes/node.h"
#include "nodes/oldeffectnode.h"
#include "tracktypes.h"
#include "undo/comboaction.h"
#include "timeline/selection.h"
@@ -112,7 +112,7 @@ private:
olive::TrackType type_;
int height_;
QVector<ClipPtr> clips_;
QVector<NodePtr> effects_;
QVector<OldEffectNodePtr> effects_;
QVector<Selection> selections_;
bool muted_;