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

Improve sorting in the track tables BPM Options submenu #12

Merged
merged 5 commits into from
Jun 25, 2013

Conversation

esbrandt
Copy link
Contributor

Sort by the most used options and add some separators for clarity.
Also rename the submenu from BPM Settings > BPM Options. IMO this is
the more correct term since the menu contains the available options for
the BPM setting of a track.
mixxx

PS. A test to see how forks and pull request work. New to this.

Sort by the most used options and add some separators for clarity.
Also rename the submenu from BPM Settings > BPM Options. IMO this is
the more correct term since the menu contains the available options for
the BPM setting of a track.
@@ -66,7 +66,7 @@
m_pCrateMenu = new QMenu(this);
m_pCrateMenu->setTitle(tr("Add to Crate"));
m_pBPMMenu = new QMenu(this);
m_pBPMMenu->setTitle(tr("BPM Settings"));
m_pBPMMenu->setTitle(tr("BPM Options"));
Copy link
Member

Choose a reason for hiding this comment

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

How about "Adjust BPM"

Copy link
Member

Choose a reason for hiding this comment

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

Though it's not only for adjusting since you can lock/clear.

@ywwg
Copy link
Member

ywwg commented Jun 15, 2013

Other than that one note, LGTM.

@kain88-de
Copy link
Member

LGTM

Merge branch 'mixxxdj/mixxx/tree/master' into 'esbrandt/mixxx/tree/master'

Conflicts:
	mixxx/src/widget/wtracktableview.cpp
…rackeditor window. It also adds some tooltips and fixes the tab order. Could use some wordsmithing on the tooltips though. Thanks.
@esbrandt
Copy link
Contributor Author

bounty

@kain88-de
Copy link
Member

can you order them in a 2x2 grid. Otherwise I think it's nice

@esbrandt
Copy link
Contributor Author

track editor - preview

@kain88-de
Copy link
Member

perfect

rryan added a commit that referenced this pull request Jun 25, 2013
Improve sorting in the track tables BPM Options submenu
@rryan rryan merged commit a8e18f6 into mixxxdj:master Jun 25, 2013
@daschuer daschuer mentioned this pull request Dec 28, 2014
@daschuer daschuer mentioned this pull request Aug 13, 2017
19 tasks
ronso0 referenced this pull request in ronso0/mixxx Oct 25, 2017
fix positions of mixer controls, rearrange vinyl controls
@daschuer daschuer mentioned this pull request Jun 11, 2018
11 tasks
@daschuer daschuer mentioned this pull request Aug 19, 2018
Holzhaus referenced this pull request in Holzhaus/mixxx Aug 23, 2020
Add `Edit metadata of audio files` chapter, including informations on …
* Track Inline editing
* Properties editor
* MusicBrainz lookup.

Fixes mixxxdj/manual#9
ywwg pushed a commit that referenced this pull request Mar 7, 2022
…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.
m0dB pushed a commit to m0dB/mixxx that referenced this pull request Jan 21, 2024
Add Ubuntu 16.04 Xenial as supported
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants