Ticket #2542: dvd_osd_menu_fix.diff

File dvd_osd_menu_fix.diff, 1.8 KB (added by skamithi, 14 years ago)

fix for problem 3. add new osd menu option for chapter menu (no key action created..i can do it if folks want to). make root menu match the title menu option.

  • libs/libmythtv/DVDRingBuffer.cpp

     
    527527void DVDRingBufferPriv::GoToMenu(const QString str)
    528528{
    529529    DVDMenuID_t menuid;
    530     if (str.compare("part") == 0)
    531         menuid = DVD_MENU_Part;
    532     else if (str.compare("menu") == 0)
     530    if (str.compare("chapter") == 0)
    533531        menuid = DVD_MENU_Root;
     532    else if (str.compare("menu") == 0)
     533        menuid = DVD_MENU_Title;
    534534    else
    535535        return;
    536536
    537     if ((dvdnav_menu_call(dvdnav, menuid) == DVDNAV_STATUS_ERR) &&
    538         (str == "menu"))
    539     {
    540         dvdnav_menu_call(dvdnav, DVD_MENU_Title);
    541     }
     537    dvdnav_menu_call(dvdnav, menuid);
    542538}
    543539
    544540void DVDRingBufferPriv::GoToNextProgram(void)
  • libs/libmythtv/tv_play.cpp

     
    60906336    {
    60916337        if (action == "JUMPTODVDROOTMENU")
    60926338            activenvp->GoToDVDMenu("menu");
     6339        else if (action == "JUMPTODVDCHAPTERMENU")
     6340            activenvp->GoToDVDMenu("chapter");
    60936341        else if (action == "TOGGLEEDIT")
    60946342            StartProgramEditMode();
    60956343        else if (action == "TOGGLEAUTOEXPIRE")
     
    62736519    }
    62746520    else if (StateIsPlaying(internalState) && activerbuffer->isDVD())
    62756521    {
    6276         item = new OSDGenericTree(treeMenu,tr("DVD Root Menu"), "JUMPTODVDROOTMENU");
     6522        item = new OSDGenericTree(treeMenu,tr("DVD Root Menu"),
     6523                "JUMPTODVDROOTMENU");
     6524        item = new OSDGenericTree(treeMenu, tr("DVD Chapter Menu"),
     6525                "JUMPTODVDCHAPTERMENU");
    62776526    }
    62786527    else if (StateIsPlaying(internalState))
    62796528    {