-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
GSoC 2020: Mixxx Macros [Moved] #2989
Closed
Closed
Changes from 1 commit
Commits
Show all changes
185 commits
Select commit
Hold shift + click to select a range
2d2eaba
MacroManager: Add SaveAndLoadMacro Test
xeruf 0503851
Macros: Add MacroManager
xeruf de39da1
Clean up comments & engine sidechain headers
xeruf 5554de8
Macros: Test control connection in MacroManager
xeruf 32e1c2b
Macros: Use ControlProxy
xeruf fc63892
Macros: Implement RecordingManagerBase
xeruf 577c151
Macros: Implement RecordingManagerBase & add Button for MacroManager …
xeruf efa7ff8
Clear code noise in engine
xeruf 66a537d
Macros: Enable Macro recording & dumping
xeruf d70041e
CMakeLists.txt: Fix duplicate entries
xeruf 284c751
Macros: Reduce real-time code in EngineBuffer
xeruf 8ef1366
Macros: Clean up ControlObjects & logging
xeruf 64c6231
Macros: Clean up MacroManager
xeruf d86125e
Macros: Clean up Logging
xeruf 62d7e11
Macros: Handle deck claiming atomically
xeruf 62c32dc
Macros: Add some todos
xeruf 0be66b1
Macros: Set deck CO and ignore noop jumps
xeruf 228dcf8
Macros: Replace magic values by MacroState enum
xeruf 337e9c9
Macros: Remove unused arguments from MacroManager
xeruf c2ed2a6
Macros: Coding style & Cleanup
xeruf 53ad10d
Macros: Remove unnecessary pointers
xeruf 1303369
Macros: Do not pass EngineMaster into MacroManager constructor
xeruf 677c894
Macros: Move recording code from EngineBuffer to MacroManager
xeruf d4b89b1
Macros: Add documentation, name methods more appropriately, slight r…
xeruf 129599a
Macros: Fix coding mistakes & save frame positions
xeruf 9003899
Macros: Add protobuf definition
xeruf 58bb100
Macros: Reduce imports and improve debug output
xeruf 5b9acec
Macros: Adjust proto format
xeruf 5ec1deb
Macros: Pass ChannelHandle by reference
xeruf bfc4276
Macros: Delete MacroManager in MixxxMainWindow deconstructor
xeruf 0d5b060
Macros: Create a MacroManagerTest
xeruf 696d9c1
Macros: Add simple test
xeruf 1993b7d
Macros: Create claimRecording Test
xeruf df0cbb2
Create a ControlObject toggle function
xeruf 24b0d53
Macros: Expand MacroManager Unit tests
xeruf e817b3d
SignalPathTest: Clean up ordering & formatting
xeruf 39ca8b1
SignalPathTest: Initialize fields in constructor list
xeruf 864d30e
Macros: Create working E2ETest
xeruf 320376b
Macros: Reduce reliance on internals in tests
xeruf 822f56e
Macros: Update TODO's
xeruf bbe2a00
Macros: Add initial database schema
xeruf eafb413
Macros: Make stopping Thread-safe by changing State definitions
xeruf 3c1fcc9
Macros: Simplify database schema
xeruf 9f3a0d1
Macros: Style recording Dot
xeruf 757fd9a
Macros: Create poll thread to update recording status CO
xeruf a39f69e
Macros: Emit saveMacro signal on recording stop
xeruf ddc14df
Macros: Move into own folder & separate Macro class
xeruf ac3ed8e
Macros: Rename MacroManager to MacroRecorder
xeruf 899b11a
Macros: Rename Tests
xeruf d03fdf3
Macros: Use QTimer to poll for recording start
xeruf ea3ebfa
Macros: Test recording_status CO
xeruf 208de88
Macros: Introduce MacroManager to wrap Macro components
xeruf ce6a09a
Clean up EngineBuffer & EngineSideChain
xeruf 3781974
Macros: Clean up code style & Refactor
xeruf 8120bdd
Macros: Rename macros QLoggingCategory
xeruf 2e9d266
Clean up database headers
xeruf 6350112
Macros: Connect to database & receive saveMacro signal
xeruf 306910e
Macros: Add Macro::serialize method using proto
xeruf ec124ee
Macros: Test & fix Macro serialization
xeruf 4725429
Macros: Improve documentation
xeruf 6f6ff57
Macros: Implement & test Macro deserialization
xeruf 9b76c58
Macros: Fix stop if recording is already stopped
xeruf c975ae8
Macros: Simplify recording stop polling
xeruf 62e27a4
Macros: Clean up parameter naming
xeruf bf68285
Macros: Create proto namespace alias
xeruf d41538c
Macros: Update TODO's & Recording State enum
xeruf ae8e157
Macros: Add stopRecordingAsync test & fix CAS loop
xeruf 3c87fda
Macros: Add MacroAction Type enum & update serialization
xeruf c38f34c
Macros: Fix schema revision
xeruf 1781c90
Move config group definitions from header to cpp
xeruf aac374d
Macros: Use SPSCQueue for recording
xeruf 3447343
Macros: Repurpose Macro class
xeruf 53ac82c
Macros: Slightly reorder database columns
xeruf a02bede
MacroManager: Load Macros by TrackId
xeruf 7e621b6
MacroManager: Properly obtain track id via PlayerManager
xeruf 50fead8
Macros: Apply review suggestions
xeruf 8a0ca78
MacroRecorder: Factor out fetchRecordedActions from saving and refact…
xeruf 0f74ca7
Track: Reorder some methods and remove useless comments
xeruf 278ba90
Macros: Create MacroDAO and use QFlags for Macro State
xeruf 4b1abaa
Macros: Integrate MacroDAO with TrackDAO and save Macros in Track
xeruf 86438f8
Macro: Rename StateFlags to StateFlag
xeruf a496b69
Macro: Reorder properties
xeruf 574799f
Macros: Stop recording on track change
xeruf 56080a3
Macros: Test recording stop on track ejection
xeruf eb5500b
Macros: Fix SEGFAULT when saving by inject PlayerManager later
xeruf d54c640
test: Move Macro tests into own subfolder
xeruf 96fe0ce
Macros: Automatically play enabled Macros
xeruf 1c4e7e5
Macros: Adjust playback tolerance range
xeruf 97a57d1
Merge branch 'master' into macros
xeruf 1f47150
Engine: Reduce unrelated changes
xeruf cd01c53
MacroDAO: Add saveMacro method for constructed method
xeruf bf6e3d3
Macros: Add Playback Test
xeruf ad1ff6f
MacroRecorder: Refactor namings & RT-safety
xeruf 9925984
Macros: Rename & refactor MacroRecorder COs
xeruf 6421a2d
Macros: Fix skin controls
xeruf 11ae809
Macros: Add slot number to database
xeruf b086607
Merge branch 'master' into macros
xeruf 80fc0f9
Macros: Pass TrackPointer when saving Macros
xeruf f86b329
Macros: Delegate Macro saving to Track
xeruf b0198a9
Macros: Add MacroControl
xeruf 44edcb2
Macros: Slight cleanup
xeruf 5a8cbf8
Macros: Handle Macro Playback in MacroControl
xeruf ccb1b35
MacroControl: Update Status CO
xeruf 9d7a278
Macro: Implement accessors and dirtiness
xeruf 8684e8b
Macros: Use shared MacroPtr & fix DAO saving
xeruf 39c4959
Macro: Move class to track
xeruf a445dd6
MacroDAO: Move class to dao folder
xeruf cb83dce
MacroControl: Update namings & improve controls
xeruf 8960233
MacroControl: Add simple test
xeruf 92105a0
MacroControl: Prepare Recording
xeruf c1b1417
MacroRecorder: Cleanup tests
xeruf 70f8f24
Macros: Move Recording to MacroControl
xeruf 821fe66
Macros: Remove global Macro management
xeruf 6e6176c
Macros: Delete MacroManager and MacroRecorder
xeruf 8eb90ce
Macros: Update MacroDAO and fix tests
xeruf 669cee8
MacroControl: Add status indicator CO
xeruf 89d3743
Macros: Record extra Action for looping
xeruf ce90ed8
Macros: Rename number to slot everywhere
xeruf 0963c1f
MacroControl: Create gotoAndPlay CO
xeruf 086db70
Macros: Fill empty slots in Control rather than DAO
xeruf 8fa7f2c
test/macros: Use proper expect statements
xeruf 9c9e09d
Macros: Fix Track dirtiness & test dirtiness
xeruf 6a706f9
MacroControl: Fix clear & toggle controls
xeruf 05ef822
Merge branch 'master' into macros
xeruf 0909e55
MacroControl: Fix recording update timer
xeruf 302bbbc
Merge branch 'master' into macros
xeruf 9705284
MacroControl: Fix status checks & check value in slots
xeruf 9af21be
MacroAction: Add getters for sample positions
xeruf df2152d
Macro: Add type property & make const
xeruf fbc5ac9
test/macros: Fix MacroRecording_RecordSeekAndPlay
xeruf b225485
test/macros: Expand MacroControlTest_RecordSeek
xeruf 87d8000
MacroControl: Start recording on non-seeking cue jumps
xeruf 396ec47
Macros: Update documentation comments
xeruf 7de5793
Macro: Rename constant to kMacrosPerChannel
xeruf 884d308
MacroDAO: Remove obsolete slot allocation
xeruf 664ccf2
MacroDAO: Refactor QMap loop
xeruf b6be1b3
MacroControl: Add slot prefixes to slots
xeruf f6c8f8f
Macros: Rename MacroPtr to MacroPointer
xeruf e9faded
MacroControl: Refactor updateRecording
xeruf d35c304
Macro: Add getStartSamplePos()
xeruf cfd828a
MacroControl: Replace "indicator" CO with "playing"
xeruf 5995745
MacroControl: Automatically set Macro label
xeruf d243f58
MacroControl: Remove PlaybackStopped Status
xeruf ec29e2b
Macro: Ignore noop in setState()
xeruf bcdd32f
test/macrocontrol: Expand RecordSeek test
xeruf 63960c3
test/macrocontrol: Expand ControlObjects test
xeruf 0b2fdd8
test/macrocontrol: Test Loop in LoadTrackAndPlay
xeruf 542124a
src/recording/recordingmanagerbase.cpp: Improve toggleRecording
xeruf df130de
MacroControl: Make Status enum class
xeruf d04d8d8
Macros: Use DbId constant for invalid id
xeruf 7aeca5b
test/macrocontrol: Fix status checks
xeruf 6bdca5d
MacroControl: Improve automatic labeling
xeruf 1ae0cee
test/macrocontrol: Create test fixture
xeruf 8d89195
test/macrocontrol: Refactor common code into fixture
xeruf 5225419
Macro: Name attributes more precisely
xeruf bb78c68
Macro: Clean up function signatures
xeruf 4a03821
MacroControl: Rework ControlObjects & use TOGGLE buttons
xeruf 12306f8
Macros: Add to LateNight skin
xeruf ce59015
MacroControl: Make automatic label more precise
xeruf 1af3280
test/macrorecording: Fix recording toggle
xeruf 6f66f9d
test/macros/macro_test.h: Remove anonymous namespace
xeruf edd68a4
Merge branch 'main' into macros
xeruf 0d0b66d
test/macros: expand control testing slightly
xeruf 829acc6
Merge branch 'main' into macros
xeruf f1c23cb
test/macros: Move checkMacroAction into a helper object
xeruf 99ebd32
controls/macrocontrol: Offset quantization
xeruf aa7e062
Macros: Use const references for parameters
xeruf 0f79e27
track/macro: Static cast frame positions
xeruf 3c097e7
controls/macrocontrol: Improve label suffix handling
xeruf 5e38edb
controls/macrocontrol: Get rid of implicit downcasting of doubles to …
xeruf 5f3e07c
track/macro: Always use setDirty to change dirtiness
xeruf 669d498
Macros: Fix pointer naming
xeruf 4176a65
Macros/Skin/LateNight: Refactor MacroPrefix
xeruf a000115
Macros/Skin/LateNight: Only show clear button when clearing is possible
xeruf 5ce6eab
Macros/Skin: Show Label via WTrackProperty
xeruf 43d5579
controls/macrocontrol.cpp: Make slotPlay safer
xeruf c0cdabf
controls/macrocontrol.cpp: Increase readability of some code
xeruf dd986ce
controls/macrocontrol: Handle aborted recordings more cleanly
xeruf 0cc1fd7
controls/macrocontrol: Play single-action Macros
xeruf 605d1ac
Macros/Skin/LateNight: Create & Style MacroActivate Button with icons
xeruf 1eda782
controls/macrocontrol: Implement toggle CO
xeruf 29fe8a4
track/macro: convert MacroAction to a proper class
xeruf e88c8a8
Merge remote-tracking branch 'upstream/main' into macros
xeruf cfc640a
Merge branch 'main' into macros
xeruf 5209c0d
Macros: Migrate to FramePos
xeruf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Macros: Style recording Dot
- Loading branch information
commit 9f3a0d1bd5e62be774b20bd94ce7cf5e485519cb
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes are obsolete and should be removed, right?