Move WOverview::drawNextPixmapPart() into new class WOverviewLMH (Low Mid High), also add new HSV waveform overview and interface, to select woverview type#17

Merged

rryan merged 13 commits into

mixxxdj:masterfrom

Jun 25, 2013

Contributor

xorik commented Jun 20, 2013

This helps to change interface of woverview widget in the future (e.g. replace it with HSV, or other new types)

xorik added 2 commits

June 20, 2013 10:58


          Move some needed vars into protected part of WOverview class

70425b2


          Move WOverview::drawNextPixmapPart() into new class WOverviewLMH

c44dd80

daschuer reviewed

View reviewed changes

src/widget/woverview.h

Member

daschuer Jun 20, 2013

I know it is not your fault, but please reorder like http://www.mixxx.org/wiki/doku.php/coding_guidelines#class_declaration

Contributor Author

xorik Jun 20, 2013

Hmm, I can't see, which rule is not satisfied?

Contributor Author

xorik Jun 20, 2013

Only thing I see is /* ... */ comment, is there more errors here?

Contributor Author

xorik Jun 20, 2013

@daschuer what exact you want I need to fix?

Member

daschuer Jun 20, 2013

The order of the declaration blocks
public:
private:
protected:

Member

kain88-de Jun 20, 2013

I would prefer

public:
protected:
private:

So the most commenly used stuff is on top and not top+bottom

Contributor Author

xorik Jun 20, 2013

fixed in last commit

Member

rryan Jun 25, 2013

+1 to Max -- that's what we already use in most places.

Member

daschuer commented Jun 20, 2013

Thank you for your work!

For me it is in a merge-able state, because it does not change the current behavior, but is fist step for a configurable waveform overview. But since this is the result from our teamwork, I would like to have a confirm from an other team member before merge.

In the meanwhile it would be nice if you could check your changes against http://www.mixxx.org/wiki/doku.php/coding_guidelines. There are some braces at start of a line and some /* */ comments.


          Cosmetic cleanup in woverview.h

d482e9c

Contributor Author

xorik commented Jun 20, 2013

Should I need to create bug on launchpad for this?


          HSV renderer for the woverview widget

1f3d43b

Member

daschuer commented Jun 20, 2013

Should I need to create bug on launchpad for this?

For what? All team member will already get a copy of this discussion by mail.

Member

ywwg commented Jun 20, 2013

Bugs are only for code committed in trunk or another release branch. Since your code is still in review and in your personal branch, no bug is needed. Just go ahead and fix it! 👍

xorik added 5 commits

June 24, 2013 11:06


          Add combobox for waveform overview type into interface preferences

6825d0a


          Add controls for waveform overview combobox

95602c3


          Select HSV or LMH waveform overview type, depending on the user settings


          Use getValueString() function with default value

701b1f5


          rebootMixxxView() after changing waveform overview type

c19f67f

Contributor Author

xorik commented Jun 25, 2013

Hi guys! I just added combobox in the preferences dialog, and add functions to select and store waveform overview type, please check it

daschuer reviewed

View reviewed changes

src/dlgprefcontrols.cpp Outdated

Member

daschuer Jun 25, 2013

Please add commends to clarify what "0" is and to clarify the relation between config options and ComboBox items/index.

Contributor Author

xorik Jun 25, 2013

Please add commends to clarify what "0" is

I wrote "By default we set filtered woverview", I must write something more?

and to clarify the relation between config options and ComboBox items/index.

Hmm... I don't understand, can you give an example?

Member

daschuer Jun 25, 2013

// Waveform overview init
waveformOverviewComboBox->addItem( tr("Filtered") ); // "0"
waveformOverviewComboBox->addItem( tr("HSV") ); // "1"

// By default we set "Filtered" woverview = "0"
waveformOverviewComboBox->setCurrentIndex(
m_pConfig->getValueString(ConfigKey("[Waveform]","WaveformOverviewType"), "0").toInt());

Member

daschuer commented Jun 25, 2013

Although you have just moved most of the commented lines, you have inherit the code clean up job. Sorry ;-)

daschuer reviewed

View reviewed changes

src/skin/legacyskinparser.cpp Outdated

Member

daschuer Jun 25, 2013

// HSV = "1" or "Filtered" = "0" (LMH) waveform overview type

Contributor Author

xorik commented Jun 25, 2013

Although you have just moved most of the commented lines, you have inherit the code clean up job. Sorry ;-)

no problem :)

xorik added 2 commits

June 25, 2013 13:39


          Add some comments about waveformOverviewComboBox

7dc7818


          Cosmetic fix

6caf25d

Contributor Author

xorik commented Jun 25, 2013

@daschuer please check last commits

Member

daschuer commented Jun 25, 2013

Thank you, it looks good to me now, except some comment style violations:
//disabed_code()
// comment

IMHO we can commit after this is fixed. But lets give the other a chance for review.


          Fixing comments style for woverview widget

1e9694c

Contributor Author

xorik commented Jun 25, 2013

Done

Member

daschuer commented Jun 25, 2013

Thank you very much!

rryan reviewed

View reviewed changes

src/widget/woverviewhsv.cpp Outdated

Member

rryan Jun 25, 2013

Please change to WOverviewHSV so that timing stats are reported separately for the two overviews.

Member

rryan commented Jun 25, 2013

LGTM to me as well @xorik (other than the 2 ScopedTimer changes I just commented on) -- thanks!


          Change ScopedTimer description for WOverviewLMH and WOverviewHSV

82b453e

Contributor Author

xorik commented Jun 25, 2013

@rryan, done

rryan added a commit that referenced this pull request


          Merge pull request #17 from xorik/test

34dcb1b

Move WOverview::drawNextPixmapPart() into new class WOverviewLMH (Low Mid High), also add new HSV waveform overview and interface, to select woverview type

rryan merged commit 34dcb1b into mixxxdj:master

Member

rryan commented Jun 25, 2013

Thanks @xorik -- merged.

esbrandt mentioned this pull request

RGB waveform display #118

Merged

ywwg mentioned this pull request

Refactor the engine to process samples in the range of [-1.0, 1.0]. Fixes Bug #1204039. #126

Merged

daschuer mentioned this pull request

Spinny updates #440

Merged

daschuer mentioned this pull request

New SoundSource/AudioSource API #411

Merged

daschuer mentioned this pull request

Multi-broadcasting #1300

Merged

19 tasks

daschuer mentioned this pull request

Library Layout Redesign Single pane #1117

Closed

11 tasks

uklotzde mentioned this pull request

Replace deprecated QSignalMapper with lambda expressions #2427

Merged

Holzhaus referenced this pull request in Holzhaus/mixxx


          EngineBuffer: Fix assert when new track is loaded during playback wit…

3565e26

…h sync

When loading a track that is not yet present in the library (and thus
doesn't have any BPM because it hasn't been analyzed yet) while another
deck is playing and both decks have sync enabled, a debug assertion is
triggered:

    DEBUG ASSERT: "isValid()" in function double mixxx::Bpm::value() const at src/track/bpm.h:53
    Aborted (core dumped)

The backtrace looks as follows:

    #0  0x00007f175c87234c in __pthread_kill_implementation () at /usr/lib/libc.so.6
    #1  0x00007f175c8254b8 in raise () at /usr/lib/libc.so.6
    #2  0x00007f175c80f534 in abort () at /usr/lib/libc.so.6
    #3  0x00007f175cf05ee4 in qt_assert(char const*, char const*, int) () at /usr/lib/libQt5Core.so.5
    #4  0x000055deb2e67e1c in mixxx::(anonymous namespace)::handleMessage(QtMsgType, QMessageLogContext const&, QString const&) (type=<optimized out>, context=<optimized out>, input=<optimized out>) at src/util/logging.cpp:355
    #5  0x00007f175cf47128 in  () at /usr/lib/libQt5Core.so.5
    #6  0x00007f175cf3fd8a in  () at /usr/lib/libQt5Core.so.5
    #7  0x00007f175cf06526 in QMessageLogger::critical(char const*, ...) const () at /usr/lib/libQt5Core.so.5
    #8  0x000055deb2e5c720 in mixxx_debug_assert(char const*, char const*, int, char const*) (assertion=assertion@entry=0x55deb39bd0db "isValid()", file=file@entry=0x55deb39bbf30 "src/track/bpm.h", line=line@entry=53, function=function@entry=0x55deb39bbf08 "double mixxx::Bpm::value() const") at gsrc/util/assert.h:9
    #9  0x000055deb2ee7e7e in mixxx_debug_assert_return_true(char const*, char const*, int, char const*) (function=0x55deb39bbf08 "double mixxx::Bpm::value() const", line=53, file=0x55deb39bbf30 "src/track/bpm.h", assertion=0x55deb39bd0db "isValid()") at gsrc/util/assert.h:18
    #10 mixxx::Bpm::value() const (this=<synthetic pointer>) at src/track/bpm.h:53
    #11 mixxx::operator*(mixxx::Bpm, double) (multiple=1, bpm=...) at src/track/bpm.h:160
    #12 SyncControl::setLocalBpm(mixxx::Bpm) (this=<optimized out>, localBpm=...) at src/engine/sync/synccontrol.cpp:567
    #13 0x000055deb34c7ba3 in EngineBuffer::postProcess(int) (this=0x55deb56eb060, iBufferSize=2048) at src/engine/enginebuffer.cpp:1318
    #14 0x000055deb3139023 in EngineMaster::processChannels(int) (this=0x55deb5449440, iBufferSize=<optimized out>) at src/engine/enginemaster.cpp:383
    #15 0x000055deb31394f7 in EngineMaster::process(int) (this=0x55deb5449440, iBufferSize=iBufferSize@entry=2048) at src/engine/enginemaster.cpp:410
    #16 0x000055deb2f91d0b in SoundManager::onDeviceOutputCallback(long) (this=<optimized out>, iFramesPerBuffer=iFramesPerBuffer@entry=1024) at src/soundio/soundmanager.cpp:596
    #17 0x000055deb32dd794 in SoundDevicePortAudio::callbackProcessClkRef(long, float*, float const*, PaStreamCallbackTimeInfo const*, unsigned long) (this=0x55deb553e6b0, framesPerBuffer=1024, out=<optimized out>, in=<optimized out>, timeInfo=<optimized out>, statusFlags=<optimized out>) at src/soundio/sounddeviceportaudio.cpp:965

This happens because `newLocalBpm` is invalid when `localBpm` is
invalid. Trying to do sync decks while no tempo information is available
does not make sense, so we only synchronize decks if the local BPM is
available.

Holzhaus referenced this pull request in Holzhaus/mixxx


          EngineBuffer: Fix assert when new track is loaded during playback wit…

9614a8f

…h sync

When loading a track that is not yet present in the library (and thus
doesn't have any BPM because it hasn't been analyzed yet) while another
deck is playing and both decks have sync enabled, a debug assertion is
triggered:

    DEBUG ASSERT: "isValid()" in function double mixxx::Bpm::value() const at src/track/bpm.h:53
    Aborted (core dumped)

The backtrace looks as follows:

    #0  0x00007f175c87234c in __pthread_kill_implementation () at /usr/lib/libc.so.6
    #1  0x00007f175c8254b8 in raise () at /usr/lib/libc.so.6
    #2  0x00007f175c80f534 in abort () at /usr/lib/libc.so.6
    #3  0x00007f175cf05ee4 in qt_assert(char const*, char const*, int) () at /usr/lib/libQt5Core.so.5
    #4  0x000055deb2e67e1c in mixxx::(anonymous namespace)::handleMessage(QtMsgType, QMessageLogContext const&, QString const&) (type=<optimized out>, context=<optimized out>, input=<optimized out>) at src/util/logging.cpp:355
    #5  0x00007f175cf47128 in  () at /usr/lib/libQt5Core.so.5
    #6  0x00007f175cf3fd8a in  () at /usr/lib/libQt5Core.so.5
    #7  0x00007f175cf06526 in QMessageLogger::critical(char const*, ...) const () at /usr/lib/libQt5Core.so.5
    #8  0x000055deb2e5c720 in mixxx_debug_assert(char const*, char const*, int, char const*) (assertion=assertion@entry=0x55deb39bd0db "isValid()", file=file@entry=0x55deb39bbf30 "src/track/bpm.h", line=line@entry=53, function=function@entry=0x55deb39bbf08 "double mixxx::Bpm::value() const") at gsrc/util/assert.h:9
    #9  0x000055deb2ee7e7e in mixxx_debug_assert_return_true(char const*, char const*, int, char const*) (function=0x55deb39bbf08 "double mixxx::Bpm::value() const", line=53, file=0x55deb39bbf30 "src/track/bpm.h", assertion=0x55deb39bd0db "isValid()") at gsrc/util/assert.h:18
    #10 mixxx::Bpm::value() const (this=<synthetic pointer>) at src/track/bpm.h:53
    #11 mixxx::operator*(mixxx::Bpm, double) (multiple=1, bpm=...) at src/track/bpm.h:160
    #12 SyncControl::setLocalBpm(mixxx::Bpm) (this=<optimized out>, localBpm=...) at src/engine/sync/synccontrol.cpp:567
    #13 0x000055deb34c7ba3 in EngineBuffer::postProcess(int) (this=0x55deb56eb060, iBufferSize=2048) at src/engine/enginebuffer.cpp:1318
    #14 0x000055deb3139023 in EngineMaster::processChannels(int) (this=0x55deb5449440, iBufferSize=<optimized out>) at src/engine/enginemaster.cpp:383
    #15 0x000055deb31394f7 in EngineMaster::process(int) (this=0x55deb5449440, iBufferSize=iBufferSize@entry=2048) at src/engine/enginemaster.cpp:410
    #16 0x000055deb2f91d0b in SoundManager::onDeviceOutputCallback(long) (this=<optimized out>, iFramesPerBuffer=iFramesPerBuffer@entry=1024) at src/soundio/soundmanager.cpp:596
    #17 0x000055deb32dd794 in SoundDevicePortAudio::callbackProcessClkRef(long, float*, float const*, PaStreamCallbackTimeInfo const*, unsigned long) (this=0x55deb553e6b0, framesPerBuffer=1024, out=<optimized out>, in=<optimized out>, timeInfo=<optimized out>, statusFlags=<optimized out>) at src/soundio/sounddeviceportaudio.cpp:965

This happens because `newLocalBpm` is invalid when `localBpm` is
invalid. Trying to do sync decks while no tempo information is available
does not make sense, so we only synchronize decks if the local BPM is
available.

ronso0 mentioned this pull request

Effects: allow clearing chains with empty '---' preset #10859

Merged

ronso0 mentioned this pull request

qopenglwindow-based replacement of qglwidget, full glsl shader based waveforms, vumeters and spinnies #10989

Merged

Swiftb0y mentioned this pull request

GNOME 44 (Wayland): Context menu on tree items in side bar closes immediately #11576

Closed

m0dB referenced this pull request in m0dB/mixxx


          Merge pull request #17 from Be-ing/2.1_beta

b037747

2.1 beta announcement

acolombier mentioned this pull request

Simplify waveform preferences panel #13226

Closed

m0dB mentioned this pull request

thread sanitizer warning BrowseThread / BrowseTableModel #13861

Open

ronso0 mentioned this pull request

Fix scrolling waveform regressions #14470

Merged

koushikcs562 pushed a commit to koushikcs562/mixxx that referenced this pull request


          Add Research project idea: Scaling Decision Tree Algorithm in P4 (mix…

d8072ce

…xxdj#17)

* Add project idea Scaling Decision Tree Algorithm in P4 plus mentors update

Signed-off-by: Dscano <d.scano89@gmail.com>

* Address Bili comments

Signed-off-by: Dscano <d.scano89@gmail.com>

---------

Signed-off-by: Dscano <d.scano89@gmail.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet