Commit bc404b6c authored by Davide Beatrici's avatar Davide Beatrici Committed by Alexandre Julliard

winecoreaudio: Drop "unix_" prefix in unixlib enum, apply it to the functions instead.

parent 2fa22538
...@@ -308,7 +308,7 @@ static void midi_in_read_proc(const MIDIPacketList *pktlist, void *refCon, void ...@@ -308,7 +308,7 @@ static void midi_in_read_proc(const MIDIPacketList *pktlist, void *refCon, void
} }
} }
NTSTATUS midi_init(void *args) NTSTATUS unix_midi_init(void *args)
{ {
CFStringRef name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("wineMIDIClient.%d"), getpid()); CFStringRef name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("wineMIDIClient.%d"), getpid());
struct midi_init_params *params = args; struct midi_init_params *params = args;
...@@ -422,7 +422,7 @@ NTSTATUS midi_init(void *args) ...@@ -422,7 +422,7 @@ NTSTATUS midi_init(void *args)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS midi_release(void *args) NTSTATUS unix_midi_release(void *args)
{ {
/* stop the notify_wait thread */ /* stop the notify_wait thread */
notify_post(NULL); notify_post(NULL);
...@@ -1122,7 +1122,7 @@ static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) ...@@ -1122,7 +1122,7 @@ static UINT midi_in_reset(WORD dev_id, struct notify_context *notify)
return err; return err;
} }
NTSTATUS midi_out_message(void *args) NTSTATUS unix_midi_out_message(void *args)
{ {
struct midi_out_message_params *params = args; struct midi_out_message_params *params = args;
...@@ -1177,7 +1177,7 @@ NTSTATUS midi_out_message(void *args) ...@@ -1177,7 +1177,7 @@ NTSTATUS midi_out_message(void *args)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS midi_in_message(void *args) NTSTATUS unix_midi_in_message(void *args)
{ {
struct midi_in_message_params *params = args; struct midi_in_message_params *params = args;
...@@ -1229,7 +1229,7 @@ NTSTATUS midi_in_message(void *args) ...@@ -1229,7 +1229,7 @@ NTSTATUS midi_in_message(void *args)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS midi_notify_wait(void *args) NTSTATUS unix_midi_notify_wait(void *args)
{ {
struct midi_notify_wait_params *params = args; struct midi_notify_wait_params *params = args;
...@@ -1250,7 +1250,7 @@ NTSTATUS midi_notify_wait(void *args) ...@@ -1250,7 +1250,7 @@ NTSTATUS midi_notify_wait(void *args)
typedef UINT PTR32; typedef UINT PTR32;
NTSTATUS wow64_midi_init(void *args) NTSTATUS unix_wow64_midi_init(void *args)
{ {
struct struct
{ {
...@@ -1260,7 +1260,7 @@ NTSTATUS wow64_midi_init(void *args) ...@@ -1260,7 +1260,7 @@ NTSTATUS wow64_midi_init(void *args)
{ {
.err = ULongToPtr(params32->err) .err = ULongToPtr(params32->err)
}; };
return midi_init(&params); return unix_midi_init(&params);
} }
struct notify_context32 struct notify_context32
...@@ -1343,7 +1343,7 @@ static UINT wow64_midi_out_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT h ...@@ -1343,7 +1343,7 @@ static UINT wow64_midi_out_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT h
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
NTSTATUS wow64_midi_out_message(void *args) NTSTATUS unix_wow64_midi_out_message(void *args)
{ {
struct struct
{ {
...@@ -1414,7 +1414,7 @@ NTSTATUS wow64_midi_out_message(void *args) ...@@ -1414,7 +1414,7 @@ NTSTATUS wow64_midi_out_message(void *args)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
midi_out_message(&params); unix_midi_out_message(&params);
switch (params32->msg) switch (params32->msg)
{ {
...@@ -1467,7 +1467,7 @@ static UINT wow64_midi_in_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hd ...@@ -1467,7 +1467,7 @@ static UINT wow64_midi_in_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hd
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
NTSTATUS wow64_midi_in_message(void *args) NTSTATUS unix_wow64_midi_in_message(void *args)
{ {
struct struct
{ {
...@@ -1539,7 +1539,7 @@ NTSTATUS wow64_midi_in_message(void *args) ...@@ -1539,7 +1539,7 @@ NTSTATUS wow64_midi_in_message(void *args)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
midi_in_message(&params); unix_midi_in_message(&params);
switch (params32->msg) switch (params32->msg)
{ {
...@@ -1574,7 +1574,7 @@ NTSTATUS wow64_midi_in_message(void *args) ...@@ -1574,7 +1574,7 @@ NTSTATUS wow64_midi_in_message(void *args)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS wow64_midi_notify_wait(void *args) NTSTATUS unix_wow64_midi_notify_wait(void *args)
{ {
struct struct
{ {
...@@ -1592,7 +1592,7 @@ NTSTATUS wow64_midi_notify_wait(void *args) ...@@ -1592,7 +1592,7 @@ NTSTATUS wow64_midi_notify_wait(void *args)
}; };
notify32->send_notify = FALSE; notify32->send_notify = FALSE;
midi_notify_wait(&params); unix_midi_notify_wait(&params);
if (!*params.quit && notify.send_notify) if (!*params.quit && notify.send_notify)
{ {
......
...@@ -231,46 +231,46 @@ struct midi_notify_wait_params ...@@ -231,46 +231,46 @@ struct midi_notify_wait_params
enum unix_funcs enum unix_funcs
{ {
unix_get_endpoint_ids, get_endpoint_ids,
unix_create_stream, create_stream,
unix_release_stream, release_stream,
unix_start, start,
unix_stop, stop,
unix_reset, reset,
unix_get_render_buffer, get_render_buffer,
unix_release_render_buffer, release_render_buffer,
unix_get_capture_buffer, get_capture_buffer,
unix_release_capture_buffer, release_capture_buffer,
unix_get_mix_format, get_mix_format,
unix_is_format_supported, is_format_supported,
unix_get_buffer_size, get_buffer_size,
unix_get_latency, get_latency,
unix_get_current_padding, get_current_padding,
unix_get_next_packet_size, get_next_packet_size,
unix_get_position, get_position,
unix_get_frequency, get_frequency,
unix_is_started, is_started,
unix_set_volumes, set_volumes,
unix_midi_init, midi_init,
unix_midi_release, midi_release,
unix_midi_out_message, midi_out_message,
unix_midi_in_message, midi_in_message,
unix_midi_notify_wait, midi_notify_wait,
}; };
NTSTATUS midi_init( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_midi_init( void * ) DECLSPEC_HIDDEN;
NTSTATUS midi_release( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_midi_release( void * ) DECLSPEC_HIDDEN;
NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_midi_out_message( void * ) DECLSPEC_HIDDEN;
NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_midi_in_message( void * ) DECLSPEC_HIDDEN;
NTSTATUS midi_notify_wait( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_midi_notify_wait( void * ) DECLSPEC_HIDDEN;
#ifdef _WIN64 #ifdef _WIN64
NTSTATUS wow64_midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS unix_wow64_midi_init(void *args) DECLSPEC_HIDDEN;
NTSTATUS wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS unix_wow64_midi_out_message(void *args) DECLSPEC_HIDDEN;
NTSTATUS wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS unix_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN;
NTSTATUS wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; NTSTATUS unix_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN;
#endif #endif
extern unixlib_handle_t coreaudio_handle; extern unixlib_handle_t coreaudio_handle;
#define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, unix_ ## func, params ) #define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, func, params )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment