Huw Davies : winecoreaudio: Move midi_in_get_num_devs to the unixlib.
Alexandre Julliard
julliard at winehq.org
Mon Nov 29 16:26:53 CST 2021
Module: wine
Branch: master
Commit: 15bb0e79d64b00f5a51d78acd922c65dab6eb9f2
URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bb0e79d64b00f5a51d78acd922c65dab6eb9f2
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Nov 29 11:26:43 2021 +0000
winecoreaudio: Move midi_in_get_num_devs to the unixlib.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winecoreaudio.drv/coremidi.c | 9 +++++++++
dlls/winecoreaudio.drv/midi.c | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c
index 983d0676b16..eae68ec153e 100644
--- a/dlls/winecoreaudio.drv/coremidi.c
+++ b/dlls/winecoreaudio.drv/coremidi.c
@@ -845,6 +845,12 @@ static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size)
return MMSYSERR_NOERROR;
}
+static DWORD midi_in_get_num_devs(void)
+{
+ TRACE("\n");
+ return num_srcs;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -929,6 +935,9 @@ NTSTATUS midi_in_message(void *args)
case MIDM_GETDEVCAPS:
*params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2);
break;
+ case MIDM_GETNUMDEVS:
+ *params->err = midi_in_get_num_devs();
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c
index 35da144c927..6456568be85 100644
--- a/dlls/winecoreaudio.drv/midi.c
+++ b/dlls/winecoreaudio.drv/midi.c
@@ -194,12 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
return MMSYSERR_NOERROR;
}
-static DWORD MIDIIn_GetNumDevs(void)
-{
- TRACE("\n");
- return MIDIIn_NumDevs;
-}
-
static DWORD MIDIIn_Start(WORD wDevID)
{
TRACE("%d\n", wDevID);
@@ -420,8 +414,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR
switch (wMsg) {
case MIDM_ADDBUFFER:
return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
- case MIDM_GETNUMDEVS:
- return MIDIIn_GetNumDevs();
case MIDM_START:
return MIDIIn_Start(wDevID);
case MIDM_STOP:
More information about the wine-cvs
mailing list