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/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
This commit is contained in:
vanhofen
2017-09-25 11:41:44 +02:00
parent 0d9a80486a 05d2a7b8b1
commit 3b0222d2d5
15 changed files with 55 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/streaminfo2.cpp
View File

@@ -1075,7 +1075,7 @@ int CStreamInfo2::update_rate ()
usleep(timeout * 1000);
b_len = mp->GetReadCount();
} else {
time_t start = time_monotonic_ms();
int64_t start = time_monotonic_ms();
/* always sample for ~100ms */
while (time_monotonic_ms() - start < timeout)
{
@@ -1083,7 +1083,7 @@ int CStreamInfo2::update_rate ()
if (ret >= 0)
b_len += ret;
}
//printf("ts: read %d time %d\n", b_len, time_monotonic_ms() - start);
//printf("ts: read %d time %" PRId64 "\n", b_len, time_monotonic_ms() - start);
}
//printf("ts: read %d\n", b_len);