From 36c6c0f79b84b7e82da468126e160dffce92e1c5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 23 Feb 2016 22:12:11 +0100
Subject: player: remove MPContext.sources fields

Some oddity that is not needed anymore. The only thing which still
referenced them was avoiding loading external files more than once,
which is now prevented by checking the list of tracks instead.
---
 player/core.h     |  2 --
 player/loadfile.c | 19 ++++---------------
 2 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'player')

diff --git a/player/core.h b/player/core.h
index ae95a20bdd..02bd01b03f 100644
--- a/player/core.h
+++ b/player/core.h
@@ -274,8 +274,6 @@ typedef struct MPContext {
     int64_t shown_vframes, shown_aframes;
 
     struct stream *stream; // stream that was initially opened
-    struct demuxer **sources; // all open demuxers
-    int num_sources;
 
     struct demux_chapter *chapters;
     int num_chapters;
diff --git a/player/loadfile.c b/player/loadfile.c
index 60a595c3da..7513e0b0b4 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -81,10 +81,6 @@ static void uninit_demuxer(struct MPContext *mpctx)
 
     free_demuxer_and_stream(mpctx->demuxer);
     mpctx->demuxer = NULL;
-
-    talloc_free(mpctx->sources);
-    mpctx->sources = NULL;
-    mpctx->num_sources = 0;
 }
 
 static void uninit_stream(struct MPContext *mpctx)
@@ -576,15 +572,8 @@ bool mp_remove_track(struct MPContext *mpctx, struct track *track)
     for (int n = mpctx->num_tracks - 1; n >= 0 && !in_use; n--)
         in_use |= mpctx->tracks[n]->demuxer == d;
 
-    if (!in_use) {
-        for (int n = 0; n < mpctx->num_sources; n++) {
-            if (mpctx->sources[n] == d) {
-                MP_TARRAY_REMOVE_AT(mpctx->sources, mpctx->num_sources, n);
-                break;
-            }
-        }
+    if (!in_use)
         free_demuxer_and_stream(d);
-    }
 
     mp_notify(mpctx, MPV_EVENT_TRACKS_CHANGED, NULL);
 
@@ -642,7 +631,6 @@ struct track *mp_add_external_file(struct MPContext *mpctx, char *filename,
         goto err_out;
     }
 
-    MP_TARRAY_APPEND(NULL, mpctx->sources, mpctx->num_sources, demuxer);
     if (mpctx->playback_initialized)
         enable_demux_thread(mpctx);
     return first;
@@ -684,8 +672,9 @@ void autoload_external_files(struct MPContext *mpctx)
     for (int i = 0; list && list[i].fname; i++) {
         char *filename = list[i].fname;
         char *lang = list[i].lang;
-        for (int n = 0; n < mpctx->num_sources; n++) {
-            if (strcmp(mpctx->sources[n]->stream->url, filename) == 0)
+        for (int n = 0; n < mpctx->num_tracks; n++) {
+            struct track *t = mpctx->tracks[n];
+            if (t->demuxer && strcmp(t->demuxer->stream->url, filename) == 0)
                 goto skip;
         }
         if (list[i].type == STREAM_SUB && !sc[STREAM_VIDEO] && !sc[STREAM_AUDIO])
-- 
cgit v1.2.3