Ticket #11713: 11713_v1.patch

mythtv/libs/libmyth/programinfo.cpp

@@ -2695 +2695 @@
     return (bookmarkmap.isEmpty()) ? 0 : bookmarkmap.begin().key();
 }
 
+/** \brief Gets any preroll position in database,
+ *         unless the ignore preroll flag is set.
+ *
+ *  \return Preroll position in frames if the query is executed
+ *          and succeeds, zero otherwise.
+ */
+uint64_t ProgramInfo::QueryPreroll(void) const
+{
+    if (programflags & FL_IGNOREPREROLL)
+        return 0;
+
+    frm_dir_map_t bookmarkmap;
+    QueryMarkupMap(bookmarkmap, MARK_UTIL_PREROLL);
+
+    return (bookmarkmap.isEmpty()) ? 0 : bookmarkmap.begin().key();
+}
+
+/** \brief Gets any playpos position in database,
+ *         unless the ignore playpos flag is set.
+ *
+ *  \return PlayPos position in frames if the query is executed
+ *          and succeeds, zero otherwise.
+ */
+uint64_t ProgramInfo::QueryPlayPos(void) const
+{
+    if (programflags & FL_IGNOREPLAYPOS)
+        return 0;
+
+    frm_dir_map_t bookmarkmap;
+    QueryMarkupMap(bookmarkmap, MARK_UTIL_PLAYPOS);
+
+    return (bookmarkmap.isEmpty()) ? 0 : bookmarkmap.begin().key();
+}
+
 /** \brief Queries "dvdbookmark" table for bookmarking DVD serial
  *         number. Deletes old dvd bookmarks if "delbookmark" is set.
  *

mythtv/libs/libmyth/programinfo.h

@@ -452 +452 @@
 
     uint32_t GetProgramFlags(void)        const { return programflags; }
     ProgramInfoType GetProgramInfoType(void) const
-        { return (ProgramInfoType)((programflags & FL_TYPEMASK) >> 16); }
+        { return (ProgramInfoType)((programflags & FL_TYPEMASK) >> 20); }
     bool IsGeneric(void) const;
     bool IsInUsePlaying(void)   const { return programflags & FL_INUSEPLAYING;}
     bool IsCommercialFree(void) const { return programflags & FL_CHANCOMMFREE;}
@@ -489 +489 @@
     // Quick sets
     void SetTitle(const QString &t) { title = t; title.detach(); }
     void SetProgramInfoType(ProgramInfoType t)
-        { programflags &= ~FL_TYPEMASK; programflags |= ((uint32_t)t<<16); }
+        { programflags &= ~FL_TYPEMASK; programflags |= ((uint32_t)t<<20); }
     void SetPathname(const QString&) const;
     void SetChanID(uint _chanid) { chanid = _chanid; }
     void SetScheduledStartTime(const QDateTime &dt) { startts      = dt;    }
@@ -532 +532 @@
         programflags &= ~FL_IGNOREBOOKMARK;
         programflags |= (ignore) ? FL_IGNOREBOOKMARK : 0;
     }
+    /// \brief If "ignore" is true QueryPreroll() will return 0, otherwise
+    ///        QueryPreroll() will return the preroll position if it exists.
+    void SetIgnorePreroll(bool ignore)
+    {
+        programflags &= ~FL_IGNOREPREROLL;
+        programflags |= (ignore) ? FL_IGNOREPREROLL : 0;
+    }
+    /// \brief If "ignore" is true QueryPlayPos() will return 0, otherwise
+    ///        QueryPlayPos() will return the playback position if it exists.
+    void SetIgnorePlayPos(bool ignore)
+    {
+        programflags &= ~FL_IGNOREPLAYPOS;
+        programflags |= (ignore) ? FL_IGNOREPLAYPOS : 0;
+    }
     virtual void SetRecordingID(uint _recordedid) { recordedid = _recordedid; }
     void SetRecordingStatus(RecStatus::Type status) { recstatus = status; }
     void SetRecordingRuleType(RecordingType type) { rectype   = type;   }
@@ -544 +558 @@
     uint        QueryMplexID(void) const;
     QDateTime   QueryBookmarkTimeStamp(void) const;
     uint64_t    QueryBookmark(void) const;
+    uint64_t    QueryPreroll(void) const;
+    uint64_t    QueryPlayPos(void) const;
     CategoryType QueryCategoryType(void) const;
     QStringList QueryDVDBookmark(const QString &serialid) const;
     bool        QueryIsEditing(void) const;
@@ -658 +674 @@
     static QMap<QString,bool> QueryJobsRunning(int type);
     static QStringList LoadFromScheduler(const QString &altTable, int recordid);
 
-  protected:
     // Flagging map support methods
     void QueryMarkupMap(frm_dir_map_t&, MarkTypes type,
                         bool merge = false) const;
@@ -667 +682 @@
     void ClearMarkupMap(MarkTypes type = MARK_ALL,
                         int64_t min_frm = -1, int64_t max_frm = -1) const;
 
+  protected:
     // Creates a basename from the start and end times
     QString CreateRecordBasename(const QString &ext) const;
 

mythtv/libs/libmyth/programtypes.cpp

@@ -53 +53 @@
         case MARK_VIDEO_RATE:   return "VIDEO_RATE";
         case MARK_DURATION_MS:  return "DURATION_MS";
         case MARK_TOTAL_FRAMES: return "TOTAL_FRAMES";
+        case MARK_UTIL_PREROLL: return "UTIL_PREROLL";
+        case MARK_UTIL_PLAYPOS: return "UTIL_PLAYPOS";
     }
 
     return "unknown";

mythtv/libs/libmyth/programtypes.h

@@ -74 +74 @@
     MARK_VIDEO_RATE    = 32,
     MARK_DURATION_MS   = 33,
     MARK_TOTAL_FRAMES  = 34,
+    MARK_UTIL_PREROLL  = 40,
+    MARK_UTIL_PLAYPOS  = 41,
 } MarkTypes;
 MPUBLIC QString toString(MarkTypes type);
 
@@ -145 +147 @@
     FL_DUPLICATE      = 0x00002000,
     FL_REACTIVATE     = 0x00004000,
     FL_IGNOREBOOKMARK = 0x00008000,
+    FL_IGNOREPREROLL  = 0x00010000,
+    FL_IGNOREPLAYPOS  = 0x00020000,
     // if you move the type mask please edit {Set,Get}ProgramInfoType()
-    FL_TYPEMASK       = 0x000F0000,
-    FL_INUSERECORDING = 0x00100000,
-    FL_INUSEPLAYING   = 0x00200000,
-    FL_INUSEOTHER     = 0x00400000,
+    FL_TYPEMASK       = 0x00F00000,
+    FL_INUSERECORDING = 0x01000000,
+    FL_INUSEPLAYING   = 0x02000000,
+    FL_INUSEOTHER     = 0x04000000,
 } ProgramFlag;
 
 typedef enum ProgramInfoType {

mythtv/libs/libmythtv/mythplayer.cpp

@@ -2870 +2870 @@
     player_ctx->LockPlayingInfo(__FILE__, __LINE__);
     {
         if (player_ctx->playingInfo)
+        {
+            // When initial playback gets underway, we override the ProgramInfo
+            // flags such that future calls to GetBookmark() will consider only
+            // an actual bookmark and not preroll or playpos information.
             player_ctx->playingInfo->SetIgnoreBookmark(false);
+            player_ctx->playingInfo->SetIgnorePreroll(true);
+            player_ctx->playingInfo->SetIgnorePlayPos(true);
+        }
     }
     player_ctx->UnlockPlayingInfo(__FILE__, __LINE__);
     commBreakMap.LoadMap(player_ctx, framesPlayed);
@@ -3601 +3608 @@
     {
         player_ctx->LockPlayingInfo(__FILE__, __LINE__);
         if (player_ctx->playingInfo)
+        {
             bookmark = player_ctx->playingInfo->QueryBookmark();
+            if (bookmark == 0)
+                bookmark = player_ctx->playingInfo->QueryPreroll();
+            if (bookmark == 0)
+                bookmark = player_ctx->playingInfo->QueryPlayPos();
+        }
         player_ctx->UnlockPlayingInfo(__FILE__, __LINE__);
     }
 

mythtv/libs/libmythtv/recorders/recorderbase.cpp

@@ -56 +56 @@
       request_pause(false),     paused(false),
       request_recording(false), recording(false),
       nextRingBuffer(NULL),     nextRecording(NULL),
-      positionMapType(MARK_GOP_BYFRAME)
+      positionMapType(MARK_GOP_BYFRAME),
+      estimatedPrerollMS(0), lastSavedKeyframe(0), lastSavedDuration(0)
 {
     ClearStatistics();
     QMutexLocker locker(avcodeclock);
@@ -114 +115 @@
         //       instance which may lead to the possibility that changes made
         //       in the database by one are overwritten by the other
         curRecording = new RecordingInfo(*pginfo);
+        // Compute an estimate of the actual preroll for setting the
+        // MARK_UTIL_PREROLL mark.  We can't reliably use
+        // curRecording->GetRecordingStartTime() because the scheduler rounds it
+        // to the nearest minute, so we use the current time instead.
+        estimatedPrerollMS =
+            MythDate::current().msecsTo(curRecording->GetScheduledStartTime());
         RecordingFile *recFile = curRecording->GetRecordingFile();
         recFile->m_containerFormat = m_containerFormat;
         recFile->Save();
@@ -579 +586 @@
     bool needToSave = force;
     positionMapLock.lock();
 
-    uint delta_size = positionMapDelta.size();
+    bool has_delta = !positionMapDelta.empty();
     // set pm_elapsed to a fake large value if the timer hasn't yet started
     uint pm_elapsed = (positionMapTimer.isRunning()) ?
         positionMapTimer.elapsed() : ~0;
     // save on every 1.5 seconds if in the first few frames of a recording
     needToSave |= (positionMap.size() < 30) &&
-        (delta_size >= 1) && (pm_elapsed >= 1500);
+        has_delta && (pm_elapsed >= 1500);
     // save every 10 seconds later on
-    needToSave |= (delta_size >= 1) && (pm_elapsed >= 10000);
+    needToSave |= has_delta && (pm_elapsed >= 10000);
     // Assume that durationMapDelta is the same size as
     // positionMapDelta and implicitly use the same logic about when
     // to same durationMapDelta.
@@ -595 +602 @@
     if (curRecording && needToSave)
     {
         positionMapTimer.start();
-        if (delta_size)
+        if (has_delta)
         {
             // copy the delta map because most times we are called it will be in
             // another thread and we don't want to lock the main recorder thread
@@ -609 +616 @@
             curRecording->SavePositionMapDelta(deltaCopy, positionMapType);
             curRecording->SavePositionMapDelta(durationDeltaCopy,
                                                MARK_DURATION_MS);
+
+            TryWritePrerollMark(durationDeltaCopy);
         }
         else
         {
@@ -626 +635 @@
     }
 }
 
+void RecorderBase::TryWritePrerollMark(const frm_pos_map_t &durationDeltaCopy)
+{
+    // Note: all log strings contain "preroll bookmark" for searching.
+    if (estimatedPrerollMS <= 0)
+    {
+        // Do nothing because no preroll bookmark is needed.
+        LOG(VB_RECORD, LOG_DEBUG,
+            QString("No preroll bookmark needed because delta=%1")
+            .arg(estimatedPrerollMS));
+        return;
+    }
+    frm_pos_map_t::const_iterator last_it = durationDeltaCopy.end();
+    --last_it;
+    long long bookmarkFrame = 0;
+    LOG(VB_RECORD, LOG_DEBUG,
+        QString("durationDeltaCopy.begin() = (%1,%2)")
+        .arg(durationDeltaCopy.begin().key())
+        .arg(durationDeltaCopy.begin().value()));
+    if (estimatedPrerollMS > *last_it)
+    {
+        // Do nothing because we haven't reached recstartts yet.
+        LOG(VB_RECORD, LOG_DEBUG,
+            QString("No preroll bookmark yet because estimatedPrerollMS=%1 "
+                    "and *last_it=%2")
+            .arg(estimatedPrerollMS).arg(*last_it));
+    }
+    else if (lastSavedDuration <= estimatedPrerollMS &&
+             estimatedPrerollMS < *durationDeltaCopy.begin())
+    {
+        // Set preroll bookmark @ lastSavedKeyframe
+        LOG(VB_RECORD, LOG_DEBUG,
+            QString("Set preroll bookmark=%1 because %2<=%3<%4")
+            .arg(lastSavedKeyframe).arg(lastSavedDuration)
+            .arg(estimatedPrerollMS).arg(*durationDeltaCopy.begin()));
+        bookmarkFrame = lastSavedKeyframe;
+    }
+    else if (*durationDeltaCopy.begin() <= estimatedPrerollMS &&
+             estimatedPrerollMS < *last_it)
+    {
+        frm_pos_map_t::const_iterator upper_it = durationDeltaCopy.begin();
+        for (; upper_it != durationDeltaCopy.end(); ++upper_it)
+        {
+            if (*upper_it > estimatedPrerollMS)
+            {
+                --upper_it;
+                // Set preroll bookmark @ upper_it.key()
+                LOG(VB_RECORD, LOG_DEBUG,
+                    QString("Set preroll bookmark=%1 because "
+                            "estimatedPrerollMS=%2 and upper_it.value()=%3")
+                    .arg(upper_it.key()).arg(estimatedPrerollMS)
+                    .arg(upper_it.value()));
+                bookmarkFrame = upper_it.key();
+                break;
+            }
+        }
+    }
+    else
+    {
+        // do nothing
+        LOG(VB_RECORD, LOG_DEBUG, "No preroll bookmark due to fallthrough");
+    }
+    if (bookmarkFrame)
+    {
+        frm_dir_map_t prerollMap;
+        prerollMap[bookmarkFrame] = MARK_UTIL_PREROLL;
+        curRecording->SaveMarkupMap(prerollMap, MARK_UTIL_PREROLL);
+    }
+    lastSavedKeyframe = last_it.key();
+    lastSavedDuration = last_it.value();
+    LOG(VB_RECORD, LOG_DEBUG,
+        QString("Setting lastSavedKeyframe=%1 lastSavedDuration=%2 "
+                "for preroll bookmark calculations")
+        .arg(lastSavedKeyframe).arg(lastSavedDuration));
+}
+
 void RecorderBase::AspectChange(uint aspect, long long frame)
 {
     MarkTypes mark = MARK_ASPECT_4_3;

mythtv/libs/libmythtv/recorders/recorderbase.h

@@ -292 +292 @@
      */
     void SetTotalFrames(uint64_t total_frames);
 
+    void TryWritePrerollMark(const frm_pos_map_t &durationDeltaCopy);
+
     TVRec         *tvrec;
     RingBuffer    *ringBuffer;
     bool           weMadeBuffer;
@@ -341 +343 @@
     frm_pos_map_t  durationMapDelta;
     MythTimer      positionMapTimer;
 
+    // Preroll bookmark support
+    qint64         estimatedPrerollMS;
+    long long      lastSavedKeyframe;
+    long long      lastSavedDuration;
+
     // Statistics
     // Note: Once we enter RecorderBase::run(), only that thread can
     // update these values safely. These values are read in that thread

mythtv/libs/libmythtv/tv_play.cpp

@@ -138 +138 @@
 #else
 const uint TV::kEndOfPlaybackFirstCheckTimer = 5000;
 #endif
+const uint TV::kSavePlayPosTimeout           = 30000;
 
 /**
  * \brief stores last program info. maintains info so long as
@@ -335 +336 @@
     {
         curProgram = new ProgramInfo(*tvrec);
         curProgram->SetIgnoreBookmark(flags & kStartTVIgnoreBookmark);
+        curProgram->SetIgnorePreroll(flags & kStartTVIgnorePreroll);
+        curProgram->SetIgnorePlayPos(flags & kStartTVIgnorePlayPos);
     }
 
     PlaySettings settings(curProgram ? curProgram->GetPlaybackGroup() : "Default");
@@ -1070 +1073 @@
       endOfPlaybackTimerId(0),      embedCheckTimerId(0),
       endOfRecPromptTimerId(0),     videoExitDialogTimerId(0),
       pseudoChangeChanTimerId(0),   speedChangeTimerId(0),
-      errorRecoveryTimerId(0),      exitPlayerTimerId(0)
+      errorRecoveryTimerId(0),      exitPlayerTimerId(0),
+      savePlayPosTimerId(0)
 {
     LOG(VB_GENERAL, LOG_INFO, LOC + "Creating TV object");
     ctorTime.start();
@@ -1333 +1337 @@
     errorRecoveryTimerId = StartTimer(kErrorRecoveryCheckFrequency, __LINE__);
     lcdTimerId           = StartTimer(1, __LINE__);
     speedChangeTimerId   = StartTimer(kSpeedChangeCheckFrequency, __LINE__);
+    savePlayPosTimerId   = StartTimer(kSavePlayPosTimeout, __LINE__);
 
     LOG(VB_PLAYBACK, LOG_DEBUG, LOC + "-- end");
     return true;
@@ -2786 +2791 @@
         HandleSpeedChangeTimerEvent();
     else if (timer_id == pipChangeTimerId)
         HandlePxPTimerEvent();
+    else if (timer_id == savePlayPosTimerId)
+        HandleSavePlayPosEvent();
     else
         handled = false;
 
@@ -3330 +3337 @@
             // Don't consider ourselves at the end if the recording is
             // in-progress.
             at_end &= !StateIsRecording(GetState(ctx));
+            bool clear_playpos = true;
             if (at_end && allow_clear_at_end)
                 SetBookmark(ctx, true);
-            if (!at_end && allow_set_before_end)
+            else if (!at_end && allow_set_before_end)
                 SetBookmark(ctx, false);
+            else
+                clear_playpos = false;
+            // If we are setting a bookmark upon exit (or equivalently clearing
+            // it due to exiting at the end), we clean up the unnecessary
+            // playpos mark.
+            if (clear_playpos && ctx->playingInfo)
+                ctx->playingInfo->ClearMarkupMap(MARK_UTIL_PLAYPOS);
         }
         if (db_auto_set_watched)
             ctx->player->SetWatched();
@@ -13392 +13407 @@
     return hide;
 }
 
+void TV::HandleSavePlayPosEvent(void)
+{
+    // Helper class to save the latest playback position (in a background thread
+    // to avoid playback glitches).  The ctor makes a copy of the ProgramInfo
+    // struct to avoid race conditions if playback ends and deletes objects
+    // before or while the background thread runs.
+    class PositionSaver : public QRunnable
+    {
+    public:
+        PositionSaver(const ProgramInfo &pginfo, uint64_t frame) :
+            m_pginfo(pginfo), m_frame(frame) {}
+        virtual void run(void)
+        {
+            LOG(VB_PLAYBACK, LOG_DEBUG,
+                QString("PositionSaver frame=%1").arg(m_frame));
+            frm_dir_map_t playPosMap;
+            playPosMap[m_frame] = MARK_UTIL_PLAYPOS;
+            m_pginfo.ClearMarkupMap(MARK_UTIL_PLAYPOS);
+            m_pginfo.SaveMarkupMap(playPosMap, MARK_UTIL_PLAYPOS);
+        }
+    private:
+        const ProgramInfo m_pginfo;
+        const uint64_t m_frame;
+    };
+
+    PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__);
+    for (uint i = 0; mctx && i < player.size(); ++i)
+    {
+        PlayerContext *ctx = GetPlayer(mctx, i);
+        ctx->LockDeletePlayer(__FILE__, __LINE__);
+        bool playing = ctx->player && !ctx->player->IsPaused();
+        if (playing) // Don't bother saving playpos while paused
+        {
+            uint64_t framesPlayed = ctx->player->GetFramesPlayed();
+            MThreadPool::globalInstance()->
+                start(new PositionSaver(*ctx->playingInfo, framesPlayed),
+                      "PositionSaver");
+        }
+        ReturnPlayerLock(ctx);
+    }
+    ReturnPlayerLock(mctx);
+
+    QMutexLocker locker(&timerIdLock);
+    KillTimer(savePlayPosTimerId);
+    savePlayPosTimerId = StartTimer(kSavePlayPosTimeout, __LINE__);
+}
+
 void TV::SetLastProgram(const ProgramInfo *rcinfo)
 {
     QMutexLocker locker(&lastProgramLock);

mythtv/libs/libmythtv/tv_play.h

@@ -116 +116 @@
     kStartTVInPlayList       = 0x02,
     kStartTVByNetworkCommand = 0x04,
     kStartTVIgnoreBookmark   = 0x08,
+    kStartTVIgnorePreroll    = 0x10,
+    kStartTVIgnorePlayPos    = 0x20,
 };
 
 class AskProgramInfo
@@ -410 +412 @@
     bool HandlePxPTimerEvent(void);
     bool HandleLCDTimerEvent(void);
     void HandleLCDVolumeTimerEvent(void);
+    void HandleSavePlayPosEvent();
 
     // Commands used by frontend UI screens (PlaybackBox, GuideGrid etc)
     void EditSchedule(const PlayerContext*,
@@ -980 +983 @@
     volatile int         speedChangeTimerId;
     volatile int         errorRecoveryTimerId;
     mutable volatile int exitPlayerTimerId;
+    volatile int         savePlayPosTimerId;
     TimerContextMap      stateChangeTimerId;
     TimerContextMap      signalMonitorTimerId;
 
@@ -1096 +1100 @@
     static const uint kErrorRecoveryCheckFrequency;
     static const uint kEndOfRecPromptCheckFrequency;
     static const uint kEndOfPlaybackFirstCheckTimer;
+    static const uint kSavePlayPosTimeout;
 };
 
 #endif

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -556 +556 @@
     connect(m_recordingList, SIGNAL(itemSelected(MythUIButtonListItem*)),
             SLOT(ItemSelected(MythUIButtonListItem*)));
     connect(m_recordingList, SIGNAL(itemClicked(MythUIButtonListItem*)),
-            SLOT(PlayFromBookmark(MythUIButtonListItem*)));
+            SLOT(PlayFromBookmarkOrPreroll(MythUIButtonListItem*)));
     connect(m_recordingList, SIGNAL(itemVisible(MythUIButtonListItem*)),
             SLOT(ItemVisible(MythUIButtonListItem*)));
     connect(m_recordingList, SIGNAL(itemLoaded(MythUIButtonListItem*)),
@@ -2197 +2197 @@
         this, new MythEvent("PLAY_PLAYLIST"));
 }
 
+void PlaybackBox::PlayFromBookmarkOrPreroll(MythUIButtonListItem *item)
+{
+    if (!item)
+        item = m_recordingList->GetItemCurrent();
+
+    if (!item)
+        return;
+
+    ProgramInfo *pginfo = item->GetData().value<ProgramInfo *>();
+
+    const bool ignoreBookmark = false;
+    const bool ignorePreroll = false;
+    const bool ignorePlayPos = true;
+    const bool underNetworkControl = false;
+    if (pginfo)
+        PlayX(*pginfo, ignoreBookmark, ignorePreroll, ignorePlayPos,
+              underNetworkControl);
+}
+
 void PlaybackBox::PlayFromBookmark(MythUIButtonListItem *item)
 {
     if (!item)
@@ -2207 +2226 @@
 
     ProgramInfo *pginfo = item->GetData().value<ProgramInfo *>();
 
+    const bool ignoreBookmark = false;
+    const bool ignorePreroll = true;
+    const bool ignorePlayPos = true;
+    const bool underNetworkControl = false;
     if (pginfo)
-        PlayX(*pginfo, false, false);
+        PlayX(*pginfo, ignoreBookmark, ignorePreroll, ignorePlayPos,
+              underNetworkControl);
 }
 
 void PlaybackBox::PlayFromBeginning(MythUIButtonListItem *item)
@@ -2221 +2245 @@
 
     ProgramInfo *pginfo = item->GetData().value<ProgramInfo *>();
 
+    const bool ignoreBookmark = true;
+    const bool ignorePreroll = true;
+    const bool ignorePlayPos = true;
+    const bool underNetworkControl = false;
+    if (pginfo)
+        PlayX(*pginfo, ignoreBookmark, ignorePreroll, ignorePlayPos,
+              underNetworkControl);
+}
+
+void PlaybackBox::PlayFromPlayPos(MythUIButtonListItem *item)
+{
+    if (!item)
+        item = m_recordingList->GetItemCurrent();
+
+    if (!item)
+        return;
+
+    ProgramInfo *pginfo = item->GetData().value<ProgramInfo *>();
+
+    const bool ignoreBookmark = true;
+    const bool ignorePreroll = true;
+    const bool ignorePlayPos = false;
+    const bool underNetworkControl = false;
     if (pginfo)
-        PlayX(*pginfo, true, false);
+        PlayX(*pginfo, ignoreBookmark, ignorePreroll, ignorePlayPos,
+              underNetworkControl);
 }
 
 void PlaybackBox::PlayX(const ProgramInfo &pginfo,
                         bool ignoreBookmark,
+                        bool ignorePreroll,
+                        bool ignorePlayPos,
                         bool underNetworkControl)
 {
     if (!m_player)
     {
-        Play(pginfo, false, ignoreBookmark, underNetworkControl);
+        Play(pginfo, false, ignoreBookmark, ignorePreroll, ignorePlayPos,
+             underNetworkControl);
         return;
     }
 
@@ -2242 +2293 @@
             ignoreBookmark ? "1" : "0");
         m_player_selected_new_show.push_back(
             underNetworkControl ? "1" : "0");
+        // XXX add anything for ignorePreroll and ignorePlayPos?
     }
     Close();
 }
@@ -2324 +2376 @@
     if (!item)
         return;
 
-    PlayFromBookmark(item);
+    PlayFromBookmarkOrPreroll(item);
 }
 
 void PlaybackBox::popupClosed(QString which, int result)
@@ -2412 +2464 @@
 
 bool PlaybackBox::Play(
     const ProgramInfo &rec,
-    bool inPlaylist, bool ignoreBookmark, bool underNetworkControl)
+    bool inPlaylist, bool ignoreBookmark, bool ignorePreroll,
+    bool ignorePlayPos, bool underNetworkControl)
 {
     bool playCompleted = false;
 
@@ -2444 +2497 @@
     uint flags =
         (inPlaylist          ? kStartTVInPlayList       : kStartTVNoFlags) |
         (underNetworkControl ? kStartTVByNetworkCommand : kStartTVNoFlags) |
+        (ignorePlayPos       ? kStartTVIgnorePlayPos    : kStartTVNoFlags) |
+        (ignorePreroll       ? kStartTVIgnorePreroll    : kStartTVNoFlags) |
         (ignoreBookmark      ? kStartTVIgnoreBookmark   : kStartTVNoFlags);
 
     playCompleted = TV::StartTV(&tvrec, flags);
@@ -2912 +2967 @@
 
     MythMenu *menu = new MythMenu(title, this, "slotmenu");
 
-    menu->AddItem(tr("Play from bookmark"),  SLOT(PlayFromBookmark()));
+    if (pginfo->IsBookmarkSet())
+        menu->AddItem(tr("Play from bookmark"), SLOT(PlayFromBookmark()));
     menu->AddItem(tr("Play from beginning"), SLOT(PlayFromBeginning()));
+    if (pginfo->QueryPlayPos())
+        menu->AddItem(tr("Play from last played position"),
+                      SLOT(PlayFromPlayPos()));
 
     return menu;
 }
@@ -3149 +3208 @@
 
     if (!sameProgram)
     {
-        if (pginfo.IsBookmarkSet())
+        if (pginfo.IsBookmarkSet() || pginfo.QueryPlayPos())
             m_popupMenu->AddItem(tr("Play from..."), NULL, createPlayFromMenu());
         else
-            m_popupMenu->AddItem(tr("Play"), SLOT(PlayFromBookmark()));
+            m_popupMenu->AddItem(tr("Play"), SLOT(PlayFromBookmarkOrPreroll()));
     }
 
     if (!m_player)
@@ -3743 +3802 @@
 
                 pginfo.SetPathname(pginfo.GetPlaybackURL());
 
-                bool ignoreBookmark = (tokens[1] == "PLAY");
-                PlayX(pginfo, ignoreBookmark, true);
+                const bool ignoreBookmark = (tokens[1] == "PLAY");
+                const bool ignorePreroll = true;
+                const bool ignorePlayPos = true;
+                const bool underNetworkControl = true;
+                PlayX(pginfo, ignoreBookmark, ignorePreroll, ignorePlayPos,
+                      underNetworkControl);
             }
             else
             {
@@ -3877 +3940 @@
             if (action == "DELETE")
                 deleteSelected(m_recordingList->GetItemCurrent());
             else if (action == ACTION_PLAYBACK)
-                PlayFromBookmark();
+                PlayFromBookmarkOrPreroll();
             else if (action == "DETAILS" || action == "INFO")
                 ShowDetails();
             else if (action == "CUSTOMEDIT")
@@ -4154 +4217 @@
                 else if (pginfo)
                 {
                     playnext = false;
-                    Play(*pginfo, kCheckForPlaylistAction == cat, false, false);
+                    const bool ignoreBookmark = false;
+                    const bool ignorePreroll = false;
+                    const bool ignorePlayPos = true;
+                    const bool underNetworkControl = false;
+                    Play(*pginfo, kCheckForPlaylistAction == cat,
+                         ignoreBookmark, ignorePreroll, ignorePlayPos,
+                         underNetworkControl);
                 }
             }
 
@@ -4183 +4252 @@
             }
 
             ProgramInfo *pginfo = FindProgramInUILists(recordingID);
+            const bool ignoreBookmark = false;
+            const bool ignorePreroll = true;
+            const bool ignorePlayPos = true;
+            const bool underNetworkControl = false;
             if (pginfo)
-                Play(*pginfo, true, false, false);
+                Play(*pginfo, true, ignoreBookmark, ignorePreroll,
+                     ignorePlayPos, underNetworkControl);
         }
         else if ((message == "SET_PLAYBACK_URL") && (me->ExtraDataCount() == 2))
         {

mythtv/programs/mythfrontend/playbackbox.h

@@ -140 +140 @@
     void ItemVisible(MythUIButtonListItem *item);
     void ItemLoaded(MythUIButtonListItem *item);
     void selected(MythUIButtonListItem *item);
+    void PlayFromBookmarkOrPreroll(MythUIButtonListItem *item = NULL);
     void PlayFromBookmark(MythUIButtonListItem *item = NULL);
     void PlayFromBeginning(MythUIButtonListItem *item = NULL);
+    void PlayFromPlayPos(MythUIButtonListItem *item = NULL);
     void deleteSelected(MythUIButtonListItem *item);
 
     void SwitchList(void);
@@ -270 +272 @@
 
     void PlayX(const ProgramInfo &rec,
                bool ignoreBookmark,
+               bool ignorePreroll,
+               bool ignorePlayPos,
                bool underNetworkControl);
 
     bool Play(const ProgramInfo &rec,
               bool inPlaylist,
               bool ignoreBookmark,
+              bool ignorePreroll,
+              bool ignorePlayPos,
               bool underNetworkControl);
 
     virtual ProgramInfo *GetCurrentProgram(void) const;