diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main_menu.c | 6 | ||||
-rw-r--r-- | apps/settings.c | 1 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/wps.c | 13 |
4 files changed, 23 insertions, 0 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index de09897baa..101dfe529a 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -135,12 +135,18 @@ void show_info(void) | |||
135 | button_get(true); | 135 | button_get(true); |
136 | } | 136 | } |
137 | 137 | ||
138 | void hold_set(void) | ||
139 | { | ||
140 | set_bool( "[Hold]", &global_settings.hold ); | ||
141 | } | ||
142 | |||
138 | void main_menu(void) | 143 | void main_menu(void) |
139 | { | 144 | { |
140 | int m; | 145 | int m; |
141 | 146 | ||
142 | /* main menu */ | 147 | /* main menu */ |
143 | struct menu_items items[] = { | 148 | struct menu_items items[] = { |
149 | { "Hold", hold_set }, | ||
144 | { "Sound Settings", sound_menu }, | 150 | { "Sound Settings", sound_menu }, |
145 | { "General Settings", settings_menu }, | 151 | { "General Settings", settings_menu }, |
146 | #ifdef HAVE_LCD_BITMAP | 152 | #ifdef HAVE_LCD_BITMAP |
diff --git a/apps/settings.c b/apps/settings.c index 56d176264d..95728515fa 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -310,6 +310,7 @@ void settings_reset(void) { | |||
310 | global_settings.total_boots = 0; | 310 | global_settings.total_boots = 0; |
311 | global_settings.total_uptime = 0; | 311 | global_settings.total_uptime = 0; |
312 | global_settings.scroll_speed = 8; | 312 | global_settings.scroll_speed = 8; |
313 | global_settings.hold = false; | ||
313 | } | 314 | } |
314 | 315 | ||
315 | 316 | ||
diff --git a/apps/settings.h b/apps/settings.h index 3921fb1f52..7f2eccc0e9 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -64,6 +64,9 @@ struct user_settings | |||
64 | /* geeky persistent statistics */ | 64 | /* geeky persistent statistics */ |
65 | unsigned short total_boots; /* how many times the device has been booted */ | 65 | unsigned short total_boots; /* how many times the device has been booted */ |
66 | unsigned int total_uptime; /* total uptime since rockbox was first booted */ | 66 | unsigned int total_uptime; /* total uptime since rockbox was first booted */ |
67 | |||
68 | /* Hold Mode */ | ||
69 | bool hold; | ||
67 | }; | 70 | }; |
68 | 71 | ||
69 | /* prototypes */ | 72 | /* prototypes */ |
diff --git a/apps/wps.c b/apps/wps.c index 8d81fc5c2f..dd168059b7 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -199,6 +199,9 @@ int wps_show(void) | |||
199 | #else | 199 | #else |
200 | case BUTTON_UP: | 200 | case BUTTON_UP: |
201 | #endif | 201 | #endif |
202 | if (global_settings.hold) | ||
203 | break; | ||
204 | |||
202 | if ( playing ) | 205 | if ( playing ) |
203 | { | 206 | { |
204 | mpeg_pause(); | 207 | mpeg_pause(); |
@@ -215,6 +218,8 @@ int wps_show(void) | |||
215 | 218 | ||
216 | #ifdef HAVE_RECORDER_KEYPAD | 219 | #ifdef HAVE_RECORDER_KEYPAD |
217 | case BUTTON_UP: | 220 | case BUTTON_UP: |
221 | if (global_settings.hold) | ||
222 | break; | ||
218 | global_settings.volume++; | 223 | global_settings.volume++; |
219 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) | 224 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) |
220 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); | 225 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); |
@@ -222,6 +227,8 @@ int wps_show(void) | |||
222 | break; | 227 | break; |
223 | 228 | ||
224 | case BUTTON_DOWN: | 229 | case BUTTON_DOWN: |
230 | if (global_settings.hold) | ||
231 | break; | ||
225 | global_settings.volume--; | 232 | global_settings.volume--; |
226 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) | 233 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) |
227 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); | 234 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); |
@@ -230,10 +237,14 @@ int wps_show(void) | |||
230 | #endif | 237 | #endif |
231 | 238 | ||
232 | case BUTTON_LEFT: | 239 | case BUTTON_LEFT: |
240 | if (global_settings.hold) | ||
241 | break; | ||
233 | mpeg_prev(); | 242 | mpeg_prev(); |
234 | break; | 243 | break; |
235 | 244 | ||
236 | case BUTTON_RIGHT: | 245 | case BUTTON_RIGHT: |
246 | if (global_settings.hold) | ||
247 | break; | ||
237 | mpeg_next(); | 248 | mpeg_next(); |
238 | break; | 249 | break; |
239 | 250 | ||
@@ -252,6 +263,8 @@ int wps_show(void) | |||
252 | #else | 263 | #else |
253 | case BUTTON_DOWN: | 264 | case BUTTON_DOWN: |
254 | #endif | 265 | #endif |
266 | if (global_settings.hold) | ||
267 | break; | ||
255 | mpeg_stop(); | 268 | mpeg_stop(); |
256 | status_set_playmode(STATUS_STOP); | 269 | status_set_playmode(STATUS_STOP); |
257 | break; | 270 | break; |