summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2020-10-30Update dependency: libdjinterop 0.14.3 -> 0.14.4tmpMatthias Beyer
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-10-21Add libdjinterop at 0.14.3Matthias Beyer
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-10-21Add missing lib to inputs: libsecretMatthias Beyer
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-10-20Fix: Add missing build inputsMatthias Beyer
qtkeychain needs to be overridden from nixpkgs, as nixpkgs master (as of today) has a bug where the `qtkeychain` attribute is set twice, and the latter (without qt5 enabled) gets preffered. So this patch includes an override for that package. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-10-11Fixes for correct use of experimental optionalAdam Szmigin
2020-10-11Allow selection of database version when exportingAdam Szmigin
2020-10-07Use QList<T> range ctor for later QT versions.Adam Szmigin
2020-10-07Use qWarning for warninghaslersn
2020-10-07Fix a bug where "Beat data grid has unsorted indices"haslersn
(cherry picked from commit 3864e1ec0cb61b81b20ebe4f41939b41ddbe8598)
2020-10-07Fix ceiling division bug in waveform size calcAdam Szmigin
2020-10-07Engine library export - initial implementationAdam Szmigin
2020-10-07Merge pull request #3155 from xsco/enh/djinterop-win-ciUwe Klotz
Enable djinterop on Windows CI builds
2020-10-06Enable djinterop on CI buildsmrsmidge
2020-10-04Merge remote-tracking branch 'upstream/2.3'Be
2020-10-04Merge pull request #2970 from Be-ing/hid_pollingUwe Klotz
HidController: loop until no more messages are available on poll
2020-10-04HidController: handle all possible return values from hidapiBe
2020-10-01HidController: remove reference to constant from commentBe
2020-10-01HidController: reorganize polling loop codeBe
2020-10-01Merge pull request #3143 from ronso0/pref-beatgrid-alphaDaniel Schürmann
Waveform: apply configured beatgrid opacity after start
2020-10-01Merge pull request #3137 from ronso0/track-end-markerDaniel Schürmann
Waveform: add track end markers
2020-10-01Merge branch '2.3' of git@github.com:mixxxdj/mixxx.gitUwe Klotz
2020-09-30waveform: add track end markersronso0
2020-09-30waveformwidgetfactory: use compact m_waveformWidgetHolders interator where ↵ronso0
applicable
2020-09-30waveformwidgetrenderer/waveformwidgetfactory: rename beatGridAlpha() > ↵ronso0
getBeatGridAlpha()
2020-09-30Waveform: apply configured beatgrid opacity after startronso0
2020-09-30Merge pull request #3123 from Holzhaus/float-warnings-pt-4Daniel Schürmann
Fix some -Wfloat-conversion warnings (Pt. 4)
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
2020-09-29Merge pull request #3139 from daschuer/track_declUwe Klotz
Externalize forward declarations for Track object
2020-09-29Merge pull request #3141 from ronso0/pref-waveform-default-rendererDaniel Schürmann
Waveform preferences: apply renderer when resetting to defaults
2020-09-29Merge pull request #2956 from Be-ing/rekordbox_beatmapBe
RekordboxFeature: always import beat data as a BeatMap
2020-09-29dlgprefwaveform.cpp: apply new connect() formatronso0
2020-09-29Preferences Waveform: apply renderer when resetting to defaultsronso0
2020-09-29Added a missing includeDaniel Schürmann
2020-09-29Merge pull request #3138 from EdwardMillen/hotcueplayfixDaniel Schürmann
Fix hotcue preview playback behaviour
2020-09-29replace #include "track/track.h" by "track_decl.h" in all header filesDaniel Schürmann
2020-09-28Fix hotcue preview playback behaviourEdward Millen
2020-09-28Merge pull request #3134 from uklotzde/2.3_basesqltablemodelDaniel Schürmann
BaseSqlTableModel: Delete redundant override
2020-09-28Externalize forward declarations for Track objectUwe Klotz
...to reduce compile time dependencies
2020-09-27BaseSqlTableModel: Delete redundant overrideUwe Klotz
2020-09-26HidController: add more commentsBe
2020-09-27Merge pull request #3105 from uklotzde/2.3_test_dependenciesDaniel Schürmann
Testing: Reduce dependencies / Fix non-functional test
2020-09-26Merge pull request #3113 from matthiasbeyer/nix-maintainers-from-nixpkgsJan Holthuis
shell.nix: Set maintainers to same list as in nixpkgs
2020-09-26Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3Uwe Klotz
# Conflicts: # src/library/dao/trackdao.cpp
2020-09-26Merge pull request #3131 from Holzhaus/2.2-build-fixUwe Klotz
library/dao/trackdao: Fix undeclared pTrack variable
2020-09-26library/dao/trackdao: Fix undeclared pTrack variableJan Holthuis
This causes a build error and was probably introduced by d2f3d77fae2074dc6e8d3baed4bda42bfe49a418.
2020-09-26effects/builtin/flangereffect: Fix types used for frac mathJan Holthuis
2020-09-26effects/builtin/echoeffect: Simplify timecast and use CSAMPLE_GAINJan Holthuis
2020-09-26waveform/renderers/waveformrenderersignalbase: Use float math for gainJan Holthuis
2020-09-26track/replaygain: Use toFloat() for normalizedPeakJan Holthuis
2020-09-26effects/builtin/flangereffect: Improve periodFraction calculationJan Holthuis