3 files changed, 1 insertions, 65 deletions

diff --git a/apps/buffering.c b/apps/buffering.c
index db555d8805..8661a42ab8 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -1436,62 +1436,6 @@ ssize_t bufgetdata(int handle_id, size_t size, void **data)
     return size;
 }
 
-ssize_t bufgettail(int handle_id, size_t size, void **data)
-{
-    if (thread_self() != buffering_thread_id)
-        return ERR_WRONG_THREAD; /* only from buffering thread */
-
-    /* We don't support tail requests of > guardbuf_size, for simplicity */
-    if (size > GUARD_BUFSIZE)
-        return ERR_INVALID_VALUE;
-
-    const struct memory_handle *h = find_handle(handle_id);
-    if (!h)
-        return ERR_HANDLE_NOT_FOUND;
-
-    if (h->end >= h->filesize) {
-        size_t tidx = ringbuf_sub_empty(h->widx, size);
-
-        if (tidx + size > buffer_len) {
-            size_t copy_n = tidx + size - buffer_len;
-            memcpy(guard_buffer, ringbuf_ptr(0), copy_n);
-        }
-
-        *data = ringbuf_ptr(tidx);
-    }
-    else {
-        size = ERR_HANDLE_NOT_DONE;
-    }
-
-    return size;
-}
-
-ssize_t bufcuttail(int handle_id, size_t size)
-{
-    if (thread_self() != buffering_thread_id)
-        return ERR_WRONG_THREAD; /* only from buffering thread */
-
-    struct memory_handle *h = find_handle(handle_id);
-    if (!h)
-        return ERR_HANDLE_NOT_FOUND;
-
-    if (h->end >= h->filesize) {
-        /* Cannot trim to before read position */
-        size_t available = h->end - MAX(h->start, h->pos);
-        if (available < size)
-            size = available;
-
-        h->widx = ringbuf_sub_empty(h->widx, size);
-        h->filesize -= size;
-        h->end -= size;
-    } else {
-        size = ERR_HANDLE_NOT_DONE;
-    }
-
-    return size;
-}
-
-
 /*
 SECONDARY EXPORTED FUNCTIONS
 ============================
diff --git a/apps/buffering.h b/apps/buffering.h
index 1a75d865ae..bc47d6b1a1 100644
--- a/apps/buffering.h
+++ b/apps/buffering.h
@@ -46,8 +46,7 @@ enum data_type {
 #define ERR_FILE_ERROR          -4
 #define ERR_HANDLE_NOT_DONE     -5
 #define ERR_UNSUPPORTED_TYPE    -6
-#define ERR_WRONG_THREAD        -7
-#define ERR_BITMAP_TOO_LARGE    -8
+#define ERR_BITMAP_TOO_LARGE    -7
 
 /* Initialise the buffering subsystem */
 void buffering_init(void) INIT_ATTR;
@@ -68,8 +67,6 @@ bool buffering_reset(char *buf, size_t buflen);
  * bufftell  : Return the handle's file read position
  * bufread   : Copy data from a handle to a buffer
  * bufgetdata: Obtain a pointer for linear access to a "size" amount of data
- * bufgettail: Out-of-band get the last size bytes of a handle.
- * bufcuttail: Out-of-band remove the trailing 'size' bytes of a handle.
  *
  * NOTE: bufread and bufgetdata will block the caller until the requested
  * amount of data is ready (unless EOF is reached).
@@ -85,8 +82,6 @@ int bufadvance(int handle_id, off_t offset);
 off_t bufftell(int handle_id);
 ssize_t bufread(int handle_id, size_t size, void *dest);
 ssize_t bufgetdata(int handle_id, size_t size, void **data);
-ssize_t bufgettail(int handle_id, size_t size, void **data);
-ssize_t bufcuttail(int handle_id, size_t size);
 
 /***************************************************************************
  * SECONDARY FUNCTIONS
diff --git a/apps/playback.c b/apps/playback.c
index a56c6d17ec..7fdb302d71 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -3467,9 +3467,6 @@ static void buffer_event_finished_callback(unsigned short id, void *ev_data)
         break;
 
     case TYPE_PACKET_AUDIO:
-        /* Strip any useless trailing tags that are left. */
-        strip_tags(hid);
-        /* Fall-through */
     case TYPE_ATOMIC_AUDIO:
         LOGFQUEUE("buffering > audio Q_AUDIO_HANDLE_FINISHED: %d", hid);
         audio_queue_post(Q_AUDIO_HANDLE_FINISHED, hid);