several conversions to smart pointers

This commit is contained in:
itsmattkc
2019-02-16 21:21:04 -08:00
parent e063a5ba8f
commit 5207a0511f
104 changed files with 972 additions and 945 deletions
+1 -1
View File
@@ -23,7 +23,7 @@
#include <QDateTime>
#include <QtMath>
AudioNoiseEffect::AudioNoiseEffect(Clip* c, const EffectMeta *em) : Effect(c, em) {
AudioNoiseEffect::AudioNoiseEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
amount_val = add_row(tr("Amount"))->add_field(EFFECT_FIELD_DOUBLE, "amount");
amount_val->set_double_minimum_value(0);
amount_val->set_double_maximum_value(100);
+1 -1
View File
@@ -26,7 +26,7 @@
class AudioNoiseEffect : public Effect {
Q_OBJECT
public:
AudioNoiseEffect(Clip* c, const EffectMeta* em);
AudioNoiseEffect(ClipPtr c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* amount_val;
+1 -1
View File
@@ -24,7 +24,7 @@
#include "project/clip.h"
#include "debug.h"
CornerPinEffect::CornerPinEffect(Clip *c, const EffectMeta *em) : Effect(c, em) {
CornerPinEffect::CornerPinEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
enable_coords = true;
enable_shader = true;
+1 -1
View File
@@ -26,7 +26,7 @@
class CornerPinEffect : public Effect {
Q_OBJECT
public:
CornerPinEffect(Clip* c, const EffectMeta* em);
CornerPinEffect(ClipPtr c, const EffectMeta* em);
void process_coords(double timecode, GLTextureCoords& coords, int data);
void process_shader(double timecode, GLTextureCoords& coords, int iterations);
void gizmo_draw(double timecode, GLTextureCoords& coords);
+1 -1
View File
@@ -22,7 +22,7 @@
#include <QOpenGLFunctions>
CrossDissolveTransition::CrossDissolveTransition(Clip* c, Clip* s, const EffectMeta* em) : Transition(c, s, em) {
CrossDissolveTransition::CrossDissolveTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {
enable_coords = true;
// add_row("Smooth")->add_field(EFFECT_FIELD_BOOL, "smooth");
+1 -1
View File
@@ -25,7 +25,7 @@
class CrossDissolveTransition : public Transition {
public:
CrossDissolveTransition(Clip* c, Clip* s, const EffectMeta* em);
CrossDissolveTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
void process_coords(double timecode, GLTextureCoords &, int data);
};
+1 -1
View File
@@ -22,7 +22,7 @@
#include "debug.h"
CubeTransition::CubeTransition(Clip* c, Clip* s, const EffectMeta* em) : Transition(c, s, em) {
CubeTransition::CubeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {
enable_coords = true;
}
+1 -1
View File
@@ -25,7 +25,7 @@
class CubeTransition : public Transition {
public:
CubeTransition(Clip* c, Clip* s, const EffectMeta* em);
CubeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
void process_coords(double timecode, GLTextureCoords &, int data);
};
@@ -22,7 +22,7 @@
#include <QtMath>
ExponentialFadeTransition::ExponentialFadeTransition(Clip* c, Clip* s, const EffectMeta* em) : Transition(c, s, em) {}
ExponentialFadeTransition::ExponentialFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {}
void ExponentialFadeTransition::process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int type) {
double interval = (timecode_end-timecode_start)/nb_bytes;
+1 -1
View File
@@ -25,7 +25,7 @@
class ExponentialFadeTransition : public Transition {
public:
ExponentialFadeTransition(Clip* c, Clip* s, const EffectMeta* em);
ExponentialFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
};
+1 -1
View File
@@ -23,7 +23,7 @@
#define FILL_TYPE_LEFT 0
#define FILL_TYPE_RIGHT 1
FillLeftRightEffect::FillLeftRightEffect(Clip* c, const EffectMeta *em) : Effect(c, em) {
FillLeftRightEffect::FillLeftRightEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
EffectRow* type_row = add_row(tr("Type"));
fill_type = type_row->add_field(EFFECT_FIELD_COMBO, "type");
fill_type->add_combo_item(tr("Fill Left with Right"), FILL_TYPE_LEFT);
+1 -1
View File
@@ -26,7 +26,7 @@
class FillLeftRightEffect : public Effect {
Q_OBJECT
public:
FillLeftRightEffect(Clip* c, const EffectMeta* em);
FillLeftRightEffect(ClipPtr c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
private:
EffectField* fill_type;
+1 -1
View File
@@ -37,7 +37,7 @@ typedef void (*f0rGetPluginInfo)(f0r_plugin_info_t* info);
typedef void (*f0rSetParamValue) (f0r_instance_t instance,
f0r_param_t param, int param_index);
Frei0rEffect::Frei0rEffect(Clip *c, const EffectMeta *em) :
Frei0rEffect::Frei0rEffect(ClipPtr c, const EffectMeta *em) :
Effect(c, em),
open(false)
{
+1 -1
View File
@@ -35,7 +35,7 @@ typedef void (*f0rGetParamInfo)(f0r_param_info_t * info,
class Frei0rEffect : public Effect {
Q_OBJECT
public:
Frei0rEffect(Clip* c, const EffectMeta* em);
Frei0rEffect(ClipPtr c, const EffectMeta* em);
~Frei0rEffect();
virtual void process_image(double timecode, uint8_t* input, uint8_t* output, int size);
+1 -1
View File
@@ -20,7 +20,7 @@
#include "linearfadetransition.h"
LinearFadeTransition::LinearFadeTransition(Clip* c, Clip* s, const EffectMeta* em) : Transition(c, s, em) {}
LinearFadeTransition::LinearFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {}
void LinearFadeTransition::process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int type) {
double interval = (timecode_end-timecode_start)/nb_bytes;
+1 -1
View File
@@ -25,7 +25,7 @@
class LinearFadeTransition : public Transition {
public:
LinearFadeTransition(Clip* c, Clip* s, const EffectMeta* em);
LinearFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
};
@@ -22,7 +22,7 @@
#include <QtMath>
LogarithmicFadeTransition::LogarithmicFadeTransition(Clip* c, Clip* s, const EffectMeta* em) : Transition(c, s, em) {}
LogarithmicFadeTransition::LogarithmicFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {}
void LogarithmicFadeTransition::process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int type) {
double interval = (timecode_end-timecode_start)/nb_bytes;
+1 -1
View File
@@ -25,7 +25,7 @@
class LogarithmicFadeTransition : public Transition {
public:
LogarithmicFadeTransition(Clip* c, Clip* s, const EffectMeta* em);
LogarithmicFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
};
+1 -1
View File
@@ -28,7 +28,7 @@
#include "ui/labelslider.h"
#include "ui/collapsiblewidget.h"
PanEffect::PanEffect(Clip* c, const EffectMeta *em) : Effect(c, em) {
PanEffect::PanEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
EffectRow* pan_row = add_row(tr("Pan"));
pan_val = pan_row->add_field(EFFECT_FIELD_DOUBLE, "pan");
pan_val->set_double_minimum_value(-100);
+1 -1
View File
@@ -26,7 +26,7 @@
class PanEffect : public Effect {
Q_OBJECT
public:
PanEffect(Clip* c, const EffectMeta* em);
PanEffect(ClipPtr c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* pan_val;
+1 -1
View File
@@ -33,7 +33,7 @@
#include "debug.h"
ShakeEffect::ShakeEffect(Clip *c, const EffectMeta *em) : Effect(c, em) {
ShakeEffect::ShakeEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
enable_coords = true;
EffectRow* intensity_row = add_row(tr("Intensity"));
+1 -1
View File
@@ -28,7 +28,7 @@
class ShakeEffect : public Effect {
Q_OBJECT
public:
ShakeEffect(Clip* c, const EffectMeta* em);
ShakeEffect(ClipPtr c, const EffectMeta* em);
void process_coords(double timecode, GLTextureCoords& coords, int data);
EffectField* intensity_val;
+1 -1
View File
@@ -38,7 +38,7 @@
#define SMPTE_STRIP_COUNT 3
#define SMPTE_LOWER_BARS 4
SolidEffect::SolidEffect(Clip* c, const EffectMeta* em) : Effect(c, em) {
SolidEffect::SolidEffect(ClipPtr c, const EffectMeta* em) : Effect(c, em) {
enable_superimpose = true;
solid_type = add_row(tr("Type"))->add_field(EFFECT_FIELD_COMBO, "type");
+1 -1
View File
@@ -28,7 +28,7 @@
class SolidEffect : public Effect {
Q_OBJECT
public:
SolidEffect(Clip* c, const EffectMeta *em);
SolidEffect(ClipPtr c, const EffectMeta *em);
void redraw(double timecode);
private slots:
void ui_update(int);
+1 -1
View File
@@ -44,7 +44,7 @@
#include "io/config.h"
#include "mainwindow.h"
TextEffect::TextEffect(Clip *c, const EffectMeta* em) :
TextEffect::TextEffect(ClipPtr c, const EffectMeta* em) :
Effect(c, em)
{
enable_superimpose = true;
+1 -1
View File
@@ -29,7 +29,7 @@
class TextEffect : public Effect {
Q_OBJECT
public:
TextEffect(Clip* c, const EffectMeta *em);
TextEffect(ClipPtr c, const EffectMeta *em);
void redraw(double timecode);
EffectField* text_val;
+1 -1
View File
@@ -44,7 +44,7 @@
#include "io/config.h"
#include "playback/playback.h"
TimecodeEffect::TimecodeEffect(Clip *c, const EffectMeta* em) :
TimecodeEffect::TimecodeEffect(ClipPtr c, const EffectMeta* em) :
Effect(c, em)
{
enable_always_update = true;
+1 -1
View File
@@ -29,7 +29,7 @@
class TimecodeEffect : public Effect {
Q_OBJECT
public:
TimecodeEffect(Clip* c, const EffectMeta *em);
TimecodeEffect(ClipPtr c, const EffectMeta *em);
void redraw(double timecode);
EffectField * scale_val;
EffectField * color_val;
+1 -1
View File
@@ -28,7 +28,7 @@
#include "project/sequence.h"
#include "debug.h"
ToneEffect::ToneEffect(Clip* c, const EffectMeta *em) : Effect(c, em), sinX(INT_MIN) {
ToneEffect::ToneEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em), sinX(INT_MIN) {
type_val = add_row(tr("Type"))->add_field(EFFECT_FIELD_COMBO, "type");
type_val->add_combo_item("Sine", TONE_TYPE_SINE);
+1 -1
View File
@@ -26,7 +26,7 @@
class ToneEffect : public Effect {
Q_OBJECT
public:
ToneEffect(Clip *c, const EffectMeta* em);
ToneEffect(ClipPtr c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* type_val;
+1 -1
View File
@@ -43,7 +43,7 @@
#include "panels/viewer.h"
#include "ui/viewerwidget.h"
TransformEffect::TransformEffect(Clip* c, const EffectMeta* em) : Effect(c, em) {
TransformEffect::TransformEffect(ClipPtr c, const EffectMeta* em) : Effect(c, em) {
enable_coords = true;
EffectRow* position_row = add_row(tr("Position"));
+1 -1
View File
@@ -26,7 +26,7 @@
class TransformEffect : public Effect {
Q_OBJECT
public:
TransformEffect(Clip* c, const EffectMeta* em);
TransformEffect(ClipPtr c, const EffectMeta* em);
void refresh();
void process_coords(double timecode, GLTextureCoords& coords, int data);
+3 -3
View File
@@ -27,7 +27,7 @@
#include "ui/collapsiblewidget.h"
#include "debug.h"
VoidEffect::VoidEffect(Clip *c, const QString& n) : Effect(c, nullptr) {
VoidEffect::VoidEffect(ClipPtr c, const QString& n) : Effect(c, nullptr) {
name = n;
QString display_name;
if (n.isEmpty()) {
@@ -43,8 +43,8 @@ VoidEffect::VoidEffect(Clip *c, const QString& n) : Effect(c, nullptr) {
meta = &void_meta;
}
Effect *VoidEffect::copy(Clip *c) {
Effect* copy = new VoidEffect(c, name);
EffectPtr VoidEffect::copy(ClipPtr c) {
EffectPtr copy(new VoidEffect(c, name));
copy->set_enabled(is_enabled());
copy_field_keyframes(copy);
return copy;
+2 -2
View File
@@ -32,9 +32,9 @@
class VoidEffect : public Effect {
Q_OBJECT
public:
VoidEffect(Clip* c, const QString& n);
VoidEffect(ClipPtr c, const QString& n);
virtual Effect* copy(Clip* c) override;
virtual EffectPtr copy(ClipPtr c) override;
virtual void load(QXmlStreamReader &stream) override;
virtual void save(QXmlStreamWriter &stream) override;
private:
+1 -1
View File
@@ -28,7 +28,7 @@
#include "ui/labelslider.h"
#include "ui/collapsiblewidget.h"
VolumeEffect::VolumeEffect(Clip* c, const EffectMeta *em) : Effect(c, em) {
VolumeEffect::VolumeEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
EffectRow* volume_row = add_row(tr("Volume"));
volume_val = volume_row->add_field(EFFECT_FIELD_DOUBLE, "volume");
+1 -1
View File
@@ -26,7 +26,7 @@
class VolumeEffect : public Effect {
Q_OBJECT
public:
VolumeEffect(Clip* c, const EffectMeta* em);
VolumeEffect(ClipPtr c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* volume_val;
+1 -1
View File
@@ -252,7 +252,7 @@ void VSTHost::processAudio(long numFrames) {
plugin->processReplacing(plugin, inputs, outputs, numFrames);
}
VSTHost::VSTHost(Clip* c, const EffectMeta *em) : Effect(c, em) {
VSTHost::VSTHost(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
plugin = nullptr;
inputs = new float* [CHANNEL_COUNT];
+1 -1
View File
@@ -37,7 +37,7 @@ typedef intptr_t (*dispatcherFuncPtr)(AEffect *effect, int32_t opCode, int32_t i
class VSTHost : public Effect {
Q_OBJECT
public:
VSTHost(Clip* c, const EffectMeta* em);
VSTHost(ClipPtr c, const EffectMeta* em);
~VSTHost();
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);