diff options
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/icons.c | 1 | ||||
-rw-r--r-- | apps/recorder/icons.h | 1 | ||||
-rw-r--r-- | apps/recorder/recording.c | 15 |
3 files changed, 6 insertions, 11 deletions
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 148235f040..4d1d2908c4 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c | |||
@@ -39,7 +39,6 @@ const unsigned char bitmap_icons_6x8[LastIcon][6] = | |||
39 | { 0x60, 0x7f, 0x03, 0x33, 0x3f, 0x00 }, /* Musical note */ | 39 | { 0x60, 0x7f, 0x03, 0x33, 0x3f, 0x00 }, /* Musical note */ |
40 | { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, /* Folder */ | 40 | { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, /* Folder */ |
41 | { 0x55, 0x00, 0x55, 0x55, 0x55, 0x55 }, /* Playlist */ | 41 | { 0x55, 0x00, 0x55, 0x55, 0x55, 0x55 }, /* Playlist */ |
42 | { 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00 }, /* Cursor / Marker */ | ||
43 | { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x55 }, /* WPS file */ | 42 | { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x55 }, /* WPS file */ |
44 | { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, /* Mod or ajz file */ | 43 | { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, /* Mod or ajz file */ |
45 | { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, /* Font file */ | 44 | { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, /* Font file */ |
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 17605ef490..5c442ea371 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h | |||
@@ -36,7 +36,6 @@ enum icons_6x8 { | |||
36 | Icon_Audio, | 36 | Icon_Audio, |
37 | Icon_Folder, | 37 | Icon_Folder, |
38 | Icon_Playlist, | 38 | Icon_Playlist, |
39 | Icon_Cursor, | ||
40 | Icon_Wps, | 39 | Icon_Wps, |
41 | Icon_Firmware, | 40 | Icon_Firmware, |
42 | Icon_Font, | 41 | Icon_Font, |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index ea71538322..72d752ec55 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -348,7 +348,7 @@ bool recording_screen(void) | |||
348 | 348 | ||
349 | lcd_setfont(FONT_SYSFIXED); | 349 | lcd_setfont(FONT_SYSFIXED); |
350 | lcd_getstringsize("M", &w, &h); | 350 | lcd_getstringsize("M", &w, &h); |
351 | lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); | 351 | lcd_setmargins(0, 8); |
352 | 352 | ||
353 | if(rec_create_directory() > 0) | 353 | if(rec_create_directory() > 0) |
354 | have_recorded = true; | 354 | have_recorded = true; |
@@ -598,7 +598,7 @@ bool recording_screen(void) | |||
598 | update_countdown = 1; /* Update immediately */ | 598 | update_countdown = 1; /* Update immediately */ |
599 | 599 | ||
600 | lcd_setfont(FONT_SYSFIXED); | 600 | lcd_setfont(FONT_SYSFIXED); |
601 | lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); | 601 | lcd_setmargins(0, 8); |
602 | } | 602 | } |
603 | break; | 603 | break; |
604 | #endif | 604 | #endif |
@@ -739,7 +739,7 @@ bool recording_screen(void) | |||
739 | fmt_gain(SOUND_MIC_GAIN, | 739 | fmt_gain(SOUND_MIC_GAIN, |
740 | global_settings.rec_mic_gain, | 740 | global_settings.rec_mic_gain, |
741 | buf2, sizeof(buf2))); | 741 | buf2, sizeof(buf2))); |
742 | if (global_settings.invert_cursor && (pos++ == cursor)) | 742 | if (pos++ == cursor) |
743 | lcd_puts_style(0, 4, buf, STYLE_INVERT); | 743 | lcd_puts_style(0, 4, buf, STYLE_INVERT); |
744 | else | 744 | else |
745 | lcd_puts(0, 4, buf); | 745 | lcd_puts(0, 4, buf); |
@@ -754,7 +754,7 @@ bool recording_screen(void) | |||
754 | snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN), | 754 | snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN), |
755 | fmt_gain(SOUND_LEFT_GAIN, gain, | 755 | fmt_gain(SOUND_LEFT_GAIN, gain, |
756 | buf2, sizeof(buf2))); | 756 | buf2, sizeof(buf2))); |
757 | if (global_settings.invert_cursor && (pos++ == cursor)) | 757 | if (pos++ == cursor) |
758 | lcd_puts_style(0, 4, buf, STYLE_INVERT); | 758 | lcd_puts_style(0, 4, buf, STYLE_INVERT); |
759 | else | 759 | else |
760 | lcd_puts(0, 4, buf); | 760 | lcd_puts(0, 4, buf); |
@@ -763,7 +763,7 @@ bool recording_screen(void) | |||
763 | fmt_gain(SOUND_LEFT_GAIN, | 763 | fmt_gain(SOUND_LEFT_GAIN, |
764 | global_settings.rec_left_gain, | 764 | global_settings.rec_left_gain, |
765 | buf2, sizeof(buf2))); | 765 | buf2, sizeof(buf2))); |
766 | if (global_settings.invert_cursor && (pos++ == cursor)) | 766 | if (pos++ == cursor) |
767 | lcd_puts_style(0, 5, buf, STYLE_INVERT); | 767 | lcd_puts_style(0, 5, buf, STYLE_INVERT); |
768 | else | 768 | else |
769 | lcd_puts(0, 5, buf); | 769 | lcd_puts(0, 5, buf); |
@@ -772,16 +772,13 @@ bool recording_screen(void) | |||
772 | fmt_gain(SOUND_RIGHT_GAIN, | 772 | fmt_gain(SOUND_RIGHT_GAIN, |
773 | global_settings.rec_right_gain, | 773 | global_settings.rec_right_gain, |
774 | buf2, sizeof(buf2))); | 774 | buf2, sizeof(buf2))); |
775 | if (global_settings.invert_cursor && (pos++ == cursor)) | 775 | if (pos++ == cursor) |
776 | lcd_puts_style(0, 6, buf, STYLE_INVERT); | 776 | lcd_puts_style(0, 6, buf, STYLE_INVERT); |
777 | else | 777 | else |
778 | lcd_puts(0, 6, buf); | 778 | lcd_puts(0, 6, buf); |
779 | } | 779 | } |
780 | } | 780 | } |
781 | 781 | ||
782 | if(global_settings.rec_source != SOURCE_SPDIF) | ||
783 | put_cursorxy(0, 4 + cursor, true); | ||
784 | |||
785 | if (global_settings.rec_source != SOURCE_LINE) { | 782 | if (global_settings.rec_source != SOURCE_LINE) { |
786 | snprintf(buf, 32, "%s %s [%d]", | 783 | snprintf(buf, 32, "%s %s [%d]", |
787 | freq_str[global_settings.rec_frequency], | 784 | freq_str[global_settings.rec_frequency], |