Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-05-04 | Move Beats et al. to mixxx namespace | Javier Vilarroig | |
2020-04-26 | master sync: doc updates | Owen Williams | |
2020-04-21 | get rid of setMasterBaseBpm() | Daniel Schürmann | |
2020-04-21 | removed the use of file_bpm form the engine, streamline update order. | Daniel Schürmann | |
Depending on the event different slots of bpmconro and synccontrol where called in different order. This leads to various hard to tack issues because the cal heriarchy is unclear when reading signal slot connections. Now bpmconrol is always updated before synccontrol and we onbly look to Beats. Loading a track and changing beats are treated the same. | |||
2020-04-21 | SyncControl: treat a changed beat grid like a changed track | Daniel Schürmann | |
2020-02-20 | fix EngineSyncTest.HalfDoubleBpmTest | Daniel Schürmann | |
2019-12-20 | rename notifySyncModeChanged to setSyncMode and stream line code when ↵ | Daniel Schürmann | |
becomming a master | |||
2019-11-15 | Merge pull request #1765 from daschuer/rate_ratio | Uwe Klotz | |
Rate ratio | |||
2019-11-10 | Add missing override to fix clang's -Winconsistent-missing-override warnings | Jan Holthuis | |
2019-01-20 | Merge remote-tracking branch 'upstream/master' into rate_ratio | Daniel Schürmann | |
Conflicts: src/engine/controls/ratecontrol.cpp src/engine/controls/ratecontrol.h src/engine/sync/synccontrol.cpp src/test/enginesynctest.cpp | |||
2019-01-12 | Merge remote-tracking branch 'upstream/2.2' | Daniel Schürmann | |
Conflicts: CHANGELOG.md LICENSE build/wix/LICENSE.rtf src/defs_version.h src/engine/controls/ratecontrol.cpp | |||
2019-01-10 | Merge remote-tracking branch 'upstream/master' into rate_ratio | Daniel Schürmann | |
Conflicts: src/engine/controls/bpmcontrol.cpp src/engine/controls/keycontrol.cpp src/engine/sync/synccontrol.cpp src/widget/wnumberrate.cpp | |||
2019-01-06 | move EngineControls to their own folder | Be | |
2018-12-23 | ignore bpm changes caused by changing beat grid | Daniel Schürmann | |
2018-12-16 | Merge remote-tracking branch 'upstream/master' into rate_ratio | Daniel Schürmann | |
Conflicts: src/engine/bpmcontrol.cpp src/engine/ratecontrol.cpp src/engine/ratecontrol.h | |||
2018-11-28 | removed unused pOldTrack from trackLoaded function | Daniel Schürmann | |
2018-09-14 | SyncControl use "rate_ratio" | Daniel Schürmann | |
2018-07-23 | Used the new rate_ratio control to set the rate | Daniel Schürmann | |
2018-06-01 | Restore quantize dependency of sync_enable lost in a previous commit | Daniel Schürmann | |
2017-10-31 | Removed unused EngineControl::getTrigger() and added some missing override ↵ | Daniel Schürmann | |
keywords | |||
2016-04-27 | Replace use of "slave" with "proxy" or "follower" everywhere. | RJ Ryan | |
2016-03-06 | Replace trackUnloaded() with void trackLoaded(TrackPointer pNewTrack, ↵ | Daniel Schürmann | |
TrackPointer pOldTrack); This hepls to streamline the code in the consumer slots | |||
2016-02-17 | fix code duplication in SyncControl | Daniel Schürmann | |
2016-01-24 | Use UserSettings (typedef) instead of ConfigObject. | RJ Ryan | |
This will allow us to experiment with different implementations for structured user preferences. It will also reduce repeated typing of template arguments and better represent the purpose of the object. | |||
2015-09-11 | Improve comments | Daniel Schürmann | |
2015-09-08 | prefer deleting ControlObjectSlave by the Qt object tree, since this ↵ | Daniel Schürmann | |
gurantees that the object is deleted by the right thread. | |||
2015-02-26 | Misc fixes. | RJ Ryan | |
2014-12-03 | BeatMap: Fix bpm and sync behavior with beatmaps. | Owen Williams | |
YOUR BPM INDICATOR IS LYING TO YOU. Since a beatmap doesn't have a constant bpm, using the "file_bpm" value for sync and slider display is misleading. This commit introduces a new ControlObject, "local_bpm", which represents the average bpm value around the closest 8 beat span. It's still a fairly noisy value, so it may require tuning. This local_bpm value is used to display the visual_bpm, so now you can watch the bpm of your crazy track change over time. Also it's used for master sync, so you can watch the pitch slider of your track wobble around as it tries to stay in sync. TESTED=existing tests pass, and some new tests for the bpm averaging function. | |||
2014-11-23 | Master Sync: if only one playing sync deck, reset user offset and reinit ↵ | Owen Williams | |
master beat distance. This should help prevent user offsets from accumulating over the course of a set, which is really annoying and makes master sync feel bad. There's a chance that the master beat distance could be incorrectly tweaked, which would be user-visible as tracks that were in sync suddenly offset by a small amount. I will do some on-decks testing to make sure this isn't happening. | |||
2014-11-07 | Use QString instead of char* in Constructor | Max Linke | |
This should replace all appearances of `const char*` with a `QString` in all classes contained in src/engine. This thing felt like fighting against a hydra -.- | |||
2014-09-11 | Change some names and add comments to make things clearer | Owen Williams | |
2014-09-09 | More x2 /2 cleanup | Owen Williams | |
2014-09-09 | Clean up the diff | Owen Williams | |
2014-09-09 | Wrap up sync master param setting into one convenience function where possible. | Owen Williams | |
2014-09-08 | Fix a problem with beat percentage calculation being off | Owen Williams | |
2014-09-08 | I think things are working ok now? | Owen Williams | |
2014-09-08 | Working out the kinks | Owen Williams | |
2014-09-07 | Double/Half master sync mostly works! | Owen Williams | |
2014-09-07 | Initial work for getting bpm x2 /2 working | Owen Williams | |
2014-08-20 | Fix explicit master not updating beat_distance. | Owen Williams | |
Rename beat distance setting funcs to be clearer. Remove anonymous namespace, which breaks FRIEND_TEST | |||
2014-08-13 | Fix phase syncing | Owen Williams | |
2014-08-12 | Move beat_distance calculation after buffer processing to keep them in sync. | Owen Williams | |
Otherwise, during syncs, some beat_distances are pre-processing and others are post-processing. This leads to misaligned phase syncs. | |||
2014-03-25 | Make sync_mode a 3-state toggle button. | RJ Ryan | |
2013-12-27 | Make programatically-triggered phase syncing happen inside enginebuffer to ↵ | Owen Williams | |
prevent off-by-one-buffer misalignment. | |||
2013-12-27 | Try to sync phase when enabling sync follower | Owen Williams | |
2013-12-27 | Add set-phase-on-sync-enable. Fails because internal buffer is always ↵ | Owen Williams | |
marching forward | |||
2013-12-23 | Prevent another party stopper | Owen Williams | |
* If track is loaded or unloaded on explicit master, hand off. | |||
2013-12-23 | Prevent some master sync party-stoppers: | Owen Williams | |
* Deck passthrough activates -> sync disables * Track ejected -> if master, sync disables, otherwise no change. * Beatgrid on track cleared or becomes empty (0BPM) -> if quantize enabled, disable it (that's all we can do from bpmcontrol) | |||
2013-12-14 | Make vinyl control and follower mode mutually exclusive. | Owen Williams | |
2013-12-13 | Some scratching changes. | RJ Ryan | |
* Move follower rate over-ride to late in RateControl so that is_scratching is properly updated and the PositionScratchController is updated. This unbreaks scratching of followers. * Add notifyScratching method to SyncableListener for Syncables to report when they start and stop scratching. * For non-explicit master mode, allow scratching any deck to affect all decks by temporarily making the scratching deck master. |