Fix for wine-64bit bridges

Seriously, windows sucks... errr!!

source/modules/jackbridge/JackBridge.hpp

@@ -29,6 +29,10 @@
 # undef __WIN64__
 #endif
 
+#ifndef __cdecl
+# define __cdecl
+#endif
+
 #include "CarlaDefines.h"
 
 #ifdef JACKBRIDGE_DIRECT
@@ -274,127 +278,127 @@ typedef void (*JackPropertyChangeCallback)(jack_uuid_t subject, const char* key,
 
 #endif // ! JACKBRIDGE_DIRECT
 
-bool jackbridge_is_ok() noexcept;
-
-void        jackbridge_get_version(int* major_ptr, int* minor_ptr, int* micro_ptr, int* proto_ptr);
-const char* jackbridge_get_version_string();
-
-jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status);
-bool           jackbridge_client_close(jack_client_t* client);
-
-int   jackbridge_client_name_size();
-char* jackbridge_get_client_name(jack_client_t* client);
-
-char* jackbridge_get_uuid_for_client_name(jack_client_t* client, const char* name);
-char* jackbridge_get_client_name_by_uuid(jack_client_t* client, const char* uuid);
-
-bool jackbridge_activate(jack_client_t* client);
-bool jackbridge_deactivate(jack_client_t* client);
-bool jackbridge_is_realtime(jack_client_t* client);
-
-bool jackbridge_set_thread_init_callback(jack_client_t* client, JackThreadInitCallback thread_init_callback, void* arg);
-void jackbridge_on_shutdown(jack_client_t* client, JackShutdownCallback shutdown_callback, void* arg);
-void jackbridge_on_info_shutdown(jack_client_t* client, JackInfoShutdownCallback shutdown_callback, void* arg);
-bool jackbridge_set_process_callback(jack_client_t* client, JackProcessCallback process_callback, void* arg);
-bool jackbridge_set_freewheel_callback(jack_client_t* client, JackFreewheelCallback freewheel_callback, void* arg);
-bool jackbridge_set_buffer_size_callback(jack_client_t* client, JackBufferSizeCallback bufsize_callback, void* arg);
-bool jackbridge_set_sample_rate_callback(jack_client_t* client, JackSampleRateCallback srate_callback, void* arg);
-bool jackbridge_set_client_registration_callback(jack_client_t* client, JackClientRegistrationCallback registration_callback, void* arg);
-bool jackbridge_set_port_registration_callback(jack_client_t* client, JackPortRegistrationCallback registration_callback, void* arg);
-bool jackbridge_set_port_rename_callback(jack_client_t* client, JackPortRenameCallback rename_callback, void* arg);
-bool jackbridge_set_port_connect_callback(jack_client_t* client, JackPortConnectCallback connect_callback, void* arg);
-bool jackbridge_set_graph_order_callback(jack_client_t* client, JackGraphOrderCallback graph_callback, void* arg);
-bool jackbridge_set_xrun_callback(jack_client_t* client, JackXRunCallback xrun_callback, void* arg);
-bool jackbridge_set_latency_callback(jack_client_t* client, JackLatencyCallback latency_callback, void* arg);
-
-bool jackbridge_set_freewheel(jack_client_t* client, bool onoff);
-bool jackbridge_set_buffer_size(jack_client_t* client, jack_nframes_t nframes);
-
-jack_nframes_t jackbridge_get_sample_rate(jack_client_t* client);
-jack_nframes_t jackbridge_get_buffer_size(jack_client_t* client);
-float          jackbridge_cpu_load(jack_client_t* client);
-
-jack_port_t* jackbridge_port_register(jack_client_t* client, const char* port_name, const char* port_type, ulong flags, ulong buffer_size);
-bool         jackbridge_port_unregister(jack_client_t* client, jack_port_t* port);
-void*        jackbridge_port_get_buffer(jack_port_t* port, jack_nframes_t nframes);
-
-const char*  jackbridge_port_name(const jack_port_t* port);
-jack_uuid_t  jackbridge_port_uuid(const jack_port_t* port);
-const char*  jackbridge_port_short_name(const jack_port_t* port);
-int          jackbridge_port_flags(const jack_port_t* port);
-const char*  jackbridge_port_type(const jack_port_t* port);
-bool         jackbridge_port_is_mine(const jack_client_t* client, const jack_port_t* port);
-int          jackbridge_port_connected(const jack_port_t* port);
-bool         jackbridge_port_connected_to(const jack_port_t* port, const char* port_name);
-const char** jackbridge_port_get_connections(const jack_port_t* port);
-const char** jackbridge_port_get_all_connections(const jack_client_t* client, const jack_port_t* port);
-
-bool jackbridge_port_set_name(jack_port_t* port, const char* port_name);
-bool jackbridge_port_set_alias(jack_port_t* port, const char* alias);
-bool jackbridge_port_unset_alias(jack_port_t* port, const char* alias);
-int  jackbridge_port_get_aliases(const jack_port_t* port, char* const aliases[2]);
-
-bool jackbridge_port_request_monitor(jack_port_t* port, bool onoff);
-bool jackbridge_port_request_monitor_by_name(jack_client_t* client, const char* port_name, bool onoff);
-bool jackbridge_port_ensure_monitor(jack_port_t* port, bool onoff);
-bool jackbridge_port_monitoring_input(jack_port_t* port);
-
-bool jackbridge_connect(jack_client_t* client, const char* source_port, const char* destination_port);
-bool jackbridge_disconnect(jack_client_t* client, const char* source_port, const char* destination_port);
-bool jackbridge_port_disconnect(jack_client_t* client, jack_port_t* port);
-
-int    jackbridge_port_name_size();
-int    jackbridge_port_type_size();
-size_t jackbridge_port_type_get_buffer_size(jack_client_t* client, const char* port_type);
-
-void jackbridge_port_get_latency_range(jack_port_t* port, jack_latency_callback_mode_t mode, jack_latency_range_t* range);
-void jackbridge_port_set_latency_range(jack_port_t* port, jack_latency_callback_mode_t mode, jack_latency_range_t* range);
-bool jackbridge_recompute_total_latencies(jack_client_t* client);
-
-const char** jackbridge_get_ports(jack_client_t* client, const char* port_name_pattern, const char* type_name_pattern, ulong flags);
-jack_port_t* jackbridge_port_by_name(jack_client_t* client, const char* port_name);
-jack_port_t* jackbridge_port_by_id(jack_client_t* client, jack_port_id_t port_id);
-
-void jackbridge_free(void* ptr);
-
-uint32_t jackbridge_midi_get_event_count(void* port_buffer);
-bool     jackbridge_midi_event_get(jack_midi_event_t* event, void* port_buffer, uint32_t event_index);
-void     jackbridge_midi_clear_buffer(void* port_buffer);
-bool     jackbridge_midi_event_write(void* port_buffer, jack_nframes_t time, const jack_midi_data_t* data, size_t data_size);
-jack_midi_data_t* jackbridge_midi_event_reserve(void* port_buffer, jack_nframes_t time, size_t data_size);
-
-bool jackbridge_release_timebase(jack_client_t* client);
-bool jackbridge_set_sync_callback(jack_client_t* client, JackSyncCallback sync_callback, void* arg);
-bool jackbridge_set_sync_timeout(jack_client_t* client, jack_time_t timeout);
-bool jackbridge_set_timebase_callback(jack_client_t* client, bool conditional, JackTimebaseCallback timebase_callback, void* arg);
-bool jackbridge_transport_locate(jack_client_t* client, jack_nframes_t frame);
-
-jack_transport_state_t jackbridge_transport_query(const jack_client_t* client, jack_position_t* pos);
-jack_nframes_t         jackbridge_get_current_transport_frame(const jack_client_t* client);
-
-bool jackbridge_transport_reposition(jack_client_t* client, const jack_position_t* pos);
-void jackbridge_transport_start(jack_client_t* client);
-void jackbridge_transport_stop(jack_client_t* client);
-
-bool jackbridge_set_property(jack_client_t* client, jack_uuid_t subject, const char* key, const char* value, const char* type);
-bool jackbridge_get_property(jack_uuid_t subject, const char* key, char** value, char** type);
-void jackbridge_free_description(jack_description_t* desc, bool free_description_itself);
-bool jackbridge_get_properties(jack_uuid_t subject, jack_description_t* desc);
-bool jackbridge_get_all_properties(jack_description_t** descs);
-bool jackbridge_remove_property(jack_client_t* client, jack_uuid_t subject, const char* key);
-int  jackbridge_remove_properties(jack_client_t* client, jack_uuid_t subject);
-bool jackbridge_remove_all_properties(jack_client_t* client);
-bool jackbridge_set_property_change_callback(jack_client_t* client, JackPropertyChangeCallback callback, void* arg);
-
-bool jackbridge_sem_init(void* sem) noexcept;
-bool jackbridge_sem_destroy(void* sem) noexcept;
-bool jackbridge_sem_post(void* sem) noexcept;
-bool jackbridge_sem_timedwait(void* sem, int secs) noexcept;
-
-bool  jackbridge_shm_is_valid(const void* shm) noexcept;
-void  jackbridge_shm_init(void* shm) noexcept;
-void  jackbridge_shm_attach(void* shm, const char* name) noexcept;
-void  jackbridge_shm_close(void* shm) noexcept;
-void* jackbridge_shm_map(void* shm, size_t size) noexcept;
+__cdecl bool jackbridge_is_ok() noexcept;
+
+__cdecl void        jackbridge_get_version(int* major_ptr, int* minor_ptr, int* micro_ptr, int* proto_ptr);
+__cdecl const char* jackbridge_get_version_string();
+
+__cdecl jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status);
+__cdecl bool           jackbridge_client_close(jack_client_t* client);
+
+__cdecl int   jackbridge_client_name_size();
+__cdecl char* jackbridge_get_client_name(jack_client_t* client);
+
+__cdecl char* jackbridge_get_uuid_for_client_name(jack_client_t* client, const char* name);
+__cdecl char* jackbridge_get_client_name_by_uuid(jack_client_t* client, const char* uuid);
+
+__cdecl bool jackbridge_activate(jack_client_t* client);
+__cdecl bool jackbridge_deactivate(jack_client_t* client);
+__cdecl bool jackbridge_is_realtime(jack_client_t* client);
+
+__cdecl bool jackbridge_set_thread_init_callback(jack_client_t* client, JackThreadInitCallback thread_init_callback, void* arg);
+__cdecl void jackbridge_on_shutdown(jack_client_t* client, JackShutdownCallback shutdown_callback, void* arg);
+__cdecl void jackbridge_on_info_shutdown(jack_client_t* client, JackInfoShutdownCallback shutdown_callback, void* arg);
+__cdecl bool jackbridge_set_process_callback(jack_client_t* client, JackProcessCallback process_callback, void* arg);
+__cdecl bool jackbridge_set_freewheel_callback(jack_client_t* client, JackFreewheelCallback freewheel_callback, void* arg);
+__cdecl bool jackbridge_set_buffer_size_callback(jack_client_t* client, JackBufferSizeCallback bufsize_callback, void* arg);
+__cdecl bool jackbridge_set_sample_rate_callback(jack_client_t* client, JackSampleRateCallback srate_callback, void* arg);
+__cdecl bool jackbridge_set_client_registration_callback(jack_client_t* client, JackClientRegistrationCallback registration_callback, void* arg);
+__cdecl bool jackbridge_set_port_registration_callback(jack_client_t* client, JackPortRegistrationCallback registration_callback, void* arg);
+__cdecl bool jackbridge_set_port_rename_callback(jack_client_t* client, JackPortRenameCallback rename_callback, void* arg);
+__cdecl bool jackbridge_set_port_connect_callback(jack_client_t* client, JackPortConnectCallback connect_callback, void* arg);
+__cdecl bool jackbridge_set_graph_order_callback(jack_client_t* client, JackGraphOrderCallback graph_callback, void* arg);
+__cdecl bool jackbridge_set_xrun_callback(jack_client_t* client, JackXRunCallback xrun_callback, void* arg);
+__cdecl bool jackbridge_set_latency_callback(jack_client_t* client, JackLatencyCallback latency_callback, void* arg);
+
+__cdecl bool jackbridge_set_freewheel(jack_client_t* client, bool onoff);
+__cdecl bool jackbridge_set_buffer_size(jack_client_t* client, jack_nframes_t nframes);
+
+__cdecl jack_nframes_t jackbridge_get_sample_rate(jack_client_t* client);
+__cdecl jack_nframes_t jackbridge_get_buffer_size(jack_client_t* client);
+__cdecl float          jackbridge_cpu_load(jack_client_t* client);
+
+__cdecl jack_port_t* jackbridge_port_register(jack_client_t* client, const char* port_name, const char* port_type, ulong flags, ulong buffer_size);
+__cdecl bool         jackbridge_port_unregister(jack_client_t* client, jack_port_t* port);
+__cdecl void*        jackbridge_port_get_buffer(jack_port_t* port, jack_nframes_t nframes);
+
+__cdecl const char*  jackbridge_port_name(const jack_port_t* port);
+__cdecl jack_uuid_t  jackbridge_port_uuid(const jack_port_t* port);
+__cdecl const char*  jackbridge_port_short_name(const jack_port_t* port);
+__cdecl int          jackbridge_port_flags(const jack_port_t* port);
+__cdecl const char*  jackbridge_port_type(const jack_port_t* port);
+__cdecl bool         jackbridge_port_is_mine(const jack_client_t* client, const jack_port_t* port);
+__cdecl int          jackbridge_port_connected(const jack_port_t* port);
+__cdecl bool         jackbridge_port_connected_to(const jack_port_t* port, const char* port_name);
+__cdecl const char** jackbridge_port_get_connections(const jack_port_t* port);
+__cdecl const char** jackbridge_port_get_all_connections(const jack_client_t* client, const jack_port_t* port);
+
+__cdecl bool jackbridge_port_set_name(jack_port_t* port, const char* port_name);
+__cdecl bool jackbridge_port_set_alias(jack_port_t* port, const char* alias);
+__cdecl bool jackbridge_port_unset_alias(jack_port_t* port, const char* alias);
+__cdecl int  jackbridge_port_get_aliases(const jack_port_t* port, char* const aliases[2]);
+
+__cdecl bool jackbridge_port_request_monitor(jack_port_t* port, bool onoff);
+__cdecl bool jackbridge_port_request_monitor_by_name(jack_client_t* client, const char* port_name, bool onoff);
+__cdecl bool jackbridge_port_ensure_monitor(jack_port_t* port, bool onoff);
+__cdecl bool jackbridge_port_monitoring_input(jack_port_t* port);
+
+__cdecl bool jackbridge_connect(jack_client_t* client, const char* source_port, const char* destination_port);
+__cdecl bool jackbridge_disconnect(jack_client_t* client, const char* source_port, const char* destination_port);
+__cdecl bool jackbridge_port_disconnect(jack_client_t* client, jack_port_t* port);
+
+__cdecl int    jackbridge_port_name_size();
+__cdecl int    jackbridge_port_type_size();
+__cdecl size_t jackbridge_port_type_get_buffer_size(jack_client_t* client, const char* port_type);
+
+__cdecl void jackbridge_port_get_latency_range(jack_port_t* port, jack_latency_callback_mode_t mode, jack_latency_range_t* range);
+__cdecl void jackbridge_port_set_latency_range(jack_port_t* port, jack_latency_callback_mode_t mode, jack_latency_range_t* range);
+__cdecl bool jackbridge_recompute_total_latencies(jack_client_t* client);
+
+__cdecl const char** jackbridge_get_ports(jack_client_t* client, const char* port_name_pattern, const char* type_name_pattern, ulong flags);
+__cdecl jack_port_t* jackbridge_port_by_name(jack_client_t* client, const char* port_name);
+__cdecl jack_port_t* jackbridge_port_by_id(jack_client_t* client, jack_port_id_t port_id);
+
+__cdecl void jackbridge_free(void* ptr);
+
+__cdecl uint32_t jackbridge_midi_get_event_count(void* port_buffer);
+__cdecl bool     jackbridge_midi_event_get(jack_midi_event_t* event, void* port_buffer, uint32_t event_index);
+__cdecl void     jackbridge_midi_clear_buffer(void* port_buffer);
+__cdecl bool     jackbridge_midi_event_write(void* port_buffer, jack_nframes_t time, const jack_midi_data_t* data, size_t data_size);
+__cdecl jack_midi_data_t* jackbridge_midi_event_reserve(void* port_buffer, jack_nframes_t time, size_t data_size);
+
+__cdecl bool jackbridge_release_timebase(jack_client_t* client);
+__cdecl bool jackbridge_set_sync_callback(jack_client_t* client, JackSyncCallback sync_callback, void* arg);
+__cdecl bool jackbridge_set_sync_timeout(jack_client_t* client, jack_time_t timeout);
+__cdecl bool jackbridge_set_timebase_callback(jack_client_t* client, bool conditional, JackTimebaseCallback timebase_callback, void* arg);
+__cdecl bool jackbridge_transport_locate(jack_client_t* client, jack_nframes_t frame);
+
+__cdecl jack_transport_state_t jackbridge_transport_query(const jack_client_t* client, jack_position_t* pos);
+__cdecl jack_nframes_t         jackbridge_get_current_transport_frame(const jack_client_t* client);
+
+__cdecl bool jackbridge_transport_reposition(jack_client_t* client, const jack_position_t* pos);
+__cdecl void jackbridge_transport_start(jack_client_t* client);
+__cdecl void jackbridge_transport_stop(jack_client_t* client);
+
+__cdecl bool jackbridge_set_property(jack_client_t* client, jack_uuid_t subject, const char* key, const char* value, const char* type);
+__cdecl bool jackbridge_get_property(jack_uuid_t subject, const char* key, char** value, char** type);
+__cdecl void jackbridge_free_description(jack_description_t* desc, bool free_description_itself);
+__cdecl bool jackbridge_get_properties(jack_uuid_t subject, jack_description_t* desc);
+__cdecl bool jackbridge_get_all_properties(jack_description_t** descs);
+__cdecl bool jackbridge_remove_property(jack_client_t* client, jack_uuid_t subject, const char* key);
+__cdecl int  jackbridge_remove_properties(jack_client_t* client, jack_uuid_t subject);
+__cdecl bool jackbridge_remove_all_properties(jack_client_t* client);
+__cdecl bool jackbridge_set_property_change_callback(jack_client_t* client, JackPropertyChangeCallback callback, void* arg);
+
+__cdecl bool jackbridge_sem_init(void* sem) noexcept;
+__cdecl bool jackbridge_sem_destroy(void* sem) noexcept;
+__cdecl bool jackbridge_sem_post(void* sem) noexcept;
+__cdecl bool jackbridge_sem_timedwait(void* sem, int secs) noexcept;
+
+__cdecl bool  jackbridge_shm_is_valid(const void* shm) noexcept;
+__cdecl void  jackbridge_shm_init(void* shm) noexcept;
+__cdecl void  jackbridge_shm_attach(void* shm, const char* name) noexcept;
+__cdecl void  jackbridge_shm_close(void* shm) noexcept;
+__cdecl void* jackbridge_shm_map(void* shm, size_t size) noexcept;
 
 #endif // JACKBRIDGE_HPP_INCLUDED