From 51422b1763aee45c83cbf337e3ea6853b2464fb1 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 30 Nov 2013 17:28:23 +0100 Subject: [PATCH] put the uncoolinit hack directly in CZapit::Start() --- src/Makefile.am | 2 +- src/zapit/src/zapit.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index cee8abfd7..e1ff768cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -157,7 +157,7 @@ endif if BOXTYPE_COOL if BOXMODEL_APOLLO else -bin_PROGRAMS += uncoolinit +noinst_PROGRAMS = uncoolinit uncoolinit_SOURCES = uncoolinit.cpp uncoolinit_LDADD = \ @AVFORMAT_LIBS@ \ diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 9160de260..1539f8c42 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2393,8 +2393,14 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) pipDecoder = cVideo::GetDecoder(1); pipDecoder->SetDemux(pipDemux); #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 videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer()); +#endif videoDecoder->Standby(false); audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/);