summaryrefslogtreecommitdiff
path: root/apps/recorder
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2007-12-07 00:07:30 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2007-12-07 00:07:30 +0000
commita007b558b3d088644e2b2b38fa51c52cae14007d (patch)
treed681881ca33ab4db9458419048dcbdb9b96ef01d /apps/recorder
parentdfc6093342736a1655269b635f306d8ddecccd81 (diff)
downloadrockbox-a007b558b3d088644e2b2b38fa51c52cae14007d.tar.gz
rockbox-a007b558b3d088644e2b2b38fa51c52cae14007d.zip
Fix gradient selection bar in recording screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15888 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder')
-rw-r--r--apps/recorder/recording.c32
1 files changed, 29 insertions, 3 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 8adf5af567..069c689321 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -873,13 +873,14 @@ bool recording_screen(bool no_source)
873 ID2P(LANG_GIGABYTE) 873 ID2P(LANG_GIGABYTE)
874 }; 874 };
875 875
876 int style = STYLE_INVERT; 876 int base_style = STYLE_INVERT;
877 int style;
877#ifdef HAVE_LCD_COLOR 878#ifdef HAVE_LCD_COLOR
878 if (global_settings.cursor_style == 2) { 879 if (global_settings.cursor_style == 2) {
879 style |= STYLE_COLORBAR; 880 base_style |= STYLE_COLORBAR;
880 } 881 }
881 else if (global_settings.cursor_style == 3) { 882 else if (global_settings.cursor_style == 3) {
882 style |= STYLE_GRADIENT | 1; 883 base_style |= STYLE_GRADIENT;
883 } 884 }
884#endif 885#endif
885 886
@@ -1454,6 +1455,14 @@ bool recording_screen(bool no_source)
1454 for(i = 0; i < screen_update; i++) 1455 for(i = 0; i < screen_update; i++)
1455 screens[i].clear_display(); 1456 screens[i].clear_display();
1456 1457
1458 style = base_style;
1459
1460#ifdef HAVE_LCD_COLOR
1461 /* special action for gradient - set default for 1 line gradient */
1462 if(global_settings.cursor_style == 3)
1463 style = base_style | CURLN_PACK(0) | NUMLN_PACK(1);
1464#endif /* HAVE_LCD_COLOR */
1465
1457#if CONFIG_CODEC == SWCODEC 1466#if CONFIG_CODEC == SWCODEC
1458 if ((audio_stat & AUDIO_STATUS_WARNING) 1467 if ((audio_stat & AUDIO_STATUS_WARNING)
1459 && (warning_counter++ % WARNING_PERIOD) < WARNING_PERIOD/2) 1468 && (warning_counter++ % WARNING_PERIOD) < WARNING_PERIOD/2)
@@ -1622,6 +1631,12 @@ bool recording_screen(bool no_source)
1622 fmt_gain(SOUND_LEFT_GAIN, 1631 fmt_gain(SOUND_LEFT_GAIN,
1623 global_settings.rec_left_gain, 1632 global_settings.rec_left_gain,
1624 buf2, sizeof(buf2))); 1633 buf2, sizeof(buf2)));
1634#ifdef HAVE_LCD_COLOR
1635 /* special action for gradient - double line gradient - line1 */
1636 if((global_settings.cursor_style == 3) &&
1637 (1==cursor))
1638 style = base_style | CURLN_PACK(0) | NUMLN_PACK(2);
1639#endif /* HAVE_LCD_COLOR */
1625 if(global_settings.cursor_style && ((1==cursor)||(2==cursor))) 1640 if(global_settings.cursor_style && ((1==cursor)||(2==cursor)))
1626 { 1641 {
1627 for(i = 0; i < screen_update; i++) 1642 for(i = 0; i < screen_update; i++)
@@ -1640,6 +1655,12 @@ bool recording_screen(bool no_source)
1640 fmt_gain(SOUND_RIGHT_GAIN, 1655 fmt_gain(SOUND_RIGHT_GAIN,
1641 global_settings.rec_right_gain, 1656 global_settings.rec_right_gain,
1642 buf2, sizeof(buf2))); 1657 buf2, sizeof(buf2)));
1658#ifdef HAVE_LCD_COLOR
1659 /* special action for gradient - double line gradient - line2 */
1660 if((global_settings.cursor_style == 3) &&
1661 (1==cursor))
1662 style = base_style | CURLN_PACK(1) | NUMLN_PACK(2);
1663#endif /* HAVE_LCD_COLOR */
1643 if(global_settings.cursor_style && ((1==cursor)||(3==cursor))) 1664 if(global_settings.cursor_style && ((1==cursor)||(3==cursor)))
1644 { 1665 {
1645 for(i = 0; i < screen_update; i++) 1666 for(i = 0; i < screen_update; i++)
@@ -1653,6 +1674,11 @@ bool recording_screen(bool no_source)
1653 PM_HEIGHT + 4, buf); 1674 PM_HEIGHT + 4, buf);
1654 } 1675 }
1655 } 1676 }
1677#ifdef HAVE_LCD_COLOR
1678 /* special action for gradient - back to single line gradient */
1679 if(global_settings.cursor_style == 3)
1680 style = base_style | CURLN_PACK(0) | NUMLN_PACK(1);
1681#endif /* HAVE_LCD_COLOR */
1656 1682
1657 FOR_NB_SCREENS(i) 1683 FOR_NB_SCREENS(i)
1658 { 1684 {