Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

single waveformwidget class for all allshader waveform widget types #2

Merged
merged 1 commit into from
May 22, 2024
Merged

single waveformwidget class for all allshader waveform widget types #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,11 +1528,6 @@ if(QOPENGL)
src/waveform/renderers/allshader/waveformrenderersimple.cpp
src/waveform/renderers/allshader/waveformrendermark.cpp
src/waveform/renderers/allshader/waveformrendermarkrange.cpp
src/waveform/widgets/allshader/filteredwaveformwidget.cpp
src/waveform/widgets/allshader/hsvwaveformwidget.cpp
src/waveform/widgets/allshader/rgbwaveformwidget.cpp
src/waveform/widgets/allshader/stackedwaveformwidget.cpp
src/waveform/widgets/allshader/simplewaveformwidget.cpp
src/waveform/widgets/allshader/waveformwidget.cpp
src/widget/openglwindow.cpp
src/widget/tooltipqopengl.cpp
Expand Down
4 changes: 4 additions & 0 deletions src/waveform/renderers/allshader/waveformrendererrgb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ class allshader::WaveformRendererRGB final : public allshader::WaveformRendererS
void initializeGL() override;
void paintGL() override;

bool supportsSlip() const override {
return true;
}

private:
mixxx::RGBShader m_shader;
VertexData m_vertices;
Expand Down
4 changes: 4 additions & 0 deletions src/waveform/renderers/allshader/waveformrenderersignalbase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ class allshader::WaveformRendererSignalBase : public ::WaveformRendererSignalBas

explicit WaveformRendererSignalBase(WaveformWidgetRenderer* waveformWidget);

virtual bool supportsSlip() const {
return false;
}

void draw(QPainter* painter, QPaintEvent* event) override {
Q_UNUSED(painter);
Q_UNUSED(event);
Expand Down
216 changes: 107 additions & 109 deletions src/waveform/waveformwidgetfactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@
#include "waveform/vsyncthread.h"
#ifdef MIXXX_USE_QOPENGL
#include "waveform/renderers/allshader/waveformrenderersignalbase.h"
#include "waveform/widgets/allshader/filteredwaveformwidget.h"
#include "waveform/widgets/allshader/hsvwaveformwidget.h"
#include "waveform/widgets/allshader/rgbwaveformwidget.h"
#include "waveform/widgets/allshader/simplewaveformwidget.h"
#include "waveform/widgets/allshader/stackedwaveformwidget.h"
#include "waveform/widgets/allshader/waveformwidget.h"
#else
#include "waveform/widgets/qthsvwaveformwidget.h"
#include "waveform/widgets/qtrgbwaveformwidget.h"
Expand Down Expand Up @@ -865,77 +861,86 @@ void WaveformWidgetFactory::slotFrameSwapped() {
#endif
}

void WaveformWidgetFactory::evaluateWidgets() {
m_waveformWidgetHandles.clear();
QHash<WaveformWidgetType::Type, QList<WaveformWidgetBackend>> collectedHandles;
QHash<WaveformWidgetType::Type, int> supportedOptions;
for (WaveformWidgetType::Type type : WaveformWidgetType::kValues) {
// this lambda needs its type specified explicitly,
// requiring it to be called with via `.operator()<WaveformT>()`
auto setWaveformVarsByType = [&]<typename WaveformT>() {
bool useOpenGl = WaveformT::useOpenGl();
bool useOpenGles = WaveformT::useOpenGles();
bool useOpenGLShaders = WaveformT::useOpenGLShaders();
WaveformWidgetCategory category = WaveformT::category();
WaveformWidgetBackend backend = WaveformWidgetBackend::None;

bool active = true;
if (isOpenGlAvailable()) {
if (useOpenGles && !useOpenGl) {
active = false;
} else if (useOpenGLShaders && !isOpenGlShaderAvailable()) {
active = false;
}
} else if (isOpenGlesAvailable()) {
if (useOpenGl && !useOpenGles) {
active = false;
} else if (useOpenGLShaders && !isOpenGlShaderAvailable()) {
active = false;
}
} else {
// No sufficient GL support
if (useOpenGles || useOpenGl || useOpenGLShaders) {
active = false;
}
}
void WaveformWidgetFactory::addHandle(
QHash<WaveformWidgetType::Type, QList<WaveformWidgetBackend>>&
collectedHandles,
WaveformWidgetType::Type type,
const WaveformWidgetVars& vars) const {
WaveformWidgetBackend backend = WaveformWidgetBackend::None;
bool active = true;
if (isOpenGlAvailable()) {
if (vars.m_useGLES && !vars.m_useGL) {
active = false;
} else if (vars.m_useGLSL && !isOpenGlShaderAvailable()) {
active = false;
}
} else if (isOpenGlesAvailable()) {
if (vars.m_useGL && !vars.m_useGLES) {
active = false;
} else if (vars.m_useGLSL && !isOpenGlShaderAvailable()) {
active = false;
}
} else {
// No sufficient GL support
if (vars.m_useGLES || vars.m_useGL || vars.m_useGLSL) {
active = false;
}
}

if (category == WaveformWidgetCategory::DeveloperOnly &&
!CmdlineArgs::Instance().getDeveloper()) {
active = false;
}
if (vars.m_category == WaveformWidgetCategory::DeveloperOnly &&
!CmdlineArgs::Instance().getDeveloper()) {
active = false;
}
#ifdef MIXXX_USE_QOPENGL
else if (category == WaveformWidgetCategory::AllShader) {
backend = WaveformWidgetBackend::AllShader;
}
else if (vars.m_category == WaveformWidgetCategory::AllShader) {
backend = WaveformWidgetBackend::AllShader;
}
#endif
else if (category == WaveformWidgetCategory::Legacy && useOpenGLShaders) {
backend = WaveformWidgetBackend::GLSL;
} else if (category == WaveformWidgetCategory::Legacy) {
backend = WaveformWidgetBackend::GL;
}
else if (vars.m_category == WaveformWidgetCategory::Legacy && vars.m_useGLSL) {
backend = WaveformWidgetBackend::GLSL;
} else if (vars.m_category == WaveformWidgetCategory::Legacy) {
backend = WaveformWidgetBackend::GL;
}

if (active) {
if (collectedHandles.contains(type)) {
collectedHandles[type].push_back(backend);
} else {
collectedHandles.insert(type,
QList<WaveformWidgetBackend>{backend});
}
}
};
if (active) {
if (collectedHandles.contains(type)) {
collectedHandles[type].push_back(backend);
} else {
collectedHandles.insert(type,
QList<WaveformWidgetBackend>{backend});
}
}
}

namespace {
template<typename WaveformT>
WaveformWidgetVars waveformWidgetVars() {
WaveformWidgetVars result;
result.m_useGL = WaveformT::useOpenGl();
result.m_useGLES = WaveformT::useOpenGles();
result.m_useGLSL = WaveformT::useOpenGLShaders();
result.m_category = WaveformT::category();

return result;
}
} // namespace

void WaveformWidgetFactory::evaluateWidgets() {
m_waveformWidgetHandles.clear();
QHash<WaveformWidgetType::Type, QList<WaveformWidgetBackend>> collectedHandles;
QHash<WaveformWidgetType::Type, int> supportedOptions;
for (WaveformWidgetType::Type type : WaveformWidgetType::kValues) {
switch (type) {
case WaveformWidgetType::Empty:
setWaveformVarsByType.operator()<EmptyWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<EmptyWaveformWidget>());
break;
case WaveformWidgetType::Simple:
setWaveformVarsByType.operator()<GLSimpleWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<GLSimpleWaveformWidget>());
#ifdef MIXXX_USE_QOPENGL
setWaveformVarsByType.operator()<allshader::SimpleWaveformWidget>();
supportedOptions[type] =
allshader::SimpleWaveformWidget::supportedOptions();
addHandle(collectedHandles, type, allshader::WaveformWidget::vars());
supportedOptions[type] = allshader::WaveformWidget::supportedOptions(type);
#else
setWaveformVarsByType.operator()<QtSimpleWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<QtSimpleWaveformWidget>());
#endif
break;
case WaveformWidgetType::Filtered:
Expand All @@ -944,41 +949,39 @@ void WaveformWidgetFactory::evaluateWidgets() {
// that load GL widgets (spinnies, waveforms) in singletons.
// Also excluded in enum WaveformWidgetType
// https://bugs.launchpad.net/bugs/1928772
setWaveformVarsByType.operator()<SoftwareWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<SoftwareWaveformWidget>();
#endif
setWaveformVarsByType.operator()<GLWaveformWidget>();
setWaveformVarsByType.operator()<GLSLFilteredWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<GLWaveformWidget>());
addHandle(collectedHandles, type, waveformWidgetVars<GLSLFilteredWaveformWidget>());
#ifdef MIXXX_USE_QOPENGL
setWaveformVarsByType.operator()<allshader::FilteredWaveformWidget>();
supportedOptions[type] =
allshader::FilteredWaveformWidget::supportedOptions();
addHandle(collectedHandles, type, allshader::WaveformWidget::vars());
supportedOptions[type] = allshader::WaveformWidget::supportedOptions(type);
#else
setWaveformVarsByType.operator()<QtWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<QtWaveformWidget>());
#endif
break;
case WaveformWidgetType::VSyncTest:
setWaveformVarsByType.operator()<GLVSyncTestWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<GLVSyncTestWidget>());
#ifndef MIXXX_USE_QOPENGL
setWaveformVarsByType.operator()<QtVSyncTestWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<QtVSyncTestWidget>());
#endif
break;
case WaveformWidgetType::RGB:
setWaveformVarsByType.operator()<GLSLRGBWaveformWidget>();
setWaveformVarsByType.operator()<GLSLRGBStackedWaveformWidget>();
setWaveformVarsByType.operator()<GLRGBWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<GLSLRGBWaveformWidget>());
addHandle(collectedHandles, type, waveformWidgetVars<GLSLRGBStackedWaveformWidget>());
addHandle(collectedHandles, type, waveformWidgetVars<GLRGBWaveformWidget>());
#ifndef __APPLE__
// Don't offer the simple renderers on macOS, they do not work with skins
// that load GL widgets (spinnies, waveforms) in singletons.
// Also excluded in enum WaveformWidgetType
// https://bugs.launchpad.net/bugs/1928772
setWaveformVarsByType.operator()<RGBWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<RGBWaveformWidget>());
#endif
#ifdef MIXXX_USE_QOPENGL
setWaveformVarsByType.operator()<allshader::RGBWaveformWidget>();
supportedOptions[type] =
allshader::RGBWaveformWidget::supportedOptions();
addHandle(collectedHandles, type, allshader::WaveformWidget::vars());
supportedOptions[type] = allshader::WaveformWidget::supportedOptions(type);
#else
setWaveformVarsByType.operator()<QtRGBWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<QtRGBWaveformWidget>());
#endif
break;
case WaveformWidgetType::HSV:
Expand All @@ -987,22 +990,20 @@ void WaveformWidgetFactory::evaluateWidgets() {
// that load GL widgets (spinnies, waveforms) in singletons.
// Also excluded in enum WaveformWidgetType
// https://bugs.launchpad.net/bugs/1928772
setWaveformVarsByType.operator()<HSVWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<HSVWaveformWidget>());
#endif
#ifdef MIXXX_USE_QOPENGL
setWaveformVarsByType.operator()<allshader::HSVWaveformWidget>();
supportedOptions[type] =
allshader::HSVWaveformWidget::supportedOptions();
addHandle(collectedHandles, type, allshader::WaveformWidget::vars());
supportedOptions[type] = allshader::WaveformWidget::supportedOptions(type);
#else
setWaveformVarsByType.operator()<QtHSVWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<QtHSVWaveformWidget>());
#endif
break;
case WaveformWidgetType::Stacked:
setWaveformVarsByType.operator()<GLSLRGBStackedWaveformWidget>();
addHandle(collectedHandles, type, waveformWidgetVars<GLSLRGBStackedWaveformWidget>());
#ifdef MIXXX_USE_QOPENGL
setWaveformVarsByType.operator()<allshader::StackedWaveformWidget>();
supportedOptions[type] =
allshader::StackedWaveformWidget::supportedOptions();
addHandle(collectedHandles, type, allshader::WaveformWidget::vars());
supportedOptions[type] = allshader::WaveformWidget::supportedOptions(type);
#endif
break;
default:
Expand Down Expand Up @@ -1030,6 +1031,14 @@ void WaveformWidgetFactory::evaluateWidgets() {
}
}

WaveformWidgetAbstract* WaveformWidgetFactory::createAllshaderWaveformWidget(
WaveformWidgetType::Type type, WWaveformViewer* viewer) {
allshader::WaveformRendererSignalBase::Options options =
m_config->getValue(ConfigKey("[Waveform]", "waveform_options"),
allshader::WaveformRendererSignalBase::None);
return new allshader::WaveformWidget(viewer, type, viewer->getGroup(), options);
}

WaveformWidgetAbstract* WaveformWidgetFactory::createFilteredWaveformWidget(
WWaveformViewer* viewer) {
// On the UI, hardware acceleration is a boolean (0 => software rendering, 1
Expand All @@ -1048,10 +1057,7 @@ WaveformWidgetAbstract* WaveformWidgetFactory::createFilteredWaveformWidget(
return new GLSLFilteredWaveformWidget(viewer->getGroup(), viewer);
#ifdef MIXXX_USE_QOPENGL
case WaveformWidgetBackend::AllShader: {
allshader::WaveformRendererSignalBase::Options options =
m_config->getValue(ConfigKey("[Waveform]", "waveform_options"),
allshader::WaveformRendererSignalBase::None);
return new allshader::FilteredWaveformWidget(viewer->getGroup(), viewer, options);
return createAllshaderWaveformWidget(WaveformWidgetType::Type::Filtered, viewer);
}
#else
case WaveformWidgetBackend::Qt:
Expand All @@ -1075,7 +1081,7 @@ WaveformWidgetAbstract* WaveformWidgetFactory::createHSVWaveformWidget(WWaveform
switch (backend) {
#ifdef MIXXX_USE_QOPENGL
case WaveformWidgetBackend::AllShader:
return new allshader::HSVWaveformWidget(viewer->getGroup(), viewer);
return createAllshaderWaveformWidget(WaveformWidgetType::HSV, viewer);
#endif
default:
return new HSVWaveformWidget(viewer->getGroup(), viewer);
Expand All @@ -1098,12 +1104,8 @@ WaveformWidgetAbstract* WaveformWidgetFactory::createRGBWaveformWidget(WWaveform
case WaveformWidgetBackend::GLSL:
return new GLSLRGBWaveformWidget(viewer->getGroup(), viewer);
#ifdef MIXXX_USE_QOPENGL
case WaveformWidgetBackend::AllShader: {
allshader::WaveformRendererSignalBase::Options options =
m_config->getValue(ConfigKey("[Waveform]", "waveform_options"),
allshader::WaveformRendererSignalBase::None);
return new allshader::RGBWaveformWidget(viewer->getGroup(), viewer, options);
}
case WaveformWidgetBackend::AllShader:
return createAllshaderWaveformWidget(WaveformWidgetType::Type::RGB, viewer);
#else
case WaveformWidgetBackend::Qt:
return new QtRGBWaveformWidget(viewer->getGroup(), viewer);
Expand All @@ -1127,12 +1129,8 @@ WaveformWidgetAbstract* WaveformWidgetFactory::createStackedWaveformWidget(
switch (backend) {
case WaveformWidgetBackend::GL:
return new GLSLRGBStackedWaveformWidget(viewer->getGroup(), viewer);
default: {
allshader::WaveformRendererSignalBase::Options options =
m_config->getValue(ConfigKey("[Waveform]", "waveform_options"),
allshader::WaveformRendererSignalBase::None);
return new allshader::StackedWaveformWidget(viewer->getGroup(), viewer, options);
}
default:
return createAllshaderWaveformWidget(WaveformWidgetType::Type::Stacked, viewer);
}
#else
return new GLSLRGBStackedWaveformWidget(viewer->getGroup(), viewer);
Expand All @@ -1154,7 +1152,7 @@ WaveformWidgetAbstract* WaveformWidgetFactory::createSimpleWaveformWidget(WWavef
case WaveformWidgetBackend::GL:
return new GLSimpleWaveformWidget(viewer->getGroup(), viewer);
default:
return new allshader::SimpleWaveformWidget(viewer->getGroup(), viewer);
return createAllshaderWaveformWidget(WaveformWidgetType::Type::Simple, viewer);
#else
case WaveformWidgetBackend::Qt:
return new QtSimpleWaveformWidget(viewer->getGroup(), viewer);
Expand Down
8 changes: 8 additions & 0 deletions src/waveform/waveformwidgetfactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "util/performancetimer.h"
#include "util/singleton.h"
#include "waveform/widgets/waveformwidgettype.h"
#include "waveform/widgets/waveformwidgetvars.h"

class WVuMeterLegacy;
class WVuMeterBase;
Expand Down Expand Up @@ -231,9 +232,16 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
void renderSelf();
void swapSelf();

void addHandle(
QHash<WaveformWidgetType::Type, QList<WaveformWidgetBackend>>&
collectedHandles,
Comment on lines +235 to +237
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like the out-parameter here, but we can clean that up some time else.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, I was thinking to put all this in a class with the QHash as a member. I'll add a TODO so we don't forget about it.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just referencing mixxxdj/mixxx#13245 for tracking

WaveformWidgetType::Type type,
const WaveformWidgetVars& vars) const;
void evaluateWidgets();
template<typename WaveformT>
QString buildWidgetDisplayName() const;
WaveformWidgetAbstract* createAllshaderWaveformWidget(
WaveformWidgetType::Type type, WWaveformViewer* viewer);
WaveformWidgetAbstract* createWaveformWidget(WaveformWidgetType::Type type, WWaveformViewer* viewer);
int findIndexOf(WWaveformViewer* viewer) const;

Expand Down
Loading