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
This commit is contained in:
parent
a089fcc545
commit
fe0f5baa73
2 changed files with 9 additions and 3 deletions
10
apps/talk.c
10
apps/talk.c
|
@ -37,7 +37,7 @@
|
|||
#include "lang.h"
|
||||
#include "talk.h"
|
||||
#include "metadata.h"
|
||||
/*#define LOGF_ENABLE*/
|
||||
#define LOGF_ENABLE
|
||||
#include "logf.h"
|
||||
#include "bitswap.h"
|
||||
#include "structec.h"
|
||||
|
@ -628,7 +628,13 @@ int talk_id(int32_t id, bool enqueue)
|
|||
if (clipbuf == NULL)
|
||||
return -1; /* not present */
|
||||
|
||||
logf("\ntalk_id: Say '%s'\n", str(id));
|
||||
#ifdef LOGF_ENABLE
|
||||
if (id > VOICEONLY_DELIMITER)
|
||||
logf("\ntalk_id: Say voice clip 0x%x\n", id - 1);
|
||||
else
|
||||
logf("\ntalk_id: Say '%s'\n", str(id));
|
||||
#endif
|
||||
|
||||
queue_clip(clipbuf, clipsize, enqueue);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -658,7 +658,7 @@ MOO
|
|||
|
||||
$name =~ s/\"//g; # cut off the quotes
|
||||
|
||||
printf HFILE_CORE (" %s,\n", $name);
|
||||
printf HFILE_CORE (" %s, /* 0x%x */\n", $name, $i);
|
||||
}
|
||||
|
||||
# Output end of enum
|
||||
|
|
Loading…
Reference in a new issue