summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Guay <marcguay@rockbox.org>2008-07-14 06:17:40 +0000
committerMarc Guay <marcguay@rockbox.org>2008-07-14 06:17:40 +0000
commit37400f8d4decf2d5aee5abe5a1a08a1ec024306f (patch)
tree74b495d68587ba79d7bbdade838b9317e0a87747
parent4bcd54e75a98e4c4d90b76c19de6f22372b5089b (diff)
downloadrockbox-37400f8d4decf2d5aee5abe5a1a08a1ec024306f.zip
rockbox-37400f8d4decf2d5aee5abe5a1a08a1ec024306f.tar.gz
rockbox-37400f8d4decf2d5aee5abe5a1a08a1ec024306f.tar.bz2
rockbox-37400f8d4decf2d5aee5abe5a1a08a1ec024306f.tar.xz
Revert most of r18029 as recording through line-in is possible on the H10, just not currently functional. Leave the /nopt for line-in on the Sansas.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18030 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config-h10.h2
-rw-r--r--firmware/export/config-h10_5gb.h2
-rw-r--r--manual/configure_rockbox/recording_settings.tex2
3 files changed, 3 insertions, 3 deletions
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h
index 9b63072..071fb0f 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config-h10.h
@@ -15,7 +15,7 @@
#define HAVE_RECORDING
/* Define bitmask of input sources - recordable bitmask can be defined
explicitly if different */
-#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO)
+#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO)
/* define the bitmask of hardware sample rates */
#define HW_SAMPR_CAPS (SAMPR_CAP_44)
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h
index 9ef59ec..e7c77e4 100644
--- a/firmware/export/config-h10_5gb.h
+++ b/firmware/export/config-h10_5gb.h
@@ -15,7 +15,7 @@
#define HAVE_RECORDING
/* Define bitmask of input sources - recordable bitmask can be defined
explicitly if different */
-#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO)
+#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO)
/* define the bitmask of hardware sample rates */
#define HW_SAMPR_CAPS (SAMPR_CAP_44)
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index dcaad47..4607f0f 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -73,7 +73,7 @@
Choose the source of the recording. The options are:
\opt{recorder,recorderv2fm,h1xx}{\setting{SPDIF (digital)}, }%
\nopt{ipodnano,ipodvideo}{\setting{Mic}, }%
- \nopt{sansa,IRIVER_H10_PAD}{{\setting{Line In}}}. %
+ \nopt{sansa}{{\setting{Line In}}}. %
\opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
\section{Channels}