git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f7b9fc4
)
filepush.cpp: no infinite wait until driver EOF.. better we check it more times..
author
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 9 Dec 2009 13:58:12 +0000
(14:58 +0100)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 9 Dec 2009 13:58:12 +0000
(14:58 +0100)
lib/base/filepush.cpp
patch
|
blob
|
history
diff --git
a/lib/base/filepush.cpp
b/lib/base/filepush.cpp
index ba30322cc49f8db9675afe546e552844b227e01e..91f24ba064026502d3b69316d89c2409bd133bec 100644
(file)
--- a/
lib/base/filepush.cpp
+++ b/
lib/base/filepush.cpp
@@
-187,12
+187,21
@@
void eFilePushThread::thread()
/* on EOF, try COMMITting once. */
if (m_send_pvr_commit)
{
/* on EOF, try COMMITting once. */
if (m_send_pvr_commit)
{
- eDebug("sending PVR commit");
struct pollfd pfd;
pfd.fd = m_fd_dest;
pfd.events = POLLIN;
struct pollfd pfd;
pfd.fd = m_fd_dest;
pfd.events = POLLIN;
- poll(&pfd, 1, -1);
- eDebug("commit done");
+ switch (poll(&pfd, 1, 250)) // wait for 250ms
+ {
+ case 0:
+ eDebug("wait for driver eof timeout");
+ continue;
+ case 1:
+ eDebug("wait for driver eof ok");
+ break;
+ default:
+ eDebug("wait for driver eof aborted by signal");
+ continue;
+ }
}
/* in stream_mode, we are sending EOF events
}
/* in stream_mode, we are sending EOF events