summaryrefslogtreecommitdiff
path: root/manual/rockbox_interface
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2009-12-07 09:17:48 +0000
committerBjörn Stenberg <bjorn@haxx.se>2009-12-07 09:17:48 +0000
commit36a81eb9b98ac7b1dff0d6658dba0255dd579f5f (patch)
tree81b81008c4cb69c276329ecd50200887c4da4838 /manual/rockbox_interface
parent66fa5b578904f7df61293d6ce5c08966b5db13db (diff)
downloadrockbox-v3.4.tar.gz
rockbox-v3.4.zip
Reverted r23881 mistakenly committed to branch.v3.4
git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23882 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual/rockbox_interface')
-rw-r--r--manual/rockbox_interface/browsing_and_playing.tex6
-rw-r--r--manual/rockbox_interface/main.tex54
-rw-r--r--manual/rockbox_interface/wps.tex4
3 files changed, 32 insertions, 32 deletions
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 9be15adeb1..bdbb97ef5c 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -35,7 +35,7 @@ generated as \fname{<MMC1>}, and will behave exactly as any other directory
35on the \dap{}. 35on the \dap{}.
36} 36}
37 37
38\opt{iriverh10,iriverh10_5gb}{\note{ 38\opt{h10,h10_5gb}{\note{
39If your \dap{} is a MTP model, the Music directory where all your music is stored 39If your \dap{} is a MTP model, the Music directory where all your music is stored
40may be hidden in the \setting{File Browser}. This may be fixed by either 40may be hidden in the \setting{File Browser}. This may be fixed by either
41either changing its properties (on a computer) to not hidden, or by changing 41either changing its properties (on a computer) to not hidden, or by changing
@@ -78,7 +78,7 @@ the \setting{Show Files} setting to all.
78 & If there is an audio file playing, returns to the 78 & If there is an audio file playing, returns to the
79 \setting{While Playing Screen} (WPS) without stopping playback.\\ 79 \setting{While Playing Screen} (WPS) without stopping playback.\\
80 % 80 %
81 \nopt{archosplayer,sansac200}% 81 \nopt{player,c200}%
82 {% 82 {%
83 \ActionTreeStop 83 \ActionTreeStop
84 \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop} 84 \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop}
@@ -317,7 +317,7 @@ can be easily changed by making a text file with the required layout. More
317 \end{table} 317 \end{table}
318} 318}
319 319
320\opt{archosplayer}{ 320\opt{player}{
321 The current text line to be entered or edited is always listed on the first 321 The current text line to be entered or edited is always listed on the first
322 line of the display. The second line of the display can contain the character 322 line of the display. The second line of the display can contain the character
323 selection bar, as in the screenshot above. 323 selection bar, as in the screenshot above.
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 72a1fa5fe4..f8768c3ceb 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -9,7 +9,7 @@
9% The extension is selected in the preamble, so no further \ifpdfoutput 9% The extension is selected in the preamble, so no further \ifpdfoutput
10% is necessary. 10% is necessary.
11\includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front} 11\includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front}
12\opt{iaudiom3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg 12\opt{m3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg
13 \end{center} 13 \end{center}
14 % spacing between the two pictures, could possibly be improved 14 % spacing between the two pictures, could possibly be improved
15 \begin{center} 15 \begin{center}
@@ -27,7 +27,7 @@ described in detail in the following paragraph.
27 \wikilink{BlindFAQ}. 27 \wikilink{BlindFAQ}.
28 28
29 % 29 %
30 \opt{iriverh100}{ 30 \opt{h100}{
31 Hold or lay the \dap{} so that the side with the joystick and LCD is facing 31 Hold or lay the \dap{} so that the side with the joystick and LCD is facing
32 towards you, and the curved side is at the top. The joystick functions as 32 towards you, and the curved side is at the top. The joystick functions as
33 the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when 33 the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when
@@ -48,7 +48,7 @@ described in detail in the following paragraph.
48 \dap{} hard locks, you can reset it by inserting a paper clip into the hole 48 \dap{} hard locks, you can reset it by inserting a paper clip into the hole
49 where the reset switch is.} 49 where the reset switch is.}
50 % 50 %
51 \opt{iriverh300}{ 51 \opt{h300}{
52 Hold or lay the \dap{} so that the side with the button pad and 52 Hold or lay the \dap{} so that the side with the button pad and
53 LCD is facing towards you. The buttons on the button pad are as follows: top 53 LCD is facing towards you. The buttons on the button pad are as follows: top
54 left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner: 54 left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner:
@@ -74,7 +74,7 @@ described in detail in the following paragraph.
74 used in Rockbox. 74 used in Rockbox.
75 } 75 }
76 % 76 %
77 \opt{ipod4g,ipodcolor,ipodvideo,ipodmini1g}{ 77 \opt{ipod4g,ipodcolor,ipodvideo,ipodmini}{
78 The main controls on the \dap{} are a slightly indented scroll wheel 78 The main controls on the \dap{} are a slightly indented scroll wheel
79 with a flat round button in the center. Hold the \dap{} with these controls 79 with a flat round button in the center. Hold the \dap{} with these controls
80 facing you. 80 facing you.
@@ -84,7 +84,7 @@ described in detail in the following paragraph.
84 \opt{ipod4g,ipodcolor}{remote connector, headphone jack, \ButtonHold{} 84 \opt{ipod4g,ipodcolor}{remote connector, headphone jack, \ButtonHold{}
85 switch.} 85 switch.}
86 \opt{ipodvideo}{\ButtonHold{} switch, headphone jack.} 86 \opt{ipodvideo}{\ButtonHold{} switch, headphone jack.}
87 \opt{ipodmini1g}{\ButtonHold{} switch, remote connector, headphone jack.} 87 \opt{ipodmini}{\ButtonHold{} switch, remote connector, headphone jack.}
88 88
89 The dock connector that is used to connect your \dap{} to your computer is on 89 The dock connector that is used to connect your \dap{} to your computer is on
90 the bottom panel of the \dap{}. 90 the bottom panel of the \dap{}.
@@ -156,7 +156,7 @@ described in detail in the following paragraph.
156 \ButtonHold{} is off before trying to use your player. 156 \ButtonHold{} is off before trying to use your player.
157 } 157 }
158 % 158 %
159 \opt{ipodnano1g}{ 159 \opt{ipodnano}{
160 The main controls on the \dap{} are a slightly indented wheel with a 160 The main controls on the \dap{} are a slightly indented wheel with a
161 flat round button in the center. Hold the \dap{} with these controls on the 161 flat round button in the center. Hold the \dap{} with these controls on the
162 top surface. There is a \ButtonHold{} switch at one end, and 162 top surface. There is a \ButtonHold{} switch at one end, and
@@ -194,7 +194,7 @@ described in detail in the following paragraph.
194 round crosspad is labelled \ButtonMenu{}. 194 round crosspad is labelled \ButtonMenu{}.
195 } 195 }
196 % 196 %
197 \opt{iriverh10,iriverh10_5gb}{ 197 \opt{h10,h10_5gb}{
198 Hold or lay the \dap{} so that the side with the scroll pad and 198 Hold or lay the \dap{} so that the side with the scroll pad and
199 LCD is facing towards you. In the centre below the lcd is the scroll pad. It 199 LCD is facing towards you. In the centre below the lcd is the scroll pad. It
200 is oriented vertically. Touching the top and bottom half of it acts as the 200 is oriented vertically. Touching the top and bottom half of it acts as the
@@ -207,12 +207,12 @@ described in detail in the following paragraph.
207 hand side is the \ButtonPower{} button. 207 hand side is the \ButtonPower{} button.
208 208
209 On the top panel of the \dap{}, from left to right, you can find the 209 On the top panel of the \dap{}, from left to right, you can find the
210 following: \ButtonHold{} switch, \opt{iriverh10}{reset pin hole, }remote port and 210 following: \ButtonHold{} switch, \opt{h10}{reset pin hole, }remote port and
211 headphone mini jack plug. 211 headphone mini jack plug.
212 212
213 On the bottom panel of the \dap{} is the data cable port.} 213 On the bottom panel of the \dap{} is the data cable port.}
214 % 214 %
215 \opt{gigabeatfx}{ 215 \opt{gigabeatf}{
216 \note{The following description is for the Gigabeat F, but can also apply for the 216 \note{The following description is for the Gigabeat F, but can also apply for the
217 Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the 217 Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the
218 Gigabeat X is smaller and has a slightly tapered back.} 218 Gigabeat X is smaller and has a slightly tapered back.}
@@ -285,7 +285,7 @@ described in detail in the following paragraph.
285 bottom of the unit, there is a connector for the docking station or the 285 bottom of the unit, there is a connector for the docking station or the
286 proprietary USB connector for connecting directly to USB.} 286 proprietary USB connector for connecting directly to USB.}
287 % 287 %
288 \opt{iaudiox5,iaudiom5}{ 288 \opt{x5,m5}{
289 The \dap{} is curved so that the end with the screen on it is thicker than the 289 The \dap{} is curved so that the end with the screen on it is thicker than the
290 other end. Hold the \dap{} wih the thick end towards the top and the screen 290 other end. Hold the \dap{} wih the thick end towards the top and the screen
291 facing towards you. Half way up the front of the unit on the right hand side 291 facing towards you. Half way up the front of the unit on the right hand side
@@ -306,14 +306,14 @@ described in detail in the following paragraph.
306 reset by inserting a paper clip. 306 reset by inserting a paper clip.
307 307
308 On the bottom of the unit is the connector for the 308 On the bottom of the unit is the connector for the
309 \archosplayerman{} subpack or dock. On the top of the unit is a charge 309 \playerman{} subpack or dock. On the top of the unit is a charge
310 indicator light, which may feel a bit like a button, but is not. 310 indicator light, which may feel a bit like a button, but is not.
311 311
312 From the top of the \dap{} on the left hand side is the headphone socket, then the 312 From the top of the \dap{} on the left hand side is the headphone socket, then the
313 remote connector. Below this is a cover which protects the \opt{iaudiox5}{USB host 313 remote connector. Below this is a cover which protects the \opt{x5}{USB host
314 connector.}\opt{iaudiom5}{USB and charging connector}.} 314 connector.}\opt{m5}{USB and charging connector}.}
315 % 315 %
316 \opt{sansae200}{ 316 \opt{e200}{
317 Hold the \dap{} with the turning wheel at the front and bottom. On the bottom left 317 Hold the \dap{} with the turning wheel at the front and bottom. On the bottom left
318 of the front of the \dap{} is a raised round button, the \ButtonPower{} button. 318 of the front of the \dap{} is a raised round button, the \ButtonPower{} button.
319 Above and to the left of this, on the outside of the turning wheel are four 319 Above and to the left of this, on the outside of the turning wheel are four
@@ -329,7 +329,7 @@ described in detail in the following paragraph.
329 other buttons have any effect. Just to the left of the \ButtonHold{} switch is a 329 other buttons have any effect. Just to the left of the \ButtonHold{} switch is a
330 small hole which contains the internal microphone.} 330 small hole which contains the internal microphone.}
331 % 331 %
332 \opt{sansac200}{ 332 \opt{c200}{
333 Hold the \dap{} with the buttons on the right and the screen on the left. On 333 Hold the \dap{} with the buttons on the right and the screen on the left. On
334 the right side of the unit, there is a series of four connected buttons that 334 the right side of the unit, there is a series of four connected buttons that
335 form a square. The four sides of the square are the \ButtonUp{}, 335 form a square. The four sides of the square are the \ButtonUp{},
@@ -351,7 +351,7 @@ described in detail in the following paragraph.
351 Immediately above the headphone socket is a lanyard loop and the microphone. 351 Immediately above the headphone socket is a lanyard loop and the microphone.
352 } 352 }
353 % 353 %
354 \opt{sansaclip}{ 354 \opt{clip}{
355 Hold the \dap{} with the controls on the bottom and the screen on the top. The main 355 Hold the \dap{} with the controls on the bottom and the screen on the top. The main
356 controls are a four-way pad with a button in the centre; pressing this centre button 356 controls are a four-way pad with a button in the centre; pressing this centre button
357 functions as \ButtonSelect{}. Going clockwise from the top, the four-way pad contains 357 functions as \ButtonSelect{}. Going clockwise from the top, the four-way pad contains
@@ -369,7 +369,7 @@ described in detail in the following paragraph.
369 above this button is the headphone jack. 369 above this button is the headphone jack.
370 } 370 }
371 % 371 %
372 \opt{archosplayer}{ 372 \opt{player}{
373 The main controls of this player are a four-way button on the right below 373 The main controls of this player are a four-way button on the right below
374 the screen, and two round buttons to the left of it. Hold the \dap{} with 374 the screen, and two round buttons to the left of it. Hold the \dap{} with
375 these controls on the bottom and facing you. 375 these controls on the bottom and facing you.
@@ -384,7 +384,7 @@ described in detail in the following paragraph.
384 the DC-In jack on the right, and the USB connector in the centre. 384 the DC-In jack on the right, and the USB connector in the centre.
385 } 385 }
386 % 386 %
387 \opt{archosrecorder}{ 387 \opt{recorder}{
388 Holding the Jukebox in front of you, there should be three rectangular buttons 388 Holding the Jukebox in front of you, there should be three rectangular buttons
389 in a horizontal line towards the middle of the unit, and below this to the left 389 in a horizontal line towards the middle of the unit, and below this to the left
390 there is a circular four button array with the circular \ButtonPlay{} button 390 there is a circular four button array with the circular \ButtonPlay{} button
@@ -405,7 +405,7 @@ described in detail in the following paragraph.
405 the right. On the bottom of the \dap{} is the Line-In jack on the left, the 405 the right. On the bottom of the \dap{} is the Line-In jack on the left, the
406 DC-In jack on the right, and the USB connector in the centre. 406 DC-In jack on the right, and the USB connector in the centre.
407 } 407 }
408 \opt{archosrecorderv2fm}{ 408 \opt{recorderv2fm}{
409 Holding the Jukebox in front of you, there should be three rectangular buttons 409 Holding the Jukebox in front of you, there should be three rectangular buttons
410 in a horizontal line towards the middle of the unit, and below this centred on the 410 in a horizontal line towards the middle of the unit, and below this centred on the
411 middle button there are four radial arc shaped buttons placed in a cross formation 411 middle button there are four radial arc shaped buttons placed in a cross formation
@@ -441,8 +441,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
441 & Start Rockbox\\ 441 & Start Rockbox\\
442 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}% 442 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}%
443 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}% 443 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
444 \opt{ONDIO_PAD,archosrecorderv2fm}{Long \ButtonOff}% 444 \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}%
445 \opt{archosrecorder}{Double tap \ButtonOff\ when playback is stopped}% 445 \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
446 \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}% 446 \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}%
447 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}% 447 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}%
448 {Long \ButtonPower}% 448 {Long \ButtonPower}%
@@ -476,11 +476,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
476 performed by inserting a paperclip gently into the Reset hole. 476 performed by inserting a paperclip gently into the Reset hole.
477}% 477}%
478 478
479\nopt{gigabeatfx,iaudiom3,iaudiom5,iaudiox5,archos} 479\nopt{gigabeatf,m3,m5,x5,archos}
480 { 480 {
481 \subsection{Starting the original firmware} 481 \subsection{Starting the original firmware}
482 \label{ref:Dualboot} 482 \label{ref:Dualboot}
483 \opt{ipod4g,ipodcolor,ipodvideo,ipodnano1g,ipodmini1g} 483 \opt{ipod4g,ipodcolor,ipodvideo,ipodnano,ipodmini}
484 { 484 {
485 Rockbox has a dual-boot feature. To boot into the original firmware, shut 485 Rockbox has a dual-boot feature. To boot into the original firmware, shut
486 down the device as described above. Turn on the \ButtonHold{} switch 486 down the device as described above. Turn on the \ButtonHold{} switch
@@ -512,22 +512,22 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
512 simultaneously until the player hard resets. 512 simultaneously until the player hard resets.
513 } 513 }
514 514
515 \opt{iriverh100,iriverh300} 515 \opt{h100,h300}
516 { 516 {
517 Rockbox has a dual-boot feature. To boot into the original firmware, 517 Rockbox has a dual-boot feature. To boot into the original firmware,
518 when the \dap{} is turned off, press and hold the \ButtonRec{} button, 518 when the \dap{} is turned off, press and hold the \ButtonRec{} button,
519 and then press the \ButtonOn{} button. 519 and then press the \ButtonOn{} button.
520 } 520 }
521 521
522 \opt{iriverh10,iriverh10_5gb} 522 \opt{h10,h10_5gb}
523 { 523 {
524 Rockbox has a dual-boot feature. It loads the original firmware from 524 Rockbox has a dual-boot feature. It loads the original firmware from
525 the file \fname{/System/OF.mi4}. To boot into the original firmware, 525 the file \fname{/System/OF.mi4}. To boot into the original firmware,
526 press and hold the \ButtonLeft{} button while turning on the player. 526 press and hold the \ButtonLeft{} button while turning on the player.
527 \note{The iriver firmware does not shut down properly when you turn it off, 527 \note{The iriver firmware does not shut down properly when you turn it off,
528 it only goes to sleep. To get back into Rockbox when exiting from the 528 it only goes to sleep. To get back into Rockbox when exiting from the
529 iriver firmware, you will need to reset the player by \opt{iriverh10}{inserting a 529 iriver firmware, you will need to reset the player by \opt{h10}{inserting a
530 pin in the reset hole}\opt{iriverh10_5gb}{removing and reinserting the battery}.} 530 pin in the reset hole}\opt{h10_5gb}{removing and reinserting the battery}.}
531 } 531 }
532 532
533 \opt{sansa,sansaAMS} 533 \opt{sansa,sansaAMS}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 362311ddaf..2c8ecfa17d 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -30,7 +30,7 @@ currently playing audio file.
30 \item Peak meter. 30 \item Peak meter.
31 \end{itemize} 31 \end{itemize}
32} 32}
33\opt{archosrecorder,archosrecorderv2fm,ondio}{ 33\opt{recorder,recorderv2fm,ondio}{
34 \note{ 34 \note{
35 \begin{itemize} 35 \begin{itemize}
36 \item The number of lines shown depends on the size of the font used. 36 \item The number of lines shown depends on the size of the font used.
@@ -40,7 +40,7 @@ currently playing audio file.
40 } 40 }
41} 41}
42% 42%
43\opt{archosplayer}{ 43\opt{player}{
44 \note{ 44 \note{
45 \begin{itemize} 45 \begin{itemize}
46 \item Playlist index/Playlist size: Artist {}- Title. 46 \item Playlist index/Playlist size: Artist {}- Title.