Fix an assertion failure when moving an input from non-interlacing to interlaced.

[nageru] / glwidget.h

diff --git a/glwidget.h b/glwidget.h
index a4b54adffecb7374c7b7a36d12a0e63f100102f8..9095e4894f2a11e062b2a1453b89a50f22c80a50 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -2,15 +2,16 @@
 #define GLWIDGET_H
 
 #include <epoxy/gl.h>
-#include <QGLWidget>
+#include <QGL>
+#include <QString>
 #include <string>
 #include <vector>
 
 #include "mixer.h"
-#include "qgl.h"
-#include "qobjectdefs.h"
 
 class QMouseEvent;
+class QObject;
+class QPoint;
 class QWidget;
 
 namespace movit {
@@ -46,11 +47,12 @@ protected:
 signals:
        void clicked();
        void transition_names_updated(std::vector<std::string> transition_names);
-       void resolution_updated(Mixer::Output output);
-       void color_updated(Mixer::Output output);
+       void name_updated(Mixer::Output output, const std::string &name);
+       void color_updated(Mixer::Output output, const std::string &color);
 
 private slots:
-       void show_context_menu(unsigned signal_num, const QPoint &pos);
+       void show_live_context_menu(const QPoint &pos);
+       void show_preview_context_menu(unsigned signal_num, const QPoint &pos);
 
 private:
        Mixer::Output output;