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

zapit: fix ordering for new azbox drivers

Browse Source 
Origin commit data
------------------
Commit: c241bfee34
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-22 (Sun, 22 Sep 2013)
This commit is contained in:
Stefan Seyfried
2013-09-22 14:32:02 +02:00
parent e65b224bb1
commit c9f712c3a3
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/zapit/src/zapit.cpp
View File

@@ -2126,6 +2126,15 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
pcrDemux->Start(); 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 */ /* select audio output and start audio */
if (have_audio) { if (have_audio) {
SetAudioStreamType(thisChannel->getAudioChannel()->audioChannelType); SetAudioStreamType(thisChannel->getAudioChannel()->audioChannelType);
@@ -2133,12 +2142,8 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
audioDecoder->Start(); audioDecoder->Start();
} }
#if ! HAVE_AZBOX_HARDWARE
/* start video */ /* 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) { if (have_video) {
videoDecoder->Start(0, thisChannel->getPcrPid(), thisChannel->getVideoPid()); videoDecoder->Start(0, thisChannel->getPcrPid(), thisChannel->getVideoPid());
videoDemux->Start(); videoDemux->Start();