Deal with a Movit change.

[nageru] / glwidget.h

diff --git a/glwidget.h b/glwidget.h
index d3972739cff27de4550b462f5cc863617620ff49..2cf34eb0a50364f3dc523e38daacd9db4b5249e8 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -3,15 +3,16 @@
 
 #include <epoxy/gl.h>
 #include <QGLWidget>
+#include <string>
+#include <vector>
 
 #include "mixer.h"
+#include "qgl.h"
+#include "qobjectdefs.h"
 
+class QMouseEvent;
 class QWidget;
 
-namespace movit {
-class ResourcePool;
-}
-
 // Note: We use the older QGLWidget instead of QOpenGLWidget as it is
 // much faster (does not go through a separate offscreen rendering step).
 //
@@ -37,10 +38,10 @@ protected:
 
 signals:
        void clicked();
+       void transition_names_updated(std::vector<std::string> transition_names);
 
 private:
        Mixer::Output output;
-       movit::ResourcePool *resource_pool;
        GLuint vao, program_num;
        GLuint position_vbo, texcoord_vbo;
 };