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

fixed timeline objects retrieving incorrect name

Browse Source
This commit is contained in:
itsmattkc
2018-11-24 22:51:26 +11:00
parent 00b31d514e
commit 8c59d5784a
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/effect.cpp
+3 -3
View File
@@ -66,14 +66,14 @@ Effect* create_effect(Clip* c, const EffectMeta* em) {
return NULL;
}
const EffectMeta* get_internal_meta(int internal_id) {
const EffectMeta* get_internal_meta(int internal_id, int type) {
for (int i=0;i<audio_effects.size();i++) {
if (audio_effects.at(i).internal == internal_id) {
if (audio_effects.at(i).internal == internal_id && audio_effects.at(i).type == type) {
return &audio_effects.at(i);
}
}
for (int i=0;i<video_effects.size();i++) {
if (video_effects.at(i).internal == internal_id) {
if (video_effects.at(i).internal == internal_id && video_effects.at(i).type == type) {
return &video_effects.at(i);
}
}
project/effect.h
+1 -1
View File
@@ -38,7 +38,7 @@ extern QVector<EffectMeta> audio_effects;
double log_volume(double linear);
void init_effects();
Effect* create_effect(Clip* c, const EffectMeta *em);
const EffectMeta* get_internal_meta(int internal_id);
const EffectMeta* get_internal_meta(int internal_id, int type);
extern QMutex effects_loaded;