diff options
Diffstat (limited to 'apps/tagcache.c')
-rw-r--r-- | apps/tagcache.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/apps/tagcache.c b/apps/tagcache.c index 08fcf30433..90f7e01a2f 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -1193,7 +1193,7 @@ failure: | |||
1193 | 1193 | ||
1194 | #define COMMAND_QUEUE_IS_EMPTY (command_queue_ridx == command_queue_widx) | 1194 | #define COMMAND_QUEUE_IS_EMPTY (command_queue_ridx == command_queue_widx) |
1195 | 1195 | ||
1196 | static long find_tag(int tag, int idx_id, const struct index_entry *idx) | 1196 | static long tc_find_tag(int tag, int idx_id, const struct index_entry *idx) |
1197 | { | 1197 | { |
1198 | #ifndef __PCTOOL__ | 1198 | #ifndef __PCTOOL__ |
1199 | if (! COMMAND_QUEUE_IS_EMPTY && TAGCACHE_IS_NUMERIC(tag)) | 1199 | 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) | |||
1224 | 1224 | ||
1225 | if (result >= 0) | 1225 | if (result >= 0) |
1226 | { | 1226 | { |
1227 | logf("find_tag: " | 1227 | logf("tc_find_tag: Recovered tag %d value %lX from write queue", |
1228 | "Recovered tag %d value %lX from write queue", | ||
1229 | tag, result); | 1228 | tag, result); |
1230 | return result; | 1229 | return result; |
1231 | } | 1230 | } |
@@ -1255,24 +1254,24 @@ static long check_virtual_tags(int tag, int idx_id, | |||
1255 | switch (tag) | 1254 | switch (tag) |
1256 | { | 1255 | { |
1257 | case tag_virt_length_sec: | 1256 | case tag_virt_length_sec: |
1258 | data = sec_in_ms(find_tag(tag_length, idx_id, idx)); | 1257 | data = sec_in_ms(tc_find_tag(tag_length, idx_id, idx)); |
1259 | break; | 1258 | break; |
1260 | 1259 | ||
1261 | case tag_virt_length_min: | 1260 | case tag_virt_length_min: |
1262 | data = min_in_ms(find_tag(tag_length, idx_id, idx)); | 1261 | data = min_in_ms(tc_find_tag(tag_length, idx_id, idx)); |
1263 | break; | 1262 | break; |
1264 | 1263 | ||
1265 | case tag_virt_playtime_sec: | 1264 | case tag_virt_playtime_sec: |
1266 | data = sec_in_ms(find_tag(tag_playtime, idx_id, idx)); | 1265 | data = sec_in_ms(tc_find_tag(tag_playtime, idx_id, idx)); |
1267 | break; | 1266 | break; |
1268 | 1267 | ||
1269 | case tag_virt_playtime_min: | 1268 | case tag_virt_playtime_min: |
1270 | data = min_in_ms(find_tag(tag_playtime, idx_id, idx)); | 1269 | data = min_in_ms(tc_find_tag(tag_playtime, idx_id, idx)); |
1271 | break; | 1270 | break; |
1272 | 1271 | ||
1273 | case tag_virt_autoscore: | 1272 | case tag_virt_autoscore: |
1274 | if (find_tag(tag_length, idx_id, idx) == 0 | 1273 | if (tc_find_tag(tag_length, idx_id, idx) == 0 |
1275 | || find_tag(tag_playcount, idx_id, idx) == 0) | 1274 | || tc_find_tag(tag_playcount, idx_id, idx) == 0) |
1276 | { | 1275 | { |
1277 | data = 0; | 1276 | data = 0; |
1278 | } | 1277 | } |
@@ -1288,9 +1287,9 @@ static long check_virtual_tags(int tag, int idx_id, | |||
1288 | autoscore = 100 * (alpha / playcout + beta / length / playcount) | 1287 | autoscore = 100 * (alpha / playcout + beta / length / playcount) |
1289 | Both terms should be small enough to avoid any overflow | 1288 | Both terms should be small enough to avoid any overflow |
1290 | */ | 1289 | */ |
1291 | long playtime = find_tag(tag_playtime, idx_id, idx); | 1290 | long playtime = tc_find_tag(tag_playtime, idx_id, idx); |
1292 | long length = find_tag(tag_length, idx_id, idx); | 1291 | long length = tc_find_tag(tag_length, idx_id, idx); |
1293 | long playcount = find_tag(tag_playcount, idx_id, idx); | 1292 | long playcount = tc_find_tag(tag_playcount, idx_id, idx); |
1294 | data = 100 * (playtime / length) + (100 * (playtime % length)) / length; | 1293 | data = 100 * (playtime / length) + (100 * (playtime % length)) / length; |
1295 | data /= playcount; | 1294 | data /= playcount; |
1296 | } | 1295 | } |
@@ -1299,7 +1298,7 @@ static long check_virtual_tags(int tag, int idx_id, | |||
1299 | /* How many commits before the file has been added to the DB. */ | 1298 | /* How many commits before the file has been added to the DB. */ |
1300 | case tag_virt_entryage: | 1299 | case tag_virt_entryage: |
1301 | data = current_tcmh.commitid | 1300 | data = current_tcmh.commitid |
1302 | - find_tag(tag_commitid, idx_id, idx) - 1; | 1301 | - tc_find_tag(tag_commitid, idx_id, idx) - 1; |
1303 | break; | 1302 | break; |
1304 | 1303 | ||
1305 | case tag_virt_basename: | 1304 | case tag_virt_basename: |
@@ -1307,7 +1306,7 @@ static long check_virtual_tags(int tag, int idx_id, | |||
1307 | /* FALLTHRU */ | 1306 | /* FALLTHRU */ |
1308 | 1307 | ||
1309 | default: | 1308 | default: |
1310 | data = find_tag(tag, idx_id, idx); | 1309 | data = tc_find_tag(tag, idx_id, idx); |
1311 | } | 1310 | } |
1312 | 1311 | ||
1313 | return data; | 1312 | return data; |