From 8c7a9b0cd0c53a03f4c1e72cacd6e746fb9c589a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 7 Sep 2014 20:45:39 +0200
Subject: stream: change cache return values

Basically a cosmetic change, because currently the player just continues
even if the cache fails initializing.
---
 stream/cache.c  | 8 ++++----
 stream/stream.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'stream')

diff --git a/stream/cache.c b/stream/cache.c
index 90683aa6db..81408e098b 100644
--- a/stream/cache.c
+++ b/stream/cache.c
@@ -599,13 +599,13 @@ static void cache_uninit(stream_t *cache)
     talloc_free(s);
 }
 
-// return 1 on success, 0 if the function was interrupted and -1 on error, or
-// if the cache is disabled
+// return 1 on success, 0 if the cache is disabled/not needed, and -1 on error
+// or if the cache is disabled
 int stream_cache_init(stream_t *cache, stream_t *stream,
                       struct mp_cache_opts *opts)
 {
     if (opts->size < 1)
-        return -1;
+        return 0;
 
     struct priv *s = talloc_zero(NULL, struct priv);
     s->log = cache->log;
@@ -653,7 +653,7 @@ int stream_cache_init(stream_t *cache, stream_t *stream,
         return 1;
     for (;;) {
         if (stream_check_interrupt(cache))
-            return 0;
+            return -1;
         int64_t fill;
         int idle;
         if (stream_control(s->cache, STREAM_CTRL_GET_CACHE_FILL, &fill) < 0)
diff --git a/stream/stream.c b/stream/stream.c
index 455c0a5409..e2f71ae58f 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -827,15 +827,15 @@ bool stream_wants_cache(stream_t *stream, struct mp_cache_opts *opts)
     return use_opts.size > 0;
 }
 
-// return: 1 on success, 0 if the function was interrupted and -1 on error, or
-//         if the cache is disabled
+// return 1 on success, 0 if the cache is disabled/not needed, and -1 on error
+// or if the cache is disabled
 int stream_enable_cache(stream_t **stream, struct mp_cache_opts *opts)
 {
     stream_t *orig = *stream;
     struct mp_cache_opts use_opts = check_cache_opts(*stream, opts);
 
     if (use_opts.size < 1)
-        return -1;
+        return 0;
 
     stream_t *fcache = open_cache(orig, "file-cache");
     if (stream_file_cache_init(fcache, orig, &use_opts) <= 0) {
-- 
cgit v1.2.3