summaryrefslogtreecommitdiffstats
path: root/src/mixxx.h
AgeCommit message (Collapse)Author
2020-10-31Merge remote-tracking branch 'upstream/2.2' into 2.3Be
2020-10-08Make use of QT's MouseEvent Synthesizer but modify the mouse button ↵Daniel Schürmann
according to "touch_shift"
2020-09-28Externalize forward declarations for Track objectUwe Klotz
...to reduce compile time dependencies
2020-07-20LegacySkinParser: Persist skin-created COs even on skin changesJan Holthuis
Up until now, Skin-created COs were parented to a skin widget, which means that they will be deleted when the skin is unloaded and the skin widget is destroyed. This sounds like a good idea, but it's actually quite problematic. Controller mappings may connect to these COs, and as they are not reloaded when the skin is changed these ControlProxy objects will still hold a reference to the internal ControlDoublePrivate, even though the actual ControlObject has been deleted. When switching to a skin that attempts to create a CO that has been destroyed earlier, this causes a DEBUG_ASSERT. This commit removes the parenting of skin-created control objects. Instead, all skin-created COs are put into a global set of skin COs, and its contents will only be destroyed in MixxxMainWindow::finalize(), i.e. when Mixxx is exited. That way, all skin-created COs persist accross skin changes and skins can reuse COs created by other skins. This is definitely not a pretty "solution", but it does the job: It fixes the DEBUG_ASSERT that was thrown on skin change when a controller mapping was connected a CO that was destroyed and the new skin tries to create a new CO under the same key. The controller mapping keeps working even after the skin change. Related Zulip discussion: https://mixxx.zulipchat.com/#narrow/stream/109171-development/topic/DEBUG_ASSERT.20on.20skin.20change
2020-07-07Make SettingsManager a plain C++ classUwe Klotz
2020-07-07Fix leaked controls on shutdownUwe Klotz
2020-05-16don't leak ChannelHandleFactoryDaniel Schürmann
2020-05-16Make m_pMenuBar a parented_ptrDaniel Schürmann
2020-04-12Fixes from the PR (naming , doxygen and spaces)JosepMaJAZ
2019-12-09Merge remote-tracking branch 'mixxx/master' into aux-masterronso0
2019-11-25Revert parented_ptr for TrackCollectionManager in main windowUwe Klotz
Manual deletion is required to enforce the correct order of destruction. This commit also fixes a double free bug caused by introducing parented_ptr.
2019-11-25Use parented_ptrUwe Klotz
2019-11-21Move export of track metadata from TrackCollection into LibraryUwe Klotz
2019-11-11Delete redundant virtual keywordsUwe Klotz
2019-11-10Add missing override to fix clang's -Winconsistent-missing-override warningsJan Holthuis
2019-11-04show warning when Aux,master should be toggled On without a sound device set ↵ronso0
up... also show dialog as question not a warning. changed dialog text accordingly.
2019-01-06Added new VisualsManager classDaniel Schürmann
2018-05-01Misc. typosluz.paz
Fixes found via `codespell`
2018-04-06Typo fixes luzpaz
+ User facing typos + trivial source comment typos + superflous double whitespace issues + found redundant comment typo Found using `codespell -q 3 --skip="./build/wix/Localization,./res/translations,./lib" -I ../mixxx-whitelist.txt` where the contents of the whitelist were: ``` iff freee substract ```
2017-11-21Merge remote-tracking branch 'upstream/master' into postfader_effectsbe_
2017-08-24Merge branch 'master' into multi-broadcastingStéphane L
2017-06-20Merge remote-tracking branch 'upstream/master' into postfader_effectsbe_
2017-06-17Untangle code for application startupUwe Klotz
2017-06-17Move initialization of database from Library to MainWindowUwe Klotz
2017-06-15SettingsManager: remove shared pointer typePalakis
This isn't needed in the current state of the code.
2017-06-15BroadcastSettings: make sure only one instance existsPalakis
2017-06-13pull ChannelHandleFactory out of EngineMaster and into MixxxMainWindowbe_
so both the engine and effects system can access ChannelHandles. This allows effects to store state for only two output handles. Before, each channel was used as its own output for in-place effects processing. That required the effects' state matricies to consume much more memory. Now, they only need to store the state for each input channel going to the master and headphone outputs, instead of every channel going to every other channel.
2017-03-28moved settings and logic to MixxMainWindow. Changed logic on ↵JosepMaJAZ
ScreenSaverHelper to remove inhibitOnCondition
2017-03-26Implemented inhibit on playJosepMaJAZ
2016-10-24Fix typo in function nameDaniel Schürmann
2016-10-22Added a detailed sound device error pop up during satrtupDaniel Schürmann
2016-10-22Added soundDeviceErrorDlgDaniel Schürmann
2016-10-22Fix behaviour of the Device Bussy dialog.Daniel Schürmann
Retry now actually works Apply without devices in the preferences saves the empty config Cancel keeps the old setting
2016-10-22Improve naming of device error dialogsDaniel Schürmann
2016-05-07Restore window geometry from last session instead of centeringTimothy Rae
2016-04-28Move src/configobject.(h|cpp) to src/preferences/.RJ Ryan
2016-04-27Replace "shoutcast" with "broadcast" in most places.RJ Ryan
2016-04-27Move MixxxKeyboard to src/controllers/keyboard/ and rename to ↵RJ Ryan
KeyboardEventFilter.
2016-04-26Rename TrackInfoObject to Track.RJ Ryan
At long last! Also move trackinfoobject.h/cpp to src/track/track.h/cpp.
2016-02-20Move LibraryScanner into Library. Fixes Bug #1545305.RJ Ryan
2016-01-27Re-create WMainMenuBar when changing in and out of fullscreen.RJ Ryan
2016-01-25Merge branch 'master' into menubarRJ Ryan
2016-01-25Use an enum for tooltip mode.RJ Ryan
2016-01-24Use UserSettings (typedef) instead of ConfigObject.RJ Ryan
This will allow us to experiment with different implementations for structured user preferences. It will also reduce repeated typing of template arguments and better represent the purpose of the object.
2016-01-15Move menu logic and VC/Passthrough/Mic checking out of MixxxMainWindow.RJ Ryan
Drops 1000+ lines from mixxx.h/mixxx.cpp -- now they're "only" 1400 lines!
2016-01-09Merge branch 'master' into preferences_cleanupSean M. Pappalardo
Conflicts: src/mixxx.cpp
2016-01-09Move initializeFonts out of MixxxMainWindow.RJ Ryan
2016-01-09Pull some user settings application logic out of MixxxMainWindow.RJ Ryan
Introduce UserSettingsPointer to help manage the lifecycle of the settings object.
2016-01-06Move logBuildDetails and initializeTranslations out of mixxx.cpp.RJ Ryan
2016-01-01Merge branch 'master' into preferences_cleanupSean M. Pappalardo