diff options
17 files changed, 66 insertions, 9 deletions
diff --git a/src/waveform/renderers/glslwaveformrenderersignal.cpp b/src/waveform/renderers/glslwaveformrenderersignal.cpp index 6349eaa29f..968b328b99 100644 --- a/src/waveform/renderers/glslwaveformrenderersignal.cpp +++ b/src/waveform/renderers/glslwaveformrenderersignal.cpp @@ -6,6 +6,8 @@ #include "waveform/waveform.h" #include "waveform/waveformwidgetfactory.h" +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + GLSLWaveformRendererSignal::GLSLWaveformRendererSignal(WaveformWidgetRenderer* waveformWidgetRenderer, bool rgbShader) : WaveformRendererSignalBase(waveformWidgetRenderer), @@ -448,3 +450,5 @@ void GLSLWaveformRendererSignal::draw(QPainter* painter, QPaintEvent* /*event*/) painter->endNativePainting(); } + +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) diff --git a/src/waveform/renderers/glslwaveformrenderersignal.h b/src/waveform/renderers/glslwaveformrenderersignal.h index 95c9b81cdb..58a396792a 100644 --- a/src/waveform/renderers/glslwaveformrenderersignal.h +++ b/src/waveform/renderers/glslwaveformrenderersignal.h @@ -6,6 +6,8 @@ #include <QtOpenGL> #include <QOpenGLFunctions_2_1> +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + #include "track/track.h" #include "util/memory.h" #include "waveform/renderers/waveformrenderersignalbase.h" @@ -72,4 +74,6 @@ class GLSLWaveformRendererRGBSignal : public GLSLWaveformRendererSignal { ~GLSLWaveformRendererRGBSignal() override {} }; +#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2 + #endif // GLWAVEFORMRENDERERSIGNALSHADER_H diff --git a/src/waveform/renderers/glvsynctestrenderer.cpp b/src/waveform/renderers/glvsynctestrenderer.cpp index 9dce60906f..f4e508d0e7 100644 --- a/src/waveform/renderers/glvsynctestrenderer.cpp +++ b/src/waveform/renderers/glvsynctestrenderer.cpp @@ -5,6 +5,8 @@ #include "waveform/waveformwidgetfactory.h" #include "util/performancetimer.h" +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + GLVSyncTestRenderer::GLVSyncTestRenderer( WaveformWidgetRenderer* waveformWidgetRenderer) : WaveformRendererSignalBase(waveformWidgetRenderer), @@ -125,3 +127,5 @@ void GLVSyncTestRenderer::draw(QPainter* painter, QPaintEvent* /*event*/) { //qDebug() << timer.restart(); // 129,498 ns } + +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) diff --git a/src/waveform/renderers/glvsynctestrenderer.h b/src/waveform/renderers/glvsynctestrenderer.h index 0cb7f24387..0d9e96fd54 100644 --- a/src/waveform/renderers/glvsynctestrenderer.h +++ b/src/waveform/renderers/glvsynctestrenderer.h @@ -3,6 +3,8 @@ #include <QOpenGLFunctions_2_1> +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + #include "waveformrenderersignalbase.h" class ControlObject; @@ -20,4 +22,6 @@ private: int m_drawcount; }; +#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2 + #endif // GLVSYNCTESTRENDERER_H diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp index 65c13e9499..37f935e28a 100644 --- a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp +++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp @@ -7,6 +7,8 @@ #include <QDomNode> +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + GLWaveformRendererFilteredSignal::GLWaveformRendererFilteredSignal( WaveformWidgetRenderer* waveformWidgetRenderer) : WaveformRendererSignalBase(waveformWidgetRenderer) { @@ -223,3 +225,5 @@ void GLWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*ev painter->endNativePainting(); } + +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.h b/src/waveform/renderers/glwaveformrendererfilteredsignal.h index 71fac48f15..6adf386e5a 100644 --- a/src/waveform/renderers/glwaveformrendererfilteredsignal.h +++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.h @@ -3,6 +3,8 @@ #include <QOpenGLFunctions_2_1> +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + #include "waveformrenderersignalbase.h" class ControlObject; @@ -18,4 +20,6 @@ public: virtual void draw(QPainter* painter, QPaintEvent* event); }; +#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2 + #endif // GLWAVEFROMRENDERERFILTEREDSIGNAL_H diff --git a/src/waveform/renderers/glwaveformrendererrgb.cpp b/src/waveform/renderers/glwaveformrendererrgb.cpp index cf70ec4077..87717c700c 100644 --- a/src/waveform/renderers/glwaveformrendererrgb.cpp +++ b/src/waveform/renderers/glwaveformrendererrgb.cpp @@ -6,6 +6,8 @@ #include "widget/wskincolor.h" #include "util/math.h" +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + GLWaveformRendererRGB::GLWaveformRendererRGB( WaveformWidgetRenderer* waveformWidgetRenderer) : WaveformRendererSignalBase(waveformWidgetRenderer) { @@ -192,3 +194,5 @@ void GLWaveformRendererRGB::draw(QPainter* painter, QPaintEvent* /*event*/) { painter->endNativePainting(); } + +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) diff --git a/src/waveform/renderers/glwaveformrendererrgb.h b/src/waveform/renderers/glwaveformrendererrgb.h index 95c7ef857d..42202fe6fe 100644 --- a/src/waveform/renderers/glwaveformrendererrgb.h +++ b/src/waveform/renderers/glwaveformrendererrgb.h @@ -3,6 +3,8 @@ #include <QOpenGLFunctions_2_1> +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + #include "waveformrenderersignalbase.h" class ControlObject; @@ -21,4 +23,6 @@ class GLWaveformRendererRGB: public WaveformRendererSignalBase, DISALLOW_COPY_AND_ASSIGN(GLWaveformRendererRGB); }; +#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2 + #endif // GLWAVEFORMRENDERERRGB_H diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp index e57673cf9a..9a3ed3f377 100644 --- a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp +++ b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp @@ -6,6 +6,7 @@ #include "waveform/waveformwidgetfactory.h" #include "util/math.h" +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) GLWaveformRendererSimpleSignal::GLWaveformRendererSimpleSignal( WaveformWidgetRenderer* waveformWidgetRenderer) @@ -158,3 +159,5 @@ void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even painter->endNativePainting(); } + +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.h b/src/waveform/renderers/glwaveformrenderersimplesignal.h index 5cb1068cec..0d18916ceb 100644 --- a/src/waveform/renderers/glwaveformrenderersimplesignal.h +++ b/src/waveform/renderers/glwaveformrenderersimplesignal.h @@ -3,6 +3,8 @@ #include <QOpenGLFunctions_2_1> +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + #include "waveformrenderersignalbase.h" class ControlObject; @@ -16,4 +18,6 @@ public: virtual void draw(QPainter* painter, QPaintEvent* event); }; +#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2 + #endif // GLWAVEFORMRENDERERSIMPLESIGNAL_H diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp index 84db222b83..5dade621b9 100644 --- a/src/waveform/waveformwidgetfactory.cpp +++ b/src/waveform/waveformwidgetfactory.cpp @@ -236,10 +236,12 @@ WaveformWidgetFactory::WaveformWidgetFactory() m_openGLVersion = QString::number(majorGlVersion) + "." + QString::number(minorGlVersion); +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) if (majorGlVersion * 100 + minorGlVersion >= 201) { // Qt5 requires at least OpenGL 2.1 or OpenGL ES 2.0 m_openGlAvailable = true; } +#endif } else { if (majorGlesVersion * 100 + minorGlesVersion >= 200) { // Qt5 requires at least OpenGL 2.1 or OpenGL ES 2.0 diff --git a/src/waveform/widgets/glrgbwaveformwidget.cpp b/src/waveform/widgets/glrgbwaveformwidget.cpp index 3df7db0d86..13a3464656 100644 --- a/src/waveform/widgets/glrgbwaveformwidget.cpp +++ b/src/waveform/widgets/glrgbwaveformwidget.cpp @@ -27,7 +27,9 @@ GLRGBWaveformWidget::GLRGBWaveformWidget(const char* group, QWidget* parent) addRenderer<WaveformRendererEndOfTrack>(); addRenderer<WaveformRendererPreroll>(); addRenderer<WaveformRenderMarkRange>(); +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) addRenderer<GLWaveformRendererRGB>(); +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) addRenderer<WaveformRenderBeat>(); addRenderer<WaveformRenderMark>(); diff --git a/src/waveform/widgets/glsimplewaveformwidget.cpp b/src/waveform/widgets/glsimplewaveformwidget.cpp index ea2484e27c..54c4e4fc31 100644 --- a/src/waveform/widgets/glsimplewaveformwidget.cpp +++ b/src/waveform/widgets/glsimplewaveformwidget.cpp @@ -29,7 +29,9 @@ GLSimpleWaveformWidget::GLSimpleWaveformWidget(const char* group, QWidget* paren addRenderer<WaveformRendererEndOfTrack>(); addRenderer<WaveformRendererPreroll>(); addRenderer<WaveformRenderMarkRange>(); +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) addRenderer<GLWaveformRendererSimpleSignal>(); +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) addRenderer<WaveformRenderBeat>(); addRenderer<WaveformRenderMark>(); diff --git a/src/waveform/widgets/glslwaveformwidget.cpp b/src/waveform/widgets/glslwaveformwidget.cpp index 45dd17a5e5..c1b6f74684 100644 --- a/src/waveform/widgets/glslwaveformwidget.cpp +++ b/src/waveform/widgets/glslwaveformwidget.cpp @@ -39,11 +39,15 @@ GLSLWaveformWidget::GLSLWaveformWidget(const char* group, QWidget* parent, addRenderer<WaveformRendererEndOfTrack>(); addRenderer<WaveformRendererPreroll>(); addRenderer<WaveformRenderMarkRange>(); +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) if (rgbRenderer) { - signalRenderer_ = addRenderer<GLSLWaveformRendererRGBSignal>(); + m_signalRenderer = addRenderer<GLSLWaveformRendererRGBSignal>(); } else { - signalRenderer_ = addRenderer<GLSLWaveformRendererFilteredSignal>(); + m_signalRenderer = addRenderer<GLSLWaveformRendererFilteredSignal>(); } +#else + Q_UNUSED(rgbRenderer); +#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2 addRenderer<WaveformRenderBeat>(); addRenderer<WaveformRenderMark>(); @@ -92,6 +96,8 @@ void GLSLWaveformWidget::resize(int width, int height) { void GLSLWaveformWidget::mouseDoubleClickEvent(QMouseEvent *event) { if (event->button() == Qt::RightButton) { makeCurrent(); - signalRenderer_->debugClick(); +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) + m_signalRenderer->debugClick(); +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) } } diff --git a/src/waveform/widgets/glslwaveformwidget.h b/src/waveform/widgets/glslwaveformwidget.h index 74a131bc01..2a28d3944b 100644 --- a/src/waveform/widgets/glslwaveformwidget.h +++ b/src/waveform/widgets/glslwaveformwidget.h @@ -23,7 +23,7 @@ class GLSLWaveformWidget : public QGLWidget, public WaveformWidgetAbstract { mixxx::Duration render() override; private: - GLSLWaveformRendererSignal* signalRenderer_; + GLSLWaveformRendererSignal* m_signalRenderer; friend class WaveformWidgetFactory; }; diff --git a/src/waveform/widgets/glvsynctestwidget.cpp b/src/waveform/widgets/glvsynctestwidget.cpp index 1c979ea995..3a788d1f9b 100644 --- a/src/waveform/widgets/glvsynctestwidget.cpp +++ b/src/waveform/widgets/glvsynctestwidget.cpp @@ -26,12 +26,16 @@ GLVSyncTestWidget::GLVSyncTestWidget(const char* group, QWidget* parent) } addRenderer<WaveformRenderBackground>(); // 172 µs -// addRenderer<WaveformRendererEndOfTrack>(); // 677 µs 1145 µs (active) -// addRenderer<WaveformRendererPreroll>(); // 652 µs 2034 µs (active) -// addRenderer<WaveformRenderMarkRange>(); // 793 µs +// addRenderer<WaveformRendererEndOfTrack>(); // 677 µs 1145 µs (active) +// addRenderer<WaveformRendererPreroll>(); // 652 µs 2034 µs (active) +// addRenderer<WaveformRenderMarkRange>(); // 793 µs + +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) addRenderer<GLVSyncTestRenderer>(); // 841 µs // 2271 µs -// addRenderer<WaveformRenderMark>(); // 711 µs -// addRenderer<WaveformRenderBeat>(); // 1183 µs +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2 + + // addRenderer<WaveformRenderMark>(); // 711 µs + // addRenderer<WaveformRenderBeat>(); // 1183 µs setAttribute(Qt::WA_NoSystemBackground); setAttribute(Qt::WA_OpaquePaintEvent); diff --git a/src/waveform/widgets/glwaveformwidget.cpp b/src/waveform/widgets/glwaveformwidget.cpp index c4839496c6..b24de85ee9 100644 --- a/src/waveform/widgets/glwaveformwidget.cpp +++ b/src/waveform/widgets/glwaveformwidget.cpp @@ -29,7 +29,9 @@ GLWaveformWidget::GLWaveformWidget(const char* group, QWidget* parent) addRenderer<WaveformRendererEndOfTrack>(); addRenderer<WaveformRendererPreroll>(); addRenderer<WaveformRenderMarkRange>(); +#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) addRenderer<GLWaveformRendererFilteredSignal>(); +#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) addRenderer<WaveformRenderBeat>(); addRenderer<WaveformRenderMark>(); |