diff options
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 @@ | |||
28 | #include "system.h" | 28 | #include "system.h" |
29 | #include "settings.h" | 29 | #include "settings.h" |
30 | #include "mp3_playback.h" | 30 | #include "mp3_playback.h" |
31 | #include "mpeg.h" | 31 | #include "audio.h" |
32 | #include "lang.h" | 32 | #include "lang.h" |
33 | #include "talk.h" | 33 | #include "talk.h" |
34 | #include "id3.h" | 34 | #include "id3.h" |
@@ -432,7 +432,7 @@ int talk_id(long id, bool enqueue) | |||
432 | unsigned char* clipbuf; | 432 | unsigned char* clipbuf; |
433 | int unit; | 433 | int unit; |
434 | 434 | ||
435 | if (mpeg_status()) /* busy, buffer in use */ | 435 | if (audio_status()) /* busy, buffer in use */ |
436 | return -1; | 436 | return -1; |
437 | 437 | ||
438 | if (p_voicefile == NULL && has_voicefile) | 438 | if (p_voicefile == NULL && has_voicefile) |
@@ -471,7 +471,7 @@ int talk_file(const char* filename, bool enqueue) | |||
471 | int size; | 471 | int size; |
472 | struct mp3entry info; | 472 | struct mp3entry info; |
473 | 473 | ||
474 | if (mpeg_status()) /* busy, buffer in use */ | 474 | if (audio_status()) /* busy, buffer in use */ |
475 | return -1; | 475 | return -1; |
476 | 476 | ||
477 | if (p_thumbnail == NULL || size_for_thumbnail <= 0) | 477 | if (p_thumbnail == NULL || size_for_thumbnail <= 0) |
@@ -512,7 +512,7 @@ int talk_number(long n, bool enqueue) | |||
512 | int level = 0; /* mille count */ | 512 | int level = 0; /* mille count */ |
513 | long mil = 1000000000; /* highest possible "-illion" */ | 513 | long mil = 1000000000; /* highest possible "-illion" */ |
514 | 514 | ||
515 | if (mpeg_status()) /* busy, buffer in use */ | 515 | if (audio_status()) /* busy, buffer in use */ |
516 | return -1; | 516 | return -1; |
517 | 517 | ||
518 | if (!enqueue) | 518 | if (!enqueue) |
@@ -591,7 +591,7 @@ int talk_value(long n, int unit, bool enqueue) | |||
591 | VOICE_HERTZ, | 591 | VOICE_HERTZ, |
592 | }; | 592 | }; |
593 | 593 | ||
594 | if (mpeg_status()) /* busy, buffer in use */ | 594 | if (audio_status()) /* busy, buffer in use */ |
595 | return -1; | 595 | return -1; |
596 | 596 | ||
597 | if (unit < 0 || unit >= UNIT_LAST) | 597 | if (unit < 0 || unit >= UNIT_LAST) |
@@ -623,7 +623,7 @@ int talk_spell(const char* spell, bool enqueue) | |||
623 | { | 623 | { |
624 | char c; /* currently processed char */ | 624 | char c; /* currently processed char */ |
625 | 625 | ||
626 | if (mpeg_status()) /* busy, buffer in use */ | 626 | if (audio_status()) /* busy, buffer in use */ |
627 | return -1; | 627 | return -1; |
628 | 628 | ||
629 | if (!enqueue) | 629 | if (!enqueue) |