Ticket #2615: ivtv_captions.diff

File ivtv_captions.diff, 1.5 KB (added by barnasc, 14 years ago)
  • libs/libmythtv/tv_play.cpp

     
    20222022            handled = true;
    20232023            activenvp->EnableTeletext();
    20242024        }
    2025         else if (type >= kTrackTypeSubtitle)
     2025        else if (type == kTrackTypeTeletextCaptions)
    20262026        {
    20272027            handled = true;
    20282028            activenvp->ToggleCaptions(type);
    20292029        }
     2030        else if (type == kTrackTypeSubtitle)
     2031        {
     2032            handled = true;
     2033            activenvp->ToggleCaptions(type);
     2034        }
    20302035    }
    20312036    else if (action.left(6) == "SELECT")
    20322037    {
  • libs/libmythtv/NuppelVideoPlayer.cpp

     
    15211521    }
    15221522    if (kDisplayTeletextCaptions & mode)
    15231523    {
     1524/* huh?
    15241525        msg += decoder->GetTrackDesc(kTrackTypeTeletextCaptions,
    15251526                                     GetTrack(kTrackTypeTeletextCaptions));
    15261527
    15271528        int page = decoder->GetTrackLanguageIndex(
    15281529            kTrackTypeTeletextCaptions,
    15291530            GetTrack(kTrackTypeTeletextCaptions));
     1531*/
     1532        msg += QObject::tr("TXT") + QString(" %1").arg(ttPageNum, 3, 16);
    15301533
     1534        int page = ttPageNum;
    15311535        TeletextViewer *tt_view = NULL;
    15321536        if (osd && (tt_view = osd->GetTeletextViewer()) && (page > 0))
    15331537        {