Ticket #1019: cutpoint.diff
File cutpoint.diff, 2.2 KB (added by , 18 years ago) |
---|
-
libs/libmythtv/NuppelVideoPlayer.h
328 328 void SetCommBreakIter(void); 329 329 330 330 void HandleArbSeek(bool right); 331 void HandleSelect( void);331 void HandleSelect(bool selectnear); 332 332 void HandleResponse(void); 333 333 334 334 void UpdateTimeDisplay(void); -
libs/libmythtv/NuppelVideoPlayer.cpp
3293 3293 handled = true; 3294 3294 3295 3295 if (action == "SELECT") 3296 HandleSelect( );3296 HandleSelect(false); 3297 3297 else if (action == "LEFT") 3298 3298 { 3299 3299 if (seekamount > 0) … … 3523 3523 osd->SetText("editmode", infoMap, -1); 3524 3524 } 3525 3525 3526 void NuppelVideoPlayer::HandleSelect( void)3526 void NuppelVideoPlayer::HandleSelect(bool selectnear) 3527 3527 { 3528 3528 bool deletepoint = false; 3529 3529 QMap<long long, int>::Iterator i; … … 3534 3534 long long pos = framesPlayed - i.key(); 3535 3535 if (pos < 0) 3536 3536 pos = 0 - pos; 3537 if ( pos < (int)ceil(20 * video_frame_rate))3537 if ((pos < (int)ceil(20 * video_frame_rate)) && !selectnear) 3538 3538 { 3539 3539 deletepoint = true; 3540 3540 deleteframe = i.key(); … … 3554 3554 option3 += QObject::tr("right"); 3555 3555 else 3556 3556 option3 += QObject::tr("left"); 3557 QString option4 = QObject::tr("Cancel"); 3557 QString option4 = QObject::tr("Insert new cut point"); 3558 //QString option5 = QObject::tr("Cancel"); 3558 3559 3559 3560 dialogname = "deletemark"; 3560 3561 dialogtype = 0; … … 3564 3565 options += option2; 3565 3566 options += option3; 3566 3567 options += option4; 3568 //options += option5; 3567 3569 3568 3570 osd->NewDialogBox(dialogname, message, options, -1); 3569 3571 } … … 3606 3608 case 3: 3607 3609 ReverseMark(deleteframe); 3608 3610 break; 3611 case 4: 3612 HandleSelect(true); 3613 break; 3609 3614 default: 3610 3615 break; 3611 3616 }