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

revert 59b9bfd and 6c2e38e

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9911782cb2
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-01-06 (Sat, 06 Jan 2024)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2024-01-06 23:46:56 +01:00
parent e994f93f8d
commit 679f3f2374
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/zapit/src/zapit.cpp
View File

@@ -2483,6 +2483,13 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
pcrDemux->Start(); pcrDemux->Start();
} }
/* select audio output and start audio */
if (audio_pid) {
SetAudioStreamType(thisChannel->getAudioChannel()->audioChannelType);
audioDemux->Start();
audioDecoder->Start();
}
/* start video */ /* start video */
if (video_pid) { if (video_pid) {
#if HAVE_CST_HARDWARE #if HAVE_CST_HARDWARE
@@ -2494,13 +2501,6 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
#endif #endif
} }
/* select audio output and start audio */
if (audio_pid) {
SetAudioStreamType(thisChannel->getAudioChannel()->audioChannelType);
audioDemux->Start();
audioDecoder->Start();
}
#ifdef USE_VBI #ifdef USE_VBI
if(teletext_pid) if(teletext_pid)
videoDecoder->StartVBI(teletext_pid); videoDecoder->StartVBI(teletext_pid);
@@ -2510,7 +2510,7 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
return true; return true;
} }
bool CZapit::StopPlayBack(bool send_pmt, bool __attribute__ ((unused)) blank) bool CZapit::StopPlayBack(bool send_pmt, bool blank)
{ {
INFO("standby %d playing %d forced %d send_pmt %d", standby, playing, playbackStopForced, send_pmt); INFO("standby %d playing %d forced %d send_pmt %d", standby, playing, playbackStopForced, send_pmt);
if(send_pmt) if(send_pmt)
@@ -2529,14 +2529,13 @@ bool CZapit::StopPlayBack(bool send_pmt, bool __attribute__ ((unused)) blank)
if (playbackStopForced) if (playbackStopForced)
return false; return false;
videoDecoder->Stop(false);
videoDemux->Stop(); videoDemux->Stop();
audioDemux->Stop(); audioDemux->Stop();
pcrDemux->Stop(); pcrDemux->Stop();
audioDecoder->Stop(); audioDecoder->Stop();
/* hack. if standby, dont blank video -> for paused timeshift */ /* hack. if standby, dont blank video -> for paused timeshift */
//videoDecoder->Stop(standby ? false : blank); videoDecoder->Stop(standby ? false : blank);
#if ENABLE_AITSCAN #if ENABLE_AITSCAN
ait->Stop(); ait->Stop();