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

use track types and clip refs

Browse Source
This commit is contained in:
itsmattkc
2019-03-30 13:36:44 +11:00
parent 5ddf2726dd
commit 7f92774dc9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/timeline.cpp
+2 -2
View File
@@ -1870,7 +1870,7 @@ void Timeline::transition_tool_click() {
for (int i=0;i<olive::effects.size();i++) {
const EffectMeta& em = olive::effects.at(i);
if (em.type == EFFECT_TYPE_TRANSITION && em.subtype == EFFECT_TYPE_VIDEO) {
if (em.type == EFFECT_TYPE_TRANSITION && em.subtype == Track::kTypeVideo) {
QAction* a = transition_menu.addAction(em.name);
a->setObjectName("v");
a->setData(reinterpret_cast<quintptr>(&em));
@@ -1881,7 +1881,7 @@ void Timeline::transition_tool_click() {
for (int i=0;i<olive::effects.size();i++) {
const EffectMeta& em = olive::effects.at(i);
if (em.type == EFFECT_TYPE_TRANSITION && em.subtype == EFFECT_TYPE_AUDIO) {
if (em.type == EFFECT_TYPE_TRANSITION && em.subtype == Track::kTypeAudio) {
QAction* a = transition_menu.addAction(em.name);
a->setObjectName("a");
a->setData(reinterpret_cast<quintptr>(&em));
timeline/clip.h
+1 -1
View File
@@ -128,7 +128,7 @@ public:
// other variables (should be deep copied/duplicated in copy())
int IndexOfEffect(Effect* e);
QList<EffectPtr> effects;
QVector<int> linked;
QVector<Clip*> linked;
TransitionPtr opening_transition;
TransitionPtr closing_transition;