diff options
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/icons.c | 12 | ||||
-rw-r--r-- | apps/recorder/peakmeter.c | 8 | ||||
-rw-r--r-- | apps/recorder/recording.c | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index a10f2e1699..7a5a7bd8f7 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c | |||
@@ -323,7 +323,7 @@ bool statusbar_icon_volume(int percent) | |||
323 | if (volume==0) { | 323 | if (volume==0) { |
324 | lcd_bitmap(bitmap_icons_7x8[Icon_Mute], | 324 | lcd_bitmap(bitmap_icons_7x8[Icon_Mute], |
325 | ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - 4, | 325 | ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - 4, |
326 | STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT, false); | 326 | STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT); |
327 | } | 327 | } |
328 | else { | 328 | else { |
329 | /* We want to redraw the icon later on */ | 329 | /* We want to redraw the icon later on */ |
@@ -371,7 +371,7 @@ bool statusbar_icon_volume(int percent) | |||
371 | void statusbar_icon_play_state(int state) | 371 | void statusbar_icon_play_state(int state) |
372 | { | 372 | { |
373 | lcd_bitmap(bitmap_icons_7x8[state], ICON_PLAY_STATE_X_POS, STATUSBAR_Y_POS, | 373 | lcd_bitmap(bitmap_icons_7x8[state], ICON_PLAY_STATE_X_POS, STATUSBAR_Y_POS, |
374 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); | 374 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); |
375 | } | 375 | } |
376 | 376 | ||
377 | /* | 377 | /* |
@@ -380,7 +380,7 @@ void statusbar_icon_play_state(int state) | |||
380 | void statusbar_icon_play_mode(int mode) | 380 | void statusbar_icon_play_mode(int mode) |
381 | { | 381 | { |
382 | lcd_bitmap(bitmap_icons_7x8[mode], ICON_PLAY_MODE_X_POS, STATUSBAR_Y_POS, | 382 | lcd_bitmap(bitmap_icons_7x8[mode], ICON_PLAY_MODE_X_POS, STATUSBAR_Y_POS, |
383 | ICON_PLAY_MODE_WIDTH, STATUSBAR_HEIGHT, false); | 383 | ICON_PLAY_MODE_WIDTH, STATUSBAR_HEIGHT); |
384 | } | 384 | } |
385 | 385 | ||
386 | /* | 386 | /* |
@@ -389,7 +389,7 @@ void statusbar_icon_play_mode(int mode) | |||
389 | void statusbar_icon_shuffle(void) | 389 | void statusbar_icon_shuffle(void) |
390 | { | 390 | { |
391 | lcd_bitmap(bitmap_icons_7x8[Icon_Shuffle], ICON_SHUFFLE_X_POS, | 391 | lcd_bitmap(bitmap_icons_7x8[Icon_Shuffle], ICON_SHUFFLE_X_POS, |
392 | STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT, false); | 392 | STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT); |
393 | } | 393 | } |
394 | 394 | ||
395 | /* | 395 | /* |
@@ -398,7 +398,7 @@ void statusbar_icon_shuffle(void) | |||
398 | void statusbar_icon_lock(void) | 398 | void statusbar_icon_lock(void) |
399 | { | 399 | { |
400 | lcd_bitmap(bitmap_icons_5x8[Icon_Lock], LOCK_X_POS, | 400 | lcd_bitmap(bitmap_icons_5x8[Icon_Lock], LOCK_X_POS, |
401 | STATUSBAR_Y_POS, 5, 8, false); | 401 | STATUSBAR_Y_POS, 5, 8); |
402 | } | 402 | } |
403 | 403 | ||
404 | #if CONFIG_LED == LED_VIRTUAL | 404 | #if CONFIG_LED == LED_VIRTUAL |
@@ -408,7 +408,7 @@ void statusbar_icon_lock(void) | |||
408 | void statusbar_led(void) | 408 | void statusbar_led(void) |
409 | { | 409 | { |
410 | lcd_bitmap(bitmap_icon_disk, ICON_DISK_X_POS, | 410 | lcd_bitmap(bitmap_icon_disk, ICON_DISK_X_POS, |
411 | STATUSBAR_Y_POS, ICON_DISK_WIDTH, STATUSBAR_HEIGHT, false); | 411 | STATUSBAR_Y_POS, ICON_DISK_WIDTH, STATUSBAR_HEIGHT); |
412 | } | 412 | } |
413 | #endif | 413 | #endif |
414 | 414 | ||
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index 779200cb85..3bab002574 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -1108,7 +1108,7 @@ void peak_meter_draw_trig(int xpos, int ypos) { | |||
1108 | scrollbar(x, ypos + 1, TRIGBAR_WIDTH, TRIG_HEIGHT - 2, | 1108 | scrollbar(x, ypos + 1, TRIGBAR_WIDTH, TRIG_HEIGHT - 2, |
1109 | TRIGBAR_WIDTH, 0, 0, HORIZONTAL); | 1109 | TRIGBAR_WIDTH, 0, 0, HORIZONTAL); |
1110 | lcd_bitmap(bitmap_icons_7x8[Icon_Stop], xpos, ypos, | 1110 | lcd_bitmap(bitmap_icons_7x8[Icon_Stop], xpos, ypos, |
1111 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); | 1111 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); |
1112 | break; | 1112 | break; |
1113 | 1113 | ||
1114 | case TRIG_STEADY: | 1114 | case TRIG_STEADY: |
@@ -1118,7 +1118,7 @@ void peak_meter_draw_trig(int xpos, int ypos) { | |||
1118 | scrollbar(x, ypos + 1, TRIGBAR_WIDTH, TRIG_HEIGHT - 2, | 1118 | scrollbar(x, ypos + 1, TRIGBAR_WIDTH, TRIG_HEIGHT - 2, |
1119 | TRIGBAR_WIDTH, 0, TRIGBAR_WIDTH - time_left, HORIZONTAL); | 1119 | TRIGBAR_WIDTH, 0, TRIGBAR_WIDTH - time_left, HORIZONTAL); |
1120 | lcd_bitmap(bitmap_icons_7x8[Icon_Stop], xpos, ypos, | 1120 | lcd_bitmap(bitmap_icons_7x8[Icon_Stop], xpos, ypos, |
1121 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); | 1121 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); |
1122 | break; | 1122 | break; |
1123 | 1123 | ||
1124 | case TRIG_GO: | 1124 | case TRIG_GO: |
@@ -1127,7 +1127,7 @@ void peak_meter_draw_trig(int xpos, int ypos) { | |||
1127 | TRIGBAR_WIDTH, TRIGBAR_WIDTH, TRIGBAR_WIDTH, HORIZONTAL); | 1127 | TRIGBAR_WIDTH, TRIGBAR_WIDTH, TRIGBAR_WIDTH, HORIZONTAL); |
1128 | lcd_bitmap(bitmap_icons_7x8[Icon_Record], | 1128 | lcd_bitmap(bitmap_icons_7x8[Icon_Record], |
1129 | TRIG_WIDTH - ICON_PLAY_STATE_WIDTH, ypos, | 1129 | TRIG_WIDTH - ICON_PLAY_STATE_WIDTH, ypos, |
1130 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); | 1130 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); |
1131 | break; | 1131 | break; |
1132 | 1132 | ||
1133 | case TRIG_POSTREC: | 1133 | case TRIG_POSTREC: |
@@ -1137,7 +1137,7 @@ void peak_meter_draw_trig(int xpos, int ypos) { | |||
1137 | TRIGBAR_WIDTH, time_left, TRIGBAR_WIDTH, HORIZONTAL); | 1137 | TRIGBAR_WIDTH, time_left, TRIGBAR_WIDTH, HORIZONTAL); |
1138 | lcd_bitmap(bitmap_icons_7x8[Icon_Record], | 1138 | lcd_bitmap(bitmap_icons_7x8[Icon_Record], |
1139 | TRIG_WIDTH - ICON_PLAY_STATE_WIDTH, ypos, | 1139 | TRIG_WIDTH - ICON_PLAY_STATE_WIDTH, ypos, |
1140 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); | 1140 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); |
1141 | break; | 1141 | break; |
1142 | } | 1142 | } |
1143 | 1143 | ||
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 84c90d2d86..9e58cec19e 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -870,7 +870,7 @@ bool f2_rec_screen(void) | |||
870 | snprintf(buf, 32, "%d", global_settings.rec_quality); | 870 | snprintf(buf, 32, "%d", global_settings.rec_quality); |
871 | lcd_putsxy(0, LCD_HEIGHT/2-h, buf); | 871 | lcd_putsxy(0, LCD_HEIGHT/2-h, buf); |
872 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], | 872 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], |
873 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); | 873 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8); |
874 | 874 | ||
875 | /* Frequency */ | 875 | /* Frequency */ |
876 | snprintf(buf, sizeof buf, "%s:", str(LANG_RECORDING_FREQUENCY)); | 876 | snprintf(buf, sizeof buf, "%s:", str(LANG_RECORDING_FREQUENCY)); |
@@ -880,7 +880,7 @@ bool f2_rec_screen(void) | |||
880 | lcd_getstringsize(ptr, &w, &h); | 880 | lcd_getstringsize(ptr, &w, &h); |
881 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); | 881 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); |
882 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], | 882 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], |
883 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); | 883 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); |
884 | 884 | ||
885 | /* Channel mode */ | 885 | /* Channel mode */ |
886 | switch ( global_settings.rec_channels ) { | 886 | switch ( global_settings.rec_channels ) { |
@@ -901,7 +901,7 @@ bool f2_rec_screen(void) | |||
901 | lcd_getstringsize(ptr, &w, &h); | 901 | lcd_getstringsize(ptr, &w, &h); |
902 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, ptr); | 902 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, ptr); |
903 | lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], | 903 | lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], |
904 | LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); | 904 | LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8); |
905 | 905 | ||
906 | lcd_update(); | 906 | lcd_update(); |
907 | 907 | ||
@@ -995,14 +995,14 @@ bool f3_rec_screen(void) | |||
995 | lcd_getstringsize(ptr, &w, &h); | 995 | lcd_getstringsize(ptr, &w, &h); |
996 | lcd_putsxy(0, LCD_HEIGHT/2-h, ptr); | 996 | lcd_putsxy(0, LCD_HEIGHT/2-h, ptr); |
997 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], | 997 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], |
998 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); | 998 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8); |
999 | 999 | ||
1000 | /* trigger setup */ | 1000 | /* trigger setup */ |
1001 | ptr = str(LANG_RECORD_TRIGGER); | 1001 | ptr = str(LANG_RECORD_TRIGGER); |
1002 | lcd_getstringsize(ptr,&w,&h); | 1002 | lcd_getstringsize(ptr,&w,&h); |
1003 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, ptr); | 1003 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, ptr); |
1004 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], | 1004 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], |
1005 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); | 1005 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); |
1006 | 1006 | ||
1007 | lcd_update(); | 1007 | lcd_update(); |
1008 | 1008 | ||