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

Fix std::bad_alloc() in WaveformRenderBeat::draw() #4789

Merged
merged 3 commits into from
Jun 7, 2022
Merged

Fix std::bad_alloc() in WaveformRenderBeat::draw() #4789

merged 3 commits into from
Jun 7, 2022

Conversation

uklotzde
Copy link
Contributor

@uklotzde uklotzde commented Jun 7, 2022

https://bugs.launchpad.net/mixxx/+bug/1977662
https://bugs.launchpad.net/mixxx/+bug/1959489

@Ronso: Please test if this fixes your issues. Then we could merge it instead of #4787.

@uklotzde uklotzde requested a review from ronso0 June 7, 2022 08:33
@uklotzde uklotzde added this to the 2.3.3 milestone Jun 7, 2022
@ronso0
Copy link
Member

ronso0 commented Jun 7, 2022

Hehe, build fails because of a typo (in the source, not your code ; )

@ronso0
Copy link
Member

ronso0 commented Jun 7, 2022

Yes, thank you, that also fixes the crash.
Also, having a blank waveform is consistent with the state after

  • Mixxx started, no track loaded
  • activate passthrough
  • load track

compared to the solution in #4787.

Though, the playposition in the overview is still stuck at the center.
I think I'll fix this in the woverview code.

@uklotzde
Copy link
Contributor Author

uklotzde commented Jun 7, 2022

Ouch, there is a typo. I tested only the main version.

src/engine/enginebuffer.cpp Outdated Show resolved Hide resolved
src/engine/enginebuffer.cpp Outdated Show resolved Hide resolved
@ronso0
Copy link
Member

ronso0 commented Jun 7, 2022

Thank you very much, LGTM

@ronso0 ronso0 self-requested a review June 7, 2022 20:21
@ronso0 ronso0 merged commit c18ad24 into mixxxdj:2.3 Jun 7, 2022
@uklotzde
Copy link
Contributor Author

uklotzde commented Jun 7, 2022

Merged into main.

@ronso0
Copy link
Member

ronso0 commented Jun 7, 2022

thanks, I got interrupted by real life and was about to do it just now.

@uklotzde
Copy link
Contributor Author

uklotzde commented Jun 7, 2022

The new debug assertions unexpectedly triggers on main:

critical [Engine] DEBUG ASSERT: "m_tempo_ratio_old != 0" in function void EngineBuffer::updateIndicators(double, int) at /home/uk/volumes/Build/cpp/mixxx/src/engine/enginebuffer.cpp:1349

 72/786 Test #708: SoundSourceProxyTest.skipAndRead ...........................................................   Passed   59.04 sec

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