1 files changed, 19 insertions, 38 deletions

diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index a1d8febca8..6b7fde92f0 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -4,48 +4,29 @@ practice. Adjust the tempo through the interface or by tapping it out
 on the appropriate button.
 
 \begin{btnmap}
-    \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{ONDIO_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{}, \ButtonMenu{} or \TouchTopRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \PluginExit
        \opt{HAVEREMOTEKEYMAP}{& }
         & Exit plugin \\
-    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
-        ,IAUDIO_X5_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu\ (Long: Stop)}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonUp}
-    \opt{COWON_D2_PAD}{\TouchCenter}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Start / Stop \\
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu\ (repeatedly)}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{COWON_D2_PAD}{\ButtonMinus{}, \ButtonPlus{} or \TouchCenter}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Tap tempo \\
-    \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
-        ,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & Adjust tempo \\
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft\ / \ButtonOn+\ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} / \ButtonMinus{} or \TouchTopMiddle{} / \TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
         & Adjust volume \\
+
+    \opt{h100,h300,e200}{
+      \ButtonRec
+        \opt{HAVEREMOTEKEYMAP}{& }
+        & Sync tap \\}
 \end{btnmap}