summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-06-29 07:06:10 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-06-29 07:06:10 +0000
commit7996d6d3f99ad80385fdc85438d23139e5569d3c (patch)
tree3643a9d5397d268bc02d67ccf82c8d0ceba32afa /apps
parenta2b6703a369f6cdbfec1f150c408dadc877631fb (diff)
downloadrockbox-7996d6d3f99ad80385fdc85438d23139e5569d3c.tar.gz
rockbox-7996d6d3f99ad80385fdc85438d23139e5569d3c.zip
Knock out at least some red/yellow from r30097.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30098 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/misc.c2
-rw-r--r--apps/plugin.c3
-rw-r--r--apps/plugin.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/apps/misc.c b/apps/misc.c
index a0817d7e27..dfee05fb5a 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -264,7 +264,9 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
264#endif 264#endif
265 { 265 {
266 bool batt_safe = battery_level_safe(); 266 bool batt_safe = battery_level_safe();
267#if CONFIG_CODEC != SWCODEC || defined(HAVE_RECORDING)
267 int audio_stat = audio_status(); 268 int audio_stat = audio_status();
269#endif
268 270
269 FOR_NB_SCREENS(i) 271 FOR_NB_SCREENS(i)
270 { 272 {
diff --git a/apps/plugin.c b/apps/plugin.c
index 10cb9263a4..bfb7f0e9c1 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -778,9 +778,10 @@ static const struct plugin_api rockbox_api = {
778 778
779 /* new stuff at the end, sort into place next time 779 /* new stuff at the end, sort into place next time
780 the API gets incompatible */ 780 the API gets incompatible */
781 781#if CONFIG_CODEC == SWCODEC
782 mixer_channel_status, 782 mixer_channel_status,
783 mixer_channel_get_buffer, 783 mixer_channel_get_buffer,
784#endif
784}; 785};
785 786
786int plugin_load(const char* plugin, const void* parameter) 787int plugin_load(const char* plugin, const void* parameter)
diff --git a/apps/plugin.h b/apps/plugin.h
index 113296c19a..aa39829daf 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -908,8 +908,10 @@ struct plugin_api {
908 908
909 /* new stuff at the end, sort into place next time 909 /* new stuff at the end, sort into place next time
910 the API gets incompatible */ 910 the API gets incompatible */
911#if CONFIG_CODEC == SWCODEC
911 enum channel_status (*mixer_channel_status)(enum pcm_mixer_channel channel); 912 enum channel_status (*mixer_channel_status)(enum pcm_mixer_channel channel);
912 void * (*mixer_channel_get_buffer)(enum pcm_mixer_channel channel, int *count); 913 void * (*mixer_channel_get_buffer)(enum pcm_mixer_channel channel, int *count);
914#endif
913}; 915};
914 916
915/* plugin header */ 917/* plugin header */