From 094f24bd0ae99d5c3e7fac6e73a434b9fbf33810 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 29 May 2021 21:16:57 +0200 Subject: [PATCH] addition to use autodetect pip Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/22a2b4971036c86fa228aac7609e0ef47384ca4c Author: vanhofen Date: 2021-05-29 (Sat, 29 May 2021) Origin message was: ------------------ - addition to use autodetect pip --- src/neutrino.cpp | 16 ++++++++++------ src/zapit/src/zapit.cpp | 6 ++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 1d5cde303..ed2dc4fdb 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4820,9 +4820,11 @@ void CNeutrinoApp::tvMode( bool rezap ) #ifdef ENABLE_PIP if (g_info.hw_caps->can_pip) + { pipDecoder->Pig(g_settings.pip_x, g_settings.pip_y, g_settings.pip_width, g_settings.pip_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); + } #endif #if 0 if(mode != NeutrinoModes::mode_ts /*&& autoshift*/) { @@ -5102,9 +5104,11 @@ void CNeutrinoApp::radioMode( bool rezap) #ifdef ENABLE_PIP if (g_info.hw_caps->can_pip) + { pipDecoder->Pig(g_settings.pip_radio_x, g_settings.pip_radio_y, g_settings.pip_radio_width, g_settings.pip_radio_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); + } #endif CRecordManager::getInstance()->StopAutoRecord(); @@ -5168,7 +5172,8 @@ void CNeutrinoApp::switchTvRadioMode(const int prev_mode) #ifdef ENABLE_PIP #if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE void CNeutrinoApp::StartAVInputPiP() { - if (!g_info.hw_caps->can_pip) return; + if (!g_info.hw_caps->can_pip) + return; if (!pipDemux) { pipDemux = new cDemux(1); @@ -5188,7 +5193,8 @@ void CNeutrinoApp::StartAVInputPiP() { } void CNeutrinoApp::StopAVInputPiP() { - if (!g_info.hw_caps->can_pip) return; + if (!g_info.hw_caps->can_pip) + return; pipDecoder->ShowPig(0); pipDemux->Stop(); @@ -5978,15 +5984,13 @@ void CNeutrinoApp::getAnnounceEpgName(CTimerd::RecordingInfo * eventinfo, std::s bool CNeutrinoApp::StartPip(const t_channel_id channel_id) { bool ret = false; - if (!g_info.hw_caps->can_pip) return ret; + if (!g_info.hw_caps->can_pip) + return ret; CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); if (!channel) return ret; - if (!g_info.hw_caps->can_pip) - return ret; - if (channel->getRecordDemux() == channel->getPipDemux()) CStreamManager::getInstance()->StopStream(channel_id); diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 93397f3dc..7a011a71b 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -667,7 +667,8 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay #ifdef ENABLE_PIP bool CZapit::StopPip() { - if (!g_info.hw_caps->can_pip) return false; + if (!g_info.hw_caps->can_pip) + return false; #if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE if (CNeutrinoApp::getInstance()->avinput_pip) { @@ -692,7 +693,8 @@ bool CZapit::StopPip() bool CZapit::StartPip(const t_channel_id channel_id) { - if (!g_info.hw_caps->can_pip) return false; + if (!g_info.hw_caps->can_pip) + return false; CZapitChannel* newchannel; bool transponder_change;