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

tweaks for gcc

Browse Source
This commit is contained in:
itsmattkc
2018-09-02 20:18:54 +10:00
parent fa73dbfa1c
commit fdd1935093
5 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
effects/effect.cpp
+2 -2
View File
@@ -358,7 +358,7 @@ Effect* Effect::copy(Clip* c) {
void Effect::process_shader(double) {}
void Effect::process_coords(double, GLTextureCoords&) {}
const GLuint Effect::process_superimpose(double) {return 0;}
GLuint Effect::process_superimpose(double) {return 0;}
void Effect::process_audio(double, double, quint8*, int, int) {}
SuperimposeEffect::SuperimposeEffect(Clip* c, int t, int i) : Effect(c, t, i), texture(NULL) {
@@ -375,7 +375,7 @@ void SuperimposeEffect::close() {
deleteTexture();
}
const GLuint SuperimposeEffect::process_superimpose(double timecode) {
GLuint SuperimposeEffect::process_superimpose(double timecode) {
bool recreate_texture = false;
int width = parent_clip->getWidth();
int height = parent_clip->getHeight();
effects/effect.h
+2 -2
View File
@@ -211,7 +211,7 @@ public:
virtual void process_shader(double timecode);
virtual void process_coords(double timecode, GLTextureCoords& coords);
virtual const GLuint process_superimpose(double timecode);
virtual GLuint process_superimpose(double timecode);
virtual void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
public slots:
void field_changed();
@@ -233,7 +233,7 @@ public:
SuperimposeEffect(Clip* c, int t, int i);
virtual void open();
virtual void close();
virtual const GLuint process_superimpose(double timecode);
virtual GLuint process_superimpose(double timecode);
virtual void redraw(double timecode);
protected:
QImage img;