Ticket #5910: mythtv-5910-fix_automatically_mark_as_watched_with_prompts.2.patch
File mythtv-5910-fix_automatically_mark_as_watched_with_prompts.2.patch, 3.8 KB (added by , 12 years ago) |
---|
-
libs/libmythtv/tv_play.cpp
old new 2927 2927 ReturnOSDLock(mctx, osd); 2928 2928 DoTogglePause(mctx, true); 2929 2929 ClearOSD(mctx); 2930 if (db_auto_set_watched) 2931 mctx->nvp->SetWatched(); 2930 2932 ReturnPlayerLock(mctx); 2931 2933 2932 2934 requestDelete = false; … … 3526 3528 } 3527 3529 else if (has_action("ESCAPE", actions) && isnearend) 3528 3530 { 3531 actx->LockDeleteNVP(__FILE__, __LINE__); 3532 if (actx->nvp) 3533 if (db_auto_set_watched) 3534 actx->nvp->SetWatched(); 3535 actx->UnlockDeleteNVP(__FILE__, __LINE__); 3529 3536 requestDelete = false; 3530 3537 SetExitPlayer(true, true); 3531 3538 } … … 3593 3600 case 1: 3594 3601 actx->LockDeleteNVP(__FILE__, __LINE__); 3595 3602 if (actx->nvp) 3603 { 3596 3604 actx->nvp->SetBookmark(); 3605 if (db_auto_set_watched) 3606 actx->nvp->SetWatched(); 3607 } 3597 3608 actx->UnlockDeleteNVP(__FILE__, __LINE__); 3598 3609 SetExitPlayer(true, true); 3599 3610 break; … … 3603 3614 actx, tr("Delete this recording?")); 3604 3615 return handled; 3605 3616 default: 3617 actx->LockDeleteNVP(__FILE__, __LINE__); 3618 if (actx->nvp) 3619 if (db_auto_set_watched) 3620 actx->nvp->SetWatched(); 3621 actx->UnlockDeleteNVP(__FILE__, __LINE__); 3606 3622 SetExitPlayer(true, true); 3607 3623 break; 3608 3624 } … … 3621 3637 SetExitPlayer(true, true); 3622 3638 break; 3623 3639 case 3: 3640 actx->LockDeleteNVP(__FILE__, __LINE__); 3641 if (actx->nvp) 3642 if (db_auto_set_watched) 3643 actx->nvp->SetWatched(); 3644 actx->UnlockDeleteNVP(__FILE__, __LINE__); 3624 3645 SetExitPlayer(true, true); 3625 3646 break; 3626 3647 default: … … 4046 4067 { 4047 4068 ctx->LockDeleteNVP(__FILE__, __LINE__); 4048 4069 if (ctx->nvp) 4070 { 4049 4071 ctx->nvp->SetBookmark(); 4072 if (db_auto_set_watched) 4073 ctx->nvp->SetWatched(); 4074 } 4050 4075 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 4051 4076 requestDelete = false; 4052 4077 SetExitPlayer(true, true); … … 4358 4383 StopFFRew(ctx); 4359 4384 ctx->LockDeleteNVP(__FILE__, __LINE__); 4360 4385 if (ctx->nvp) 4386 { 4361 4387 ctx->nvp->SetBookmark(); 4388 if (db_auto_set_watched) 4389 ctx->nvp->SetWatched(); 4390 } 4362 4391 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 4363 4392 PromptDeleteRecording(ctx, tr("Delete this recording?")); 4364 4393 } … … 10150 10179 { 10151 10180 ctx->LockDeleteNVP(__FILE__, __LINE__); 10152 10181 ctx->nvp->SetBookmark(); 10182 if (db_auto_set_watched) 10183 ctx->nvp->SetWatched(); 10153 10184 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 10154 10185 jumpToProgram = true; 10155 10186 SetExitPlayer(true, true); … … 10213 10244 SetLastProgram(p); 10214 10245 ctx->LockDeleteNVP(__FILE__, __LINE__); 10215 10246 ctx->nvp->SetBookmark(); 10247 if (db_auto_set_watched) 10248 ctx->nvp->SetWatched(); 10216 10249 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 10217 10250 jumpToProgram = true; 10218 10251 SetExitPlayer(true, true);