From 6ed05b3f004c173ba9297c85deefe36376890eba Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Sat, 9 Mar 2024 17:25:03 +0200
Subject: [PATCH] proxy: make the FEATURES_MINIMAL and FEATURES_ALL constants
 part of the enum

This fixes their parsing by g-i, correcting their values in the bindings,
which were previously wrong.

Fixes #540
---
 lib/wp/proxy.h | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/lib/wp/proxy.h b/lib/wp/proxy.h
index f6a6c43d..33ecf5bf 100644
--- a/lib/wp/proxy.h
+++ b/lib/wp/proxy.h
@@ -31,30 +31,28 @@ typedef enum { /*< flags >*/
   WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PORT_CONFIG = (1 << 8),
   WP_PIPEWIRE_OBJECT_FEATURE_PARAM_ROUTE       = (1 << 9),
 
+  /*!
+   * The minimal feature set for proxies implementing WpPipewireObject.
+   * This is a subset of \em WP_PIPEWIRE_OBJECT_FEATURES_ALL
+   */
+  WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL =
+      (WP_PROXY_FEATURE_BOUND | WP_PIPEWIRE_OBJECT_FEATURE_INFO),
+
+  /*!
+   * The complete common feature set for proxies implementing
+   * WpPipewireObject. This is a subset of \em WP_OBJECT_FEATURES_ALL
+   */
+  WP_PIPEWIRE_OBJECT_FEATURES_ALL =
+      (WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL |
+       WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS |
+       WP_PIPEWIRE_OBJECT_FEATURE_PARAM_FORMAT |
+       WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROFILE |
+       WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PORT_CONFIG |
+       WP_PIPEWIRE_OBJECT_FEATURE_PARAM_ROUTE),
+
   WP_PROXY_FEATURE_CUSTOM_START                = (1 << 16), /*< skip >*/
 } WpProxyFeatures;
 
-/*!
- * \brief The minimal feature set for proxies implementing WpPipewireObject.
- * This is a subset of \em WP_PIPEWIRE_OBJECT_FEATURES_ALL
- * \ingroup wpproxy
- */
-#define WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL \
-    (WP_PROXY_FEATURE_BOUND | WP_PIPEWIRE_OBJECT_FEATURE_INFO)
-
-/*!
- * \brief The complete common feature set for proxies implementing
- * WpPipewireObject. This is a subset of \em WP_OBJECT_FEATURES_ALL
- * \ingroup wpproxy
- */
-#define WP_PIPEWIRE_OBJECT_FEATURES_ALL \
-    (WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL | \
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS | \
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_FORMAT | \
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROFILE | \
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PORT_CONFIG | \
-     WP_PIPEWIRE_OBJECT_FEATURE_PARAM_ROUTE)
-
 /*!
  * \brief The WpProxy GType
  * \ingroup wpproxy