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

Fix build issues and more on FreeBSD #4111

Closed
wants to merge 2,351 commits into from
Closed
Changes from all commits
Commits
Show all changes
2351 commits
Select commit Hold shift + click to select a range
8b5eeef
skins/QMLDemo: Remove obsolete TODO comment
Holzhaus Jun 21, 2021
aa271d8
QML: Add TODO for enum usage to QmlEffectManifestParametersModel
Holzhaus Jun 21, 2021
93dec8e
skins/QMLDemo: Use JS template strings instead of concatenation
Holzhaus Jun 21, 2021
c8cb59a
skins/QMLDemo: Fix MiniKnob indicator and reduce duplication
Holzhaus Jun 21, 2021
f58eabc
skins/QMLDemo: Use fixed width for knob indicator
Holzhaus Jun 21, 2021
ae7408f
skins/QMLDemo: Fix label for FX parameters where shortName is not set
Holzhaus Jun 21, 2021
c20b1e2
skins/QMLDemo: Increase effect parameter width to prevent elided text
Holzhaus Jun 21, 2021
ee37875
Merge pull request #4022 from daschuer/command_line_fix_1
uklotzde Jun 21, 2021
fdb46c0
skins/QMLDemo: Add TODO regarding null coalescing
Holzhaus Jun 22, 2021
77650d1
skins/QMLDemo: Make effect param buttons toggleable and add label
Holzhaus Jun 22, 2021
3265842
skins/QMLDemo: Show dryWet/superKnob only when EffectUnit is expanded
Holzhaus Jun 22, 2021
a99bd50
QML: Add a way to retrieve the Effect parameter control key from model
Holzhaus Jun 22, 2021
c8cfefa
skins/QMLDemo: Fix wrong effect parameter control keys
Holzhaus Jun 22, 2021
5c20663
Merge pull request #4000 from Holzhaus/qml-effects
Swiftb0y Jun 22, 2021
a4c9d6a
LibraryFeature: Rename getChildModel to sidebarModel and make it const
Holzhaus Jun 22, 2021
66e6c0a
Merge remote-tracking branch 'upstream/2.3' into main
daschuer Jun 22, 2021
851715f
Update Translation template. Found 2720 source text(s) (2 new and 271…
daschuer Jun 22, 2021
b65432f
Pull latest translations from https://www.transifex.com/mixxx-dj-soft…
daschuer Jun 22, 2021
0014f24
Enable export of hot cue colours to EnginePrime
mr-smidge Jun 22, 2021
44f2976
Merge pull request #4025 from xsco/enh/engineprime-export-cue-colours
uklotzde Jun 23, 2021
94939d0
Update Mixxx version in LICENSE to 2.4
daschuer Jun 23, 2021
0244af2
Merge pull request #4026 from daschuer/license24
Holzhaus Jun 23, 2021
42984dd
Sync Lock: rename functions to make them clearer
ywwg Mar 15, 2021
47cd79e
Sync Lock: Don't recalc half/double multiplier on every callback
ywwg Jun 16, 2021
5653190
parented_ptr: Cast to QObject to fix parent method signature mismatch
Holzhaus Jun 28, 2021
3cb730a
library: Use parented_ptr for feature sidebar model instances
Holzhaus Jun 28, 2021
d6eed39
SidebarModel: Add basic support for icon names
Holzhaus Jun 28, 2021
002b9c8
BrowseFeature: Add missing overrides
Holzhaus Jun 28, 2021
8fabcaa
Merge remote-tracking branch 'upstream/2.3' into main
daschuer Jun 28, 2021
f64910c
Merge pull request #4024 from Holzhaus/feature-sidebarmodel-const
uklotzde Jun 28, 2021
580153d
Merge branch 'main' of github.com:mixxxdj/mixxx into sidebar-icon-name
Holzhaus Jun 29, 2021
271cea5
Remove int reference and skip argument parsing when no argument is given
daschuer Jun 23, 2021
e48b971
Use "CmdlineArges" as translation context
daschuer Jun 29, 2021
2e12617
hide deprecated command line arguments
daschuer Jun 29, 2021
521ab45
Merge pull request #3706 from ywwg/synclock-03-halfdoublefix
daschuer Jun 29, 2021
e9fd98d
Merge pull request #4034 from Holzhaus/sidebar-icon-name
daschuer Jun 29, 2021
bdc8528
SidebarModel: Replace if-else ladder in data() with switch case
Holzhaus Jun 29, 2021
2b3e39f
Merge pull request #4038 from Holzhaus/sidebarmodel-switch
daschuer Jun 29, 2021
380c457
Fix misc. typos
luzpaz Jun 29, 2021
df501d1
Merge pull request #4039 from luzpaz/typos
daschuer Jun 29, 2021
994e4ac
clarify comment
daschuer Jun 30, 2021
18382f5
Frame: Add frame class to avoid sample/frame ambiguity
hacksdump Jun 13, 2020
6df3614
Frame: Add artithmetic and logical operators
hacksdump Jun 15, 2020
34d1f9d
Frame: Add multiply and divide operations
hacksdump Jun 16, 2020
92161c5
Frame: Replace forward declaration with include
hacksdump Jun 20, 2020
4a7bdc5
Frame: Refactor and rename to FramePos and FrameDiff_t
hacksdump Jun 21, 2020
e3124ff
FramePos: Use constant for invalid frame instead of -1
hacksdump Jun 26, 2020
e98439f
FramePos: Use C++ style limits
hacksdump Jun 26, 2020
eb550fa
FramePos: Use constant for starting frame pos
hacksdump Aug 24, 2020
b048478
FramePos: Use NaN instead of negative infinity
hacksdump Aug 31, 2020
9ae96f2
FramePos: Add Qt declarations
hacksdump Sep 9, 2020
3d9df08
FramePos: Define static start and invalid constants
hacksdump Sep 9, 2020
7a05af6
FramePos: Move class alongside other audio helper classes
Holzhaus Jul 1, 2021
db6b5f6
FramePos: Clean up comments
Holzhaus Jul 1, 2021
aa17102
FramePos: Remove d prefix for doubles
Holzhaus Jul 1, 2021
f79e907
FramePos: Make FramePos invalid when no value is given
Holzhaus Jul 1, 2021
4db7cb2
FramePos: Add isValid method to check if the position is valid
Holzhaus Jul 1, 2021
b82ba59
FramePos: Add fromEngineSamplePos helper method
Holzhaus Jul 1, 2021
e7e39e4
FramePos: Rename getValue() to just value()
Holzhaus Jul 1, 2021
0191a50
FramePos: Add helper method to truncate to full sample positions
Holzhaus Jul 1, 2021
af40d4f
Beats: Use frame positions for beatmap/beatgrid construction
Holzhaus Jul 1, 2021
cd8b88c
BeatMap: Reduce back-and-forth conversions between samples/frames
Holzhaus Jul 1, 2021
69c3717
BeatMap: Add inline to internal utility functions
Holzhaus Jul 1, 2021
f808edb
Frame: Add constexpr to some methods
Holzhaus Jul 1, 2021
fb2be0b
FramePos: Fix wrong fractional check
Holzhaus Jul 1, 2021
e4f9b22
FramePos: Use util_isnan to fix broken NaN detection
Holzhaus Jul 1, 2021
9d2811c
FramePos: Add tests
Holzhaus Jul 1, 2021
45bff1a
Merge branch '2.3' of [email protected]:mixxxdj/mixxx.git
uklotzde Jul 1, 2021
35a5ccd
BeatMap: Use in const reference in for loop to avoid copy
Holzhaus Jul 1, 2021
aa75711
Merge pull request #4036 from daschuer/command_line_fix_1
Holzhaus Jul 2, 2021
e671a6c
AnalyzerQueenMaryBeats: Rename m_stepSize to m_stepSizeFrames
Holzhaus Jul 2, 2021
ad42583
FrameTest: Check denormals and NaN
Holzhaus Jul 2, 2021
c26b018
FramePos: Make infinite frame positions invalid
Holzhaus Jul 2, 2021
70416aa
BeatMap: Add helper function and add assertion for fraction positions
Holzhaus Jul 2, 2021
a555ae4
FramePos: Assert validity in isFractional()
Holzhaus Jul 2, 2021
5651d71
Merge pull request #2699 from Be-ing/contributing.md
Holzhaus Jul 2, 2021
db34509
Bpm: Add more operator overrides
Holzhaus Jul 1, 2021
96e0d64
Beats: Add mixxx::Bpm in BeatUtils and BeatGrid/BeatMap classes
Holzhaus Jul 1, 2021
5dc50d1
Merge pull request #4043 from Holzhaus/frames
daschuer Jul 2, 2021
a710a02
FramePos: Add some comments and simplify valid check
Holzhaus Jul 3, 2021
7c5f330
FramePos: Ensure that all invalid frame positions are equal
Holzhaus Jul 3, 2021
1cadb3f
Bpm: Fix comparison of invalid values
Holzhaus Jul 3, 2021
3ac8866
FramePos: Add assertions when invalid values are accessed
Holzhaus Jul 3, 2021
86dd12f
FramePos: Add assertions to prevent calculations with invalid values
Holzhaus Jul 3, 2021
db51b83
test: Add some simple tests for Bpm class
Holzhaus Jul 3, 2021
23fc6b2
Bpm: Improve and test comparison operators
Holzhaus Jul 3, 2021
67b6af8
Merge pull request #4053 from Holzhaus/frame-improvements
uklotzde Jul 4, 2021
a423ff5
Bpm: Only access value if it's actually valid
Holzhaus Jul 4, 2021
65e04b5
Bpm: Also check for invalid values
Holzhaus Jul 4, 2021
bc0d16d
Bpm: Ensure that bpm value is valid before doing any calculations
Holzhaus Jul 4, 2021
4dff17c
Bpm: Add proper debug output
Holzhaus Jul 4, 2021
66d9f35
set value name for deprecated command line options, to make them work
daschuer Jul 5, 2021
d710ddb
QML: Add some initial work on exposing the Library to QML
Holzhaus May 26, 2021
b42818f
QML: Add adapter model that exposes old track table as list model
Holzhaus Jul 4, 2021
4956b59
skins/QMLDemo: Add simple track list
Holzhaus Jul 5, 2021
00e09f2
Merge pull request #4057 from daschuer/depr_cmd
uklotzde Jul 5, 2021
bad2999
Merge branch '2.3' of [email protected]:mixxxdj/mixxx.git
uklotzde Jul 5, 2021
717c1fa
Bpm: Simplify </<=/>/>= operator implementations
Holzhaus Jul 5, 2021
d4a6b2e
Merge pull request #4044 from Holzhaus/bpm
uklotzde Jul 6, 2021
c14ba70
Bpm: Make constructor constexpr
Holzhaus Jul 1, 2021
9145ff8
Beats: Return mixxx::Bpm type instead of double from all bpm methods
Holzhaus Jul 1, 2021
95a9e1d
Beats: Remove getMaxBpm() method
Holzhaus Jul 1, 2021
4cd4614
SyncControl: Return mixxx::Bpm::kValueUndefined instead of 0.0 in fil…
Holzhaus Jul 6, 2021
603d325
Return {} instead of mixxx::Bpm() to avoid return type repetition
Holzhaus Jul 6, 2021
d9839fe
BrowseThread: Fix debug assertion for undefined bpm values
uklotzde Jul 6, 2021
a3c6595
Merge pull request #4062 from uklotzde/browsethread
Holzhaus Jul 6, 2021
14590f4
Merge pull request #4045 from Holzhaus/bpm-pt2
uklotzde Jul 6, 2021
dcb4977
Bpm: Improve method naming (hasValue/getValue -> isValid/value)
Holzhaus Jul 6, 2021
2f2fb14
Beats: Improve comments
Holzhaus Jul 2, 2021
8a35dc8
Merge pull request #4048 from Holzhaus/bpm-pt3
uklotzde Jul 6, 2021
a3d40eb
Fix debug assertion when exporting invalid bpm as file tag
uklotzde Jul 6, 2021
ba48f3f
Beats: Use FramePos consistently in Beats classes
Holzhaus Jul 2, 2021
18ab29f
BeatMap: Remove unused function
Holzhaus Jul 2, 2021
75b2752
Beats: Rename findNBeatsFromSample to findNBeatsFromPosition
Holzhaus Jul 6, 2021
8d75d83
Merge pull request #4063 from uklotzde/format-bpm
Holzhaus Jul 6, 2021
469c990
Beats: Add `firstBeat()` utility function
Holzhaus Jul 6, 2021
6c201ea
BpmControl: Use mixxx::kEngineChannelCount instead of hardcoding 2
Holzhaus Jul 6, 2021
93ef4ff
Bpm: Add method to to divide by another Bpm
Holzhaus Jul 6, 2021
9dc9d26
EngineBuffer: Return Bpm type from getBpm/getLocalBpm methods
Holzhaus Jul 6, 2021
9c33e11
EngineBuffer: Use mixxx::audio::SampleRate instead of int/double
Holzhaus Jul 6, 2021
56e2683
Beats: Use while loop in numBeatsInRange()
Holzhaus Jul 6, 2021
039583b
Merge pull request #4065 from Holzhaus/enginebuffer-samplerate
uklotzde Jul 6, 2021
4d25559
use debian_buildenv.sh in build-checks GH Actions workflow
Be-ing Jul 3, 2021
81ba203
debian_buildenv.sh: add libudev-dev dependency
Be-ing Jul 3, 2021
d6fcf90
CMake: link hidraw backend of hidapi on Linux instead of libusb
Be-ing Jul 3, 2021
43d83fb
update udev rules for hidraw backend of hidapi
Be-ing Jul 3, 2021
5c58257
HidEnumerator: filter duplicate devices
Be-ing Jul 3, 2021
c1b09e6
HidEnumerator: remove "USB" from debug messages
Be-ing Jul 3, 2021
a005337
HidEnumerator: add link to upstream bug report for hidapi
Be-ing Jul 4, 2021
f17c8bf
HidController: add FIXME to implement hid_get_input_report upstream
Be-ing Jul 6, 2021
f3d9ad1
Merge pull request #4064 from Holzhaus/engine-bpm
daschuer Jul 7, 2021
1618440
EngineBuffer: Use mixxx::audio::FramePos for some methods
Holzhaus Jul 7, 2021
3bd0be8
QML: Marks drops as accepted in PlayerDropArea
Holzhaus Jul 5, 2021
8003a11
Merge pull request #4067 from Holzhaus/qml-dragdrop-accept
Swiftb0y Jul 7, 2021
a152e84
skins/QMLDemo: Add SyncButton component with leader support
Holzhaus Jul 7, 2021
ec7d18e
skins/QMLDemo: Use Arrow function for grabToImage
Holzhaus Jul 7, 2021
eec1140
EngineBuffer: Remove old sample-based doSeekPlayPos method
Holzhaus Jul 7, 2021
84fa081
Merge pull request #4066 from Holzhaus/engine-frame-refactor
uklotzde Jul 7, 2021
b7f31ae
Merge pull request #4054 from Be-ing/hidapi_hidraw
Holzhaus Jul 7, 2021
d6236d4
Merge pull request #4049 from Holzhaus/beats-frame-refactor
uklotzde Jul 7, 2021
a88e298
Merge pull request #4068 from Holzhaus/qml-syncbutton
Swiftb0y Jul 7, 2021
85e22c7
Rename mixxx.{cpp,h} to mixxxmainwindow.{cpp,h}
Holzhaus Jul 7, 2021
b0ed7fb
FramePos: Add helper methods for engine sample conversions with -1.0
Holzhaus Jul 3, 2021
f625d96
FramePos: Assert statically that invalid engine position constant is …
Holzhaus Jul 3, 2021
f2024a9
Cue: Migrate class to FramePos
Holzhaus Jul 5, 2021
d8ab236
Track: Use mixxx::FramePos type in Cue-related methods
Holzhaus Jul 6, 2021
1c9c876
TrackRecord: Use mixxx::audio::FramePos for main cue position
Holzhaus Jul 6, 2021
c86cbb6
Cue: Delete obsolete comment
Holzhaus Jul 7, 2021
7a89aed
Cue: Use FramePos::fromEngineSamplePosMaybeInvalid in legacy methods
Holzhaus Jul 7, 2021
902e4a8
Track: Use FramePos::fromEngineSamplePosMaybeInvalid in legacy methods
Holzhaus Jul 7, 2021
eff29a6
QmlLibraryProxy: Replace plain pointer with smart pointers
Holzhaus Jul 7, 2021
792acbc
QmlLibraryTrackListModel: Return {} instead of QVariant() in data()
Holzhaus Jul 7, 2021
32da274
QmlLibraryTrackListModel: Use a debug assertion in columnCount
Holzhaus Jul 7, 2021
07b2ec0
QmlLibraryTrackListModel: Move constructor to cpp file
Holzhaus Jul 7, 2021
13696bc
Merge pull request #4069 from Holzhaus/frame-refactor-prerequisites
uklotzde Jul 7, 2021
4aba92d
Merge pull request #4072 from Holzhaus/mixxxmainwindow
uklotzde Jul 7, 2021
f61c710
AnalyzerSilence: Use mixxx::audio::FramePos in storeResults()
Holzhaus Jul 6, 2021
0f13188
DlgTrackInfo: Use mixxx::audio::FramePos in slots
Holzhaus Jul 6, 2021
7bf19d0
AutoDJProcessor: Return mixxx::audio::FramePos from DeckAttributes
Holzhaus Jul 6, 2021
8a83203
EnginePrimeExportJob: Use mixxx::audio::FramePos internally
Holzhaus Jul 6, 2021
75630e1
RekordboxFeature: Use mixxx::audio::FramePos internally
Holzhaus Jul 6, 2021
eaa5bb7
VinylControlControl: Use mixxx::audio::FramePos internally
Holzhaus Jul 6, 2021
363ac4c
BaseTrackPlayer: Use mixxx::audio::FramePos internally
Holzhaus Jul 6, 2021
910bf2a
CueControl: Use mixxx::audio::FramePos internally
Holzhaus Jul 6, 2021
33afb32
test: Use mixxx::audio::FramePos in AnalyzerSilenceTest
Holzhaus Jul 6, 2021
f39ea33
test: Use mixxx::audio::FramePos in CueControlTest/HotcueControlTest
Holzhaus Jul 6, 2021
efbf9e2
Merge pull request #4074 from Holzhaus/frame-refactor-analyzer
uklotzde Jul 8, 2021
68edc11
Merge pull request #4075 from Holzhaus/frame-refactor-dlgtrackinfo
uklotzde Jul 8, 2021
e19b1bf
Merge pull request #4076 from Holzhaus/frame-refactor-autodj
uklotzde Jul 8, 2021
11de340
Merge pull request #4078 from Holzhaus/frame-refactor-rekordbox
uklotzde Jul 8, 2021
637802d
Merge pull request #4082 from Holzhaus/frame-refactor-analyzersilence…
uklotzde Jul 8, 2021
f176928
BaseTrackPlayer: Remove unnecessary loop end validity check
Holzhaus Jul 8, 2021
5fdb296
EnginePrimeExportJob: Use sum of start frame pos and frame count
Holzhaus Jul 8, 2021
9856ab2
BaseTrackPlayer: Use getStartAndEndPosition() for loop cues
Holzhaus Jul 8, 2021
af8f905
Merge pull request #4077 from Holzhaus/frame-refactor-engineprime
uklotzde Jul 8, 2021
9bb6f11
Merge pull request #4080 from Holzhaus/frame-refactor-basetrackplayer
uklotzde Jul 8, 2021
312da1f
CMake: Add support for test coverage
Holzhaus Jul 7, 2021
98ff1a6
CI: Add workflow for generating coverage report
Holzhaus Jul 7, 2021
49c8684
CI: Use lcov and official coveralls GH Action
Holzhaus Jul 8, 2021
fdcb065
EngineBuffer: Fix broken playback due to rate integer division
Holzhaus Jul 8, 2021
7cc4e0f
Merge pull request #4085 from Holzhaus/enginebuffer-fix-broken-playback
uklotzde Jul 8, 2021
309c04e
SampleRate: Add operator for dividing by another sample rate
Holzhaus Jul 8, 2021
b73c701
EnginePrimeExportJob: Fix clazy range loop detach warning
Holzhaus Jul 8, 2021
5dc279b
VinylControlControl: Use semantically correct fractionalPos calculation
Holzhaus Jul 8, 2021
80b4134
Treat m4v like m4a for metadata
aw-was-here Jul 7, 2021
a63b836
Merge pull request #4086 from Holzhaus/samplerate-division
uklotzde Jul 8, 2021
466b3d7
Merge pull request #4087 from Holzhaus/engineprime-loop-analysis
uklotzde Jul 8, 2021
e4a371d
Analyzer: Use mixxx::audio::SampleRate type instead of int
Holzhaus Jul 8, 2021
b17de2c
Encoder: Use mixxx::audio::SampleRate type instead of int
Holzhaus Jul 8, 2021
042dd10
QML: Add comment explaining why we use qmlRegisterUncreatableType
Holzhaus Jul 8, 2021
ed88d4d
Sample rate: Add missing const qualifier
uklotzde Jul 8, 2021
2e43cf6
Sample rate: Verify conversion from double
uklotzde Jul 8, 2021
e14b23b
Merge pull request #4060 from Holzhaus/qml-library-model
Be-ing Jul 8, 2021
18624f0
Merge pull request #4088 from aw-was-here/add-m4v
Be-ing Jul 8, 2021
b499d16
Merge pull request #4089 from Holzhaus/analyzer-samplerate
uklotzde Jul 9, 2021
8c8ef50
Merge pull request #4090 from Holzhaus/encoder-samplerate
uklotzde Jul 9, 2021
9be7c5a
Merge pull request #4079 from Holzhaus/frame-refactor-vinylcontrol
uklotzde Jul 9, 2021
b8e4da1
CueControl: Remove leftover qWarning() from debugging
Holzhaus Jul 9, 2021
2b55905
CueControl: Rename cuePoint to mainCuePosition in hintReader()
Holzhaus Jul 9, 2021
8eba638
CueControl: Remove unnecessary frame/sample conversion in hintReader()
Holzhaus Jul 9, 2021
7e97341
Beats: Use enum class for BpmScale
Holzhaus Jul 9, 2021
787b8aa
Merge pull request #4091 from uklotzde/samplerate
Holzhaus Jul 9, 2021
04ab2be
QML: Add some initial work on exposing the Library sidebar to QML
Holzhaus May 26, 2021
d7230fc
QML: Add roleNames support to SidebarModel
Holzhaus Jun 29, 2021
e367e61
skins/QMLDemo: Add initial support for the sidebar
Holzhaus Jun 4, 2021
fce26e2
Merge pull request #4037 from Holzhaus/qml-sidebar
Swiftb0y Jul 9, 2021
422912b
Merge pull request #4092 from Holzhaus/bpmscale-enum-class
uklotzde Jul 9, 2021
1a3b8d0
FrameTest: Add test for toLowerFrameBoundary()
Holzhaus Jul 9, 2021
c3987c5
SeratoBeatsImporter: Round beats to nearest frame position
Holzhaus Jul 9, 2021
277dc56
BeatFactory: Ensure Beatgrid framepos is valid and non-fractional
Holzhaus Jul 9, 2021
8babdd2
BeatMap: Replace custom rounding with FramePos::toLowerFrameBoundary()
Holzhaus Jul 9, 2021
3ed735e
Merge branch '2.3'
ywwg Jul 10, 2021
86112e4
Merge pull request #4094 from Holzhaus/beats-rounding
uklotzde Jul 10, 2021
9de885c
Merge pull request #4084 from Holzhaus/coverage
uklotzde Jul 10, 2021
3ef395b
Merge pull request #4083 from Holzhaus/frame-refactor-cuecontroltest
uklotzde Jul 10, 2021
2253c78
FramePos: Add method to rount to upper frame boundary
Holzhaus Jul 10, 2021
015ad88
BeatMap: Allow searching using fractional positions
Holzhaus Jul 10, 2021
c2bb376
Add migration code for QMutex/QRecursiveMutex/QMutexLocker
uklotzde Jul 10, 2021
a69db4b
BeatMapTest: Add test for finding beats with fractional position
Holzhaus Jul 10, 2021
decfdbe
BeatMap: Ensure proper frame rounding in hasBeatInRange()
Holzhaus Jul 10, 2021
9284952
FrameTest: Add tests for upper/nearest frame boundary
Holzhaus Jul 10, 2021
730c168
BeatMap: Use camelCase instead of PascalCase for beatLessThan function
Holzhaus Jul 10, 2021
51d077f
BeatMap: Add comment regarding fuzzy matches in hasBeatInRange()
Holzhaus Jul 10, 2021
21b310b
BeatMap: Add tests for hasBeatInRange() with fractional positions
Holzhaus Jul 10, 2021
7cad4cc
Merge pull request #4096 from uklotzde/qtmutex
Be-ing Jul 10, 2021
f9d596b
Add [[nodiscard]] to lockMutex()
uklotzde Jul 10, 2021
e5a8699
BeatMap: Make beatLessThan helper method inline
Holzhaus Jul 10, 2021
3113dd9
BeatMap: Fix commented out debug assertion
Holzhaus Jul 10, 2021
c7d5334
Merge pull request #4097 from uklotzde/qtmutex
Be-ing Jul 10, 2021
2d47336
BeatMapTest: Rename countBeatsInIterator to countRemainingBeats
Holzhaus Jul 10, 2021
b6e1088
BeatMap: Add comment explaining rounding in findBeats()
Holzhaus Jul 10, 2021
32dad22
Merge pull request #4095 from Holzhaus/quantizecontrol-frame-boundary
daschuer Jul 11, 2021
0979e8e
Merge pull request #4081 from Holzhaus/frame-refactor-cuecontrol
daschuer Jul 11, 2021
855cdc0
CMake: use CXX_COMPILER_LAUNCHER instead of RULE_LAUNCH_COMPILE
Be-ing Jul 11, 2021
4b43bca
Track: Remove CuePosition class and corresponding methods
Holzhaus Jul 6, 2021
004fc48
Cue: Remove all sample-based methods
Holzhaus Jul 6, 2021
611a153
Merge pull request #4061 from Holzhaus/frame-refactor
uklotzde Jul 12, 2021
1aa67da
mixxxlibraryfeature: remove wrong ENGINE_PRIME ifdef
ronso0 Jul 12, 2021
53e774e
Merge pull request #4102 from ronso0/mixxxlibraryfeature-include-fix
ronso0 Jul 12, 2021
6a95caa
Beats: Remove unnecessary capabilities
Holzhaus Jul 12, 2021
f6ca3ec
Beats: Fix outdated comment
Holzhaus Jul 12, 2021
193b01e
Merge pull request #4104 from Holzhaus/beats-comment-fix
uklotzde Jul 12, 2021
82f8c78
Merge pull request #4098 from Be-ing/sccache_hack_remove
daschuer Jul 13, 2021
18b7e69
QMLDemo: improve OrientationToggleButton touch friendlyness
Swiftb0y Jun 1, 2021
441cfed
Merge pull request #3934 from Swiftb0y/qml-orientation-button-touchfr…
Holzhaus Jul 15, 2021
705955a
Merge pull request #4103 from Holzhaus/remove-beatscap-scale-translate
Be-ing Jul 17, 2021
bcf9a6f
Make mixxx more FreeBSD friendly
alonsobsd Jul 17, 2021
1de76fd
Make mixxx more FreeBSD friendly
alonsobsd Jul 17, 2021
28a1486
Make mixxx more FreeBSD friendly
alonsobsd Jul 17, 2021
056d9c2
Make mixxx more FreeBSD friendly
alonsobsd Jul 17, 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
@@ -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
5 changes: 4 additions & 1 deletion .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",
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"
95 changes: 58 additions & 37 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
@@ -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)
@@ -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
@@ -116,3 +106,34 @@ 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'
uses: coverallsapp/github-action@master
with:
flag-name: ubuntu-20.04
path-to-lcov: build/lcov.info
github-token: ${{ secrets.GITHUB_TOKEN }}
34 changes: 6 additions & 28 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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: >-
@@ -176,13 +154,13 @@ 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'

@@ -338,8 +316,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
9 changes: 3 additions & 6 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -8,18 +8,15 @@ 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:20210526
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/[email protected]
if: github.event_name == 'push'
80 changes: 22 additions & 58 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,77 +1,33 @@
# Don't add any custom patterns for platform-specific files like .DS_Store
# or generated by custom development tools like .vscode or .idea that don't
# affect other developers. Instead add those custom patterns to your global
# .gitignore file.
# affect other developers. Instead ignore those patterns through your global
# gitignore or locally in .git/info/exclude.

*.diff
# Logs
*.log
*.o
*.orig
*.os
*.patch
!build/appveyor/NSIS.patch
*.pyc
*.rej
*_build
*~
.#*

src/mixxx.rc.include
src/mixxx.res

*.sqlite
*.log.*

*.cfg
!/res/keyboard/*.cfg
# TOOLS

# Might be created when running a Python script from the tools folder
__pycache__

lib/*/*.a
lib/*/lib/*.a

mixxx
mixxx-test

src/test/test_data
src/test/golden_buffers/*.actual

res/qrc_mixxx.cc

*.wixobj
*.wixpdb
*.msi
*.mst
*.cab
build/wix/subdirs/*.wxs
# The following 2 files are autogenerated by scons at release time
# based on .tmpl template file for the second one.
build/wix/bundle/bundleloc.wxs
build/wix/ProductID.wxi

*.obj
*.pdb
lib/*/*.lib
lib/*/lib/*.lib

lib/qtscript-bytearray/*.cc

# Clang/cmake
*_build
compile_commands.json

# Exclude documentation generated by Doxygen
/doxygen/
# Doxygen documentation
/doxygen

# Exclude buildenv directory from our helper scripts
/buildenv/
/buildenv

# CMake build configurations, generated by tools/windows_buildenv.bat
CMakeSettings*.json
/CMakeSettings*.json

# Build and distribution directories for various build configurations
/build/
/install/

# VisualStudio project files
/.vs/
/build
/install

# Exclude unneeded files from GoogleTest library when updating our bundled
# GoogleTest library in the lib/ directory
@@ -89,3 +45,11 @@ lib/hidapi/dist
lib/hidapi/doxygen
lib/hidapi/hidtest
lib/hidapi/testgui

# Legacy compilation artifacts that are obsolete starting with 2.3
# TODO: Delete after 2.2 with SCons has been abandoned. Developers
# are supposed to clean their project directory!
src/mixxx.rc.include
src/mixxx.res
src/test/**/*.actual
res/qrc_mixxx.cc
15 changes: 15 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -124,3 +124,18 @@ repos:
stages:
- commit
- manual
- id: qmlformat
name: qmlformat
entry: tools/qmlformat.py
pass_filenames: true
language: system
types: [text]
files: ^.*\.qml$
- id: qmllint
name: qmllint
entry: qmllint
pass_filenames: true
require_serial: true
language: system
types: [text]
files: ^.*\.qml$
4 changes: 2 additions & 2 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[main]
host = https://www.transifex.com

[mixxxdj.mixxx2-3]
[mixxxdj.mixxx2-4]
file_filter = res/translations/mixxx_<lang>.ts
source_file = res/translations/mixxx.ts
source_lang = en
minimum_perc = 0
type = TS
type = QT
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (Unreleased)

* Cover art: Prevent wrong cover art display due to hash conflicts
* Cover art: Add background color for quick cover art preview
* Add Random Track Control to AutoDJ [#3076](https://github.com/mixxxdj/mixxx/pull/3076)
* Add support for saving loops as hotcues [#2194](https://github.com/mixxxdj/mixxx/pull/2194) [lp:1367159](https://bugs.launchpad.net/mixxx/+bug/1367159)

## [2.3.0](https://launchpad.net/mixxx/+milestone/2.3.0)
### Hotcues ###
* Add hotcue colors and custom labels by right clicking hotcue buttons or right clicking hotcues on overview waveforms [#2016](https://github.com/mixxxdj/mixxx/pull/2016) [#2520](https://github.com/mixxxdj/mixxx/pull/2520) [#2238](https://github.com/mixxxdj/mixxx/pull/2238) [#2560](https://github.com/mixxxdj/mixxx/pull/2560) [#2557](https://github.com/mixxxdj/mixxx/pull/2557) [#2362](https://github.com/mixxxdj/mixxx/pull/2362)
Loading