[vlc-commits] [Git][videolan/vlc][master] 2 commits: visualization: meson: use enabled flag

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
62686410 by Alexandre Janniaux at 2024-04-07T14:59:17+00:00
visualization: meson: use enabled flag

- - - - -
0a03780c by Alexandre Janniaux at 2024-04-07T14:59:17+00:00
visualization: meson: add missing plugins

- - - - -


2 changed files:

- meson_options.txt
- modules/visualization/meson.build


Changes:

=====================================
meson_options.txt
=====================================
@@ -265,6 +265,11 @@ option('vorbis',
     value : 'auto',
     description : 'Enable/disable vorbis support')
 
+option('vsxu',
+    type : 'feature',
+    value : 'auto',
+    description : 'Enable/disable VSXU visualization support')
+
 option('x265',
     type : 'feature',
     value : 'auto',


=====================================
modules/visualization/meson.build
=====================================
@@ -1,12 +1,22 @@
+# glspectrum plugin
+vlc_modules += {
+    'name' : 'glspectrum',
+    'sources' : files('glspectrum.c',
+      'visual/fft.c', 'visual/fft.h',
+      'visual/window.c', 'visual/window.h',
+      'visual/window_presets.h'),
+    'dependencies' : [opengl_dep, m_lib],
+    'enabled' : opengl_dep.found(),
+}
+
 # goom visualization plugin
 goom2_dep = dependency('libgoom2', required: get_option('goom2'))
-if goom2_dep.found()
-    vlc_modules += {
-        'name' : 'goom',
-        'sources' : files('goom.c'),
-        'dependencies' : [goom2_dep, m_lib]
-    }
-endif
+vlc_modules += {
+    'name' : 'goom',
+    'sources' : files('goom.c'),
+    'dependencies' : [goom2_dep, m_lib],
+    'enabled' : goom2_dep.found(),
+}
 
 # projectM visualization plugin
 projectm_dep = dependency('libprojectM', version: '>= 2.0.0', required: false)
@@ -19,13 +29,30 @@ else
         required: false)
 endif
 
-if projectm_dep.found()
-  if host_system != 'windows'
-    vlc_modules += {
-        'name' : 'projectm',
-        'sources' : files('projectm.cpp'),
-        'dependencies' : [projectm_dep],
-        'cpp_args' : [projectm_args]
-    }
-  endif
-endif
+vlc_modules += {
+    'name' : 'projectm',
+    'sources' : files('projectm.cpp'),
+    'dependencies' : [projectm_dep],
+    'cpp_args' : [projectm_args],
+    'enabled' : projectm_dep.found() and host_system != 'windows'
+}
+
+# Visual visualization plugin
+vlc_modules += {
+    'name' : 'visual',
+    'sources' : files(
+        'visual/visual.c', 'visual/visual.h',
+        'visual/fft.c', 'visual/fft.h',
+        'visual/window.c', 'visual/window.h',
+        'visual/effects.c', 'visual/window_presets.h'),
+    'dependencies' : [m_lib],
+}
+
+# Vsxu plugin
+vsxu_dep = dependency('libvsxu', required: get_option('vsxu'))
+vlc_modules += {
+    'name' : 'vsxu',
+    'sources' : files('vsxu.cpp', 'cyclic_buffer.h'),
+    'dependencies' : [m_lib, vsxu_dep],
+    'enabled' : vsxu_dep.found()
+}



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ee8329a5afc0af367324c838e3336c8b267a489e...0a03780ca80b992ce81b05c1d93dd838903f27cb

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ee8329a5afc0af367324c838e3336c8b267a489e...0a03780ca80b992ce81b05c1d93dd838903f27cb
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance