mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

more pip changes

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1357c3ec56
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2021-10-15 (Fri, 15 Oct 2021)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2021-10-15 14:55:29 +02:00
committed by vanhofen
parent df11308db3
commit a6a0e3a3ac
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/zapit/src/zapit.cpp
View File

@@ -735,7 +735,7 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip)
ERROR("Cannot get frontend\n"); ERROR("Cannot get frontend\n");
return false; return false;
} }
StopPip(); StopPip(pip);
if (!need_lock && !SAME_TRANSPONDER(newchannel->getChannelID(), live_channel_id)) if (!need_lock && !SAME_TRANSPONDER(newchannel->getChannelID(), live_channel_id))
live_channel_id = newchannel->getChannelID(); live_channel_id = newchannel->getChannelID();
@@ -1856,7 +1856,10 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
case CZapitMessages::CMD_STOP_PIP: case CZapitMessages::CMD_STOP_PIP:
StopPip(); for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++)
{
StopPip(i);
}
SendCmdReady(connfd); SendCmdReady(connfd);
break; break;
#endif #endif
@@ -2464,7 +2467,10 @@ void CZapit::enterStandby(void)
SaveVolumeMap(); SaveVolumeMap();
StopPlayBack(true); StopPlayBack(true);
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
StopPip(); for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++)
{
StopPip(i);
}
#endif #endif
if(!(currentMode & RECORD_MODE)) { if(!(currentMode & RECORD_MODE)) {
@@ -2845,9 +2851,9 @@ void CZapit::run()
delete audioDecoder; delete audioDecoder;
delete audioDemux; delete audioDemux;
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
StopPip();
for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++) for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++)
{ {
StopPip(i);
if (pipVideoDecoder[i]) if (pipVideoDecoder[i])
pipVideoDecoder[i] = NULL; pipVideoDecoder[i] = NULL;
if (pipVideoDemux[i]) if (pipVideoDemux[i])