Merge lp://qastaging/~mixxxdevelopers/mixxx/features_softtakeover into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Sean M. Pappalardo | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp://qastaging/~mixxxdevelopers/mixxx/features_softtakeover | ||||
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk | ||||
Diff against target: |
476 lines (+227/-15) (has conflicts) 11 files modified
mixxx/build/depends.py (+2/-0) mixxx/src/midi/mididevice.cpp (+19/-9) mixxx/src/midi/mididevice.h (+2/-0) mixxx/src/midi/midimapping.cpp (+4/-0) mixxx/src/midi/midioptiondelegate.cpp (+10/-3) mixxx/src/midi/midiscriptengine.cpp (+13/-1) mixxx/src/midi/midiscriptengine.h (+4/-0) mixxx/src/mixxxcontrol.cpp (+6/-2) mixxx/src/mixxxcontrol.h (+2/-0) mixxx/src/softtakeover.cpp (+115/-0) mixxx/src/softtakeover.h (+50/-0) Text conflict in mixxx/src/midi/midimapping.cpp |
||||
To merge this branch: | bzr merge lp://qastaging/~mixxxdevelopers/mixxx/features_softtakeover | ||||
Related bugs: |
|
||||
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
RJ Skerry-Ryan | Approve | ||
Sean M. Pappalardo | Abstain | ||
Albert Santoni | Needs Fixing | ||
Review via email:
|
Description of the change
This branch adds soft-takeover capabilities for MIDI controllers, both for simple XML mappings and MIDI scripting.
I'm requesting that this be included in time for Mixxx v1.9.0.
Note that the main goal was to add this for MIDI scripting. I did it for the XML mappings as well for completeness, but that part isn't totally useful until Mixxx can accept multiple <option>s for simple XML mappings. Adding that capability is beyond the scope of the feature itself since everything is hard-coded for a single <option>, and it would require modification of GUI classes as well, something I don't feel qualified to do, especially not with the hope of getting this merged in time for 1.9.0.
Hey Sean,
I'm going to give you a hard time because you're a developer. :)
Two questions:
1) How is this useful in its current incarnation if you can't have
multiple <options> blocks?
2) Why does this have to go in 1.9? None of the mappings are using it. ??
3) What are the SCS.3d changes you made? Should we cherry-pick those
changes and put them in trunk before everything else?
Thanks,
Albert
On Tue, Nov 16, 2010 at 4:58 PM, Sean M. Pappalardo /bugs.launchpad .net/bugs/ 555547 /code.launchpad .net/~mixxxdeve lopers/ mixxx/features_ softtakeover/ +merge/ 41027 res/midi/ Stanton- SCS3d-scripts. js' midi/Stanton- SCS3d-scripts. js 2010-06-29 11:58:44 +0000 midi/Stanton- SCS3d-scripts. js 2010-11-17 00:57:57 +0000 triggerS4 = 0xFF; modeSignals = {"fx":[ ["[Flanger]", "lfoDepth", "StantonSCS3d. FXDepthLEDs" ], modeSignals = {"fx":[ ["[Flanger]", "lfoDepth", "StantonSCS3d. FXDepthLEDs" ], FXDelayLEDs" ], FXPeriodLEDs" ], B11LED" ], B11LED" ] ], B11LED" ] ], B11LED" ], BsALED" ], BsBLED" ],
<email address hidden> wrote:
> Sean M. Pappalardo has proposed merging lp:~mixxxdevelopers/mixxx/features_softtakeover into lp:mixxx.
>
> Requested reviews:
> Mixxx Development Team (mixxxdevelopers)
> Related bugs:
> #555547 Add soft-takeover for MIDI controllers (XML and script)
> https:/
>
>
> This branch adds soft-takeover capabilities for MIDI controllers, both for simple XML mappings and MIDI scripting.
>
> I'm requesting that this be included in time for Mixxx v1.9.0.
>
> Note that the main goal was to add this for MIDI scripting. I did it for the XML mappings as well for completeness, but that part isn't totally useful until Mixxx can accept multiple <option>s for simple XML mappings. Adding that capability is beyond the scope of the feature itself since everything is hard-coded for a single <option>, and it would require modification of GUI classes as well, something I don't feel qualified to do, especially not with the hope of getting this merged in time for 1.9.0.
> --
> https:/
> Your team Mixxx Development Team is requested to review the proposed merge of lp:~mixxxdevelopers/mixxx/features_softtakeover into lp:mixxx.
>
> === modified file 'mixxx/
> --- mixxx/res/
> +++ mixxx/res/
> @@ -64,7 +64,7 @@
> StantonSCS3d.
>
> // Signals to (dis)connect by mode: Group, Key, Function name
> -StantonSCS3d.
> +StantonSCS3d.
> ["[Flanger]", "lfoDelay", "StantonSCS3d.
> ["[Flanger]", "lfoPeriod", "StantonSCS3d.
> ["CurrentChannel", "reverse", "StantonSCS3d.
> @@ -80,77 +80,77 @@
> "loop2":[ ["CurrentChannel", "pfl", "StantonSCS3d.
> "loop3":[ ["CurrentChannel", "pfl", "StantonSCS3d.
> "trig":[ ["CurrentChannel", "pfl", "StantonSCS3d.
> - ["CurrentChannel", "hotcue_1_enabled", "StantonSCS3d.
> - ["CurrentChannel", "hotcue_2_enabled", "StantonSCS3d.
> - ["CurrentChannel...