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

Use parent_clip instead of duplicating clip * c

Browse Source
This commit is contained in:
alcomposer
2018-11-29 22:33:10 +10:30
parent f0902971a3
commit bb0a94ce34
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
effects/internal/timecodeeffect.cpp
+3 -3
View File
@@ -24,8 +24,7 @@
#include "playback/playback.h" #include "playback/playback.h"
TimecodeEffect::TimecodeEffect(Clip *c, const EffectMeta* em) : TimecodeEffect::TimecodeEffect(Clip *c, const EffectMeta* em) :
Effect(c, em), Effect(c, em)
c(c)
{ {
enable_always_update = true; enable_always_update = true;
enable_superimpose = true; enable_superimpose = true;
@@ -81,7 +80,8 @@ void TimecodeEffect::redraw(double timecode) {
if(qvariant_cast<bool>(tc_select->get_combo_data(timecode))){ if(qvariant_cast<bool>(tc_select->get_combo_data(timecode))){
display_timecode = prepend_text->get_string_value(timecode) + frame_to_timecode(sequence->playhead, config.timecode_view, sequence->frame_rate);} display_timecode = prepend_text->get_string_value(timecode) + frame_to_timecode(sequence->playhead, config.timecode_view, sequence->frame_rate);}
else { else {
display_timecode = prepend_text->get_string_value(timecode) + frame_to_timecode(qlonglong(playhead_to_clip_seconds(c, sequence->playhead)*c->getMediaFrameRate()), config.timecode_view, c->getMediaFrameRate());} double media_rate = parent_clip->getMediaFrameRate();
display_timecode = prepend_text->get_string_value(timecode) + frame_to_timecode(timecode * media_rate, config.timecode_view, media_rate);}
img.fill(Qt::transparent); img.fill(Qt::transparent);
QPainter p(&img); QPainter p(&img);
effects/internal/timecodeeffect.h
-1
View File
@@ -24,7 +24,6 @@ public:
private: private:
QFont font; QFont font;
QString display_timecode; QString display_timecode;
Clip * c;
}; };
#endif // TIMECODEEFFECT_H #endif // TIMECODEEFFECT_H