Diffstat (limited to 'core/multimedia/opieplayer/modplug/memfile.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/multimedia/opieplayer/modplug/memfile.cpp | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/core/multimedia/opieplayer/modplug/memfile.cpp b/core/multimedia/opieplayer/modplug/memfile.cpp index 8a29997..cd243c7 100644 --- a/core/multimedia/opieplayer/modplug/memfile.cpp +++ b/core/multimedia/opieplayer/modplug/memfile.cpp @@ -16,12 +16,16 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "memfile.h" +/* OPIE */ +#include <opie2/odebug.h> + +/* STD */ #include <unistd.h> #include <sys/mman.h> MemFile::MemFile() { } @@ -44,33 +48,33 @@ void MemFile::close() void MemFile::unmap() { #if defined(Q_WS_X11) || defined(Q_WS_QWS) if ( m_data.data() ) { - munmap( m_data.data(), m_data.size() ); - m_data.resetRawData( m_data.data(), m_data.size() ); + munmap( m_data.data(), m_data.size() ); + m_data.resetRawData( m_data.data(), m_data.size() ); } #endif } QByteArray &MemFile::data() { if ( !m_data.data() ) { #if defined(Q_WS_X11) || defined(Q_WS_QWS) - const char *rawData = (const char *)mmap( 0, size(), PROT_READ, - MAP_SHARED, handle(), 0 ); - if ( rawData ) - { - m_data.setRawData( rawData, size() ); - return m_data; - } - else - qDebug( "MemFile: mmap() failed!" ); - // fallback + const char *rawData = (const char *)mmap( 0, size(), PROT_READ, + MAP_SHARED, handle(), 0 ); + if ( rawData ) + { + m_data.setRawData( rawData, size() ); + return m_data; + } + else + odebug << "MemFile: mmap() failed!" << oendl; + // fallback #endif - m_data = readAll(); + m_data = readAll(); } return m_data; } |