cleanup and disabled nonfunctional scrolling code

This commit is contained in:
itsmattkc
2019-02-16 03:23:09 -08:00
parent 6bccd0c660
commit 2f38a0b111
70 changed files with 383 additions and 583 deletions
+10
View File
@@ -0,0 +1,10 @@
#version 110
uniform sampler2D tex1;
uniform sampler3D tex2;
void main()
{
vec4 col = texture2D(tex1, gl_TexCoord[0].st);
gl_FragColor = OCIODisplay(col, tex2);
}
-1
View File
@@ -23,7 +23,6 @@
#include "project/effect.h"
class QOpenGLTexture;
#include <QImage>
class SolidEffect : public Effect {
-1
View File
@@ -25,7 +25,6 @@
#include <QFont>
#include <QImage>
class QOpenGLTexture;
class TextEffect : public Effect {
Q_OBJECT
+2 -2
View File
@@ -82,10 +82,10 @@ TimecodeEffect::TimecodeEffect(Clip *c, const EffectMeta* em) :
void TimecodeEffect::redraw(double timecode) {
if (tc_select->get_combo_data(timecode).toBool()){
display_timecode = prepend_text->get_string_value(timecode) + frame_to_timecode(Olive::ActiveSequence->playhead, config.timecode_view, Olive::ActiveSequence->frame_rate);}
display_timecode = prepend_text->get_string_value(timecode) + frame_to_timecode(Olive::ActiveSequence->playhead, Olive::CurrentConfig.timecode_view, Olive::ActiveSequence->frame_rate);}
else {
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);}
display_timecode = prepend_text->get_string_value(timecode) + frame_to_timecode(timecode * media_rate, Olive::CurrentConfig.timecode_view, media_rate);}
img.fill(Qt::transparent);
QPainter p(&img);
-1
View File
@@ -25,7 +25,6 @@
#include <QFont>
#include <QImage>
class QOpenGLTexture;
class TimecodeEffect : public Effect {
Q_OBJECT
+1 -1
View File
@@ -32,7 +32,7 @@
// Plugin's dispatcher function
typedef intptr_t (*dispatcherFuncPtr)(AEffect *effect, int32_t opCode, int32_t index, int32_t value, void *ptr, float opt);
class QDialog;
#include <QDialog>
class VSTHost : public Effect {
Q_OBJECT