- addition to use autodetect pip

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-29 21:16:57 +02:00
committed by Thilo Graf
parent 8b5ac83f27
commit 5c3d8a7512
2 changed files with 14 additions and 8 deletions

View File

@@ -4735,9 +4735,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*/) {
@@ -5003,9 +5005,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();
@@ -5069,7 +5073,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);
@@ -5089,7 +5094,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();
@@ -5834,15 +5840,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);