diff options
| author | Andreas Zelend <ace20022@xbmc.org> | 2018-08-26 12:11:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 12:11:07 +0200 |
| commit | f21b477993cae9f59f77b8798a1390159863f3f7 (patch) | |
| tree | f378f02ab57e8cb282328ab760fdbb6da6734cc7 | |
| parent | 3f0facee65a1339c3578ff302bf9e51127c1706d (diff) | |
| parent | a934d78c64981a63c1a11d598817a8dc06d4425e (diff) | |
Merge pull request #14353 from ace20022/vob_subs18.0b1v2-Leia
[videoplayer] Fix external vob subs usage.
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp | 1 | ||||
| -rw-r--r-- | xbmc/cores/VideoPlayer/VideoPlayer.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp index f7d3ec7995..d2d4e5f0f5 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp @@ -212,6 +212,7 @@ bool CDVDDemuxVobsub::ParseId(SState& state, char* line) stream->codec = AV_CODEC_ID_DVD_SUBTITLE; stream->uniqueId = m_Streams.size(); stream->source = m_source; + stream->demuxerId = m_demuxerId; state.id = stream->uniqueId; m_Streams.push_back(stream.release()); diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index 7385c023f3..e5cbd2d637 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -4598,9 +4598,9 @@ int CVideoPlayer::AddSubtitleFile(const std::string& filename, const std::string if (static_cast<StreamFlags>(info.flag) != StreamFlags::FLAG_NONE) stream.flags = static_cast<StreamFlags>(info.flag); } - + UpdateContent(); return m_SelectionStreams.TypeIndexOf(STREAM_SUBTITLE, - m_SelectionStreams.Source(STREAM_SOURCE_DEMUX_SUB, filename), -1, 0); + m_SelectionStreams.Source(STREAM_SOURCE_DEMUX_SUB, filename), v.GetDemuxerId(), 0); } if(ext == ".sub") { |