Merge pull request #46240 from hpvb/dylib_old_inttypes_32
[3.2] An update to the dylibloader for older inttypes
This commit is contained in:
commit
1db796a2dc
6 changed files with 8236 additions and 4934 deletions
File diff suppressed because it is too large
Load diff
|
@ -2,9 +2,11 @@
|
|||
#define DYLIBLOAD_WRAPPER_ASOUND
|
||||
// This file is generated. Do not edit!
|
||||
// see https://github.com/hpvb/dynload-wrapper for details
|
||||
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.2 on 2021-02-18 00:19:14
|
||||
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.3 on 2021-02-20 00:08:12
|
||||
// flags: /home/hp/Projects/godot/pulse/generate-wrapper.py --include /usr/include/alsa/asoundlib.h --sys-include <alsa/asoundlib.h> --soname libasound.so.2 --init-name asound --output-header asound-so_wrap.h --output-implementation asound-so_wrap.c
|
||||
//
|
||||
#include <stdint.h>
|
||||
|
||||
#define snd_asoundlib_version snd_asoundlib_version_dylibloader_orig_asound
|
||||
#define snd_dlpath snd_dlpath_dylibloader_orig_asound
|
||||
#define snd_dlopen snd_dlopen_dylibloader_orig_asound
|
||||
|
@ -5141,7 +5143,7 @@ extern void (*snd_midi_event_no_status_dylibloader_wrapper_asound)( snd_midi_eve
|
|||
extern long (*snd_midi_event_encode_dylibloader_wrapper_asound)( snd_midi_event_t*,const unsigned char*, long, snd_seq_event_t*);
|
||||
extern int (*snd_midi_event_encode_byte_dylibloader_wrapper_asound)( snd_midi_event_t*, int, snd_seq_event_t*);
|
||||
extern long (*snd_midi_event_decode_dylibloader_wrapper_asound)( snd_midi_event_t*, unsigned char*, long,const snd_seq_event_t*);
|
||||
int initialize_asound();
|
||||
int initialize_asound(int verbose);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
#ifdef PULSEAUDIO_ENABLED
|
||||
extern "C" {
|
||||
extern int initialize_pulse();
|
||||
extern int initialize_pulse(int verbose);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -153,13 +153,18 @@ Error AudioDriverALSA::init_device() {
|
|||
}
|
||||
|
||||
Error AudioDriverALSA::init() {
|
||||
#ifdef DEBUG_ENABLED
|
||||
int dylibloader_verbose = 1;
|
||||
#else
|
||||
int dylibloader_verbose = 0;
|
||||
#endif
|
||||
#ifdef PULSEAUDIO_ENABLED
|
||||
// On pulse enabled systems Alsa will silently use pulse.
|
||||
// It doesn't matter if this fails as that likely means there is no pulse
|
||||
initialize_pulse();
|
||||
initialize_pulse(dylibloader_verbose);
|
||||
#endif
|
||||
|
||||
if (initialize_asound()) {
|
||||
if (initialize_asound(dylibloader_verbose)) {
|
||||
return ERR_CANT_OPEN;
|
||||
}
|
||||
|
||||
|
|
|
@ -236,7 +236,12 @@ Error AudioDriverPulseAudio::init_device() {
|
|||
}
|
||||
|
||||
Error AudioDriverPulseAudio::init() {
|
||||
if (initialize_pulse()) {
|
||||
#ifdef DEBUG_ENABLED
|
||||
int dylibloader_verbose = 1;
|
||||
#else
|
||||
int dylibloader_verbose = 0;
|
||||
#endif
|
||||
if (initialize_pulse(dylibloader_verbose)) {
|
||||
return ERR_CANT_OPEN;
|
||||
}
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -2,9 +2,11 @@
|
|||
#define DYLIBLOAD_WRAPPER_PULSE
|
||||
// This file is generated. Do not edit!
|
||||
// see https://github.com/hpvb/dynload-wrapper for details
|
||||
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.2 on 2021-02-18 00:19:07
|
||||
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.3 on 2021-02-20 00:08:31
|
||||
// flags: /home/hp/Projects/godot/pulse/generate-wrapper.py --include /usr/include/pulse/pulseaudio.h --sys-include <pulse/pulseaudio.h> --soname libpulse.so.0 --omit-prefix _pa_ --init-name pulse --output-header pulse-so_wrap.h --output-implementation pulse-so_wrap.c
|
||||
//
|
||||
#include <stdint.h>
|
||||
|
||||
#define pa_get_library_version pa_get_library_version_dylibloader_orig_pulse
|
||||
#define pa_bytes_per_second pa_bytes_per_second_dylibloader_orig_pulse
|
||||
#define pa_frame_size pa_frame_size_dylibloader_orig_pulse
|
||||
|
@ -1437,7 +1439,7 @@ extern struct timeval* (*pa_timeval_sub_dylibloader_wrapper_pulse)(struct timeva
|
|||
extern struct timeval* (*pa_timeval_store_dylibloader_wrapper_pulse)(struct timeval*, pa_usec_t);
|
||||
extern pa_usec_t (*pa_timeval_load_dylibloader_wrapper_pulse)(struct timeval*);
|
||||
extern pa_usec_t (*pa_rtclock_now_dylibloader_wrapper_pulse)( void);
|
||||
int initialize_pulse();
|
||||
int initialize_pulse(int verbose);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue