From f77515ebafb9fdfd177671b848211824e654206f Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 7 Sep 2018 21:41:52 +0200 Subject: stream_libarchive: remove base filename stuff Apparently this was so that when playing a video file from a .rar file, it would load external subtitles with the same name (instead of looking for mpv's rar:// mangled URL). This was requested on github almost 5 years ago. Seems like a weird feature, and I don't care. Drop it, because it complicates some in progress change. --- stream/stream.h | 3 --- stream/stream_libarchive.c | 3 --- 2 files changed, 6 deletions(-) (limited to 'stream') diff --git a/stream/stream.h b/stream/stream.h index 589e6b35cc..c423d70096 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -54,9 +54,6 @@ enum stream_ctrl { // stream_memory.c STREAM_CTRL_SET_CONTENTS, - // stream_libarchive.c - STREAM_CTRL_GET_BASE_FILENAME, - // Certain network protocols STREAM_CTRL_AVSEEK, STREAM_CTRL_HAS_AVSEEK, diff --git a/stream/stream_libarchive.c b/stream/stream_libarchive.c index 54ebc64b98..bc1fb94d12 100644 --- a/stream/stream_libarchive.c +++ b/stream/stream_libarchive.c @@ -472,9 +472,6 @@ static int archive_entry_control(stream_t *s, int cmd, void *arg) { struct priv *p = s->priv; switch (cmd) { - case STREAM_CTRL_GET_BASE_FILENAME: - *(char **)arg = talloc_strdup(NULL, p->src->url); - return STREAM_OK; case STREAM_CTRL_GET_SIZE: if (p->entry_size < 0) break; -- cgit v1.2.3