Skip to content

Some fixes to EngineSync#50

Merged
ywwg merged 19 commits into
mixxxdj:master_syncfrom
rryan:master_sync
Jul 21, 2013
Merged

Some fixes to EngineSync#50
ywwg merged 19 commits into
mixxxdj:master_syncfrom
rryan:master_sync

Conversation

@rryan
Copy link
Copy Markdown
Member

@rryan rryan commented Jul 19, 2013

  • Supports channels other than [Channel1-4].
  • Keeps track of current channel master via a SyncChannel class and not the EngineChannel pointer.
  • Removes MIDI stuff -- we should add that later instead of leaving as a stub.
  • Some other minor stuff.

rryan added 18 commits July 18, 2013 16:28
…d. Replace "[Master]" with a constant in EngineSync.
…of just Channel1-4. Rename some methods and make them private.
…ter. Store the current beat distance and engine rate controls in SyncChannel itself.
Comment thread src/engine/enginesync.cpp
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

like my comment style? :P We should clean these up before merging. (but they can stay in the branch for now)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahah yea these debugs and the commentary are funny.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it makes things easy to see amidst the log spew. I even do this at work :)

@ywwg
Copy link
Copy Markdown
Member

ywwg commented Jul 19, 2013

Have you been testing master sync at all? If so, and these changes don't introduce any obvious bugs, LGTM.

@rryan
Copy link
Copy Markdown
Member Author

rryan commented Jul 19, 2013

Nope :(. I probably broke things.

@ywwg
Copy link
Copy Markdown
Member

ywwg commented Jul 21, 2013

This seems to still work! merging.

ywwg added a commit that referenced this pull request Jul 21, 2013
@ywwg ywwg merged commit 72b9aa8 into mixxxdj:master_sync Jul 21, 2013
@daschuer daschuer mentioned this pull request Jun 11, 2018
11 tasks
Be-ing referenced this pull request in Be-ing/mixxx Mar 30, 2020
DlgPrefColors: use full palette preview for icons in comboboxes
m0dB pushed a commit to m0dB/mixxx that referenced this pull request Jan 21, 2024
update Download page for 2.2.0 release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants