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.

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

Use always non GL VU-Meters in case no sufficiant GL version is available #11288

Merged
merged 1 commit into from
Feb 20, 2023

Conversation

daschuer
Copy link
Member

This fixes #11286 a regression since #10893

@daschuer daschuer added this to the 2.3.4 milestone Feb 20, 2023
@JoergAtGithub
Copy link
Member

I tested this /w and /wo --safemode for 2.3 branch and this PR. The test showed, that this VU-Meter is broken for --safemode in 2.3 branch, but not for this PR.

I noticed the following unrelated issue: If I use --safemode, OpenGL waveforms are disabled and only the non-OpenGL waveforms are listed in the preferences, as supposed to be. But none of these non-OpenGL waveforms are rendered in Safemode, if I select them, I see just a black area.
If I start Mixxx without --safemode option and select a non-OpenGL waveform, the waveforms are working.

@JoergAtGithub
Copy link
Member

Code LGTM

@JoergAtGithub JoergAtGithub merged commit d454b12 into mixxxdj:2.3 Feb 20, 2023
Comment on lines +1304 to +1305
if (!CmdlineArgs::Instance().getUseVuMeterGL() |
(!pWaveformWidgetFactory->isOpenGlAvailable() &&
Copy link
Member

Choose a reason for hiding this comment

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

typo which results in different semantics... Would probably have been caught by -Wconversion

Suggested change
if (!CmdlineArgs::Instance().getUseVuMeterGL() |
(!pWaveformWidgetFactory->isOpenGlAvailable() &&
if (!CmdlineArgs::Instance().getUseVuMeterGL() ||
(!pWaveformWidgetFactory->isOpenGlAvailable() &&

Copy link
Member

Choose a reason for hiding this comment

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

I will create a PR to fix this!

Copy link
Member

Choose a reason for hiding this comment

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

Thank you.

Copy link
Member

Choose a reason for hiding this comment

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

Here it is: #11292

napaalm added a commit to napaalm/mixxx that referenced this pull request Mar 23, 2023
napaalm added a commit to napaalm/mixxx that referenced this pull request Mar 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants