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

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

Browse Source 
Conflicts:
	configure.ac
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/driver/rcinput.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33441c2ba2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-26 00:45:36 +01:00
parent dce47308fe e569490348
commit 2623c0d848
7 changed files with 11 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/rcinput.cpp
View File

@@ -535,6 +535,8 @@ int CRCInput::checkTimers()
return _id;
}
int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds)
{
return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000);