summaryrefslogtreecommitdiff
path: root/apps/playlist.c
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-01-18 18:57:06 +0000
committerAidan MacDonald <amachronic@protonmail.com>2022-02-12 10:24:32 -0500
commite8faf2f2adeb9066de3c968a57803bb262f61ee1 (patch)
tree130c2e3d904da7876ac88ea089f85f48cab5e313 /apps/playlist.c
parent95dfc489b5a602f68202b206c434f8485e9d3915 (diff)
downloadrockbox-e8faf2f2adeb9066de3c968a57803bb262f61ee1.tar.gz
rockbox-e8faf2f2adeb9066de3c968a57803bb262f61ee1.zip
buflib: add a common dummy callbacks struct & use it
There are various allocations that can't be moved or shrunk. Provide a global callback struct for this use case instead of making each caller declare its own dummy struct. Also fixed ROLO and x1000 installer code which incorrectly used movable allocations. Change-Id: I00088396b9826e02e69a4a33477fe1a7816374f1
Diffstat (limited to 'apps/playlist.c')
-rw-r--r--apps/playlist.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/playlist.c b/apps/playlist.c
index e93feb6abb..a7b16d8b1b 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -2076,13 +2076,10 @@ int playlist_create(const char *dir, const char *file)
2076 2076
2077 if (file) 2077 if (file)
2078 { 2078 {
2079 /* dummy ops with no callbacks, needed because by
2080 * default buflib buffers can be moved around which must be avoided */
2081 static struct buflib_callbacks dummy_ops;
2082 int handle; 2079 int handle;
2083 size_t buflen; 2080 size_t buflen;
2084 /* use mp3 buffer for maximum load speed */ 2081 /* use mp3 buffer for maximum load speed */
2085 handle = core_alloc_maximum("temp", &buflen, &dummy_ops); 2082 handle = core_alloc_maximum("temp", &buflen, &buflib_ops_locked);
2086 if (handle > 0) 2083 if (handle > 0)
2087 { 2084 {
2088 /* load the playlist file */ 2085 /* load the playlist file */
@@ -2119,13 +2116,10 @@ int playlist_resume(void)
2119 bool sorted = true; 2116 bool sorted = true;
2120 int result = -1; 2117 int result = -1;
2121 2118
2122 /* dummy ops with no callbacks, needed because by
2123 * default buflib buffers can be moved around which must be avoided */
2124 static struct buflib_callbacks dummy_ops;
2125 /* use mp3 buffer for maximum load speed */ 2119 /* use mp3 buffer for maximum load speed */
2126 if (core_allocatable() < (1 << 10)) 2120 if (core_allocatable() < (1 << 10))
2127 talk_buffer_set_policy(TALK_BUFFER_LOOSE); /* back off voice buffer */ 2121 talk_buffer_set_policy(TALK_BUFFER_LOOSE); /* back off voice buffer */
2128 handle = core_alloc_maximum("temp", &buflen, &dummy_ops); 2122 handle = core_alloc_maximum("temp", &buflen, &buflib_ops_locked);
2129 if (handle < 0) 2123 if (handle < 0)
2130 { 2124 {
2131 splashf(HZ * 2, "%s(): OOM", __func__); 2125 splashf(HZ * 2, "%s(): OOM", __func__);