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

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

Browse Source 
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-25 11:36:34 +02:00
parent b28f1676c6 1736a5fca8
commit cd18fa9ca0
37 changed files with 122 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/rcinput.cpp
View File

@@ -473,7 +473,7 @@ int CRCInput::addTimer(uint64_t Interval, bool oneshot, bool correct_time )
_newtimer.correct_time = correct_time;
printf("adding timer %d (0x%lu, 0x%lu)\n", _newtimer.id, _newtimer.times_out, Interval);
//printf("adding timer %d (0x%" PRIx64 ", 0x%" PRIx64 ")\n", _newtimer.id, _newtimer.times_out, Interval);
std::vector<timer>::iterator e;
for ( e= timers.begin(); e!= timers.end(); ++e )
@@ -486,7 +486,7 @@ printf("adding timer %d (0x%lu, 0x%lu)\n", _newtimer.id, _newtimer.times_out, In
void CRCInput::killTimer(uint32_t &id)
{
printf("killing timer %d\n", id);
//printf("killing timer %d\n", id);
if(id == 0)
return;