diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-06 14:20:58 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-06 15:09:19 (GMT) |
| commit | 02db4405cd34b4366b4ba7ddb10b54dfb60957f5 (patch) | |
| tree | 35eebe5deec3cb2a5d7a4da315244b419aa22fb3 /src/multimedia | |
| parent | 36ed34763d2ba4d8f5cd71b22224bf1245ed2000 (diff) | |
| download | Qt-02db4405cd34b4366b4ba7ddb10b54dfb60957f5.zip Qt-02db4405cd34b4366b4ba7ddb10b54dfb60957f5.tar.gz Qt-02db4405cd34b4366b4ba7ddb10b54dfb60957f5.tar.bz2 | |
multimedia: fix warnings on mingw
moved static CRITICAL_SECTIONs to cpp files. In header they would be
declared more than once depending on what file includes those headers.
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp index e5b6e0d..3478e51 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.cpp +++ b/src/multimedia/audio/qaudioinput_win32_p.cpp @@ -55,6 +55,7 @@ //#define DEBUG_AUDIO 1 +static CRITICAL_SECTION waveInCriticalSection; QAudioInputPrivate::QAudioInputPrivate(const QByteArray &device, const QAudioFormat& audioFormat): settings(audioFormat) diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h index 32464f0..aa0d0b3 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/audio/qaudioinput_win32_p.h @@ -68,8 +68,6 @@ #include <QtMultimedia/qaudioengine.h> -static CRITICAL_SECTION waveInCriticalSection; - class QAudioInputPrivate : public QAbstractAudioInput { Q_OBJECT diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp index f681936..dbf0a66 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp @@ -54,6 +54,8 @@ //#define DEBUG_AUDIO 1 +static CRITICAL_SECTION waveOutCriticalSection; + QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray &device, const QAudioFormat& audioFormat): settings(audioFormat) { diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h index 91f14f5..50a3992 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.h +++ b/src/multimedia/audio/qaudiooutput_win32_p.h @@ -67,8 +67,6 @@ #include <QtMultimedia/qaudioengine.h> -static CRITICAL_SECTION waveOutCriticalSection; - class QAudioOutputPrivate : public QAbstractAudioOutput { Q_OBJECT |