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

#475 and some clip pointer changes

Browse Source
This commit is contained in:
itsmattkc
2019-02-28 01:54:04 -08:00
parent edea300cbc
commit 1685fa3a5d
70 changed files with 726 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/clippropertiesdialog.cpp
+118
View File
@@ -0,0 +1,118 @@
#include "clippropertiesdialog.h"
#include <QGridLayout>
#include <QLabel>
#include <QDialogButtonBox>
#include "panels/panels.h"
#include "project/undo.h"
ClipPropertiesDialog::ClipPropertiesDialog(QWidget *parent, QVector<Clip *> clips) :
QDialog(parent)
{
setWindowTitle((clips.size() == 1) ?
tr("\"%1\" Properties").arg(clips.at(0)->name()) :
tr("Multiple Clip Properties"));
clips_ = clips;
QGridLayout* layout = new QGridLayout(this);
int row = 0;
// Clip Name field
layout->addWidget(new QLabel(tr("Name:")), row, 0);
clip_name_field_ = new QLineEdit();
layout->addWidget(clip_name_field_, row, 1);
row++;
// Clip Duration field
layout->addWidget(new QLabel(tr("Duration:")), row, 0);
duration_field_ = new LabelSlider();
duration_field_->set_display_type(LABELSLIDER_FRAMENUMBER);
duration_field_->set_minimum_value(1);
layout->addWidget(duration_field_, row, 1);
row++;
// Dialog buttons (OK and Cancel)
QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
buttons->setCenterButtons(true);
layout->addWidget(buttons, row, 0, 1, 2);
connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
// analyze list of clips for default values
bool all_clips_have_same_name = true;
bool all_clips_have_same_duration = true;
for (int i=1;i<clips.size();i++) {
if (clips.at(i-1)->name() != clips.at(i)->name()) {
all_clips_have_same_name = false;
}
if (clips.at(i-1)->length() != clips.at(i)->length()) {
all_clips_have_same_duration = false;
}
}
Clip* first_clip = clips_.first();
if (all_clips_have_same_name) {
// if there's only one clip selected, set all defaults to that clip's properties
clip_name_field_->setText(first_clip->name());
} else {
// if there are multiple clips, use different properties
clip_name_field_->setPlaceholderText(tr("(multiple)"));
}
// it's assumed all the clips come from the same sequence
duration_field_->set_frame_rate(first_clip->sequence->frame_rate);
if (all_clips_have_same_duration) {
duration_field_->set_default_value(first_clip->length());
duration_field_->set_value(first_clip->length(), false);
duration_field_->set_maximum_value(first_clip->media_length());
} else {
duration_field_->set_default_value(qSNaN());
duration_field_->set_value(qSNaN(), false);
}
}
void ClipPropertiesDialog::accept()
{
const QString& clip_name = clip_name_field_->text();
double clip_duration = duration_field_->value();
ComboAction* ca = new ComboAction();
for (int i=0;i<clips_.size();i++) {
Clip* clip = clips_.at(i);
if (!clip_name.isEmpty()) {
ca->append(new RenameClipCommand(clip, clip_name));
}
if (!qIsNaN(clip_duration)) {
clip->move(ca,
clip->timeline_in(),
clip->timeline_in() + qRound(clip_duration),
clip->clip_in(),
clip->track());
}
}
if (ca->hasActions()) {
olive::UndoStack.push(ca);
update_ui(false);
} else {
delete ca;
}
QDialog::accept();
}
dialogs/clippropertiesdialog.h
+23
View File
@@ -0,0 +1,23 @@
#ifndef CLIPPROPERTIESDIALOG_H
#define CLIPPROPERTIESDIALOG_H
#include <QDialog>
#include <QLineEdit>
#include "project/clip.h"
#include "ui/labelslider.h"
class ClipPropertiesDialog : public QDialog {
Q_OBJECT
public:
ClipPropertiesDialog(QWidget* parent, QVector<Clip*> clips);
protected:
virtual void accept() override;
private:
QVector<Clip*> clips_;
QLineEdit* clip_name_field_;
LabelSlider* duration_field_;
};
#endif // CLIPPROPERTIESDIALOG_H
dialogs/speeddialog.cpp
+29 -29
View File
@@ -35,9 +35,11 @@
#include "project/effect.h"
#include "project/media.h"
SpeedDialog::SpeedDialog(QWidget *parent) : QDialog(parent) {
SpeedDialog::SpeedDialog(QWidget *parent, QVector<Clip*> clips) : QDialog(parent) {
setWindowTitle(tr("Speed/Duration"));
clips_ = clips;
QVBoxLayout* main_layout = new QVBoxLayout(this);
QGridLayout* grid = new QGridLayout();
@@ -93,8 +95,8 @@ void SpeedDialog::run() {
default_length = -1;
current_length = -1;
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
double clip_percent;
@@ -185,8 +187,8 @@ void SpeedDialog::percent_update() {
double fr_val = qSNaN();
long len_val = -1;
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
// get frame rate
if (frame_rate->isEnabled() && c->track() < 0) {
@@ -220,8 +222,8 @@ void SpeedDialog::duration_update() {
bool got_fr = false;
double fr_val = qSNaN();
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
// get percent
long clip_default_length = qRound(c->length() * c->speed().value);
@@ -263,8 +265,8 @@ void SpeedDialog::frame_rate_update() {
long len_val = -1;
// analyze video clips
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
// check if all selected clips are currently the same speed
if (i == 0) {
@@ -295,8 +297,8 @@ void SpeedDialog::frame_rate_update() {
}
// analyze audio clips
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
if (c->track() >= 0) {
long new_clip_len = (qIsNaN(old_pc_val) || qIsNaN(pc_val)) ? c->length() : ((c->length() * c->speed().value) / pc_val);
@@ -311,7 +313,7 @@ void SpeedDialog::frame_rate_update() {
duration->set_value((len_val == -1) ? qSNaN() : len_val, false);
}
void set_speed(ComboAction* ca, ClipPtr c, double speed, bool ripple, long& ep, long& lr) {
void set_speed(ComboAction* ca, Clip* 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();
@@ -330,7 +332,7 @@ void set_speed(ComboAction* ca, ClipPtr c, double speed, bool ripple, long& ep,
}
ep = qMin(ep, c->timeline_out());
lr = qMax(lr, proposed_out - c->timeline_out());
move_clip(ca, c, c->timeline_in(), proposed_out, qRound(c->clip_in() * multiplier), c->track());
c->move(ca, c->timeline_in(), proposed_out, qRound(c->clip_in() * multiplier), c->track());
c->refactor_frame_rate(ca, multiplier, false);
@@ -358,8 +360,8 @@ void SpeedDialog::accept() {
long earliest_point = LONG_MAX;
long longest_ripple = LONG_MIN;
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
// make sure the clip is closed while we're making changes
if (c->IsOpen()) {
@@ -376,7 +378,7 @@ void SpeedDialog::accept() {
// set reverse setting if the user made a selection
if (reverse->checkState() != Qt::PartiallyChecked && c->reversed() != reverse->isChecked()) {
long new_clip_in = (c->media_length() - (c->length() + c->clip_in()));
move_clip(ca, c, c->timeline_in(), c->timeline_out(), new_clip_in, c->track());
c->move(ca, c->timeline_in(), c->timeline_out(), new_clip_in, c->track());
c->set_clip_in(new_clip_in);
reversed_action->AddSetting(c, reverse->isChecked());
}
@@ -386,8 +388,8 @@ void SpeedDialog::accept() {
if (!qIsNaN(percent->value())) {
// if we have a percentage value, use that on all the clips
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
set_speed(ca, c, percent->value(), ripple->isChecked(), earliest_point, longest_ripple);
}
@@ -395,15 +397,13 @@ void SpeedDialog::accept() {
// if the user changed the speed by changing the frame rate,
bool can_change_all = true;
double cached_speed;
double cached_speed = clips_.first()->speed().value;
double cached_fr = qSNaN();
// see if we can use the frame rate to change all the speeds
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
if (i == 0) {
cached_speed = c->speed().value;
} else if (!qFuzzyCompare(cached_speed, c->speed().value)) {
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
if (i > 0 && !qFuzzyCompare(cached_speed, c->speed().value)) {
can_change_all = false;
}
if (c->track() < 0) {
@@ -417,8 +417,8 @@ void SpeedDialog::accept() {
}
// make changes
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
if (c->track() < 0) {
set_speed(ca, c, frame_rate->value() / c->media_frame_rate(), ripple->isChecked(), earliest_point, longest_ripple);
} else if (can_change_all) {
@@ -427,14 +427,14 @@ void SpeedDialog::accept() {
}
} else if (!qIsNaN(duration->value())) {
// simply set duration
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
for (int i=0;i<clips_.size();i++) {
Clip* c = clips_.at(i);
set_speed(ca, c, (c->length() * c->speed().value) / duration->value(), ripple->isChecked(), earliest_point, longest_ripple);
}
}
if (ripple->isChecked()) {
ripple_clips(ca, clips.at(0)->sequence, earliest_point, longest_ripple);
ripple_clips(ca, clips_.at(0)->sequence, earliest_point, longest_ripple);
}
sel_command->new_data = olive::ActiveSequence->selections;
dialogs/speeddialog.h
+20 -19
View File
@@ -29,31 +29,32 @@
class SpeedDialog : public QDialog
{
Q_OBJECT
Q_OBJECT
public:
SpeedDialog(QWidget* parent = 0);
QVector<ClipPtr> clips;
SpeedDialog(QWidget* parent, QVector<Clip*> clips);
void run();
void run();
private slots:
void percent_update();
void duration_update();
void frame_rate_update();
void accept();
void percent_update();
void duration_update();
void frame_rate_update();
void accept();
private:
LabelSlider* percent;
LabelSlider* duration;
LabelSlider* frame_rate;
QVector<Clip*> clips_;
QCheckBox* reverse;
QCheckBox* maintain_pitch;
QCheckBox* ripple;
LabelSlider* percent;
LabelSlider* duration;
LabelSlider* frame_rate;
double default_frame_rate;
double current_frame_rate;
double current_percent;
long default_length;
long current_length;
QCheckBox* reverse;
QCheckBox* maintain_pitch;
QCheckBox* ripple;
double default_frame_rate;
double current_frame_rate;
double current_percent;
long default_length;
long current_length;
};
#endif // SPEEDDIALOG_H
effects/internal/audionoiseeffect.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include <QDateTime>
#include <QtMath>
AudioNoiseEffect::AudioNoiseEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
AudioNoiseEffect::AudioNoiseEffect(Clip* 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);
effects/internal/audionoiseeffect.h
+1 -1
View File
@@ -26,7 +26,7 @@
class AudioNoiseEffect : public Effect {
Q_OBJECT
public:
AudioNoiseEffect(ClipPtr c, const EffectMeta* em);
AudioNoiseEffect(Clip* c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* amount_val;
effects/internal/cornerpineffect.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include "project/clip.h"
#include "debug.h"
CornerPinEffect::CornerPinEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
CornerPinEffect::CornerPinEffect(Clip* c, const EffectMeta *em) : Effect(c, em) {
enable_coords = true;
enable_shader = true;
effects/internal/cornerpineffect.h
+1 -1
View File
@@ -26,7 +26,7 @@
class CornerPinEffect : public Effect {
Q_OBJECT
public:
CornerPinEffect(ClipPtr c, const EffectMeta* em);
CornerPinEffect(Clip* 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);
effects/internal/crossdissolvetransition.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <QOpenGLFunctions>
CrossDissolveTransition::CrossDissolveTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {
CrossDissolveTransition::CrossDissolveTransition(Clip* c, Clip* s, const EffectMeta* em) : Transition(c, s, em) {
enable_coords = true;
// add_row("Smooth")->add_field(EFFECT_FIELD_BOOL, "smooth");
effects/internal/crossdissolvetransition.h
+1 -1
View File
@@ -25,7 +25,7 @@
class CrossDissolveTransition : public Transition {
public:
CrossDissolveTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
CrossDissolveTransition(Clip *c, Clip *s, const EffectMeta* em);
void process_coords(double timecode, GLTextureCoords &, int data);
};
effects/internal/cubetransition.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "debug.h"
CubeTransition::CubeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {
CubeTransition::CubeTransition(Clip* c, Clip* s, const EffectMeta* em) : Transition(c, s, em) {
enable_coords = true;
}
effects/internal/cubetransition.h
+1 -1
View File
@@ -25,7 +25,7 @@
class CubeTransition : public Transition {
public:
CubeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
CubeTransition(Clip* c, Clip* s, const EffectMeta* em);
void process_coords(double timecode, GLTextureCoords &, int data);
};
effects/internal/exponentialfadetransition.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <QtMath>
ExponentialFadeTransition::ExponentialFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {}
ExponentialFadeTransition::ExponentialFadeTransition(Clip* c, Clip* 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;
effects/internal/exponentialfadetransition.h
+1 -1
View File
@@ -25,7 +25,7 @@
class ExponentialFadeTransition : public Transition {
public:
ExponentialFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
ExponentialFadeTransition(Clip* c, Clip* s, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
};
effects/internal/fillleftrighteffect.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#define FILL_TYPE_LEFT 0
#define FILL_TYPE_RIGHT 1
FillLeftRightEffect::FillLeftRightEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
FillLeftRightEffect::FillLeftRightEffect(Clip* 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);
effects/internal/fillleftrighteffect.h
+1 -1
View File
@@ -26,7 +26,7 @@
class FillLeftRightEffect : public Effect {
Q_OBJECT
public:
FillLeftRightEffect(ClipPtr c, const EffectMeta* em);
FillLeftRightEffect(Clip* 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;
effects/internal/frei0reffect.cpp
+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(ClipPtr c, const EffectMeta *em) :
Frei0rEffect::Frei0rEffect(Clip* c, const EffectMeta *em) :
Effect(c, em),
open(false)
{
effects/internal/frei0reffect.h
+1 -1
View File
@@ -35,7 +35,7 @@ typedef void (*f0rGetParamInfo)(f0r_param_info_t * info,
class Frei0rEffect : public Effect {
Q_OBJECT
public:
Frei0rEffect(ClipPtr c, const EffectMeta* em);
Frei0rEffect(Clip* c, const EffectMeta* em);
~Frei0rEffect();
virtual void process_image(double timecode, uint8_t* input, uint8_t* output, int size);
effects/internal/linearfadetransition.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "linearfadetransition.h"
LinearFadeTransition::LinearFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {}
LinearFadeTransition::LinearFadeTransition(Clip* c, Clip* 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;
effects/internal/linearfadetransition.h
+1 -1
View File
@@ -25,7 +25,7 @@
class LinearFadeTransition : public Transition {
public:
LinearFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
LinearFadeTransition(Clip* c, Clip* s, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
};
effects/internal/logarithmicfadetransition.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <QtMath>
LogarithmicFadeTransition::LogarithmicFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em) : Transition(c, s, em) {}
LogarithmicFadeTransition::LogarithmicFadeTransition(Clip* c, Clip* 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;
effects/internal/logarithmicfadetransition.h
+1 -1
View File
@@ -25,7 +25,7 @@
class LogarithmicFadeTransition : public Transition {
public:
LogarithmicFadeTransition(ClipPtr c, ClipPtr s, const EffectMeta* em);
LogarithmicFadeTransition(Clip* c, Clip* s, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
};
effects/internal/paneffect.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include "ui/labelslider.h"
#include "ui/collapsiblewidget.h"
PanEffect::PanEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
PanEffect::PanEffect(Clip* 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);
effects/internal/paneffect.h
+1 -1
View File
@@ -26,7 +26,7 @@
class PanEffect : public Effect {
Q_OBJECT
public:
PanEffect(ClipPtr c, const EffectMeta* em);
PanEffect(Clip* c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* pan_val;
effects/internal/shakeeffect.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include "debug.h"
ShakeEffect::ShakeEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
ShakeEffect::ShakeEffect(Clip* c, const EffectMeta *em) : Effect(c, em) {
enable_coords = true;
EffectRow* intensity_row = add_row(tr("Intensity"));
effects/internal/shakeeffect.h
+1 -1
View File
@@ -28,7 +28,7 @@
class ShakeEffect : public Effect {
Q_OBJECT
public:
ShakeEffect(ClipPtr c, const EffectMeta* em);
ShakeEffect(Clip* c, const EffectMeta* em);
void process_coords(double timecode, GLTextureCoords& coords, int data);
EffectField* intensity_val;
effects/internal/solideffect.cpp
+1 -1
View File
@@ -38,7 +38,7 @@
#define SMPTE_STRIP_COUNT 3
#define SMPTE_LOWER_BARS 4
SolidEffect::SolidEffect(ClipPtr c, const EffectMeta* em) : Effect(c, em) {
SolidEffect::SolidEffect(Clip* c, const EffectMeta* em) : Effect(c, em) {
enable_superimpose = true;
solid_type = add_row(tr("Type"))->add_field(EFFECT_FIELD_COMBO, "type");
effects/internal/solideffect.h
+1 -1
View File
@@ -28,7 +28,7 @@
class SolidEffect : public Effect {
Q_OBJECT
public:
SolidEffect(ClipPtr c, const EffectMeta *em);
SolidEffect(Clip* c, const EffectMeta *em);
void redraw(double timecode);
private slots:
void ui_update(int);
effects/internal/texteffect.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
#include "io/config.h"
#include "mainwindow.h"
TextEffect::TextEffect(ClipPtr c, const EffectMeta* em) :
TextEffect::TextEffect(Clip* c, const EffectMeta* em) :
Effect(c, em)
{
enable_superimpose = true;
effects/internal/texteffect.h
+1 -1
View File
@@ -29,7 +29,7 @@
class TextEffect : public Effect {
Q_OBJECT
public:
TextEffect(ClipPtr c, const EffectMeta *em);
TextEffect(Clip* c, const EffectMeta *em);
void redraw(double timecode);
EffectField* text_val;
effects/internal/timecodeeffect.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
#include "ui/fontcombobox.h"
#include "io/config.h"
TimecodeEffect::TimecodeEffect(ClipPtr c, const EffectMeta* em) :
TimecodeEffect::TimecodeEffect(Clip* c, const EffectMeta* em) :
Effect(c, em)
{
enable_always_update = true;
effects/internal/timecodeeffect.h
+1 -1
View File
@@ -29,7 +29,7 @@
class TimecodeEffect : public Effect {
Q_OBJECT
public:
TimecodeEffect(ClipPtr c, const EffectMeta *em);
TimecodeEffect(Clip* c, const EffectMeta *em);
void redraw(double timecode);
EffectField * scale_val;
EffectField * color_val;
effects/internal/toneeffect.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include "project/sequence.h"
#include "debug.h"
ToneEffect::ToneEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em), sinX(INT_MIN) {
ToneEffect::ToneEffect(Clip* 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);
effects/internal/toneeffect.h
+1 -1
View File
@@ -26,7 +26,7 @@
class ToneEffect : public Effect {
Q_OBJECT
public:
ToneEffect(ClipPtr c, const EffectMeta* em);
ToneEffect(Clip* c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* type_val;
effects/internal/transformeffect.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
#include "panels/viewer.h"
#include "ui/viewerwidget.h"
TransformEffect::TransformEffect(ClipPtr c, const EffectMeta* em) : Effect(c, em) {
TransformEffect::TransformEffect(Clip* c, const EffectMeta* em) : Effect(c, em) {
enable_coords = true;
EffectRow* position_row = add_row(tr("Position"));
effects/internal/transformeffect.h
+1 -1
View File
@@ -26,7 +26,7 @@
class TransformEffect : public Effect {
Q_OBJECT
public:
TransformEffect(ClipPtr c, const EffectMeta* em);
TransformEffect(Clip* c, const EffectMeta* em);
void refresh();
void process_coords(double timecode, GLTextureCoords& coords, int data);
effects/internal/voideffect.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
#include "ui/collapsiblewidget.h"
#include "debug.h"
VoidEffect::VoidEffect(ClipPtr c, const QString& n) : Effect(c, nullptr) {
VoidEffect::VoidEffect(Clip* c, const QString& n) : Effect(c, nullptr) {
name = n;
QString display_name;
if (n.isEmpty()) {
@@ -43,7 +43,7 @@ VoidEffect::VoidEffect(ClipPtr c, const QString& n) : Effect(c, nullptr) {
meta = &void_meta;
}
EffectPtr VoidEffect::copy(ClipPtr c) {
EffectPtr VoidEffect::copy(Clip* c) {
EffectPtr copy(new VoidEffect(c, name));
copy->set_enabled(is_enabled());
copy_field_keyframes(copy);
effects/internal/voideffect.h
+2 -2
View File
@@ -32,9 +32,9 @@
class VoidEffect : public Effect {
Q_OBJECT
public:
VoidEffect(ClipPtr c, const QString& n);
VoidEffect(Clip* c, const QString& n);
virtual EffectPtr copy(ClipPtr c) override;
virtual EffectPtr copy(Clip* c) override;
virtual void load(QXmlStreamReader &stream) override;
virtual void save(QXmlStreamWriter &stream) override;
private:
effects/internal/volumeeffect.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include "ui/labelslider.h"
#include "ui/collapsiblewidget.h"
VolumeEffect::VolumeEffect(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
VolumeEffect::VolumeEffect(Clip* c, const EffectMeta *em) : Effect(c, em) {
EffectRow* volume_row = add_row(tr("Volume"));
volume_val = volume_row->add_field(EFFECT_FIELD_DOUBLE, "volume");
effects/internal/volumeeffect.h
+1 -1
View File
@@ -26,7 +26,7 @@
class VolumeEffect : public Effect {
Q_OBJECT
public:
VolumeEffect(ClipPtr c, const EffectMeta* em);
VolumeEffect(Clip* c, const EffectMeta* em);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* volume_val;
effects/internal/vsthost.cpp
+1 -1
View File
@@ -256,7 +256,7 @@ void VSTHost::processAudio(long numFrames) {
plugin->processReplacing(plugin, inputs, outputs, numFrames);
}
VSTHost::VSTHost(ClipPtr c, const EffectMeta *em) : Effect(c, em) {
VSTHost::VSTHost(Clip* c, const EffectMeta *em) : Effect(c, em) {
plugin = nullptr;
inputs = new float* [CHANNEL_COUNT];
effects/internal/vsthost.h
+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(ClipPtr c, const EffectMeta* em);
VSTHost(Clip* c, const EffectMeta* em);
~VSTHost();
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
io/loadthread.cpp
+11 -7
View File
@@ -41,11 +41,14 @@ LoadThread::LoadThread(bool a) : autorecovery(a), cancelled(false) {
connect(this, SIGNAL(finished()), this, SLOT(deleteLater()));
connect(this, SIGNAL(success()), this, SLOT(success_func()));
connect(this, SIGNAL(error()), this, SLOT(error_func()));
connect(this, SIGNAL(start_create_effect_ui(QXmlStreamReader*, ClipPtr, int, const QString*, const EffectMeta*, long, bool)), this, SLOT(create_effect_ui(QXmlStreamReader*, ClipPtr, int, const QString*, const EffectMeta*, long, bool)));
connect(this,
SIGNAL(start_create_effect_ui(QXmlStreamReader*, Clip*, int, const QString*, const EffectMeta*, long, bool)),
this,
SLOT(create_effect_ui(QXmlStreamReader*, Clip*, int, const QString*, const EffectMeta*, long, bool)));
connect(this, SIGNAL(start_question(const QString&, const QString &, int)), this, SLOT(question_func(const QString &, const QString &, int)));
}
void LoadThread::load_effect(QXmlStreamReader& stream, ClipPtr c) {
void LoadThread::load_effect(QXmlStreamReader& stream, Clip* c) {
QString tag = stream.name().toString();
// variables to store effect metadata in
@@ -68,7 +71,7 @@ void LoadThread::load_effect(QXmlStreamReader& stream, ClipPtr c) {
} else if (attr.name() == "shared") {
// if a transition has this tag, it's sharing a transition with another clip so we don't have to do any processing
ClipPtr sharing_clip = c->sequence->clips.at(attr.value().toInt());
Clip* sharing_clip = c->sequence->clips.at(attr.value().toInt()).get();
if (tag == "opening") {
c->opening_transition = (sharing_clip->closing_transition);
@@ -376,7 +379,8 @@ bool LoadThread::load_worker(QFile& f, QXmlStreamReader& stream, int type) {
} else if (stream.name() == "clip" && stream.isStartElement()) {
int media_type = -1;
int media_id, stream_id;
ClipPtr c(new Clip(s));
ClipPtr c = std::make_shared<Clip>(s);
QColor clip_color;
ClipSpeed speed_info = c->speed();
@@ -465,7 +469,7 @@ bool LoadThread::load_worker(QFile& f, QXmlStreamReader& stream, int type) {
&& (stream.name() == "effect"
|| stream.name() == "opening"
|| stream.name() == "closing")) {
load_effect(stream, c);
load_effect(stream, c.get());
} else if (stream.name() == "marker" && stream.isStartElement()) {
Marker m;
for (int j=0;j<stream.attributes().size();j++) {
@@ -490,7 +494,7 @@ bool LoadThread::load_worker(QFile& f, QXmlStreamReader& stream, int type) {
// correct links, clip IDs, transitions
for (int i=0;i<s->clips.size();i++) {
// correct links
ClipPtr correct_clip = s->clips.at(i);
Clip* correct_clip = s->clips.at(i).get();
for (int j=0;j<correct_clip->linked.size();j++) {
bool found = false;
for (int k=0;k<s->clips.size();k++) {
@@ -727,7 +731,7 @@ void LoadThread::success_func() {
void LoadThread::create_effect_ui(
QXmlStreamReader* stream,
ClipPtr c,
Clip* c,
int type,
const QString* effect_name,
const EffectMeta* meta,
io/loadthread.h
+15 -3
View File
@@ -41,18 +41,30 @@ signals:
void start_question(const QString &title, const QString &text, int buttons);
void success();
void error();
void start_create_effect_ui(QXmlStreamReader* stream, ClipPtr c, int type, const QString *effect_name, const EffectMeta* meta, long effect_length, bool effect_enabled);
void start_create_effect_ui(QXmlStreamReader* stream,
Clip* c,
int type,
const QString *effect_name,
const EffectMeta* meta,
long effect_length,
bool effect_enabled);
void report_progress(int p);
private slots:
void question_func(const QString &title, const QString &text, int buttons);
void error_func();
void success_func();
void create_effect_ui(QXmlStreamReader* stream, ClipPtr c, int type, const QString *effect_name, const EffectMeta* meta, long effect_length, bool effect_enabled);
void create_effect_ui(QXmlStreamReader* stream,
Clip* c,
int type,
const QString *effect_name,
const EffectMeta* meta,
long effect_length,
bool effect_enabled);
private:
bool autorecovery;
bool load_worker(QFile& f, QXmlStreamReader& stream, int type);
void load_effect(QXmlStreamReader& stream, ClipPtr c);
void load_effect(QXmlStreamReader& stream, Clip* c);
void read_next(QXmlStreamReader& stream);
void read_next_start_element(QXmlStreamReader& stream);
main.cpp
+4
View File
@@ -25,6 +25,7 @@
#include "oliveglobal.h"
#include "ui/mediaiconservice.h"
#include "panels/timeline.h"
#include "io/config.h"
@@ -126,6 +127,9 @@ int main(int argc, char *argv[]) {
MainWindow w(nullptr);
// multiply track height constants by the current DPI scale
olive::timeline::MultiplyTrackSizesByDPI();
// connect main window's first paint to global's init finished function
QObject::connect(&w, SIGNAL(finished_first_paint()), olive::Global.get(), SLOT(finished_initialize()));
olive.pro
+4 -2
View File
@@ -158,7 +158,8 @@ SOURCES += \
rendering/renderthread.cpp \
rendering/cacher.cpp \
rendering/clipqueue.cpp \
rendering/audio.cpp
rendering/audio.cpp \
dialogs/clippropertiesdialog.cpp
HEADERS += \
mainwindow.h \
@@ -268,7 +269,8 @@ HEADERS += \
rendering/renderthread.h \
rendering/clipqueue.h \
rendering/cacher.h \
rendering/audio.h
rendering/audio.h \
dialogs/clippropertiesdialog.h
FORMS +=
oliveglobal.cpp
+10 -4
View File
@@ -357,14 +357,20 @@ void OliveGlobal::open_debug_log() {
void OliveGlobal::open_speed_dialog() {
if (olive::ActiveSequence != nullptr) {
SpeedDialog s(olive::MainWindow);
QVector<Clip*> selected_clips;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
s.clips.append(c);
selected_clips.append(c);
}
}
if (s.clips.size() > 0) s.run();
if (selected_clips.size() > 0) {
SpeedDialog s(olive::MainWindow, selected_clips);
s.exec();
}
}
}
panels/effectcontrols.cpp
+3 -3
View File
@@ -100,7 +100,7 @@ void EffectControls::set_zoom(bool in) {
void EffectControls::menu_select(QAction* q) {
ComboAction* ca = new ComboAction();
for (int i=0;i<selected_clips.size();i++) {
const ClipPtr& c = olive::ActiveSequence->clips.at(selected_clips.at(i));
Clip* c = olive::ActiveSequence->clips.at(selected_clips.at(i)).get();
if ((c->track() < 0) == (effect_menu_subtype == EFFECT_TYPE_VIDEO)) {
const EffectMeta* meta = reinterpret_cast<const EffectMeta*>(q->data().value<quintptr>());
if (effect_menu_type == EFFECT_TYPE_TRANSITION) {
@@ -148,7 +148,7 @@ void EffectControls::copy(bool del) {
ComboAction* ca = new ComboAction();
EffectDeleteCommand* del_com = (del) ? new EffectDeleteCommand() : nullptr;
for (int i=0;i<selected_clips.size();i++) {
const ClipPtr& c = olive::ActiveSequence->clips.at(selected_clips.at(i));
Clip* c = olive::ActiveSequence->clips.at(selected_clips.at(i)).get();
for (int j=0;j<c->effects.size();j++) {
EffectPtr effect = c->effects.at(j);
if (effect->container->selected) {
@@ -566,7 +566,7 @@ void EffectControls::delete_effects() {
if (mode == kTransitionNone) {
EffectDeleteCommand* command = new EffectDeleteCommand();
for (int i=0;i<selected_clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(selected_clips.at(i));
Clip* c = olive::ActiveSequence->clips.at(selected_clips.at(i)).get();
for (int j=0;j<c->effects.size();j++) {
EffectPtr effect = c->effects.at(j);
if (effect->container->selected) {
panels/panels.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ void update_effect_controls() {
int mode = kTransitionNone;
if (olive::ActiveSequence != nullptr) {
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr clip = olive::ActiveSequence->clips.at(i);
Clip* clip = olive::ActiveSequence->clips.at(i).get();
if (clip != nullptr) {
for (int j=0;j<olive::ActiveSequence->selections.size();j++) {
const Selection& s = olive::ActiveSequence->selections.at(j);
panels/timeline.cpp
+36 -53
View File
@@ -54,6 +54,10 @@
#include <QSplitter>
#include <QStatusBar>
int olive::timeline::kTrackDefaultHeight = 40;
int olive::timeline::kTrackMinHeight = 30;
int olive::timeline::kTrackHeightIncrement = 10;
Timeline::Timeline(QWidget *parent) :
Panel(parent),
cursor_frame(0),
@@ -301,7 +305,7 @@ void Timeline::add_clips_from_ghosts(ComboAction* ca, SequencePtr s) {
earliest_point = qMin(earliest_point, g.in);
ClipPtr c = ClipPtr(new Clip(s));
ClipPtr c = std::make_shared<Clip>(s);
c->set_media(g.media, g.media_stream);
c->set_timeline_in(g.in);
c->set_timeline_out(g.out);
@@ -345,11 +349,11 @@ void Timeline::add_clips_from_ghosts(ComboAction* ca, SequencePtr s) {
if (olive::CurrentConfig.add_default_effects_to_clips) {
if (c->track() < 0) {
// add default video effects
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TRANSFORM, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_TRANSFORM, EFFECT_TYPE_EFFECT)));
} else {
// add default audio effects
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_VOLUME, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_PAN, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_VOLUME, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_PAN, EFFECT_TYPE_EFFECT)));
}
}
}
@@ -366,7 +370,7 @@ void Timeline::add_transition() {
bool adding = false;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
int transition_to_add = (c->track() < 0) ? TRANSITION_INTERNAL_CROSSDISSOLVE : TRANSITION_INTERNAL_LINEARFADE;
if (c->opening_transition == nullptr) {
@@ -404,7 +408,7 @@ void Timeline::nest() {
// get selected clips
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
selected_clips.append(i);
earliest_point = qMin(c->timeline_in(), earliest_point);
@@ -658,7 +662,7 @@ void Timeline::toggle_enable_on_selected_clips() {
bool push_undo = false;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
set_action->AddSetting(c, !c->enabled());
push_undo = true;
@@ -824,7 +828,7 @@ void Timeline::DecreaseTrackHeight() {
repaint_timeline();
}
bool is_clip_selected(ClipPtr clip, bool containing) {
bool is_clip_selected(Clip *clip, bool containing) {
for (int i=0;i<clip->sequence->selections.size();i++) {
const Selection& s = clip->sequence->selections.at(i);
if (clip->track() == s.track && ((clip->timeline_in() >= s.in && clip->timeline_out() <= s.out && containing) ||
@@ -845,7 +849,7 @@ ClipPtr Timeline::split_clip(ComboAction* ca, bool transitions, int p, long fram
}
ClipPtr Timeline::split_clip(ComboAction* ca, bool transitions, int p, long frame, long post_in) {
ClipPtr pre = olive::ActiveSequence->clips.at(p);
Clip* pre = olive::ActiveSequence->clips.at(p).get();
if (pre != nullptr) {
if (pre->timeline_in() < frame && pre->timeline_out() > frame) {
@@ -858,7 +862,7 @@ ClipPtr Timeline::split_clip(ComboAction* ca, bool transitions, int p, long fram
post->set_timeline_in(post_in);
post->set_clip_in(pre->clip_in() + (post->timeline_in() - pre->timeline_in()));
move_clip(ca, pre, pre->timeline_in(), frame, pre->clip_in(), pre->track(), false);
pre->move(ca, pre->timeline_in(), frame, pre->clip_in(), pre->track(), false);
if (transitions) {
@@ -925,7 +929,7 @@ bool Timeline::split_clip_and_relink(ComboAction *ca, int clip, long frame, bool
split_cache.append(clip);
ClipPtr c = olive::ActiveSequence->clips.at(clip);
Clip* c = olive::ActiveSequence->clips.at(clip).get();
if (c != nullptr) {
QVector<int> pre_clips;
QVector<ClipPtr> post_clips;
@@ -947,7 +951,7 @@ bool Timeline::split_clip_and_relink(ComboAction *ca, int clip, long frame, bool
for (int i=0;i<c->linked.size();i++) {
int l = c->linked.at(i);
if (!split_cache.contains(l)) {
ClipPtr link = olive::ActiveSequence->clips.at(l);
Clip* link = olive::ActiveSequence->clips.at(l).get();
if ((original_clip_is_selected && is_clip_selected(link, true)) || !original_clip_is_selected) {
split_cache.append(l);
ClipPtr s = split_clip(ca, true, l, frame);
@@ -998,7 +1002,7 @@ void Timeline::clean_up_selections(QVector<Selection>& areas) {
}
}
bool selection_contains_transition(const Selection& s, ClipPtr c, int type) {
bool selection_contains_transition(const Selection& s, Clip* c, int type) {
if (type == kTransitionOpening) {
return c->opening_transition != nullptr
&& s.out == c->timeline_in() + c->opening_transition->get_true_length()
@@ -1022,7 +1026,7 @@ void Timeline::delete_areas_and_relink(ComboAction* ca, QVector<Selection>& area
for (int i=0;i<areas.size();i++) {
const Selection& s = areas.at(i);
for (int j=0;j<olive::ActiveSequence->clips.size();j++) {
ClipPtr c = olive::ActiveSequence->clips.at(j);
Clip* c = olive::ActiveSequence->clips.at(j).get();
if (c != nullptr && c->track() == s.track && !c->undeletable) {
if (selection_contains_transition(s, c, kTransitionOpening)) {
// delete opening transition
@@ -1043,7 +1047,7 @@ void Timeline::delete_areas_and_relink(ComboAction* ca, QVector<Selection>& area
post_clips.append(post);
} else if (c->timeline_in() < s.in && c->timeline_out() > s.in) {
// only out point is in deletion area
move_clip(ca, c, c->timeline_in(), s.in, c->clip_in(), c->track());
c->move(ca, c->timeline_in(), s.in, c->clip_in(), c->track());
if (c->closing_transition != nullptr) {
if (s.in < c->timeline_out() - c->closing_transition->get_true_length()) {
@@ -1054,7 +1058,7 @@ void Timeline::delete_areas_and_relink(ComboAction* ca, QVector<Selection>& area
}
} else if (c->timeline_in() < s.out && c->timeline_out() > s.out) {
// only in point is in deletion area
move_clip(ca, c, s.out, c->timeline_out(), c->clip_in() + (s.out - c->timeline_in()), c->track());
c->move(ca, s.out, c->timeline_out(), c->clip_in() + (s.out - c->timeline_in()), c->track());
if (c->opening_transition != nullptr) {
if (s.out > c->timeline_in() + c->opening_transition->get_true_length()) {
@@ -1236,7 +1240,7 @@ void Timeline::paste(bool insert) {
bool ask_conflict = true;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
for (int j=0;j<clipboard.size();j++) {
EffectPtr e = std::static_pointer_cast<Effect>(clipboard.at(j));
@@ -1405,7 +1409,9 @@ void Timeline::edit_to_point_internal(bool in, bool ripple) {
update_ui(true);
if (seek != olive::ActiveSequence->playhead && ripple) panel_sequence_viewer->seek(seek);
if (seek != olive::ActiveSequence->playhead && ripple) {
panel_sequence_viewer->seek(seek);
}
} else {
delete ca;
}
@@ -1484,7 +1490,7 @@ void Timeline::split_at_playhead() {
QVector<int> pre_clips;
QVector<ClipPtr> post_clips;
for (int j=0;j<olive::ActiveSequence->clips.size();j++) {
ClipPtr clip = olive::ActiveSequence->clips.at(j);
Clip* clip = olive::ActiveSequence->clips.at(j).get();
if (clip != nullptr && is_clip_selected(clip, true)) {
ClipPtr s = split_clip(ca, true, j, olive::ActiveSequence->playhead);
if (s != nullptr) {
@@ -1626,7 +1632,7 @@ void Timeline::set_marker() {
bool clip_mode = false;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr
&& is_clip_selected(c, true)) {
@@ -1681,7 +1687,7 @@ void Timeline::toggle_links() {
LinkCommand* command = new LinkCommand();
command->s = olive::ActiveSequence;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
if (!command->clips.contains(i)) command->clips.append(i);
@@ -2034,38 +2040,6 @@ void Timeline::setup_ui() {
setWidget(dockWidgetContents);
}
void move_clip(ComboAction* ca, ClipPtr c, long iin, long iout, long iclip_in, int itrack, bool verify_transitions, bool relative) {
ca->append(new MoveClipAction(c, iin, iout, iclip_in, itrack, relative));
if (verify_transitions) {
// if this is a shared transition, and the corresponding clip will be moved away somehow
if (c->opening_transition != nullptr
&& c->opening_transition->secondary_clip != nullptr
&& c->opening_transition->secondary_clip->timeline_out() != iin) {
// separate transition
ca->append(new SetPointer(reinterpret_cast<void**>(&c->opening_transition->secondary_clip), nullptr));
ca->append(new AddTransitionCommand(nullptr,
c->opening_transition->secondary_clip,
c->opening_transition,
nullptr,
0));
}
if (c->closing_transition != nullptr
&& c->closing_transition->secondary_clip != nullptr
&& c->closing_transition->parent_clip->timeline_in() != iout) {
// separate transition
ca->append(new SetPointer(reinterpret_cast<void**>(&c->closing_transition->secondary_clip), nullptr));
ca->append(new AddTransitionCommand(nullptr,
c,
c->closing_transition,
nullptr,
0));
}
}
}
void Timeline::set_tool() {
QPushButton* button = static_cast<QPushButton*>(sender());
decheck_tool_buttons(button);
@@ -2083,3 +2057,12 @@ void Timeline::set_tool() {
timeline_area->setCursor(Qt::ArrowCursor);
}
}
void olive::timeline::MultiplyTrackSizesByDPI()
{
qDebug() << QApplication::desktop()->devicePixelRatio();
kTrackDefaultHeight *= QApplication::desktop()->devicePixelRatio();
kTrackMinHeight *= QApplication::desktop()->devicePixelRatio();
kTrackHeightIncrement *= QApplication::desktop()->devicePixelRatio();
}
panels/timeline.h
+23 -3
View File
@@ -50,11 +50,31 @@ enum TrimType {
TRIM_OUT
};
bool is_clip_selected(ClipPtr clip, bool containing);
namespace olive {
namespace timeline {
const int kGhostThickness = 2;
const int kClipTextPadding = 3;
/**
* @brief Set default track sizes
*
* Olive has a few default constants used for adjusting track heights in the Timeline. For HiDPI, it makes
* sense to multiply these by the current DPI scale. It uses a variable from QApplication to do this multiplication,
* which means the QApplication instance needs to be instantiated before these are calculated. Therefore, call this
* function ONCE after QApplication is created to multiply the track heights correctly.
*/
void MultiplyTrackSizesByDPI();
extern int kTrackDefaultHeight;
extern int kTrackMinHeight;
extern int kTrackHeightIncrement;
}
}
bool is_clip_selected(Clip* clip, bool containing);
int getScreenPointFromFrame(double zoom, long frame);
long getFrameFromScreenPoint(double zoom, int x);
bool selection_contains_transition(const Selection& s, ClipPtr c, int type);
void move_clip(ComboAction *ca, ClipPtr c, long iin, long iout, long iclip_in, int itrack, bool verify_transitions = true, bool relative = false);
bool selection_contains_transition(const Selection& s, Clip *c, int type);
void ripple_clips(ComboAction *ca, SequencePtr s, long point, long length, const QVector<int>& ignore = QVector<int>());
struct Ghost {
panels/viewer.cpp
+3 -3
View File
@@ -448,7 +448,7 @@ void Viewer::pause() {
panel_project->process_file_list(file_list);
// add it to the sequence
ClipPtr c = ClipPtr(new Clip(seq));
ClipPtr c = std::make_shared<Clip>(seq);
Media* m = panel_project->last_imported_media.at(0);
FootagePtr f = m->to_footage();
@@ -745,7 +745,7 @@ void Viewer::set_media(Media* m) {
seq->height = video_stream.video_height;
if (video_stream.video_frame_rate > 0 && !video_stream.infinite_length) seq->frame_rate = video_stream.video_frame_rate * footage->speed;
ClipPtr c = ClipPtr(new Clip(seq));
ClipPtr c = std::make_shared<Clip>(seq);
c->set_media(media, video_stream.file_index);
c->set_timeline_in(0);
c->set_timeline_out(footage->get_length_in_frames(seq->frame_rate));
@@ -765,7 +765,7 @@ void Viewer::set_media(Media* m) {
const FootageStream& audio_stream = footage->audio_tracks.at(0);
seq->audio_frequency = audio_stream.audio_frequency;
ClipPtr c = ClipPtr(new Clip(seq));
ClipPtr c = std::make_shared<Clip>(seq);
c->set_media(media, audio_stream.file_index);
c->set_timeline_in(0);
c->set_timeline_out(footage->get_length_in_frames(seq->frame_rate));
project/clip.cpp
+43 -10
View File
@@ -40,7 +40,7 @@ const int kRGBAComponentCount = 4;
Clip::Clip(SequencePtr s) :
sequence(s),
cacher(ClipPtr(this))
cacher(this)
{
enabled_ = true;
clip_in_ = 0;
@@ -63,7 +63,7 @@ Clip::Clip(SequencePtr s) :
}
ClipPtr Clip::copy(SequencePtr s) {
ClipPtr copy(new Clip(s));
ClipPtr copy = std::make_shared<Clip>(s);
copy->set_enabled(enabled());
copy->set_name(name());
@@ -78,7 +78,7 @@ ClipPtr Clip::copy(SequencePtr s) {
copy->set_reversed(reversed());
for (int i=0;i<effects.size();i++) {
copy->effects.append(effects.at(i)->copy(copy));
copy->effects.append(effects.at(i)->copy(copy.get()));
}
copy->set_cached_frame_rate((this->sequence == nullptr) ? cached_frame_rate() : this->sequence->frame_rate);
@@ -153,6 +153,39 @@ void Clip::set_enabled(bool e)
enabled_ = e;
}
void Clip::move(ComboAction* ca, long iin, long iout, long iclip_in, int itrack, bool verify_transitions, bool relative)
{
ca->append(new MoveClipAction(this, iin, iout, iclip_in, itrack, relative));
if (verify_transitions) {
// if this is a shared transition, and the corresponding clip will be moved away somehow
if (opening_transition != nullptr
&& opening_transition->secondary_clip != nullptr
&& opening_transition->secondary_clip->timeline_out() != iin) {
// separate transition
ca->append(new SetPointer(reinterpret_cast<void**>(&opening_transition->secondary_clip), nullptr));
ca->append(new AddTransitionCommand(nullptr,
opening_transition->secondary_clip,
opening_transition,
nullptr,
0));
}
if (closing_transition != nullptr
&& closing_transition->secondary_clip != nullptr
&& closing_transition->parent_clip->timeline_in() != iout) {
// separate transition
ca->append(new SetPointer(reinterpret_cast<void**>(&closing_transition->secondary_clip), nullptr));
ca->append(new AddTransitionCommand(nullptr,
this,
closing_transition,
nullptr,
0));
}
}
}
void Clip::reset() {
texture = nullptr;
}
@@ -395,11 +428,11 @@ int Clip::media_height() {
void Clip::refactor_frame_rate(ComboAction* ca, double multiplier, bool change_timeline_points) {
if (change_timeline_points) {
move_clip(ca, ClipPtr(this),
qRound(double(timeline_in_) * multiplier),
qRound(double(timeline_out_) * multiplier),
qRound(double(clip_in_) * multiplier),
track_);
this->move(ca,
qRound(double(timeline_in_) * multiplier),
qRound(double(timeline_out_) * multiplier),
qRound(double(clip_in_) * multiplier),
track_);
}
// move keyframes
@@ -485,7 +518,7 @@ bool Clip::IsOpen()
return open_;
}
void Clip::Cache(long playhead, bool scrubbing, QVector<ClipPtr>& nests, int playback_speed) {
void Clip::Cache(long playhead, bool scrubbing, QVector<Clip*>& nests, int playback_speed) {
// qint64 time = QDateTime::currentMSecsSinceEpoch();
cacher.Cache(playhead, scrubbing, nests, playback_speed);
@@ -542,7 +575,7 @@ bool Clip::Retrieve()
memcpy(data_buffer_1, frame->data[0], frame_size);
}
e->process_image(get_timecode(ClipPtr(this), cacher_frame),
e->process_image(get_timecode(this, cacher_frame),
using_db_1 ? data_buffer_1 : data_buffer_2,
using_db_1 ? data_buffer_2 : data_buffer_1,
frame_size
project/clip.h
+10 -2
View File
@@ -53,7 +53,7 @@ using ClipPtr = std::shared_ptr<Clip>;
class Sequence;
using SequencePtr = std::shared_ptr<Sequence>;
class Clip {
class Clip : public std::enable_shared_from_this<Clip> {
public:
Clip(SequencePtr s);
~Clip();
@@ -77,6 +77,14 @@ public:
bool enabled();
void set_enabled(bool e);
void move(ComboAction* ca,
long iin,
long iout,
long iclip_in,
int itrack,
bool verify_transitions = true,
bool relative = false);
long clip_in(bool with_transition = false);
void set_clip_in(long c);
@@ -126,7 +134,7 @@ public:
// playback functions
void Open();
void Cache(long playhead, bool scrubbing, QVector<ClipPtr> &nests, int playback_speed);
void Cache(long playhead, bool scrubbing, QVector<Clip*> &nests, int playback_speed);
bool Retrieve();
void Close(bool wait);
bool IsOpen();
project/comboaction.cpp
+6 -1
View File
@@ -31,5 +31,10 @@ void ComboAction::append(QUndoCommand* u) {
}
void ComboAction::appendPost(QUndoCommand* u) {
post_commands.append(u);
post_commands.append(u);
}
bool ComboAction::hasActions()
{
return commands.size() > 0;
}
project/comboaction.h
+8
View File
@@ -73,6 +73,14 @@ public:
* The PostAction to add
*/
void appendPost(QUndoCommand* u);
/**
* @brief Returns whether actions have been appended or not
*
* @return **TRUE** if actions have been appended, **FALSE** if not.
*/
bool hasActions();
private:
/**
* @brief Internal array of QUndoCommand objects
project/effect.cpp
+3 -3
View File
@@ -69,7 +69,7 @@
QVector<EffectMeta> effects;
EffectPtr create_effect(ClipPtr c, const EffectMeta* em) {
EffectPtr create_effect(Clip* c, const EffectMeta* em) {
if (em->internal >= 0 && em->internal < EFFECT_INTERNAL_COUNT) {
// must be an internal effect
switch (em->internal) {
@@ -112,7 +112,7 @@ const EffectMeta* get_internal_meta(int internal_id, int type) {
return nullptr;
}
Effect::Effect(ClipPtr c, const EffectMeta *em) :
Effect::Effect(Clip* c, const EffectMeta *em) :
parent_clip(c),
meta(em),
enable_shader(false),
@@ -854,7 +854,7 @@ void Effect::setIterations(int i) {
void Effect::process_image(double, uint8_t *, uint8_t *, int){}
EffectPtr Effect::copy(ClipPtr c) {
EffectPtr Effect::copy(Clip *c) {
EffectPtr copy = create_effect(c, meta);
copy->set_enabled(is_enabled());
copy_field_keyframes(copy);
project/effect.h
+167 -167
View File
@@ -49,114 +49,114 @@ class Effect;
using EffectPtr = std::shared_ptr<Effect>;
struct EffectMeta {
QString name;
QString category;
QString filename;
QString path;
QString tooltip;
int internal;
int type;
int subtype;
QString name;
QString category;
QString filename;
QString path;
QString tooltip;
int internal;
int type;
int subtype;
};
extern QVector<EffectMeta> effects;
double log_volume(double linear);
EffectPtr create_effect(ClipPtr c, const EffectMeta *em);
EffectPtr create_effect(Clip *c, const EffectMeta *em);
const EffectMeta* get_internal_meta(int internal_id, int type);
enum EffectType {
EFFECT_TYPE_INVALID,
EFFECT_TYPE_VIDEO,
EFFECT_TYPE_AUDIO,
EFFECT_TYPE_EFFECT,
EFFECT_TYPE_TRANSITION
EFFECT_TYPE_INVALID,
EFFECT_TYPE_VIDEO,
EFFECT_TYPE_AUDIO,
EFFECT_TYPE_EFFECT,
EFFECT_TYPE_TRANSITION
};
enum EffectKeyframeType {
EFFECT_KEYFRAME_LINEAR,
EFFECT_KEYFRAME_BEZIER,
EFFECT_KEYFRAME_HOLD
EFFECT_KEYFRAME_LINEAR,
EFFECT_KEYFRAME_BEZIER,
EFFECT_KEYFRAME_HOLD
};
enum EffectInternal {
EFFECT_INTERNAL_TRANSFORM,
EFFECT_INTERNAL_TEXT,
EFFECT_INTERNAL_SOLID,
EFFECT_INTERNAL_NOISE,
EFFECT_INTERNAL_VOLUME,
EFFECT_INTERNAL_PAN,
EFFECT_INTERNAL_TONE,
EFFECT_INTERNAL_SHAKE,
EFFECT_INTERNAL_TIMECODE,
EFFECT_INTERNAL_MASK,
EFFECT_INTERNAL_FILLLEFTRIGHT,
EFFECT_INTERNAL_VST,
EFFECT_INTERNAL_CORNERPIN,
EFFECT_INTERNAL_FREI0R,
EFFECT_INTERNAL_COUNT
EFFECT_INTERNAL_TRANSFORM,
EFFECT_INTERNAL_TEXT,
EFFECT_INTERNAL_SOLID,
EFFECT_INTERNAL_NOISE,
EFFECT_INTERNAL_VOLUME,
EFFECT_INTERNAL_PAN,
EFFECT_INTERNAL_TONE,
EFFECT_INTERNAL_SHAKE,
EFFECT_INTERNAL_TIMECODE,
EFFECT_INTERNAL_MASK,
EFFECT_INTERNAL_FILLLEFTRIGHT,
EFFECT_INTERNAL_VST,
EFFECT_INTERNAL_CORNERPIN,
EFFECT_INTERNAL_FREI0R,
EFFECT_INTERNAL_COUNT
};
enum EffectBlendMode {
BLEND_MODE_ADD,
BLEND_MODE_AVERAGE,
BLEND_MODE_COLORBURN,
BLEND_MODE_COLORDODGE,
BLEND_MODE_DARKEN,
BLEND_MODE_DIFFERENCE,
BLEND_MODE_EXCLUSION,
BLEND_MODE_GLOW,
BLEND_MODE_HARDLIGHT,
BLEND_MODE_HARDMIX,
BLEND_MODE_LIGHTEN,
BLEND_MODE_LINEARBURN,
BLEND_MODE_LINEARDODGE,
BLEND_MODE_LINEARLIGHT,
BLEND_MODE_MULTIPLY,
BLEND_MODE_NEGATION,
BLEND_MODE_NORMAL,
BLEND_MODE_OVERLAY,
BLEND_MODE_PHOENIX,
BLEND_MODE_PINLIGHT,
BLEND_MODE_REFLECT,
BLEND_MODE_SCREEN,
BLEND_MODE_SOFTLIGHT,
BLEND_MODE_SUBSTRACT,
BLEND_MODE_SUBTRACT,
BLEND_MODE_VIVIDLIGHT,
BLEND_MODE_COUNT
BLEND_MODE_ADD,
BLEND_MODE_AVERAGE,
BLEND_MODE_COLORBURN,
BLEND_MODE_COLORDODGE,
BLEND_MODE_DARKEN,
BLEND_MODE_DIFFERENCE,
BLEND_MODE_EXCLUSION,
BLEND_MODE_GLOW,
BLEND_MODE_HARDLIGHT,
BLEND_MODE_HARDMIX,
BLEND_MODE_LIGHTEN,
BLEND_MODE_LINEARBURN,
BLEND_MODE_LINEARDODGE,
BLEND_MODE_LINEARLIGHT,
BLEND_MODE_MULTIPLY,
BLEND_MODE_NEGATION,
BLEND_MODE_NORMAL,
BLEND_MODE_OVERLAY,
BLEND_MODE_PHOENIX,
BLEND_MODE_PINLIGHT,
BLEND_MODE_REFLECT,
BLEND_MODE_SCREEN,
BLEND_MODE_SOFTLIGHT,
BLEND_MODE_SUBSTRACT,
BLEND_MODE_SUBTRACT,
BLEND_MODE_VIVIDLIGHT,
BLEND_MODE_COUNT
};
struct GLTextureCoords {
int grid_size;
int grid_size;
int vertexTopLeftX;
int vertexTopLeftY;
int vertexTopLeftZ;
int vertexTopRightX;
int vertexTopRightY;
int vertexTopRightZ;
int vertexBottomLeftX;
int vertexBottomLeftY;
int vertexBottomLeftZ;
int vertexBottomRightX;
int vertexBottomRightY;
int vertexBottomRightZ;
int vertexTopLeftX;
int vertexTopLeftY;
int vertexTopLeftZ;
int vertexTopRightX;
int vertexTopRightY;
int vertexTopRightZ;
int vertexBottomLeftX;
int vertexBottomLeftY;
int vertexBottomLeftZ;
int vertexBottomRightX;
int vertexBottomRightY;
int vertexBottomRightZ;
float textureTopLeftX;
float textureTopLeftY;
float textureTopLeftQ;
float textureTopRightX;
float textureTopRightY;
float textureTopRightQ;
float textureBottomRightX;
float textureBottomRightY;
float textureBottomRightQ;
float textureBottomLeftX;
float textureBottomLeftY;
float textureBottomLeftQ;
float textureTopLeftX;
float textureTopLeftY;
float textureTopLeftQ;
float textureTopRightX;
float textureTopRightY;
float textureTopRightQ;
float textureBottomRightX;
float textureBottomRightY;
float textureBottomRightQ;
float textureBottomLeftX;
float textureBottomLeftY;
float textureBottomLeftQ;
int blendmode;
float opacity;
int blendmode;
float opacity;
};
const EffectMeta* get_meta_from_name(const QString& input);
@@ -168,114 +168,114 @@ qint16 mix_audio_sample(qint16 a, qint16 b);
#include "effectgizmo.h"
class Effect : public QObject {
Q_OBJECT
Q_OBJECT
public:
Effect(ClipPtr c, const EffectMeta* em);
~Effect();
ClipPtr parent_clip;
const EffectMeta* meta;
int id;
QString name;
CollapsibleWidget* container;
Effect(Clip *c, const EffectMeta* em);
~Effect();
Clip* parent_clip;
const EffectMeta* meta;
int id;
QString name;
CollapsibleWidget* container;
EffectRow* add_row(const QString &name, bool savable = true, bool keyframable = true);
EffectRow* row(int i);
int row_count();
EffectRow* add_row(const QString &name, bool savable = true, bool keyframable = true);
EffectRow* row(int i);
int row_count();
EffectGizmo* add_gizmo(int type);
EffectGizmo* gizmo(int i);
int gizmo_count();
EffectGizmo* add_gizmo(int type);
EffectGizmo* gizmo(int i);
int gizmo_count();
bool is_enabled();
void set_enabled(bool b);
bool is_enabled();
void set_enabled(bool b);
virtual void refresh();
virtual void refresh();
virtual EffectPtr copy(ClipPtr c);
void copy_field_keyframes(EffectPtr e);
virtual EffectPtr copy(Clip* c);
void copy_field_keyframes(EffectPtr e);
virtual void load(QXmlStreamReader& stream);
virtual void custom_load(QXmlStreamReader& stream);
virtual void save(QXmlStreamWriter& stream);
virtual void load(QXmlStreamReader& stream);
virtual void custom_load(QXmlStreamReader& stream);
virtual void save(QXmlStreamWriter& stream);
void load_from_string(const QByteArray &s);
QByteArray save_to_string();
void load_from_string(const QByteArray &s);
QByteArray save_to_string();
// glsl handling
bool is_open();
void open();
void close();
bool is_glsl_linked();
virtual void startEffect();
virtual void endEffect();
// glsl handling
bool is_open();
void open();
void close();
bool is_glsl_linked();
virtual void startEffect();
virtual void endEffect();
bool enable_shader;
bool enable_coords;
bool enable_superimpose;
bool enable_image;
bool enable_shader;
bool enable_coords;
bool enable_superimpose;
bool enable_image;
int getIterations();
void setIterations(int i);
int getIterations();
void setIterations(int i);
const char* ffmpeg_filter;
const char* ffmpeg_filter;
virtual void process_image(double timecode, uint8_t* input, uint8_t* output, int size);
virtual void process_shader(double timecode, GLTextureCoords&, int iteration);
virtual void process_coords(double timecode, GLTextureCoords& coords, int data);
virtual GLuint process_superimpose(double timecode);
virtual void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
virtual void process_image(double timecode, uint8_t* input, uint8_t* output, int size);
virtual void process_shader(double timecode, GLTextureCoords&, int iteration);
virtual void process_coords(double timecode, GLTextureCoords& coords, int data);
virtual GLuint process_superimpose(double timecode);
virtual void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
virtual void gizmo_draw(double timecode, GLTextureCoords& coords);
void gizmo_move(EffectGizmo* sender, int x_movement, int y_movement, double timecode, bool done);
void gizmo_world_to_screen();
bool are_gizmos_enabled();
virtual void gizmo_draw(double timecode, GLTextureCoords& coords);
void gizmo_move(EffectGizmo* sender, int x_movement, int y_movement, double timecode, bool done);
void gizmo_world_to_screen();
bool are_gizmos_enabled();
public slots:
void field_changed();
void field_changed();
private slots:
void show_context_menu(const QPoint&);
void delete_self();
void move_up();
void move_down();
void save_to_file();
void load_from_file();
void show_context_menu(const QPoint&);
void delete_self();
void move_up();
void move_down();
void save_to_file();
void load_from_file();
protected:
// glsl effect
QOpenGLShaderProgram* glslProgram;
QString vertPath;
QString fragPath;
// glsl effect
QOpenGLShaderProgram* glslProgram;
QString vertPath;
QString fragPath;
// superimpose effect
QImage img;
QOpenGLTexture* texture;
// superimpose effect
QImage img;
QOpenGLTexture* texture;
// enable effect to update constantly
bool enable_always_update;
// enable effect to update constantly
bool enable_always_update;
private:
// superimpose effect
QString script;
// superimpose effect
QString script;
bool isOpen;
QVector<EffectRow*> rows;
QVector<EffectGizmo*> gizmos;
QGridLayout* ui_layout;
QWidget* ui;
bool bound;
int iterations;
bool isOpen;
QVector<EffectRow*> rows;
QVector<EffectGizmo*> gizmos;
QGridLayout* ui_layout;
QWidget* ui;
bool bound;
int iterations;
// superimpose functions
virtual void redraw(double timecode);
bool valueHasChanged(double timecode);
QVector<QVariant> cachedValues;
void delete_texture();
int get_index_in_clip();
void validate_meta_path();
// superimpose functions
virtual void redraw(double timecode);
bool valueHasChanged(double timecode);
QVector<QVariant> cachedValues;
void delete_texture();
int get_index_in_clip();
void validate_meta_path();
};
class EffectInit : public QThread {
public:
EffectInit();
EffectInit();
protected:
void run();
void run();
};
#endif // EFFECT_H
project/effectrow.cpp
+3 -3
View File
@@ -116,7 +116,7 @@ void EffectRow::set_keyframe_enabled(bool enabled) {
void EffectRow::goto_previous_key() {
long key = LONG_MIN;
ClipPtr c = parent_effect->parent_clip;
Clip* c = parent_effect->parent_clip;
for (int i=0;i<fieldCount();i++) {
EffectField* f = field(i);
for (int j=0;j<f->keyframes.size();j++) {
@@ -132,7 +132,7 @@ void EffectRow::goto_previous_key() {
void EffectRow::toggle_key() {
QVector<EffectField*> key_fields;
QVector<int> key_field_index;
ClipPtr c = parent_effect->parent_clip;
Clip* c = parent_effect->parent_clip;
for (int j=0;j<fieldCount();j++) {
EffectField* f = field(j);
for (int i=0;i<f->keyframes.size();i++) {
@@ -159,7 +159,7 @@ void EffectRow::toggle_key() {
void EffectRow::goto_next_key() {
long key = LONG_MAX;
ClipPtr c = parent_effect->parent_clip;
Clip* c = parent_effect->parent_clip;
for (int i=0;i<fieldCount();i++) {
EffectField* f = field(i);
for (int j=0;j<f->keyframes.size();j++) {
project/transition.cpp
+6 -6
View File
@@ -41,7 +41,7 @@
#include <QMessageBox>
#include <QCoreApplication>
Transition::Transition(ClipPtr c, ClipPtr s, const EffectMeta* em) :
Transition::Transition(Clip *c, Clip *s, const EffectMeta* em) :
Effect(c, em), secondary_clip(s),
length(30)
{
@@ -55,7 +55,7 @@ Transition::Transition(ClipPtr c, ClipPtr s, const EffectMeta* em) :
length_ui_ele->set_frame_rate(parent_clip->sequence == nullptr ? parent_clip->cached_frame_rate() : parent_clip->sequence->frame_rate);
}
TransitionPtr Transition::copy(ClipPtr c, ClipPtr s) {
TransitionPtr Transition::copy(Clip *c, Clip *s) {
return create_transition(c, s, meta, length);
}
@@ -80,7 +80,7 @@ long Transition::get_length() {
return length;
}
ClipPtr Transition::get_opened_clip() {
Clip* Transition::get_opened_clip() {
if (parent_clip->opening_transition.get() == this) {
return parent_clip;
} else if (secondary_clip != nullptr && secondary_clip->opening_transition.get() == this) {
@@ -89,7 +89,7 @@ ClipPtr Transition::get_opened_clip() {
return nullptr;
}
ClipPtr Transition::get_closed_clip() {
Clip* Transition::get_closed_clip() {
if (parent_clip->closing_transition.get() == this) {
return parent_clip;
} else if (secondary_clip != nullptr && secondary_clip->closing_transition.get() == this) {
@@ -103,7 +103,7 @@ void Transition::set_length_from_slider() {
update_ui(false);
}
TransitionPtr get_transition_from_meta(ClipPtr c, ClipPtr s, const EffectMeta* em) {
TransitionPtr get_transition_from_meta(Clip* c, Clip* s, const EffectMeta* em) {
if (!em->filename.isEmpty()) {
// load effect from file
return TransitionPtr(new Transition(c, s, em));
@@ -126,7 +126,7 @@ TransitionPtr get_transition_from_meta(ClipPtr c, ClipPtr s, const EffectMeta* e
return nullptr;
}
TransitionPtr create_transition(ClipPtr c, ClipPtr s, const EffectMeta* em, long length) {
TransitionPtr create_transition(Clip* c, Clip* s, const EffectMeta* em, long length) {
TransitionPtr t(get_transition_from_meta(c, s, em));
if (t != nullptr) {
if (length > 0) {
project/transition.h
+7 -7
View File
@@ -41,16 +41,16 @@ enum TransitionInternal {
class Transition;
using TransitionPtr = std::shared_ptr<Transition>;
TransitionPtr get_transition_from_meta(ClipPtr c, ClipPtr s, const EffectMeta* em);
TransitionPtr get_transition_from_meta(Clip *c, Clip *s, const EffectMeta* em);
TransitionPtr create_transition(ClipPtr c, ClipPtr s, const EffectMeta* em, long length = 0);
TransitionPtr create_transition(Clip* c, Clip* s, const EffectMeta* em, long length = 0);
class Transition : public Effect {
Q_OBJECT
public:
Transition(ClipPtr c, ClipPtr s, const EffectMeta* em);
virtual TransitionPtr copy(ClipPtr c, ClipPtr s);
ClipPtr secondary_clip;
Transition(Clip* c, Clip* s, const EffectMeta* em);
virtual TransitionPtr copy(Clip* c, Clip* s);
Clip* secondary_clip;
virtual void save(QXmlStreamWriter& stream) override;
@@ -58,8 +58,8 @@ public:
long get_true_length();
long get_length();
ClipPtr get_opened_clip();
ClipPtr get_closed_clip();
Clip* get_opened_clip();
Clip* get_closed_clip();
private slots:
void set_length_from_slider();
private:
project/undo.cpp
+19 -20
View File
@@ -50,7 +50,7 @@
QUndoStack olive::UndoStack;
MoveClipAction::MoveClipAction(ClipPtr c, long iin, long iout, long iclip_in, int itrack, bool irelative) {
MoveClipAction::MoveClipAction(Clip *c, long iin, long iout, long iclip_in, int itrack, bool irelative) {
clip = c;
old_in = c->timeline_in();
@@ -192,7 +192,7 @@ void SetTimelineInOutCommand::doRedo() {
}
}
AddEffectCommand::AddEffectCommand(ClipPtr c, EffectPtr e, const EffectMeta *m, int insert_pos) {
AddEffectCommand::AddEffectCommand(Clip* c, EffectPtr e, const EffectMeta *m, int insert_pos) {
clip = c;
ref = e;
meta = m;
@@ -222,8 +222,8 @@ void AddEffectCommand::doRedo() {
done = true;
}
AddTransitionCommand::AddTransitionCommand(ClipPtr iopen,
ClipPtr iclose,
AddTransitionCommand::AddTransitionCommand(Clip* iopen,
Clip* iclose,
TransitionPtr copy,
const EffectMeta *itransition,
int ilength) {
@@ -247,8 +247,8 @@ void AddTransitionCommand::doUndo() {
void AddTransitionCommand::doRedo() {
// convert open/close clips to primary/secondary for transition object
ClipPtr primary = open_;
ClipPtr secondary = close_;
Clip* primary = open_;
Clip* secondary = close_;
if (primary == nullptr) {
primary = secondary;
secondary = nullptr;
@@ -596,7 +596,7 @@ EffectDeleteCommand::~EffectDeleteCommand() {}
void EffectDeleteCommand::doUndo() {
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
Clip* c = clips.at(i);
c->effects.insert(fx.at(i), deleted_objects.at(i));
}
panel_effect_controls->reload_clips();
@@ -607,7 +607,7 @@ void EffectDeleteCommand::doUndo() {
void EffectDeleteCommand::doRedo() {
deleted_objects.clear();
for (int i=0;i<clips.size();i++) {
ClipPtr c = clips.at(i);
Clip* c = clips.at(i);
int fx_id = fx.at(i) - i;
EffectPtr e = c->effects.at(fx_id);
e->close();
@@ -689,7 +689,7 @@ void EffectFieldUndo::doRedo() {
SetClipProperty::SetClipProperty(SetClipPropertyType type) : type_(type)
{}
void SetClipProperty::AddSetting(ClipPtr c, bool setting)
void SetClipProperty::AddSetting(Clip* c, bool setting)
{
clips_.append(c);
setting_.append(setting);
@@ -829,7 +829,7 @@ void DeleteMarkerAction::doRedo() {
sorted = true;
}
SetSpeedAction::SetSpeedAction(ClipPtr c, double speed) {
SetSpeedAction::SetSpeedAction(Clip* c, double speed) {
clip = c;
old_speed = c->speed().value;
new_speed = speed;
@@ -1005,20 +1005,19 @@ void RemoveClipsFromClipboard::doRedo() {
done = true;
}
RenameClipCommand::RenameClipCommand() {}
RenameClipCommand::RenameClipCommand(Clip *clip, QString new_name)
{
clip_ = clip;
old_name_ = clip_->name();
new_name_ = new_name;
}
void RenameClipCommand::doUndo() {
for (int i=0;i<clips.size();i++) {
clips.at(i)->set_name(old_names.at(i));
}
clip_->set_name(old_name_);
}
void RenameClipCommand::doRedo() {
old_names.resize(clips.size());
for (int i=0;i<clips.size();i++) {
old_names[i] = clips.at(i)->name();
clips.at(i)->set_name(new_name);
}
clip_->set_name(new_name_);
}
SetPointer::SetPointer(void **pointer, void *data) {
@@ -1062,7 +1061,7 @@ void RippleAction::doRedo() {
ClipPtr c = s->clips.at(i);
if (c != nullptr) {
if (c->timeline_in() >= point) {
move_clip(ca, c, length, length, 0, 0, true, true);
c->move(ca, length, length, 0, 0, true, true);
}
}
}
project/undo.h
+19 -19
View File
@@ -63,11 +63,11 @@ private:
class MoveClipAction : public OliveAction {
public:
MoveClipAction(ClipPtr c, long iin, long iout, long iclip_in, int itrack, bool irelative);
MoveClipAction(Clip* c, long iin, long iout, long iclip_in, int itrack, bool irelative);
virtual void doUndo() override;
virtual void doRedo() override;
private:
ClipPtr clip;
Clip* clip;
long old_in;
long old_out;
@@ -125,11 +125,11 @@ private:
class AddEffectCommand : public OliveAction {
public:
AddEffectCommand(ClipPtr c, EffectPtr e, const EffectMeta* m, int insert_pos = -1);
AddEffectCommand(Clip* c, EffectPtr e, const EffectMeta* m, int insert_pos = -1);
virtual void doUndo() override;
virtual void doRedo() override;
private:
ClipPtr clip;
Clip* clip;
const EffectMeta* meta;
EffectPtr ref;
int pos;
@@ -138,12 +138,12 @@ private:
class AddTransitionCommand : public OliveAction {
public:
AddTransitionCommand(ClipPtr iopen, ClipPtr iclose, TransitionPtr copy, const EffectMeta* itransition, int ilength);
AddTransitionCommand(Clip* iopen, Clip* iclose, TransitionPtr copy, const EffectMeta* itransition, int ilength);
virtual void doUndo() override;
virtual void doRedo() override;
private:
ClipPtr open_;
ClipPtr close_;
Clip* open_;
Clip* close_;
TransitionPtr transition_to_copy_;
const EffectMeta* transition_meta_;
int length_;
@@ -170,8 +170,8 @@ public:
virtual void doRedo() override;
private:
TransitionPtr transition_ref_;
ClipPtr opened_clip_;
ClipPtr closed_clip_;
Clip* opened_clip_;
Clip* closed_clip_;
};
class SetTimelineInOutCommand : public OliveAction {
@@ -295,7 +295,7 @@ public:
virtual ~EffectDeleteCommand() override;
virtual void doUndo() override;
virtual void doRedo() override;
QVector<ClipPtr> clips;
QVector<Clip*> clips;
QVector<int> fx;
private:
bool done;
@@ -374,10 +374,10 @@ public:
SetClipProperty(SetClipPropertyType type);
virtual void doUndo() override;
virtual void doRedo() override;
void AddSetting(ClipPtr c, bool setting);
void AddSetting(Clip *c, bool setting);
private:
SetClipPropertyType type_;
QVector<ClipPtr> clips_;
QVector<Clip*> clips_;
QVector<bool> setting_;
QVector<bool> old_setting_;
void MainLoop(bool undo);
@@ -421,11 +421,11 @@ private:
class SetSpeedAction : public OliveAction {
public:
SetSpeedAction(ClipPtr c, double speed);
SetSpeedAction(Clip* c, double speed);
virtual void doUndo() override;
virtual void doRedo() override;
private:
ClipPtr clip;
Clip* clip;
double old_speed;
double new_speed;
};
@@ -542,7 +542,7 @@ public:
MoveEffectCommand();
virtual void doUndo() override;
virtual void doRedo() override;
ClipPtr clip;
Clip* clip;
int from;
int to;
};
@@ -561,13 +561,13 @@ private:
class RenameClipCommand : public OliveAction {
public:
RenameClipCommand();
QVector<ClipPtr> clips;
QString new_name;
RenameClipCommand(Clip* clip, QString new_name);
virtual void doUndo() override;
virtual void doRedo() override;
private:
QVector<QString> old_names;
QString old_name_;
QString new_name_;
Clip* clip_;
};
class SetPointer : public OliveAction {
rendering/cacher.cpp
+4 -4
View File
@@ -42,7 +42,7 @@ double bytes_to_seconds(int nb_bytes, int nb_channels, int sample_rate) {
return (double(nb_bytes >> 1) / nb_channels / sample_rate);
}
void apply_audio_effects(ClipPtr clip, double timecode_start, AVFrame* frame, int nb_bytes, QVector<ClipPtr> nests) {
void apply_audio_effects(Clip* clip, double timecode_start, AVFrame* frame, int nb_bytes, QVector<Clip*> nests) {
// perform all audio effects
double timecode_end;
timecode_end = timecode_start + bytes_to_seconds(nb_bytes, frame->channels, frame->sample_rate);
@@ -78,7 +78,7 @@ void apply_audio_effects(ClipPtr clip, double timecode_start, AVFrame* frame, in
}
if (!nests.isEmpty()) {
ClipPtr next_nest = nests.last();
Clip* next_nest = nests.last();
nests.removeLast();
apply_audio_effects(next_nest,
timecode_start + (double(clip->timeline_in(true)-clip->clip_in(true))/clip->sequence->frame_rate),
@@ -735,7 +735,7 @@ void Cacher::WakeMainThread()
main_thread_lock_.unlock();
}
Cacher::Cacher(ClipPtr c) : clip(c) {}
Cacher::Cacher(Clip* c) : clip(c) {}
void Cacher::OpenWorker() {
qint64 time_start = QDateTime::currentMSecsSinceEpoch();
@@ -1048,7 +1048,7 @@ void Cacher::Open()
start((clip->track() < 0) ? QThread::HighPriority : QThread::TimeCriticalPriority);
}
void Cacher::Cache(long playhead, bool scrubbing, QVector<ClipPtr>& nests, int playback_speed)
void Cacher::Cache(long playhead, bool scrubbing, QVector<Clip*>& nests, int playback_speed)
{
if (clip->media_stream()->infinite_length && queue.size() > 0) {
retrieved_frame = queue.at(0);
rendering/cacher.h
+4 -5
View File
@@ -42,7 +42,6 @@ extern "C" {
#include "rendering/clipqueue.h"
class Clip;
using ClipPtr = std::shared_ptr<Clip>;
/**
* @brief The Cacher class
@@ -106,7 +105,7 @@ public:
*
* @param c
*/
Cacher(ClipPtr c);
Cacher(Clip* c);
/**
* @brief The main QThread loop
@@ -158,7 +157,7 @@ public:
*
* The current playback speed (controlled by Shuttle Left/Stop/Right)
*/
void Cache(long playhead, bool scrubbing, QVector<ClipPtr>& nests, int playback_speed);
void Cache(long playhead, bool scrubbing, QVector<Clip*>& nests, int playback_speed);
/**
* @brief Retrieve frame requested by Cache()
@@ -257,7 +256,7 @@ private:
/**
* @brief Reference to the parent clip. Set in the constructor and never changed during this object's lifetime.
*/
ClipPtr clip;
Clip* clip;
/**
* @brief Frame queue
@@ -327,7 +326,7 @@ private:
/**
* @brief Current nested Sequence hierarchy set by Cache()
*/
QVector<ClipPtr> nests_;
QVector<Clip*> nests_;
/**
* @brief Signal cache to continue operation after one cycle rather than wait for another signal
rendering/renderfunctions.cpp
+10 -10
View File
@@ -106,7 +106,7 @@ GLuint draw_clip(QOpenGLFramebufferObject* fbo, GLuint texture, bool clear) {
return fbo->texture();
}
void process_effect(ClipPtr c,
void process_effect(Clip* c,
EffectPtr e,
double timecode,
GLTextureCoords& coords,
@@ -178,12 +178,12 @@ GLuint compose_sequence(ComposeSequenceParams &params) {
int audio_track_count = 0;
QVector<ClipPtr> current_clips;
QVector<Clip*> current_clips;
// loop through clips, find currently active, and sort by track
for (int i=0;i<s->clips.size();i++) {
ClipPtr c = s->clips.at(i);
Clip* c = s->clips.at(i).get();
if (c != nullptr) {
@@ -284,7 +284,7 @@ GLuint compose_sequence(ComposeSequenceParams &params) {
// loop through current clips
for (int i=0;i<current_clips.size();i++) {
ClipPtr c = current_clips.at(i);
Clip* c = current_clips.at(i);
bool got_mutex = true;
@@ -683,15 +683,15 @@ long rescale_frame_number(long framenumber, double source_frame_rate, double tar
return qRound((double(framenumber)/source_frame_rate)*target_frame_rate);
}
double get_timecode(ClipPtr c, long playhead) {
double get_timecode(Clip* c, long playhead) {
return double(playhead_to_clip_frame(c, playhead))/c->sequence->frame_rate;
}
long playhead_to_clip_frame(ClipPtr c, long playhead) {
long playhead_to_clip_frame(Clip* c, long playhead) {
return (qMax(0L, playhead - c->timeline_in(true)) + c->clip_in(true));
}
double playhead_to_clip_seconds(ClipPtr c, long playhead) {
double playhead_to_clip_seconds(Clip* c, long playhead) {
// returns time in seconds
long clip_frame = playhead_to_clip_frame(c, playhead);
@@ -707,18 +707,18 @@ double playhead_to_clip_seconds(ClipPtr c, long playhead) {
return secs;
}
int64_t seconds_to_timestamp(ClipPtr c, double seconds) {
int64_t seconds_to_timestamp(Clip *c, double seconds) {
return qRound64(seconds * av_q2d(av_inv_q(c->time_base())));
}
int64_t playhead_to_timestamp(ClipPtr c, long playhead) {
int64_t playhead_to_timestamp(Clip* c, long playhead) {
return seconds_to_timestamp(c, playhead_to_clip_seconds(c, playhead));
}
void close_active_clips(SequencePtr s) {
if (s != nullptr) {
for (int i=0;i<s->clips.size();i++) {
ClipPtr c = s->clips.at(i);
Clip* c = s->clips.at(i).get();
if (c != nullptr) {
c->Close(true);
}
rendering/renderfunctions.h
+6 -6
View File
@@ -67,7 +67,7 @@ struct ComposeSequenceParams {
* Should be left empty. This array gets passed around compose_sequence() as it calls itself recursively to
* handle nested sequences.
*/
QVector<ClipPtr> nests;
QVector<Clip*> nests;
/**
* @brief Set compose mode to video or audio
@@ -307,7 +307,7 @@ long rescale_frame_number(long framenumber, double source_frame_rate, double tar
*
* Timecode in seconds
*/
double get_timecode(ClipPtr c, long playhead);
double get_timecode(Clip *c, long playhead);
/**
* @brief Convert playhead frame number to a clip frame number
@@ -327,7 +327,7 @@ double get_timecode(ClipPtr c, long playhead);
*
* The curren frame number of the clip at `playhead`
*/
long playhead_to_clip_frame(ClipPtr c, long playhead);
long playhead_to_clip_frame(Clip* c, long playhead);
/**
* @brief Converts the playhead to clip seconds
@@ -348,7 +348,7 @@ long playhead_to_clip_frame(ClipPtr c, long playhead);
*
* Clip time in seconds
*/
double playhead_to_clip_seconds(ClipPtr c, long playhead);
double playhead_to_clip_seconds(Clip *c, long playhead);
/**
* @brief Convert seconds to FFmpeg timestamp
@@ -368,7 +368,7 @@ double playhead_to_clip_seconds(ClipPtr c, long playhead);
*
* An FFmpeg-compatible timestamp in AVStream->time_base units.
*/
int64_t seconds_to_timestamp(ClipPtr c, double seconds);
int64_t seconds_to_timestamp(Clip* c, double seconds);
/**
* @brief Convert Timeline playhead to FFmpeg timestamp
@@ -388,7 +388,7 @@ int64_t seconds_to_timestamp(ClipPtr c, double seconds);
*
* An FFmpeg-compatible timestamp in AVStream->time_base units.
*/
int64_t playhead_to_timestamp(ClipPtr c, long playhead);
int64_t playhead_to_timestamp(Clip *c, long playhead);
/**
* @brief Close all open clips in a Sequence
ui/keyframeview.cpp
+1 -1
View File
@@ -376,7 +376,7 @@ void KeyframeView::mouseMoveEvent(QMouseEvent* event) {
if (panel_timeline->snapping) {
for (int i=0;i<selected_keyframes.size();i++) {
EffectField* field = selected_fields.at(i);
ClipPtr c = field->parent_row->parent_effect->parent_clip;
Clip* c = field->parent_row->parent_effect->parent_clip;
long key_time = old_key_vals.at(i) + frame_diff - c->clip_in() + c->timeline_in();
long key_eval = key_time;
if (panel_timeline->snap_to_point(olive::ActiveSequence->playhead, &key_eval)) {
ui/timelinewidget.cpp
+69 -73
View File
@@ -38,6 +38,7 @@
#include "ui/cursors.h"
#include "ui/menuhelper.h"
#include "ui/focusfilter.h"
#include "dialogs/clippropertiesdialog.h"
#include "debug.h"
#include "project/effect.h"
@@ -100,9 +101,9 @@ void TimelineWidget::show_context_menu(const QPoint& pos) {
menu.addSeparator();
// collect all the selected clips
QVector<ClipPtr> selected_clips;
QVector<Clip*> selected_clips;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
selected_clips.append(c);
}
@@ -175,8 +176,7 @@ void TimelineWidget::show_context_menu(const QPoint& pos) {
connect(revealInProjectAction, SIGNAL(triggered(bool)), this, SLOT(reveal_media()));
}
QAction* rename = menu.addAction(tr("R&ename"));
connect(rename, SIGNAL(triggered(bool)), this, SLOT(rename_clip()));
menu.addAction(tr("Properties"), this, SLOT(show_clip_properties()));
}
menu.exec(mapToGlobal(pos));
@@ -188,7 +188,7 @@ void TimelineWidget::toggle_autoscale() {
bool added_clip = false;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
action->AddSetting(c, !c->autoscaled());
added_clip = true;
@@ -219,32 +219,6 @@ void TimelineWidget::tooltip_timer_timeout() {
tooltip_timer.stop();
}
void TimelineWidget::rename_clip() {
QVector<ClipPtr> selected_clips;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
if (c != nullptr && is_clip_selected(c, true)) {
selected_clips.append(c);
}
}
if (selected_clips.size() > 0) {
QString s = QInputDialog::getText(this,
(selected_clips.size() == 1) ? tr("Rename '%1'").arg(selected_clips.at(0)->name())
: tr("Rename multiple clips"),
tr("Enter a new name for this clip:"),
QLineEdit::Normal,
selected_clips.at(0)->name()
);
if (!s.isEmpty()) {
RenameClipCommand* rcc = new RenameClipCommand();
rcc->new_name = s;
rcc->clips = selected_clips;
olive::UndoStack.push(rcc);
update_ui(true);
}
}
}
void TimelineWidget::open_sequence_properties() {
QList<Media*> sequence_items;
QList<Media*> all_top_level_items;
@@ -262,6 +236,24 @@ void TimelineWidget::open_sequence_properties() {
QMessageBox::critical(this, tr("Error"), tr("Couldn't locate media wrapper for sequence."));
}
void TimelineWidget::show_clip_properties()
{
// get list of selected clips
QVector<Clip*> selected_clips;
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr && is_clip_selected(c, true)) {
selected_clips.append(c);
}
}
// if clips are selected, open the clip properties dialog
if (selected_clips.size() > 0) {
ClipPropertiesDialog cpd(this, selected_clips);
cpd.exec();
}
}
bool same_sign(int a, int b) {
return (a < 0) == (b < 0);
}
@@ -669,7 +661,7 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) {
// check if we're currently hovering over a clip or not
if (hovered_clip >= 0) {
ClipPtr clip = olive::ActiveSequence->clips.at(hovered_clip);
Clip* clip = olive::ActiveSequence->clips.at(hovered_clip).get();
if (is_clip_selected(clip, true)) {
@@ -771,7 +763,7 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) {
for (int i=0;i<clip->linked.size();i++) {
ClipPtr link = olive::ActiveSequence->clips.at(clip->linked.at(i));
Clip* link = olive::ActiveSequence->clips.at(clip->linked.at(i)).get();
// check if the clip is already selected
if (!is_clip_selected(link, true)) {
@@ -854,7 +846,7 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) {
}
void make_room_for_transition(ComboAction* ca,
ClipPtr c,
Clip* c,
int type,
long transition_start,
long transition_end,
@@ -895,7 +887,7 @@ void make_room_for_transition(ComboAction* ca,
}
}
void VerifyTransitionsAfterCreating(ComboAction* ca, ClipPtr open, ClipPtr close, long transition_start, long transition_end) {
void VerifyTransitionsAfterCreating(ComboAction* ca, Clip* open, Clip* close, long transition_start, long transition_end) {
// in case the user made the transition larger than the clips, we're going to delete everything under
// the transition ghost and extend the clips to the transition's coordinates as necessary
@@ -939,7 +931,7 @@ void VerifyTransitionsAfterCreating(ComboAction* ca, ClipPtr open, ClipPtr close
// loop through both kinds of transition
for (int t=kTransitionOpening;t<=kTransitionClosing;t++) {
ClipPtr clip_ref = (t == kTransitionOpening) ? open : close;
Clip* clip_ref = (t == kTransitionOpening) ? open : close;
// if we have an opening transition:
if (clip_ref != nullptr) {
@@ -975,12 +967,11 @@ void VerifyTransitionsAfterCreating(ComboAction* ca, ClipPtr open, ClipPtr close
move_clip(ca,
clip_ref,
new_in,
new_out,
clip_ref->clip_in() - (clip_ref->timeline_in() - new_in),
clip_ref->track());
clip_ref->move(ca,
new_in,
new_out,
clip_ref->clip_in() - (clip_ref->timeline_in() - new_in),
clip_ref->track());
}
}
}
@@ -1006,7 +997,7 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
panel_sequence_viewer->cue_recording(qMin(g.in, g.out), qMax(g.in, g.out), g.track);
panel_timeline->creating = false;
} else if (g.in != g.out) {
ClipPtr c = ClipPtr(new Clip(olive::ActiveSequence));
ClipPtr c = std::make_shared<Clip>(olive::ActiveSequence);
c->set_media(nullptr, 0);
c->set_timeline_in(qMin(g.in, g.out));
c->set_timeline_out(qMax(g.in, g.out));
@@ -1032,40 +1023,40 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
if (c->track() < 0 && olive::CurrentConfig.add_default_effects_to_clips) {
// default video effects (before custom effects)
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TRANSFORM, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_TRANSFORM, EFFECT_TYPE_EFFECT)));
}
switch (panel_timeline->creating_object) {
case ADD_OBJ_TITLE:
c->set_name(tr("Title"));
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TEXT, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_TEXT, EFFECT_TYPE_EFFECT)));
break;
case ADD_OBJ_SOLID:
c->set_name(tr("Solid Color"));
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_SOLID, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_SOLID, EFFECT_TYPE_EFFECT)));
break;
case ADD_OBJ_BARS:
{
c->set_name(tr("Bars"));
EffectPtr e = create_effect(c, get_internal_meta(EFFECT_INTERNAL_SOLID, EFFECT_TYPE_EFFECT));
EffectPtr e = create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_SOLID, EFFECT_TYPE_EFFECT));
e->row(0)->field(0)->set_combo_index(1);
c->effects.append(e);
}
break;
case ADD_OBJ_TONE:
c->set_name(tr("Tone"));
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_TONE, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_TONE, EFFECT_TYPE_EFFECT)));
break;
case ADD_OBJ_NOISE:
c->set_name(tr("Noise"));
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_NOISE, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_NOISE, EFFECT_TYPE_EFFECT)));
break;
}
if (c->track() >= 0 && olive::CurrentConfig.add_default_effects_to_clips) {
// default audio effects (after custom effects)
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_VOLUME, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c, get_internal_meta(EFFECT_INTERNAL_PAN, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_VOLUME, EFFECT_TYPE_EFFECT)));
c->effects.append(create_effect(c.get(), get_internal_meta(EFFECT_INTERNAL_PAN, EFFECT_TYPE_EFFECT)));
}
push_undo = true;
@@ -1250,13 +1241,13 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
for (int i=0;i<panel_timeline->ghosts.size();i++) {
Ghost& g = panel_timeline->ghosts[i];
ClipPtr c = olive::ActiveSequence->clips.at(g.clip);
Clip* c = olive::ActiveSequence->clips.at(g.clip).get();
if (g.transition == nullptr) {
// if this was a clip rather than a transition
move_clip(ca, c, (g.in - g.old_in), (g.out - g.old_out), (g.clip_in - g.old_clip_in), (g.track - g.old_track), false, true);
c->move(ca, (g.in - g.old_in), (g.out - g.old_out), (g.clip_in - g.old_clip_in), (g.track - g.old_track), false, true);
} else {
@@ -1290,8 +1281,8 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
timeline_in_movement = g.in - g.transition->secondary_clip->timeline_in();
}
move_clip(ca, g.transition->parent_clip, movement, timeline_out_movement, movement, 0, false, true);
move_clip(ca, g.transition->secondary_clip, timeline_in_movement, movement, timeline_in_movement, 0, false, true);
g.transition->parent_clip->move(ca, movement, timeline_out_movement, movement, 0, false, true);
g.transition->secondary_clip->move(ca, timeline_in_movement, movement, timeline_in_movement, 0, false, true);
make_room_for_transition(ca, g.transition->parent_clip, kTransitionOpening, g.in, g.out, false);
make_room_for_transition(ca, g.transition->secondary_clip, kTransitionClosing, g.in, g.out, false);
@@ -1309,7 +1300,7 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
timeline_out_movement = g.out - g.transition->parent_clip->timeline_out();
}
move_clip(ca, c, (g.in - g.old_in), timeline_out_movement, (g.clip_in - g.old_clip_in), 0, false, true);
c->move(ca, (g.in - g.old_in), timeline_out_movement, (g.clip_in - g.old_clip_in), 0, false, true);
clip_length -= (g.in - g.old_in);
}
@@ -1326,7 +1317,7 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
}
// if transition is going to make the clip bigger, make the clip bigger
move_clip(ca, c, timeline_in_movement, (g.out - g.old_out), timeline_in_movement, 0, false, true);
c->move(ca, timeline_in_movement, (g.out - g.old_out), timeline_in_movement, 0, false, true);
clip_length += (g.out - g.old_out);
}
@@ -1378,13 +1369,13 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
// for a shared transition, the secondary_clip will always be the closing transition side and
// the parent_clip will always be the opening transition side
ClipPtr search_clip = (t == kTransitionOpening)
Clip* search_clip = (t == kTransitionOpening)
? transition->secondary_clip : transition->parent_clip;
for (int j=0;j<panel_timeline->ghosts.size();j++) {
const Ghost& other_clip_ghost = panel_timeline->ghosts.at(j);
if (olive::ActiveSequence->clips.at(other_clip_ghost.clip) == search_clip) {
if (olive::ActiveSequence->clips.at(other_clip_ghost.clip).get() == search_clip) {
// we found the other clip in the current ghosts/selections
@@ -1464,12 +1455,12 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
long transition_end = qMax(g.in, g.out);
// get clip references from tool's cached data
ClipPtr open = (panel_timeline->transition_tool_open_clip > -1)
? olive::ActiveSequence->clips.at(panel_timeline->transition_tool_open_clip)
Clip* open = (panel_timeline->transition_tool_open_clip > -1)
? olive::ActiveSequence->clips.at(panel_timeline->transition_tool_open_clip).get()
: nullptr;
ClipPtr close = (panel_timeline->transition_tool_close_clip > -1)
? olive::ActiveSequence->clips.at(panel_timeline->transition_tool_close_clip)
Clip* close = (panel_timeline->transition_tool_close_clip > -1)
? olive::ActiveSequence->clips.at(panel_timeline->transition_tool_close_clip).get()
: nullptr;
@@ -1585,7 +1576,7 @@ void TimelineWidget::init_ghosts() {
}
}
void validate_transitions(ClipPtr c, int transition_type, long& frame_diff) {
void validate_transitions(Clip* c, int transition_type, long& frame_diff) {
long validator;
if (transition_type == kTransitionOpening) {
@@ -1676,8 +1667,10 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
long temp_frame_diff = frame_diff; // cache to see if we change it (thus cancelling any snap)
for (int i=0;i<panel_timeline->ghosts.size();i++) {
const Ghost& g = panel_timeline->ghosts.at(i);
ClipPtr c = nullptr;
if (g.clip != -1) c = olive::ActiveSequence->clips.at(g.clip);
Clip* c = nullptr;
if (g.clip != -1) {
c = olive::ActiveSequence->clips.at(g.clip).get();
}
const FootageStream* ms = nullptr;
if (g.clip != -1 && c->media() != nullptr && c->media()->get_type() == MEDIA_TYPE_FOOTAGE) {
@@ -1731,8 +1724,8 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
// prevent dual transition from going below 0 on the primary or media length on the secondary
if (g.transition != nullptr && g.transition->secondary_clip != nullptr) {
ClipPtr otc = g.transition->parent_clip;
ClipPtr ctc = g.transition->secondary_clip;
Clip* otc = g.transition->parent_clip;
Clip* ctc = g.transition->secondary_clip;
if (g.trim_type == TRIM_IN) {
frame_diff -= g.transition->get_true_length();
@@ -1833,12 +1826,15 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
|| panel_timeline->transition_tool_close_clip == -1) {
validate_transitions(c, g.media_stream, frame_diff);
} else {
ClipPtr otc = olive::ActiveSequence->clips.at(panel_timeline->transition_tool_open_clip); // open transition clip
ClipPtr ctc = olive::ActiveSequence->clips.at(panel_timeline->transition_tool_close_clip); // close transition clip
// open transition clip
Clip* otc = olive::ActiveSequence->clips.at(panel_timeline->transition_tool_open_clip).get();
// close transition clip
Clip* ctc = olive::ActiveSequence->clips.at(panel_timeline->transition_tool_close_clip).get();
if (g.media_stream == kTransitionClosing) {
// swap
ClipPtr temp = otc;
Clip* temp = otc;
otc = ctc;
ctc = temp;
}
@@ -2066,7 +2062,7 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
// find which clips are selected
for (int j=0;j<olive::ActiveSequence->clips.size();j++) {
ClipPtr c = olive::ActiveSequence->clips.at(j);
Clip* c = olive::ActiveSequence->clips.at(j).get();
if (c != nullptr && is_clip_selected(c, false)) {
@@ -2157,7 +2153,7 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
// loop through clips for any currently selected
for (int i=0;i<olive::ActiveSequence->clips.size();i++) {
ClipPtr c = olive::ActiveSequence->clips.at(i);
Clip* c = olive::ActiveSequence->clips.at(i).get();
if (c != nullptr) {
Ghost g;
ui/timelinewidget.h
+1 -12
View File
@@ -37,17 +37,6 @@
class Timeline;
namespace olive {
namespace timeline {
const int kGhostThickness = 2;
const int kClipTextPadding = 3;
const int kTrackDefaultHeight = 40/* * QApplication::desktop()->devicePixelRatio()*/;
const int kTrackMinHeight = 30;
const int kTrackHeightIncrement = 10;
}
}
struct TimelineTrackHeight {
int index;
int height;
@@ -118,8 +107,8 @@ private slots:
void show_context_menu(const QPoint& pos);
void toggle_autoscale();
void tooltip_timer_timeout();
void rename_clip();
void open_sequence_properties();
void show_clip_properties();
};
#endif // TIMELINEWIDGET_H