summaryrefslogtreecommitdiffstats
path: root/src/mixer
AgeCommit message (Expand)Author
2020-03-18Merge remote-tracking branch 'upstream/master' into lp1747212Daniel Schürmann
2020-03-02Merge pull request #2523 from Holzhaus/cueinfoUwe Klotz
2020-03-01Merge branch '2.2' of github.com:mixxxdj/mixxxJan Holthuis
2020-02-29Replace constants from cue.h and use them throughout codebaseJan Holthuis
2020-02-03mixer: Connect noPassthroughInputConfigured directly via EngineDeckJan Holthuis
2020-02-03mixer/basetrackplayer: Remove obsolete passthrough enabled handlingJan Holthuis
2020-02-02engine/enginedeck: Reenable popup when activating unconfigured passthruJan Holthuis
2020-01-20Merge remote-tracking branch 'mixxx/master' into aux-masterronso0
2020-01-15Fix incorrect emit statements in Mixxx codebaseJan Holthuis
2020-01-07Add util wrapper function for QAtomic*<T>::load/store[Relaxed] methodsJan Holthuis
2019-12-09Merge remote-tracking branch 'mixxx/master' into aux-masterronso0
2019-11-21Move export of track metadata from TrackCollection into LibraryUwe Klotz
2019-11-15Merge pull request #1765 from daschuer/rate_ratioUwe Klotz
2019-11-10Fix a bug where outro end was passed the end of the track, because not update...Daniel Schürmann
2019-11-04show warning when Aux,master should be toggled On without a sound device set ...ronso0
2019-10-22Cue: rename setPosition to setStartPositionBe
2019-10-14PlayerManager: fix initialization orderBe
2019-10-14use parented_ptr for ControlProxyBe
2019-09-09Merge remote-tracking branch 'upstream/master' into autodj_intro_outroBe
2019-09-02Misc. typosluz.paz
2019-08-20move workaround for AutoDJ cloning decks to PlayerManagerBe
2019-08-20Merge remote-tracking branch 'upstream/master' into autodj_intro_outroBe
2019-08-18Merge remote-tracking branch 'upstream/master' into rate_ratioDaniel Schürmann
2019-08-17Merge pull request #2042 from ronso0/clone-deck-opt-outBe
2019-08-16define default for CloneOnDoubleLoadronso0
2019-08-13remove useless tracking of automatic vs manually placed cuesBe
2019-07-08Merge remote-tracking branch 'upstream/master' into autodj_intro_outro3Daniel Schürmann
2019-06-27simplify reading &/ setting the default of bool cloneOnDoubleTapronso0
2019-06-26declare cloneOnDoubleTap earlierronso0
2019-06-26set cloneOnLoadDoubleTap default also in playermanagerronso0
2019-06-26use default FALSE if no config value exists yetronso0
2019-06-15Format debug info for TrackFileUwe Klotz
2019-05-07convert Cue::CueSource to enum classBe
2019-05-07convert Cue::CueType to enum classBe
2019-05-03Merge branch 'master' of https://github.com/mixxxdj/mixxx into clone-deck-opt...ronso0
2019-03-29Merge commit '9ee75377510d00b0491e4a934704b11e5cd33efb' into silencedetectionNino Miškić-Pletenac
2019-03-17Merge branch 'master' into unfinished_batch_analysisUwe Klotz
2019-03-16fix reset value to 1 for rate_ratioDaniel Schürmann
2019-02-28make playermanager respect clone optionronso0
2019-02-15Merge remote-tracking branch 'upstream/master' into rate_ratioDaniel Schürmann
2019-02-14Merge commit 'b70157731738f93239cd60a43af35fdb58598b84' into silencedetectionNino Miškić-Pletenac
2019-02-09trigger double load clone from PlayerManager instead of BaseTrackPlayerMatthew Nicholson
2019-02-05round value passed to CloneFromDeckMatthew Nicholson
2019-02-04add CloneFromDeck control objectMatthew Nicholson
2019-01-31use nullptr instead of NULLMatthew Nicholson
2019-01-31use nullptr instead of NULLMatthew Nicholson
2019-01-31use nullptr instead of NULLMatthew Nicholson
2019-01-31rename BaseTrackPlayerImpl::m_syncFromChannel to m_pChannelToCloneFromMatthew Nicholson
2019-01-31rename requestSyncPosition to requestClonePositionMatthew Nicholson
2019-01-31change double load timeout to half a secondMatthew Nicholson