Applied patch [ 1204548 ] Add Get and SetVolume to wxMediaCtrl and fix bug 1200182

[wxWidgets.git] / src / common / mstream.cpp

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 9226ce4461282164c3f847f24f1b9feb85ec5fac..122d6e7baaff9dd2fff33227d7b3b80d837eaaa0 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "mstream.h"
 #endif
 
@@ -47,11 +47,27 @@ wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO((void *)data, len); // const_cast
     m_i_streambuf->SetIntPosition(0); // seek to start pos
-    m_i_streambuf->Fixed(TRUE);
+    m_i_streambuf->Fixed(true);
 
     m_length = len;
 }
 
+wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
+{
+    ssize_t len = (ssize_t)stream.GetLength();
+    if (len == wxInvalidOffset) {
+        m_i_streambuf = NULL;
+        m_lasterror = wxSTREAM_EOF;
+        return;
+    }
+    m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
+    m_i_streambuf->SetBufferIO(len); // create buffer
+    stream.CopyTo(m_i_streambuf->GetBufferStart(), len);
+    m_i_streambuf->SetIntPosition(0); // seek to start pos
+    m_i_streambuf->Fixed(true);
+    m_length = len;
+}
+
 wxMemoryInputStream::~wxMemoryInputStream()
 {
     delete m_i_streambuf;
@@ -60,8 +76,15 @@ wxMemoryInputStream::~wxMemoryInputStream()
 char wxMemoryInputStream::Peek()
 {
     char *buf = (char *)m_i_streambuf->GetBufferStart();
+    size_t pos = m_i_streambuf->GetIntPosition();
+    if ( pos == m_length )
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+
+        return 0;
+    }
 
-    return buf[m_i_streambuf->GetIntPosition()];
+    return buf[pos];
 }
 
 bool wxMemoryInputStream::Eof() const
@@ -80,17 +103,17 @@ size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
     }
 
     m_i_streambuf->Read(buffer, nbytes);
-    m_lasterror = wxSTREAM_NOERROR;
+    m_lasterror = wxSTREAM_NO_ERROR;
 
     return m_i_streambuf->GetIntPosition() - pos;
 }
 
-off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxMemoryInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {
     return m_i_streambuf->Seek(pos, mode);
 }
 
-off_t wxMemoryInputStream::OnSysTell() const
+wxFileOffset wxMemoryInputStream::OnSysTell() const
 {
     return m_i_streambuf->Tell();
 }
@@ -104,8 +127,8 @@ wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len)
     m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
     if ( data )
         m_o_streambuf->SetBufferIO(data, len);
-    m_o_streambuf->Fixed(FALSE);
-    m_o_streambuf->Flushable(FALSE);
+    m_o_streambuf->Fixed(false);
+    m_o_streambuf->Flushable(false);
 }
 
 wxMemoryOutputStream::~wxMemoryOutputStream()
@@ -126,12 +149,12 @@ size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
     return newpos - oldpos;
 }
 
-off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxMemoryOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 {
     return m_o_streambuf->Seek(pos, mode);
 }
 
-off_t wxMemoryOutputStream::OnSysTell() const
+wxFileOffset wxMemoryOutputStream::OnSysTell() const
 {
     return m_o_streambuf->Tell();
 }