From 464cd85b5b15920ac6f95441b6b9b9a4c769ae09 Mon Sep 17 00:00:00 2001 From: BPanther Date: Tue, 10 Oct 2023 19:45:22 +0200 Subject: [PATCH] pip cleanup --- src/neutrino.cpp | 16 ---------------- src/zapit/src/zapit.cpp | 18 +++--------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7ff9586fa..db28cd935 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4402,14 +4402,6 @@ void CNeutrinoApp::tvMode( bool rezap ) videoDecoder->Standby(false); } -#if 0//def ENABLE_PIP - if (g_info.hw_caps->can_pip) - { - pipVideoDecoder[0]->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*/) { //printf("standby on: autoshift ! stopping ...\n"); @@ -4669,14 +4661,6 @@ void CNeutrinoApp::radioMode( bool rezap) videoDecoder->Standby(false); } -#if 0//def ENABLE_PIP - if (g_info.hw_caps->can_pip) - { - pipVideoDecoder[0]->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(); if (mode != NeutrinoModes::mode_webtv && mode != NeutrinoModes::mode_webradio) { diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 86bee3fd3..9c1783d59 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2308,21 +2308,9 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) audioDemux = new cDemux(); audioDemux->Open(DMX_AUDIO_CHANNEL); - videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer()); - videoDecoder->Standby(false); - audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/); - -#if 0//def ENABLE_PIP - if (g_info.hw_caps->can_pip) - { - for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++) - { - pipVideoDecoder[i] = new cVideo(0, NULL, NULL, i+1); - pipVideoDecoder[i]->ShowPig(0); - pipAudioDecoder[i] = new cAudio(0, NULL, NULL, i+1); - } - } -#endif + videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer()); + videoDecoder->Standby(false); + audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/); videoDecoder->SetAudioHandle(audioDecoder->GetHandle());