From 5824eb7107a612880f68cc8e4f42cfff1bbf88ba Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 27 Feb 2015 19:44:39 +0100 Subject: stream_rar: treat rar files as playlists Refactors an older hack, which for some reason used a more complicated way. This generates the playlist representing the contents of the rar file in demux_playlist.c. The pseudo-demuxer could easily be separate from the the playlist parsers (and in fact there's almost no shared code), but I don't think this obscure feature deserves a separate file. Sample files created with: rar a -v20000k -m0 files.rar file1.mkv file1.mkv --- stream/stream.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'stream/stream.c') diff --git a/stream/stream.c b/stream/stream.c index fd545da7e7..4e15f498d9 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -74,8 +74,7 @@ extern const stream_info_t stream_info_dvdnav; extern const stream_info_t stream_info_bdmv_dir; extern const stream_info_t stream_info_bluray; extern const stream_info_t stream_info_bdnav; -extern const stream_info_t stream_info_rar_filter; -extern const stream_info_t stream_info_rar_entry; +extern const stream_info_t stream_info_rar; extern const stream_info_t stream_info_edl; static const stream_info_t *const stream_list[] = { @@ -115,8 +114,7 @@ static const stream_info_t *const stream_list[] = { &stream_info_null, &stream_info_mf, &stream_info_edl, - &stream_info_rar_filter, - &stream_info_rar_entry, + &stream_info_rar, &stream_info_file, NULL }; -- cgit v1.2.3