=== modified file 'mixxx/res/images/templates/ic_template_keyboard_mapping_sheet.svg'
--- mixxx/res/images/templates/ic_template_keyboard_mapping_sheet.svg 2012-06-15 12:49:21 +0000
+++ mixxx/res/images/templates/ic_template_keyboard_mapping_sheet.svg 2012-09-26 11:47:17 +0000
@@ -28,14 +28,14 @@
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:window-width="1920"
- inkscape:window-height="1178"
+ inkscape:window-height="1152"
id="namedview8739"
showgrid="false"
inkscape:zoom="1"
- inkscape:cx="374.24576"
- inkscape:cy="483.16984"
- inkscape:window-x="1280"
- inkscape:window-y="0"
+ inkscape:cx="298.04381"
+ inkscape:cy="470.35251"
+ inkscape:window-x="0"
+ inkscape:window-y="22"
inkscape:window-maximized="1"
inkscape:current-layer="layer4"
showguides="true"
@@ -589,7 +589,7 @@
id="path24676"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.0001992;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:connector-curvature="0" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
If you need more clones, duplicate from the clones
+
+
Mixxx 1.11 keyboard mapping
+
User CustomizationsYou can make your own custom keyboard mapping.
-Each control inside Mixxx is identified by a unique string. These strings are used in the keyboard mappings, the MIDI mappings, and inside Mixxx to gain access to the controls. The following is a list of controls that can be used in any of the above contexts.http://www.mixxx.org/wiki/doku.php/mixxxcontrols
-Share your custom keyboard mapping with others in the Mixxx user customizations forum:
-Each control inside Mixxx is identified by a unique string. These strings are used in the keyboard mappings, the MIDI mappings, and inside Mixxx to gain access to the controls. The following is a list of controls that can be used in any of the above contexts.http://mixxx.org/forums/viewforum.php?f=6
-Each control inside Mixxx is identified by a unique string. These strings are used in the keyboard mappings, the MIDI mappings, and inside Mixxx to gain access to the controls. The following is a list of controls that can be used in any of the above contexts.http://mixxx.org/manual/latest/chapters/advanced_topics.html#making-a-custom-keyboard-mapping
-For a list of controls that can be used in the keyboard mapping see the Mixxx wiki:
-You can make your own custom keyboard mapping.
+
+Each control inside Mixxx is identified by a unique string. These strings are used in the keyboard mappings, the MIDI mappings, and inside Mixxx to gain access to the controls. The following is a list of controls that can be used in any of the above contexts.http://www.mixxx.org/wiki/doku.php/mixxxcontrols
+
+Share your custom keyboard mapping with others in the Mixxx user customizations forum:
+
+Each control inside Mixxx is identified by a unique string. These strings are used in the keyboard mappings, the MIDI mappings, and inside Mixxx to gain access to the controls. The following is a list of controls that can be used in any of the above contexts.http://mixxx.org/forums/viewforum.php?f=6
+
+Each control inside Mixxx is identified by a unique string. These strings are used in the keyboard mappings, the MIDI mappings, and inside Mixxx to gain access to the controls. The following is a list of controls that can be used in any of the above contexts.http://mixxx.org/manual/latest/chapters/advanced_topics.html#making-a-custom-keyboard-mapping
+
+For a list of controls that can be used in the keyboard mapping see the Mixxx wiki:
+
+autoDJtoggle
+autoDJshuffle
+autoDJskip
+autoDJfade
+
@@ -5181,4 +5370,5 @@
x="601.44299"
id="tspan22784"
sodipodi:role="line"> * for en-us keyboard layout
+
\ No newline at end of file
=== modified file 'mixxx/res/keyboard/cs_CZ.kbd.cfg'
--- mixxx/res/keyboard/cs_CZ.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/cs_CZ.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up h
crossfader_down g
=== modified file 'mixxx/res/keyboard/da_DK.kbd.cfg'
--- mixxx/res/keyboard/da_DK.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/da_DK.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up h
crossfader_down g
=== modified file 'mixxx/res/keyboard/de_DE.kbd.cfg'
--- mixxx/res/keyboard/de_DE.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/de_DE.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up h
crossfader_down g
=== modified file 'mixxx/res/keyboard/el_GR.kbd.cfg'
--- mixxx/res/keyboard/el_GR.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/el_GR.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up η
crossfader_down γ
=== modified file 'mixxx/res/keyboard/en_US.kbd.cfg'
--- mixxx/res/keyboard/en_US.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/en_US.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up h
crossfader_down g
=== modified file 'mixxx/res/keyboard/es_ES.kbd.cfg'
--- mixxx/res/keyboard/es_ES.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/es_ES.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up h
crossfader_down g
=== modified file 'mixxx/res/keyboard/fi_FI.kbd.cfg'
--- mixxx/res/keyboard/fi_FI.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/fi_FI.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up h
crossfader_down g
=== modified file 'mixxx/res/keyboard/fr_FR.kbd.cfg'
--- mixxx/res/keyboard/fr_FR.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/fr_FR.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up h
crossfader_down g
=== modified file 'mixxx/res/keyboard/it_IT.kbd.cfg'
--- mixxx/res/keyboard/it_IT.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/it_IT.kbd.cfg 2012-09-26 09:42:25 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up h
crossfader_down g
=== modified file 'mixxx/res/keyboard/ru_RU.kbd.cfg'
--- mixxx/res/keyboard/ru_RU.kbd.cfg 2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/ru_RU.kbd.cfg 2012-09-26 12:24:36 +0000
@@ -1,3 +1,9 @@
+[AutoDJ]
+shuffle_playlist F9
+skip_next F10
+fade_now F11
+toggle_autodj 12
+
[Master]
crossfader_up р
crossfader_down п
=== modified file 'mixxx/src/controllers/dlgcontrollerlearning.cpp'
--- mixxx/src/controllers/dlgcontrollerlearning.cpp 2012-05-14 19:34:35 +0000
+++ mixxx/src/controllers/dlgcontrollerlearning.cpp 2012-09-26 11:41:08 +0000
@@ -98,6 +98,7 @@
addDeckControl("vinylcontrol_enabled", tr("Toggle vinyl-control (ON/OFF)"), vinylControlMenu);
addDeckControl("vinylcontrol_cueing", tr("Toggle vinyl-control cueing mode (OFF/ONE/HOT)"), vinylControlMenu);
addDeckControl("vinylcontrol_mode", tr("Toggle vinyl-control mode (ABS/REL/CONST)"), vinylControlMenu);
+ addControl("[VinylControl]", "Toggle", tr("Single deck mode - Toggle vinyl control to next deck"), vinylControlMenu);
// Cues
QMenu* cueMenu = addSubmenu(tr("Cues / Hotcues"));
@@ -170,6 +171,13 @@
addControl("[Microphone]", "volume", tr("Microphone volume"), microphoneMenu, true);
addControl("[Microphone]", "orientation", tr("Microphone channel orientation (e.g. left, right, center)"), microphoneMenu);
+ // AutoDJ Controls
+ QMenu* autodjMenu = addSubmenu(tr("Auto DJ"));
+ addControl("[AutoDJ]", "shuffle_playlist", tr("Shuffle the content of the Auto DJ playlist"), autodjMenu);
+ addControl("[AutoDJ]", "skip_next", tr("Skip the next track in the Auto DJ playlist"), autodjMenu);
+ addControl("[AutoDJ]", "fade_now", tr("Trigger the transition to the next track"), autodjMenu);
+ addControl("[AutoDJ]", "toggle_autodj", tr("Toggle Auto DJ (ON/OFF)"), autodjMenu);
+
// Skin Controls
QMenu* guiMenu = addSubmenu(tr("User Interface"));
addControl("[Samplers]", "show_samplers", tr("Show/hide the sampler section"), guiMenu);
@@ -182,6 +190,7 @@
for (int i = 1; i <= iNumDecks; ++i) {
addControl(QString("[Spinny%1]").arg(i), "show_spinny",
QString("%1: %2").arg(m_deckStr.arg(i), spinnyText), guiMenu);
+
}
emit(listenForClicks());