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

I have a Numark MixTrack Pro II #4326

Closed
wants to merge 2,840 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2840 commits
Select commit Hold shift + click to select a range
3f12983
User capital BPM
daschuer Aug 18, 2021
b0e4f51
Improve description of Engine Prime section
daschuer Aug 18, 2021
b8d9bac
Remove #3196 which has been backported to 2.3.0 as #3194
daschuer Aug 18, 2021
dd557b6
Improve description for #2979
daschuer Aug 18, 2021
20a8eab
Move #3868 to the inclusive paragraph
daschuer Aug 18, 2021
fb5f74d
Fix macOS spelling
daschuer Aug 18, 2021
30f1bca
Improve wording for last_played_at column
daschuer Aug 18, 2021
4c182fd
Improve description for #3811
daschuer Aug 18, 2021
54dfc02
Improved description for explicit leader
daschuer Aug 18, 2021
f6499e8
revert unintended change
daschuer Aug 18, 2021
73e3c56
User capital BPM
daschuer Aug 18, 2021
41047ec
Improve various descriptions
daschuer Aug 18, 2021
0ee41f3
remove redundant #3076 entry
daschuer Aug 18, 2021
dc44a3e
remove redundant entry about QT_MESSAGE_PATTERN
daschuer Aug 18, 2021
f2d3acc
Clarify what to do in case of unwanted commits
daschuer Aug 18, 2021
ef69bc9
Fix spelling of non-existent
daschuer Aug 18, 2021
6b9128a
CueControl: Use mixxx::audio::FramePos for used seek on load position
Holzhaus Aug 18, 2021
58c9c90
Mention the case when the author is not fluent in git
daschuer Aug 18, 2021
babfa2a
Merge pull request #4220 from daschuer/dont_sqash
Swiftb0y Aug 18, 2021
f63cc50
Merge pull request #4221 from Holzhaus/cuecontrol-seekonload-framepos
Swiftb0y Aug 18, 2021
702acf7
Added FindJACK.cmake
daschuer Aug 12, 2021
afeebd0
Fix spelling error
uklotzde Aug 18, 2021
cb4f971
Detach library preference constants from class definition
uklotzde Aug 18, 2021
2b29682
README: Add coverage status badge
Holzhaus Aug 18, 2021
36c9924
README: Move Build status near other status badges
Holzhaus Aug 18, 2021
d97033a
Merge pull request #4226 from Holzhaus/readme-coveralls-badge
uklotzde Aug 18, 2021
af4c57e
Fix FindJACK.cmake for cases others than windows
daschuer Aug 12, 2021
ee1ce4a
Remove unnecessary regex dependency from FindJACK.cmake
daschuer Aug 18, 2021
4b1fd4e
[portaudio] directly link to jack in the static case
daschuer Aug 12, 2021
1325061
Switch to the vcpkg environment for osx and update windows environmen…
daschuer Jul 7, 2021
974ecc5
install ccache and make from Homebrew
daschuer Jul 7, 2021
86be653
make pkg-config alo look also for hidapi
daschuer Aug 18, 2021
c5edb37
Switch to Ninja for macOS builds
daschuer Aug 18, 2021
d814cd4
CHANGELOG.md: Add missing newline after headline
Holzhaus Aug 18, 2021
cd7b895
CONTRIBUTING.md: Fix some markdown formatting issues
Holzhaus Aug 18, 2021
02d59bb
Merge pull request #4228 from Holzhaus/markdown-formatting
daschuer Aug 19, 2021
8aea341
Merge pull request #4219 from Holzhaus/loopingcontroltest-framepos
uklotzde Aug 19, 2021
7ad5b80
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Aug 19, 2021
9634231
Fix spelling in comments
uklotzde Aug 19, 2021
52bcaf1
Merge pull request #4203 from Holzhaus/whitespace-fixes
uklotzde Aug 19, 2021
656feb1
Merge branch 'main' of git@github.com:mixxxdj/mixxx.git into library_…
uklotzde Aug 19, 2021
0774a04
Merge pull request #4191 from Holzhaus/bpmcontrol-framepos
uklotzde Aug 19, 2021
1517dbd
Added common kNullKey to lower the controlproxy memory footprint
daschuer Jun 20, 2018
08fa6df
Remove inefficient const char* constructor
daschuer Jan 1, 2019
1af2412
use const ref
daschuer Nov 26, 2019
b8e8abb
Save a default CO to ommit null checks everywhere.
daschuer Nov 26, 2019
d64e38f
HotcueControl: Use mixxx::audio::FramePos for previewing position
Holzhaus Aug 19, 2021
bdc9c37
LoopingControlTest: Fix wrong usage of FramePos for beatloop size CO
Holzhaus Aug 19, 2021
6ae4c0a
Beats: Rename deserialization functions to `fromByteArray()`
Holzhaus Aug 19, 2021
8299a06
Beats: Move deserialization logic from BeatFactory class
Holzhaus Aug 19, 2021
fb29af1
Remove more redundant null checks
daschuer Nov 26, 2019
0efa809
Merge pull request #4232 from Holzhaus/loopingcontroltest-wrong-expect
uklotzde Aug 19, 2021
ccef574
Merge pull request #4233 from Holzhaus/beats-frombytearray
uklotzde Aug 19, 2021
c0a2093
Merge pull request #4231 from Holzhaus/hotcuecontrol-previewing-framepos
uklotzde Aug 19, 2021
bebbd6a
Improve assertions with ControlFlags
daschuer Aug 20, 2021
b65fefd
Remove redundant inline keyword in a class definition
daschuer Aug 20, 2021
294351a
Make the default constructed ControlObject really const
daschuer Aug 20, 2021
b21d1b4
move private static variables to anonymous namespace
daschuer Aug 20, 2021
98d1c9f
Protect against creating two default COs from two threads.
daschuer Aug 20, 2021
17b9502
Beats: Move identical method implementations from BeatGrid/BeatMap
Holzhaus Aug 19, 2021
4e8b180
Rename s_pDefaultCO
daschuer Aug 20, 2021
f1a7b67
remove redundant static keyword from the anonymous namespace
daschuer Aug 20, 2021
881eb71
Remove redundant nullptr initalisation of QAtomicPointer
daschuer Aug 20, 2021
0e94198
Assert that ControlDoublePrivate::setUserConfig() is not called unece…
daschuer Aug 20, 2021
48de8ed
Assert that persistant COs have access to the user settings
daschuer Aug 20, 2021
eb26629
Make use of QWeakPointer::lock()
daschuer Aug 20, 2021
b0fe71d
Beats: Remove comments stating the obvious
Holzhaus Aug 20, 2021
49d9f5c
Merge pull request #4234 from Holzhaus/beats-common-methods
Be-ing Aug 20, 2021
6ad1449
Merge pull request #4229 from daschuer/controlproxytweaks
uklotzde Aug 20, 2021
2458444
Ensure that declaration and definition of constants match
uklotzde Aug 20, 2021
5080d9f
ControlDoublePrivate: Make sure the warning is printed before the ass…
daschuer Aug 20, 2021
e124d1a
Replace DEBUG_ASSERT(false) with an inverted string literal
daschuer Aug 21, 2021
7bb2f29
Merge pull request #4223 from uklotzde/library_prefs
daschuer Aug 21, 2021
1afe0de
Add missing QStringLiteral and use list initialization
uklotzde Aug 21, 2021
ceeeefe
Hide private ConfigKey constants
uklotzde Aug 21, 2021
ac53367
Library Prefs: Add kKeyNotationConfigKey
uklotzde Aug 21, 2021
31b5eea
Library Prefs: Add kSeratoMetadataExportConfigKey
uklotzde Aug 21, 2021
c9df5af
Merge pull request #4236 from daschuer/assert_debug
uklotzde Aug 21, 2021
28581b9
Re-use cfg file parser from ConfiObject
daschuer Aug 22, 2021
7ffa8f6
IsStaticLibrary: Static library detection on windows is not implement…
daschuer Aug 23, 2021
0444717
set visibility=hidden related CMake variables
daschuer Aug 23, 2021
f2258d1
Merge pull request #4238 from uklotzde/library_prefs
Be-ing Aug 24, 2021
471f376
Merge remote-tracking branch 'upstream/2.3'
Be-ing Aug 25, 2021
3ac09c1
do not assume PortAudio on Linux was built with ALSA backend
Be-ing Aug 25, 2021
bc824ec
Suppress expected and harmless schema migration errors
uklotzde Aug 26, 2021
9b575f0
Merge remote-tracking branch 'upstream/2.3'
Be-ing Aug 27, 2021
c9f9d3c
Merge pull request #4242 from Be-ing/portaudio_no_alsa
uklotzde Aug 27, 2021
49f9169
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Aug 28, 2021
68043a4
Require TagLib 1.11 or newer
uklotzde Aug 28, 2021
e42c162
CMake: check for TagLib >= 1.11
Be-ing Aug 28, 2021
8699e61
CMake: fix version detection for TagLib
Be-ing Aug 28, 2021
6c5e0f7
Merge pull request #18 from Be-ing/taglib_cmake_version_check
uklotzde Aug 28, 2021
0dba5ac
Merge pull request #4251 from uklotzde/taglib-1.11
Be-ing Aug 28, 2021
5c917f1
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Aug 29, 2021
50b40ab
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Aug 29, 2021
6f4fc8e
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Aug 29, 2021
70ebab0
Silence warnings for expected invalid keys.
daschuer Sep 1, 2021
aa579bc
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Sep 1, 2021
705a390
Merge pull request #4257 from daschuer/lp1942350
Holzhaus Sep 1, 2021
d1b651a
TrackDAO: Only set beatgrid if BPM is valid
Holzhaus Sep 3, 2021
c3302b7
EngineSyncTest: Do not attempt to create invalid beatgrids
Holzhaus Sep 3, 2021
0092d39
BeatGrid: Add debug assertions for valid BPM and position
Holzhaus Sep 3, 2021
43a29e8
BeatFactory: Remove static makeBeatGrid function
Holzhaus Sep 3, 2021
c8ed990
Remove unused includes of "beatfactory.h"
Holzhaus Sep 3, 2021
31b5e6c
Merge pull request #4258 from Holzhaus/makebeatgrid
uklotzde Sep 3, 2021
3e4c2be
BeatsPointer: Use std::shared_ptr instead of QSharedPointer
Holzhaus Sep 3, 2021
ed2a2f9
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Sep 4, 2021
9d11158
Merge pull request #4259 from Holzhaus/beats-std-ptr
uklotzde Sep 4, 2021
4059a0c
Merge branch '2.3' of github.com:mixxxdj/mixxx
Holzhaus Sep 4, 2021
311fb24
BeatFactory: Round beatgrid frame positions in makePreferredBeats()
Holzhaus Sep 4, 2021
d585e26
Merge pull request #4263 from Holzhaus/beatgrid-frame-boundary
uklotzde Sep 4, 2021
6155543
Don't disable loop cues when latching it via play. lp1942656
daschuer Sep 5, 2021
6efff85
LoopingControl: Handle invalid start position properly (lp1942715)
Holzhaus Sep 5, 2021
d8f91a9
LoopingControl: Combine loop reset code paths in slotLoopStartPos()
Holzhaus Sep 6, 2021
dc8ef5b
Merge pull request #4265 from daschuer/lp1942656
Be-ing Sep 6, 2021
6fe9011
LoopingControl: Reduce usage of `position` variable in `slotLoopStart…
Holzhaus Sep 6, 2021
97cd3df
Merge pull request #4266 from Holzhaus/looping-startpos-fix
daschuer Sep 7, 2021
a0dc7c8
EngineBuffer: Use mixxx::audio::FramePos for seeking
Holzhaus Aug 10, 2021
1d9490d
EngineBuffer: Use mixxx::audio::FramePos internally
Holzhaus Aug 10, 2021
169cd3e
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Sep 7, 2021
0fef878
Merge remote-tracking branch 'upstream/2.3'
Be-ing Sep 7, 2021
5f7300e
sidebar: Left key jumps to parent and activates it
ronso0 Aug 29, 2021
ce865c7
Fix debug assertion in BeatFactory::makePreferredBeats()
uklotzde Sep 7, 2021
c468680
Check earlier if the first beat is valid
uklotzde Sep 8, 2021
9c42ccc
Beat detection: Check preconditions and handle edge cases
uklotzde Sep 8, 2021
8c4afc8
BeatUtils::makeConstBpm(): Do not return a bogus default bpm
uklotzde Sep 8, 2021
4e3398d
BeatUtils: Use QVector::isEmpty() instead of !size() to check emptiness
Holzhaus Sep 8, 2021
ef72d53
BeatUtils: Use QVector::last() instead of QVector::[QVector::size() - 1]
Holzhaus Sep 8, 2021
c788690
BeatUtils: Rename constant to kMaxOutliersCount for consistency
Holzhaus Sep 8, 2021
bc616cc
EngineBuffer: Improve calculation of m_slipPosition in processSlip()
Holzhaus Sep 8, 2021
dec27e2
Merge pull request #4272 from Holzhaus/beatutils-cleanup
uklotzde Sep 8, 2021
a9862ee
Merge branch 'main' of git@github.com:mixxxdj/mixxx.git into makePref…
uklotzde Sep 8, 2021
e405c47
Merge pull request #4248 from uklotzde/schema-migration
Holzhaus Sep 8, 2021
a0ff12b
Merge pull request #4217 from Holzhaus/enginebuffer-framepos
uklotzde Sep 8, 2021
1cda303
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Sep 8, 2021
afbf85f
Improve headlines for consistency
daschuer Sep 8, 2021
72530a6
Merge remote-tracking branch 'upstream/2.3'
Be-ing Sep 8, 2021
0cabef1
Merge remote-tracking branch 'upstream/main' into 2.4.0_changelog
daschuer Sep 8, 2021
78a547f
Merge pull request #4210 from daschuer/2.4.0_changelog
Holzhaus Sep 8, 2021
22a29b9
Update CHANGELOG
daschuer Sep 8, 2021
48392a8
LateNight: fix button svg warnings
ronso0 Sep 8, 2021
b8a34a0
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Sep 8, 2021
dc0a04a
Beats: Add static methods to create const/nonconst beats
Holzhaus Sep 7, 2021
efa3e80
BeatMap: Remove all usage ouside of the Beats class
Holzhaus Sep 6, 2021
39222ac
BeatGrid: Remove all usage ouside of the Beats class
Holzhaus Sep 7, 2021
deb436a
Merge remote-tracking branch 'upstream/main' into vcpkg_osx
daschuer Sep 9, 2021
eeea61c
Unpdate to new build environment fixing protobuf related linker warnings
daschuer Sep 9, 2021
a6da64b
Merge pull request #4275 from daschuer/2.4.0_changelog
Holzhaus Sep 9, 2021
d1f1ede
Set always CC and CXX environment variable to make sure cmake finds a…
daschuer Sep 9, 2021
03f77a3
Update linux/org.mixxx.Mixxx.metainfo.xml from changelog
Holzhaus Sep 9, 2021
3c857e7
install ccache and ninja at once
daschuer Sep 9, 2021
4989a4b
Merge pull request #4268 from Holzhaus/beats-private
uklotzde Sep 9, 2021
b68d3b9
Export MACOSX_DEPLOYMENT_TARGET=10.12
daschuer Sep 9, 2021
5794db2
Merge branch 'main' of git@github.com:mixxxdj/mixxx.git into makePref…
uklotzde Sep 10, 2021
b532f64
Merge pull request #4276 from ronso0/late-missing-svg
uklotzde Sep 11, 2021
b9f31aa
bump PPA version to 2.4.0~alpha2
daschuer Sep 11, 2021
46182d1
rename storeScaleFactor() to setScalefactor()
daschuer Sep 12, 2021
2b9dd0b
macos_buildenv.sh: remove hack download macOS 10.13 SDK
Be-ing Sep 13, 2021
380798f
macos_buildenv.sh: remove hack setting CC & CXX
Be-ing Sep 13, 2021
70143a1
move vars from buildenv scripts to CMakeLists.txt
Be-ing Sep 13, 2021
d213b16
CMake: add Windows-specific overlay when using vcpkg
Be-ing Sep 13, 2021
13b9c40
CMake: reorganize CMAKE_OSX_DEPLOYMENT_TARGET code
Be-ing Sep 13, 2021
9a85d24
Merge pull request #68 from Be-ing/vcpkg_osx
daschuer Sep 13, 2021
50ffc34
Merge remote-tracking branch 'upstream/2.3'
Swiftb0y Sep 13, 2021
ce8188c
eslintrc.json: add new es6-specific rules
Swiftb0y Sep 13, 2021
dff40de
eslintrc.json: remove deprecated print() from globals
Swiftb0y Sep 13, 2021
5a3a939
macos_buildenv.sh: delete ZIP after extracting
Be-ing Sep 13, 2021
6433f5b
CMake: always set CMAKE_OSX_DEPLOYMENT_TARGET=10.12
Be-ing Sep 13, 2021
95b4c72
update build environments to fix Debug macOS build
Be-ing Sep 13, 2021
ba787fd
Merge pull request #69 from Be-ing/vcpkg_osx
daschuer Sep 13, 2021
f687259
Merge pull request #4282 from Swiftb0y/eslint-rules
uklotzde Sep 13, 2021
4327e3f
Merge pull request #4225 from daschuer/vcpkg_osx
Be-ing Sep 14, 2021
93bef54
CMake: use ${QT_VERSION_MAJOR} instead of hardcoding Qt5
Be-ing Jul 3, 2021
751dbe6
CMake: remove legacy path for fixup_bundle
Be-ing Sep 14, 2021
af50f69
Merge pull request #4277 from daschuer/ppa-alpha2
uklotzde Sep 14, 2021
5b8a7a5
Merge pull request #4253 from ronso0/sidebar-left
uklotzde Sep 14, 2021
ac51d27
Merge pull request #3960 from daschuer/Q_SCALE_FACTOR
uklotzde Sep 14, 2021
f4b79e9
Merge remote-tracking branch 'upstream/2.3' into main
daschuer Sep 15, 2021
2e6a3a1
Update Translation template. Found 2718 source text(s) (35 new and 26…
daschuer Sep 15, 2021
a24a470
Pull latest translations from https://www.transifex.com/mixxx-dj-soft…
daschuer Sep 15, 2021
cd3da36
Added libwavpack-dev to enable wavpack playback
daschuer Sep 15, 2021
ca8472f
Added libudev-dev, required in case the installed hidapi is too old
daschuer Sep 15, 2021
3bd653e
Merge pull request #4285 from daschuer/ppa_fix
uklotzde Sep 15, 2021
8d87c62
CMake: remove unused code for copying Qt plugins to macOS bundle
Be-ing Sep 16, 2021
9fc8b6b
Merge pull request #4052 from Be-ing/qt6_prereqs
uklotzde Sep 16, 2021
07f675a
Merge pull request #4270 from uklotzde/makePreferredBeats
daschuer Sep 16, 2021
62daaf7
BeatGrid & BeatMap: remove unused #include
Be-ing Sep 17, 2021
44170cc
use Qt5/6 QMutex & QMutexLocker compatibility macros
Be-ing Sep 17, 2021
ba5918b
QmlEffectsManagerProxy: fully define QmlVisibleEffectsModel
Be-ing Sep 17, 2021
8fe2d54
explicitly convert QStrings to QFileInfos
Be-ing Sep 17, 2021
7243aab
resolve ambiguous overload of QJSValue constructor
Be-ing Sep 17, 2021
465dccc
ColorMapper: add missing #include <QVariant>
Be-ing Sep 17, 2021
23bb0f2
Merge pull request #4295 from Be-ing/colormapper_qvariant_include_qt6
uklotzde Sep 17, 2021
df1e179
Merge pull request #4293 from Be-ing/qfileinfo_qt6
uklotzde Sep 17, 2021
c9711b6
Merge pull request #4294 from Be-ing/qjsvalue_size
uklotzde Sep 17, 2021
ddbf8af
Merge pull request #4291 from Be-ing/qmlvisibleeffectsmodel_qt6
uklotzde Sep 17, 2021
ab6839d
Remove no longer valid assertion, fixing lp1943643
daschuer Sep 17, 2021
f514962
Merge pull request #4290 from Be-ing/qmutexlocker
uklotzde Sep 18, 2021
efb126c
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Sep 18, 2021
7b849fb
Merge pull request #4297 from daschuer/lp1943643
uklotzde Sep 18, 2021
a7ea1f9
Fix segfault when deleting the last history playlist under a year fol…
daschuer Sep 18, 2021
fa8dae5
CMake: add option to build with Qt6
Be-ing Sep 16, 2021
ea61dab
DbId: fix QMetaType deprecation warning with Qt6
Be-ing Sep 18, 2021
57b3e69
string utils: fix deprecation warnings with Qt6
Be-ing Sep 18, 2021
c438378
Merge pull request #4298 from daschuer/lp1944029
uklotzde Sep 18, 2021
81884d6
replace QRegEx with QRegularExpression
Be-ing Sep 17, 2021
3a6bd19
Fix parsing of numeric operators in search queries
uklotzde Sep 18, 2021
2d4f7d0
Fix parsing of duration seconds in search queries
uklotzde Sep 18, 2021
4d5e2e9
add Qt5/6 compatibility typedef for qHash seed type
Be-ing Sep 17, 2021
ff87875
Merge pull request #4300 from Be-ing/qmetatype_dbid_qt6
uklotzde Sep 18, 2021
3195bd5
Merge pull request #4302 from Be-ing/string_conversions_qt6
uklotzde Sep 18, 2021
c93ee05
RgbColor: fix QVariant deprecation warnings with Qt6
Be-ing Sep 18, 2021
d480aa0
Merge pull request #4289 from Be-ing/qregularexpression
uklotzde Sep 19, 2021
84283bf
Merge pull request #4292 from Be-ing/qhash_qt6
uklotzde Sep 19, 2021
34d29c4
Merge pull request #4299 from Be-ing/qvariant_qt6
uklotzde Sep 19, 2021
d6a5ff8
Move compatibility workarounds for QMutex into new subdirectory
uklotzde Sep 19, 2021
8dcd528
Merge pull request #4051 from Be-ing/qt6
uklotzde Sep 19, 2021
0580818
Merge pull request #4303 from uklotzde/qmutex
Be-ing Sep 19, 2021
1da8395
BrowseTableModel: Move utility function into .cpp file
uklotzde Sep 19, 2021
c3fc9c6
convertWCStringToQString: Fix switch/case conditions
uklotzde Sep 19, 2021
1b45aaf
Merge pull request #4305 from uklotzde/convertWCStringToQString
Be-ing Sep 19, 2021
4f7d086
Merge pull request #4304 from uklotzde/browsetablemodel
Be-ing Sep 19, 2021
2db57cc
add halve/double controls for beatjump size
ronso0 Sep 7, 2021
968bda6
Extract Qt atomic operation wrappers into separate header file
uklotzde Sep 19, 2021
d31c431
Merge pull request #4306 from uklotzde/qatomic
Be-ing Sep 19, 2021
e896c34
Extract utility functions for QUuid
uklotzde Sep 19, 2021
efdcb7c
Remove obsolete QUuid utility function
uklotzde Sep 19, 2021
5ca10ef
Improve QUuid to QString tests
uklotzde Sep 19, 2021
c96b23a
Improve QUuid to QString tests (again)
uklotzde Sep 19, 2021
dfa61fa
Merge pull request #4308 from uklotzde/quuid
Be-ing Sep 19, 2021
2836a4f
remove getDevicePixelRatioF compatibility function
Be-ing Sep 19, 2021
2f08b4f
remove obsolete getPrimaryScreen compatibility function
Be-ing Sep 19, 2021
4bf6196
Merge pull request #4309 from Be-ing/devicepixelratio_qt56
uklotzde Sep 19, 2021
9e1af98
set continue-on-error: true for coveralls.io upload
daschuer Sep 19, 2021
ae58213
Merge pull request #4313 from daschuer/coveralls
uklotzde Sep 20, 2021
4ef9b6c
Merge pull request #4269 from ronso0/beatjump-size-halvedouble
daschuer Sep 20, 2021
158a254
Merge remote-tracking branch 'upstream/2.3' into main
daschuer Sep 20, 2021
86bcfcc
Shade: restore mixer bg from 2.3
ronso0 Sep 21, 2021
4a87f8b
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Sep 22, 2021
884c6dc
GitHub CI: Fix pre-commit
uklotzde Sep 22, 2021
48617bf
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
uklotzde Sep 23, 2021
29be1a4
GlobalTrackCache: Use Qt compatibility layer for mutex
uklotzde Sep 23, 2021
2e67b4c
Clean up QMutex/QMutexLocker includes
uklotzde Sep 23, 2021
bd5b9af
CI: Update Docker image for GitHub pre-commit workflow
Holzhaus Sep 23, 2021
bff6a40
Merge pull request #19 from Holzhaus/github-pre-commit
uklotzde Sep 23, 2021
006fc86
Merge pull request #4322 from uklotzde/compatibility-qmutex
Be-ing Sep 23, 2021
5ed5164
Merge pull request #4321 from uklotzde/github-pre-commit
Holzhaus Sep 23, 2021
3926fde
Merge remote-tracking branch 'upstream/2.3' into main
daschuer Sep 26, 2021
edf209a
Promote simple const variables to constexpr
tcoyvwac Sep 26, 2021
eff27ab
Merge pull request #4325 from tcoyvwac/fix/constexpr-simple-variables
Be-ing Sep 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 8 additions & 9 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ SpacesBeforeTrailingComments: 1
# StatementMacros don't require a trailing semicolon.
# Trailing semicolons should be omitted after these macros
# when compiling with -Wpedantic to avoid warnings.
# TODO: Enable if Clang 8 is available, Ubuntu 18.04 uses Clang 6
#StatementMacros:
# - Q_DECLARE_FLAGS
# - Q_DECLARE_METATYPE
# - Q_DECLARE_OPERATORS_FOR_FLAGS
# - Q_OBJECT
# - Q_PROPERTY
# - Q_UNUSED
# - QT_REQUIRE_VERSION
StatementMacros:
- Q_DECLARE_FLAGS
- Q_DECLARE_METATYPE
- Q_DECLARE_OPERATORS_FOR_FLAGS
- Q_OBJECT
- Q_PROPERTY
- Q_UNUSED
- QT_REQUIRE_VERSION
---
Language: JavaScript
# Don't format .js files yet
Expand Down
1 change: 1 addition & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Crate
crate
InOut
copyable
sord
8 changes: 6 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 5,
"ecmaVersion": 7,
"sourceType": "script"
},
"env": {
"es6": true
},
"rules": {
"array-bracket-spacing" : "warn",
"block-spacing": "warn",
Expand Down Expand Up @@ -39,11 +42,13 @@
"no-unused-vars": ["error", {
"argsIgnorePattern": "^_"
}],
"no-var": "warn",
"object-curly-newline" : ["warn", {
"consistent": true,
"multiline": true
}],
"object-curly-spacing" : "warn",
"prefer-const": "warn",
"prefer-regex-literals": "warn",
"quotes": ["warn", "double"],
"require-atomic-updates": "error",
Expand All @@ -57,7 +62,6 @@
"globals": {
"console": "writable",
"svg": "writable",
"print": "readonly",
"HIDController": "writable",
"HIDDebug": "writable",
"HIDPacket": "writable",
Expand Down
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
custom: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QSFMYWN2B3JD2&source=url"
custom: "https://mixxx.org/donate"
96 changes: 59 additions & 37 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,14 @@ jobs:
include:
- name: clazy
- name: clang-tidy
- name: coverage
runs-on: ubuntu-20.04
name: ${{ matrix.name }}
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Install build dependencies
run: |
sudo apt-get update && sudo apt-get install -y --no-install-recommends \
libavformat-dev \
libchromaprint-dev \
libebur128-dev \
libfftw3-dev \
libflac-dev \
libid3tag0-dev \
liblilv-dev \
libmad0-dev \
libmodplug-dev \
libmp3lame-dev \
libopus-dev \
libopusfile-dev \
libportmidi-dev \
libprotobuf-dev \
libqt5opengl5-dev \
libqt5sql5-sqlite \
libqt5svg5-dev \
libqt5x11extras5-dev \
librubberband-dev \
libshout-idjc-dev \
libsndfile1-dev \
libsoundtouch-dev \
libsqlite3-dev \
libtag1-dev \
libupower-glib-dev \
libusb-1.0-0-dev \
libwavpack-dev \
portaudio19-dev \
protobuf-compiler \
qt5-default \
qtscript5-dev \
qt5keychain-dev \
clazy \
clang-tidy \
cmake
run: tools/debian_buildenv.sh setup
- name: Create build directory
run: mkdir build
- name: Configure (clazy)
Expand Down Expand Up @@ -107,6 +72,31 @@ jobs:
-DWAVPACK=ON \
..
working-directory: build
- name: Configure (coverage)
if: matrix.name == 'coverage'
run: |
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DOPTIMIZE=off \
-DCOVERAGE=ON \
-DWARNINGS_FATAL=OFF \
-DDEBUG_ASSERTIONS_FATAL=OFF \
-DBATTERY=ON \
-DBROADCAST=ON \
-DBULK=ON \
-DHID=ON \
-DLILV=ON \
-DOPUS=ON \
-DQTKEYCHAIN=ON \
-DVINYLCONTROL=ON \
-DFFMPEG=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
-DMAD=ON \
-DMODPLUG=ON \
-DWAVPACK=ON \
..
working-directory: build
- name: Set up problem matcher
uses: ammaraskar/gcc-problem-matcher@master
- name: Build
Expand All @@ -116,3 +106,35 @@ jobs:
env:
CLAZY_CHECKS: level2,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-wrong-qevent-cast,no-qstring-allocations,no-function-args-by-value,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-missing-qobject-macro,no-rule-of-three,no-returning-void-expression,no-missing-typeinfo,no-base-class-event
CLAZY_IGNORE_DIRS: lib/.*
- name: "Test"
if: matrix.name == 'coverage'
run: ctest --timeout 45
working-directory: build
env:
# Render analyzer waveform tests to an offscreen buffer
QT_QPA_PLATFORM: ${{ matrix.qt_qpa_platform }}
GTEST_COLOR: 1
# Only use single thread to prevent *.gcna files from overwriting each other
CTEST_PARALLEL_LEVEL: 1
CTEST_OUTPUT_ON_FAILURE: 1
- name: "Generate Coverage Report"
if: matrix.name == 'coverage'
run: >-
lcov
--capture
--directory .
--base-directory ..
--include "${PWD%/*}/src/*"
--exclude "${PWD%/*}/src/test/*"
--exclude "${PWD%/*}/build/*"
--exclude "${PWD%/*}/lib/*"
--output-file lcov.info
working-directory: build
- name: "Upload Coverage Report to coveralls.io"
if: matrix.name == 'coverage'
continue-on-error: true
uses: coverallsapp/github-action@master
with:
flag-name: ubuntu-20.04
path-to-lcov: build/lcov.info
github-token: ${{ secrets.GITHUB_TOKEN }}
41 changes: 12 additions & 29 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,6 @@ jobs:
fail-fast: false
matrix:
include:
- name: Ubuntu 18.04 (gcc)
os: ubuntu-18.04
cmake_args: >-
-DWARNINGS_FATAL=ON
-DBULK=ON
-DFAAD=ON
-DFFMPEG=OFF
-DLOCALECOMPARE=ON
-DMAD=ON
-DMODPLUG=ON
-DWAVPACK=ON
-DINSTALL_USER_UDEV_RULES=OFF
ctest_args:
compiler_cache: ccache
compiler_cache_path: ~/.ccache
cpack_generator: DEB
buildenv_basepath: /home/runner/buildenv
buildenv_script: tools/debian_buildenv.sh
artifacts_name: Ubuntu 18.04 DEB
artifacts_path: build/*.deb
artifacts_slug: ubuntu-bionic
qt_qpa_platform: offscreen
- name: Ubuntu 20.04 (gcc)
os: ubuntu-20.04
cmake_args: >-
Expand Down Expand Up @@ -75,7 +53,7 @@ jobs:
qt_qpa_platform: offscreen
- name: Windows 2019 (MSVC)
os: windows-2019
# TODO: Reenable FFmpeg after licensing issues have been clarified
# TODO: Re-enable FFmpeg after licensing issues have been clarified
# Attention: If you change the cmake_args for the Windows CI build,
# also adjust the for the local Windows build setup in
# ./tools/windows_buildenv.bat
Expand Down Expand Up @@ -147,20 +125,25 @@ jobs:
# Possibly related: actions/checkout#290
run: git fetch origin --force --tags

- name: "[macOS/Ubuntu 18.04] Set up cmake"
uses: jwlawson/actions-setup-cmake@v1.4
- name: "[macOS] Set up cmake"
uses: jwlawson/actions-setup-cmake@v1.9
# Ubuntu 20.04 should use the CMake version from the repos, and Visual
# Studio on Windows comes with its own CMake version anyway.
if: runner.os == 'macOS' || matrix.os == 'ubuntu-18.04'
if: runner.os == 'macOS'
with:
# This should always match the mininum required version in
# This should always match the minimum required version in
# our CMakeLists.txt
cmake-version: '3.16.x'

- name: "[Windows] Set up MSVC Developer Command Prompt"
if: runner.os == 'Windows'
uses: seanmiddleditch/gha-setup-vsdevenv@v3

- name: "[macOS] install ccache and make"
if: runner.os == 'macOS'
run: |
brew install ccache ninja

- name: "[macOS/Windows] Get build environment name"
if: runner.os != 'Linux'
id: buildenv_name
Expand Down Expand Up @@ -309,8 +292,8 @@ jobs:
# No need to do the PPA build for both Ubuntu versions
if: matrix.os == 'ubuntu-20.04'
run: |
if [[ "${{ github.ref }}" == "refs/heads/2.3" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxxbetas"
if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies -D CPACK_DEBIAN_DEBIAN_VERSION=0ubuntu2"
elif [[ "${{ github.ref }}" =~ ^refs/tags/[0-9]+\.[0-9]+\.[0-9]+$ ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxx"
else
Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,23 @@ jobs:
pre-commit:
name: Detecting code style issues
runs-on: ubuntu-latest
# The Dockerfile for this container can be found at:
# https://github.com/Holzhaus/mixxx-ci-docker
container: holzhaus/mixxx-ci:20210923
steps:
- name: "Check out repository"
uses: actions/checkout@v2
with:
fetch-depth: 2

- name: "Set up Python"
uses: actions/setup-python@v2

- name: Install clang-format
run: sudo apt-get update && sudo apt-get install -y --no-install-recommends clang-format-10

- name: "Detect code style issues (push)"
uses: pre-commit/action@v2.0.3
if: github.event_name == 'push'
# There are too many files in the repo that have formatting issues. We'll
# disable these checks for now when pushing directly (but still run these
# on Pull Requests!).
env:
SKIP: end-of-file-fixer,trailing-whitespace,clang-format,eslint,no-commit-to-branch
SKIP: clang-format,eslint,no-commit-to-branch

- name: "Detect code style issues (pull_request)"
uses: pre-commit/action@v2.0.3
Expand All @@ -54,9 +51,6 @@ jobs:
name: ${{ env.UPLOAD_PATCH_FILE }}
path: ${{ env.UPLOAD_PATCH_FILE }}

- name: "Install appstreamcli"
run: sudo apt-get update && sudo apt-get install -y --no-install-recommends appstream

# AppStream metadata has been generated/updated by a pre-commit hook
- name: "Validate AppStream metadata"
run: appstreamcli validate res/linux/org.mixxx.Mixxx.metainfo.xml
Loading