From 679f3f23746e1c9bb1f0e3c55c6fbe3064f132e8 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 6 Jan 2024 23:46:56 +0100
Subject: [PATCH] revert 59b9bfd and 6c2e38e

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/9911782cb2bdf3f7bbf91954e8b571e097ab9aee
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
---
 src/zapit/src/zapit.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 88580bcf7..457c767b1 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2483,6 +2483,13 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
 		pcrDemux->Start();
 	}
 
+	/* select audio output and start audio */
+	if (audio_pid) {
+		SetAudioStreamType(thisChannel->getAudioChannel()->audioChannelType);
+		audioDemux->Start();
+		audioDecoder->Start();
+	}
+
 	/* start video */
 	if (video_pid) {
 #if HAVE_CST_HARDWARE
@@ -2494,13 +2501,6 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
 #endif
 	}
 
-	/* select audio output and start audio */
-	if (audio_pid) {
-		SetAudioStreamType(thisChannel->getAudioChannel()->audioChannelType);
-		audioDemux->Start();
-		audioDecoder->Start();
-	}
-
 #ifdef USE_VBI
 	if(teletext_pid)
 		videoDecoder->StartVBI(teletext_pid);
@@ -2510,7 +2510,7 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
 	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);
 	if(send_pmt)
@@ -2529,14 +2529,13 @@ bool CZapit::StopPlayBack(bool send_pmt, bool __attribute__ ((unused)) blank)
 	if (playbackStopForced)
 		return false;
 
-	videoDecoder->Stop(false);
 	videoDemux->Stop();
 	audioDemux->Stop();
 	pcrDemux->Stop();
 	audioDecoder->Stop();
 
 	/* hack. if standby, dont blank video -> for paused timeshift */
-	//videoDecoder->Stop(standby ? false : blank);
+	videoDecoder->Stop(standby ? false : blank);
 
 #if ENABLE_AITSCAN
 	ait->Stop();