fix quad pip

Origin commit data
------------------
Commit: 386622da9c
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 573e86ffe6
commit 159eaac3bf

View File

@@ -137,7 +137,7 @@ bool CQuadPiPSetupNotifier::changeNotify(const neutrino_locale_t, void */*Data*/
for (unsigned i = 0; i < pip_devs; i++) for (unsigned i = 0; i < pip_devs; i++)
{ {
CZapit::getInstance()->OpenPip(i); CZapit::getInstance()->OpenPip(i);
usleep (100); // delay time for zap etc. usleep (150); // delay time for zap etc.
if (i == 0) if (i == 0)
{ {
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(g_settings.quadpip_channel_id_window[i]); CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(g_settings.quadpip_channel_id_window[i]);
@@ -149,7 +149,7 @@ bool CQuadPiPSetupNotifier::changeNotify(const neutrino_locale_t, void */*Data*/
g_Zapit->zapTo_pip(g_settings.quadpip_channel_id_window[i], i-1); g_Zapit->zapTo_pip(g_settings.quadpip_channel_id_window[i], i-1);
pipAudioDemux[i-1]->Start(); pipAudioDemux[i-1]->Start();
pipAudioDecoder[i-1]->Start(); pipAudioDecoder[i-1]->Start();
usleep(50); // delay for audio start/stop for audio later at window selection usleep(150); // delay for audio start/stop for audio later at window selection
pipAudioDemux[i-1]->Stop(); pipAudioDemux[i-1]->Stop();
pipAudioDecoder[i-1]->Stop(); pipAudioDecoder[i-1]->Stop();
@@ -172,7 +172,6 @@ bool CQuadPiPSetupNotifier::changeNotify(const neutrino_locale_t, void */*Data*/
{ {
CCamManager::getInstance()->Stop(g_settings.quadpip_channel_id_window[i], CCamManager::PIP); CCamManager::getInstance()->Stop(g_settings.quadpip_channel_id_window[i], CCamManager::PIP);
CZapit::getInstance()->StopPip(i); CZapit::getInstance()->StopPip(i);
g_Zapit->stopPip(i);
} }
g_Zapit->Rezap(); g_Zapit->Rezap();
aw = 0; aw = 0;
@@ -389,18 +388,7 @@ int CQuadPiPSetupSelectChannelWidget::exec(CMenuTarget *parent, const std::strin
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++)
{ {
CCamManager::getInstance()->Stop(g_settings.quadpip_channel_id_window[i], CCamManager::PIP); CCamManager::getInstance()->Stop(g_settings.quadpip_channel_id_window[i], CCamManager::PIP);
if (pipVideoDemux[i]) CZapit::getInstance()->StopPip(i);
pipVideoDemux[i]->Stop();
if (pipVideoDecoder[i])
{
pipVideoDecoder[i]->ShowPig(0);
pipVideoDecoder[i]->Stop();
}
if (pipAudioDemux[i])
pipAudioDemux[i]->Stop();
if (pipAudioDecoder[i])
pipAudioDecoder[i]->Stop();
g_Zapit->stopPip(i);
} }
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(g_settings.quadpip_channel_id_window[aw]); CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(g_settings.quadpip_channel_id_window[aw]);
g_Zapit->Rezap(); g_Zapit->Rezap();