4 files changed, 6 insertions, 19 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)
 
     if (file)
     {
-        /* dummy ops with no callbacks, needed because by
-         * default buflib buffers can be moved around which must be avoided */
-        static struct buflib_callbacks dummy_ops;
         int handle;
         size_t buflen;
         /* use mp3 buffer for maximum load speed */
-        handle = core_alloc_maximum("temp", &buflen, &dummy_ops);
+        handle = core_alloc_maximum("temp", &buflen, &buflib_ops_locked);
         if (handle > 0)
         {
             /* load the playlist file */
@@ -2119,13 +2116,10 @@ int playlist_resume(void)
     bool sorted = true;
     int result = -1;
 
-    /* dummy ops with no callbacks, needed because by
-     * default buflib buffers can be moved around which must be avoided */
-    static struct buflib_callbacks dummy_ops;
     /* use mp3 buffer for maximum load speed */
     if (core_allocatable() < (1 << 10))
         talk_buffer_set_policy(TALK_BUFFER_LOOSE); /* back off voice buffer */
-    handle = core_alloc_maximum("temp", &buflen, &dummy_ops);
+    handle = core_alloc_maximum("temp", &buflen, &buflib_ops_locked);
     if (handle < 0)
     {
         splashf(HZ * 2, "%s(): OOM", __func__);
diff --git a/apps/plugin.c b/apps/plugin.c
index aa69b9ca03..8434fea07d 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -990,14 +990,11 @@ void* plugin_get_buffer(size_t *buffer_size)
  */
 static void* plugin_get_audio_buffer(size_t *buffer_size)
 {
-    /* dummy ops with no callbacks, needed because by
-     * default buflib buffers can be moved around which must be avoided */
-    static struct buflib_callbacks dummy_ops;
     if (plugin_buffer_handle <= 0)
     {
         plugin_buffer_handle = core_alloc_maximum("plugin audio buf",
                                                   &plugin_buffer_size,
-                                                  &dummy_ops);
+                                                  &buflib_ops_locked);
     }
 
     if (buffer_size)
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index ef10f8a433..0f6e8469ec 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -1406,12 +1406,9 @@ static int pcmrec_handle;
 static void on_init_recording(void)
 {
     send_event(RECORDING_EVENT_START, NULL);
-    /* dummy ops with no callbacks, needed because by
-     * default buflib buffers can be moved around which must be avoided
-     * FIXME: This buffer should play nicer and be shrinkable/movable */
-    static struct buflib_callbacks dummy_ops;
+    /* FIXME: This buffer should play nicer and be shrinkable/movable */
     talk_buffer_set_policy(TALK_BUFFER_LOOSE);
-    pcmrec_handle = core_alloc_maximum("pcmrec", &rec_buffer_size, &dummy_ops);
+    pcmrec_handle = core_alloc_maximum("pcmrec", &rec_buffer_size, &buflib_ops_locked);
     if (pcmrec_handle <= 0)
     /* someone is abusing core_alloc_maximum(). Fix this evil guy instead of
      * trying to handle OOM without hope */
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 37f443e036..fc06005c1d 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -328,8 +328,7 @@ static void allocate_tempbuf(void)
 #else /* !__PCTOOL__ */
     /* Need to pass dummy ops to prevent the buffer being moved
      * out from under us, since we yield during the tagcache commit. */
-    static struct buflib_callbacks dummy_ops;
-    tempbuf_handle = core_alloc_maximum("tc tempbuf", &size, &dummy_ops);
+    tempbuf_handle = core_alloc_maximum("tc tempbuf", &size, &buflib_ops_locked);
     if (tempbuf_handle > 0)
     {
         tempbuf = core_get_data(tempbuf_handle);