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

pip variables renamed

Browse Source
This commit is contained in:
BPanther
2021-10-15 20:00:19 +02:00
committed by Thilo Graf
parent a686f3bb03
commit eace201108
4 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/neutrino.cpp
View File

@@ -193,15 +193,15 @@ void * nhttpd_main_thread(void *data);
//#define DISABLE_SECTIONSD
extern cVideo * videoDecoder;
extern cVideo *videoDecoder;
#ifdef ENABLE_PIP
extern cVideo *pipDecoder;
extern cDemux *pipDemux;
extern cVideo *pipVideoDecoder[3];
extern cDemux *pipVideoDemux[3];
#endif
extern cDemux *videoDemux;
extern cAudio * audioDecoder;
extern cAudio *audioDecoder;
cPowerManager *powerManager;
cCpuFreqManager * cpuFreq;
cCpuFreqManager *cpuFreq;
void stop_daemons(bool stopall = true, bool for_flash = false);
void stop_video(void);
@@ -4953,7 +4953,7 @@ 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,
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));
}
@@ -5239,7 +5239,7 @@ 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,
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));
}
@@ -5309,20 +5309,20 @@ void CNeutrinoApp::StartAVInputPiP() {
if (!g_info.hw_caps->can_pip)
return;
if (!pipDemux) {
pipDemux = new cDemux(1);
pipDemux->Open(DMX_VIDEO_CHANNEL);
if (!pipDecoder) {
pipDecoder = new cVideo(0, NULL, NULL, 1);
if (!pipVideoDemux[0]) {
pipVideoDemux[0] = new cDemux(1);
pipVideoDemux[0]->Open(DMX_VIDEO_CHANNEL);
if (!pipVideoDecoder[0]) {
pipVideoDecoder[0] = new cVideo(0, NULL, NULL, 1);
}
}
pipDemux->SetSource(1, 2);
pipDecoder->SetStreamType((VIDEO_FORMAT) 1);
pipDemux->Start();
pipDecoder->Start(0, 0, 0);
pipDecoder->open_AVInput_Device();
pipDecoder->Pig(g_settings.pip_x,g_settings.pip_y,g_settings.pip_width,g_settings.pip_height,g_settings.screen_width,g_settings.screen_height);
pipDecoder->ShowPig(1);
pipVideoDemux[0]->SetSource(1, 2);
pipVideoDecoder[0]->SetStreamType((VIDEO_FORMAT) 1);
pipVideoDemux[0]->Start();
pipVideoDecoder[0]->Start(0, 0, 0);
pipVideoDecoder[0]->open_AVInput_Device();
pipVideoDecoder[0]->Pig(g_settings.pip_x,g_settings.pip_y,g_settings.pip_width,g_settings.pip_height,g_settings.screen_width,g_settings.screen_height);
pipVideoDecoder[0]->ShowPig(1);
avinput_pip = true;
}
@@ -5330,10 +5330,10 @@ void CNeutrinoApp::StopAVInputPiP() {
if (!g_info.hw_caps->can_pip)
return;
pipDecoder->ShowPig(0);
pipDemux->Stop();
pipDecoder->Stop();
pipDecoder->close_AVInput_Device();
pipVideoDecoder[0]->ShowPig(0);
pipVideoDemux[0]->Stop();
pipVideoDecoder[0]->Stop();
pipVideoDecoder[0]->close_AVInput_Device();
avinput_pip = false;
}
#endif