oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests 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
project/sequence.cpp
+13 -22
View File
@@ -20,9 +20,6 @@
#include "sequence.h"
#include "clip.h"
#include "transition.h"
#include <QCoreApplication>
#include "debug.h"
@@ -36,15 +33,10 @@ Sequence::Sequence() :
{
}
Sequence::~Sequence() {
// dealloc all clips
for (int i=0;i<clips.size();i++) {
delete clips.at(i);
}
}
Sequence::~Sequence() {}
Sequence* Sequence::copy() {
Sequence* s = new Sequence();
SequencePtr Sequence::copy() {
SequencePtr s(new Sequence());
s->name = QCoreApplication::translate("Sequence", "%1 (copy)").arg(name);
s->width = width;
s->height = height;
@@ -53,11 +45,11 @@ Sequence* Sequence::copy() {
s->audio_layout = audio_layout;
s->clips.resize(clips.size());
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
ClipPtr c = clips.at(i);
if (c == nullptr) {
s->clips[i] = nullptr;
} else {
Clip* copy = c->copy(s);
ClipPtr copy = c->copy(s);
copy->linked = c->linked;
s->clips[i] = copy;
}
@@ -68,7 +60,7 @@ Sequence* Sequence::copy() {
long Sequence::getEndFrame() {
long end = 0;
for (int j=0;j<clips.size();j++) {
Clip* c = clips.at(j);
ClipPtr c = clips.at(j);
if (c != nullptr && c->timeline_out > end) {
end = c->timeline_out;
}
@@ -76,15 +68,15 @@ long Sequence::getEndFrame() {
return end;
}
void Sequence::hard_delete_transition(Clip *c, int type) {
void Sequence::hard_delete_transition(ClipPtr c, int type) {
int transition_index = (type == TA_OPENING_TRANSITION) ? c->opening_transition : c->closing_transition;
if (transition_index > -1) {
bool del = true;
Transition* t = transitions.at(transition_index);
TransitionPtr t = transitions.at(transition_index);
if (t->secondary_clip != nullptr) {
for (int i=0;i<clips.size();i++) {
Clip* comp = clips.at(i);
ClipPtr comp = clips.at(i);
if (comp != nullptr
&& c != comp
&& (c->opening_transition == transition_index
@@ -100,9 +92,8 @@ void Sequence::hard_delete_transition(Clip *c, int type) {
}
}
if (del) {
delete transitions.at(transition_index);
transitions[transition_index] = nullptr;
if (del) {
transitions[transition_index].reset();
}
if (type == TA_OPENING_TRANSITION) {
@@ -117,7 +108,7 @@ void Sequence::getTrackLimits(int* video_tracks, int* audio_tracks) {
int vt = 0;
int at = 0;
for (int j=0;j<clips.size();j++) {
Clip* c = clips.at(j);
ClipPtr c = clips.at(j);
if (c != nullptr) {
if (c->track < 0 && c->track < vt) { // video clip
vt = c->track;
@@ -131,4 +122,4 @@ void Sequence::getTrackLimits(int* video_tracks, int* audio_tracks) {
}
// static variable for the currently active sequence
Sequence* olive::ActiveSequence = nullptr;
SequencePtr olive::ActiveSequence = nullptr;