From 19b4faece29bd41e330d6f30379c410aa6c9252d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 5 Jan 2018 22:09:21 +0000 Subject: [PATCH] fixup after PR13295 --- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++-- xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h | 4 ++-- xbmc/cores/VideoPlayer/VideoPlayer.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index 995b2f8a6d386..3d3e4000f27ff 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -518,7 +518,7 @@ bool CDVDDemuxFFmpeg::Open(std::shared_ptr pInput, bool streami if (!fileinfo) { - CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInput); + const std::shared_ptr pExt = std::dynamic_pointer_cast(m_pInput); if (pExt && pExt->HasExtention()) { SAFE_DELETE(m_pSSIF); @@ -1581,7 +1581,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) pStream->codecpar->codec_tag = MKTAG('A', 'M', 'V', 'C'); AVStream* mvcStream = nullptr; - CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInput); + const std::shared_ptr pExt = std::dynamic_pointer_cast(m_pInput); if (pExt) { if (pExt->HasExtention()) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h index e260f5023f2f2..955e45fd73000 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h @@ -41,7 +41,7 @@ class CDemuxStreamSSIF int GetH264StreamId() { return m_h264StreamId; }; int GetMVCStreamId() { return m_mvcStreamId; }; void AddMVCExtPacket(DemuxPacket* &scrPkt); - void SetBluRay(CDVDInputStream::IExtentionStream* &bluRay) { m_bluRay = bluRay; }; + void SetBluRay(const std::shared_ptr &bluRay) { m_bluRay = bluRay; }; bool IsBluRay() { return m_bluRay != nullptr; }; private: @@ -49,7 +49,7 @@ class CDemuxStreamSSIF DemuxPacket* MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt); bool FillMVCQueue(double dtsBase); - CDVDInputStream::IExtentionStream* m_bluRay = nullptr; + std::shared_ptr m_bluRay = nullptr; std::queue m_H264queue; std::queue m_MVCqueue; int m_h264StreamId = -1; diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index 30febb0176b5c..cd71ffb871687 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -3743,7 +3743,7 @@ bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset) if (!player->OpenStream(hint)) return false; - CDVDInputStream::IExtentionStream* pExt = dynamic_cast(m_pInputStream); + const std::shared_ptr pExt = std::dynamic_pointer_cast(m_pInputStream); if (pExt && !static_cast(player)->SupportsExtention()) pExt->DisableExtention();