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 | |||
@@ -18,8 +18,12 @@ | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include "memfile.h" | 20 | #include "memfile.h" |
21 | 21 | ||
22 | /* OPIE */ | ||
23 | #include <opie2/odebug.h> | ||
24 | |||
25 | /* STD */ | ||
22 | #include <unistd.h> | 26 | #include <unistd.h> |
23 | #include <sys/mman.h> | 27 | #include <sys/mman.h> |
24 | 28 | ||
25 | MemFile::MemFile() | 29 | MemFile::MemFile() |
@@ -46,10 +50,10 @@ void MemFile::unmap() | |||
46 | { | 50 | { |
47 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) | 51 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) |
48 | if ( m_data.data() ) | 52 | if ( m_data.data() ) |
49 | { | 53 | { |
50 | munmap( m_data.data(), m_data.size() ); | 54 | munmap( m_data.data(), m_data.size() ); |
51 | m_data.resetRawData( m_data.data(), m_data.size() ); | 55 | m_data.resetRawData( m_data.data(), m_data.size() ); |
52 | } | 56 | } |
53 | #endif | 57 | #endif |
54 | } | 58 | } |
55 | 59 | ||
@@ -57,20 +61,20 @@ QByteArray &MemFile::data() | |||
57 | { | 61 | { |
58 | if ( !m_data.data() ) | 62 | if ( !m_data.data() ) |
59 | { | 63 | { |
60 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) | 64 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) |
61 | const char *rawData = (const char *)mmap( 0, size(), PROT_READ, | 65 | const char *rawData = (const char *)mmap( 0, size(), PROT_READ, |
62 | MAP_SHARED, handle(), 0 ); | 66 | MAP_SHARED, handle(), 0 ); |
63 | if ( rawData ) | 67 | if ( rawData ) |
64 | { | 68 | { |
65 | m_data.setRawData( rawData, size() ); | 69 | m_data.setRawData( rawData, size() ); |
66 | return m_data; | 70 | return m_data; |
67 | } | 71 | } |
68 | else | 72 | else |
69 | qDebug( "MemFile: mmap() failed!" ); | 73 | odebug << "MemFile: mmap() failed!" << oendl; |
70 | // fallback | 74 | // fallback |
71 | #endif | 75 | #endif |
72 | m_data = readAll(); | 76 | m_data = readAll(); |
73 | } | 77 | } |
74 | return m_data; | 78 | return m_data; |
75 | } | 79 | } |
76 | 80 | ||