From c9f712c3a3de3dd6d97e22f00709f581fb9f64b0 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 22 Sep 2013 14:32:02 +0200 Subject: [PATCH] zapit: fix ordering for new azbox drivers Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c241bfee3427edb93b4478ade57a9b1b9e5cb70e Author: Stefan Seyfried Date: 2013-09-22 (Sun, 22 Sep 2013) --- src/zapit/src/zapit.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 5c6e8aa77..d598c7438 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2126,6 +2126,15 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel) pcrDemux->Start(); } +#if HAVE_AZBOX_HARDWARE + /* new (> 20130917) AZbox drivers switch to radio mode if audio is started first */ + /* start video */ + if (have_video) { + videoDecoder->Start(0, thisChannel->getPcrPid(), thisChannel->getVideoPid()); + videoDemux->Start(); + } +#endif + /* select audio output and start audio */ if (have_audio) { SetAudioStreamType(thisChannel->getAudioChannel()->audioChannelType); @@ -2133,12 +2142,8 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel) audioDecoder->Start(); } +#if ! HAVE_AZBOX_HARDWARE /* start video */ -#if HAVE_AZBOX_HARDWARE - videoDemux->Start(); - /* no idea why we need to start *video* to get sound for radio... :-) */ - videoDecoder->Start(); -#else if (have_video) { videoDecoder->Start(0, thisChannel->getPcrPid(), thisChannel->getVideoPid()); videoDemux->Start();