summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Expand)Author
2020-05-07Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngineBe
2020-05-05Merge pull request #2714 from daschuer/lp1875013Jan Holthuis
2020-05-03Improve logging in case of internal libshout is usedDaniel Schürmann
2020-04-29Merge pull request #2707 from Holzhaus/serato-offset-correctionBe
2020-04-28actually link against internal shout_mixxxDaniel Schürmann
2020-04-28Merge pull request #2689 from Be-ing/keyfinderDaniel Schürmann
2020-04-28use a common find_package(Shout) and put target_link_libraries to the else br...Daniel Schürmann
2020-04-28Merge branch 'master' of github.com:mixxxdj/mixxx into serato-offset-correctionJan Holthuis
2020-04-28Add aditional status message in case system installed libshout is not usefullDaniel Schürmann
2020-04-25Add the fallback to the internal libShout to cmake as wellDaniel Schürmann
2020-04-25track/serato: Determine timing offsets when audio signal properties are knownJan Holthuis
2020-04-25Split TagLib metadata import/export code into multiple filesUwe Klotz
2020-04-24Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngineBe
2020-04-23Merge pull request #2621 from xerus2000/playlist-crate-refactorBe
2020-04-22Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngineBe
2020-04-22Merge pull request #2658 from JosepMaJAZ/cmake-windows-debug-build-fixesBe
2020-04-21Merge branch 'master' into playlist-crate-refactorxerus2000
2020-04-20AnalyzerKeyFinder: make KeyFinder optional with a CMake optionBe
2020-04-20add AnalyzerKeyFinder for more accurate key analysisBe
2020-04-19Rename BaseTrackCollectionFeature to BaseTrackSetFeaturexerus2000
2020-04-18ColorMapper(JSProxy): port to QJSEngine/QJSValue APIBe
2020-04-18Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJSEngineJan Holthuis
2020-04-18Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJSEngineJan Holthuis
2020-04-18Merge branch 'master' of github.com:mixxxdj/mixxx into mass-color-replaceJan Holthuis
2020-04-17Remove unsused class WidgetHiderUwe Klotz
2020-04-13FindOupus.cmake restored. Somehow now it does find it cleaning the cache...JosepMaJAZ
2020-04-13This fixes some bugs building in debug:JosepMaJAZ
2020-04-12Merge branch 'master' of github.com:mixxxdj/mixxx into mass-color-replaceJan Holthuis
2020-04-12cmake: remove extraneous files from CMakeLists.txtHarshit Maurya
2020-04-12Merge branch 'master' into context-menuHarshit Maurya
2020-04-09CMake: Set some additional variables for the CPack WIX GeneratorJan Holthuis
2020-04-09CMake: Fix install paths on WindowsJan Holthuis
2020-04-09CMake: Set more CPack variablesJan Holthuis
2020-04-09Merge pull request #2569 from Holzhaus/controller-fixes-part2Be
2020-04-09Merge pull request #2601 from uklotzde/audio_typesJan Holthuis
2020-04-08Merge branch 'master' of github.com:mixxxdj/mixxx into controller-fixes-part2Jan Holthuis
2020-04-08controllers: Move savePreset() from Controller into Preset classesJan Holthuis
2020-04-06update hidapi to 0.9.0Be
2020-04-06Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into audio_types2Uwe Klotz
2020-04-02Create common BaseTrackCollectionFeature ancestor for crates & playlistsxerus
2020-04-02Merge branch 'master' into basetracktablemodelUwe Klotz
2020-04-01widget/wtrackproperty: introduce new class to decouple context menu from wtra...Harshit Maurya
2020-03-30Get rid of the Janus-headed AudioSignal base classUwe Klotz
2020-03-30Add types for properties of PCM audio signals and streamsUwe Klotz
2020-03-29dialog/dlgreplacecolor: Add initial support for replacing hotcue colorsJan Holthuis
2020-03-29dialog: Add (non-working) replace color dialogJan Holthuis
2020-03-27Merge branch 'master' into migrate-to-QJSEngineFerran Pujol Camins
2020-03-27Merge branch 'master' into migrate-to-QJSEngineFerran Pujol Camins
2020-03-26CMake: Fix PortAudio package warningJan Holthuis
2020-03-24Merge branch 'master' into basetracktablemodelUwe Klotz