diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-05-30 16:10:34 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-05-30 16:10:34 +0000 |
commit | fc502e0b15f822bb283fac11778e54b6dcf5375b (patch) | |
tree | de14d3f647c204592d4f745cb431f609d41316ef /apps | |
parent | 0b495f0a189db12131bd049e26d6695564495806 (diff) | |
download | rockbox-fc502e0b15f822bb283fac11778e54b6dcf5375b.tar.gz rockbox-fc502e0b15f822bb283fac11778e54b6dcf5375b.zip |
Move enum table into tagtree.c as it's not used elsewhere and switch to uppercase for its constants as per docs/CONTRIBUTING.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21135 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/tagtree.c | 63 | ||||
-rw-r--r-- | apps/tagtree.h | 2 |
2 files changed, 35 insertions, 30 deletions
diff --git a/apps/tagtree.c b/apps/tagtree.c index 13b5d83cb2..d53b8cf3a6 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -57,6 +57,13 @@ static int tagtree_play_folder(struct tree_context* c); | |||
57 | 57 | ||
58 | #define SEARCHSTR_SIZE 256 | 58 | #define SEARCHSTR_SIZE 256 |
59 | 59 | ||
60 | enum table { | ||
61 | ROOT = 1, | ||
62 | NAVIBROWSE, | ||
63 | ALLSUBENTRIES, | ||
64 | PLAYTRACK, | ||
65 | }; | ||
66 | |||
60 | static const struct id3_to_search_mapping { | 67 | static const struct id3_to_search_mapping { |
61 | char *string; | 68 | char *string; |
62 | size_t id3_offset; | 69 | size_t id3_offset; |
@@ -1065,7 +1072,7 @@ static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | |||
1065 | , 0); | 1072 | , 0); |
1066 | } | 1073 | } |
1067 | 1074 | ||
1068 | if (c->currtable == allsubentries) | 1075 | if (c->currtable == ALLSUBENTRIES) |
1069 | { | 1076 | { |
1070 | tag = tag_title; | 1077 | tag = tag_title; |
1071 | level--; | 1078 | level--; |
@@ -1139,14 +1146,14 @@ static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | |||
1139 | { | 1146 | { |
1140 | if (offset == 0) | 1147 | if (offset == 0) |
1141 | { | 1148 | { |
1142 | dptr->newtable = allsubentries; | 1149 | dptr->newtable = ALLSUBENTRIES; |
1143 | dptr->name = str(LANG_TAGNAVI_ALL_TRACKS); | 1150 | dptr->name = str(LANG_TAGNAVI_ALL_TRACKS); |
1144 | dptr++; | 1151 | dptr++; |
1145 | current_entry_count++; | 1152 | current_entry_count++; |
1146 | } | 1153 | } |
1147 | if (offset <= 1) | 1154 | if (offset <= 1) |
1148 | { | 1155 | { |
1149 | dptr->newtable = navibrowse; | 1156 | dptr->newtable = NAVIBROWSE; |
1150 | dptr->name = str(LANG_TAGNAVI_RANDOM); | 1157 | dptr->name = str(LANG_TAGNAVI_RANDOM); |
1151 | dptr->extraseek = -1; | 1158 | dptr->extraseek = -1; |
1152 | dptr++; | 1159 | dptr++; |
@@ -1162,10 +1169,10 @@ static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | |||
1162 | if (total_count++ < offset) | 1169 | if (total_count++ < offset) |
1163 | continue; | 1170 | continue; |
1164 | 1171 | ||
1165 | dptr->newtable = navibrowse; | 1172 | dptr->newtable = NAVIBROWSE; |
1166 | if (tag == tag_title || tag == tag_filename) | 1173 | if (tag == tag_title || tag == tag_filename) |
1167 | { | 1174 | { |
1168 | dptr->newtable = playtrack; | 1175 | dptr->newtable = PLAYTRACK; |
1169 | dptr->extraseek = tcs->idx_id; | 1176 | dptr->extraseek = tcs->idx_id; |
1170 | } | 1177 | } |
1171 | else | 1178 | else |
@@ -1297,7 +1304,7 @@ static int load_root(struct tree_context *c) | |||
1297 | int i; | 1304 | int i; |
1298 | 1305 | ||
1299 | tc = c; | 1306 | tc = c; |
1300 | c->currtable = root; | 1307 | c->currtable = ROOT; |
1301 | if (c->dirlevel == 0) | 1308 | if (c->dirlevel == 0) |
1302 | c->currextra = root_menu; | 1309 | c->currextra = root_menu; |
1303 | 1310 | ||
@@ -1311,12 +1318,12 @@ static int load_root(struct tree_context *c) | |||
1311 | switch (menu->items[i]->type) | 1318 | switch (menu->items[i]->type) |
1312 | { | 1319 | { |
1313 | case menu_next: | 1320 | case menu_next: |
1314 | dptr->newtable = navibrowse; | 1321 | dptr->newtable = NAVIBROWSE; |
1315 | dptr->extraseek = i; | 1322 | dptr->extraseek = i; |
1316 | break; | 1323 | break; |
1317 | 1324 | ||
1318 | case menu_load: | 1325 | case menu_load: |
1319 | dptr->newtable = root; | 1326 | dptr->newtable = ROOT; |
1320 | dptr->extraseek = menu->items[i]->link; | 1327 | dptr->extraseek = menu->items[i]->link; |
1321 | break; | 1328 | break; |
1322 | } | 1329 | } |
@@ -1341,19 +1348,19 @@ int tagtree_load(struct tree_context* c) | |||
1341 | if (!table) | 1348 | if (!table) |
1342 | { | 1349 | { |
1343 | c->dirfull = false; | 1350 | c->dirfull = false; |
1344 | table = root; | 1351 | table = ROOT; |
1345 | c->currtable = table; | 1352 | c->currtable = table; |
1346 | c->currextra = root_menu; | 1353 | c->currextra = root_menu; |
1347 | } | 1354 | } |
1348 | 1355 | ||
1349 | switch (table) | 1356 | switch (table) |
1350 | { | 1357 | { |
1351 | case root: | 1358 | case ROOT: |
1352 | count = load_root(c); | 1359 | count = load_root(c); |
1353 | break; | 1360 | break; |
1354 | 1361 | ||
1355 | case allsubentries: | 1362 | case ALLSUBENTRIES: |
1356 | case navibrowse: | 1363 | case NAVIBROWSE: |
1357 | logf("navibrowse..."); | 1364 | logf("navibrowse..."); |
1358 | cpu_boost(true); | 1365 | cpu_boost(true); |
1359 | count = retrieve_entries(c, &tcs, 0, true); | 1366 | count = retrieve_entries(c, &tcs, 0, true); |
@@ -1411,16 +1418,16 @@ int tagtree_enter(struct tree_context* c) | |||
1411 | c->dirlevel++; | 1418 | c->dirlevel++; |
1412 | 1419 | ||
1413 | switch (c->currtable) { | 1420 | switch (c->currtable) { |
1414 | case root: | 1421 | case ROOT: |
1415 | c->currextra = newextra; | 1422 | c->currextra = newextra; |
1416 | 1423 | ||
1417 | if (newextra == root) | 1424 | if (newextra == ROOT) |
1418 | { | 1425 | { |
1419 | menu = menus[seek]; | 1426 | menu = menus[seek]; |
1420 | c->currextra = seek; | 1427 | c->currextra = seek; |
1421 | } | 1428 | } |
1422 | 1429 | ||
1423 | else if (newextra == navibrowse) | 1430 | else if (newextra == NAVIBROWSE) |
1424 | { | 1431 | { |
1425 | int i, j; | 1432 | int i, j; |
1426 | 1433 | ||
@@ -1486,9 +1493,9 @@ int tagtree_enter(struct tree_context* c) | |||
1486 | 1493 | ||
1487 | break; | 1494 | break; |
1488 | 1495 | ||
1489 | case navibrowse: | 1496 | case NAVIBROWSE: |
1490 | case allsubentries: | 1497 | case ALLSUBENTRIES: |
1491 | if (newextra == playtrack) | 1498 | if (newextra == PLAYTRACK) |
1492 | { | 1499 | { |
1493 | if (global_settings.party_mode && audio_status()) { | 1500 | if (global_settings.party_mode && audio_status()) { |
1494 | splash(HZ, ID2P(LANG_PARTY_MODE)); | 1501 | splash(HZ, ID2P(LANG_PARTY_MODE)); |
@@ -1637,7 +1644,7 @@ bool tagtree_insert_selection_playlist(int position, bool queue) | |||
1637 | dptr = tagtree_get_entry(tc, tc->selected_item); | 1644 | dptr = tagtree_get_entry(tc, tc->selected_item); |
1638 | 1645 | ||
1639 | /* Insert a single track? */ | 1646 | /* Insert a single track? */ |
1640 | if (dptr->newtable == playtrack) | 1647 | if (dptr->newtable == PLAYTRACK) |
1641 | { | 1648 | { |
1642 | if (tagtree_get_filename(tc, buf, sizeof buf) < 0) | 1649 | if (tagtree_get_filename(tc, buf, sizeof buf) < 0) |
1643 | { | 1650 | { |
@@ -1649,27 +1656,27 @@ bool tagtree_insert_selection_playlist(int position, bool queue) | |||
1649 | return true; | 1656 | return true; |
1650 | } | 1657 | } |
1651 | 1658 | ||
1652 | if (dptr->newtable == navibrowse) | 1659 | if (dptr->newtable == NAVIBROWSE) |
1653 | { | 1660 | { |
1654 | tagtree_enter(tc); | 1661 | tagtree_enter(tc); |
1655 | tagtree_load(tc); | 1662 | tagtree_load(tc); |
1656 | dptr = tagtree_get_entry(tc, tc->selected_item); | 1663 | dptr = tagtree_get_entry(tc, tc->selected_item); |
1657 | } | 1664 | } |
1658 | else if (dptr->newtable != allsubentries) | 1665 | else if (dptr->newtable != ALLSUBENTRIES) |
1659 | { | 1666 | { |
1660 | logf("unsupported table: %d", dptr->newtable); | 1667 | logf("unsupported table: %d", dptr->newtable); |
1661 | return false; | 1668 | return false; |
1662 | } | 1669 | } |
1663 | 1670 | ||
1664 | /* Now the current table should be allsubentries. */ | 1671 | /* Now the current table should be allsubentries. */ |
1665 | if (dptr->newtable != playtrack) | 1672 | if (dptr->newtable != PLAYTRACK) |
1666 | { | 1673 | { |
1667 | tagtree_enter(tc); | 1674 | tagtree_enter(tc); |
1668 | tagtree_load(tc); | 1675 | tagtree_load(tc); |
1669 | dptr = tagtree_get_entry(tc, tc->selected_item); | 1676 | dptr = tagtree_get_entry(tc, tc->selected_item); |
1670 | 1677 | ||
1671 | /* And now the newtable should be playtrack. */ | 1678 | /* And now the newtable should be playtrack. */ |
1672 | if (dptr->newtable != playtrack) | 1679 | if (dptr->newtable != PLAYTRACK) |
1673 | { | 1680 | { |
1674 | logf("newtable: %d !!", dptr->newtable); | 1681 | logf("newtable: %d !!", dptr->newtable); |
1675 | tc->dirlevel = dirlevel; | 1682 | tc->dirlevel = dirlevel; |
@@ -1743,11 +1750,11 @@ char *tagtree_get_title(struct tree_context* c) | |||
1743 | { | 1750 | { |
1744 | switch (c->currtable) | 1751 | switch (c->currtable) |
1745 | { | 1752 | { |
1746 | case root: | 1753 | case ROOT: |
1747 | return menu->title; | 1754 | return menu->title; |
1748 | 1755 | ||
1749 | case navibrowse: | 1756 | case NAVIBROWSE: |
1750 | case allsubentries: | 1757 | case ALLSUBENTRIES: |
1751 | return current_title[c->currextra]; | 1758 | return current_title[c->currextra]; |
1752 | } | 1759 | } |
1753 | 1760 | ||
@@ -1759,14 +1766,14 @@ int tagtree_get_attr(struct tree_context* c) | |||
1759 | int attr = -1; | 1766 | int attr = -1; |
1760 | switch (c->currtable) | 1767 | switch (c->currtable) |
1761 | { | 1768 | { |
1762 | case navibrowse: | 1769 | case NAVIBROWSE: |
1763 | if (csi->tagorder[c->currextra] == tag_title) | 1770 | if (csi->tagorder[c->currextra] == tag_title) |
1764 | attr = FILE_ATTR_AUDIO; | 1771 | attr = FILE_ATTR_AUDIO; |
1765 | else | 1772 | else |
1766 | attr = ATTR_DIRECTORY; | 1773 | attr = ATTR_DIRECTORY; |
1767 | break; | 1774 | break; |
1768 | 1775 | ||
1769 | case allsubentries: | 1776 | case ALLSUBENTRIES: |
1770 | attr = FILE_ATTR_AUDIO; | 1777 | attr = FILE_ATTR_AUDIO; |
1771 | break; | 1778 | break; |
1772 | 1779 | ||
diff --git a/apps/tagtree.h b/apps/tagtree.h index 1aaa52da8d..a08c7433a4 100644 --- a/apps/tagtree.h +++ b/apps/tagtree.h | |||
@@ -30,8 +30,6 @@ | |||
30 | #define TAGMENU_MAX_MENUS 32 | 30 | #define TAGMENU_MAX_MENUS 32 |
31 | #define TAGMENU_MAX_FMTS 32 | 31 | #define TAGMENU_MAX_FMTS 32 |
32 | 32 | ||
33 | enum table { root = 1, navibrowse, allsubentries, playtrack }; | ||
34 | |||
35 | struct tagentry { | 33 | struct tagentry { |
36 | char *name; | 34 | char *name; |
37 | int newtable; | 35 | int newtable; |