-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello,
I just noticed that also the headphone output toggle was also broken in upstream. Just fixed and patch attached. Sorry for flooding with patches, I will try to be more careful before sending a patch. JP -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkyP7eoACgkQchi8veCammcRqACfVoFnCSOfbgVikZIvXnNJvWVN bq0AoJmq8LtijrGDpdJLhgl8rzuUHVdw =7QGW -----END PGP SIGNATURE-----
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/mixxx/1.8/ # testament_sha1: dba97eac3dde074033705a8772bc8b8c0b874d11 # timestamp: 2010-09-14 23:47:35 +0200 # base_revision_id: [email protected]\ # 7pbxju2nxia6pe2i # # Begin patch === modified file 'mixxx/res/midi/M-Audio-Xponent-scripts.js' --- mixxx/res/midi/M-Audio-Xponent-scripts.js 2010-09-14 20:46:50 +0000 +++ mixxx/res/midi/M-Audio-Xponent-scripts.js 2010-09-14 21:45:25 +0000 @@ -223,19 +223,20 @@ }; MaudioXponent.actbin = function(channel, control, value, status) { // Generic binary button + script.debug(channel, control, value, status); var currentdeck = channel+1; - var activenow = engine.getValue("[Channel"+currentdeck+"]",MaudioXponent.binleds[control]); - if (activenow == 1) { // If currently active - engine.setValue("[Channel"+currentdeck+"]",MaudioXponent.binleds[control],0); // Stop - midi.sendShortMsg(MaudioXponent.off + channel,control,0x00); // Turn off the LED + var activenow = engine.getValue("[Channel"+currentdeck+"]", MaudioXponent.binleds[control]); + if (activenow) { // If currently active + engine.setValue("[Channel"+currentdeck+"]",MaudioXponent.binleds[control], 0); // Stop + midi.sendShortMsg(MaudioXponent.off + channel,control, 0x00); // Turn off the LED }else { // If not currently active - engine.setValue("[Channel"+currentdeck+"]",MaudioXponent.binleds[control],1); // Start - midi.sendShortMsg(MaudioXponent.on + channel,control,0x01); // Turn on the LED + engine.setValue("[Channel"+currentdeck+"]",MaudioXponent.binleds[control], 1); // Start + midi.sendShortMsg(MaudioXponent.on + channel,control, 0x01); // Turn on the LED } }; MaudioXponent.actbinstop = function(channel, control, value, status) { // Generic binary button - print ("sono sulla stop"); + script.debug(channel, control, value, status); var currentdeck = channel+1; engine.setValue("[Channel"+currentdeck+"]",MaudioXponent.binleds[control],0); // Stop midi.sendShortMsg(MaudioXponent.off + channel,control,0x00); // Turn off the LED @@ -381,7 +382,7 @@ }; MaudioXponent.flanger = function(channel, control, value, status) { - script.debug(channel, control, value, status); + //script.debug(channel, control, value, status); if (control == 12) { var activenow = engine.getValue("[Channel1]","flanger"); if (activenow == 1) { // If currently active === modified file 'mixxx/res/midi/M-Audio_Xponent.midi.xml' --- mixxx/res/midi/M-Audio_Xponent.midi.xml 2010-09-06 05:55:25 +0000 +++ mixxx/res/midi/M-Audio_Xponent.midi.xml 2010-09-14 21:45:25 +0000 @@ -198,13 +198,6 @@ </control> <control> <group>[Channel1]</group> - <key>pfl</key> - <status>0x80</status> - <midino>20</midino> - <controltype>button</controltype> - </control> - <control> - <group>[Channel1]</group> <key>pregain</key> <status>0xB0</status> <midino>11</midino> @@ -700,13 +693,6 @@ </control> <control> <group>[Channel2]</group> - <key>pfl</key> - <status>0x81</status> - <midino>20</midino> - <controltype>button</controltype> - </control> - <control> - <group>[Channel2]</group> <key>pregain</key> <status>0xB1</status> <midino>11</midino> # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaKaU90AAqfflEQQUG///382 TUq////4AAIIAFAFeLxkJFq1KtiQUEkoKbTU2pptNPUGpp6JibSYmgANNGg0A5gCMExAMAmCaMho YBMEYmEkIKJ6YgUeU8kabKbUaBppp6mgGmgekDmAIwTEAwCYJoyGhgEwRiYSSE00EwTE1MTEBqno 0n6oYgeoNBptQgSx3atPIMP9PB0UaumKsR1aPr2vZSmvPqzJmFDIrxwUlWTW0lTKIR3XhJB14G7N J1lwzMzJccmPmFbs1YndoqTyMpMuVtkPnozmFjA2n969sGO5vxIJ8I7fIVVvNGbYtla8Mb7w+yqp gqwvrBgnmm+bEBaxk70C9FMELHks04DNfI8GTcd9ipu1DRNq2Ka0ZzlUmThig4H0KjUhZBqFxDl+ S5b+6AH8u7XyyglhqEnKz/EK4mG70e4Wh1ltk5HbZOI4Msns4uydCBgD3F3eQeFUlV5skoI3BsCp MJsGEtjYp0VCk6ukG7CElSwb9UJZu68p0ulkYdq9Wx0lSJdUtpl1s+YKzEKsuIYH4XgxYCsqA+7V WaVaKq+Yw0pJsy0sMaiotNCXzBjEgbAiySqCcM5rgeBSOHqQMKAnBYFKCmD4Fz6XmYWhfBE4dLrA 7A6FLRGsJBcGBWRcUumL6r3wgait7YHskbCExrJWNxnMHvbEILiQa6tfOjAYQcYYnqkZUXKmI4iU sQTue6j2O7CJBLRx2Fuh3MVAGLgzTi1XDQY+OZba0zEU2U+vUGWJADdK+e+8HaRD6PslWTlDFXM6 4lnUYDmAtkFptM2Mguuyc4debCDyECh1LExqODAYjy5mS1bLLoAm22BkUuC3XHYFAGCeMtMyLQLY spC4slrNEXNPE6k4NCKO6qilW1AdKumayRsM4KRqMpn/EKhyrRswzDa5NyeINprmzLENvN5lIMYw OsW5RwcwK9MuRRbgGzsinokEJmShgFWpCgwjGnGU6AMemYdItFeVkXa+5UJxnZPkBMX2pRmQvVOX wQ4PPyRpIvd0A17+ixetloZEiO8X9D6CpxHPcuz31IRRKDgxkKyqgVReCgiLZAZ659I4Gq0PceF1 AQmQxl52SOpcV0voRuTGgK4Hc+6XecScVycSlwvLSsPOJEjhmXtzO8nu3J1hUjFqLMdhOZXOt76j UshLefmZ1YLaCSV9s+t4wnJsOM0RgMjiz08cGPXvo4+XyQsZByOU49HxKETR2/21ZkXZyADSyxGQ vgRraZScdceKS0TpwlgFhqJkLm3B5QfAL8p0ayzaH8MaWxEyXOF5dv3o5Un9YS/WlcJIXATyY0PR HirvqXw4ZQoEaIY1i78APYjG1fNyJHTu5bQ60bkRQpkLZLevAZMmFMilwPXbOLcnY90yF2ymFfDJ UHp74nVAsOhk4v6SKGzrqqT2EPiGFykSRnGUs4DCHhasqFCoBI5zaOkEqgOLYhQuYNVsHYwD9+9w OZC+HJPXSqOjzERAoizInEql5kYK6tCzKh+/VowwdAeviE03qBvK+6ilLMrHAblv2qcCtHnQHI5J h3toXUDBaEPHBUiVfPeJ6sPbtQTZQCuJIYP3gpyCE2Q1Cbn9Zrec5+wwY9BxBrjahi5CkFdCPeNi pCsNkrkYpgc8nTzYEftZPB9dIb2KNlNZoqJWWIgFaqjiyaLFCFpDeBwz8CiGYMovl415r+kD1MQx Uc0LYv97MlityIjHPgdf3k84VB20EQoQyIox3rDOCxJ7/+l/4u5IpwoSFFNKe6A=
m-audio-xponent-headphone-toggle.patch.sig
Description: PGP signature
------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
