Remove CO* constructor to COT. Cleanups. #16

daschuer · 2013-06-19T22:42:12Z

This is a refactoring, needed before we can continue to introduce additional CO changes.
I would like to merge this at first because it is already quite big and has no critical changes (I hope)

In addition of some renaming the main part of this patch is that I have decoupled CO from COT. Now it is not required to have a CO to instantiate a COT or COTM or COTW.

For the next steps, I will try to get rid of the two CO hash storages. I will replace this with a CO cache using smart pointers. Then I will try to get rid of the places where a CO and a COTM is instantiated for the same Key.
I will make CO to a Owner/Master/Creator CO and COT to a Slave/Consumer CO. I hope I can also eleminate COTM. Based on this new structure we can than introduce Int and String CO and do other nice things.

… set() for me

…ring

rryan · 2013-06-20T05:41:50Z

src/basetrackplayer.cpp

@@ -44,12 +44,12 @@
    // Set the routing option defaults for the master and headphone mixes.
    {
        ControlObjectThreadMain* pMaster = new ControlObjectThreadMain(
-            ControlObject::getControl(ConfigKey(getGroup(), "master")));
+                getGroup(), "master");


This indentation (8-space indent) doesn't match the rest of Mixxx -- please use 4-space indents.

Please! .. let us (slowly) change this to 8-space indent for line wrap!

The code is much more easy to read. Since we have the braces at the and of the line, you can instantly distinguish between a line wrap and a conditional code block. See "src/control/control.cpp @@ -49,7 +49,7 @@" below.

Here what other think:

it is the default K&R Style of Eclipse to wrap lines with 2 x indentation.

It is part of http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Function_Calls
** They wrap at the function parentheses or at 2 x default indention (2) -> 2 x 2 = 4

The function parentheses wrap is part of th Mixxx style guide as well, but it is not suitable in any cases, eg. when the function parentheses is already near the line end like in the sample above.

The same for line wrap in Function declarations http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Function_Declarations_and_Definitions

You're right, it's the right style (if Google style had 4-spaces as default indentation) -- sorry about that.

daschuer · 2013-06-20T06:27:34Z

src/control/control.cpp

@@ -49,7 +49,7 @@

 // static
 ControlDoublePrivate* ControlDoublePrivate::getControl(
-    const ConfigKey& key, bool bCreate, bool bIgnoreNops, bool bTrack) {
+        const ConfigKey& key, bool bCreate, bool bIgnoreNops, bool bTrack) {
    QMutexLocker locker(&m_sqCOHashMutex);
    QHash<ConfigKey, ControlDoublePrivate*>::const_iterator it = m_sqCOHash.find(key);
    if (it != m_sqCOHash.end()) {


here you can see th advantage of double indentation line wrap.

Yea, this has annoyed me for a long time too but for consistency with the rest of the code I was sticking to 4-space indent.

daschuer · 2013-06-20T20:47:45Z

I hope the branch is now in a merge-able state, even though i was no able to test my latest changes.

rryan · 2013-06-20T20:50:10Z

src/control/controlbehavior.cpp

+            if (dParam > 0.) { // looking for NOTE_ON doesn't seem to work...
+                // This is a possibly race condition if another writer wants
+                // to change the value at the same time. We allow the race here,
+                // because this is possible what the user expects if he changes


s/possible/possibly/

rryan · 2013-06-20T20:59:16Z

Thank you for the changes -- everything looks good except the valueChangedFromEngine() changes. You've added the signal back in but didn't add back in all the connections. Please revert the removal of the connections.

daschuer · 2013-06-20T21:59:54Z

done

rryan · 2013-06-20T22:05:39Z

Looks good to me -- thanks.

Remove CO* constructor to COT. Cleanups.

…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.

daschuer added 18 commits May 17, 2013 00:46

removed valueChangedFromEngine()

8afddd3

unified word choice for pSender, pSetter is the a function pointer to…

33dfbf9

… set() for me

added pSender to setMidiParameter

bc44569

removed setValueFromThread

78af330

removed pSender from ControlDoublePrivate::reset()

e6fdaaa

merged from lp:mixxx

f16f136

merged from lp:mixxx

f0cfd08

merged from lp:mixxx

aac8856

merged from lp:~mixxxdevelopers/mixxx/atomic-co

98e895e

Merge branch 'master' into atomic-co

8f2c854

some refactoring

059fa5b

get rid of ControlObect dependency of ControlObjectThread

ec04156

Merge remote-tracking branch 'upstream/master' into atomic-co

3df0301

get rif of ControlObject dependency of ControlObjectThreadMain

41afff9

get rid of ControlObject dependency of ControlObjectThreadWidget

c802cef

transfer ConfigKey via reference

a099961

Merge remote-tracking branch 'upstream/master' into atomic-co

56b7709

bc44569 partial reverted, for a merge request, focused on COT refacto…

4523cfd

…ring

rryan reviewed Jun 20, 2013
View reviewed changes

ghost assigned rryan Jun 20, 2013

daschuer reviewed Jun 20, 2013
View reviewed changes

daschuer added 2 commits June 20, 2013 21:55

changes from RJs comments

076f48e

repace setValueFromThread by set via a tamporary cot

bb707b1

rryan reviewed Jun 20, 2013
View reviewed changes

daschuer added 2 commits June 20, 2013 23:01

another spelling fix

6fab199

added valueChangedFromEngine connections back in

e9510b9

daschuer added a commit that referenced this pull request Jun 20, 2013

Merge pull request #16 from daschuer/atomic-co

87ea884

Remove CO* constructor to COT. Cleanups.

daschuer merged commit 87ea884 into mixxxdj:master Jun 20, 2013

ywwg mentioned this pull request Dec 20, 2013

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

Merged

uklotzde mentioned this pull request Jul 12, 2014

Update Vestax VCI-300 mapping for 1.12 #280

Merged

daschuer mentioned this pull request Dec 28, 2014

Spinny updates #440

Merged

daschuer mentioned this pull request Jan 8, 2015

New SoundSource/AudioSource API #411

Merged

daschuer mentioned this pull request Aug 13, 2017

Multi-broadcasting #1300

Merged

19 tasks

daschuer mentioned this pull request Jun 11, 2018

Library Layout Redesign Single pane #1117

Closed

11 tasks

uklotzde mentioned this pull request Jan 16, 2020

Replace deprecated QSignalMapper with lambda expressions #2427

Merged

ronso0 mentioned this pull request Sep 4, 2022

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

Merged

ronso0 mentioned this pull request May 9, 2023

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

Merged

Swiftb0y mentioned this pull request Aug 7, 2023

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

Closed

acolombier mentioned this pull request May 22, 2024

Simplify waveform preferences panel #13226

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove CO* constructor to COT. Cleanups. #16

Remove CO* constructor to COT. Cleanups. #16

daschuer commented Jun 19, 2013

rryan Jun 20, 2013

daschuer Jun 20, 2013

rryan Jun 20, 2013

daschuer Jun 20, 2013

rryan Jun 20, 2013

daschuer commented Jun 20, 2013

rryan Jun 20, 2013

rryan commented Jun 20, 2013

daschuer commented Jun 20, 2013

rryan commented Jun 20, 2013

Remove CO* constructor to COT. Cleanups. #16

Remove CO* constructor to COT. Cleanups. #16

Conversation

daschuer commented Jun 19, 2013

rryan Jun 20, 2013

Choose a reason for hiding this comment

daschuer Jun 20, 2013

Choose a reason for hiding this comment

rryan Jun 20, 2013

Choose a reason for hiding this comment

daschuer Jun 20, 2013

Choose a reason for hiding this comment

rryan Jun 20, 2013

Choose a reason for hiding this comment

daschuer commented Jun 20, 2013

rryan Jun 20, 2013

Choose a reason for hiding this comment

rryan commented Jun 20, 2013

daschuer commented Jun 20, 2013

rryan commented Jun 20, 2013