lp:~ywwg/mixxx/features_xwax2
Created by
Owen Williams
and last modified
This branch contains all of my work on the xwax vinyl control portion of Mixxx. The branch has been merged with trunk, but fixes to vinyl control that haven't been committed to trunk will be made here.
- Get this branch:
- bzr branch lp:~ywwg/mixxx/features_xwax2
Only
Owen Williams
can upload to this branch. If you are
Owen Williams
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- RJ Skerry-Ryan: Approve
-
Diff: 3843 lines (+1680/-472) (has conflicts)57 files modifiedmixxx/build/depends.py (+3/-0)
mixxx/lib/xwax/timecoder.c (+1/-1)
mixxx/lib/xwax/timecoder_win32.cpp (+1/-1)
mixxx/src/cachingreader.cpp (+163/-145)
mixxx/src/cachingreader.h (+79/-74)
mixxx/src/dlgprefnovinyldlg.ui (+23/-0)
mixxx/src/dlgprefvinyl.cpp (+3/-0)
mixxx/src/dlgprefvinyldlg.ui (+7/-0)
mixxx/src/engine/enginebuffer.cpp (+5/-9)
mixxx/src/engine/enginebufferscalelinear.cpp (+0/-10)
mixxx/src/engine/enginebufferscalest.h (+5/-5)
mixxx/src/engine/enginedeck.cpp (+1/-2)
mixxx/src/engine/enginemaster.cpp (+11/-2)
mixxx/src/engine/enginemaster.h (+2/-0)
mixxx/src/engine/enginevinylsoundemu.cpp (+37/-25)
mixxx/src/engine/enginevinylsoundemu.h (+6/-1)
mixxx/src/engine/engineworkerscheduler.cpp (+25/-11)
mixxx/src/engine/engineworkerscheduler.h (+21/-6)
mixxx/src/engine/readaheadmanager.cpp (+12/-7)
mixxx/src/engine/readaheadmanager.h (+2/-1)
mixxx/src/engine/syncworker.cpp (+25/-0)
mixxx/src/engine/syncworker.h (+20/-0)
mixxx/src/engine/vinylcontrolcontrol.cpp (+6/-0)
mixxx/src/engine/vinylcontrolcontrol.h (+2/-0)
mixxx/src/library/basesqltablemodel.cpp (+85/-0)
mixxx/src/library/basetrackcache.cpp (+15/-2)
mixxx/src/library/dao/trackdao.cpp (+3/-1)
mixxx/src/library/itunes/itunesfeature.cpp (+45/-20)
mixxx/src/library/preparelibrarytablemodel.cpp (+5/-1)
mixxx/src/library/rhythmbox/rhythmboxfeature.cpp (+1/-1)
mixxx/src/library/traktor/traktorfeature.cpp (+1/-1)
mixxx/src/mixxx.cpp (+10/-35)
mixxx/src/skin/legacyskinparser.cpp (+4/-2)
mixxx/src/skin/legacyskinparser.h (+3/-1)
mixxx/src/skin/skinloader.cpp (+7/-1)
mixxx/src/skin/skinloader.h (+2/-1)
mixxx/src/soundmanager.cpp (+1/-9)
mixxx/src/soundmanager.h (+0/-2)
mixxx/src/track/beatfactory.cpp (+4/-5)
mixxx/src/trackinfoobject.cpp (+11/-1)
mixxx/src/trackinfoobject.h (+4/-0)
mixxx/src/util/fifo.h (+44/-0)
mixxx/src/util/pa_memorybarrier.h (+128/-0)
mixxx/src/util/pa_ringbuffer.c (+238/-0)
mixxx/src/util/pa_ringbuffer.h (+233/-0)
mixxx/src/vinylcontrol/vinylcontrol.cpp (+15/-2)
mixxx/src/vinylcontrol/vinylcontrol.h (+6/-1)
mixxx/src/vinylcontrol/vinylcontrolmanager.cpp (+17/-6)
mixxx/src/vinylcontrol/vinylcontrolmanager.h (+1/-0)
mixxx/src/vinylcontrol/vinylcontrolsignalwidget.cpp (+1/-1)
mixxx/src/vinylcontrol/vinylcontrolxwax.cpp (+118/-61)
mixxx/src/vinylcontrol/vinylcontrolxwax.h (+2/-1)
mixxx/src/waveform/waveformrenderer.cpp (+24/-1)
mixxx/src/waveform/waveformrenderer.h (+2/-1)
mixxx/src/widget/wspinny.cpp (+160/-10)
mixxx/src/widget/wspinny.h (+25/-1)
mixxx/src/widget/wtracktableview.cpp (+5/-4)
- RJ Skerry-Ryan: Pending requested
-
Diff: 1496 lines (+492/-161) (has conflicts)28 files modifiedmixxx/lib/xwax/timecoder.c (+1/-1)
mixxx/lib/xwax/timecoder_win32.cpp (+1/-1)
mixxx/src/dlgprefnovinyldlg.ui (+67/-0)
mixxx/src/dlgprefvinyl.cpp (+3/-0)
mixxx/src/dlgprefvinyldlg.ui (+7/-0)
mixxx/src/engine/enginebuffer.cpp (+3/-0)
mixxx/src/engine/enginebufferscalelinear.cpp (+0/-10)
mixxx/src/engine/enginedeck.cpp (+1/-2)
mixxx/src/engine/enginevinylsoundemu.cpp (+29/-25)
mixxx/src/engine/enginevinylsoundemu.h (+1/-1)
mixxx/src/engine/vinylcontrolcontrol.cpp (+6/-0)
mixxx/src/engine/vinylcontrolcontrol.h (+2/-0)
mixxx/src/mixxx.cpp (+9/-35)
mixxx/src/skin/legacyskinparser.cpp (+4/-2)
mixxx/src/skin/legacyskinparser.h (+3/-1)
mixxx/src/skin/skinloader.cpp (+4/-2)
mixxx/src/skin/skinloader.h (+2/-1)
mixxx/src/soundmanager.cpp (+1/-0)
mixxx/src/vinylcontrol/vinylcontrol.cpp (+15/-2)
mixxx/src/vinylcontrol/vinylcontrol.h (+6/-1)
mixxx/src/vinylcontrol/vinylcontrolmanager.cpp (+2/-6)
mixxx/src/vinylcontrol/vinylcontrolsignalwidget.cpp (+1/-1)
mixxx/src/vinylcontrol/vinylcontrolxwax.cpp (+103/-57)
mixxx/src/vinylcontrol/vinylcontrolxwax.h (+1/-0)
mixxx/src/waveform/waveformrenderer.cpp (+24/-1)
mixxx/src/waveform/waveformrenderer.h (+2/-1)
mixxx/src/widget/wspinny.cpp (+169/-10)
mixxx/src/widget/wspinny.h (+25/-1)
Related source package recipes
Related bugs
| Bug #528113: Vinyl control signal quality doesn't refresh | Low | Fix Released |
|
| Bug #624925: Mixxx should switch to relative mode if looping is enabled in absolute mode | Wishlist | Fix Released |
|
| Bug #624931: Scale BPM display does not work for vinyl control in Mixxx 1.8 and below | Wishlist | Fix Released |
|
| Bug #669289: Enable needle cueing in relative mode | Wishlist | Fix Released |
|
| Bug #672758: Support 45 rpm vinyl mode | Wishlist | Fix Released |
|
Related blueprints
Vinyl Control Improvements
(Essential)
Branch information
Recent revisions
- 2685. By Owen Williams
-
Vinyl Control bugfixes:
* fix steady pitch detector to work in reverse and better detect loops
* try not to enter track selection mode when scratching - 2684. By Owen Williams
-
Create vinylcontrol_
scratching CO that is 1 when pitch is changing rapidly and 0 when not.
Use new vinylcontrol_scatching CO to trigger swap between keylock and linear scaling in engine. - 2683. By Owen Williams
-
Since my wave writer code is so useful, make it something I can #define to enable
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~mixxxdevelopers/mixxx/trunk
