Skip to content

Commit

Permalink
pip cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
BPanther committed Oct 10, 2023
1 parent 386622d commit 464cd85
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 31 deletions.
16 changes: 0 additions & 16 deletions src/neutrino.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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) {
Expand Down
18 changes: 3 additions & 15 deletions src/zapit/src/zapit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down

0 comments on commit 464cd85

Please sign in to comment.