summaryrefslogtreecommitdiffstats
path: root/apps/recorder
diff options
context:
space:
mode:
authorJörg Hohensohn <hohensoh@rockbox.org>2004-09-28 22:13:26 +0000
committerJörg Hohensohn <hohensoh@rockbox.org>2004-09-28 22:13:26 +0000
commit593cc00447af20197a1b7bc009af205a0f065576 (patch)
treef1793614a17b4e654d26b0c95b7842616ed8d919 /apps/recorder
parente6f83b695056d0afd7f76377d9d5fcbc4ac02dbc (diff)
downloadrockbox-593cc00447af20197a1b7bc009af205a0f065576.tar.gz
rockbox-593cc00447af20197a1b7bc009af205a0f065576.zip
a hell of a commit: changed several HAVE_xx configuration flags into multiple choice values (keypad, tuner, CPU, h/w codec)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5126 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder')
-rw-r--r--apps/recorder/keyboard.c4
-rw-r--r--apps/recorder/radio.c8
-rw-r--r--apps/recorder/radio.h2
-rw-r--r--apps/recorder/recording.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index c1bd25e0aa..b1a28c29b4 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -33,7 +33,7 @@
#define KEYBOARD_LINES 4
#define KEYBOARD_PAGES 3
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
static void kbd_setupkeys(const char* line[KEYBOARD_LINES], int page)
{
switch (page) {
@@ -77,7 +77,7 @@ void kbd_spellchar(char c)
int kbd_input(char* text, int buflen)
{
-#ifndef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD != RECORDER_PAD
(void)text;
(void)buflen;
splash(HZ*2, true, "Keyboard not implemented yet");
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index c163cc4552..3d03dc30c9 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -48,7 +48,7 @@
#include "recording.h"
#include "talk.h"
-#ifdef HAVE_FMRADIO
+#ifdef CONFIG_TUNER
#define MAX_FREQ (108000000)
#define MIN_FREQ (87500000)
@@ -167,7 +167,7 @@ static void remember_frequency(void)
bool radio_screen(void)
{
-#ifndef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD != RECORDER_PAD
splash(HZ*2, true, "Radio not supported yet");
return false;
#else
@@ -668,7 +668,7 @@ static bool radio_add_preset(void)
static int handle_radio_presets_menu_cb(int key, int m)
{
(void)m;
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
switch(key)
{
case BUTTON_F3:
@@ -732,7 +732,7 @@ bool handle_radio_presets_menu(void)
int handle_radio_presets_cb(int key, int m)
{
-#ifdef HAVE_ONDIO_KEYPAD
+#if CONFIG_KEYPAD == ONDIO_PAD
(void)key;
(void)m;
return BUTTON_NONE;
diff --git a/apps/recorder/radio.h b/apps/recorder/radio.h
index 5ddbf13d6b..76a4af3b9f 100644
--- a/apps/recorder/radio.h
+++ b/apps/recorder/radio.h
@@ -19,7 +19,7 @@
#ifndef RADIO_H
#define RADIO_H
-#ifdef HAVE_FMRADIO
+#ifdef CONFIG_TUNER
bool radio_screen(void);
void radio_stop(void);
bool radio_hardware_present(void);
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 3a2505b6ae..98c2b27008 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -166,7 +166,7 @@ int rec_create_directory(void)
bool recording_screen(void)
{
-#ifndef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD != RECORDER_PAD
splash(HZ*2, true, "Recording not supported yet");
return false;
#else
@@ -625,7 +625,7 @@ bool recording_screen(void)
#endif
}
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
bool f2_rec_screen(void)
{
bool exit = false;