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

changed create_transition to a static member of Transition

Browse Source
This commit is contained in:
itsmattkc
2019-02-28 03:16:07 -08:00
parent 86b7124238
commit c513276a1b
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/transition.cpp
+4 -4
View File
@@ -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);