devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

All AAC-HE files will double the frame sample count, not only AAC-HE files with SBR upsampling. This change fixes issues with some m4a files reported in the forums.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29310 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-02-15 20:00:28 +00:00
parent 258626f455
commit 237ca504e1
9 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/talk.c
View file

@ -1015,7 +1015,7 @@ int talk_number(long n, bool enqueue)
/* Say time duration/interval. Input is time in seconds,
say hours,minutes,seconds. */
static int talk_time_unit(long secs, bool exact, bool enqueue)
static int talk_time_unit(long secs, bool enqueue)
{
int hours, mins;
if (!enqueue)
@ -1026,11 +1026,9 @@ static int talk_time_unit(long secs, bool exact, bool enqueue)
}
if((mins = secs/60)) {
secs %= 60;
if(exact || !hours)
talk_value(mins, UNIT_MIN, true);
else talk_number(mins, true); /* don't say "minutes" */
talk_value(mins, UNIT_MIN, true);
}
if((exact && secs) || (!hours && !mins))
if((secs) || (!hours && !mins))
talk_value(secs, UNIT_SEC, true);
else if(!hours && secs)
talk_number(secs, true);
@ -1110,8 +1108,8 @@ int talk_value_decimal(long n, int unit, int decimals, bool enqueue)
#endif
/* special case for time duration */
if (unit == UNIT_TIME || unit == UNIT_TIME_EXACT)
return talk_time_unit(n, unit == UNIT_TIME_EXACT, enqueue);
if (unit == UNIT_TIME)
return talk_time_unit(n, enqueue);
if (unit < 0 || unit >= UNIT_LAST)
unit_id = -1;