summaryrefslogtreecommitdiffstats
path: root/src
AgeCommit message (Collapse)Author
2020-05-07Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngineBe
2020-05-07Merge pull request #2745 from uklotzde/loggingDaniel Schürmann
Logging Pt. 1: Prepare for QLoggingCategory
2020-05-07Merge pull request #2756 from uklotzde/trackdaoBe
TrackDAO: Reformat code / Avoid mutex locks on Track object
2020-05-07Merge remote-tracking branch 'upstream/2.2'Be
2020-05-07Merge pull request #2759 from daschuer/manual_ducking_fixBe
Fix manual ducking
2020-05-07Merge remote-tracking branch 'upstream/2.2'Be
2020-05-07Merge pull request #2678 from Holzhaus/save-most-recent-loopBe
Fix load/save of most recent loop
2020-05-07Merge pull request #2673 from Holzhaus/serato-markers-integration-loopsBe
Import saved loops from Serato Tags
2020-05-07engine/controls/cuecontrol: Document CueControl loop handlingJan Holthuis
2020-05-07track/serato/tags: Fix typo in commentJan Holthuis
Co-authored-by: Be <be.0@gmx.com>
2020-05-07Merge pull request #2735 from ronso0/fullscreen-hotkey-linuxDaniel Schürmann
restore/add F11 to toggle fullscreen
2020-05-07make mic ducking use strength the same way in Auto & Man moderonso0
Previously, engine/enginetalkoverducking returned opposite values for 'strength' in Auto and Manual mode. This commit removes the inversion from Auto mode, thus the Strength knob always affects the music volume in the same way with both modes, much like a Muisc Volume knob: * fully left: music muted completely * fully right: music volume unchanged
2020-05-07Silence DebugDaniel Schürmann
2020-05-07Fix manual duckingDaniel Schürmann
now the ducking gain is only applied when talkover is enabled
2020-05-06Merge pull request #2750 from ronso0/mic-ducking-strengthDaniel Schürmann
make mic ducking use strength the same way in Auto & Man mode
2020-05-06Merge pull request #2754 from Holzhaus/waveform-mark-lowest-on-topDaniel Schürmann
Draw hotcue mark with lowest index on top
2020-05-06Merge branch 'master' of github.com:mixxxdj/mixxx into ↵Jan Holthuis
serato-markers-integration-loops
2020-05-06engine/controls/cuecontrol: Use break instead of continue in switch caseJan Holthuis
2020-05-06Do not remove debug log filter rules in the futureUwe Klotz
2020-05-06Access TrackRecord instead of mutex-synchronized Track objectUwe Klotz
2020-05-06Check query execution with VERIFY_OR_DEBUG_ASSERTUwe Klotz
Insert queries should never fail
2020-05-06Use const-ref instead of creating a copyUwe Klotz
2020-05-06widget/wsearchlineedit: Work around object name qsscheck failJan Holthuis
The simple parser of qsscheck is not smart enough to deal with global constants. Since this should not make any significant performance difference and the constant is only used once, it makes sense to move the string back into function parentheses to work around this issue.
2020-05-06waveform/renderers/waveformmarkset: Draw hotcue mark with lowest index on topJan Holthuis
Currently, hotcue marks on the same position are drawn over each other and only the hotcue mark with the highest index is shown. Since not all hotcue indices might be mapped on the controller (or accessible via the skin) it makes sense to draw mark with the lowest index on top to increase the chance that a user can jump to it via GUI or performance pads. Zulip Discussion: https://mixxx.zulipchat.com/#narrow/stream/109171-development/topic/hotcue.20markers.20drawn.20over.20each.20other
2020-05-06Reformat codeUwe Klotz
2020-05-06engine/controls/cuecontrol: Allow using saved loops as hotcuesJan Holthuis
2020-05-06Merge branch 'master' of github.com:mixxxdj/mixxx into ↵Jan Holthuis
serato-markers-integration-loops
2020-05-06use F11 as additional fullscreen shortcutronso0
1) to restore previous Linux shortcut 2) to have it as additional shortcut on OS where QKeySequence::FullScreen is not set (for example Ubuntu Studio 20.04 as of 2020-05-04)
2020-05-06make mic ducking use strength the same way in Auto & Man moderonso0
Previously, engine/enginetalkoverducking returned opposite values for 'strength' in Auto and Manual mode. This commit removes the inversion from Auto mode, thus the Strength knob always affects the music volume in the same way with both modes, much like a Muisc Volume knob: * fully left: music muted completely * fully right: music volume unchanged
2020-05-05Merge pull request #2748 from uklotzde/lp1876202_wsearchlineeditBe
Lp1876202: Fix WSearchLineEdit state machine
2020-05-05Provide more context in translator tip commentUwe Klotz
2020-05-05Add a translator tip comment for WSearchLineEdit placeholderUwe Klotz
2020-05-05Use parented_ptr instead of a plain pointerUwe Klotz
2020-05-05Remove internal state switching from WSearchLineEditUwe Klotz
2020-05-05Delete redundant commentUwe Klotz
2020-05-05Merge pull request #2751 from JaviVilarroig/Move_Beats_to_mixxx_namespaceBe
Move Beats et al. to mixxx namespace
2020-05-05Remove redundant methods and invocationsUwe Klotz
2020-05-05Rename methodUwe Klotz
2020-05-05Simplify placeholder color calculationUwe Klotz
2020-05-05Revert "Rename unspecific setup() method"Uwe Klotz
This reverts commit 52e13b4823b0743a1e1e1262fa3f69df44266308.
2020-05-05Log placeholder colorUwe Klotz
2020-05-05Rename unspecific setup() methodUwe Klotz
2020-05-05Hide internal state typeUwe Klotz
2020-05-05Rename slots according to naming conventionsUwe Klotz
2020-05-05Move logic from LibraryControl to WSearchLineEditUwe Klotz
2020-05-05Turn slots into methodsUwe Klotz
2020-05-05Use a custom color for the placeholder text (Qt >= 5.12)Uwe Klotz
2020-05-05Change default background color to blackUwe Klotz
2020-05-05Delete obsolete member variableUwe Klotz
2020-05-04Remove obsolete forground color switchingUwe Klotz