From ed99a96ad7574937dcd0419e703f5f264947e9ed Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 5 Dec 2012 22:30:08 +0100 Subject: [PATCH] Moved resetting of still frame timer to before call to WaitForPlayer to avoid the second of two sequential (but physically separated) stills being skipped. --- mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp index cb9b1af..c9b8e5f 100644 --- a/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp +++ b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp @@ -648,15 +648,6 @@ int DVDRingBuffer::safe_read(void *data, uint sz) .arg(m_title).arg(still).arg(m_part).arg(m_titleParts)); } - // wait unless it is a transition from one normal video cell to - // another or the same menu id - if (((m_still != m_lastStill) || (m_title != m_lastTitle)) && - !((m_title == 0 && m_lastTitle == 0) && - (m_part == m_lastPart))) - { - WaitForPlayer(); - } - // if the new cell is a still frame, reset the timer if (m_parent) { @@ -666,6 +657,15 @@ int DVDRingBuffer::safe_read(void *data, uint sz) m_parent->SetStillFrameTimeout(0); } + // wait unless it is a transition from one normal video cell to + // another or the same menu id + if (((m_still != m_lastStill) || (m_title != m_lastTitle)) && + !((m_title == 0 && m_lastTitle == 0) && + (m_part == m_lastPart))) + { + WaitForPlayer(); + } + // clear menus/still frame selections m_lastvobid = m_vobid; m_lastcellid = m_cellid; -- 1.7.9.5