From 9eeb3ede447edeec72cd1a47b469ad83535d974c Mon Sep 17 00:00:00 2001
From: BPanther <bpanther_ts@hotmail.com>
Date: Tue, 2 Jan 2024 00:43:08 +0100
Subject: [PATCH] pip cleanup

Origin commit data
------------------
Commit: https://github.com/Duckbox-Developers/neutrino-ddt/commit/464cd85b5b15920ac6f95441b6b9b9a4c769ae09
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2023-10-10 (Tue, 10 Oct 2023)
---
 src/neutrino.cpp        | 20 --------------------
 src/zapit/src/zapit.cpp | 24 ++++--------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index ec2739c7c..e2082d8d5 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -4951,16 +4951,6 @@ void CNeutrinoApp::tvMode( bool rezap )
 		videoDecoder->Standby(false);
 	}
 
-#if 0 //ENABLE_PIP
-	if (g_info.hw_caps->can_pip)
-#if !BOXMODEL_HISILICON
-	{
-		pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_x),pip_recalc_pos_y(g_settings.pip_y),
-			g_settings.pip_width, g_settings.pip_height,
-			frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
-	}
-#endif
-#endif
 #if 0
 	if(mode != NeutrinoModes::mode_ts /*&& autoshift*/) {
 		//printf("standby on: autoshift ! stopping ...\n");
@@ -5237,16 +5227,6 @@ void CNeutrinoApp::radioMode( bool rezap)
 		videoDecoder->Standby(false);
 	}
 
-#if 0 //ENABLE_PIP
-	if (g_info.hw_caps->can_pip)
-#if !BOXMODEL_HISILICON
-	{
-		pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_radio_x),pip_recalc_pos_y(g_settings.pip_radio_y),
-			g_settings.pip_radio_width, g_settings.pip_radio_height,
-			frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
-	}
-#endif
-#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 8d79088a1..b4a2d55f4 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2712,29 +2712,13 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 	/* work around broken drivers: when starting up with 720p50 image is pink on hd1 */
 	videoDecoder = new cVideo(VIDEO_STD_1080I50, videoDemux->getChannel(), videoDemux->getBuffer());
 	videoDecoder->SetVideoSystem(video_mode);
+	videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());
 #else
-        videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());
+	videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());
+	videoDecoder->Standby(false);
+	audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/);
 #endif
-        videoDecoder->Standby(false);
-        audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/);
 
-#if 0 //ENABLE_PIP
-	if (g_info.hw_caps->can_pip)
-	{
-#if HAVE_CST_HARDWARE
-		pipVideoDemux[0] = new cDemux(dnum);
-		pipVideoDemux[0]->Open(DMX_PIP_CHANNEL);
-		pipVideoDecoder[0] = new cVideo(video_mode, pipVideoDemux[0]->getChannel(), pipVideoDemux[0]->getBuffer(), 1);
-#else
-		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
-	}
-#endif
 #endif
 
 	videoDecoder->SetAudioHandle(audioDecoder->GetHandle());