diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-26 03:11:00 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-26 03:11:00 +0000 |
commit | fe0f5baa73e639e0a7ef2e7f4b08e255bac4872a (patch) | |
tree | 542a7efbec2a3e557e7d13eb0bfde268393c34b8 /apps/talk.c | |
parent | a089fcc54590b3afa300fe3a0307d92980cfbcd4 (diff) | |
download | rockbox-fe0f5baa73e639e0a7ef2e7f4b08e255bac4872a.tar.gz rockbox-fe0f5baa73e639e0a7ef2e7f4b08e255bac4872a.zip |
Fix crash in talk.c logf line when outputting voice only clips, more comments in lang.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26294 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/talk.c')
-rw-r--r-- | apps/talk.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/talk.c b/apps/talk.c index 0e3ff17a1b..b85997531d 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "lang.h" | 37 | #include "lang.h" |
38 | #include "talk.h" | 38 | #include "talk.h" |
39 | #include "metadata.h" | 39 | #include "metadata.h" |
40 | /*#define LOGF_ENABLE*/ | 40 | #define LOGF_ENABLE |
41 | #include "logf.h" | 41 | #include "logf.h" |
42 | #include "bitswap.h" | 42 | #include "bitswap.h" |
43 | #include "structec.h" | 43 | #include "structec.h" |
@@ -628,7 +628,13 @@ int talk_id(int32_t id, bool enqueue) | |||
628 | if (clipbuf == NULL) | 628 | if (clipbuf == NULL) |
629 | return -1; /* not present */ | 629 | return -1; /* not present */ |
630 | 630 | ||
631 | logf("\ntalk_id: Say '%s'\n", str(id)); | 631 | #ifdef LOGF_ENABLE |
632 | if (id > VOICEONLY_DELIMITER) | ||
633 | logf("\ntalk_id: Say voice clip 0x%x\n", id - 1); | ||
634 | else | ||
635 | logf("\ntalk_id: Say '%s'\n", str(id)); | ||
636 | #endif | ||
637 | |||
632 | queue_clip(clipbuf, clipsize, enqueue); | 638 | queue_clip(clipbuf, clipsize, enqueue); |
633 | 639 | ||
634 | return 0; | 640 | return 0; |