Ticket #1043: dvdmenu_nav_improvements.patch
File dvdmenu_nav_improvements.patch, 2.7 KB (added by , 18 years ago) |
---|
-
libs/libmythtv/tv_play.cpp
2282 2282 { 2283 2283 if (prbuffer->isDVD()) 2284 2284 { 2285 if (prbuffer->DVD()->NumPartsInTitle() < 2) 2285 if (prbuffer->InDVDMenuOrStillFrame()) 2286 UpdateOSDSeekMessage(tr("Skipping Back Not Allowed"), 2287 osd_general_timeout); 2288 else if (prbuffer->DVD()->NumPartsInTitle() < 2) 2286 2289 { 2287 2290 nvp->GoToDVDProgram(0); 2288 UpdateOSDSeekMessage(tr("Previous Title /Chapter"),2291 UpdateOSDSeekMessage(tr("Previous Title"), 2289 2292 osd_general_timeout); 2290 2293 } 2291 2294 else -
libs/libmythtv/DVDRingBuffer.cpp
287 287 if (IsInMenu() && NumMenuButtons() > 0 && 288 288 !buttonSelected) 289 289 { 290 int32_t button;291 290 pci_t *pci = dvdnav_get_current_nav_pci(dvdnav); 292 dvdnav_get_current_highlight(dvdnav, &button); 293 294 if (button > NumMenuButtons() || button < 1) 295 dvdnav_button_select(dvdnav, pci,1); 296 else 297 dvdnav_button_select(dvdnav, pci, button); 291 uint8_t button = pci->hli.hl_gi.fosl_btnn; 292 if (button > 0) 293 dvdnav_button_select(dvdnav,pci,button); 294 else dvdnav_button_select(dvdnav,pci,1); 298 295 buttonSelected = true; 299 296 spuchanged = false; 300 297 } … … 345 342 .arg(hl->sx).arg(hl->sy) 346 343 .arg(hl->ex).arg(hl->ey) 347 344 .arg(hl->pts).arg(hl->buttonN)); 345 346 if (DVDButtonUpdate(false)) 347 buttonExists = DrawMenuButton(menuSpuPkt,menuBuflength); 348 348 349 if (blockBuf != dvdBlockWriteBuf) 349 350 { 350 351 dvdnav_free_cache_block(dvdnav, blockBuf); 351 352 } 352 353 if (DVDButtonUpdate(false))354 buttonExists = DrawMenuButton(menuSpuPkt,menuBuflength);355 353 } 356 354 break; 357 355 case DVDNAV_STILL_FRAME: