From f326202c48ac12b7b33cf42b240e229ef370fdc9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 14 Feb 2013 11:52:33 +0100 Subject: Reduce MinGW64-warnings about mixerID. warning: cast to pointer from integer of ifferent size. Change-Id: I4294fe7b67c56d1eca59f81c3af26919ad5089a8 Reviewed-by: Yoann Lopes --- src/multimedia/audio/qaudioinput_win32_p.cpp | 12 +++++++----- src/multimedia/audio/qaudioinput_win32_p.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/multimedia/audio') diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp index 00acda937..5ef636925 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.cpp +++ b/src/multimedia/audio/qaudioinput_win32_p.cpp @@ -197,7 +197,7 @@ void QAudioInputPrivate::setVolume(qreal volume) controlDetails.cMultipleItems = 0; controlDetails.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); controlDetails.paDetails = &controlDetailsUnsigned; - mixerSetControlDetails((HMIXEROBJ)mixerID, &controlDetails, MIXER_SETCONTROLDETAILSF_VALUE); + mixerSetControlDetails(mixerID, &controlDetails, MIXER_SETCONTROLDETAILSF_VALUE); } } } @@ -221,7 +221,7 @@ qreal QAudioInputPrivate::volume() const controlDetails.paDetails = &detailsUnsigned; memset(controlDetails.paDetails, 0, controlDetails.cbDetails); - MMRESULT result = mixerGetControlDetails((HMIXEROBJ)mixerID, &controlDetails, MIXER_GETCONTROLDETAILSF_VALUE); + MMRESULT result = mixerGetControlDetails(mixerID, &controlDetails, MIXER_GETCONTROLDETAILSF_VALUE); if (result != MMSYSERR_NOERROR) continue; if (controlDetails.cbDetails < sizeof(MIXERCONTROLDETAILS_UNSIGNED)) @@ -431,14 +431,16 @@ void QAudioInputPrivate::initMixer() return; // Get the Mixer ID from the Sound Device ID - if (mixerGetID((HMIXEROBJ)inputDevice, &mixerID, MIXER_OBJECTF_WAVEIN) != MMSYSERR_NOERROR) + UINT mixerIntID = 0; + if (mixerGetID((HMIXEROBJ)(quintptr(inputDevice)), &mixerIntID, MIXER_OBJECTF_WAVEIN) != MMSYSERR_NOERROR) return; + mixerID = (HMIXEROBJ)mixerIntID; // Get the Destination (Recording) Line Infomation MIXERLINE mixerLine; mixerLine.cbStruct = sizeof(MIXERLINE); mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN; - if (mixerGetLineInfo((HMIXEROBJ)mixerID, &mixerLine, MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR) + if (mixerGetLineInfo(mixerID, &mixerLine, MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR) return; // Set all the Destination (Recording) Line Controls @@ -448,7 +450,7 @@ void QAudioInputPrivate::initMixer() mixerLineControls.cControls = mixerLine.cControls; mixerLineControls.cbmxctrl = sizeof(MIXERCONTROL); mixerLineControls.pamxctrl = new MIXERCONTROL[mixerLineControls.cControls]; - if (mixerGetLineControls((HMIXEROBJ)mixerID, &mixerLineControls, MIXER_GETLINECONTROLSF_ALL) != MMSYSERR_NOERROR) + if (mixerGetLineControls(mixerID, &mixerLineControls, MIXER_GETLINECONTROLSF_ALL) != MMSYSERR_NOERROR) closeMixer(); } } diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h index a3525cda2..31bb6e6aa 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/audio/qaudioinput_win32_p.h @@ -148,7 +148,7 @@ private: void initMixer(); void closeMixer(); - UINT mixerID; + HMIXEROBJ mixerID; MIXERLINECONTROLS mixerLineControls; private slots: -- cgit v1.2.3