len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tagcache: Rename find_tag() -> tc_find_tag()

Browse source 
The overly-generic name "find_tag()" is part of the skin parser
library and this can cause problems depending on what's included
from headers. Unfortunately.

Change-Id: I0cb02b1203daa6ff36595ed6c6f40b5b56bd3e58
This commit is contained in:
Aidan MacDonald 2023-09-29 13:22:22 +01:00 • committed by Aidan MacDonald
parent 9d585cbc05
commit 5641e8140a
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
apps/tagcache.c
View file

@ -1193,7 +1193,7 @@ failure:
#define COMMAND_QUEUE_IS_EMPTY (command_queue_ridx == command_queue_widx) #define COMMAND_QUEUE_IS_EMPTY (command_queue_ridx == command_queue_widx)
static long find_tag(int tag, int idx_id, const struct index_entry *idx) static long tc_find_tag(int tag, int idx_id, const struct index_entry *idx)
{ {
#ifndef __PCTOOL__ #ifndef __PCTOOL__
if (! COMMAND_QUEUE_IS_EMPTY && TAGCACHE_IS_NUMERIC(tag)) if (! COMMAND_QUEUE_IS_EMPTY && TAGCACHE_IS_NUMERIC(tag))
@ -1224,8 +1224,7 @@ static long find_tag(int tag, int idx_id, const struct index_entry *idx)
if (result >= 0) if (result >= 0)
{ {
logf("find_tag: " logf("tc_find_tag: Recovered tag %d value %lX from write queue",
"Recovered tag %d value %lX from write queue",
tag, result); tag, result);
return result; return result;
} }
@ -1255,24 +1254,24 @@ static long check_virtual_tags(int tag, int idx_id,
switch (tag) switch (tag)
{ {
case tag_virt_length_sec: case tag_virt_length_sec:
data = sec_in_ms(find_tag(tag_length, idx_id, idx)); data = sec_in_ms(tc_find_tag(tag_length, idx_id, idx));
break; break;
case tag_virt_length_min: case tag_virt_length_min:
data = min_in_ms(find_tag(tag_length, idx_id, idx)); data = min_in_ms(tc_find_tag(tag_length, idx_id, idx));
break; break;
case tag_virt_playtime_sec: case tag_virt_playtime_sec:
data = sec_in_ms(find_tag(tag_playtime, idx_id, idx)); data = sec_in_ms(tc_find_tag(tag_playtime, idx_id, idx));
break; break;
case tag_virt_playtime_min: case tag_virt_playtime_min:
data = min_in_ms(find_tag(tag_playtime, idx_id, idx)); data = min_in_ms(tc_find_tag(tag_playtime, idx_id, idx));
break; break;
case tag_virt_autoscore: case tag_virt_autoscore:
if (find_tag(tag_length, idx_id, idx) == 0 if (tc_find_tag(tag_length, idx_id, idx) == 0
|| find_tag(tag_playcount, idx_id, idx) == 0) || tc_find_tag(tag_playcount, idx_id, idx) == 0)
{ {
data = 0; data = 0;
} }
@ -1288,9 +1287,9 @@ static long check_virtual_tags(int tag, int idx_id,
autoscore = 100 * (alpha / playcout + beta / length / playcount) autoscore = 100 * (alpha / playcout + beta / length / playcount)
Both terms should be small enough to avoid any overflow Both terms should be small enough to avoid any overflow
*/ */
long playtime = find_tag(tag_playtime, idx_id, idx); long playtime = tc_find_tag(tag_playtime, idx_id, idx);
long length = find_tag(tag_length, idx_id, idx); long length = tc_find_tag(tag_length, idx_id, idx);
long playcount = find_tag(tag_playcount, idx_id, idx); long playcount = tc_find_tag(tag_playcount, idx_id, idx);
data = 100 * (playtime / length) + (100 * (playtime % length)) / length; data = 100 * (playtime / length) + (100 * (playtime % length)) / length;
data /= playcount; data /= playcount;
} }
@ -1299,7 +1298,7 @@ static long check_virtual_tags(int tag, int idx_id,
/* How many commits before the file has been added to the DB. */ /* How many commits before the file has been added to the DB. */
case tag_virt_entryage: case tag_virt_entryage:
data = current_tcmh.commitid data = current_tcmh.commitid
- find_tag(tag_commitid, idx_id, idx) - 1; - tc_find_tag(tag_commitid, idx_id, idx) - 1;
break; break;
case tag_virt_basename: case tag_virt_basename:
@ -1307,7 +1306,7 @@ static long check_virtual_tags(int tag, int idx_id,
/* FALLTHRU */ /* FALLTHRU */
default: default:
data = find_tag(tag, idx_id, idx); data = tc_find_tag(tag, idx_id, idx);
} }
return data; return data;