diff options
| -rw-r--r-- | include/astal-wp.h | 4 | ||||
| -rw-r--r-- | include/astal/wireplumber/audio.h (renamed from include/wireplumber/audio.h) | 0 | ||||
| -rw-r--r-- | include/astal/wireplumber/endpoint.h (renamed from include/wireplumber/endpoint.h) | 0 | ||||
| -rw-r--r-- | include/astal/wireplumber/meson.build (renamed from include/wireplumber/meson.build) | 0 | ||||
| -rw-r--r-- | include/astal/wireplumber/wp.h (renamed from include/wireplumber/wp.h) | 0 | ||||
| -rw-r--r-- | include/meson.build | 8 | ||||
| -rw-r--r-- | include/wireplumber.h | 4 | ||||
| -rw-r--r-- | src/audio.c | 2 | ||||
| -rw-r--r-- | src/endpoint.c | 6 | ||||
| -rw-r--r-- | src/meson.build | 2 | ||||
| -rw-r--r-- | src/wireplumber.c | 7 |
11 files changed, 12 insertions, 21 deletions
diff --git a/include/astal-wp.h b/include/astal-wp.h new file mode 100644 index 0000000..6c48211 --- /dev/null +++ b/include/astal-wp.h @@ -0,0 +1,4 @@ + +#include "astal/wireplumber/audio.h" +#include "astal/wireplumber/endpoint.h" +#include "astal/wireplumber/wp.h" diff --git a/include/wireplumber/audio.h b/include/astal/wireplumber/audio.h index 5cfa27e..5cfa27e 100644 --- a/include/wireplumber/audio.h +++ b/include/astal/wireplumber/audio.h diff --git a/include/wireplumber/endpoint.h b/include/astal/wireplumber/endpoint.h index 269551b..269551b 100644 --- a/include/wireplumber/endpoint.h +++ b/include/astal/wireplumber/endpoint.h diff --git a/include/wireplumber/meson.build b/include/astal/wireplumber/meson.build index 525b380..525b380 100644 --- a/include/wireplumber/meson.build +++ b/include/astal/wireplumber/meson.build diff --git a/include/wireplumber/wp.h b/include/astal/wireplumber/wp.h index 94e68cc..94e68cc 100644 --- a/include/wireplumber/wp.h +++ b/include/astal/wireplumber/wp.h diff --git a/include/meson.build b/include/meson.build index 46fac69..9d32288 100644 --- a/include/meson.build +++ b/include/meson.build @@ -1,8 +1,8 @@ -astal_wireplumber_inc = include_directories('.', 'wireplumber') +astal_wireplumber_inc = include_directories('.', 'astal/wireplumber') astal_wireplumber_headers = files( - 'wireplumber.h', + 'astal-wp.h', ) -install_headers(astal_wireplumber_headers, subdir : 'astal') +install_headers(astal_wireplumber_headers) -subdir('wireplumber') +subdir('astal/wireplumber') diff --git a/include/wireplumber.h b/include/wireplumber.h deleted file mode 100644 index f8799c1..0000000 --- a/include/wireplumber.h +++ /dev/null @@ -1,4 +0,0 @@ - -#include "wireplumber/audio.h" -#include "wireplumber/endpoint.h" -#include "wireplumber/wp.h" diff --git a/src/audio.c b/src/audio.c index 3782b2e..53224a7 100644 --- a/src/audio.c +++ b/src/audio.c @@ -3,7 +3,7 @@ #include <wp/wp.h> #include "endpoint.h" -#include "wireplumber.h" +#include "wp.h" struct _AstalWpAudio { GObject parent_instance; diff --git a/src/endpoint.c b/src/endpoint.c index 77b3104..7d7a275 100644 --- a/src/endpoint.c +++ b/src/endpoint.c @@ -1,12 +1,6 @@ -#include "endpoint.h" - -#include <limits.h> #include <wp/wp.h> #include "endpoint-private.h" -#include "glib-object.h" -#include "glib.h" -#include "glibconfig.h" #include "wp.h" struct _AstalWpEndpoint { diff --git a/src/meson.build b/src/meson.build index 63415c4..ae56c6f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -46,7 +46,7 @@ if get_option('introspection') symbol_prefix : 'astal_wp', identifier_prefix : 'AstalWp', includes : ['GObject-2.0', 'Gio-2.0'], - header : 'astal/wireplumber.h', + header : 'astal-wp.h', export_packages : pkg_config_name, install : true ) diff --git a/src/wireplumber.c b/src/wireplumber.c index 41ba36c..6bf712a 100644 --- a/src/wireplumber.c +++ b/src/wireplumber.c @@ -2,9 +2,6 @@ #include "audio.h" #include "endpoint-private.h" -#include "endpoint.h" -#include "glib-object.h" -#include "glib.h" #include "wp.h" struct _AstalWpWp { @@ -315,7 +312,7 @@ static void astal_wp_wp_class_init(AstalWpWpClass *class) { astal_wp_wp_properties[ASTAL_WP_WP_PROP_ENDPOINTS] = g_param_spec_pointer("endpoints", "endpoints", "endpoints", G_PARAM_READABLE); /** - * AstalWpAudio:default-speaker: + * AstalWpWp:default-speaker: * * The AstalWndpoint object representing the default speaker */ @@ -323,7 +320,7 @@ static void astal_wp_wp_class_init(AstalWpWpClass *class) { g_param_spec_object("default-speaker", "default-speaker", "default-speaker", ASTAL_WP_TYPE_ENDPOINT, G_PARAM_READABLE); /** - * AstalWpAudio:default-microphone: + * AstalWpWp:default-microphone: * * The AstalWndpoint object representing the default speaker */ |