3 files changed, 5 insertions, 4 deletions
diff --git a/apps/plugins/mpegplayer/alloc.c b/apps/plugins/mpegplayer/alloc.c
index c4f936e..6b50b8f 100644
--- a/apps/plugins/mpegplayer/alloc.c
+++ b/apps/plugins/mpegplayer/alloc.c
@@ -27,6 +27,7 @@
 
 #include "plugin.h"
 #include "mpegplayer.h"
+#include <system.h>
 
 /* Main allocator */
 static off_t mem_ptr;
@@ -132,8 +133,8 @@ bool mpeg_alloc_init(unsigned char *buf, size_t mallocsize)
     mem_ptr = 0;
     /* Cache-align buffer or 4-byte align */
     mallocbuf = buf;
-    bufsize = align_buffer(PUN_PTR(void **, &mallocbuf),
-                           mallocsize, CACHEALIGN_UP(4));
+    bufsize = mallocsize;
+    ALIGN_BUFFER(mallocbuf, bufsize, CACHEALIGN_UP(4));
 
     /* Separate allocator for video */
     mpeg2_mem_ptr = 0;
diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c
index c008139..defd8ef 100644
--- a/apps/plugins/mpegplayer/disk_buf.c
+++ b/apps/plugins/mpegplayer/disk_buf.c
@@ -22,6 +22,7 @@
  ****************************************************************************/
 #include "plugin.h"
 #include "mpegplayer.h"
+#include <system.h>
 
 static struct mutex disk_buf_mtx SHAREDBSS_ATTR;
 static struct event_queue disk_buf_queue SHAREDBSS_ATTR;
@@ -859,7 +860,7 @@ bool disk_buf_init(void)
         return false;
 
 #ifdef PROC_NEEDS_CACHEALIGN
-    disk_buf.size = CACHEALIGN_BUFFER(&disk_buf.start, disk_buf.size);
+    CACHEALIGN_BUFFER(disk_buf.start, disk_buf.size);
     disk_buf.start = UNCACHED_ADDR(disk_buf.start);
 #endif
     disk_buf.size -= DISK_GUARDBUF_SIZE;
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index cb5d4ed..0b5bb51 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -283,7 +283,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 const struct plugin_api* rb;
 
 CACHE_FUNCTION_WRAPPERS(rb);
-ALIGN_BUFFER_WRAPPER(rb);
 
 /* One thing we can do here for targets with remotes is having a display
  * always on the remote instead of always forcing a popup on the main display */