changed create_transition to a static member of Transition
This commit is contained in:
+1
-1
@@ -778,7 +778,7 @@ void LoadThread::create_effect_ui(
|
||||
c->effects.append(e);
|
||||
}
|
||||
} else {
|
||||
TransitionPtr t = create_transition(c, nullptr, meta);
|
||||
TransitionPtr t = Transition::Create(c, nullptr, meta);
|
||||
if (effect_length > -1) t->set_length(effect_length);
|
||||
t->set_enabled(effect_enabled);
|
||||
t->load(*stream);
|
||||
|
||||
@@ -56,7 +56,7 @@ Transition::Transition(Clip *c, Clip *s, const EffectMeta* em) :
|
||||
}
|
||||
|
||||
TransitionPtr Transition::copy(Clip *c, Clip *s) {
|
||||
return create_transition(c, s, meta, length);
|
||||
return Transition::Create(c, s, meta, length);
|
||||
}
|
||||
|
||||
void Transition::save(QXmlStreamWriter &stream) {
|
||||
@@ -103,7 +103,7 @@ void Transition::set_length_from_slider() {
|
||||
update_ui(false);
|
||||
}
|
||||
|
||||
TransitionPtr get_transition_from_meta(Clip* c, Clip* s, const EffectMeta* em) {
|
||||
TransitionPtr Transition::CreateFromMeta(Clip* c, Clip* s, const EffectMeta* em) {
|
||||
if (!em->filename.isEmpty()) {
|
||||
// load effect from file
|
||||
return TransitionPtr(new Transition(c, s, em));
|
||||
@@ -126,8 +126,8 @@ TransitionPtr get_transition_from_meta(Clip* c, Clip* s, const EffectMeta* em) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
TransitionPtr create_transition(Clip* c, Clip* s, const EffectMeta* em, long length) {
|
||||
TransitionPtr t(get_transition_from_meta(c, s, em));
|
||||
TransitionPtr Transition::Create(Clip* c, Clip* s, const EffectMeta* em, long length) {
|
||||
TransitionPtr t(CreateFromMeta(c, s, em));
|
||||
if (t != nullptr) {
|
||||
if (length > 0) {
|
||||
t->set_length(length);
|
||||
|
||||
@@ -41,10 +41,6 @@ enum TransitionInternal {
|
||||
class Transition;
|
||||
using TransitionPtr = std::shared_ptr<Transition>;
|
||||
|
||||
TransitionPtr get_transition_from_meta(Clip *c, Clip *s, const EffectMeta* em);
|
||||
|
||||
TransitionPtr create_transition(Clip* c, Clip* s, const EffectMeta* em, long length = 0);
|
||||
|
||||
class Transition : public Effect {
|
||||
Q_OBJECT
|
||||
public:
|
||||
@@ -60,6 +56,9 @@ public:
|
||||
|
||||
Clip* get_opened_clip();
|
||||
Clip* get_closed_clip();
|
||||
|
||||
static TransitionPtr Create(Clip* c, Clip* s, const EffectMeta* em, long length = 0);
|
||||
static TransitionPtr CreateFromMeta(Clip *c, Clip *s, const EffectMeta* em);
|
||||
private slots:
|
||||
void set_length_from_slider();
|
||||
private:
|
||||
|
||||
+1
-1
@@ -257,7 +257,7 @@ void AddTransitionCommand::doRedo() {
|
||||
// create new transition object
|
||||
if (new_transition_ref_ == nullptr) {
|
||||
if (transition_to_copy_ == nullptr) {
|
||||
new_transition_ref_ = get_transition_from_meta(primary, secondary, transition_meta_);
|
||||
new_transition_ref_ = Transition::CreateFromMeta(primary, secondary, transition_meta_);
|
||||
} else {
|
||||
new_transition_ref_ = transition_to_copy_->copy(primary, nullptr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user