more pip changes

This commit is contained in:
BPanther
2021-10-15 20:00:19 +02:00
committed by Thilo Graf
parent 180f0446b8
commit 2024f516ed

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)) {
@@ -2872,9 +2878,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])