diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-12-08 23:24:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-08 23:24:37 +0100 |
commit | 3804c3f5dcfcc80578b4d9a6287ac99aa84f2706 (patch) | |
tree | 896a9def1caaefe6d8dc790d2c6a312edf0f36d7 /src | |
parent | fd0e940447b3f77e606d80e0546606d056796cd2 (diff) | |
parent | b17498c9c7b40560de7ca27783032bf49f5113a7 (diff) |
Merge pull request #3417 from Be-ing/mac_cpu_waveform_default
set default waveform renderer to RGB (non-GL) for macOS
Diffstat (limited to 'src')
-rw-r--r-- | src/waveform/waveformwidgetfactory.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp index 355f08ad60..6c26009b56 100644 --- a/src/waveform/waveformwidgetfactory.cpp +++ b/src/waveform/waveformwidgetfactory.cpp @@ -734,7 +734,9 @@ void WaveformWidgetFactory::swap() { } WaveformWidgetType::Type WaveformWidgetFactory::autoChooseWidgetType() const { - //default selection + // OpenGL waveform performance is bad on macOS with QGLWidget and Qt 5. + // TODO: remove this #ifndef when upgrading to QOpenGLWidget +#ifndef __APPLE__ if (m_openGlAvailable) { if (m_openGLShaderAvailable) { return WaveformWidgetType::GLSLRGBWaveform; @@ -742,7 +744,8 @@ WaveformWidgetType::Type WaveformWidgetFactory::autoChooseWidgetType() const { return WaveformWidgetType::GLRGBWaveform; } } - return WaveformWidgetType::SoftwareWaveform; +#endif + return WaveformWidgetType::RGBWaveform; } void WaveformWidgetFactory::evaluateWidgets() { |