Fix a few warnings on Windows build

This commit is contained in:
Leland Lucius 2020-05-26 23:52:23 -05:00
parent 1426331d3f
commit 50c7627f74
3 changed files with 7 additions and 7 deletions

View File

@ -1422,7 +1422,7 @@ static int osdir_list_status = OSDIR_LIST_READY;
static char osdir_path[OSDIR_MAX_PATH];
// osdir_list_start -- prepare to list a directory
int osdir_list_start(char *path)
int osdir_list_start(const char *path)
{
if (strlen(path) >= OSDIR_MAX_PATH - 2) {
xlcerror("LISTDIR path too big", "return nil", NULL);

View File

@ -105,14 +105,14 @@ int open_mixers(px_mixer *Px, UINT deviceIn, UINT deviceOut)
return open_ep_mixers(Px, deviceIn, deviceOut);
}
res = mixerGetID((HMIXEROBJ) (deviceIn == WAVE_MAPPER ? 0 : deviceIn),
res = mixerGetID((HMIXEROBJ) (UINT_PTR) (deviceIn == WAVE_MAPPER ? 0 : deviceIn),
&deviceIn,
MIXER_OBJECTF_WAVEIN);
if (res != MMSYSERR_NOERROR) {
return FALSE;
}
res = mixerGetID((HMIXEROBJ) (deviceOut == WAVE_MAPPER ? 0 : deviceOut),
res = mixerGetID((HMIXEROBJ) (UINT_PTR) (deviceOut == WAVE_MAPPER ? 0 : deviceOut),
&deviceOut,
MIXER_OBJECTF_WAVEOUT);
if (res != MMSYSERR_NOERROR) {
@ -426,7 +426,7 @@ static const char *get_mixer_name(px_mixer *Px, int i)
if (i == 0) {
if (!info->inName) {
res = mixerGetDevCaps((UINT) info->hInputMixer, &caps, sizeof(caps));
res = mixerGetDevCaps((UINT_PTR) info->hInputMixer, &caps, sizeof(caps));
if (res == MMSYSERR_NOERROR) {
info->inName = strdup(caps.szPname);
}
@ -435,7 +435,7 @@ static const char *get_mixer_name(px_mixer *Px, int i)
}
if (!info->outName) {
res = mixerGetDevCaps((UINT) info->hOutputMixer, &caps, sizeof(caps));
res = mixerGetDevCaps((UINT_PTR) info->hOutputMixer, &caps, sizeof(caps));
if (res == MMSYSERR_NOERROR) {
info->outName = strdup(caps.szPname);
}

View File

@ -67,8 +67,8 @@ static void dprintf(const char *format, ...)
int OpenMixer_Win_WASAPI(px_mixer *Px, int index)
{
wchar_t *deviceIn = PaWasapi_GetInputDeviceID(Px->pa_stream);
wchar_t *deviceOut = PaWasapi_GetOutputDeviceID(Px->pa_stream);
const wchar_t *deviceIn = PaWasapi_GetInputDeviceID(Px->pa_stream);
const wchar_t *deviceOut = PaWasapi_GetOutputDeviceID(Px->pa_stream);
int ret = FALSE;
if (open_ep_mixers_byid(Px, deviceIn, deviceOut))