diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-09-06 20:48:28 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-09-06 20:48:28 +0000 |
| commit | 8fd5b177ede6e3fb76e1e5695729a10732d46fd9 (patch) | |
| tree | 5cea7e41ba6043fcf625ea5995e6b42cc5a07f4b /apps | |
| parent | cff7b0614b1565fb4e5dc49010687aad91fc87d2 (diff) | |
Ondio FM: Removed S/PDIF option for recording source, as the Ondio doesn't have S/PDIF input. Bumped config block version so save your settings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7482 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/recorder/recording.c | 16 | ||||
| -rw-r--r-- | apps/settings.c | 9 | ||||
| -rw-r--r-- | apps/sound_menu.c | 8 |
3 files changed, 22 insertions, 11 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index e6bb833584..007ac8dc9d 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -93,9 +93,14 @@ bool f2_rec_screen(void); bool f3_rec_screen(void); -#define SOURCE_MIC 0 -#define SOURCE_LINE 1 +#define SOURCE_MIC 0 +#define SOURCE_LINE 1 +#ifdef HAVE_SPDIF_IN #define SOURCE_SPDIF 2 +#define MAX_SOURCE SOURCE_SPDIF +#else +#define MAX_SOURCE SOURCE_LINE +#endif #define MAX_FILE_SIZE 0x7FF00000 /* 2 GB - 1 MB */ @@ -699,8 +704,7 @@ bool recording_screen(void) last_seconds = 0; } - /* Show mic gain if input source is Mic */ - if(global_settings.rec_source == 0) + if(global_settings.rec_source == SOURCE_MIC) { snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN), fmt_gain(SOUND_MIC_GAIN, @@ -746,7 +750,9 @@ bool recording_screen(void) } } +#ifdef SOURCE_SPDIF if(global_settings.rec_source != SOURCE_SPDIF) +#endif put_cursorxy(0, 4 + cursor, true); if (global_settings.rec_source != SOURCE_LINE) { @@ -987,7 +993,7 @@ bool f3_rec_screen(void) case BUTTON_LEFT: case BUTTON_F3 | BUTTON_LEFT: global_settings.rec_source++; - if(global_settings.rec_source > 2) + if(global_settings.rec_source > MAX_SOURCE) global_settings.rec_source = 0; used = true; break; diff --git a/apps/settings.c b/apps/settings.c index 4090714de0..650a957d6e 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -78,7 +78,7 @@ const char rec_base_directory[] = REC_BASE_DIR; #include "pcm_playback.h" #endif -#define CONFIG_BLOCK_VERSION 26 +#define CONFIG_BLOCK_VERSION 27 #define CONFIG_BLOCK_SIZE 512 #define RTC_BLOCK_SIZE 44 @@ -364,8 +364,11 @@ static const struct bit_entry hd_bits[] = {1, S_O(rec_channels), 0, "rec channels", "stereo,mono" }, {4, S_O(rec_mic_gain), 8, "rec mic gain", NULL }, {3, S_O(rec_quality), 5, "rec quality", NULL }, - {2, S_O(rec_source), 0, /* 0=mic */ - "rec source", "mic,line,spdif" }, +#ifdef HAVE_SPDIF_IN + {2, S_O(rec_source), 0 /* 0=mic */, "rec source", "mic,line,spdif" }, +#else + {1, S_O(rec_source), 0 /* 0=mic */, "rec source", "mic,line" }, +#endif {3, S_O(rec_frequency), 0, /* 0=44.1kHz */ "rec frequency", "44,48,32,22,24,16" }, {4, S_O(rec_left_gain), 2, /* 0dB */ diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 0fcf79492c..9d06f05694 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c @@ -255,11 +255,13 @@ static bool recsource(void) static const struct opt_items names[] = { { STR(LANG_RECORDING_SRC_MIC) }, { STR(LANG_RECORDING_SRC_LINE) }, - { STR(LANG_RECORDING_SRC_DIGITAL) } +#ifdef HAVE_SPDIF_IN + { STR(LANG_RECORDING_SRC_DIGITAL) }, +#endif }; return set_option(str(LANG_RECORDING_SOURCE), - &global_settings.rec_source, INT, - names, 3, NULL ); + &global_settings.rec_source, INT, names, + sizeof(names)/sizeof(struct opt_items), NULL ); } static bool recfrequency(void) |