summaryrefslogtreecommitdiffstats
path: root/src/mixer
AgeCommit message (Collapse)Author
2021-03-11Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into mainUwe Klotz
# Conflicts: # src/library/baseexternalplaylistmodel.cpp
2021-03-11Don't set an offset or bpm lock when creating a track with a bpm value only. ↵Daniel Schürmann
Remove now unused bool parameter.
2021-03-08check bpm lock when setting beat grid of bpmDaniel Schürmann
2021-02-22Merge branch '2.3' of github.com:mixxxdj/mixxxJan Holthuis
2021-02-20fix warnings raised when building w/o vinyl controlronso0
2021-01-05Merge pull request #3382 from daschuer/hotcue_focus_off_by_one_mainUwe Klotz
Multi Preview Fix
2021-01-01Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into mainUwe Klotz
2020-12-31Fix current track display/broadcasting/recording when starting auto-DJDaniel Schürmann
2020-12-16swap if else logicDaniel Schürmann
2020-12-16Merge remote-tracking branch 'upstream/main' into hotcue_focus_off_by_one_mainDaniel Schürmann
2020-12-15Merge branch '2.3' of github.com:mixxxdj/mixxx into mainJan Holthuis
2020-12-15Replace null pointer constants (e.g. NULL, 0) with nullptrJan Holthuis
2020-12-15Add missing namespace commentsJan Holthuis
2020-12-14introduce CoreServices to decouple backend from QWidgetsBe
2020-12-07merge 2.3Be
2020-12-08Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into mainUwe Klotz
# Conflicts: # src/controllers/colormapperjsproxy.cpp # src/controllers/engine/controllerengine.cpp # src/controllers/hid/hidcontroller.cpp # src/database/mixxxdb.cpp # src/library/crate/cratetablemodel.cpp # src/library/dao/trackdao.cpp # src/library/hiddentablemodel.cpp # src/library/library.cpp # src/library/playlisttablemodel.cpp # src/library/trackset/baseplaylistfeature.cpp # src/library/trackset/crate/cratefeaturehelper.cpp # src/mixxxapplication.cpp # src/network/jsonwebtask.cpp # src/preferences/dialog/dlgpreferences.cpp # src/recording/recordingmanager.cpp # src/track/track.cpp # src/widget/wsearchlineedit.cpp
2020-12-07Merge branch '2.3' of github.com:mixxxdj/mixxx into cleanup-headersJan Holthuis
2020-12-07Slimdown moc_compilation.cppDaniel Poelzleithner
The moc_compilation file became unbearable large, easily taking 10 minutes to compile whenever a Q_OBJECT changes. AUTOMOC scans for <basename>_moc.cpp includes and does not add the file to the moc_compilation whenever it is included in the propper cpp file. After this patch, moc_compilation.cpp is empty and the mocs are compiled with the approptial cpp, increasing recompile speeds by a factor of 10 when just a header file changed.
2020-12-02Merge branch '2.3' of github.com:mixxxdj/mixxx into cleanup-headersJan Holthuis
2020-11-29Create and initalize Cues at once to avoid sending singlas with halve ↵Daniel Schürmann
initalized data
2020-11-23fix another pass by referenceDaniel Schürmann
2020-11-22Merge remote-tracking branch 'upstream/2.3' into mainDaniel Schürmann
2020-11-19Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into mainUwe Klotz
# Conflicts: # src/mixer/playermanager.h # src/util/compatibility.h
2020-11-19Pass non-trivial/large function args by referenceJan Holthuis
Fixes a bunch of `-Wclazy-function-args-by-ref` warnings. See https://github.com/KDE/clazy/blob/master/docs/checks/README-function-args-by-ref.md for details. Most of these changes are automated, using the clazy fixit by setting the `CLAZY_EXPORT_FIXES` before compilation and then running: $ mkdir /tmp/patch $ find ../src -iname "*.yaml" -exec mv {} /tmp/patch \; $ clang-apply-replacements /tmp/patch
2020-11-17PlayerManager: Use QStringLiteral for string concatenationUwe Klotz
2020-11-17PlayerManager: Use QStringBuilder for composing group stringsUwe Klotz
2020-11-17PreviewButtonDelegate: Replace string formatting with constantUwe Klotz
2020-11-15Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into mainUwe Klotz
# Conflicts: # res/controllers/mixco/novation_twitch.mixco.js # res/controllers/novation_twitch.mixco.output.js # src/controllers/dlgprefcontrollers.cpp # src/controllers/engine/controllerengine.cpp # src/controllers/midi/midicontroller.h # src/library/dao/playlistdao.cpp
2020-11-15mixer/auxiliary: Fix emit syntaxJan Holthuis
2020-11-14Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into mainUwe Klotz
# Conflicts: # src/library/dao/playlistdao.cpp # src/mixer/playermanager.cpp
2020-11-13library,mixer,util: Replace old-style Qt connect() callsJan Holthuis
2020-11-10Remove long copyright headersxerus2000
2020-11-10Use #pragma once everywherexerus2000
2020-10-31Merge branch 'main' of github.com:mixxxdj/mixxx into saved-loopsJan Holthuis
2020-10-29Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into mainUwe Klotz
# Conflicts: # src/engine/enginebuffer.cpp # src/engine/sync/synccontrol.cpp
2020-10-27Replace implicit casts from double to bool with comparisonsJan Holthuis
This fixes a lot of -Wfloat-conversion warnings on certain compilers.
2020-10-27Use ControlObject::toBool() method to fix -Wfloat-conversion errorsJan Holthuis
This fixes a bunch of warnigs regarding implicit casts from double to bool.
2020-10-27Merge remote-tracking branch 'upstream/2.3' into mainBe
2020-10-27Merge branch 'main' of github.com:mixxxdj/mixxx into saved-loopsJan Holthuis
2020-10-26Merge pull request #3200 from ronso0/cloneFromSaplerBe
add [group],CloneFromSampler control
2020-10-25Merge branch '2.3' of github.com:mixxxdj/mixxx into mainJan Holthuis
2020-10-25Merge branch '2.2' of github.com:mixxxdj/mixxx into 2.3Jan Holthuis
2020-10-24export sampler bank: add xml suffix also when file name contains '.'ronso0
2020-10-22Basetrackplayer clone: use static_cast<int> instead of lroundronso0
2020-10-22add group,CloneFromSampler controlronso0
2020-10-17Merge branch 'master' of github.com:mixxxdj/mixxx into saved-loopsJan Holthuis
2020-10-16Merge branch '2.3' of git@github.com:mixxxdj/mixxx.gitUwe Klotz
2020-10-09Merge branch 'master' of github.com:mixxxdj/mixxx into saved-loopsJan Holthuis
2020-10-09Merge branch '2.3' of github.com:mixxxdj/mixxx into float-warnings-pt-3Jan Holthuis
2020-09-29Merge branch '2.3' of git@github.com:mixxxdj/mixxx.gitUwe Klotz
# Conflicts: # src/library/dao/autodjcratesdao.h # src/library/searchquery.cpp # src/library/searchquery.h # src/library/trackset/baseplaylistfeature.h # src/library/trackset/crate/cratefeature.h # src/mixer/playermanager.h # src/test/controllerengine_test.cpp # src/test/librarytest.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 04:35:26 +0000