mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

pip cleanup

Browse Source 
Origin commit data
------------------
Commit: 464cd85b5b
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2023-10-10 (Tue, 10 Oct 2023)
This commit is contained in:
BPanther
2024-01-02 00:43:08 +01:00
committed by Thilo Graf
parent 159eaac3bf
commit 9eeb3ede44
2 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/neutrino.cpp
View File

@@ -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) {

24
src/zapit/src/zapit.cpp
View File

@@ -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());