ao_jack: modularize

mpv-player · Jan 14, 2023 · 423dc0b · 423dc0b
1 parent 420ebfd
commit 423dc0b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/audio/out/ao.c b/audio/out/ao.c
@@ -96,7 +96,7 @@ static struct ao_module audio_out_drivers[] = {
 #endif
     // wrappers:
 #if HAVE_JACK
-    BUILTIN(&audio_out_jack),
+    MODULAR(jack),
 #endif
 #if HAVE_OPENAL
     BUILTIN(&audio_out_openal),

diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
@@ -271,7 +271,7 @@ static void uninit(struct ao *ao)
     jack_client_close(p->client);
 }
 
-const struct ao_driver audio_out_jack = {
+const struct ao_driver AO_MODULE_DRIVER(audio_out_jack) = {
     .description = "JACK audio output",
     .name        = "jack",
     .init      = init,

diff --git a/meson.build b/meson.build
@@ -822,8 +822,18 @@ jack_opt = get_option('jack').require(
 jack = dependency('jack', required: jack_opt)
 features += {'jack': jack.found()}
 if features['jack']
-    dependencies += jack
-    sources += files('audio/out/ao_jack.c')
+    if features['modular-drivers']
+        shared_module(
+            'mpv-ao-jack',
+            'audio/out/ao_jack.c',
+            dependencies: [jack],
+            install: true,
+            install_dir: moduledir,
+        )
+    else
+        dependencies += jack
+        sources += files('audio/out/ao_jack.c')
+    endif
 endif
 
 openal = dependency('openal', version: '>= 1.13', required: get_option('openal'))