Add config to disable alsa and bluez5 handling by default.
This commit is contained in:
Wim Taymans
parent
e0f9949878
commit
752c7c7e54
177
0001-media-session-add-getopt-support.patch
Normal file
177
0001-media-session-add-getopt-support.patch
Normal file
@ -0,0 +1,177 @@
|
||||
From 2655b1834627c82e105f5942cd8045197d47074c Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Mon, 30 Mar 2020 14:09:44 +0200
|
||||
Subject: [PATCH 1/2] media-session: add getopt support
|
||||
|
||||
Add options to media-session
|
||||
Add an option to enable or disable modules
|
||||
Add an option to set properties for later use
|
||||
---
|
||||
src/examples/media-session/media-session.c | 115 +++++++++++++++++++--
|
||||
src/examples/media-session/media-session.h | 2 +
|
||||
2 files changed, 108 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c
|
||||
index 8740b2e5..c03c40a3 100644
|
||||
--- a/src/examples/media-session/media-session.c
|
||||
+++ b/src/examples/media-session/media-session.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <math.h>
|
||||
+#include <getopt.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "config.h"
|
||||
@@ -1690,15 +1691,111 @@ static void session_shutdown(struct impl *impl)
|
||||
pw_core_info_free(impl->this.info);
|
||||
}
|
||||
|
||||
+#define DEFAULT_ENABLED "alsa-pcm,alsa-seq,v4l2,bluez5,metadata,suspend-node,policy-node"
|
||||
+#define DEFAULT_DISABLED ""
|
||||
+
|
||||
+static const struct {
|
||||
+ const char *name;
|
||||
+ const char *desc;
|
||||
+ int (*start)(struct sm_media_session *sess);
|
||||
+
|
||||
+} modules[] = {
|
||||
+ { "alsa-seq", "alsa seq midi support", sm_alsa_midi_start },
|
||||
+ { "alsa-pcm", "alsa pcm udev detection", sm_alsa_monitor_start },
|
||||
+ { "v4l2", "video for linux udev detection", sm_v4l2_monitor_start },
|
||||
+ { "bluez5", "bluetooth support", sm_bluez5_monitor_start },
|
||||
+ { "metadata", "export metadata API", sm_metadata_start },
|
||||
+ { "suspend-node", "suspend inactive nodes", sm_suspend_node_start },
|
||||
+ { "policy-node", "configure and link nodes", sm_policy_node_start },
|
||||
+};
|
||||
+
|
||||
+static int opt_contains(const char *opt, const char *val)
|
||||
+{
|
||||
+ const char *s, *state = NULL;
|
||||
+ size_t len;
|
||||
+ while((s = pw_split_walk(opt, ",", &len, &state)) != NULL) {
|
||||
+ if (strncmp(val, s, len) == 0)
|
||||
+ return 1;
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void show_help(const char *name)
|
||||
+{
|
||||
+ size_t i;
|
||||
+
|
||||
+ fprintf(stdout, "%s [options]\n"
|
||||
+ " -h, --help Show this help\n"
|
||||
+ " -v, --version Show version\n"
|
||||
+ " -e, --enabled Enabled options (default '%s')\n"
|
||||
+ " -d, --disabled Disabled options (default '%s')\n"
|
||||
+ " -p, --properties Extra properties as 'key=value { key=value }'\n",
|
||||
+ name, DEFAULT_ENABLED, DEFAULT_DISABLED);
|
||||
+
|
||||
+ fprintf(stdout,
|
||||
+ "\noptions:\n");
|
||||
+ for (i = 0; i < SPA_N_ELEMENTS(modules); i++) {
|
||||
+ fprintf(stdout, "\t%-15.15s: %s\n", modules[i].name, modules[i].desc);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
struct impl impl = { 0, };
|
||||
const struct spa_support *support;
|
||||
uint32_t n_support;
|
||||
- int res = 0;
|
||||
+ int res = 0, c;
|
||||
+ const char *opt_enabled = DEFAULT_ENABLED;
|
||||
+ const char *opt_disabled = DEFAULT_DISABLED;
|
||||
+ const char *opt_properties = NULL;
|
||||
+ static const struct option long_options[] = {
|
||||
+ {"help", 0, NULL, 'h'},
|
||||
+ {"version", 0, NULL, 'v'},
|
||||
+ {"enabled", 1, NULL, 'e'},
|
||||
+ {"disabled", 1, NULL, 'd'},
|
||||
+ {"properties", 1, NULL, 'p'},
|
||||
+ {NULL, 0, NULL, 0}
|
||||
+ };
|
||||
+ size_t i;
|
||||
+ const struct spa_dict_item *item;
|
||||
|
||||
pw_init(&argc, &argv);
|
||||
|
||||
+ while ((c = getopt_long(argc, argv, "hve:d:p:", long_options, NULL)) != -1) {
|
||||
+ switch (c) {
|
||||
+ case 'h':
|
||||
+ show_help(argv[0]);
|
||||
+ return 0;
|
||||
+ case 'v':
|
||||
+ fprintf(stdout, "%s\n"
|
||||
+ "Compiled with libpipewire %s\n"
|
||||
+ "Linked with libpipewire %s\n",
|
||||
+ argv[0],
|
||||
+ pw_get_headers_version(),
|
||||
+ pw_get_library_version());
|
||||
+ return 0;
|
||||
+ case 'e':
|
||||
+ opt_enabled = optarg;
|
||||
+ break;
|
||||
+ case 'd':
|
||||
+ opt_disabled = optarg;
|
||||
+ break;
|
||||
+ case 'p':
|
||||
+ opt_properties = optarg;
|
||||
+ break;
|
||||
+ default:
|
||||
+ return -1;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ impl.this.props = pw_properties_new_string(opt_properties ? opt_properties : "");
|
||||
+ if (impl.this.props == NULL)
|
||||
+ return -1;
|
||||
+
|
||||
+ spa_dict_for_each(item, &impl.this.props->dict) {
|
||||
+ pw_log_info(" '%s' = '%s'", item->key, item->value);
|
||||
+ }
|
||||
+
|
||||
impl.loop = pw_main_loop_new(NULL);
|
||||
if (impl.loop == NULL)
|
||||
return -1;
|
||||
@@ -1735,14 +1832,14 @@ int main(int argc, char *argv[])
|
||||
if ((res = start_policy(&impl)) < 0)
|
||||
goto exit;
|
||||
|
||||
- sm_metadata_start(&impl.this);
|
||||
- sm_alsa_midi_start(&impl.this);
|
||||
- sm_bluez5_monitor_start(&impl.this);
|
||||
- sm_alsa_monitor_start(&impl.this);
|
||||
- sm_v4l2_monitor_start(&impl.this);
|
||||
-
|
||||
- sm_suspend_node_start(&impl.this);
|
||||
- sm_policy_node_start(&impl.this);
|
||||
+ for (i = 0; i < SPA_N_ELEMENTS(modules); i++) {
|
||||
+ const char *name = modules[i].name;
|
||||
+ if (opt_contains(opt_enabled, name) &&
|
||||
+ !opt_contains(opt_disabled, name)) {
|
||||
+ pw_log_info("enable: %s", name);
|
||||
+ modules[i].start(&impl.this);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
// sm_session_manager_start(&impl.this);
|
||||
|
||||
diff --git a/src/examples/media-session/media-session.h b/src/examples/media-session/media-session.h
|
||||
index 06cd5a89..5e639a57 100644
|
||||
--- a/src/examples/media-session/media-session.h
|
||||
+++ b/src/examples/media-session/media-session.h
|
||||
@@ -226,6 +226,8 @@ struct sm_media_session_events {
|
||||
struct sm_media_session {
|
||||
struct sm_session *session; /** session object managed by this session */
|
||||
|
||||
+ struct pw_properties *props;
|
||||
+
|
||||
uint32_t session_id;
|
||||
struct pw_client_session *client_session;
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
24
0002-conf-disable-alsa-pcm-alsa-seq-and-bluez5.patch
Normal file
24
0002-conf-disable-alsa-pcm-alsa-seq-and-bluez5.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From 642368d53f8a9d061bae94673c7f83e5cdfbe3a5 Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Mon, 30 Mar 2020 15:32:04 +0200
|
||||
Subject: [PATCH 2/2] conf: disable alsa-pcm,alsa-seq and bluez5
|
||||
|
||||
Disable alsa and bluetooth handling by default to avoid causing
|
||||
conflicts with pulseaudio.
|
||||
---
|
||||
src/daemon/pipewire.conf.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
|
||||
index 75135420..acf15e22 100644
|
||||
--- a/src/daemon/pipewire.conf.in
|
||||
+++ b/src/daemon/pipewire.conf.in
|
||||
@@ -69,4 +69,4 @@ load-module libpipewire-module-session-manager
|
||||
# Execute the given program. This is usually used to start the
|
||||
# session manager.
|
||||
#
|
||||
-exec pipewire-media-session
|
||||
+exec pipewire-media-session -d alsa-seq,alsa-pcm,bluez5
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
Name: pipewire
|
||||
Summary: Media Sharing Server
|
||||
Version: 0.3.2
|
||||
Release: 1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
|
||||
Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
|
||||
License: MIT
|
||||
URL: https://pipewire.org/
|
||||
%if 0%{?gitrel}
|
||||
@ -27,9 +27,13 @@ Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/p
|
||||
%endif
|
||||
|
||||
## upstream patches
|
||||
Patch0: 0001-media-session-add-getopt-support.patch
|
||||
|
||||
## upstreamable patches
|
||||
|
||||
## fedora patches
|
||||
Patch1: 0002-conf-disable-alsa-pcm-alsa-seq-and-bluez5.patch
|
||||
|
||||
BuildRequires: meson >= 0.35.0
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pkgconfig
|
||||
@ -156,6 +160,9 @@ This package contains the PipeWire spa plugin to connect to a JACK server.
|
||||
%prep
|
||||
%setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
|
||||
|
||||
%patch0 -p1 -b .0000
|
||||
%patch1 -p1 -b .0001
|
||||
|
||||
%build
|
||||
%meson -D docs=true -D man=true -D gstreamer=true -D systemd=true
|
||||
%meson_build
|
||||
@ -248,6 +255,9 @@ exit 0
|
||||
%{_libdir}/spa-%{spaversion}/jack/
|
||||
|
||||
%changelog
|
||||
* Mon Mar 30 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.2-2
|
||||
- Add config to disable alsa and bluez5 handling by default.
|
||||
|
||||
* Thu Mar 26 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.2-1
|
||||
- Update to 0.3.2
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user