slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix signature of the waveInProc/waveOutProc callbacks.

Browse Source 
Parameters are DWORD_PTR instead of DWORD, which did not matter
on 32bit but caused MinGW64-compiler warnings and potential
crashes on 64bit.

Change-Id: I840ae3ea7ea532746f73f20b3233cae842931d45
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Friedemann Kleint
2013-02-14 11:43:18 +01:00
committed by The Qt Project
parent 60607544e1
commit 699a5d75aa
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/audio/qaudioinput_win32_p.cpp
View File

@@ -85,7 +85,7 @@ QAudioInputPrivate::~QAudioInputPrivate()
} }
void QT_WIN_CALLBACK QAudioInputPrivate::waveInProc( HWAVEIN hWaveIn, UINT uMsg, void QT_WIN_CALLBACK QAudioInputPrivate::waveInProc( HWAVEIN hWaveIn, UINT uMsg,
DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ) DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
{ {
Q_UNUSED(dwParam1) Q_UNUSED(dwParam1)
Q_UNUSED(dwParam2) Q_UNUSED(dwParam2)

2
src/multimedia/audio/qaudioinput_win32_p.h
View File

@@ -139,7 +139,7 @@ private:
QMutex mutex; QMutex mutex;
static void QT_WIN_CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg, static void QT_WIN_CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg,
DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ); DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 );
WAVEHDR* allocateBlocks(int size, int count); WAVEHDR* allocateBlocks(int size, int count);
void freeBlocks(WAVEHDR* blockArray); void freeBlocks(WAVEHDR* blockArray);

2
src/multimedia/audio/qaudiooutput_win32_p.cpp
View File

@@ -131,7 +131,7 @@ QAudioOutputPrivate::~QAudioOutputPrivate()
} }
void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg, void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ) DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
{ {
Q_UNUSED(dwParam1) Q_UNUSED(dwParam1)
Q_UNUSED(dwParam2) Q_UNUSED(dwParam2)

2
src/multimedia/audio/qaudiooutput_win32_p.h
View File

@@ -132,7 +132,7 @@ private:
int intervalTime; int intervalTime;
qreal volumeCache; qreal volumeCache;
static void QT_WIN_CALLBACK waveOutProc( HWAVEOUT hWaveOut, UINT uMsg, static void QT_WIN_CALLBACK waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ); DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 );
QMutex mutex; QMutex mutex;