From 6dd12cd80fbca017bbb00557a0c124c417bc1c4e Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 3 Nov 2017 18:25:18 +0100 Subject: [PATCH 1/2] fix generic build Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c7c52324a39c3b65e21b35d9983f26e95efa6537 Author: Jacek Jendrzej Date: 2017-11-03 (Fri, 03 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/simple_display.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/simple_display.cpp b/src/driver/simple_display.cpp index 347ff46ea..82ba228da 100644 --- a/src/driver/simple_display.cpp +++ b/src/driver/simple_display.cpp @@ -80,7 +80,7 @@ static int proc_put(const char *path, bool state) return ret; } #else -static int proc_put(const char *path, bool state) {} +static int proc_put(const char *path, bool state) {return 0;} #endif static char volume = 0; @@ -348,8 +348,8 @@ void CLCD::showTime(bool force) if (force || last_display || (hour != t->tm_hour) || (minute != t->tm_min)) { hour = t->tm_hour; minute = t->tm_min; -#if HAVE_SPARK_HARDWARE int ret = -1; +#if HAVE_SPARK_HARDWARE now += t->tm_gmtoff; int fd = dev_open(); #if 0 /* VFDSETTIME is broken and too complicated anyway -> use VFDSETTIME2 */ From 6e8dcaa0fb565fdc110dbd4cb9364a5f41ab4afc Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 3 Nov 2017 20:14:37 +0100 Subject: [PATCH 2/2] silence -Wparentheses-equality warning Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/75fd96f6b73a70c86d82c91b7cba134ad3ee1837 Author: Jacek Jendrzej Date: 2017-11-03 (Fri, 03 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_item.cpp | 2 +- src/gui/epgview.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp index be2e6678a..33b595b2d 100644 --- a/src/gui/components/cc_item.cpp +++ b/src/gui/components/cc_item.cpp @@ -207,7 +207,7 @@ void CComponentsItem::paintInit(bool do_save_bg) //handle frame color for slected/not selected item if (fr_thickness) { for(size_t j =0; j< v_fbdata.size() ;j++) { - if ((v_fbdata[j].fbdata_type == CC_FBDATA_TYPE_FRAME)){ + if (v_fbdata[j].fbdata_type == CC_FBDATA_TYPE_FRAME){ v_fbdata[j].color = col_frame_cur; v_fbdata[j].frame_thickness = th; } diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index a4b7a79f6..c22ecff12 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -952,7 +952,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start } break; case NeutrinoMessages::EVT_CURRENTNEXT_EPG: - if (/*!id && */ ((*(t_channel_id *) data) == (channel_id & 0xFFFFFFFFFFFFULL))) { + if (/*!id && */ (*(t_channel_id *) data) == (channel_id & 0xFFFFFFFFFFFFULL)) { show(channel_id,0,NULL,false); showPos=0; }