diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2009-11-15 22:38:49 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2009-11-15 22:38:49 +0000 |
commit | eca2ef13073afff02d2f69573321f15a8a96d069 (patch) | |
tree | 92ec970bd603dbecdcaf532eb5e5075bd450f73f | |
parent | 3b402e254a5ecfbf2a740d0e8062dd0ea8cde6ba (diff) | |
download | rockbox-eca2ef13073afff02d2f69573321f15a8a96d069.tar.gz rockbox-eca2ef13073afff02d2f69573321f15a8a96d069.zip |
Manual: Pictureflow chapter - foremost fixing the M3 manual but clean up the button table completely to make it more readable and be more accurate (this needed a small correction to the Iaudio remote keymap file). Update the note about playback and the menu item description while at it. Flyspray: FS#10712, Author: Michael Chicoine and me.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23642 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | manual/platform/remote-keymap-iaudio.tex | 2 | ||||
-rw-r--r-- | manual/plugins/pictureflow.tex | 139 |
2 files changed, 86 insertions, 55 deletions
diff --git a/manual/platform/remote-keymap-iaudio.tex b/manual/platform/remote-keymap-iaudio.tex index 3cf4d77c3f..3c21ac847b 100644 --- a/manual/platform/remote-keymap-iaudio.tex +++ b/manual/platform/remote-keymap-iaudio.tex | |||
@@ -19,7 +19,7 @@ | |||
19 | \newcommand{\ActionRCStdContext}{Long \ButtonRCMode} | 19 | \newcommand{\ActionRCStdContext}{Long \ButtonRCMode} |
20 | \newcommand{\ActionRCStdQuickScreen}{Long \ButtonRCRec} | 20 | \newcommand{\ActionRCStdQuickScreen}{Long \ButtonRCRec} |
21 | \newcommand{\ActionRCQuickScreenExit}{\ButtonRCRec} | 21 | \newcommand{\ActionRCQuickScreenExit}{\ButtonRCRec} |
22 | \newcommand{\ActionRCStdMenu}{\ButtonRCRec} | 22 | \newcommand{\ActionRCStdMenu}{\ButtonRCMenu} |
23 | \newcommand{\ActionRCStdOk}{\ButtonRCPlay{} or \ButtonRCRight} | 23 | \newcommand{\ActionRCStdOk}{\ButtonRCPlay{} or \ButtonRCRight} |
24 | 24 | ||
25 | %Button actions, wps context | 25 | %Button actions, wps context |
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex index 6a3b50dff1..a515890c7b 100644 --- a/manual/plugins/pictureflow.tex +++ b/manual/plugins/pictureflow.tex | |||
@@ -2,7 +2,8 @@ | |||
2 | \screenshot{plugins/images/ss-pictureflow}{PictureFlow}{img:pictureflow} | 2 | \screenshot{plugins/images/ss-pictureflow}{PictureFlow}{img:pictureflow} |
3 | PictureFlow provides a visualisation of your albums with their associated cover | 3 | PictureFlow provides a visualisation of your albums with their associated cover |
4 | art. \opt{swcodec}{It is possible to start playback of the selected | 4 | art. \opt{swcodec}{It is possible to start playback of the selected |
5 | album from PictureFlow. Playback will start from the selected track.} | 5 | album from PictureFlow. Playback will start from the selected track. The |
6 | PictureFlow plugin will continue to run while your tracks are played.} | ||
6 | 7 | ||
7 | \opt{hwcodec}{ | 8 | \opt{hwcodec}{ |
8 | \note{PictureFlow is a visualisation only. It cannot be used to select and | 9 | \note{PictureFlow is a visualisation only. It cannot be used to select and |
@@ -25,68 +26,98 @@ aware: | |||
25 | \begin{table} | 26 | \begin{table} |
26 | \begin{btnmap}{}{} | 27 | \begin{btnmap}{}{} |
27 | \opt{scrollwheel,IRIVER_H10_PAD}{ | 28 | \opt{scrollwheel,IRIVER_H10_PAD}{ |
28 | \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack} | 29 | \ActionStdPrev{} / \ActionStdNext |
29 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown} | 30 | & |
30 | \opt{HAVEREMOTEKEYMAP}{& } | 31 | \opt{HAVEREMOTEKEYMAP}{ |
31 | & Scroll through albums / track list\\} | 32 | &} |
32 | 33 | Scroll through albums / track list | |
33 | \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight | 34 | \\ |
34 | \opt{HAVEREMOTEKEYMAP}{& | 35 | } |
35 | \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp} | 36 | |
36 | } | 37 | % only scroll wheel and 'strip' targets use the same action in album and track list |
37 | & Scroll through albums\\} | 38 | \nopt{scrollwheel,IRIVER_H10_PAD}{% |
39 | % currently the M3 does not use buttons of the main unit which has no display | ||
40 | \nopt{IAUDIO_M3_PAD}{\ButtonLeft{} / \ButtonRight} | ||
41 | & | ||
42 | \opt{HAVEREMOTEKEYMAP}{ | ||
43 | \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdPrev{} / \ActionRCStdNext} | ||
44 | &} | ||
45 | Scroll through albums | ||
46 | \\ | ||
38 | 47 | ||
39 | \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown | 48 | \nopt{IAUDIO_M3_PAD}{\ActionStdPrev{} / \ActionStdNext} |
40 | \opt{HAVEREMOTEKEYMAP}{& | 49 | & |
41 | \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp} | 50 | \opt{HAVEREMOTEKEYMAP}{ |
42 | } | 51 | % even though the M3 uses an Iaudio remote, mapping differs when used with M/X5 |
43 | & Scroll through track list\\} | 52 | \opt{IAUDIO_M3_PAD}{\ButtonRCLeft{} / \ButtonRCRight} |
53 | \opt{GIGABEAT_RC_PAD}{\ButtonRCVolUp{} / \ButtonRCVolDown{}} | ||
54 | &} | ||
55 | Scroll through track list | ||
56 | \\ | ||
57 | } | ||
44 | 58 | ||
45 | \opt{IRIVER_H10_PAD}{\ButtonRight} | 59 | \nopt{IAUDIO_M3_PAD}{% |
46 | \opt{ONDIO_PAD}{\ButtonUp} | 60 | \nopt{ONDIO_PAD,IRIVER_H10_PAD,RECORDER_PAD}{\ButtonSelect} |
47 | \opt{RECORDER_PAD}{\ButtonOn} | 61 | \opt{ONDIO_PAD}{\ButtonUp} |
48 | \nopt{ONDIO_PAD,IRIVER_H10_PAD,RECORDER_PAD}{\ButtonSelect} | 62 | \opt{IRIVER_H10_PAD}{\ButtonRight} |
49 | \opt{HAVEREMOTEKEYMAP}{& | 63 | \opt{RECORDER_PAD}{\ButtonOn} |
50 | \opt{GIGABEAT_RC_PAD}{\ButtonRCFF} | 64 | } |
51 | } | 65 | & |
52 | & Enter track list | 66 | \opt{HAVEREMOTEKEYMAP}{ |
53 | \opt{swcodec}{/ Play album from selected track} | 67 | \opt{IAUDIO_M3_PAD}{\ButtonRCPlay} |
54 | \\ | 68 | \opt{GIGABEAT_RC_PAD}{\ButtonRCFF} |
69 | &} | ||
70 | Enter track list | ||
71 | \nopt{ONDIO_PAD}{/ Play album from selected track} | ||
72 | \\ | ||
73 | |||
74 | % Ondio uses a different button in album list and track list | ||
75 | \opt{ONDIO_PAD}{ | ||
76 | \ButtonMenu | ||
77 | & | ||
78 | Play album from selected track in track list | ||
79 | \\ | ||
80 | } | ||
81 | |||
82 | \nopt{IAUDIO_M3_PAD}{\ButtonLeft} | ||
83 | & | ||
84 | \opt{HAVEREMOTEKEYMAP}{ | ||
85 | \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdCancel} | ||
86 | &} | ||
87 | Exit track list | ||
88 | \\ | ||
55 | 89 | ||
56 | \ButtonLeft | 90 | \nopt{IAUDIO_M3_PAD}{\ActionStdMenu} |
57 | \opt{HAVEREMOTEKEYMAP}{& | 91 | & |
58 | \opt{GIGABEAT_RC_PAD}{\ButtonRCRew} | 92 | \opt{HAVEREMOTEKEYMAP}{ |
59 | } | 93 | \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdMenu} |
60 | & Exit track list\\ | 94 | &} |
95 | Enter menu | ||
96 | \\ | ||
61 | 97 | ||
62 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} | 98 | \nopt{IAUDIO_M3_PAD}{% |
63 | \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_PAD,% | 99 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff} |
64 | GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu} | 100 | \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD% |
65 | \opt{IAUDIO_X5_PAD}{\ButtonRec} | 101 | ,MROBE100_PAD}{\ButtonPower} |
66 | \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonDown} | 102 | \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower} |
67 | \opt{IRIVER_H10_PAD,SANSA_C200_PAD}{\ButtonPower} | 103 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu} |
68 | \opt{RECORDER_PAD}{\ButtonFOne} | 104 | \opt{SANSA_FUZE_PAD}{Long \ButtonHome} |
69 | \opt{ONDIO_PAD}{Long \ButtonMenu} | 105 | } |
70 | \opt{HAVEREMOTEKEYMAP}{& | 106 | & |
71 | \opt{GIGABEAT_RC_PAD}{\ButtonRCDsp} | 107 | \opt{HAVEREMOTEKEYMAP}{ |
72 | } | 108 | \opt{IAUDIO_M3_PAD}{\ButtonRCRec} |
73 | & Enter menu\\ | 109 | \opt{GIGABEAT_RC_PAD}{\ButtonRCRew} |
74 | 110 | &} | |
75 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff} | 111 | Exit PictureFlow |
76 | \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,% | 112 | \\ |
77 | MROBE100_PAD}{\ButtonPower} | 113 | |
78 | \opt{SANSA_FUZE_PAD}{Long \ButtonHome} | ||
79 | \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower} | ||
80 | \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{Long \ButtonMenu} | ||
81 | \opt{HAVEREMOTEKEYMAP}{& | ||
82 | \opt{GIGABEAT_RC_PAD}{\ButtonRCRew} | ||
83 | } | ||
84 | & Exit PictureFlow\\ | ||
85 | \end{btnmap} | 114 | \end{btnmap} |
86 | \end{table} | 115 | \end{table} |
87 | 116 | ||
88 | \subsubsection{Main Menu} | 117 | \subsubsection{Main Menu} |
89 | \begin{description} | 118 | \begin{description} |
119 | \item[Go to WPS.] Leave PictureFlow and enter the while playing screen. | ||
120 | \opt{swcodec}{\item[Playback Control.] Control music playback from within the plugin.} | ||
90 | \item[Settings.] Enter the settings menu. | 121 | \item[Settings.] Enter the settings menu. |
91 | \item[Return.] Exit menu. | 122 | \item[Return.] Exit menu. |
92 | \item[Quit.] Exit PictureFlow plugin. | 123 | \item[Quit.] Exit PictureFlow plugin. |