Merge lp://qastaging/~ywwg/mixxx/features_xwax2 into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
Owen Williams
Status: | Superseded | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~ywwg/mixxx/features_xwax2 | ||||||||||||||||||||
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk | ||||||||||||||||||||
Diff against target: |
1496 lines (+492/-161) (has conflicts) 28 files modified
mixxx/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) Text conflict in mixxx/src/dlgprefnovinyldlg.ui |
||||||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/~ywwg/mixxx/features_xwax2 | ||||||||||||||||||||
Related bugs: |
|
||||||||||||||||||||
Related blueprints: |
Vinyl Control Improvements
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
RJ Skerry-Ryan | Pending | ||
Review via email:
|
Description of the change
I've continued working in features_xwax2 to make some fixes and updates to the vinyl control code. It would be nice if some of these fixes could go into trunk, other new features can probably wait if it breaks freeze too badly.
New Features:
* Show signal quality inside WSpinny
* More pleasant waveform stretching
Fixes:
* fix vinylsoundemu and take equivalent code out of EBSL
* when loading a track, update track duration with correct value
* keep vinyl control enabled when changing vinyl control preferences
* Absolute mode fixes (better for scratching)
To post a comment you must log in.
Changes in trunk won't go out until after 1.10, should this be retargeted at
LP:mixxx/1.10?
Bill
On Jul 30, 2011 3:21 PM, "Owen Williams" <email address hidden> wrote: /bugs.launchpad .net/mixxx/ +bug/528113 /bugs.launchpad .net/mixxx/ +bug/624925 /bugs.launchpad .net/mixxx/ +bug/624931 /bugs.launchpad .net/mixxx/ +bug/669289 /bugs.launchpad .net/mixxx/ +bug/672758 /code.launchpad .net/~ywwg/ mixxx/features_ xwax2/+ merge/69904 /code.launchpad .net/~ywwg/ mixxx/features_ xwax2/+ merge/69904 lib/xwax/ timecoder. c' xwax/timecoder. c 2011-05-25 19:52:14 +0000 xwax/timecoder. c 2011-07-30 20:21:03 +0000 >resolution * tc->speed); >resolution * lib/xwax/ timecoder_ win32.cpp' xwax/timecoder_ win32.cpp 2011-05-25 19:52:14 +0000 xwax/timecoder_ win32.cpp 2011-07-30 20:21:03 +0000 >resolution * tc->speed); >resolution * src/dlgprefnovi nyldlg. ui' dlgprefnovinyld lg.ui 2011-05-26 10:22:03 +0000 dlgprefnovinyld lg.ui 2011-07-30 20:21:03 +0000
>
> Owen Williams has proposed merging lp:~ywwg/mixxx/features_xwax2 into
lp:mixxx.
>
> Requested reviews:
> RJ Ryan (rryan)
> Related bugs:
> Bug #528113 in Mixxx: "Vinyl control signal quality doesn't refresh"
> https:/
> Bug #624925 in Mixxx: "Mixxx should switch to relative mode if looping is
enabled in absolute mode"
> https:/
> Bug #624931 in Mixxx: "Scale BPM display does not work for vinyl control
in Mixxx 1.8 and below"
> https:/
> Bug #669289 in Mixxx: "Enable needle cueing in relative mode"
> https:/
> Bug #672758 in Mixxx: "Support 45 rpm vinyl mode"
> https:/
>
> For more details, see:
> https:/
>
> I've continued working in features_xwax2 to make some fixes and updates to
the vinyl control code. It would be nice if some of these fixes could go
into trunk, other new features can probably wait if it breaks freeze too
badly.
>
> New Features:
> * Show signal quality inside WSpinny
> * More pleasant waveform stretching
>
> Fixes:
> * fix vinylsoundemu and take equivalent code out of EBSL
> * when loading a track, update track duration with correct value
> * keep vinyl control enabled when changing vinyl control preferences
> * Absolute mode fixes (better for scratching)
> --
> https:/
> Your team Mixxx Development Team is subscribed to branch lp:mixxx.
>
> === modified file 'mixxx/
> --- mixxx/lib/
> +++ mixxx/lib/
> @@ -519,7 +519,7 @@
>
> if (r >= 0) {
> //normalize position to milliseconds, not timecode steps --
Owen
> - r = r * 1000 / (tc->def-
> + r = (float)r * (1000.0 / (tc->def-
tc->speed));
> if (when)
> *when = tc->timecode_ticker * tc->dt;
> return r;
>
> === modified file 'mixxx/
> --- mixxx/lib/
> +++ mixxx/lib/
> @@ -521,7 +521,7 @@
>
> if (r >= 0) {
> //normalize position to milliseconds, not timecode steps --
Owen
> - r = r * 1000 / (tc->def-
> + r = (float)r * (1000.0 / (tc->def-
tc->speed));
> if (when)
> *when = tc->timecode_ticker * tc->dt;
> return r;
>
> === modified file 'mixxx/
> --- mixxx/src/
> +++ mixxx/src/
> @@ -9,8 +9,13 @@
> <rect>
> <x>0</x>
> <y>0</y>
> +<<<<<<< TREE
> <width>461</width>
> <height...