spa: move dbus helpers out of bluez plugin

The file is moved into a new "include-private" directory. This is done
because otherwise adjustments would have to be made to the list of installed
headers, the way include tests currently work and which files are
used for generating documentation.

spa/include-private/spa-private/dbus-helpers.h

@@ -1,9 +1,9 @@
-/* Spa Bluez5 DBus helpers */
+/* Spa DBus helpers */
 /* SPDX-FileCopyrightText: Copyright © 2023 PipeWire authors */
 /* SPDX-License-Identifier: MIT */
 
-#ifndef SPA_BLUEZ5_DBUS_HELPERS_H
-#define SPA_BLUEZ5_DBUS_HELPERS_H
+#ifndef SPA_PRIVATE_DBUS_HELPERS_H
+#define SPA_PRIVATE_DBUS_HELPERS_H
 
 #include <stdbool.h>
 
@@ -69,4 +69,4 @@ SPA_DEFINE_AUTO_CLEANUP(DBusError, DBusError, {
 	dbus_error_free(thing);
 })
 
-#endif /* SPA_BLUEZ5_DBUS_HELPERS_H */
+#endif /* SPA_PRIVATE_DBUS_HELPERS_H */

spa/meson.build

@@ -8,6 +8,7 @@
 spa_dep = declare_dependency(
   include_directories : [
     include_directories('include'),
+    include_directories('include-private'),
   ],
   dependencies : [atomic_dep],
   version : spaversion,

spa/plugins/bluez5/backend-hsphfpd.c

@@ -16,9 +16,9 @@
 #include <spa/utils/string.h>
 #include <spa/utils/type.h>
 #include <spa/param/audio/raw.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "defs.h"
-#include "dbus-helpers.h"
 
 SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.bluez5.hsphfpd");
 #undef SPA_LOG_TOPIC_DEFAULT

spa/plugins/bluez5/backend-native.c

@@ -26,6 +26,7 @@
 #include <spa/utils/type.h>
 #include <spa/utils/json.h>
 #include <spa/param/audio/raw.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "defs.h"
 
@@ -33,7 +34,6 @@
 #include <libusb.h>
 #endif
 
-#include "dbus-helpers.h"
 #include "modemmanager.h"
 #include "upower.h"
 

spa/plugins/bluez5/backend-ofono.c

@@ -20,9 +20,9 @@
 #include <spa/utils/type.h>
 #include <spa/utils/result.h>
 #include <spa/param/audio/raw.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "defs.h"
-#include "dbus-helpers.h"
 
 #define INITIAL_INTERVAL_NSEC	(500 * SPA_NSEC_PER_MSEC)
 #define ACTION_INTERVAL_NSEC	(3000 * SPA_NSEC_PER_MSEC)

spa/plugins/bluez5/bluez5-dbus.c

@@ -32,10 +32,10 @@
 #include <spa/utils/result.h>
 #include <spa/utils/string.h>
 #include <spa/utils/json.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "config.h"
 #include "codec-loader.h"
-#include "dbus-helpers.h"
 #include "player.h"
 #include "iso-io.h"
 #include "bap-codec-caps.h"

spa/plugins/bluez5/modemmanager.c

@@ -4,10 +4,10 @@
 
 #include <errno.h>
 #include <spa/utils/string.h>
+#include <spa-private/dbus-helpers.h>
 
 #include <ModemManager.h>
 
-#include "dbus-helpers.h"
 #include "modemmanager.h"
 
 #define DBUS_INTERFACE_OBJECTMANAGER "org.freedesktop.DBus.ObjectManager"

spa/plugins/bluez5/player.c

@@ -7,9 +7,9 @@
 #include <dbus/dbus.h>
 
 #include <spa/utils/string.h>
+#include <spa-private/dbus-helpers.h>
 
 #include "defs.h"
-#include "dbus-helpers.h"
 #include "player.h"
 
 #define PLAYER_OBJECT_PATH_BASE	"/media_player"

spa/plugins/bluez5/upower.c

@@ -4,8 +4,8 @@
 
 #include <errno.h>
 #include <spa/utils/string.h>
+#include <spa-private/dbus-helpers.h>
 
-#include "dbus-helpers.h"
 #include "upower.h"
 
 #define UPOWER_SERVICE "org.freedesktop.UPower"