Ticket #5910: mythtv-5910-fix_automatically_mark_as_watched_with_prompts.3.patch
File mythtv-5910-fix_automatically_mark_as_watched_with_prompts.3.patch, 3.8 KB (added by , 15 years ago) |
---|
-
libs/libmythtv/tv_play.cpp
old new 3040 3040 ReturnOSDLock(mctx, osd); 3041 3041 DoTogglePause(mctx, true); 3042 3042 ClearOSD(mctx); 3043 if (db_auto_set_watched) 3044 mctx->nvp->SetWatched(); 3043 3045 ReturnPlayerLock(mctx); 3044 3046 3045 3047 requestDelete = false; … … 3648 3650 } 3649 3651 else if (has_action("ESCAPE", actions) && isnearend) 3650 3652 { 3653 actx->LockDeleteNVP(__FILE__, __LINE__); 3654 if (actx->nvp) 3655 if (db_auto_set_watched) 3656 actx->nvp->SetWatched(); 3657 actx->UnlockDeleteNVP(__FILE__, __LINE__); 3651 3658 requestDelete = false; 3652 3659 SetExitPlayer(true, true); 3653 3660 } … … 3715 3722 case 1: 3716 3723 actx->LockDeleteNVP(__FILE__, __LINE__); 3717 3724 if (actx->nvp) 3725 { 3718 3726 actx->nvp->SetBookmark(); 3727 if (db_auto_set_watched) 3728 actx->nvp->SetWatched(); 3729 } 3719 3730 actx->UnlockDeleteNVP(__FILE__, __LINE__); 3720 3731 SetExitPlayer(true, true); 3721 3732 break; … … 3725 3736 actx, tr("Delete this recording?")); 3726 3737 return handled; 3727 3738 default: 3739 actx->LockDeleteNVP(__FILE__, __LINE__); 3740 if (actx->nvp) 3741 if (db_auto_set_watched) 3742 actx->nvp->SetWatched(); 3743 actx->UnlockDeleteNVP(__FILE__, __LINE__); 3728 3744 SetExitPlayer(true, true); 3729 3745 break; 3730 3746 } … … 3743 3759 SetExitPlayer(true, true); 3744 3760 break; 3745 3761 case 3: 3762 actx->LockDeleteNVP(__FILE__, __LINE__); 3763 if (actx->nvp) 3764 if (db_auto_set_watched) 3765 actx->nvp->SetWatched(); 3766 actx->UnlockDeleteNVP(__FILE__, __LINE__); 3746 3767 SetExitPlayer(true, true); 3747 3768 break; 3748 3769 default: … … 4171 4192 { 4172 4193 ctx->LockDeleteNVP(__FILE__, __LINE__); 4173 4194 if (ctx->nvp) 4195 { 4174 4196 ctx->nvp->SetBookmark(); 4197 if (db_auto_set_watched) 4198 ctx->nvp->SetWatched(); 4199 } 4175 4200 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 4176 4201 requestDelete = false; 4177 4202 SetExitPlayer(true, true); … … 4482 4507 StopFFRew(ctx); 4483 4508 ctx->LockDeleteNVP(__FILE__, __LINE__); 4484 4509 if (ctx->nvp) 4510 { 4485 4511 ctx->nvp->SetBookmark(); 4512 if (db_auto_set_watched) 4513 ctx->nvp->SetWatched(); 4514 } 4486 4515 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 4487 4516 PromptDeleteRecording(ctx, tr("Delete this recording?")); 4488 4517 } … … 10590 10619 { 10591 10620 ctx->LockDeleteNVP(__FILE__, __LINE__); 10592 10621 ctx->nvp->SetBookmark(); 10622 if (db_auto_set_watched) 10623 ctx->nvp->SetWatched(); 10593 10624 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 10594 10625 jumpToProgram = true; 10595 10626 SetExitPlayer(true, true); … … 10653 10684 SetLastProgram(p); 10654 10685 ctx->LockDeleteNVP(__FILE__, __LINE__); 10655 10686 ctx->nvp->SetBookmark(); 10687 if (db_auto_set_watched) 10688 ctx->nvp->SetWatched(); 10656 10689 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 10657 10690 jumpToProgram = true; 10658 10691 SetExitPlayer(true, true);