From 992e1a6613b12e358cbaacb4f0eed35b4f348015 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 16 Jun 2017 11:10:31 +0200 Subject: [PATCH 1/3] epgview: align with and height of progressbar Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4adea2366172af85bffb8514197b8230ffe4a270 Author: vanhofen Date: 2017-06-16 (Fri, 16 Jun 2017) Origin message was: ------------------ - epgview: align with and height of progressbar Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 6dbda256f..b696c54ea 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -1412,9 +1412,9 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st void CEpgData::showProgressBar() { - int w = 104; + int w = ox/10; int x = sx + (ox - w)/2; - int h = botboxheight - 12; + int h = botboxheight - 2*OFFSET_INNER_SMALL; int y = sy + oy - botboxheight + (botboxheight - h)/2; if (!pb){ pb = new CProgressBar(x, y, w, h); From 909cf0482d71b99e4118c9f892d780c5c6af0a35 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Fri, 16 Jun 2017 19:10:23 +0200 Subject: [PATCH 2/3] Revert "HD1: Workaround for missing cs_get_chip_type" This reverts commit f273871fcff9667a3af625d16b0fa1b7d2e6d751. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e3cc6cee67f5314efb0222d533d76001a60ea686 Author: Michael Liebmann Date: 2017-06-16 (Fri, 16 Jun 2017) ------------------ This commit was generated by Migit --- lib/hardware/coolstream/hardware_caps.cpp | 6 +----- lib/hardware/coolstream/hd1/libcoolstream/cs_api.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/hardware/coolstream/hardware_caps.cpp b/lib/hardware/coolstream/hardware_caps.cpp index e5af0e255..139825c32 100644 --- a/lib/hardware/coolstream/hardware_caps.cpp +++ b/lib/hardware/coolstream/hardware_caps.cpp @@ -6,7 +6,6 @@ * * License: GPL v2 or later */ -#include #include "cs_api.h" #include #include @@ -21,10 +20,7 @@ hw_caps_t *get_hwcaps(void) { if (initialized) return ∩︀ int rev = cs_get_revision(); - int chip = 0; -#ifdef BOXMODEL_CS_HD2 - chip = cs_get_chip_type(); -#endif + int chip = cs_get_chip_type(); caps.has_fan = (rev < 8 && CFEManager::getInstance()->getFE(0)->hasSat()); // only SAT-HD1 before rev 8 has fan caps.has_HDMI = 1; caps.has_SCART = (rev != 10); diff --git a/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h b/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h index 80dd47ade..9a4e77259 100644 --- a/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h +++ b/lib/hardware/coolstream/hd1/libcoolstream/cs_api.h @@ -82,7 +82,7 @@ int cs_get_tsp_config(unsigned int port, tsrouter_tsp_config_t *tsp_config); unsigned long long cs_get_serial(void); unsigned int cs_get_revision(void); /* Dummy function for compatibility with hd2 */ -//unsigned int cs_get_chip_type(void); +unsigned int cs_get_chip_type(void); // library version functions From f4eae34527c31332f0b7967962f50240c9e277a1 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Fri, 16 Jun 2017 19:05:59 +0200 Subject: [PATCH 3/3] COsdHelpers: Fix video system switching on HD1 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/224521bc40bcaeb9c5198565286544658ba400c9 Author: Michael Liebmann Date: 2017-06-16 (Fri, 16 Jun 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/osd_helpers.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/gui/osd_helpers.cpp b/src/gui/osd_helpers.cpp index 2675cffef..b5bb20127 100644 --- a/src/gui/osd_helpers.cpp +++ b/src/gui/osd_helpers.cpp @@ -156,17 +156,10 @@ int COsdHelpers::isVideoSystem1080(int res) return false; } -#ifdef ENABLE_CHANGE_OSD_RESOLUTION int COsdHelpers::getVideoSystem() { return videoDecoder->GetVideoSystem(); } -#else -int COsdHelpers::getVideoSystem() -{ - return g_settings.video_Mode; -} -#endif uint32_t COsdHelpers::getOsdResolution() {