diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-04-04 12:06:29 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-04-04 12:06:29 +0000 |
| commit | 8a237a829e0f63b61536f315209a6d0ea1477e31 (patch) | |
| tree | 1fe54329fe776aa7bc982a37203cb61c13244a48 /apps/talk.c | |
| parent | ec4e9b8d600c53add3c8bf6eb7fe1975dba141a7 (diff) | |
More audio code restructuring, mostly renaming functions so far
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6246 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/talk.c')
| -rw-r--r-- | apps/talk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/talk.c b/apps/talk.c index 6fb75c2601..2b97629d55 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -28,7 +28,7 @@ #include "system.h" #include "settings.h" #include "mp3_playback.h" -#include "mpeg.h" +#include "audio.h" #include "lang.h" #include "talk.h" #include "id3.h" @@ -432,7 +432,7 @@ int talk_id(long id, bool enqueue) unsigned char* clipbuf; int unit; - if (mpeg_status()) /* busy, buffer in use */ + if (audio_status()) /* busy, buffer in use */ return -1; if (p_voicefile == NULL && has_voicefile) @@ -471,7 +471,7 @@ int talk_file(const char* filename, bool enqueue) int size; struct mp3entry info; - if (mpeg_status()) /* busy, buffer in use */ + if (audio_status()) /* busy, buffer in use */ return -1; if (p_thumbnail == NULL || size_for_thumbnail <= 0) @@ -512,7 +512,7 @@ int talk_number(long n, bool enqueue) int level = 0; /* mille count */ long mil = 1000000000; /* highest possible "-illion" */ - if (mpeg_status()) /* busy, buffer in use */ + if (audio_status()) /* busy, buffer in use */ return -1; if (!enqueue) @@ -591,7 +591,7 @@ int talk_value(long n, int unit, bool enqueue) VOICE_HERTZ, }; - if (mpeg_status()) /* busy, buffer in use */ + if (audio_status()) /* busy, buffer in use */ return -1; if (unit < 0 || unit >= UNIT_LAST) @@ -623,7 +623,7 @@ int talk_spell(const char* spell, bool enqueue) { char c; /* currently processed char */ - if (mpeg_status()) /* busy, buffer in use */ + if (audio_status()) /* busy, buffer in use */ return -1; if (!enqueue) |