Ticket #6169: fix_PosMapFromEnc.diff

libs/libmythtv/decoderbase.cpp

@@ -178 +178 @@
     return true;
 }
 
+/** \fn DecoderBase::PosMapFromEnc()
+ *  \brief Queries encoder for position map data
+ *         that has not been committed to the DB yet.
+ *
+ *  PosMapFromDb() must be called first in order to
+ *  set positionMapType and keyframedist correctly.
+ *
+ */
 bool DecoderBase::PosMapFromEnc(void)
 {
     if (!m_parent)
@@ -191 +199 @@
     }
 
     QMap<long long, long long> posMap;
-    if (m_parent->PosMapFromEnc(start, posMap))
+    if (!m_parent->PosMapFromEnc(start, posMap))
         return false;
 
     QMutexLocker locker(&m_positionMapLock);
 
-    // LiveTV will always have a by frame keyframe map..
-    positionMapType = MARK_GOP_BYFRAME;
-    keyframedist = 1;
-
     // append this new position map to class's
     m_positionMap.reserve(m_positionMap.size() + posMap.size());
     for (QMap<long long,long long>::const_iterator it = posMap.begin();
          it != posMap.end(); it++) 
     {
-        PosMapEntry e = {it.key(), it.key(), *it};
+        PosMapEntry e = {it.key(), it.key() * keyframedist, *it};
         m_positionMap.push_back(e);
     }
     if (!m_positionMap.empty())