diff options
Diffstat (limited to 'apps/tagtree.c')
-rw-r--r-- | apps/tagtree.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/apps/tagtree.c b/apps/tagtree.c index eb9df07113..ce562b78e9 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -711,10 +711,10 @@ static void tagtree_track_finish_event(struct mp3entry *id3) | |||
711 | 711 | ||
712 | bool tagtree_export(void) | 712 | bool tagtree_export(void) |
713 | { | 713 | { |
714 | gui_syncsplash(0, str(LANG_CREATING)); | 714 | splash(0, str(LANG_CREATING)); |
715 | if (!tagcache_create_changelog(&tcs)) | 715 | if (!tagcache_create_changelog(&tcs)) |
716 | { | 716 | { |
717 | gui_syncsplash(HZ*2, ID2P(LANG_FAILED)); | 717 | splash(HZ*2, ID2P(LANG_FAILED)); |
718 | } | 718 | } |
719 | 719 | ||
720 | return false; | 720 | return false; |
@@ -722,10 +722,10 @@ bool tagtree_export(void) | |||
722 | 722 | ||
723 | bool tagtree_import(void) | 723 | bool tagtree_import(void) |
724 | { | 724 | { |
725 | gui_syncsplash(0, ID2P(LANG_WAIT)); | 725 | splash(0, ID2P(LANG_WAIT)); |
726 | if (!tagcache_import_changelog()) | 726 | if (!tagcache_import_changelog()) |
727 | { | 727 | { |
728 | gui_syncsplash(HZ*2, ID2P(LANG_FAILED)); | 728 | splash(HZ*2, ID2P(LANG_FAILED)); |
729 | } | 729 | } |
730 | 730 | ||
731 | return false; | 731 | return false; |
@@ -942,8 +942,7 @@ static bool show_search_progress(bool init, int count) | |||
942 | /* Update progress every 1/10 of a second */ | 942 | /* Update progress every 1/10 of a second */ |
943 | if (current_tick - last_tick > HZ/10) | 943 | if (current_tick - last_tick > HZ/10) |
944 | { | 944 | { |
945 | gui_syncsplash(0, str(LANG_PLAYLIST_SEARCH_MSG), count, | 945 | splashf(0, str(LANG_PLAYLIST_SEARCH_MSG), count, str(LANG_OFF_ABORT)); |
946 | str(LANG_OFF_ABORT)); | ||
947 | if (action_userabort(TIMEOUT_NOBLOCK)) | 946 | if (action_userabort(TIMEOUT_NOBLOCK)) |
948 | return false; | 947 | return false; |
949 | last_tick = current_tick; | 948 | last_tick = current_tick; |
@@ -1266,7 +1265,7 @@ static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | |||
1266 | 1265 | ||
1267 | if (!sort && (sort_inverse || sort_limit)) | 1266 | if (!sort && (sort_inverse || sort_limit)) |
1268 | { | 1267 | { |
1269 | gui_syncsplash(HZ*4, ID2P(LANG_SHOWDIR_BUFFER_FULL), total_count); | 1268 | splashf(HZ*4, ID2P(LANG_SHOWDIR_BUFFER_FULL), total_count); |
1270 | logf("Too small dir buffer"); | 1269 | logf("Too small dir buffer"); |
1271 | return 0; | 1270 | return 0; |
1272 | } | 1271 | } |
@@ -1369,7 +1368,7 @@ int tagtree_load(struct tree_context* c) | |||
1369 | { | 1368 | { |
1370 | c->dirlevel = 0; | 1369 | c->dirlevel = 0; |
1371 | count = load_root(c); | 1370 | count = load_root(c); |
1372 | gui_syncsplash(HZ, str(LANG_TAGCACHE_BUSY)); | 1371 | splash(HZ, str(LANG_TAGCACHE_BUSY)); |
1373 | } | 1372 | } |
1374 | 1373 | ||
1375 | /* The _total_ numer of entries available. */ | 1374 | /* The _total_ numer of entries available. */ |
@@ -1566,7 +1565,7 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue | |||
1566 | cpu_boost(true); | 1565 | cpu_boost(true); |
1567 | if (!tagcache_search(&tcs, tag_filename)) | 1566 | if (!tagcache_search(&tcs, tag_filename)) |
1568 | { | 1567 | { |
1569 | gui_syncsplash(HZ, ID2P(LANG_TAGCACHE_BUSY)); | 1568 | splash(HZ, ID2P(LANG_TAGCACHE_BUSY)); |
1570 | cpu_boost(false); | 1569 | cpu_boost(false); |
1571 | return false; | 1570 | return false; |
1572 | } | 1571 | } |
@@ -1674,12 +1673,12 @@ bool tagtree_insert_selection_playlist(int position, bool queue) | |||
1674 | } | 1673 | } |
1675 | 1674 | ||
1676 | if (tc->filesindir <= 0) | 1675 | if (tc->filesindir <= 0) |
1677 | gui_syncsplash(HZ, ID2P(LANG_END_PLAYLIST)); | 1676 | splash(HZ, ID2P(LANG_END_PLAYLIST)); |
1678 | else | 1677 | else |
1679 | { | 1678 | { |
1680 | logf("insert_all_playlist"); | 1679 | logf("insert_all_playlist"); |
1681 | if (!insert_all_playlist(tc, position, queue)) | 1680 | if (!insert_all_playlist(tc, position, queue)) |
1682 | gui_syncsplash(HZ*2, ID2P(LANG_FAILED)); | 1681 | splash(HZ*2, ID2P(LANG_FAILED)); |
1683 | } | 1682 | } |
1684 | 1683 | ||
1685 | /* Finally return the dirlevel to its original value. */ | 1684 | /* Finally return the dirlevel to its original value. */ |