diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2023-03-29 09:24:29 +0100 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2023-07-02 12:14:33 -0400 |
commit | 9ba51e355287f234260977e8cd978773e2528cae (patch) | |
tree | 324d3e172f9958bd239621105b7be6cbdd7c57a3 /apps | |
parent | 129fb4016bb081d9fc204fb66aa56cd4955e868e (diff) | |
download | rockbox-9ba51e355287f234260977e8cd978773e2528cae.tar.gz rockbox-9ba51e355287f234260977e8cd978773e2528cae.zip |
playlist: Remove playlist_add()
It was only used in filetree.c. It's still implemented in Lua so
scripts using rb.playlist_add() won't break, but has been removed
from the Lua API "backend".
Change-Id: I5625a47f0692456008c6b10dee14755151d22f29
Diffstat (limited to 'apps')
-rw-r--r-- | apps/filetree.c | 8 | ||||
-rw-r--r-- | apps/playlist.c | 17 | ||||
-rw-r--r-- | apps/playlist.h | 1 | ||||
-rw-r--r-- | apps/plugin.c | 1 | ||||
-rw-r--r-- | apps/plugin.h | 1 | ||||
-rw-r--r-- | apps/plugins/lua/include_lua/playlist.lua | 2 | ||||
-rw-r--r-- | apps/plugins/lua/rocklib.c | 8 | ||||
-rw-r--r-- | apps/tree.c | 4 |
8 files changed, 14 insertions, 28 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index b652b6515b..7e6ba4eb8d 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -74,6 +74,7 @@ int ft_build_playlist(struct tree_context* c, int start_index) | |||
74 | int i; | 74 | int i; |
75 | int res = 0; | 75 | int res = 0; |
76 | int start=start_index; | 76 | int start=start_index; |
77 | struct playlist_info *playlist = playlist_get_current(); | ||
77 | 78 | ||
78 | tree_lock_cache(c); | 79 | tree_lock_cache(c); |
79 | struct entry *entries = tree_get_entries(c); | 80 | struct entry *entries = tree_get_entries(c); |
@@ -82,7 +83,8 @@ int ft_build_playlist(struct tree_context* c, int start_index) | |||
82 | { | 83 | { |
83 | if((entries[i].attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO) | 84 | if((entries[i].attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO) |
84 | { | 85 | { |
85 | res = playlist_add(entries[i].name); | 86 | res = playlist_insert_track(playlist, entries[i].name, |
87 | PLAYLIST_INSERT_LAST, false, false); | ||
86 | if (res < 0) | 88 | if (res < 0) |
87 | break; | 89 | break; |
88 | } | 90 | } |
@@ -127,10 +129,9 @@ bool ft_play_playlist(char* pathname, char* dirname, | |||
127 | if (playlist_create(dirname, filename) != -1) | 129 | if (playlist_create(dirname, filename) != -1) |
128 | { | 130 | { |
129 | if (global_settings.playlist_shuffle) | 131 | if (global_settings.playlist_shuffle) |
130 | { | ||
131 | playlist_shuffle(current_tick, -1); | 132 | playlist_shuffle(current_tick, -1); |
132 | } | ||
133 | 133 | ||
134 | playlist_set_modified(NULL, false); | ||
134 | playlist_start(0, 0, 0); | 135 | playlist_start(0, 0, 0); |
135 | return true; | 136 | return true; |
136 | } | 137 | } |
@@ -528,6 +529,7 @@ int ft_enter(struct tree_context* c) | |||
528 | start_index = 0; | 529 | start_index = 0; |
529 | } | 530 | } |
530 | 531 | ||
532 | playlist_set_modified(NULL, false); | ||
531 | playlist_start(start_index, 0, 0); | 533 | playlist_start(start_index, 0, 0); |
532 | play = true; | 534 | play = true; |
533 | } | 535 | } |
diff --git a/apps/playlist.c b/apps/playlist.c index 0f11ad25ca..5b628ad649 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -1207,6 +1207,8 @@ static int create_and_play_dir(int direction, bool play_last) | |||
1207 | if (global_settings.playlist_shuffle) | 1207 | if (global_settings.playlist_shuffle) |
1208 | playlist_shuffle(current_tick, -1); | 1208 | playlist_shuffle(current_tick, -1); |
1209 | 1209 | ||
1210 | playlist_set_modified(NULL, false); | ||
1211 | |||
1210 | if (play_last && direction <= 0) | 1212 | if (play_last && direction <= 0) |
1211 | index = current_playlist.amount - 1; | 1213 | index = current_playlist.amount - 1; |
1212 | else | 1214 | else |
@@ -2024,21 +2026,6 @@ void playlist_shutdown(void) | |||
2024 | playlist_write_unlock(playlist); | 2026 | playlist_write_unlock(playlist); |
2025 | } | 2027 | } |
2026 | 2028 | ||
2027 | /* | ||
2028 | * Add track to end of the playlist. Prefer playlist_insert_track(), | ||
2029 | * this is DEPRECATED and will be going away at some point. | ||
2030 | */ | ||
2031 | int playlist_add(const char *filename) | ||
2032 | { | ||
2033 | int ret = playlist_insert_track(NULL, filename, PLAYLIST_INSERT_LAST, | ||
2034 | false, true); | ||
2035 | if (ret < 0) | ||
2036 | return ret; | ||
2037 | |||
2038 | playlist_set_modified(NULL, false); | ||
2039 | return ret; | ||
2040 | } | ||
2041 | |||
2042 | /* returns number of tracks in playlist (includes queued/inserted tracks) */ | 2029 | /* returns number of tracks in playlist (includes queued/inserted tracks) */ |
2043 | int playlist_amount_ex(const struct playlist_info* playlist) | 2030 | int playlist_amount_ex(const struct playlist_info* playlist) |
2044 | { | 2031 | { |
diff --git a/apps/playlist.h b/apps/playlist.h index d01100af59..a12180f286 100644 --- a/apps/playlist.h +++ b/apps/playlist.h | |||
@@ -103,7 +103,6 @@ void playlist_init(void) INIT_ATTR; | |||
103 | void playlist_shutdown(void); | 103 | void playlist_shutdown(void); |
104 | int playlist_create(const char *dir, const char *file); | 104 | int playlist_create(const char *dir, const char *file); |
105 | int playlist_resume(void); | 105 | int playlist_resume(void); |
106 | int playlist_add(const char *filename); | ||
107 | int playlist_shuffle(int random_seed, int start_index); | 106 | int playlist_shuffle(int random_seed, int start_index); |
108 | unsigned int playlist_get_filename_crc32(struct playlist_info *playlist, | 107 | unsigned int playlist_get_filename_crc32(struct playlist_info *playlist, |
109 | int index); | 108 | int index); |
diff --git a/apps/plugin.c b/apps/plugin.c index cd58209fb7..13b2fc7769 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -692,7 +692,6 @@ static const struct plugin_api rockbox_api = { | |||
692 | playlist_resume_track, | 692 | playlist_resume_track, |
693 | playlist_set_modified, | 693 | playlist_set_modified, |
694 | playlist_start, | 694 | playlist_start, |
695 | playlist_add, | ||
696 | playlist_sync, | 695 | playlist_sync, |
697 | playlist_remove_all_tracks, | 696 | playlist_remove_all_tracks, |
698 | playlist_create, | 697 | playlist_create, |
diff --git a/apps/plugin.h b/apps/plugin.h index ad8822ed72..007552d120 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -797,7 +797,6 @@ struct plugin_api { | |||
797 | void (*playlist_set_modified)(struct playlist_info *playlist, bool modified); | 797 | void (*playlist_set_modified)(struct playlist_info *playlist, bool modified); |
798 | void (*playlist_start)(int start_index, unsigned long elapsed, | 798 | void (*playlist_start)(int start_index, unsigned long elapsed, |
799 | unsigned long offset); | 799 | unsigned long offset); |
800 | int (*playlist_add)(const char *filename); | ||
801 | void (*playlist_sync)(struct playlist_info* playlist); | 800 | void (*playlist_sync)(struct playlist_info* playlist); |
802 | int (*playlist_remove_all_tracks)(struct playlist_info *playlist); | 801 | int (*playlist_remove_all_tracks)(struct playlist_info *playlist); |
803 | int (*playlist_create)(const char *dir, const char *file); | 802 | int (*playlist_create)(const char *dir, const char *file); |
diff --git a/apps/plugins/lua/include_lua/playlist.lua b/apps/plugins/lua/include_lua/playlist.lua index e11b30fe7d..dfa839aab1 100644 --- a/apps/plugins/lua/include_lua/playlist.lua +++ b/apps/plugins/lua/include_lua/playlist.lua | |||
@@ -28,7 +28,7 @@ rb.playlist_amount = function() | |||
28 | return rb.playlist("amount") | 28 | return rb.playlist("amount") |
29 | end | 29 | end |
30 | rb.playlist_add = function (filename) | 30 | rb.playlist_add = function (filename) |
31 | return rb.playlist("add", filename) | 31 | return rb.playlist("insert_track", filename, rb.PLAYLIST_INSERT_LAST, false, true) |
32 | end | 32 | end |
33 | rb.playlist_create = function(dir, filename) | 33 | rb.playlist_create = function(dir, filename) |
34 | return rb.playlist("create", dir, filename) | 34 | return rb.playlist("create", dir, filename) |
diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c index 8efaaab169..070fdb4991 100644 --- a/apps/plugins/lua/rocklib.c +++ b/apps/plugins/lua/rocklib.c | |||
@@ -317,13 +317,13 @@ RB_WRAP(splash_scroller) | |||
317 | RB_WRAP(playlist) | 317 | RB_WRAP(playlist) |
318 | { | 318 | { |
319 | /* just passes NULL to work with the current playlist */ | 319 | /* just passes NULL to work with the current playlist */ |
320 | enum e_playlist {PLAYL_AMOUNT = 0, PLAYL_ADD, PLAYL_CREATE, | 320 | enum e_playlist {PLAYL_AMOUNT = 0, PLAYL_CREATE, |
321 | PLAYL_START, PLAYL_RESUMETRACK, PLAYL_RESUME, | 321 | PLAYL_START, PLAYL_RESUMETRACK, PLAYL_RESUME, |
322 | PLAYL_SHUFFLE, PLAYL_SYNC, PLAYL_REMOVEALLTRACKS, | 322 | PLAYL_SHUFFLE, PLAYL_SYNC, PLAYL_REMOVEALLTRACKS, |
323 | PLAYL_INSERTTRACK, PLAYL_INSERTDIRECTORY, PLAYL_INSERTPLAYL, | 323 | PLAYL_INSERTTRACK, PLAYL_INSERTDIRECTORY, PLAYL_INSERTPLAYL, |
324 | PLAYL_ECOUNT}; | 324 | PLAYL_ECOUNT}; |
325 | 325 | ||
326 | const char *playlist_option[] = {"amount", "add", "create", "start", "resume_track", | 326 | const char *playlist_option[] = {"amount", "create", "start", "resume_track", |
327 | "resume", "shuffle", "sync", "remove_all_tracks", | 327 | "resume", "shuffle", "sync", "remove_all_tracks", |
328 | "insert_track", "insert_directory", "insert_playlist", NULL}; | 328 | "insert_track", "insert_directory", "insert_playlist", NULL}; |
329 | 329 | ||
@@ -339,10 +339,6 @@ RB_WRAP(playlist) | |||
339 | case PLAYL_AMOUNT: | 339 | case PLAYL_AMOUNT: |
340 | result = rb->playlist_amount(); | 340 | result = rb->playlist_amount(); |
341 | break; | 341 | break; |
342 | case PLAYL_ADD: | ||
343 | filename = luaL_checkstring(L, 2); | ||
344 | result = rb->playlist_add(filename); | ||
345 | break; | ||
346 | case PLAYL_CREATE: | 342 | case PLAYL_CREATE: |
347 | dir = luaL_checkstring(L, 2); | 343 | dir = luaL_checkstring(L, 2); |
348 | filename = luaL_checkstring(L, 3); | 344 | filename = luaL_checkstring(L, 3); |
diff --git a/apps/tree.c b/apps/tree.c index b9b257e093..2cbc8acf1d 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -1105,6 +1105,8 @@ bool bookmark_play(char *resume_file, int index, unsigned long elapsed, | |||
1105 | { | 1105 | { |
1106 | if (global_settings.playlist_shuffle) | 1106 | if (global_settings.playlist_shuffle) |
1107 | playlist_shuffle(seed, -1); | 1107 | playlist_shuffle(seed, -1); |
1108 | |||
1109 | playlist_set_modified(NULL, false); | ||
1108 | playlist_start(index, elapsed, offset); | 1110 | playlist_start(index, elapsed, offset); |
1109 | started = true; | 1111 | started = true; |
1110 | } | 1112 | } |
@@ -1156,6 +1158,8 @@ bool bookmark_play(char *resume_file, int index, unsigned long elapsed, | |||
1156 | else | 1158 | else |
1157 | return false; | 1159 | return false; |
1158 | } | 1160 | } |
1161 | |||
1162 | playlist_set_modified(NULL, false); | ||
1159 | playlist_start(index, elapsed, offset); | 1163 | playlist_start(index, elapsed, offset); |
1160 | started = true; | 1164 | started = true; |
1161 | } | 1165 | } |