diff options
-rw-r--r-- | apps/recorder/recording.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index b45fc13345..fc27439f2e 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -430,7 +430,7 @@ bool recording_screen(void) | |||
430 | { | 430 | { |
431 | screens[1].clear_display(); | 431 | screens[1].clear_display(); |
432 | snprintf(buf, 32, str(LANG_REMOTE_LCD_ON)); | 432 | snprintf(buf, 32, str(LANG_REMOTE_LCD_ON)); |
433 | screens[1].puts((screens[1].width/w - strlen(buf))/2, | 433 | screens[1].puts((screens[1].width/w - strlen(buf))/2 + 1, |
434 | screens[1].height/(h*2) + 1, buf); | 434 | screens[1].height/(h*2) + 1, buf); |
435 | screens[1].update(); | 435 | screens[1].update(); |
436 | gui_syncsplash(0, true, str(LANG_REMOTE_LCD_OFF)); | 436 | gui_syncsplash(0, true, str(LANG_REMOTE_LCD_OFF)); |
@@ -513,7 +513,7 @@ bool recording_screen(void) | |||
513 | screen_update = 1; | 513 | screen_update = 1; |
514 | screens[1].clear_display(); | 514 | screens[1].clear_display(); |
515 | snprintf(buf, 32, str(LANG_REMOTE_LCD_ON)); | 515 | snprintf(buf, 32, str(LANG_REMOTE_LCD_ON)); |
516 | screens[1].puts((screens[1].width/w - strlen(buf))/2, | 516 | screens[1].puts((screens[1].width/w - strlen(buf))/2 + 1, |
517 | screens[1].height/(h*2) + 1, buf); | 517 | screens[1].height/(h*2) + 1, buf); |
518 | screens[1].update(); | 518 | screens[1].update(); |
519 | gui_syncsplash(0, true, str(LANG_REMOTE_LCD_OFF)); | 519 | gui_syncsplash(0, true, str(LANG_REMOTE_LCD_OFF)); |
@@ -874,7 +874,7 @@ bool recording_screen(void) | |||
874 | dsize = rec_sizesplit_bytes(); | 874 | dsize = rec_sizesplit_bytes(); |
875 | num_recorded_bytes = audio_num_recorded_bytes(); | 875 | num_recorded_bytes = audio_num_recorded_bytes(); |
876 | 876 | ||
877 | FOR_NB_SCREENS(i) | 877 | for(i = 0; i < screen_update; i++) |
878 | screens[i].clear_display(); | 878 | screens[i].clear_display(); |
879 | 879 | ||
880 | if ((global_settings.rec_sizesplit) && (global_settings.rec_split_method)) | 880 | if ((global_settings.rec_sizesplit) && (global_settings.rec_split_method)) |
@@ -892,7 +892,7 @@ bool recording_screen(void) | |||
892 | hours, minutes, seconds%60); | 892 | hours, minutes, seconds%60); |
893 | } | 893 | } |
894 | 894 | ||
895 | FOR_NB_SCREENS(i) | 895 | for(i = 0; i < screen_update; i++) |
896 | screens[i].puts(0, 0, buf); | 896 | screens[i].puts(0, 0, buf); |
897 | 897 | ||
898 | if(audio_stat & AUDIO_STATUS_PRERECORD) | 898 | if(audio_stat & AUDIO_STATUS_PRERECORD) |
@@ -923,10 +923,10 @@ bool recording_screen(void) | |||
923 | str(LANG_RECORDING_SIZE), buf2); | 923 | str(LANG_RECORDING_SIZE), buf2); |
924 | } | 924 | } |
925 | } | 925 | } |
926 | FOR_NB_SCREENS(i) | 926 | for(i = 0; i < screen_update; i++) |
927 | screens[i].puts(0, 1, buf); | 927 | screens[i].puts(0, 1, buf); |
928 | 928 | ||
929 | FOR_NB_SCREENS(i) | 929 | for(i = 0; i < screen_update; i++) |
930 | { | 930 | { |
931 | if (filename_offset[i] > 0) | 931 | if (filename_offset[i] > 0) |
932 | { | 932 | { |
@@ -975,13 +975,13 @@ bool recording_screen(void) | |||
975 | 975 | ||
976 | if (global_settings.invert_cursor && (pos++ == cursor)) | 976 | if (global_settings.invert_cursor && (pos++ == cursor)) |
977 | { | 977 | { |
978 | FOR_NB_SCREENS(i) | 978 | for(i = 0; i < screen_update; i++) |
979 | screens[i].puts_style_offset(0, filename_offset[i] + | 979 | screens[i].puts_style_offset(0, filename_offset[i] + |
980 | PM_HEIGHT + 2, buf, STYLE_INVERT,0); | 980 | PM_HEIGHT + 2, buf, STYLE_INVERT,0); |
981 | } | 981 | } |
982 | else | 982 | else |
983 | { | 983 | { |
984 | FOR_NB_SCREENS(i) | 984 | for(i = 0; i < screen_update; i++) |
985 | screens[i].puts(0, filename_offset[i] + PM_HEIGHT + 2, buf); | 985 | screens[i].puts(0, filename_offset[i] + PM_HEIGHT + 2, buf); |
986 | } | 986 | } |
987 | 987 | ||
@@ -993,13 +993,13 @@ bool recording_screen(void) | |||
993 | buf2, sizeof(buf2))); | 993 | buf2, sizeof(buf2))); |
994 | if(global_settings.invert_cursor && ((1==cursor)||(2==cursor))) | 994 | if(global_settings.invert_cursor && ((1==cursor)||(2==cursor))) |
995 | { | 995 | { |
996 | FOR_NB_SCREENS(i) | 996 | for(i = 0; i < screen_update; i++) |
997 | screens[i].puts_style_offset(0, filename_offset[i] + | 997 | screens[i].puts_style_offset(0, filename_offset[i] + |
998 | PM_HEIGHT + 3, buf, STYLE_INVERT,0); | 998 | PM_HEIGHT + 3, buf, STYLE_INVERT,0); |
999 | } | 999 | } |
1000 | else | 1000 | else |
1001 | { | 1001 | { |
1002 | FOR_NB_SCREENS(i) | 1002 | for(i = 0; i < screen_update; i++) |
1003 | screens[i].puts(0, filename_offset[i] + | 1003 | screens[i].puts(0, filename_offset[i] + |
1004 | PM_HEIGHT + 3, buf); | 1004 | PM_HEIGHT + 3, buf); |
1005 | } | 1005 | } |
@@ -1013,13 +1013,13 @@ bool recording_screen(void) | |||
1013 | buf2, sizeof(buf2))); | 1013 | buf2, sizeof(buf2))); |
1014 | if(global_settings.invert_cursor && ((1==cursor)||(2==cursor))) | 1014 | if(global_settings.invert_cursor && ((1==cursor)||(2==cursor))) |
1015 | { | 1015 | { |
1016 | FOR_NB_SCREENS(i) | 1016 | for(i = 0; i < screen_update; i++) |
1017 | screens[i].puts_style_offset(0, filename_offset[i] + | 1017 | screens[i].puts_style_offset(0, filename_offset[i] + |
1018 | PM_HEIGHT + 3, buf, STYLE_INVERT,0); | 1018 | PM_HEIGHT + 3, buf, STYLE_INVERT,0); |
1019 | } | 1019 | } |
1020 | else | 1020 | else |
1021 | { | 1021 | { |
1022 | FOR_NB_SCREENS(i) | 1022 | for(i = 0; i < screen_update; i++) |
1023 | screens[i].puts(0, filename_offset[i] + | 1023 | screens[i].puts(0, filename_offset[i] + |
1024 | PM_HEIGHT + 3, buf); | 1024 | PM_HEIGHT + 3, buf); |
1025 | } | 1025 | } |
@@ -1031,13 +1031,13 @@ bool recording_screen(void) | |||
1031 | buf2, sizeof(buf2))); | 1031 | buf2, sizeof(buf2))); |
1032 | if(global_settings.invert_cursor && ((1==cursor)||(3==cursor))) | 1032 | if(global_settings.invert_cursor && ((1==cursor)||(3==cursor))) |
1033 | { | 1033 | { |
1034 | FOR_NB_SCREENS(i) | 1034 | for(i = 0; i < screen_update; i++) |
1035 | screens[i].puts_style_offset(0, filename_offset[i] + | 1035 | screens[i].puts_style_offset(0, filename_offset[i] + |
1036 | PM_HEIGHT + 4, buf, STYLE_INVERT,0); | 1036 | PM_HEIGHT + 4, buf, STYLE_INVERT,0); |
1037 | } | 1037 | } |
1038 | else | 1038 | else |
1039 | { | 1039 | { |
1040 | FOR_NB_SCREENS(i) | 1040 | for(i = 0; i < screen_update; i++) |
1041 | screens[i].puts(0, filename_offset[i] + | 1041 | screens[i].puts(0, filename_offset[i] + |
1042 | PM_HEIGHT + 4, buf); | 1042 | PM_HEIGHT + 4, buf); |
1043 | } | 1043 | } |
@@ -1048,33 +1048,33 @@ bool recording_screen(void) | |||
1048 | switch(cursor) | 1048 | switch(cursor) |
1049 | { | 1049 | { |
1050 | case 1: | 1050 | case 1: |
1051 | FOR_NB_SCREENS(i) | 1051 | for(i = 0; i < screen_update; i++) |
1052 | screen_put_cursorxy(&screens[i], 0, | 1052 | screen_put_cursorxy(&screens[i], 0, |
1053 | filename_offset[i] + | 1053 | filename_offset[i] + |
1054 | PM_HEIGHT + 3, true); | 1054 | PM_HEIGHT + 3, true); |
1055 | 1055 | ||
1056 | if(global_settings.rec_source != SOURCE_MIC) | 1056 | if(global_settings.rec_source != SOURCE_MIC) |
1057 | { | 1057 | { |
1058 | FOR_NB_SCREENS(i) | 1058 | for(i = 0; i < screen_update; i++) |
1059 | screen_put_cursorxy(&screens[i], 0, | 1059 | screen_put_cursorxy(&screens[i], 0, |
1060 | filename_offset[i] + | 1060 | filename_offset[i] + |
1061 | PM_HEIGHT + 4, true); | 1061 | PM_HEIGHT + 4, true); |
1062 | } | 1062 | } |
1063 | break; | 1063 | break; |
1064 | case 2: | 1064 | case 2: |
1065 | FOR_NB_SCREENS(i) | 1065 | for(i = 0; i < screen_update; i++) |
1066 | screen_put_cursorxy(&screens[i], 0, | 1066 | screen_put_cursorxy(&screens[i], 0, |
1067 | filename_offset[i] + | 1067 | filename_offset[i] + |
1068 | PM_HEIGHT + 3, true); | 1068 | PM_HEIGHT + 3, true); |
1069 | break; | 1069 | break; |
1070 | case 3: | 1070 | case 3: |
1071 | FOR_NB_SCREENS(i) | 1071 | for(i = 0; i < screen_update; i++) |
1072 | screen_put_cursorxy(&screens[i], 0, | 1072 | screen_put_cursorxy(&screens[i], 0, |
1073 | filename_offset[i] + | 1073 | filename_offset[i] + |
1074 | PM_HEIGHT + 4, true); | 1074 | PM_HEIGHT + 4, true); |
1075 | break; | 1075 | break; |
1076 | default: | 1076 | default: |
1077 | FOR_NB_SCREENS(i) | 1077 | for(i = 0; i < screen_update; i++) |
1078 | screen_put_cursorxy(&screens[i], 0, | 1078 | screen_put_cursorxy(&screens[i], 0, |
1079 | filename_offset[i] + | 1079 | filename_offset[i] + |
1080 | PM_HEIGHT + 2, true); | 1080 | PM_HEIGHT + 2, true); |
@@ -1095,7 +1095,7 @@ bool recording_screen(void) | |||
1095 | freq_str[global_settings.rec_frequency], | 1095 | freq_str[global_settings.rec_frequency], |
1096 | global_settings.rec_channels ? | 1096 | global_settings.rec_channels ? |
1097 | str(LANG_CHANNEL_MONO) : str(LANG_CHANNEL_STEREO)); | 1097 | str(LANG_CHANNEL_MONO) : str(LANG_CHANNEL_STEREO)); |
1098 | FOR_NB_SCREENS(i) | 1098 | for(i = 0; i < screen_update; i++) |
1099 | screens[i].puts(0, filename_offset[i] + PM_HEIGHT + 5, buf); | 1099 | screens[i].puts(0, filename_offset[i] + PM_HEIGHT + 5, buf); |
1100 | 1100 | ||
1101 | for(i = 0; i < screen_update; i++) | 1101 | for(i = 0; i < screen_update; i++) |