diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index ea0aa806d59..0ad00a335ba 100644
|
a
|
b
|
bool TV::StartTV(ProgramInfo *tvrec, uint flags,
|
| 409 | 409 | startSysEventSent = true; |
| 410 | 410 | startLivetvEventSent = true; |
| 411 | 411 | gCoreContext->SendSystemEvent("LIVETV_STARTED"); |
| | 412 | usleep(gCoreContext->GetNumSetting("LiveTVWaitMS", 0)*1000); |
| 412 | 413 | } |
| 413 | 414 | |
| 414 | 415 | LOG(VB_PLAYBACK, LOG_DEBUG, LOC + "tv->LiveTV() -- end"); |
| … |
… |
void TV::SwitchInputs(PlayerContext *ctx,
|
| 7479 | 7480 | delete testrec; |
| 7480 | 7481 | } |
| 7481 | 7482 | |
| | 7483 | usleep(gCoreContext->GetNumSetting("LiveTVWaitMS", 0)*1000); |
| 7482 | 7484 | UnpauseLiveTV(ctx); |
| 7483 | 7485 | UpdateOSDInput(ctx); |
| 7484 | 7486 | |
| … |
… |
void TV::ChangeChannel(PlayerContext *ctx, ChannelChangeDirection direction)
|
| 7795 | 7797 | if (ctx->player) |
| 7796 | 7798 | ctx->player->GetAudio()->Reset(); |
| 7797 | 7799 | |
| | 7800 | usleep(gCoreContext->GetNumSetting("LiveTVWaitMS", 0)*1000); |
| 7798 | 7801 | UnpauseLiveTV(ctx); |
| 7799 | 7802 | |
| 7800 | 7803 | if (oldinputname != ctx->recorder->GetInput()) |
| … |
… |
void TV::ChangeChannel(PlayerContext *ctx, uint chanid, const QString &chan)
|
| 7964 | 7967 | if (ctx->player) |
| 7965 | 7968 | ctx->player->GetAudio()->Reset(); |
| 7966 | 7969 | |
| | 7970 | usleep(gCoreContext->GetNumSetting("LiveTVWaitMS", 0)*1000); |
| 7967 | 7971 | UnpauseLiveTV(ctx, chanid && GetQueuedChanID()); |
| 7968 | 7972 | |
| 7969 | 7973 | if (oldinputname != ctx->recorder->GetInput()) |
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index e0551ef2840..b963a8dce87 100644
|
a
|
b
|
static HostSpinBoxSetting *LiveTVIdleTimeout()
|
| 1810 | 1810 | return gs; |
| 1811 | 1811 | } |
| 1812 | 1812 | |
| | 1813 | static HostSpinBoxSetting *LiveTVWaitMS() |
| | 1814 | { |
| | 1815 | HostSpinBoxSetting *gs = new HostSpinBoxSetting("LiveTVWaitMS", 0, 10000, 100); |
| | 1816 | |
| | 1817 | gs->setLabel(PlaybackSettings::tr("Live TV wait (milliseconds)")); |
| | 1818 | |
| | 1819 | gs->setValue(0); |
| | 1820 | |
| | 1821 | gs->setHelpText(PlaybackSettings::tr("Wait the specified number of milliseconds " |
| | 1822 | "before beginning playback of Live TV " |
| | 1823 | "to avoid stuttering during the first minute")); |
| | 1824 | return gs; |
| | 1825 | } |
| | 1826 | |
| | 1827 | |
| 1813 | 1828 | // static HostCheckBoxSetting *PlaybackPreview() |
| 1814 | 1829 | // { |
| 1815 | 1830 | // HostCheckBoxSetting *gc = new HostCheckBoxSetting("PlaybackPreview"); |
| … |
… |
void PlaybackSettings::Load(void)
|
| 4224 | 4239 | general->addChild(UseProgStartMark()); |
| 4225 | 4240 | general->addChild(AutomaticSetWatched()); |
| 4226 | 4241 | general->addChild(ContinueEmbeddedTVPlay()); |
| | 4242 | general->addChild(LiveTVWaitMS()); |
| 4227 | 4243 | general->addChild(LiveTVIdleTimeout()); |
| 4228 | 4244 | |
| 4229 | 4245 | #if CONFIG_DEBUGTYPE |