diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-06-08 23:42:04 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-06-08 23:42:04 +0000 |
commit | 2d48d0ffa6baddd19e6ff077f25068f90af7be3d (patch) | |
tree | 68c80646a748496fee423d77aa43afafb783b269 /firmware/target/arm | |
parent | a85793fc54a0079f5483d5a5c6c60b7d17ca688c (diff) | |
download | rockbox-2d48d0ffa6baddd19e6ff077f25068f90af7be3d.tar.gz rockbox-2d48d0ffa6baddd19e6ff077f25068f90af7be3d.zip |
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
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/audio-pp.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/audio-e200.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/firmware/target/arm/audio-pp.c b/firmware/target/arm/audio-pp.c index 91670cb015..9fff197520 100644 --- a/firmware/target/arm/audio-pp.c +++ b/firmware/target/arm/audio-pp.c | |||
@@ -29,7 +29,7 @@ void audio_set_output_source(int source) | |||
29 | source = AUDIO_SRC_PLAYBACK; | 29 | source = AUDIO_SRC_PLAYBACK; |
30 | } /* audio_set_output_source */ | 30 | } /* audio_set_output_source */ |
31 | 31 | ||
32 | void audio_set_source(int source, unsigned flags) | 32 | void audio_input_mux(int source, unsigned flags) |
33 | { | 33 | { |
34 | (void)flags; | 34 | (void)flags; |
35 | /* Prevent pops from unneeded switching */ | 35 | /* Prevent pops from unneeded switching */ |
@@ -87,6 +87,6 @@ void audio_set_source(int source, unsigned flags) | |||
87 | } /* end switch */ | 87 | } /* end switch */ |
88 | 88 | ||
89 | last_source = source; | 89 | last_source = source; |
90 | } /* audio_set_source */ | 90 | } /* audio_input_mux */ |
91 | 91 | ||
92 | 92 | ||
diff --git a/firmware/target/arm/sandisk/sansa-e200/audio-e200.c b/firmware/target/arm/sandisk/sansa-e200/audio-e200.c index f046f0db99..0c3db7b87b 100644 --- a/firmware/target/arm/sandisk/sansa-e200/audio-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/audio-e200.c | |||
@@ -39,7 +39,7 @@ void audio_set_output_source(int source) | |||
39 | set_fiq_status(oldmode); | 39 | set_fiq_status(oldmode); |
40 | } /* audio_set_output_source */ | 40 | } /* audio_set_output_source */ |
41 | 41 | ||
42 | void audio_set_source(int source, unsigned flags) | 42 | void audio_input_mux(int source, unsigned flags) |
43 | { | 43 | { |
44 | static int last_source = AUDIO_SRC_PLAYBACK; | 44 | static int last_source = AUDIO_SRC_PLAYBACK; |
45 | static bool last_recording = false; | 45 | static bool last_recording = false; |
@@ -89,6 +89,4 @@ void audio_set_source(int source, unsigned flags) | |||
89 | } /* end switch */ | 89 | } /* end switch */ |
90 | 90 | ||
91 | last_source = source; | 91 | last_source = source; |
92 | } /* audio_set_source */ | 92 | } /* audio_input_mux */ |
93 | |||
94 | |||