Add method to detect if RingBuffer construction actually failed

MythTV · Jul 7, 2013 · 45460b5 · 45460b5
1 parent a2e8a95
commit 45460b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/mythtv/libs/libmythtv/ringbuffer.cpp b/mythtv/libs/libmythtv/ringbuffer.cpp
@@ -1582,6 +1582,14 @@ QString RingBuffer::GetSubtitleFilename(void) const
     return tmp;
 }
 
+QString RingBuffer::GetLastError(void) const
+{
+    rwlock.lockForRead();
+    QString tmp = lastError;
+    rwlock.unlock();
+    return tmp;
+}
+
 /** \fn RingBuffer::GetWritePosition(void) const
  *  \brief Returns how far into a ThreadedFileWriter file we have written.
  */

diff --git a/mythtv/libs/libmythtv/ringbuffer.h b/mythtv/libs/libmythtv/ringbuffer.h
@@ -66,6 +66,8 @@ class MTV_PUBLIC RingBuffer : protected MThread
     QString   GetSafeFilename(void) { return safefilename; }
     QString   GetFilename(void)      const;
     QString   GetSubtitleFilename(void) const;
+    QString   GetLastError(void)     const;
+
     /// Returns value of stopreads
     /// \sa StartReads(void), StopReads(void)
     bool      GetStopReads(void)     const { return stopreads; }
@@ -204,6 +206,7 @@ class MTV_PUBLIC RingBuffer : protected MThread
     QString safefilename;         // unprotected (for debugging)
     QString filename;             // protected by rwlock
     QString subtitlefilename;     // protected by rwlock
+    QString lastError;            // protected by rwlock
 
     ThreadedFileWriter *tfw;      // protected by rwlock
     int fd2;                      // protected by rwlock