From a89dcc949678c5bd9608be8e6dd68220c966f4a1 Mon Sep 17 00:00:00 2001 From: Jim Stichnoth Date: Tue, 30 Jul 2013 06:22:11 -0700 Subject: [PATCH 1/3] Improve the ability to seek in an audio-only recording. The improvement is when the recording lacks a seektable. Refs #11357 --- mythtv/libs/libmythtv/avformatdecoder.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp index 6b9a863db7a..4a1a5498ef9 100644 --- a/mythtv/libs/libmythtv/avformatdecoder.cpp +++ b/mythtv/libs/libmythtv/avformatdecoder.cpp @@ -587,8 +587,6 @@ bool AvFormatDecoder::DoFastForward(long long desiredFrame, bool discardFrames) break; } } - if (!st) - return false; int seekDelta = desiredFrame - framesPlayed; @@ -622,7 +620,7 @@ bool AvFormatDecoder::DoFastForward(long long desiredFrame, bool discardFrames) int normalframes = 0; - if (st->cur_dts != (int64_t)AV_NOPTS_VALUE) + if (st && st->cur_dts != (int64_t)AV_NOPTS_VALUE) { int64_t adj_cur_dts = st->cur_dts; From 1255ccfddb6f80f672aa1cfb0d11bc9208e6dea9 Mon Sep 17 00:00:00 2001 From: Stuart Auchterlonie Date: Wed, 31 Jul 2013 11:19:27 +0100 Subject: [PATCH 2/3] UK EIT Fixup: remove 'New: ' from Titles. Cherry picked from 2c7357f7be50b27975fe47c45f8dede3c62d7aaa Closes #11715 --- mythtv/libs/libmythtv/eitfixup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mythtv/libs/libmythtv/eitfixup.cpp b/mythtv/libs/libmythtv/eitfixup.cpp index 02c44b8afdf..a1d63ebdd7c 100644 --- a/mythtv/libs/libmythtv/eitfixup.cpp +++ b/mythtv/libs/libmythtv/eitfixup.cpp @@ -34,7 +34,7 @@ EITFixUp::EITFixUp() m_dishPPVCode("\\s*\\(([A-Z]|[0-9]){5}\\)\\s*$"), m_ukThen("\\s*(Then|Followed by) 60 Seconds\\.", Qt::CaseInsensitive), m_ukNew("(New\\.|\\s*(Brand New|New)\\s*(Series|Episode)\\s*[:\\.\\-])",Qt::CaseInsensitive), - m_ukNewTitle("^Brand New\\s*",Qt::CaseInsensitive), + m_ukNewTitle("^(Brand New|New:)\\s*",Qt::CaseInsensitive), m_ukCEPQ("[:\\!\\.\\?]"), m_ukColonPeriod("[:\\.]"), m_ukDotSpaceStart("^\\. "), From d655bc49e0faed6cba80f6ddebaa8da4c2e6e848 Mon Sep 17 00:00:00 2001 From: Paul Harrison Date: Wed, 31 Jul 2013 15:32:41 +0100 Subject: [PATCH 3/3] mytharchivehelper: fix disappearing seektables when importing a recording There was a typo in the query to remove the old seektables which rather than the query failing it somehow was removing all the seektables! Fixes #11712. --- mythplugins/mytharchive/mytharchivehelper/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mythplugins/mytharchive/mytharchivehelper/main.cpp b/mythplugins/mytharchive/mytharchivehelper/main.cpp index cff672f6d1c..b9d8a8ece2a 100644 --- a/mythplugins/mytharchive/mytharchivehelper/main.cpp +++ b/mythplugins/mytharchive/mytharchivehelper/main.cpp @@ -1066,7 +1066,7 @@ int NativeArchive::importRecording(const QDomElement &itemNode, { // delete any records for this recordings query.prepare("DELETE FROM recordedmarkup " - "WHERE chanid = CHANID AND starttime = STARTTIME;"); + "WHERE chanid = :CHANID AND starttime = :STARTTIME;"); query.bindValue(":CHANID", chanID); query.bindValue(":STARTTIME", startTime); query.exec(); @@ -1119,7 +1119,7 @@ int NativeArchive::importRecording(const QDomElement &itemNode, { // delete any records for this recordings query.prepare("DELETE FROM recordedseek " - "WHERE chanid = CHANID AND starttime = STARTTIME;"); + "WHERE chanid = :CHANID AND starttime = :STARTTIME;"); query.bindValue(":CHANID", chanID); query.bindValue(":STARTTIME", startTime); query.exec();