Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp
- index 9beb59a..5cf0cff 100644
- --- a/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp
- +++ b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp
- @@ -766,7 +766,13 @@ int DVDRingBuffer::safe_read(void *data, uint sz)
- }
- // debug
- - LOG(VB_PLAYBACK, LOG_DEBUG, LOC + "DVDNAV_NAV_PACKET");
- + LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString("DVDNAV_NAV_PACKET - time:%1, pos:%2, vob:%3, cell:%4, seeking:%5, seektime:%6")
- + .arg(m_currentTime)
- + .arg(m_currentpos)
- + .arg(m_vobid)
- + .arg(m_cellid)
- + .arg(m_seeking)
- + .arg(m_seektime));
- // release buffer
- if (blockBuf != m_dvdBlockWriteBuf)
- @@ -1895,7 +1901,7 @@ bool DVDRingBuffer::NewSequence(bool new_sequence)
- return result;
- }
- - result = m_newSequence && m_inMenu;
- + result = m_newSequence;
- m_newSequence = false;
- if (result)
- LOG(VB_PLAYBACK, LOG_INFO, LOC + "Asking for still frame");
- diff --git a/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp b/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp
- index 804aaf1..65744c3 100644
- --- a/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp
- +++ b/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp
- @@ -154,9 +154,8 @@ bool MythDVDPlayer::VideoLoop(void)
- return !IsErrored();
- }
- - // we need a custom presentation method for still frame menus with audio
- - if (player_ctx->buffer->DVD()->IsInMenu() &&
- - !player_ctx->buffer->DVD()->IsInStillFrame())
- + // we need a custom presentation method for still frames with audio
- + if (!player_ctx->buffer->DVD()->IsInStillFrame())
- {
- // ensure we refresh the pause frame
- if (!dvd_stillframe_showing)
- @@ -166,9 +165,7 @@ bool MythDVDPlayer::VideoLoop(void)
- DisplayLastFrame();
- return !IsErrored();
- }
- -
- - // the still frame is treated as a pause frame
- - if (player_ctx->buffer->DVD()->IsInStillFrame())
- + else // the still frame is treated as a pause frame
- {
- // ensure we refresh the pause frame
- if (!dvd_stillframe_showing)
- @@ -195,10 +192,6 @@ bool MythDVDPlayer::VideoLoop(void)
- dvd_stillframe_showing = true;
- }
- - else
- - {
- - dvd_stillframe_showing = false;
- - }
- }
- // unpause the still frame if more frames become available
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement