diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2024-01-16 21:01:49 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2024-01-16 21:01:49 -0500 |
| commit | 9065d8778e63ea919506fd0d4a0692042fb503fb (patch) | |
| tree | 09de40e56ac924e60c4f3c080ac74a5064049e90 /src/mixer | |
| parent | 863eda6c45a0ed0bf5f460dde6177c257d57cff8 (diff) | |
| download | camu-9065d8778e63ea919506fd0d4a0692042fb503fb.tar.gz camu-9065d8778e63ea919506fd0d4a0692042fb503fb.tar.bz2 camu-9065d8778e63ea919506fd0d4a0692042fb503fb.zip | |
Improve windows build
- Support using libplacebo vulkan backend on windows
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/mixer')
| -rw-r--r-- | src/mixer/audio_miniaudio.c | 1 | ||||
| -rw-r--r-- | src/mixer/meson.build | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c index b77323a..3d6f54b 100644 --- a/src/mixer/audio_miniaudio.c +++ b/src/mixer/audio_miniaudio.c @@ -135,7 +135,6 @@ static u64 audio_miniaudio_get_latency(struct camu_audio *audio) struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)audio; // Latency is one period on PulseAudio even if periods is >1. On WASAPI, latency is periods // times period size. - // This is a hack, should be possible to determine at runtime. #ifdef _WIN32 return ((ma->device.playback.internalPeriodSizeInFrames * ma->device.playback.internalPeriods) / #else diff --git a/src/mixer/meson.build b/src/mixer/meson.build index 52125ce..71c003b 100644 --- a/src/mixer/meson.build +++ b/src/mixer/meson.build @@ -6,20 +6,21 @@ mixer_src += ['audio_miniaudio.c'] mixer_deps += [miniaudio] miniaudio_args = [ - '-DMA_NO_JACK', - '-DMA_NO_ALSA', + '-DMA_ENABLE_ONLY_SPECIFIC_BACKENDS', '-DMA_NO_DECODING', '-DMA_NO_ENCODING', - '-DMA_NO_GENERATION', '-DMA_NO_RESOURCE_MANAGER', '-DMA_NO_NODE_GRAPH', '-DMA_NO_ENGINE', + '-DMA_NO_GENERATION', ] if not is_windows libpulse = dependency('libpulse') mixer_deps += [libpulse] - miniaudio_args += ['-DMA_NO_RUNTIME_LINKING'] + miniaudio_args += ['-DMA_ENABLE_PULSEAUDIO', '-DMA_NO_RUNTIME_LINKING'] +else + miniaudio_args += ['-DMA_ENABLE_WASAPI'] endif mixer = declare_dependency(sources: mixer_src, dependencies: mixer_deps, |