diff options
Diffstat (limited to 'apps/recorder/recording.c')
-rw-r--r-- | apps/recorder/recording.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index a077c957a7..242351a0d6 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -437,11 +437,15 @@ bool recording_screen(void) | |||
437 | /* Only accept USB connection when not recording */ | 437 | /* Only accept USB connection when not recording */ |
438 | if(mpeg_status() != MPEG_STATUS_RECORD) | 438 | if(mpeg_status() != MPEG_STATUS_RECORD) |
439 | { | 439 | { |
440 | usb_screen(); | 440 | default_event_handler(SYS_USB_CONNECTED); |
441 | done = true; | 441 | done = true; |
442 | been_in_usb_mode = true; | 442 | been_in_usb_mode = true; |
443 | } | 443 | } |
444 | break; | 444 | break; |
445 | |||
446 | default: | ||
447 | default_event_handler(button); | ||
448 | break; | ||
445 | } | 449 | } |
446 | 450 | ||
447 | peak_meter_peek(); | 451 | peak_meter_peek(); |
@@ -622,6 +626,7 @@ bool f2_rec_screen(void) | |||
622 | bool used = false; | 626 | bool used = false; |
623 | int w, h; | 627 | int w, h; |
624 | char buf[32]; | 628 | char buf[32]; |
629 | int button; | ||
625 | 630 | ||
626 | lcd_setfont(FONT_SYSFIXED); | 631 | lcd_setfont(FONT_SYSFIXED); |
627 | lcd_getstringsize("A",&w,&h); | 632 | lcd_getstringsize("A",&w,&h); |
@@ -671,7 +676,8 @@ bool f2_rec_screen(void) | |||
671 | 676 | ||
672 | lcd_update(); | 677 | lcd_update(); |
673 | 678 | ||
674 | switch (button_get(true)) { | 679 | button = button_get(true); |
680 | switch (button) { | ||
675 | case BUTTON_LEFT: | 681 | case BUTTON_LEFT: |
676 | case BUTTON_F2 | BUTTON_LEFT: | 682 | case BUTTON_F2 | BUTTON_LEFT: |
677 | global_settings.rec_quality++; | 683 | global_settings.rec_quality++; |
@@ -706,9 +712,10 @@ bool f2_rec_screen(void) | |||
706 | used = true; | 712 | used = true; |
707 | break; | 713 | break; |
708 | 714 | ||
709 | case SYS_USB_CONNECTED: | 715 | default: |
710 | usb_screen(); | 716 | if(default_event_handler(button) == SYS_USB_CONNECTED) |
711 | return true; | 717 | return true; |
718 | break; | ||
712 | } | 719 | } |
713 | } | 720 | } |
714 | 721 | ||
@@ -735,6 +742,7 @@ bool f3_rec_screen(void) | |||
735 | bool exit = false; | 742 | bool exit = false; |
736 | bool used = false; | 743 | bool used = false; |
737 | int w, h; | 744 | int w, h; |
745 | int button; | ||
738 | char *src_str[] = | 746 | char *src_str[] = |
739 | { | 747 | { |
740 | str(LANG_RECORDING_SRC_MIC), | 748 | str(LANG_RECORDING_SRC_MIC), |
@@ -760,7 +768,8 @@ bool f3_rec_screen(void) | |||
760 | 768 | ||
761 | lcd_update(); | 769 | lcd_update(); |
762 | 770 | ||
763 | switch (button_get(true)) { | 771 | button = button_get(true); |
772 | switch (button) { | ||
764 | case BUTTON_LEFT: | 773 | case BUTTON_LEFT: |
765 | case BUTTON_F3 | BUTTON_LEFT: | 774 | case BUTTON_F3 | BUTTON_LEFT: |
766 | global_settings.rec_source++; | 775 | global_settings.rec_source++; |
@@ -779,9 +788,10 @@ bool f3_rec_screen(void) | |||
779 | used = true; | 788 | used = true; |
780 | break; | 789 | break; |
781 | 790 | ||
782 | case SYS_USB_CONNECTED: | 791 | default: |
783 | usb_screen(); | 792 | if(default_event_handler(button) == SYS_USB_CONNECTED) |
784 | return true; | 793 | return true; |
794 | break; | ||
785 | } | 795 | } |
786 | } | 796 | } |
787 | 797 | ||