diff options
| author | Joakim Plate <elupus@ecce.se> | 2014-02-02 07:27:08 -0800 |
|---|---|---|
| committer | Joakim Plate <elupus@ecce.se> | 2014-02-02 07:27:08 -0800 |
| commit | 4a96b1be94c84b2b84797432b3f71699138f23d5 (patch) | |
| tree | 40525634463d80d9d1f6aa66b9c4fc2429898931 | |
| parent | a79eb9e28faa29d44ebcee6a3629c4894f8dd7c8 (diff) | |
| parent | fe45c02afeaed52ba926e2f50762a60458878138 (diff) | |
Merge pull request #4131 from Voyager1/fix-bluray-resume
[fix] Resume playback on Bluray
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDPlayer.cpp | 3 | ||||
| -rw-r--r-- | xbmc/cores/omxplayer/OMXPlayer.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp index 19ba19f56d..e8f637ca65 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1026,7 +1026,8 @@ void CDVDPlayer::Process() if (CDVDInputStream::IMenus* ptr = dynamic_cast<CDVDInputStream::IMenus*>(m_pInputStream)) { CLog::Log(LOGNOTICE, "DVDPlayer: playing a file with menu's"); - m_PlayerOptions.starttime = 0; + if(CDVDInputStreamNavigator* nav = dynamic_cast<CDVDInputStreamNavigator*>(m_pInputStream)) + m_PlayerOptions.starttime = 0; if(m_PlayerOptions.state.size() > 0) ptr->SetState(m_PlayerOptions.state); diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp index a26183ff38..244024e60b 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp @@ -1083,7 +1083,8 @@ void COMXPlayer::Process() if (CDVDInputStream::IMenus* ptr = dynamic_cast<CDVDInputStream::IMenus*>(m_pInputStream)) { CLog::Log(LOGNOTICE, "OMXPlayer: playing a file with menu's"); - m_PlayerOptions.starttime = 0; + if(CDVDInputStreamNavigator* nav = dynamic_cast<CDVDInputStreamNavigator*>(m_pInputStream)) + m_PlayerOptions.starttime = 0; if(m_PlayerOptions.state.size() > 0) ptr->SetState(m_PlayerOptions.state); |