enable playback of multifile (split) movies

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

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index 705dbb5ea8ec88ceab99e3e50a1db684fa3f2d64..8d116559aa1f53f5463f4206daf3c06a174a7133 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -40,7 +40,7 @@ void eFilePushThread::thread()
        sigaction(SIGUSR1, &act, 0);
        
        dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
-       source_pos = lseek(m_fd_source, 0, SEEK_CUR);
+       source_pos = m_raw_source.lseek(0, SEEK_CUR);
        
                /* m_stop must be evaluated after each syscall. */
        while (!m_stop)
@@ -49,6 +49,7 @@ void eFilePushThread::thread()
                if (m_buf_start != m_buf_end)
                {
                                // TODO: take care of boundaries.
+                       filterRecordData(m_buffer + m_buf_start, m_buf_end - m_buf_start);
                        int w = write(m_fd_dest, m_buffer + m_buf_start, m_buf_end - m_buf_start);
 //                     eDebug("wrote %d bytes", w);
                        if (w <= 0)
@@ -83,7 +84,7 @@ void eFilePushThread::thread()
                        m_sg->getNextSourceSpan(source_pos, bytes_read, current_span_offset, current_span_remaining);
 
                        if (source_pos != current_span_offset)
-                               source_pos = lseek(m_fd_source, current_span_offset, SEEK_SET);
+                               source_pos = m_raw_source.lseek(current_span_offset, SEEK_SET);
                        bytes_read = 0;
                }
                
@@ -97,7 +98,7 @@ void eFilePushThread::thread()
                m_buf_end = 0;
                
                if (maxread)
-                       m_buf_end = read(m_fd_source, m_buffer, maxread);
+                       m_buf_end = m_raw_source.read(m_buffer, maxread);
 
                if (m_buf_end < 0)
                {
@@ -127,7 +128,7 @@ void eFilePushThread::thread()
                        sendEvent(evtEOF);
 #if 0
                        eDebug("FILEPUSH: end-of-file! (currently unhandled)");
-                       if (!lseek(m_fd_source, 0, SEEK_SET))
+                       if (!m_raw_source.lseek(0, SEEK_SET))
                        {
                                eDebug("(looping)");
                                continue;
@@ -150,11 +151,20 @@ void eFilePushThread::thread()
 
 void eFilePushThread::start(int fd_source, int fd_dest)
 {
-       m_fd_source = fd_source;
+       m_raw_source.setfd(fd_source);
        m_fd_dest = fd_dest;
        resume();
 }
 
+int eFilePushThread::start(const char *filename, int fd_dest)
+{
+       if (m_raw_source.open(filename) < 0)
+               return -1;
+       m_fd_dest = fd_dest;
+       resume();
+       return 0;
+}
+
 void eFilePushThread::stop()
 {
        if (!thread_running()) /* FIXME: races */
@@ -171,7 +181,7 @@ void eFilePushThread::pause()
 
 void eFilePushThread::seek(int whence, off_t where)
 {
-       ::lseek(m_fd_source, where, whence);
+       m_raw_source.lseek(where, whence);
 }
 
 void eFilePushThread::resume()
@@ -204,3 +214,9 @@ void eFilePushThread::recvEvent(const int &evt)
 {
        m_event(evt);
 }
+
+void eFilePushThread::filterRecordData(const unsigned char *data, int len)
+{
+       /* do nothing */
+}
+