Promote media-session to its own subdirectory

media-session is past the point of being a mere example, let's promote
it out of the subdirectory.

pw-reserve is moved to tools/

doc/meson.build

@@ -22,11 +22,9 @@ endforeach
 foreach h : module_sources
   inputs += meson.source_root() / 'src' / 'modules' / h
 endforeach
-if is_variable('media_session_sources')
-  foreach h : media_session_sources
-    inputs += meson.source_root() / 'src' / 'examples' / h
-  endforeach
-endif
+foreach h : media_session_sources
+  inputs += meson.source_root() / 'src' / 'media-session' / h
+endforeach
 inputs += meson.source_root() / 'test' / 'pwtest.h'
 
 # SPA headers use static inline functions. Doxygen doesn't extract those

po/POTFILES.in

@@ -1,6 +1,6 @@
 src/daemon/pipewire.c
 src/daemon/pipewire.desktop.in
-src/examples/media-session/alsa-monitor.c
+src/media-session/alsa-monitor.c
 src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
 src/modules/module-protocol-pulse/modules/module-tunnel-source.c
 src/modules/module-pulse-tunnel.c

pw-uninstalled.sh

@@ -41,7 +41,7 @@ export SPA_PLUGIN_DIR="${BUILDDIR}/spa/plugins"
 export SPA_DATA_DIR="${SCRIPT_DIR}/spa/plugins"
 # the directory with pipewire modules
 export PIPEWIRE_MODULE_DIR="${BUILDDIR}/src/modules"
-export PATH="${BUILDDIR}/src/daemon:${BUILDDIR}/src/tools:${BUILDDIR}/src/examples:${PATH}"
+export PATH="${BUILDDIR}/src/daemon:${BUILDDIR}/src/tools:${BUILDDIR}/src/media-session:${BUILDDIR}/src/examples:${PATH}"
 export LD_LIBRARY_PATH="${BUILDDIR}/src/pipewire/:${BUILDDIR}/pipewire-jack/src/${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}"
 export GST_PLUGIN_PATH="${BUILDDIR}/src/gst/${GST_PLUGIN_PATH+":${GST_PLUGIN_PATH}"}"
 # the directory with card profiles and paths

src/examples/meson.build

@@ -56,54 +56,6 @@ executable('export-spa-device',
   dependencies : [pipewire_dep, mathlib],
 )
 
-media_session_sources = []
-if get_option('session-managers').contains('media-session')
-  sm_logind_src = []
-  sm_logind_dep = []
-  if systemd.found() and systemd_dep.found()
-    sm_logind_src = ['media-session/logind.c']
-    sm_logind_dep = [systemd_dep]
-  endif
-  media_session_sources += [
-    'media-session/access-flatpak.c',
-    'media-session/access-portal.c',
-    'media-session/alsa-no-dsp.c',
-    'media-session/alsa-midi.c',
-    'media-session/alsa-monitor.c',
-    'media-session/alsa-endpoint.c',
-    'media-session/bluez-monitor.c',
-    'media-session/bluez-endpoint.c',
-    'media-session/bluez-autoswitch.c',
-    'media-session/default-nodes.c',
-    'media-session/default-profile.c',
-    'media-session/default-routes.c',
-    'media-session/media-session.c',
-    'media-session/session-manager.c',
-    'media-session/match-rules.c',
-    'media-session/metadata.c',
-    'media-session/stream-endpoint.c',
-    'media-session/restore-stream.c',
-    'media-session/policy-ep.c',
-    'media-session/policy-node.c',
-    'media-session/streams-follow-default.c',
-    'media-session/v4l2-monitor.c',
-    'media-session/v4l2-endpoint.c',
-    'media-session/libcamera-monitor.c',
-    'media-session/suspend-node.c',
-  ] + sm_logind_src
-  executable('pipewire-media-session',
-    media_session_sources,
-    install: true,
-    dependencies : [dbus_dep, pipewire_dep, alsa_dep, mathlib, sm_logind_dep, libinotify_dep],
-)
-endif
-
-executable('pw-reserve',
-	'media-session/pw-reserve.c',
-	install: true,
-	dependencies : [dbus_dep, pipewire_dep],
-)
-
 executable('bluez-session',
   'bluez-session.c',
   install : installed_tests_enabled,

src/media-session/meson.build

@@ -0,0 +1,41 @@
+media_session_sources = []
+if get_option('session-managers').contains('media-session')
+  sm_logind_src = []
+  sm_logind_dep = []
+  if systemd.found() and systemd_dep.found()
+    sm_logind_src = ['logind.c']
+    sm_logind_dep = [systemd_dep]
+  endif
+  media_session_sources += [
+    'access-flatpak.c',
+    'access-portal.c',
+    'alsa-no-dsp.c',
+    'alsa-midi.c',
+    'alsa-monitor.c',
+    'alsa-endpoint.c',
+    'bluez-monitor.c',
+    'bluez-endpoint.c',
+    'bluez-autoswitch.c',
+    'default-nodes.c',
+    'default-profile.c',
+    'default-routes.c',
+    'media-session.c',
+    'session-manager.c',
+    'match-rules.c',
+    'metadata.c',
+    'stream-endpoint.c',
+    'restore-stream.c',
+    'policy-ep.c',
+    'policy-node.c',
+    'streams-follow-default.c',
+    'v4l2-monitor.c',
+    'v4l2-endpoint.c',
+    'libcamera-monitor.c',
+    'suspend-node.c',
+  ] + sm_logind_src
+  pms = executable('pipewire-media-session',
+    media_session_sources,
+    install: true,
+    dependencies : [dbus_dep, pipewire_dep, alsa_dep, mathlib, sm_logind_dep, libinotify_dep],
+)
+endif

src/meson.build

@@ -3,6 +3,7 @@ subdir('pipewire')
 subdir('daemon')
 subdir('tools')
 subdir('modules')
+subdir('media-session')
 if not get_option('examples').disabled()
   subdir('examples')
 endif

src/tools/meson.build

@@ -59,3 +59,9 @@ elif not sndfile_dep.found() and get_option('pw-cat').enabled()
 	error('pw-cat is enabled but required dependency `sndfile` was not found.')
 endif
 summary({'Build pw-cat tool': build_pw_cat}, bool_yn: true, section: 'pw-cat/pw-play/pw-dump tool')
+
+executable('pw-reserve',
+	'pw-reserve.c',
+	install: true,
+	dependencies : [dbus_dep, pipewire_dep],
+)

src/tools/pw-reserve.c

@@ -33,7 +33,7 @@
 
 #include "pipewire/pipewire.h"
 
-#include "reserve.c"
+#include "../media-session/reserve.c"
 
 #define NAME "reserve"