mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

put the uncoolinit hack directly in CZapit::Start()

Browse Source
This commit is contained in:
Stefan Seyfried
2013-11-30 17:28:23 +01:00
parent 29c47133fd
commit 51422b1763
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@@ -157,7 +157,7 @@ endif
if BOXTYPE_COOL if BOXTYPE_COOL
if BOXMODEL_APOLLO if BOXMODEL_APOLLO
else else
bin_PROGRAMS += uncoolinit noinst_PROGRAMS = uncoolinit
uncoolinit_SOURCES = uncoolinit.cpp uncoolinit_SOURCES = uncoolinit.cpp
uncoolinit_LDADD = \ uncoolinit_LDADD = \
@AVFORMAT_LIBS@ \ @AVFORMAT_LIBS@ \

6
src/zapit/src/zapit.cpp
View File

@@ -2393,8 +2393,14 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
pipDecoder = cVideo::GetDecoder(1); pipDecoder = cVideo::GetDecoder(1);
pipDecoder->SetDemux(pipDemux); pipDecoder->SetDemux(pipDemux);
#endif #endif
#else
#if HAVE_COOL_HARDWARE
/* work around broken drivers: when starting up with 720p50 image is pink on hd1 */
videoDecoder = new cVideo(VIDEO_STD_1080I50, videoDemux->getChannel(), videoDemux->getBuffer());
videoDecoder->SetVideoSystem(video_mode);
#else #else
videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer()); videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());
#endif
videoDecoder->Standby(false); videoDecoder->Standby(false);
audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/); audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/);