conf: move endpoints into wireplumber.settings

modules/module-settings.c

@@ -137,13 +137,6 @@ do_parse_settings (void *data, const char *location,
   return 0;
 }
 
-static int
-do_parse_endpoints (void *data, const char *location, const char *section,
-    const char *str, size_t len)
-{
-  return do_parse_settings (data, location, section, str, len);
-}
-
 static gboolean
 is_persistent_settings_enabled (WpProperties *settings) {
   const gchar *val_str;
@@ -188,14 +181,6 @@ on_metadata_activated (WpMetadata * m, GAsyncResult * res, gpointer user_data)
     return;
   }
 
-  if (pw_context_conf_section_for_each (pw_ctx, "wireplumber.endpoints",
-      do_parse_endpoints, config_settings) < 0) {
-    wp_transition_return_error (transition, g_error_new (
-      WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_OPERATION_FAILED,
-        "failed to parse endpoints"));
-    return;
-  }
-
   /* Don't use configuration settings if persistent settings is enabled */
   if (!is_persistent_settings_enabled (config_settings)) {
     wp_info_object (self, PERSISTENT_SETTING

src/config/wireplumber.conf

@@ -324,95 +324,3 @@ wireplumber.settings = {
   # persistent.settings = false
 }
 
-wireplumber.endpoints = {
-  # endpoints = {
-  #   endpoint.capture = {
-  #     media.class = "Audio/Source"
-  #     role = "Capture"
-  #   }
-  #   endpoint.multimedia = {
-  #     media.class = "Audio/Sink"
-  #     role = "Multimedia"
-  #   }
-  #   endpoint.speech_low = {
-  #     media.class = "Audio/Sink"
-  #     role = "Speech-Low"
-  #   }
-  #   endpoint.custom_low = {
-  #     media.class = "Audio/Sink"
-  #     role = "Custom-Low"
-  #   }
-  #   endpoint.navigation = {
-  #     media.class = "Audio/Sink"
-  #     role = "Navigation"
-  #   }
-  #   endpoint.speech_high = {
-  #     media.class = "Audio/Sink"
-  #     role = "Speech-High"
-  #   }
-  #   endpoint.custom_high = {
-  #     media.class = "Audio/Sink"
-  #     role = "Custom-High"
-  #   }
-  #   endpoint.communication = {
-  #     media.class = "Audio/Sink"
-  #     role = "Communication"
-  #   }
-  #   endpoint.emergency = {
-  #     media.class = "Audio/Sink"
-  #     role = "Emergency"
-  #   }
-  # }
-
-  # endpoints-roles = {
-  #   Capture = {
-  #     alias = [ "Multimedia", "Music", "Voice", "Capture" ]
-  #     priority = 25
-  #     action.default = "cork"
-  #     action.capture = "mix"
-  #     media.class = "Audio/Source"
-  #   }
-  #   Multimedia = {
-  #     alias = [ "Movie" "Music" "Game" ]
-  #     priority = 25
-  #     action.default = "cork"
-  #   }
-  #   Speech-Low = {
-  #     priority = 30
-  #     action.default = "cork"
-  #     action.Speech-Low = "mix"
-  #   }
-  #   Custom-Low = {
-  #     priority = 35
-  #     action.default = "cork"
-  #     action.Custom-Low = "mix"
-  #   }
-  #   Navigation = {
-  #     priority = 50
-  #     action.default = "duck"
-  #     action.Navigation = "mix"
-  #   }
-  #   Speech-High = {
-  #     priority = 60
-  #     action.default = "cork"
-  #     action.Speech-High = "mix"
-  #   }
-  #   Custom-High = {
-  #     priority = 65
-  #     action.default = "cork"
-  #     action.Custom-High = "mix"
-  #   }
-  #   Communication = {
-  #     priority = 75
-  #     action.default = "cork"
-  #     action.Communication = "mix"
-  #   }
-  #   Emergency = {
-  #     alias = [ "Alert" ]
-  #     priority = 99
-  #     action.default = "cork"
-  #     action.Emergency = "mix"
-  #   }
-  # }
-}
-

src/config/wireplumber.conf.d/endpoint.conf

@@ -0,0 +1,95 @@
+## The WirePlumber endpoint configuration
+
+wireplumber.settings = {
+  ## The list of endpoints to create
+  endpoints = {
+    # endpoint.capture = {
+    #   media.class = "Audio/Source"
+    #   role = "Capture"
+    # }
+    # endpoint.multimedia = {
+    #   media.class = "Audio/Sink"
+    #   role = "Multimedia"
+    # }
+    # endpoint.speech_low = {
+    #   media.class = "Audio/Sink"
+    #   role = "Speech-Low"
+    # }
+    # endpoint.custom_low = {
+    #   media.class = "Audio/Sink"
+    #   role = "Custom-Low"
+    # }
+    # endpoint.navigation = {
+    #   media.class = "Audio/Sink"
+    #   role = "Navigation"
+    # }
+    # endpoint.speech_high = {
+    #   media.class = "Audio/Sink"
+    #   role = "Speech-High"
+    # }
+    # endpoint.custom_high = {
+    #   media.class = "Audio/Sink"
+    #   role = "Custom-High"
+    # }
+    # endpoint.communication = {
+    #   media.class = "Audio/Sink"
+    #   role = "Communication"
+    # }
+    # endpoint.emergency = {
+    #   media.class = "Audio/Sink"
+    #   role = "Emergency"
+    # }
+  }
+
+  ## The list of endpoint roles to use
+  endpoints-roles = {
+    # Capture = {
+    #   alias = [ "Multimedia", "Music", "Voice", "Capture" ]
+    #   priority = 25
+    #   action.default = "cork"
+    #   action.capture = "mix"
+    #   media.class = "Audio/Source"
+    # }
+    # Multimedia = {
+    #   alias = [ "Movie" "Music" "Game" ]
+    #   priority = 25
+    #   action.default = "cork"
+    # }
+    # Speech-Low = {
+    #   priority = 30
+    #   action.default = "cork"
+    #   action.Speech-Low = "mix"
+    # }
+    # Custom-Low = {
+    #   priority = 35
+    #   action.default = "cork"
+    #   action.Custom-Low = "mix"
+    # }
+    # Navigation = {
+    #   priority = 50
+    #   action.default = "duck"
+    #   action.Navigation = "mix"
+    # }
+    # Speech-High = {
+    #   priority = 60
+    #   action.default = "cork"
+    #   action.Speech-High = "mix"
+    # }
+    # Custom-High = {
+    #   priority = 65
+    #   action.default = "cork"
+    #   action.Custom-High = "mix"
+    # }
+    # Communication = {
+    #   priority = 75
+    #   action.default = "cork"
+    #   action.Communication = "mix"
+    # }
+    # Emergency = {
+    #   alias = [ "Alert" ]
+    #   priority = 99
+    #   action.default = "cork"
+    #   action.Emergency = "mix"
+    # }
+  }
+}