aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Marie <semarie@online.fr>2022-03-02 18:35:13 +0000
committerSébastien Marie <semarie@online.fr>2022-03-02 18:35:13 +0000
commit3145935d6bb1ffc9ca4f3f8ebdb8dc3edcac3ec0 (patch)
tree715b8658e800fc9c1f7f9e5a4e43b632b468dfbf
parent25430333ba89389c25acfdd78bfcf2b6e04af224 (diff)
miniaudio
- simplify foreign - enable SUPPORT_SNDIO on OpenBSD - correct ptr type for SUPPORT_PULSEAUDIO (Linux) and SUPPORT_COREAUDIO (Darwin)
-rw-r--r--vendor/miniaudio/common.odin9
-rw-r--r--vendor/miniaudio/data_conversion.odin10
-rw-r--r--vendor/miniaudio/decoding.odin13
-rw-r--r--vendor/miniaudio/device_io_procs.odin9
-rw-r--r--vendor/miniaudio/device_io_types.odin8
-rw-r--r--vendor/miniaudio/encoding.odin11
-rw-r--r--vendor/miniaudio/filtering.odin9
-rw-r--r--vendor/miniaudio/generation.odin11
-rw-r--r--vendor/miniaudio/logging.odin11
-rw-r--r--vendor/miniaudio/utilities.odin11
-rw-r--r--vendor/miniaudio/vfs.odin9
11 files changed, 79 insertions, 32 deletions
diff --git a/vendor/miniaudio/common.odin b/vendor/miniaudio/common.odin
index 75b66101f..89e3d6bd2 100644
--- a/vendor/miniaudio/common.odin
+++ b/vendor/miniaudio/common.odin
@@ -2,8 +2,13 @@ package miniaudio
import "core:c"
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
handle :: distinct rawptr
diff --git a/vendor/miniaudio/data_conversion.odin b/vendor/miniaudio/data_conversion.odin
index 8a53cc19e..7167270a1 100644
--- a/vendor/miniaudio/data_conversion.odin
+++ b/vendor/miniaudio/data_conversion.odin
@@ -2,9 +2,13 @@ package miniaudio
import "core:c"
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
-
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
/************************************************************************************************************************************************************
*************************************************************************************************************************************************************
diff --git a/vendor/miniaudio/decoding.odin b/vendor/miniaudio/decoding.odin
index 52b315f10..dcf3b7a1a 100644
--- a/vendor/miniaudio/decoding.odin
+++ b/vendor/miniaudio/decoding.odin
@@ -2,10 +2,13 @@ package miniaudio
import "core:c"
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
-
-
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
/************************************************************************************************************************************************************
@@ -164,4 +167,4 @@ foreign lib {
decode_from_vfs :: proc(pVFS: ^vfs, pFilePath: cstring, pConfig: ^decoder_config, pFrameCountOut: ^u64, ppPCMFramesOut: ^rawptr) -> result ---
decode_file :: proc(pFilePath: cstring, pConfig: ^decoder_config, pFrameCountOut: ^u64, ppPCMFramesOut: ^rawptr) -> result ---
decode_memory :: proc(pData: rawptr, dataSize: c.size_t, pConfig: ^decoder_config, pFrameCountOut: ^u64, ppPCMFramesOut: ^rawptr) -> result ---
-} \ No newline at end of file
+}
diff --git a/vendor/miniaudio/device_io_procs.odin b/vendor/miniaudio/device_io_procs.odin
index 8d6609186..7cff3f621 100644
--- a/vendor/miniaudio/device_io_procs.odin
+++ b/vendor/miniaudio/device_io_procs.odin
@@ -1,7 +1,12 @@
package miniaudio
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
import "core:c"
diff --git a/vendor/miniaudio/device_io_types.odin b/vendor/miniaudio/device_io_types.odin
index 7778e85cf..e05f94665 100644
--- a/vendor/miniaudio/device_io_types.odin
+++ b/vendor/miniaudio/device_io_types.odin
@@ -6,7 +6,7 @@ SUPPORT_WASAPI :: ODIN_OS == .Windows
SUPPORT_DSOUND :: ODIN_OS == .Windows
SUPPORT_WINMM :: ODIN_OS == .Windows
SUPPORT_COREAUDIO :: ODIN_OS == .Darwin
-SUPPORT_SNDIO :: false // ODIN_OS == .OpenBSD
+SUPPORT_SNDIO :: ODIN_OS == .OpenBSD
SUPPORT_AUDIO4 :: false // ODIN_OS == .OpenBSD || ODIN_OS == .NetBSD
SUPPORT_OSS :: ODIN_OS == .FreeBSD
SUPPORT_PULSEAUDIO :: ODIN_OS == .Linux
@@ -739,8 +739,8 @@ context_type :: struct {
pa_stream_writable_size: proc "system" (),
pa_stream_readable_size: proc "system" (),
- /*pa_mainloop**/ pMainLoop: ptr,
- /*pa_context**/ pPulseContext: ptr,
+ /*pa_mainloop**/ pMainLoop: rawptr,
+ /*pa_context**/ pPulseContext: rawptr,
} when SUPPORT_PULSEAUDIO else struct {}),
jack: (struct {
@@ -791,7 +791,7 @@ context_type :: struct {
AudioUnitInitialize: proc "system" (),
AudioUnitRender: proc "system" (),
- /*AudioComponent*/ component: ptr,
+ /*AudioComponent*/ component: rawptr,
noAudioSessionDeactivate: b32, /* For tracking whether or not the iOS audio session should be explicitly deactivated. Set from the config in ma_context_init__coreaudio(). */
} when SUPPORT_COREAUDIO else struct {}),
diff --git a/vendor/miniaudio/encoding.odin b/vendor/miniaudio/encoding.odin
index 83f9d5252..9b84108dc 100644
--- a/vendor/miniaudio/encoding.odin
+++ b/vendor/miniaudio/encoding.odin
@@ -2,8 +2,13 @@ package miniaudio
import "core:c"
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
/************************************************************************************************************************************************************
@@ -49,4 +54,4 @@ foreign lib {
encoder_init_file_w :: proc(pFilePath: [^]c.wchar_t, pConfig: ^encoder_config, pEncoder: ^encoder) -> result ---
encoder_uninit :: proc(pEncoder: ^encoder) ---
encoder_write_pcm_frames :: proc(pEncoder: ^encoder, FramesIn: rawptr, frameCount: u64) -> u64 ---
-} \ No newline at end of file
+}
diff --git a/vendor/miniaudio/filtering.odin b/vendor/miniaudio/filtering.odin
index 4956da173..9949f6338 100644
--- a/vendor/miniaudio/filtering.odin
+++ b/vendor/miniaudio/filtering.odin
@@ -1,7 +1,12 @@
package miniaudio
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
/**************************************************************************************************************************************************************
diff --git a/vendor/miniaudio/generation.odin b/vendor/miniaudio/generation.odin
index c241f00b1..97b7d453c 100644
--- a/vendor/miniaudio/generation.odin
+++ b/vendor/miniaudio/generation.odin
@@ -2,8 +2,13 @@ package miniaudio
import "core:c"
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
waveform_type :: enum c.int {
sine,
@@ -82,4 +87,4 @@ foreign lib {
noise_set_amplitude :: proc(pNoise: ^noise, amplitude: f64) -> result ---
noise_set_seed :: proc(pNoise: ^noise, seed: i32) -> result ---
noise_set_type :: proc(pNoise: ^noise, type: noise_type) -> result ---
-} \ No newline at end of file
+}
diff --git a/vendor/miniaudio/logging.odin b/vendor/miniaudio/logging.odin
index 35aa54bc9..0c14a10c2 100644
--- a/vendor/miniaudio/logging.odin
+++ b/vendor/miniaudio/logging.odin
@@ -2,8 +2,13 @@ package miniaudio
import c "core:c/libc"
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
MAX_LOG_CALLBACKS :: 4
@@ -32,4 +37,4 @@ foreign lib {
log_post :: proc(pLog: ^log, level: u32, pMessage: cstring) -> result ---
log_postv :: proc(pLog: ^log, level: u32, pFormat: cstring, args: c.va_list) -> result ---
log_postf :: proc(pLog: ^log, level: u32, pFormat: cstring, #c_vararg args: ..any) -> result ---
-} \ No newline at end of file
+}
diff --git a/vendor/miniaudio/utilities.odin b/vendor/miniaudio/utilities.odin
index 19307a77d..9ced019f5 100644
--- a/vendor/miniaudio/utilities.odin
+++ b/vendor/miniaudio/utilities.odin
@@ -1,7 +1,12 @@
package miniaudio
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
@(default_calling_convention="c", link_prefix="ma_")
foreign lib {
@@ -228,4 +233,4 @@ foreign lib {
audio_buffer_get_cursor_in_pcm_frames :: proc(pAudioBuffer: ^audio_buffer, pCursor: ^u64) -> result ---
audio_buffer_get_length_in_pcm_frames :: proc(pAudioBuffer: ^audio_buffer, pLength: ^u64) -> result ---
audio_buffer_get_available_frames :: proc(pAudioBuffer: ^audio_buffer, pAvailableFrames: ^u64) -> result ---
-} \ No newline at end of file
+}
diff --git a/vendor/miniaudio/vfs.odin b/vendor/miniaudio/vfs.odin
index 547fbd265..85571341e 100644
--- a/vendor/miniaudio/vfs.odin
+++ b/vendor/miniaudio/vfs.odin
@@ -2,8 +2,13 @@ package miniaudio
import "core:c"
-when ODIN_OS == .Windows { foreign import lib "lib/miniaudio.lib" }
-when ODIN_OS == .Linux { foreign import lib "lib/miniaudio.a" }
+when ODIN_OS == .Windows {
+ foreign import lib "lib/miniaudio.lib"
+} else when ODIN_OS == .Linux {
+ foreign import lib "lib/miniaudio.a"
+} else {
+ foreign import lib "system:miniaudio"
+}
/************************************************************************************************************************************************************