From 2492b5f1198161a04b046554df79390eb312ca5c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 10 Sep 2015 14:10:44 +0200
Subject: cache: do not include backbuffer size in total stream cache size

This causes weirdness with the "cache-size" property and option. Only
the read handler of the property included the backbuffer, while all
others did not. Make it consistent, and subtract the backbuffer size
from the cache size.

Fixes #2305.
---
 stream/cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'stream')

diff --git a/stream/cache.c b/stream/cache.c
index 43b7eba329..c4eaa6e261 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -367,7 +367,7 @@ static int cache_get_cached_control(stream_t *cache, int cmd, void *arg)
     struct priv *s = cache->priv;
     switch (cmd) {
     case STREAM_CTRL_GET_CACHE_SIZE:
-        *(int64_t *)arg = s->buffer_size;
+        *(int64_t *)arg = s->buffer_size - s->back_size;
         return STREAM_OK;
     case STREAM_CTRL_GET_CACHE_FILL:
         *(int64_t *)arg = s->max_filepos - s->read_filepos;
-- 
cgit v1.2.3