mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/simple_display.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: db0efcca40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-03 22:40:43 +01:00
parent 5d2a16205d 6e8dcaa0fb
commit 72f8a92e90
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/simple_display.cpp
View File

@@ -75,7 +75,7 @@ static int proc_put(const char *path, bool state)
return ret;
}
#else
static int proc_put(const char, bool) {}
static int proc_put(const char, bool) {return 0;}
#endif
static char volume = 0;
@@ -353,8 +353,8 @@ void CLCD::showTime(bool force)
if (force || last_display || (switch_name_time_cnt == 0 && ((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 */

2
src/gui/components/cc_item.cpp
View File

@@ -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;
}

2
src/gui/epgview.cpp
View File

@@ -995,7 +995,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;
}