oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

several conversions to smart pointers

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/mediapropertiesdialog.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ MediaPropertiesDialog::MediaPropertiesDialog(QWidget *parent, Media *i) :
int row = 0;
Footage* f = item->to_footage();
FootagePtr f = item->to_footage();
grid->addWidget(new QLabel(tr("Tracks:"), this), row, 0, 1, 2);
row++;
@@ -143,7 +143,7 @@ MediaPropertiesDialog::MediaPropertiesDialog(QWidget *parent, Media *i) :
}
void MediaPropertiesDialog::accept() {
Footage* f = item->to_footage();
FootagePtr f = item->to_footage();
ComboAction* ca = new ComboAction();
dialogs/mediapropertiesdialog.h
+2 -2
View File
@@ -34,11 +34,11 @@
class MediaPropertiesDialog : public QDialog {
Q_OBJECT
public:
MediaPropertiesDialog(QWidget *parent, Media* i);
MediaPropertiesDialog(QWidget *parent, Media* i);
private:
QComboBox* interlacing_box;
QLineEdit* name_box;
Media* item;
Media* item;
QListWidget* track_list;
QDoubleSpinBox* conform_fr;
QCheckBox* premultiply_alpha_setting;
dialogs/newsequencedialog.cpp
+2 -2
View File
@@ -85,7 +85,7 @@ void NewSequenceDialog::set_sequence_name(const QString& s) {
void NewSequenceDialog::create() {
if (existing_sequence == nullptr) {
Sequence* s = new Sequence();
SequencePtr s(new Sequence());
s->name = sequence_name_edit->text();
s->width = width_numeric->value();
@@ -112,7 +112,7 @@ void NewSequenceDialog::create() {
ca->append(esc);
for (int i=0;i<existing_sequence->clips.size();i++) {
Clip* c = existing_sequence->clips.at(i);
ClipPtr c = existing_sequence->clips.at(i);
if (c != nullptr) {
c->refactor_frame_rate(ca, multiplier, true);
}
dialogs/newsequencedialog.h
+3 -3
View File
@@ -35,7 +35,7 @@ class NewSequenceDialog : public QDialog
Q_OBJECT
public:
explicit NewSequenceDialog(QWidget *parent = 0, Media* existing = 0);
explicit NewSequenceDialog(QWidget *parent = nullptr, Media* existing = nullptr);
~NewSequenceDialog();
void set_sequence_name(const QString& s);
@@ -45,8 +45,8 @@ private slots:
void preset_changed(int index);
private:
Sequence* existing_sequence;
Media* existing_item;
SequencePtr existing_sequence;
Media* existing_item;
void setup_ui();
dialogs/proxydialog.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
#include "project/footage.h"
#include "mainwindow.h"
ProxyDialog::ProxyDialog(QWidget *parent, const QVector<Footage *> &footage) :
ProxyDialog::ProxyDialog(QWidget *parent, const QVector<FootagePtr> &footage) :
QDialog(parent),
selected_footage(footage)
{
dialogs/proxydialog.h
+2 -2
View File
@@ -30,7 +30,7 @@
class ProxyDialog : public QDialog {
Q_OBJECT
public:
ProxyDialog(QWidget* parent, const QVector<Footage*>& footage);
ProxyDialog(QWidget* parent, const QVector<FootagePtr>& footage);
public slots:
// called if user clicks "OK" on the dialog
virtual void accept() override;
@@ -51,7 +51,7 @@ private:
QString proxy_folder_name;
// list of footage to make proxies for
QVector<Footage*> selected_footage;
QVector<FootagePtr> selected_footage;
private slots:
// triggered when the user changes the index in the location combobox
void location_changed(int i);
dialogs/replaceclipmediadialog.cpp
+3 -3
View File
@@ -31,7 +31,7 @@
#include <QPushButton>
#include <QMessageBox>
ReplaceClipMediaDialog::ReplaceClipMediaDialog(QWidget *parent, Media *old_media) :
ReplaceClipMediaDialog::ReplaceClipMediaDialog(QWidget *parent, Media* old_media) :
QDialog(parent),
media(old_media)
{
@@ -80,7 +80,7 @@ void ReplaceClipMediaDialog::replace() {
QMessageBox::Ok
);
} else {
Media* new_item = static_cast<Media*>(selected_items.at(0).internalPointer());
Media* new_item = static_cast<Media*>(selected_items.at(0).internalPointer());
if (media == new_item) {
QMessageBox::critical(
this,
@@ -111,7 +111,7 @@ void ReplaceClipMediaDialog::replace() {
);
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
Clip* c = olive::ActiveSequence->clips.at(i);
ClipPtr c = olive::ActiveSequence->clips.at(i);
if (c != nullptr && c->media == media) {
rcmc->clips.append(c);
}
dialogs/replaceclipmediadialog.h
+2 -2
View File
@@ -31,11 +31,11 @@
class ReplaceClipMediaDialog : public QDialog {
Q_OBJECT
public:
ReplaceClipMediaDialog(QWidget* parent, Media *old_media);
ReplaceClipMediaDialog(QWidget* parent, Media* old_media);
private slots:
void replace();
private:
Media* media;
Media* media;
QTreeView* tree;
QCheckBox* use_same_media_in_points;
};
dialogs/speeddialog.cpp
+13 -13
View File
@@ -94,7 +94,7 @@ void SpeedDialog::run() {
current_length = -1;
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
double clip_percent;
@@ -103,7 +103,7 @@ void SpeedDialog::run() {
if (c->track < 0) {
bool process_video = true;
if (c->media != nullptr && c->media->get_type() == MEDIA_TYPE_FOOTAGE) {
Footage* m = c->media->to_footage();
FootagePtr m = c->media->to_footage();
FootageStream* ms = m->get_stream_from_file_index(true, c->media_stream);
if (ms != nullptr && ms->infinite_length) {
process_video = false;
@@ -187,7 +187,7 @@ void SpeedDialog::percent_update() {
long len_val = -1;
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
// get frame rate
if (frame_rate->isEnabled() && c->track < 0) {
@@ -222,7 +222,7 @@ void SpeedDialog::duration_update() {
double fr_val = qSNaN();
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
// get percent
long clip_default_length = qRound(c->getLength() * c->speed);
@@ -265,7 +265,7 @@ void SpeedDialog::frame_rate_update() {
// analyze video clips
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
// check if all selected clips are currently the same speed
if (i == 0) {
@@ -297,7 +297,7 @@ void SpeedDialog::frame_rate_update() {
// analyze audio clips
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
if (c->track >= 0) {
long new_clip_len = (qIsNaN(old_pc_val) || qIsNaN(pc_val)) ? c->getLength() : ((c->getLength() * c->speed) / pc_val);
@@ -312,7 +312,7 @@ void SpeedDialog::frame_rate_update() {
duration->set_value((len_val == -1) ? qSNaN() : len_val, false);
}
void set_speed(ComboAction* ca, Clip* c, double speed, bool ripple, long& ep, long& lr) {
void set_speed(ComboAction* ca, ClipPtr c, double speed, bool ripple, long& ep, long& lr) {
panel_timeline->deselect_area(c->timeline_in, c->timeline_out, c->track);
long proposed_out = c->timeline_out;
@@ -321,7 +321,7 @@ void set_speed(ComboAction* ca, Clip* c, double speed, bool ripple, long& ep, lo
ca->append(new SetSpeedAction(c, speed));
if (!ripple && proposed_out > c->timeline_out) {
for (int i=0;i<c->sequence->clips.size();i++) {
Clip* compare = c->sequence->clips.at(i);
ClipPtr compare = c->sequence->clips.at(i);
if (compare != nullptr
&& compare->track == c->track
&& compare->timeline_in >= c->timeline_out && compare->timeline_in < proposed_out) {
@@ -352,7 +352,7 @@ void SpeedDialog::accept() {
long longest_ripple = LONG_MIN;
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
if (c->open) close_clip(c, true);
if (c->track >= 0
@@ -372,7 +372,7 @@ void SpeedDialog::accept() {
if (!qIsNaN(percent->value())) {
// simply set speed
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
set_speed(ca, c, percent->value(), ripple->isChecked(), earliest_point, longest_ripple);
}
} else if (!qIsNaN(frame_rate->value())) {
@@ -382,7 +382,7 @@ void SpeedDialog::accept() {
// see if we can use the frame rate to change all the speeds
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
if (i == 0) {
cached_speed = c->speed;
} else if (!qFuzzyCompare(cached_speed, c->speed)) {
@@ -400,7 +400,7 @@ void SpeedDialog::accept() {
// make changes
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
if (c->track < 0) {
set_speed(ca, c, frame_rate->value() / c->getMediaFrameRate(), ripple->isChecked(), earliest_point, longest_ripple);
} else if (can_change_all) {
@@ -410,7 +410,7 @@ void SpeedDialog::accept() {
} else if (!qIsNaN(duration->value())) {
// simply set duration
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
set_speed(ca, c, (c->getLength() * c->speed) / duration->value(), ripple->isChecked(), earliest_point, longest_ripple);
}
}
dialogs/speeddialog.h
+1 -1
View File
@@ -32,7 +32,7 @@ class SpeedDialog : public QDialog
Q_OBJECT
public:
SpeedDialog(QWidget* parent = 0);
QVector<Clip*> clips;
QVector<ClipPtr> clips;
void run();
private slots: