Ticket #2978: prompt_livetv_exit_r12631.diff
File prompt_livetv_exit_r12631.diff, 4.0 KB (added by , 17 years ago) |
---|
-
libs/libmythtv/tv_play.cpp
2384 2384 break; 2385 2385 } 2386 2386 } 2387 else if (dialogname == "videoexitplayoptions") 2387 else if (dialogname == "videoexitplayoptions") 2388 2388 { 2389 2389 int result = GetOSD()->GetDialogResponse(dialogname); 2390 2390 … … 2780 2780 2781 2781 if (StateIsLiveTV(GetState())) 2782 2782 { 2783 if (nvp && gContext->GetNumSetting("PlaybackExitPrompt") == 2)2784 nvp->SetBookmark();2785 2783 if (nvp && gContext->GetNumSetting("AutomaticSetWatched", 0)) 2786 2784 nvp->SetWatched(); 2787 2785 exitPlayer = true; 2788 2786 wantsToQuit = true; 2787 if (nvp) 2788 { 2789 switch(gContext->GetNumSetting("PlaybackExitPrompt")) 2790 { 2791 case 2: 2792 nvp->SetBookmark(); 2793 break; 2794 case 4: case 8: 2795 PromptStopWatchingRecording(); 2796 wantsToQuit = false; 2797 exitPlayer = false; 2798 break; 2799 } 2800 } 2789 2801 } 2790 2802 else 2791 2803 { 2792 if (nvp && gContext->GetNumSetting("PlaybackExitPrompt") == 1&&2804 if (nvp && 5 & gContext->GetNumSetting("PlaybackExitPrompt") && 2793 2805 !underNetworkControl && !prbuffer->InDVDMenuOrStillFrame()) 2794 2806 { 2795 2807 PromptStopWatchingRecording(); 2796 2808 break; 2797 2809 } 2798 else if (nvp && gContext->GetNumSetting("PlaybackExitPrompt") == 2) 2810 else if (nvp && 2811 gContext->GetNumSetting("PlaybackExitPrompt") == 2) 2799 2812 nvp->SetBookmark(); 2800 2813 if (nvp && gContext->GetNumSetting("AutomaticSetWatched", 0)) 2801 2814 nvp->SetWatched(); … … 7484 7497 7485 7498 if (playbackinfo && allowbookmark) 7486 7499 { 7487 QString videotype = (prbuffer->isDVD()) ? "DVD":"recording"; 7488 message = tr("You are exiting this %1").arg(videotype); 7500 QString videotype; 7501 if (StateIsLiveTV(GetState())) 7502 videotype = "Live TV"; 7503 else 7504 videotype = (prbuffer->isDVD()) ? "this DVD":"this recording"; 7489 7505 7506 message = tr("You are exiting %1").arg(videotype); 7507 7490 7508 options += tr("Save this position and go to the menu"); 7491 7509 options += tr("Do not save, just exit to the menu"); 7492 7510 options += tr("Keep watching"); 7493 if (!prbuffer->isDVD() )7511 if (!prbuffer->isDVD() && !StateIsLiveTV(GetState())) 7494 7512 options += tr("Delete this recording"); 7495 7513 7496 7514 dialogname = "exitplayoptions"; 7497 7515 } 7498 7516 else 7499 7517 { 7500 7501 7518 message = tr("You are exiting this Video/DVD"); 7502 7519 7503 7520 options += tr("Keep Watching"); -
programs/mythfrontend/globalsettings.cpp
1241 1241 gc->setLabel(QObject::tr("Action on playback exit")); 1242 1242 gc->addSelection(QObject::tr("Just exit"), "0"); 1243 1243 gc->addSelection(QObject::tr("Save position and exit"), "2"); 1244 gc->addSelection(QObject::tr("Always prompt"), "1"); 1244 gc->addSelection(QObject::tr("Always prompt (excluding Live TV)"), "1"); 1245 gc->addSelection(QObject::tr("Always prompt (including Live TV)"), "4"); 1246 gc->addSelection(QObject::tr("Prompt for Live TV only"), "8"); 1245 1247 gc->setHelpText(QObject::tr("If set to prompt, a menu will be displayed " 1246 1248 "when you exit playback mode. The options available will " 1247 1249 "allow you to save your position, delete the "