diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-10-09 11:39:30 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-10-09 11:39:30 +0000 |
commit | c259bfdabe168e5d4f834e4c817f7610fe5d09fe (patch) | |
tree | 95201508e8e592b1ac496cccdcc40443422140a2 | |
parent | 270fe46f3c0cbcc305466c01c575fb2a29b82537 (diff) | |
download | rockbox-c259bfdabe168e5d4f834e4c817f7610fe5d09fe.tar.gz rockbox-c259bfdabe168e5d4f834e4c817f7610fe5d09fe.zip |
recording enabled for Ondio
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5233 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/recorder/recording.c | 67 |
1 files changed, 52 insertions, 15 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 8bec6e81de..310d0b283d 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -51,6 +51,26 @@ | |||
51 | 51 | ||
52 | #ifdef HAVE_RECORDING | 52 | #ifdef HAVE_RECORDING |
53 | 53 | ||
54 | |||
55 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
56 | #define REC_STOPEXIT BUTTON_OFF | ||
57 | #define REC_RECPAUSE BUTTON_PLAY | ||
58 | #define REC_INC BUTTON_RIGHT | ||
59 | #define REC_DEC BUTTON_LEFT | ||
60 | #define REC_NEXT BUTTON_DOWN | ||
61 | #define REC_PREV BUTTON_UP | ||
62 | #define REC_SETTINGS BUTTON_F1 | ||
63 | #define REC_F2 BUTTON_F2 | ||
64 | #define REC_F3 BUTTON_F3 | ||
65 | #elif CONFIG_KEYPAD == ONDIO_PAD /* only limited features */ | ||
66 | #define REC_STOPEXIT BUTTON_OFF | ||
67 | #define REC_RECPAUSE BUTTON_RIGHT | ||
68 | #define REC_INC BUTTON_UP | ||
69 | #define REC_DEC BUTTON_DOWN | ||
70 | #define REC_NEXT (BUTTON_MENU | BUTTON_REL) | ||
71 | #define REC_SETTINGS (BUTTON_MENU | BUTTON_REPEAT) | ||
72 | #endif | ||
73 | |||
54 | bool f2_rec_screen(void); | 74 | bool f2_rec_screen(void); |
55 | bool f3_rec_screen(void); | 75 | bool f3_rec_screen(void); |
56 | 76 | ||
@@ -168,10 +188,12 @@ int rec_create_directory(void) | |||
168 | 188 | ||
169 | bool recording_screen(void) | 189 | bool recording_screen(void) |
170 | { | 190 | { |
191 | /* | ||
171 | #if CONFIG_KEYPAD != RECORDER_PAD | 192 | #if CONFIG_KEYPAD != RECORDER_PAD |
172 | splash(HZ*2, true, "Recording not supported yet"); | 193 | splash(HZ*2, true, "Recording not supported yet"); |
173 | return false; | 194 | return false; |
174 | #else | 195 | #else |
196 | */ | ||
175 | int button; | 197 | int button; |
176 | bool done = false; | 198 | bool done = false; |
177 | char buf[32]; | 199 | char buf[32]; |
@@ -248,7 +270,7 @@ bool recording_screen(void) | |||
248 | button = button_get_w_tmo(HZ / peak_meter_fps); | 270 | button = button_get_w_tmo(HZ / peak_meter_fps); |
249 | switch(button) | 271 | switch(button) |
250 | { | 272 | { |
251 | case BUTTON_OFF: | 273 | case REC_STOPEXIT: |
252 | if(mpeg_status() & MPEG_STATUS_RECORD) | 274 | if(mpeg_status() & MPEG_STATUS_RECORD) |
253 | { | 275 | { |
254 | mpeg_stop(); | 276 | mpeg_stop(); |
@@ -262,7 +284,7 @@ bool recording_screen(void) | |||
262 | update_countdown = 1; /* Update immediately */ | 284 | update_countdown = 1; /* Update immediately */ |
263 | break; | 285 | break; |
264 | 286 | ||
265 | case BUTTON_PLAY: | 287 | case REC_RECPAUSE: |
266 | /* Only act if the mpeg is stopped */ | 288 | /* Only act if the mpeg is stopped */ |
267 | if(!(mpeg_status() & MPEG_STATUS_RECORD)) | 289 | if(!(mpeg_status() & MPEG_STATUS_RECORD)) |
268 | { | 290 | { |
@@ -286,20 +308,24 @@ bool recording_screen(void) | |||
286 | } | 308 | } |
287 | break; | 309 | break; |
288 | 310 | ||
289 | case BUTTON_UP: | 311 | #ifdef REC_PREV |
312 | case REC_PREV: | ||
290 | cursor--; | 313 | cursor--; |
291 | adjust_cursor(); | 314 | adjust_cursor(); |
292 | update_countdown = 1; /* Update immediately */ | 315 | update_countdown = 1; /* Update immediately */ |
293 | break; | 316 | break; |
317 | #endif | ||
294 | 318 | ||
295 | case BUTTON_DOWN: | 319 | #ifdef REC_NEXT |
320 | case REC_NEXT: | ||
296 | cursor++; | 321 | cursor++; |
297 | adjust_cursor(); | 322 | adjust_cursor(); |
298 | update_countdown = 1; /* Update immediately */ | 323 | update_countdown = 1; /* Update immediately */ |
299 | break; | 324 | break; |
325 | #endif | ||
300 | 326 | ||
301 | case BUTTON_RIGHT: | 327 | case REC_INC: |
302 | case BUTTON_RIGHT | BUTTON_REPEAT: | 328 | case REC_INC | BUTTON_REPEAT: |
303 | switch(cursor) | 329 | switch(cursor) |
304 | { | 330 | { |
305 | case 0: | 331 | case 0: |
@@ -340,8 +366,8 @@ bool recording_screen(void) | |||
340 | update_countdown = 1; /* Update immediately */ | 366 | update_countdown = 1; /* Update immediately */ |
341 | break; | 367 | break; |
342 | 368 | ||
343 | case BUTTON_LEFT: | 369 | case REC_DEC: |
344 | case BUTTON_LEFT | BUTTON_REPEAT: | 370 | case REC_DEC | BUTTON_REPEAT: |
345 | switch(cursor) | 371 | switch(cursor) |
346 | { | 372 | { |
347 | case 0: | 373 | case 0: |
@@ -382,7 +408,8 @@ bool recording_screen(void) | |||
382 | update_countdown = 1; /* Update immediately */ | 408 | update_countdown = 1; /* Update immediately */ |
383 | break; | 409 | break; |
384 | 410 | ||
385 | case BUTTON_F1: | 411 | #ifdef REC_SETTINGS |
412 | case REC_SETTINGS: | ||
386 | if (recording_menu(false)) | 413 | if (recording_menu(false)) |
387 | return SYS_USB_CONNECTED; | 414 | return SYS_USB_CONNECTED; |
388 | settings_save(); | 415 | settings_save(); |
@@ -404,8 +431,10 @@ bool recording_screen(void) | |||
404 | lcd_setfont(FONT_SYSFIXED); | 431 | lcd_setfont(FONT_SYSFIXED); |
405 | lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); | 432 | lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); |
406 | break; | 433 | break; |
434 | #endif | ||
407 | 435 | ||
408 | case BUTTON_F2: | 436 | #ifdef REC_F2 |
437 | case REC_F2: | ||
409 | if(mpeg_status() != MPEG_STATUS_RECORD) | 438 | if(mpeg_status() != MPEG_STATUS_RECORD) |
410 | { | 439 | { |
411 | if (f2_rec_screen()) | 440 | if (f2_rec_screen()) |
@@ -417,8 +446,10 @@ bool recording_screen(void) | |||
417 | update_countdown = 1; /* Update immediately */ | 446 | update_countdown = 1; /* Update immediately */ |
418 | } | 447 | } |
419 | break; | 448 | break; |
449 | #endif | ||
420 | 450 | ||
421 | case BUTTON_F3: | 451 | #ifdef REC_F3 |
452 | case REC_F3: | ||
422 | if(mpeg_status() & MPEG_STATUS_RECORD) | 453 | if(mpeg_status() & MPEG_STATUS_RECORD) |
423 | { | 454 | { |
424 | mpeg_new_file(rec_create_filename(path_buffer)); | 455 | mpeg_new_file(rec_create_filename(path_buffer)); |
@@ -438,6 +469,7 @@ bool recording_screen(void) | |||
438 | } | 469 | } |
439 | } | 470 | } |
440 | break; | 471 | break; |
472 | #endif | ||
441 | 473 | ||
442 | case SYS_USB_CONNECTED: | 474 | case SYS_USB_CONNECTED: |
443 | /* Only accept USB connection when not recording */ | 475 | /* Only accept USB connection when not recording */ |
@@ -607,7 +639,7 @@ bool recording_screen(void) | |||
607 | while(1) | 639 | while(1) |
608 | { | 640 | { |
609 | button = button_get(true); | 641 | button = button_get(true); |
610 | if(button == (BUTTON_OFF | BUTTON_REL)) | 642 | if(button == (REC_STOPEXIT | BUTTON_REL)) |
611 | break; | 643 | break; |
612 | } | 644 | } |
613 | } | 645 | } |
@@ -624,10 +656,12 @@ bool recording_screen(void) | |||
624 | reload_directory(); | 656 | reload_directory(); |
625 | 657 | ||
626 | return been_in_usb_mode; | 658 | return been_in_usb_mode; |
627 | #endif | 659 | /* |
660 | #endif | ||
661 | */ | ||
628 | } | 662 | } |
629 | 663 | ||
630 | #if CONFIG_KEYPAD == RECORDER_PAD | 664 | #ifdef REC_F2 |
631 | bool f2_rec_screen(void) | 665 | bool f2_rec_screen(void) |
632 | { | 666 | { |
633 | bool exit = false; | 667 | bool exit = false; |
@@ -744,7 +778,9 @@ bool f2_rec_screen(void) | |||
744 | 778 | ||
745 | return false; | 779 | return false; |
746 | } | 780 | } |
781 | #endif /* #ifdef REC_F2 */ | ||
747 | 782 | ||
783 | #ifdef REC_F3 | ||
748 | bool f3_rec_screen(void) | 784 | bool f3_rec_screen(void) |
749 | { | 785 | { |
750 | bool exit = false; | 786 | bool exit = false; |
@@ -820,5 +856,6 @@ bool f3_rec_screen(void) | |||
820 | 856 | ||
821 | return false; | 857 | return false; |
822 | } | 858 | } |
823 | #endif | 859 | #endif /* #ifdef REC_F3 */ |
860 | |||
824 | #endif /* HAVE_RECORDING */ | 861 | #endif /* HAVE_RECORDING */ |