summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-04-27 04:00:48 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-04-27 04:00:48 +0000
commit82e97363f1f7b1f0e534849925b7145f28deed8b (patch)
treedc021a37ab2b1e9aa7b94c06f680971818194580 /apps
parenta089b00ea00dd2dce017f5e16b9b62bae2d8c665 (diff)
downloadrockbox-82e97363f1f7b1f0e534849925b7145f28deed8b.tar.gz
rockbox-82e97363f1f7b1f0e534849925b7145f28deed8b.tar.bz2
rockbox-82e97363f1f7b1f0e534849925b7145f28deed8b.zip
Get rid of a committed #define from kernel.h that didn't make the final cut. Put voice_wait in voice_thread.h where it ought.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29787 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/misc.c3
-rw-r--r--apps/playback.h1
-rw-r--r--apps/voice_thread.h1
3 files changed, 4 insertions, 1 deletions
diff --git a/apps/misc.c b/apps/misc.c
index e4a5c42d0d..55fd7f5f51 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -83,6 +83,9 @@
#include "bookmark.h"
#include "wps.h"
#include "playback.h"
+#if CONFIG_CODEC == SWCODEC
+#include "voice_thread.h"
+#endif
#ifdef BOOTFILE
#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) \
diff --git a/apps/playback.h b/apps/playback.h
index 225946cfaf..ea8718089f 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -70,7 +70,6 @@ struct bufopen_bitmap_data {
#endif
/* Functions */
-void voice_wait(void);
bool audio_is_thread_ready(void);
int audio_track_count(void);
long audio_filebufused(void);
diff --git a/apps/voice_thread.h b/apps/voice_thread.h
index 0d13ac293e..4359825dd7 100644
--- a/apps/voice_thread.h
+++ b/apps/voice_thread.h
@@ -27,6 +27,7 @@ void mp3_play_stop(void);
void mp3_play_pause(bool play);
bool mp3_is_playing(void);
+void voice_wait(void);
void voice_stop(void);
void voice_thread_init(void);
void voice_thread_resume(void);