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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

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


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-26 00:39:36 +01:00
parent b21ec915f5 0d8c13b81f
commit dce47308fe
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/driver/rcinput.cpp
View File

@@ -1320,21 +1320,19 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
} }
if (ev.type == EV_SYN) if (ev.type == EV_SYN)
continue; /* ignore... */ continue; /* ignore... */
if (ev.value) { /* try to compensate for possible changes in wall clock
/* try to compensate for possible changes in wall clock * kernel ev.time default uses CLOCK_REALTIME, as does gettimeofday().
* kernel ev.time default uses CLOCK_REALTIME, as does gettimeofday(). * so subtract gettimeofday() from ev.time and then add
* so subtract gettimeofday() from ev.time and then add * CLOCK_MONOTONIC, which is supposed to not change with settimeofday.
* CLOCK_MONOTONIC, which is supposed to not change with settimeofday. * Everything would be much easier if we could use the post-kernel 3.4
* Everything would be much easier if we could use the post-kernel 3.4 * EVIOCSCLOCKID ioctl :-) */
* EVIOCSCLOCKID ioctl :-) */ struct timespec t1;
struct timespec t1; now_pressed = ev.time.tv_usec + ev.time.tv_sec * 1000000ULL;
now_pressed = ev.time.tv_usec + ev.time.tv_sec * 1000000ULL; if (!clock_gettime(CLOCK_MONOTONIC, &t1)) {
if (!clock_gettime(CLOCK_MONOTONIC, &t1)) { struct timeval t2;
struct timeval t2; gettimeofday(&t2, NULL);
gettimeofday(&t2, NULL); now_pressed += t1.tv_sec * 1000000ULL + t1.tv_nsec / 1000;
now_pressed += t1.tv_sec * 1000000ULL + t1.tv_nsec / 1000; now_pressed -= (t2.tv_usec + t2.tv_sec * 1000000ULL);
now_pressed -= (t2.tv_usec + t2.tv_sec * 1000000ULL);
}
} }
SHTDCNT::getInstance()->resetSleepTimer(); SHTDCNT::getInstance()->resetSleepTimer();
if (ev.value && firstKey) { if (ev.value && firstKey) {

1
src/gui/timerlist.cpp
View File

@@ -1626,6 +1626,7 @@ int CTimerList::modifyTimer()
if (!strlen(timer->recordingDir)) if (!strlen(timer->recordingDir))
strncpy(timer->recordingDir,g_settings.network_nfs_recordingdir.c_str(),sizeof(timer->recordingDir)-1); strncpy(timer->recordingDir,g_settings.network_nfs_recordingdir.c_str(),sizeof(timer->recordingDir)-1);
timer_recordingDir = timer->recordingDir; timer_recordingDir = timer->recordingDir;
strncpy(t_old.recordingDir, timer->recordingDir, sizeof(t_old.recordingDir)-1);
bool recDirEnabled = (g_settings.recording_type == RECORDING_FILE); // obsolete? bool recDirEnabled = (g_settings.recording_type == RECORDING_FILE); // obsolete?
CMenuForwarder* m6 = new CMenuForwarder(LOCALE_TIMERLIST_RECORDING_DIR, recDirEnabled, timer_recordingDir, this, "rec_dir1", CRCInput::RC_green); CMenuForwarder* m6 = new CMenuForwarder(LOCALE_TIMERLIST_RECORDING_DIR, recDirEnabled, timer_recordingDir, this, "rec_dir1", CRCInput::RC_green);