Ticket #502: osd.patch
File osd.patch, 5.2 KB (added by , 19 years ago) |
---|
-
libs/libmythtv/tv_play.cpp
175 175 baseFilters(""), fftime(0), rewtime(0), 176 176 jumptime(0), usePicControls(false), smartChannelChange(false), 177 177 MuteIndividualChannels(false), arrowAccel(false), osd_display_time(0), 178 osd_program_display_time(0), 178 179 autoCommercialSkip(false), tryUnflaggedSkip(false), 179 180 smartForward(false), stickykeys(0), 180 181 ff_rew_repos(1.0f), ff_rew_reverse(false), … … 275 276 arrowAccel = gContext->GetNumSetting("UseArrowAccels", 1); 276 277 persistentbrowsemode = gContext->GetNumSetting("PersistentBrowseMode", 0); 277 278 osd_display_time = gContext->GetNumSetting("OSDDisplayTime"); 279 osd_program_display_time = gContext->GetNumSetting("OSDProgramDisplayTime"); 278 280 autoCommercialSkip = gContext->GetNumSetting("AutoCommercialSkip", 0); 279 281 tryUnflaggedSkip = gContext->GetNumSetting("TryUnflaggedSkip", 0); 280 282 smartForward = gContext->GetNumSetting("SmartForward", 0); … … 2500 2502 playbackinfo->ToMap(infoMap); 2501 2503 GetOSD()->HideSet("status"); 2502 2504 GetOSD()->ClearAllText("program_info"); 2503 GetOSD()->SetText("program_info", infoMap, osd_ display_time);2505 GetOSD()->SetText("program_info", infoMap, osd_program_display_time); 2504 2506 } 2505 2507 else 2506 2508 { 2507 2509 QString desc = ""; 2508 2510 int pos = nvp->calcSliderPos(desc); 2509 2511 GetOSD()->HideSet("program_info"); 2510 GetOSD()->StartPause(pos, false, tr("Position"), desc, osd_ display_time);2512 GetOSD()->StartPause(pos, false, tr("Position"), desc, osd_program_display_time); 2511 2513 update_osd_pos = true; 2512 2514 } 2513 2515 } … … 2516 2518 { 2517 2519 bool muted = false; 2518 2520 2521 if (disptime == -999) disptime = osd_display_time; 2522 2519 2523 AudioOutput *aud = nvp->getAudioOutput(); 2520 2524 if (aud && !aud->GetMute()) 2521 2525 { … … 3224 3233 { 3225 3234 // Clear previous osd and add new info 3226 3235 GetOSD()->ClearAllText("program_info"); 3227 GetOSD()->SetText("program_info", infoMap, osd_ display_time);3236 GetOSD()->SetText("program_info", infoMap, osd_program_display_time); 3228 3237 GetOSD()->ClearAllText("channel_number"); 3229 GetOSD()->SetText("channel_number", infoMap, osd_ display_time);3238 GetOSD()->SetText("channel_number", infoMap, osd_program_display_time); 3230 3239 } 3231 3240 } 3232 3241 … … 3351 3360 //GetOSD()->SetText("signal_info", infoMap, -1); 3352 3361 3353 3362 GetOSD()->ClearAllText("channel_number"); 3354 GetOSD()->SetText("channel_number", infoMap, osd_ display_time);3363 GetOSD()->SetText("channel_number", infoMap, osd_program_display_time); 3355 3364 3356 3365 infoMap["description"] = sigDesc; 3357 3366 GetOSD()->ClearAllText("program_info"); 3358 GetOSD()->SetText("program_info", infoMap, osd_ display_time);3367 GetOSD()->SetText("program_info", infoMap, osd_program_display_time); 3359 3368 3360 3369 lastSignalMsg.clear(); 3361 3370 lastSignalMsgTime.start(); -
libs/libmythtv/tv_play.h
187 187 void DoInfo(void); 188 188 void DoPlay(void); 189 189 void DoPause(void); 190 bool UpdatePosOSD(float time, const QString &mesg, int disptime = 2);190 bool UpdatePosOSD(float time, const QString &mesg, int disptime = -999); 191 191 void DoSeek(float time, const QString &mesg); 192 192 enum ArbSeekWhence { 193 193 ARBSEEK_SET = 0, … … 271 271 bool MuteIndividualChannels; 272 272 bool arrowAccel; 273 273 int osd_display_time; 274 int osd_program_display_time; 274 275 275 276 int autoCommercialSkip; 276 277 bool tryUnflaggedSkip; -
programs/mythfrontend/globalsettings.cpp
685 685 return gc; 686 686 } 687 687 688 static HostSpinBox *OSDProgramDisplayTime() 689 { 690 HostSpinBox *gs = new HostSpinBox("OSDProgramDisplayTime", 0, 30, 1); 691 gs->setLabel(QObject::tr("Number of seconds for OSD program information")); 692 gs->setValue(3); 693 gs->setHelpText(QObject::tr("How long the program information remains on " 694 "the On Screen Display after a channel change.")); 695 return gs; 696 } 697 688 698 static HostSpinBox *OSDDisplayTime() 689 699 { 690 700 HostSpinBox *gs = new HostSpinBox("OSDDisplayTime", 0, 30, 1); 691 701 gs->setLabel(QObject::tr("Number of seconds for OSD information")); 692 702 gs->setValue(3); 693 gs->setHelpText(QObject::tr("How long the program information remains on"694 " the On Screen Display after a channel change."));703 gs->setHelpText(QObject::tr("How long the On Screen Display remains " 704 "on the screen in other situations.")); 695 705 return gs; 696 706 } 697 707 … … 3019 3029 VerticalConfigurationGroup* osd = new VerticalConfigurationGroup(false); 3020 3030 osd->setLabel(QObject::tr("On-screen display")); 3021 3031 osd->addChild(OSDTheme()); 3032 osd->addChild(OSDProgramDisplayTime()); 3022 3033 osd->addChild(OSDDisplayTime()); 3023 3034 osd->addChild(OSDFont()); 3024 3035 osd->addChild(OSDCCFont());