From 6c2af7c2aa8afde380b5a5f7c606c49dd38bef18 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Thu, 1 Sep 2005 08:04:37 +0000 Subject: On popular demand, the arrow cursor is reintroduced git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7438 a1c6a512-1295-4272-9138-f99709370657 --- apps/recorder/icons.c | 1 + apps/recorder/icons.h | 1 + apps/recorder/recording.c | 15 +++++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'apps/recorder') diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 4d1d2908c4..148235f040 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c @@ -39,6 +39,7 @@ const unsigned char bitmap_icons_6x8[LastIcon][6] = { 0x60, 0x7f, 0x03, 0x33, 0x3f, 0x00 }, /* Musical note */ { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, /* Folder */ { 0x55, 0x00, 0x55, 0x55, 0x55, 0x55 }, /* Playlist */ + { 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00 }, /* Cursor / Marker */ { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x55 }, /* WPS file */ { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, /* Mod or ajz file */ { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, /* Font file */ diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 5c442ea371..17605ef490 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h @@ -36,6 +36,7 @@ enum icons_6x8 { Icon_Audio, Icon_Folder, Icon_Playlist, + Icon_Cursor, Icon_Wps, Icon_Firmware, Icon_Font, diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 72d752ec55..ea71538322 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -348,7 +348,7 @@ bool recording_screen(void) lcd_setfont(FONT_SYSFIXED); lcd_getstringsize("M", &w, &h); - lcd_setmargins(0, 8); + lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); if(rec_create_directory() > 0) have_recorded = true; @@ -598,7 +598,7 @@ bool recording_screen(void) update_countdown = 1; /* Update immediately */ lcd_setfont(FONT_SYSFIXED); - lcd_setmargins(0, 8); + lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); } break; #endif @@ -739,7 +739,7 @@ bool recording_screen(void) fmt_gain(SOUND_MIC_GAIN, global_settings.rec_mic_gain, buf2, sizeof(buf2))); - if (pos++ == cursor) + if (global_settings.invert_cursor && (pos++ == cursor)) lcd_puts_style(0, 4, buf, STYLE_INVERT); else lcd_puts(0, 4, buf); @@ -754,7 +754,7 @@ bool recording_screen(void) snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN), fmt_gain(SOUND_LEFT_GAIN, gain, buf2, sizeof(buf2))); - if (pos++ == cursor) + if (global_settings.invert_cursor && (pos++ == cursor)) lcd_puts_style(0, 4, buf, STYLE_INVERT); else lcd_puts(0, 4, buf); @@ -763,7 +763,7 @@ bool recording_screen(void) fmt_gain(SOUND_LEFT_GAIN, global_settings.rec_left_gain, buf2, sizeof(buf2))); - if (pos++ == cursor) + if (global_settings.invert_cursor && (pos++ == cursor)) lcd_puts_style(0, 5, buf, STYLE_INVERT); else lcd_puts(0, 5, buf); @@ -772,13 +772,16 @@ bool recording_screen(void) fmt_gain(SOUND_RIGHT_GAIN, global_settings.rec_right_gain, buf2, sizeof(buf2))); - if (pos++ == cursor) + if (global_settings.invert_cursor && (pos++ == cursor)) lcd_puts_style(0, 6, buf, STYLE_INVERT); else lcd_puts(0, 6, buf); } } + if(global_settings.rec_source != SOURCE_SPDIF) + put_cursorxy(0, 4 + cursor, true); + if (global_settings.rec_source != SOURCE_LINE) { snprintf(buf, 32, "%s %s [%d]", freq_str[global_settings.rec_frequency], -- cgit v1.2.3