Ticket #7939: tv_jumppoints_0.24.patch

File tv_jumppoints_0.24.patch, 1.5 KB (added by Jim Stichnoth, 8 years ago)

Attempted back-port to 0.24. Compiles, but not tested. Combines 307dac8776d54a5d104da1b8f8c046039ed1d143, 343022203cdf6948428187e8f1fb6337ca7b0de0, and the last chunk of 9b5b7b514408f8b25052ee1c0bebc05e676efc1d .

  • mythtv/libs/libmythtv/tv_play.cpp

    diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
    index e8d0c2d..1efac5b 100644
    a b void TV::customEvent(QEvent *e) 
    84458445        }
    84468446
    84478447        SetExitPlayer(true, true);
     8448        mctx->player->DisableEdit(-1);
    84488449        ReturnPlayerLock(mctx);
    84498450    }
    84508451
  • mythtv/libs/libmythui/mythmainwindow.cpp

    diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
    index 121f4c2..9093f6b 100644
    a b void MythMainWindow::ExitToMainMenu(void) 
    13131313    MythScreenStack *toplevel = GetMainStack();
    13141314    if (toplevel && d->popwindows)
    13151315    {
     1316        MythEvent xe("EXIT_TO_MENU");
     1317        gCoreContext->dispatch(xe);
    13161318        MythScreenType *screen = toplevel->GetTopScreen();
    13171319        if (screen && screen->objectName() != QString("mainmenu"))
    13181320        {
  • mythtv/programs/mythfrontend/playbackbox.cpp

    diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
    index 93f2a56..00e1f5e 100644
    a b void PlaybackBox::customEvent(QEvent *event) 
    40824082                m_artTimer[(uint)type]->start(s_artDelay[(uint)type]);
    40834083            }
    40844084        }
     4085        else if (message == "EXIT_TO_MENU")
     4086        {
     4087            m_playListPlay.clear();
     4088        }
    40854089    }
    40864090    else
    40874091        ScheduleCommon::customEvent(event);