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

Reduce MinGW64-warnings about mixerID.

Browse Source 
warning: cast to pointer from integer of ifferent size.

Change-Id: I4294fe7b67c56d1eca59f81c3af26919ad5089a8
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Friedemann Kleint
2013-02-14 11:52:33 +01:00
committed by The Qt Project
parent 699a5d75aa
commit f326202c48
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,7 +197,7 @@ void QAudioInputPrivate::setVolume(qreal volume)
controlDetails.cMultipleItems = 0; controlDetails.cMultipleItems = 0;
controlDetails.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); controlDetails.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED);
controlDetails.paDetails = &controlDetailsUnsigned; 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; controlDetails.paDetails = &detailsUnsigned;
memset(controlDetails.paDetails, 0, controlDetails.cbDetails); 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) if (result != MMSYSERR_NOERROR)
continue; continue;
if (controlDetails.cbDetails < sizeof(MIXERCONTROLDETAILS_UNSIGNED)) if (controlDetails.cbDetails < sizeof(MIXERCONTROLDETAILS_UNSIGNED))
@@ -431,14 +431,16 @@ void QAudioInputPrivate::initMixer()
return; return;
// Get the Mixer ID from the Sound Device ID // 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; return;
mixerID = (HMIXEROBJ)mixerIntID;
// Get the Destination (Recording) Line Infomation // Get the Destination (Recording) Line Infomation
MIXERLINE mixerLine; MIXERLINE mixerLine;
mixerLine.cbStruct = sizeof(MIXERLINE); mixerLine.cbStruct = sizeof(MIXERLINE);
mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN; 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; return;
// Set all the Destination (Recording) Line Controls // Set all the Destination (Recording) Line Controls
@@ -448,7 +450,7 @@ void QAudioInputPrivate::initMixer()
mixerLineControls.cControls = mixerLine.cControls; mixerLineControls.cControls = mixerLine.cControls;
mixerLineControls.cbmxctrl = sizeof(MIXERCONTROL); mixerLineControls.cbmxctrl = sizeof(MIXERCONTROL);
mixerLineControls.pamxctrl = new MIXERCONTROL[mixerLineControls.cControls]; 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(); closeMixer();
} }
} }

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

@@ -148,7 +148,7 @@ private:
void initMixer(); void initMixer();
void closeMixer(); void closeMixer();
UINT mixerID; HMIXEROBJ mixerID;
MIXERLINECONTROLS mixerLineControls; MIXERLINECONTROLS mixerLineControls;
private slots: private slots: