diff options
Diffstat (limited to 'subprojects/packagefiles')
| -rw-r--r-- | subprojects/packagefiles/miniaudio/meson.build | 5 | ||||
| -rw-r--r-- | subprojects/packagefiles/miniaudio/miniaudio_alsa_compile.diff | 72 |
2 files changed, 74 insertions, 3 deletions
diff --git a/subprojects/packagefiles/miniaudio/meson.build b/subprojects/packagefiles/miniaudio/meson.build index 0296803..5e8ab38 100644 --- a/subprojects/packagefiles/miniaudio/meson.build +++ b/subprojects/packagefiles/miniaudio/meson.build @@ -1,3 +1,2 @@ -project('miniaudio', 'c', version: '0.11.21') -miniaudio = declare_dependency(sources: ['extras/miniaudio_split/miniaudio.c'], - include_directories: include_directories('extras/miniaudio_split')) +project('miniaudio', 'c', version: 'git-12a8d4e') +miniaudio = declare_dependency(include_directories: include_directories('.')) diff --git a/subprojects/packagefiles/miniaudio/miniaudio_alsa_compile.diff b/subprojects/packagefiles/miniaudio/miniaudio_alsa_compile.diff new file mode 100644 index 0000000..e1b1199 --- /dev/null +++ b/subprojects/packagefiles/miniaudio/miniaudio_alsa_compile.diff @@ -0,0 +1,72 @@ +diff --git a/miniaudio.h b/miniaudio.h +index a00d394..ca28153 100644 +--- a/miniaudio.h ++++ b/miniaudio.h +@@ -26694,6 +26694,17 @@ typedef snd_pcm_state_t ma_snd_pcm_state_t; + #define MA_SND_PCM_NO_AUTO_RESAMPLE SND_PCM_NO_AUTO_RESAMPLE + #define MA_SND_PCM_NO_AUTO_CHANNELS SND_PCM_NO_AUTO_CHANNELS + #define MA_SND_PCM_NO_AUTO_FORMAT SND_PCM_NO_AUTO_FORMAT ++ ++/* snd_pcm_state_t */ ++#define MA_SND_PCM_STATE_OPEN 0 ++#define MA_SND_PCM_STATE_SETUP 1 ++#define MA_SND_PCM_STATE_PREPARED 2 ++#define MA_SND_PCM_STATE_RUNNING 3 ++#define MA_SND_PCM_STATE_XRUN 4 ++#define MA_SND_PCM_STATE_DRAINING 5 ++#define MA_SND_PCM_STATE_PAUSED 6 ++#define MA_SND_PCM_STATE_SUSPENDED 7 ++#define MA_SND_PCM_STATE_DISCONNECTED 8 + #else + #include <errno.h> /* For EPIPE, etc. */ + typedef unsigned long ma_snd_pcm_uframes_t; +@@ -26719,17 +26730,6 @@ typedef struct + unsigned int pos[1]; + } ma_snd_pcm_chmap_t; + +-/* snd_pcm_state_t */ +-#define MA_SND_PCM_STATE_OPEN 0 +-#define MA_SND_PCM_STATE_SETUP 1 +-#define MA_SND_PCM_STATE_PREPARED 2 +-#define MA_SND_PCM_STATE_RUNNING 3 +-#define MA_SND_PCM_STATE_XRUN 4 +-#define MA_SND_PCM_STATE_DRAINING 5 +-#define MA_SND_PCM_STATE_PAUSED 6 +-#define MA_SND_PCM_STATE_SUSPENDED 7 +-#define MA_SND_PCM_STATE_DISCONNECTED 8 +- + /* snd_pcm_stream_t */ + #define MA_SND_PCM_STREAM_PLAYBACK 0 + #define MA_SND_PCM_STREAM_CAPTURE 1 +@@ -26817,6 +26817,7 @@ typedef int (* ma_snd_pcm_hw_params_set_channels_minmax_proc) ( + typedef int (* ma_snd_pcm_hw_params_set_rate_resample_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int val); + typedef int (* ma_snd_pcm_hw_params_set_rate_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int val, int dir); + typedef int (* ma_snd_pcm_hw_params_set_rate_near_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *val, int *dir); ++typedef int (* ma_snd_pcm_hw_params_set_rate_minmax_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *min, int *mindir, unsigned int *max, int *maxdir); + typedef int (* ma_snd_pcm_hw_params_set_buffer_size_near_proc)(ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, ma_snd_pcm_uframes_t *val); + typedef int (* ma_snd_pcm_hw_params_set_periods_near_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, unsigned int *val, int *dir); + typedef int (* ma_snd_pcm_hw_params_set_access_proc) (ma_snd_pcm_t *pcm, ma_snd_pcm_hw_params_t *params, ma_snd_pcm_access_t _access); +@@ -28570,8 +28571,9 @@ static ma_result ma_context_init__alsa(ma_context* pContext, const ma_context_co + ma_snd_pcm_hw_params_get_format_mask_proc _snd_pcm_hw_params_get_format_mask = snd_pcm_hw_params_get_format_mask; + ma_snd_pcm_hw_params_set_channels_proc _snd_pcm_hw_params_set_channels = snd_pcm_hw_params_set_channels; + ma_snd_pcm_hw_params_set_channels_near_proc _snd_pcm_hw_params_set_channels_near = snd_pcm_hw_params_set_channels_near; ++ ma_snd_pcm_hw_params_set_channels_minmax_proc _snd_pcm_hw_params_set_channels_minmax = snd_pcm_hw_params_set_channels_minmax; + ma_snd_pcm_hw_params_set_rate_resample_proc _snd_pcm_hw_params_set_rate_resample = snd_pcm_hw_params_set_rate_resample; +- ma_snd_pcm_hw_params_set_rate_near _snd_pcm_hw_params_set_rate = snd_pcm_hw_params_set_rate; ++ ma_snd_pcm_hw_params_set_rate_near_proc _snd_pcm_hw_params_set_rate = snd_pcm_hw_params_set_rate; + ma_snd_pcm_hw_params_set_rate_near_proc _snd_pcm_hw_params_set_rate_near = snd_pcm_hw_params_set_rate_near; + ma_snd_pcm_hw_params_set_rate_minmax_proc _snd_pcm_hw_params_set_rate_minmax = snd_pcm_hw_params_set_rate_minmax; + ma_snd_pcm_hw_params_set_buffer_size_near_proc _snd_pcm_hw_params_set_buffer_size_near = snd_pcm_hw_params_set_buffer_size_near; +@@ -28623,9 +28625,9 @@ static ma_result ma_context_init__alsa(ma_context* pContext, const ma_context_co + ma_snd_pcm_info_proc _snd_pcm_info = snd_pcm_info; + ma_snd_pcm_info_sizeof_proc _snd_pcm_info_sizeof = snd_pcm_info_sizeof; + ma_snd_pcm_info_get_name_proc _snd_pcm_info_get_name = snd_pcm_info_get_name; +- ma_snd_pcm_poll_descriptors _snd_pcm_poll_descriptors = snd_pcm_poll_descriptors; +- ma_snd_pcm_poll_descriptors_count _snd_pcm_poll_descriptors_count = snd_pcm_poll_descriptors_count; +- ma_snd_pcm_poll_descriptors_revents _snd_pcm_poll_descriptors_revents = snd_pcm_poll_descriptors_revents; ++ ma_snd_pcm_poll_descriptors_proc _snd_pcm_poll_descriptors = snd_pcm_poll_descriptors; ++ ma_snd_pcm_poll_descriptors_count_proc _snd_pcm_poll_descriptors_count = snd_pcm_poll_descriptors_count; ++ ma_snd_pcm_poll_descriptors_revents_proc _snd_pcm_poll_descriptors_revents = snd_pcm_poll_descriptors_revents; + ma_snd_config_update_free_global_proc _snd_config_update_free_global = snd_config_update_free_global; + + pContext->alsa.snd_pcm_open = (ma_proc)_snd_pcm_open; |