add stream-mode to filepush, which will retry on eof until stream grows

2 files changed, 24 insertions, 1 deletions

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index 8424ae41..92c580c2 100644
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -11,6 +11,8 @@ eFilePushThread::eFilePushThread(int io_prio_class, int io_prio_level)
 {
 	m_stop = 0;
 	m_sg = 0;
+	m_send_pvr_commit = 0;
+	m_stream_mode = 0;
 	flush();
 	enablePVRCommit(0);
 	CONNECT(m_messagepump.recv_msg, eFilePushThread::recvEvent);
@@ -128,7 +130,19 @@ void eFilePushThread::thread()
 						/* well check again */
 				continue;
 			}
+			
+				/* in stream_mode, we are sending EOF events 
+				   over and over until somebody responds.
+				   
+				   in stream_mode, think of evtEOF as "buffer underrun occured". */
 			sendEvent(evtEOF);
+
+			if (m_stream_mode)
+			{
+				eDebug("reached EOF, but we are in stream mode. delaying 1 second.");
+				sleep(1);
+				continue;
+			}
 #if 0
 			eDebug("FILEPUSH: end-of-file! (currently unhandled)");
 			if (!m_raw_source.lseek(0, SEEK_SET))
@@ -214,6 +228,11 @@ void eFilePushThread::enablePVRCommit(int s)
 	m_send_pvr_commit = s;
 }
 
+void eFilePushThread::setStreamMode(int s)
+{
+	m_stream_mode = s;
+}
+
 void eFilePushThread::setScatterGather(iFilePushScatterGather *sg)
 {
 	m_sg = sg;
diff --git a/lib/base/filepush.h b/lib/base/filepush.h
index 0749cd43..d3f32d75 100644
--- a/lib/base/filepush.h
+++ b/lib/base/filepush.h
@@ -33,6 +33,9 @@ public:
 	void flush();
 	void enablePVRCommit(int);
 	
+		/* stream mode will wait on EOF until more data is available. */
+	void setStreamMode(int);
+	
 	void setScatterGather(iFilePushScatterGather *);
 	
 	enum { evtEOF, evtReadError, evtWriteError, evtUser };
@@ -52,7 +55,8 @@ private:
 	int m_buf_start, m_buf_end;
 	int m_fd_dest;
 	int m_send_pvr_commit;
-	
+	int m_stream_mode;
+
 	eRawFile m_raw_source;
 	
 	eFixedMessagePump<int> m_messagepump;