summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-09-27 10:18:48 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-09-27 10:18:48 +0000
commitf7c3ffa53797eadb0264eb26efc41d58942379a3 (patch)
tree3ec876a8f9e9447312bcae86b2ca2fd724a0fd3e
parentf11702921fc137fb9eb08b3311bc4264ed6a2fe2 (diff)
downloadrockbox-f7c3ffa53797eadb0264eb26efc41d58942379a3.tar.gz
rockbox-f7c3ffa53797eadb0264eb26efc41d58942379a3.zip
peakmeter is lcd-bitmap only
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2438 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings_menu.c2
-rw-r--r--apps/wps-display.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 643f5be542..3cb270dafe 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -36,7 +36,9 @@
36#include "powermgmt.h" 36#include "powermgmt.h"
37#include "rtc.h" 37#include "rtc.h"
38#include "ata.h" 38#include "ata.h"
39#ifdef HAVE_LCD_BITMAP
39#include "peakmeter.h" 40#include "peakmeter.h"
41#endif
40#include "lang.h" 42#include "lang.h"
41 43
42static bool contrast(void) 44static bool contrast(void)
diff --git a/apps/wps-display.c b/apps/wps-display.c
index a8980855e4..c64a1aa7dd 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -527,7 +527,7 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all)
527 struct format_flags flags; 527 struct format_flags flags;
528 bool scroll_active = false; 528 bool scroll_active = false;
529 int i; 529 int i;
530 530#ifdef HAVE_LCD_BITMAP
531 /* to find out wether the peak meter is enabled we 531 /* to find out wether the peak meter is enabled we
532 assume it wasn't until we find a line that contains 532 assume it wasn't until we find a line that contains
533 the peak meter. We can't use peak_meter_enabled itself 533 the peak meter. We can't use peak_meter_enabled itself
@@ -536,7 +536,7 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all)
536 or sleep is called but who knows...) 536 or sleep is called but who knows...)
537 */ 537 */
538 bool enable_pm = false; 538 bool enable_pm = false;
539 539#endif
540 if (!id3) 540 if (!id3)
541 { 541 {
542 lcd_stop_scroll(); 542 lcd_stop_scroll();
@@ -611,10 +611,11 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all)
611 } 611 }
612 } 612 }
613 } 613 }
614 614#ifdef HAVE_LCD_BITMAP
615 /* Now we know wether the peak meter is used. 615 /* Now we know wether the peak meter is used.
616 So we can enable / disable the peak meter thread */ 616 So we can enable / disable the peak meter thread */
617 peak_meter_enabled = enable_pm; 617 peak_meter_enabled = enable_pm;
618#endif
618 lcd_update(); 619 lcd_update();
619 620
620 return true; 621 return true;