Straighten out some audio path APIs and misc. audio stuff. Having recording is not a prerequisite to having input/output source selection which is probably most useful when adding a audio input features like FM to a new port without forcing recording to be implemented first.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13599 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 6 insertions, 6 deletions

diff --git a/firmware/target/coldfire/iriver/audio-iriver.c b/firmware/target/coldfire/iriver/audio-iriver.c
index bd071430b2..4d22e7c987 100644
--- a/firmware/target/coldfire/iriver/audio-iriver.c
+++ b/firmware/target/coldfire/iriver/audio-iriver.c
@@ -44,7 +44,7 @@ void audio_set_output_source(int source)
     set_irq_level(level);
 } /* audio_set_output_source */
 
-void audio_set_source(int source, unsigned flags)
+void audio_input_mux(int source, unsigned flags)
 {
     /* Prevent pops from unneeded switching */
     static int last_source = AUDIO_SRC_PLAYBACK;
@@ -131,6 +131,4 @@ void audio_set_source(int source, unsigned flags)
     or_l(MUX_BIT, &GPIO_FUNCTION);
 
     last_source = source;
-} /* audio_set_source */
-
-
+} /* audio_input_mux */
diff --git a/firmware/target/coldfire/iriver/h100/power-h100.c b/firmware/target/coldfire/iriver/h100/power-h100.c
index ce1c350802..943168967f 100644
--- a/firmware/target/coldfire/iriver/h100/power-h100.c
+++ b/firmware/target/coldfire/iriver/h100/power-h100.c
@@ -89,7 +89,8 @@ void spdif_power_enable(bool on)
 
 #ifndef BOOTLOADER
     /* Make sure the feed is reset */
-    spdif_set_output_source(spdif_get_output_source(NULL), true);
+    spdif_set_output_source(spdif_get_output_source(NULL)
+        IF_SPDIF_POWER_(, true));
 #endif
 }
 
diff --git a/firmware/target/coldfire/iriver/h100/spdif-h100.c b/firmware/target/coldfire/iriver/h100/spdif-h100.c
index ee4a9402ea..beede3fdce 100644
--- a/firmware/target/coldfire/iriver/h100/spdif-h100.c
+++ b/firmware/target/coldfire/iriver/h100/spdif-h100.c
@@ -33,7 +33,8 @@ void spdif_init(void)
 {
     /* PHASECONFIG setup: gain = 3*2^13, source = EBUIN */
     PHASECONFIG = (6 << 3) | (4 << 0);
-    spdif_set_output_source(AUDIO_SRC_PLAYBACK, true);
+    spdif_set_output_source(AUDIO_SRC_PLAYBACK
+        IF_SPDIF_POWER_(, true));
 }
 
 /* Return the S/PDIF frequency in herz - unrounded */