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 | |
parent | cff7b0614b1565fb4e5dc49010687aad91fc87d2 (diff) | |
download | rockbox-8fd5b177ede6e3fb76e1e5695729a10732d46fd9.tar.gz rockbox-8fd5b177ede6e3fb76e1e5695729a10732d46fd9.zip |
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
-rw-r--r-- | apps/recorder/recording.c | 16 | ||||
-rw-r--r-- | apps/settings.c | 9 | ||||
-rw-r--r-- | apps/sound_menu.c | 8 | ||||
-rw-r--r-- | firmware/export/config-fmrecorder.h | 3 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 3 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 3 |
6 files changed, 31 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 @@ | |||
93 | bool f2_rec_screen(void); | 93 | bool f2_rec_screen(void); |
94 | bool f3_rec_screen(void); | 94 | bool f3_rec_screen(void); |
95 | 95 | ||
96 | #define SOURCE_MIC 0 | 96 | #define SOURCE_MIC 0 |
97 | #define SOURCE_LINE 1 | 97 | #define SOURCE_LINE 1 |
98 | #ifdef HAVE_SPDIF_IN | ||
98 | #define SOURCE_SPDIF 2 | 99 | #define SOURCE_SPDIF 2 |
100 | #define MAX_SOURCE SOURCE_SPDIF | ||
101 | #else | ||
102 | #define MAX_SOURCE SOURCE_LINE | ||
103 | #endif | ||
99 | 104 | ||
100 | #define MAX_FILE_SIZE 0x7FF00000 /* 2 GB - 1 MB */ | 105 | #define MAX_FILE_SIZE 0x7FF00000 /* 2 GB - 1 MB */ |
101 | 106 | ||
@@ -699,8 +704,7 @@ bool recording_screen(void) | |||
699 | last_seconds = 0; | 704 | last_seconds = 0; |
700 | } | 705 | } |
701 | 706 | ||
702 | /* Show mic gain if input source is Mic */ | 707 | if(global_settings.rec_source == SOURCE_MIC) |
703 | if(global_settings.rec_source == 0) | ||
704 | { | 708 | { |
705 | snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN), | 709 | snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN), |
706 | fmt_gain(SOUND_MIC_GAIN, | 710 | fmt_gain(SOUND_MIC_GAIN, |
@@ -746,7 +750,9 @@ bool recording_screen(void) | |||
746 | } | 750 | } |
747 | } | 751 | } |
748 | 752 | ||
753 | #ifdef SOURCE_SPDIF | ||
749 | if(global_settings.rec_source != SOURCE_SPDIF) | 754 | if(global_settings.rec_source != SOURCE_SPDIF) |
755 | #endif | ||
750 | put_cursorxy(0, 4 + cursor, true); | 756 | put_cursorxy(0, 4 + cursor, true); |
751 | 757 | ||
752 | if (global_settings.rec_source != SOURCE_LINE) { | 758 | if (global_settings.rec_source != SOURCE_LINE) { |
@@ -987,7 +993,7 @@ bool f3_rec_screen(void) | |||
987 | case BUTTON_LEFT: | 993 | case BUTTON_LEFT: |
988 | case BUTTON_F3 | BUTTON_LEFT: | 994 | case BUTTON_F3 | BUTTON_LEFT: |
989 | global_settings.rec_source++; | 995 | global_settings.rec_source++; |
990 | if(global_settings.rec_source > 2) | 996 | if(global_settings.rec_source > MAX_SOURCE) |
991 | global_settings.rec_source = 0; | 997 | global_settings.rec_source = 0; |
992 | used = true; | 998 | used = true; |
993 | break; | 999 | 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; | |||
78 | #include "pcm_playback.h" | 78 | #include "pcm_playback.h" |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | #define CONFIG_BLOCK_VERSION 26 | 81 | #define CONFIG_BLOCK_VERSION 27 |
82 | #define CONFIG_BLOCK_SIZE 512 | 82 | #define CONFIG_BLOCK_SIZE 512 |
83 | #define RTC_BLOCK_SIZE 44 | 83 | #define RTC_BLOCK_SIZE 44 |
84 | 84 | ||
@@ -364,8 +364,11 @@ static const struct bit_entry hd_bits[] = | |||
364 | {1, S_O(rec_channels), 0, "rec channels", "stereo,mono" }, | 364 | {1, S_O(rec_channels), 0, "rec channels", "stereo,mono" }, |
365 | {4, S_O(rec_mic_gain), 8, "rec mic gain", NULL }, | 365 | {4, S_O(rec_mic_gain), 8, "rec mic gain", NULL }, |
366 | {3, S_O(rec_quality), 5, "rec quality", NULL }, | 366 | {3, S_O(rec_quality), 5, "rec quality", NULL }, |
367 | {2, S_O(rec_source), 0, /* 0=mic */ | 367 | #ifdef HAVE_SPDIF_IN |
368 | "rec source", "mic,line,spdif" }, | 368 | {2, S_O(rec_source), 0 /* 0=mic */, "rec source", "mic,line,spdif" }, |
369 | #else | ||
370 | {1, S_O(rec_source), 0 /* 0=mic */, "rec source", "mic,line" }, | ||
371 | #endif | ||
369 | {3, S_O(rec_frequency), 0, /* 0=44.1kHz */ | 372 | {3, S_O(rec_frequency), 0, /* 0=44.1kHz */ |
370 | "rec frequency", "44,48,32,22,24,16" }, | 373 | "rec frequency", "44,48,32,22,24,16" }, |
371 | {4, S_O(rec_left_gain), 2, /* 0dB */ | 374 | {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) | |||
255 | static const struct opt_items names[] = { | 255 | static const struct opt_items names[] = { |
256 | { STR(LANG_RECORDING_SRC_MIC) }, | 256 | { STR(LANG_RECORDING_SRC_MIC) }, |
257 | { STR(LANG_RECORDING_SRC_LINE) }, | 257 | { STR(LANG_RECORDING_SRC_LINE) }, |
258 | { STR(LANG_RECORDING_SRC_DIGITAL) } | 258 | #ifdef HAVE_SPDIF_IN |
259 | { STR(LANG_RECORDING_SRC_DIGITAL) }, | ||
260 | #endif | ||
259 | }; | 261 | }; |
260 | return set_option(str(LANG_RECORDING_SOURCE), | 262 | return set_option(str(LANG_RECORDING_SOURCE), |
261 | &global_settings.rec_source, INT, | 263 | &global_settings.rec_source, INT, names, |
262 | names, 3, NULL ); | 264 | sizeof(names)/sizeof(struct opt_items), NULL ); |
263 | } | 265 | } |
264 | 266 | ||
265 | static bool recfrequency(void) | 267 | static bool recfrequency(void) |
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index b30b1a4332..0df6579a92 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -86,6 +86,9 @@ | |||
86 | /* define this if the unit can be powered or charged via USB */ | 86 | /* define this if the unit can be powered or charged via USB */ |
87 | #define HAVE_USB_POWER | 87 | #define HAVE_USB_POWER |
88 | 88 | ||
89 | /* Define this for S/PDIF input available */ | ||
90 | #define HAVE_SPDIF_IN | ||
91 | |||
89 | #define CONFIG_LCD LCD_SSD1815 | 92 | #define CONFIG_LCD LCD_SSD1815 |
90 | 93 | ||
91 | #define BOOTFILE_EXT "ajz" | 94 | #define BOOTFILE_EXT "ajz" |
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 5d77ae6f09..1874ce192b 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -77,6 +77,9 @@ | |||
77 | /* Define this for S/PDIF output available */ | 77 | /* Define this for S/PDIF output available */ |
78 | #define HAVE_SPDIF_OUT | 78 | #define HAVE_SPDIF_OUT |
79 | 79 | ||
80 | /* Define this for S/PDIF input available */ | ||
81 | #define HAVE_SPDIF_IN | ||
82 | |||
80 | #define CONFIG_LCD LCD_SSD1815 | 83 | #define CONFIG_LCD LCD_SSD1815 |
81 | 84 | ||
82 | #define BOOTFILE_EXT "ajz" | 85 | #define BOOTFILE_EXT "ajz" |
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index a4179c6da4..74ac021c42 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -86,6 +86,9 @@ | |||
86 | /* define this if the unit can be powered or charged via USB */ | 86 | /* define this if the unit can be powered or charged via USB */ |
87 | #define HAVE_USB_POWER | 87 | #define HAVE_USB_POWER |
88 | 88 | ||
89 | /* Define this for S/PDIF input available */ | ||
90 | #define HAVE_SPDIF_IN | ||
91 | |||
89 | #define CONFIG_LCD LCD_SSD1815 | 92 | #define CONFIG_LCD LCD_SSD1815 |
90 | 93 | ||
91 | #define BOOTFILE_EXT "ajz" | 94 | #define BOOTFILE_EXT "ajz" |