Mixxx

Merge lp://qastaging/~mixxxdevelopers/mixxx/fixes_soundcardSync into lp://qastaging/mixxx/1.9

  1. fixes_soundcardSync
  2. Merge into release-1.9.x
Proposed by Sean M. Pappalardo
Status: Merged
Approved by: Sean M. Pappalardo
Approved revision: 2553
Merged at revision: 2744
Proposed branch: lp://qastaging/~mixxxdevelopers/mixxx/fixes_soundcardSync
Merge into: lp://qastaging/mixxx/1.9
Diff against target: 276 lines (+91/-40)
4 files modified
mixxx/src/sounddeviceportaudio.cpp (+9/-3)
mixxx/src/soundmanager.cpp (+76/-34)
mixxx/src/soundmanager.h (+5/-2)
mixxx/src/soundmanagerconfig.h (+1/-1)
To merge this branch: bzr merge lp://qastaging/~mixxxdevelopers/mixxx/fixes_soundcardSync
Reviewer Review Type Date Requested Status
Phillip Whelan code review Approve
Review via email: mp+42801@code.qastaging.launchpad.net

Commit message

Merging fixes_soundcardSync which now causes Mixxx to lock to the clock of the master output card.

Description of the change

This branch re-works when Mixxx calculates new sound buffers and now only does it in sync with the sound card that is selected as the master output. (If no master out is selected, it uses one of the direct deck outputs.) This eliminates pops and stutters on the master/direct deck output at least.

If only one card is enabled, it functions as the master.

There is commented code in SoundManager::requestBuffer() that will print whenever a slave sound card drops or repeats a buffer which is very useful for testing.

To post a comment you must log in.
Revision history for this message
Phillip Whelan (pwhelan) wrote :

Resubmit this for trunk, since this did not make the feature freeze for 1.9.

review: Disapprove
lp://qastaging/~mixxxdevelopers/mixxx/fixes_soundcardSync updated
2553. By Phillip Whelan

Merging from the 1.9 branch in preparation for merging into the 1.9 release.

Revision history for this message
Phillip Whelan (pwhelan) wrote :

I have reviewed the code and it looks all good; The code is now more elegant, is more flexible and creates no new problems.

I tested this on my desktop; an Ubuntu 10.10 running a vanilla kernel, and experienced no regressions on my Delta 1010LT multi-out card.

Reconsidering my earlier position, I think this should be merged for Mixxx 1.9.1; I would delay it until after the first release, but then get it out as soon as possible. This is only to not further delay the 1.9.0 release. The code is simple enough, and despite how critical it is, it is worth it since it will benefit a large number of novice users.

review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches