Fix another uninitialized sound data issue.

[nageru] / glwidget.h

diff --git a/glwidget.h b/glwidget.h
index eb26d382cc98f58aa4b57ec9d0a8fb657f459340..2cf34eb0a50364f3dc523e38daacd9db4b5249e8 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -1,13 +1,23 @@
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 
-#include <QOpenGLWidget>
-#include <QOpenGLFunctions>
-#include <QOpenGLVertexArrayObject>
-#include <QOpenGLBuffer>
-#include <QMatrix4x4>
+#include <epoxy/gl.h>
+#include <QGLWidget>
+#include <string>
+#include <vector>
 
-class GLWidget : public QOpenGLWidget
+#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).
+//
+// TODO: Consider if QOpenGLWindow could do what we want.
+class GLWidget : public QGLWidget
 {
        Q_OBJECT
 
@@ -15,12 +25,25 @@ public:
        GLWidget(QWidget *parent = 0);
        ~GLWidget();
 
-       QSize minimumSizeHint() const Q_DECL_OVERRIDE;
-       QSize sizeHint() const Q_DECL_OVERRIDE;
+       void set_output(Mixer::Output output)
+       {
+               this->output = output;
+       }
 
 protected:
-       void initializeGL() Q_DECL_OVERRIDE;
-       void paintGL() Q_DECL_OVERRIDE;
+       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:
+       Mixer::Output output;
+       GLuint vao, program_num;
+       GLuint position_vbo, texcoord_vbo;
 };
 
 #endif