fix inverted setting (meaning was inverted too)

[enigma2.git] / lib / base / filepush.cpp

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index ee83f1426652fb9ca56881adbc1fcaa1cf9d9c1a..60dc78ee2995829c3de7f9ccd6156d7a567fc3c2 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -3,11 +3,16 @@
 #include <lib/base/eerror.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
 
-eFilePushThread::eFilePushThread()
+#define PVR_COMMIT 1
+
+eFilePushThread::eFilePushThread(): m_messagepump(eApp, 0)
 {
        m_stop = 0;
-       m_buf_start = m_buf_end = 0;
+       flush();
+       enablePVRCommit(0);
+       CONNECT(m_messagepump.recv_msg, eFilePushThread::recvEvent);
 }
 
 static void signal_handler(int x)
@@ -17,6 +22,8 @@ static void signal_handler(int x)
 void eFilePushThread::thread()
 {
        off_t dest_pos = 0;
+       
+       int already_empty = 0;
        eDebug("FILEPUSH THREAD START");
                // this is a race. FIXME.
        
@@ -35,12 +42,12 @@ void eFilePushThread::thread()
                {
                                // TODO: take care of boundaries.
                        int w = write(m_fd_dest, m_buffer + m_buf_start, m_buf_end - m_buf_start);
-                       eDebug("wrote %d bytes", w);
+//                     eDebug("wrote %d bytes", w);
                        if (w <= 0)
                        {
                                if (errno == -EINTR)
                                        continue;
-                               eDebug("eFilePushThread *write error* - not yet handled");
+                               eDebug("eFilePushThread *write error* (%m) - not yet handled");
                                // ... we would stop the thread
                        }
 
@@ -65,14 +72,30 @@ void eFilePushThread::thread()
                }
                if (m_buf_end == 0)
                {
+                               /* on EOF, try COMMITting once. */
+                       if (m_send_pvr_commit && !already_empty)
+                       {
+                               eDebug("sending PVR commit");
+                               already_empty = 1;
+                               if (::ioctl(m_fd_dest, PVR_COMMIT) == EINTR)
+                                       continue;
+                               eDebug("commit done");
+                                               /* well check again */
+                               continue;
+                       }
+                       sendEvent(evtEOF);
+
+#if 0
                        eDebug("FILEPUSH: end-of-file! (currently unhandled)");
                        if (!lseek(m_fd_source, 0, SEEK_SET))
                        {
                                eDebug("(looping)");
                                continue;
                        }
+#endif
                        break;
-               }
+               } else
+                       already_empty = 0;
 //             printf("FILEPUSH: read %d bytes\n", m_buf_end);
        }
        
@@ -88,6 +111,8 @@ void eFilePushThread::start(int fd_source, int fd_dest)
 
 void eFilePushThread::stop()
 {
+       if (!thread_running()) /* FIXME: races */
+               return;
        m_stop = 1;
        sendSignal(SIGUSR1);
        kill();
@@ -108,3 +133,23 @@ void eFilePushThread::resume()
        m_stop = 0;
        run();
 }
+
+void eFilePushThread::flush()
+{
+       m_buf_start = m_buf_end = 0;
+}
+
+void eFilePushThread::enablePVRCommit(int s)
+{
+       m_send_pvr_commit = s;
+}
+
+void eFilePushThread::sendEvent(int evt)
+{
+       m_messagepump.send(evt);
+}
+
+void eFilePushThread::recvEvent(const int &evt)
+{
+       m_event(evt);
+}