Skip to content
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.

Sign up for GitHub

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

Jump to bottom

synclock-06-scratch-phase #2

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

synclock-06-scratch-phase #2

wants to merge 21 commits into from

Commits on Jun 16, 2021

  1. Sync Lock: rename functions to make them clearer

    @ywwg
    ywwg committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    fa980d9 View commit details
    Browse the repository at this point in the history

  2. Sync Lock: Don't recalc half/double multiplier on every callback

    @ywwg
    ywwg committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    2d2b485 View commit details
    Browse the repository at this point in the history

  3. Rename Sync instances of "master" to "leader" 

    Also add an alias from the sync_master CO to sync_leader
    @ywwg
    ywwg committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    9e85796 View commit details
    Browse the repository at this point in the history

  4. Sync Lock: Differentiate track loading from beats updating 

    When we load a track, we want the deck to sync to other decks.
When we update beats of a Leader deck, we want it to remain at the same playback speed.
    @ywwg
    ywwg committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    eb3e428 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. Merge branch 'main' into syncleader

    @ywwg
    ywwg committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    9f374f4 View commit details
    Browse the repository at this point in the history

  2. Sync Lock: rename a few more instances of sync_master to sync_leader

    @ywwg
    ywwg committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    8559d2f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'syncleader' into synclock-05-explicitload

    @ywwg
    ywwg committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    688f91a View commit details
    Browse the repository at this point in the history

  4. Fix bad phase seek when starting from preroll. 

    We were interpreting all <0 playposition as "invalid", which is not correct.
fixes https://bugs.launchpad.net/mixxx/+bug/1930143
    @ywwg
    ywwg committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    90b6ec4 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2021

  1. Sync Lock: convert enums to enum classes

    @ywwg
    ywwg committed Jul 10, 2021
    Configuration menu
    Copy the full SHA
    e79703d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into syncleader

    @ywwg
    ywwg committed Jul 10, 2021
    Configuration menu
    Copy the full SHA
    36781b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. Merge branch 'syncleader'

    @ywwg
    ywwg committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    6fbf69a View commit details
    Browse the repository at this point in the history

  2. Sync Lock: Update remaining instances of "master" 

    Remove sync_mode from control picker menu, it's an internal CO that
should not need to be mapped.
    @ywwg
    ywwg committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    23942ee View commit details
    Browse the repository at this point in the history

  3. Merge branch 'syncleader' into synclock-05-explicitload

    @ywwg
    ywwg committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    830dc8d View commit details
    Browse the repository at this point in the history

  4. Sync Lock: Remove stray debug line

    @ywwg
    ywwg committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    1a1cc2d View commit details
    Browse the repository at this point in the history

  5. Sync Lock: make sure to reinit leader params after scratching ends

    @ywwg
    ywwg committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    f598252 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2021

  1. Merge branch 'synclock-05-explicitload' into synclock-06-scratch-phase

    @ywwg
    ywwg committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    366f21c View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2021

  1. Merge branch 'main' into synclock-06-scratch-phase

    @ywwg
    ywwg committed Aug 8, 2021
    Configuration menu
    Copy the full SHA
    da25c1a View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2021

  1. Merge branch 'synclock-05-explicitload' into synclock-06-scratch-phase

    @ywwg
    ywwg committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    d1b58f4 View commit details
    Browse the repository at this point in the history

  2. Update beatgrid generation api

    @ywwg
    ywwg committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    102b303 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'synclock-05-explicitload' into synclock-06-scratch-phase

    @ywwg
    ywwg committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    380e534 View commit details
    Browse the repository at this point in the history

  4. Sync Lock: Fix beat distance being out of date after a seek 

    Also fix swap-named tests
    @ywwg
    ywwg committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    4593b5b View commit details
    Browse the repository at this point in the history