Switch to memory barriers, now that Mesa 11.1 has them (ATI always had problems with...

[nageru] / glwidget.h

diff --git a/glwidget.h b/glwidget.h
index bb62940d6d5a16830db12797b837c956fd73b7cb..2cf34eb0a50364f3dc523e38daacd9db4b5249e8 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -1,11 +1,17 @@
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 
+#include <epoxy/gl.h>
 #include <QGLWidget>
+#include <string>
+#include <vector>
 
-namespace movit {
-class ResourcePool;
-}
+#include "mixer.h"
+#include "qgl.h"
+#include "qobjectdefs.h"
+
+class QMouseEvent;
+class QWidget;
 
 // Note: We use the older QGLWidget instead of QOpenGLWidget as it is
 // much faster (does not go through a separate offscreen rendering step).
@@ -19,13 +25,23 @@ public:
        GLWidget(QWidget *parent = 0);
        ~GLWidget();
 
+       void set_output(Mixer::Output output)
+       {
+               this->output = output;
+       }
+
 protected:
        void initializeGL() override;
        void resizeGL(int width, int height) override;
        void paintGL() override;
+       void mousePressEvent(QMouseEvent *event) override;
+
+signals:
+       void clicked();
+       void transition_names_updated(std::vector<std::string> transition_names);
 
 private:
-       movit::ResourcePool *resource_pool;
+       Mixer::Output output;
        GLuint vao, program_num;
        GLuint position_vbo, texcoord_vbo;
 };