summaryrefslogtreecommitdiff
path: root/src/mixer
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-01-01 11:23:22 -0500
committerAndrew Opalach <andrew@akon.city> 2024-01-01 11:23:22 -0500
commit130a0edc0405e53b45f8b2f8da0b94356480a644 (patch)
tree76cda2f7e0098bdcb6c54dc152bf3e95467fd44e /src/mixer
parent099126fdca625c5f6c219c5a1a7ecbc0e145988f (diff)
downloadcamu-130a0edc0405e53b45f8b2f8da0b94356480a644.tar.gz
camu-130a0edc0405e53b45f8b2f8da0b94356480a644.tar.bz2
camu-130a0edc0405e53b45f8b2f8da0b94356480a644.zip
wip
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/audio_miniaudio.c10
-rw-r--r--src/mixer/meson.build15
-rw-r--r--src/mixer/mixer.c1
3 files changed, 20 insertions, 6 deletions
diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c
index 1388fc4..38cb91d 100644
--- a/src/mixer/audio_miniaudio.c
+++ b/src/mixer/audio_miniaudio.c
@@ -179,12 +179,12 @@ struct camu_audio_miniaudio audio_plugin_miniaudio = {
.stop = audio_miniaudio_stop,
.free = audio_miniaudio_free
},
- .log = { },
- .context_config = { },
- .context = { },
+ .log = { 0 },
+ .context_config = { 0 },
+ .context = { 0 },
.infos = NULL,
.info_count = 0,
.selected_device = NULL,
- .config = { },
- .device = { }
+ .config = { 0 },
+ .device = { 0 }
};
diff --git a/src/mixer/meson.build b/src/mixer/meson.build
index 4053210..53389eb 100644
--- a/src/mixer/meson.build
+++ b/src/mixer/meson.build
@@ -9,4 +9,17 @@ if host_machine.system() != 'windows'
mixer_deps += [libpulse]
endif
-mixer = declare_dependency(sources: mixer_src, dependencies: mixer_deps)
+miniaudio_args = [
+ '-DMA_NO_JACK',
+ '-DMA_NO_ALSA',
+ '-DMA_NO_DECODING',
+ '-DMA_NO_ENCODING',
+ '-DMA_NO_GENERATION',
+ '-DMA_NO_RESOURCE_MANAGER',
+ '-DMA_NO_NODE_GRAPH',
+ '-DMA_NO_ENGINE',
+ '-DMA_NO_RUNTIME_LINKING'
+]
+
+mixer = declare_dependency(sources: mixer_src, dependencies: mixer_deps,
+ compile_args: miniaudio_args)
diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c
index 8cfc2cc..646f056 100644
--- a/src/mixer/mixer.c
+++ b/src/mixer/mixer.c
@@ -60,6 +60,7 @@ void camu_mixer_pick_format(struct camu_mixer *mixer, struct camu_lav_resample_f
f64 camu_mixer_get_latency(struct camu_mixer *mixer)
{
+ if (!mixer->audio) return 0;
return mixer->audio->get_latency(mixer->audio) / 1000000.0;
}