From 86bff65898178fe6e58e8d02c9b6e588003621bc Mon Sep 17 00:00:00 2001 From: kotontrion Date: Fri, 19 Jul 2024 10:13:44 +0200 Subject: move headers to the correct location --- include/astal-wp.h | 4 ++++ include/astal/wireplumber/audio.h | 33 +++++++++++++++++++++++++++++++++ include/astal/wireplumber/endpoint.h | 35 +++++++++++++++++++++++++++++++++++ include/astal/wireplumber/meson.build | 7 +++++++ include/astal/wireplumber/wp.h | 26 ++++++++++++++++++++++++++ include/meson.build | 8 ++++---- include/wireplumber.h | 4 ---- include/wireplumber/audio.h | 33 --------------------------------- include/wireplumber/endpoint.h | 35 ----------------------------------- include/wireplumber/meson.build | 7 ------- include/wireplumber/wp.h | 26 -------------------------- 11 files changed, 109 insertions(+), 109 deletions(-) create mode 100644 include/astal-wp.h create mode 100644 include/astal/wireplumber/audio.h create mode 100644 include/astal/wireplumber/endpoint.h create mode 100644 include/astal/wireplumber/meson.build create mode 100644 include/astal/wireplumber/wp.h delete mode 100644 include/wireplumber.h delete mode 100644 include/wireplumber/audio.h delete mode 100644 include/wireplumber/endpoint.h delete mode 100644 include/wireplumber/meson.build delete mode 100644 include/wireplumber/wp.h (limited to 'include') 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/astal/wireplumber/audio.h b/include/astal/wireplumber/audio.h new file mode 100644 index 0000000..5cfa27e --- /dev/null +++ b/include/astal/wireplumber/audio.h @@ -0,0 +1,33 @@ +#ifndef ASTAL_WIREPLUMBER_AUDIO_H +#define ASTAL_WIREPLUMBER_AUDIO_H + +#include + +#include "endpoint.h" + +G_BEGIN_DECLS + +#define ASTAL_WP_TYPE_AUDIO (astal_wp_audio_get_type()) + +G_DECLARE_FINAL_TYPE(AstalWpAudio, astal_wp_audio, ASTAL_WP, AUDIO, GObject) + +AstalWpEndpoint *astal_wp_audio_get_speaker(AstalWpAudio *self, guint id); +AstalWpEndpoint *astal_wp_audio_get_microphone(AstalWpAudio *self, guint id); +AstalWpEndpoint *astal_wp_audio_get_recorder(AstalWpAudio *self, guint id); +AstalWpEndpoint *astal_wp_audio_get_stream(AstalWpAudio *self, guint id); +AstalWpEndpoint *astal_wp_audio_get_endpoint(AstalWpAudio *self, guint id); + +AstalWpEndpoint *astal_wp_audio_get_default_speaker(AstalWpAudio *self); +AstalWpEndpoint *astal_wp_audio_get_default_microphone(AstalWpAudio *self); + +GList *astal_wp_audio_get_microphones(AstalWpAudio *self); +GList *astal_wp_audio_get_speakers(AstalWpAudio *self); +GList *astal_wp_audio_get_recorders(AstalWpAudio *self); +GList *astal_wp_audio_get_streams(AstalWpAudio *self); + +AstalWpAudio *astal_wp_audio_get_default(); +AstalWpAudio *astal_wp_get_default_audio(); + +G_END_DECLS + +#endif // !ASTAL_WIREPLUMBER_AUDIO_H diff --git a/include/astal/wireplumber/endpoint.h b/include/astal/wireplumber/endpoint.h new file mode 100644 index 0000000..269551b --- /dev/null +++ b/include/astal/wireplumber/endpoint.h @@ -0,0 +1,35 @@ +#ifndef ASTAL_WP_ENDPOINT_H +#define ASTAL_WP_ENDPOINT_H + +#include + +G_BEGIN_DECLS + +#define ASTAL_WP_TYPE_ENDPOINT (astal_wp_endpoint_get_type()) + +G_DECLARE_FINAL_TYPE(AstalWpEndpoint, astal_wp_endpoint, ASTAL_WP, ENDPOINT, GObject) + +#define ASTAL_WP_TYPE_MEDIA_CLASS (astal_wp_media_class_get_type()) + +typedef enum { + ASTAL_WP_MEDIA_CLASS_AUDIO_MICROPHONE, + ASTAL_WP_MEDIA_CLASS_AUDIO_SPEAKER, + ASTAL_WP_MEDIA_CLASS_AUDIO_RECORDER, + ASTAL_WP_MEDIA_CLASS_AUDIO_STREAM, +} AstalWpMediaClass; + +void astal_wp_endpoint_update_volume(AstalWpEndpoint *self); +void astal_wp_endpoint_set_volume(AstalWpEndpoint *self, gdouble volume); +void astal_wp_endpoint_set_mute(AstalWpEndpoint *self, gboolean mute); +gboolean astal_wp_endpoint_get_is_default(AstalWpEndpoint *self); + +AstalWpMediaClass astal_wp_endpoint_get_media_class(AstalWpEndpoint *self); +guint astal_wp_endpoint_get_id(AstalWpEndpoint *self); +gboolean astal_wp_endpoint_get_mute(AstalWpEndpoint *self); +gdouble astal_wp_endpoint_get_volume(AstalWpEndpoint *self); +const gchar *astal_wp_endpoint_get_description(AstalWpEndpoint *self); +void astal_wp_endpoint_set_is_default(AstalWpEndpoint *self, gboolean is_default); + +G_END_DECLS + +#endif // !ASTAL_WP_ENDPOINT_H diff --git a/include/astal/wireplumber/meson.build b/include/astal/wireplumber/meson.build new file mode 100644 index 0000000..525b380 --- /dev/null +++ b/include/astal/wireplumber/meson.build @@ -0,0 +1,7 @@ +astal_wireplumber_subheaders = files( + 'wp.h', + 'endpoint.h', + 'audio.h', +) + +install_headers(astal_wireplumber_subheaders, subdir : 'astal/wireplumber') diff --git a/include/astal/wireplumber/wp.h b/include/astal/wireplumber/wp.h new file mode 100644 index 0000000..94e68cc --- /dev/null +++ b/include/astal/wireplumber/wp.h @@ -0,0 +1,26 @@ +#ifndef ASTAL_WIREPLUMBER_H +#define ASTAL_WIREPLUMBER_H + +#include + +#include "audio.h" +#include "endpoint.h" + +G_BEGIN_DECLS + +#define ASTAL_WP_TYPE_WP (astal_wp_wp_get_type()) + +G_DECLARE_FINAL_TYPE(AstalWpWp, astal_wp_wp, ASTAL_WP, WP, GObject) + +AstalWpWp* astal_wp_wp_get_default(); +AstalWpWp* astal_wp_get_default_wp(); + +AstalWpAudio* astal_wp_wp_get_audio(); +AstalWpEndpoint* astal_wp_wp_get_endpoint(AstalWpWp* self, guint id); +GList* astal_wp_wp_get_endpoints(AstalWpWp* self); +AstalWpEndpoint* astal_wp_wp_get_default_speaker(AstalWpWp* self); +AstalWpEndpoint* astal_wp_wp_get_default_microphone(AstalWpWp* self); + +G_END_DECLS + +#endif // !ASTAL_WIREPLUMBER_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/include/wireplumber/audio.h b/include/wireplumber/audio.h deleted file mode 100644 index 5cfa27e..0000000 --- a/include/wireplumber/audio.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef ASTAL_WIREPLUMBER_AUDIO_H -#define ASTAL_WIREPLUMBER_AUDIO_H - -#include - -#include "endpoint.h" - -G_BEGIN_DECLS - -#define ASTAL_WP_TYPE_AUDIO (astal_wp_audio_get_type()) - -G_DECLARE_FINAL_TYPE(AstalWpAudio, astal_wp_audio, ASTAL_WP, AUDIO, GObject) - -AstalWpEndpoint *astal_wp_audio_get_speaker(AstalWpAudio *self, guint id); -AstalWpEndpoint *astal_wp_audio_get_microphone(AstalWpAudio *self, guint id); -AstalWpEndpoint *astal_wp_audio_get_recorder(AstalWpAudio *self, guint id); -AstalWpEndpoint *astal_wp_audio_get_stream(AstalWpAudio *self, guint id); -AstalWpEndpoint *astal_wp_audio_get_endpoint(AstalWpAudio *self, guint id); - -AstalWpEndpoint *astal_wp_audio_get_default_speaker(AstalWpAudio *self); -AstalWpEndpoint *astal_wp_audio_get_default_microphone(AstalWpAudio *self); - -GList *astal_wp_audio_get_microphones(AstalWpAudio *self); -GList *astal_wp_audio_get_speakers(AstalWpAudio *self); -GList *astal_wp_audio_get_recorders(AstalWpAudio *self); -GList *astal_wp_audio_get_streams(AstalWpAudio *self); - -AstalWpAudio *astal_wp_audio_get_default(); -AstalWpAudio *astal_wp_get_default_audio(); - -G_END_DECLS - -#endif // !ASTAL_WIREPLUMBER_AUDIO_H diff --git a/include/wireplumber/endpoint.h b/include/wireplumber/endpoint.h deleted file mode 100644 index 269551b..0000000 --- a/include/wireplumber/endpoint.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef ASTAL_WP_ENDPOINT_H -#define ASTAL_WP_ENDPOINT_H - -#include - -G_BEGIN_DECLS - -#define ASTAL_WP_TYPE_ENDPOINT (astal_wp_endpoint_get_type()) - -G_DECLARE_FINAL_TYPE(AstalWpEndpoint, astal_wp_endpoint, ASTAL_WP, ENDPOINT, GObject) - -#define ASTAL_WP_TYPE_MEDIA_CLASS (astal_wp_media_class_get_type()) - -typedef enum { - ASTAL_WP_MEDIA_CLASS_AUDIO_MICROPHONE, - ASTAL_WP_MEDIA_CLASS_AUDIO_SPEAKER, - ASTAL_WP_MEDIA_CLASS_AUDIO_RECORDER, - ASTAL_WP_MEDIA_CLASS_AUDIO_STREAM, -} AstalWpMediaClass; - -void astal_wp_endpoint_update_volume(AstalWpEndpoint *self); -void astal_wp_endpoint_set_volume(AstalWpEndpoint *self, gdouble volume); -void astal_wp_endpoint_set_mute(AstalWpEndpoint *self, gboolean mute); -gboolean astal_wp_endpoint_get_is_default(AstalWpEndpoint *self); - -AstalWpMediaClass astal_wp_endpoint_get_media_class(AstalWpEndpoint *self); -guint astal_wp_endpoint_get_id(AstalWpEndpoint *self); -gboolean astal_wp_endpoint_get_mute(AstalWpEndpoint *self); -gdouble astal_wp_endpoint_get_volume(AstalWpEndpoint *self); -const gchar *astal_wp_endpoint_get_description(AstalWpEndpoint *self); -void astal_wp_endpoint_set_is_default(AstalWpEndpoint *self, gboolean is_default); - -G_END_DECLS - -#endif // !ASTAL_WP_ENDPOINT_H diff --git a/include/wireplumber/meson.build b/include/wireplumber/meson.build deleted file mode 100644 index 525b380..0000000 --- a/include/wireplumber/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -astal_wireplumber_subheaders = files( - 'wp.h', - 'endpoint.h', - 'audio.h', -) - -install_headers(astal_wireplumber_subheaders, subdir : 'astal/wireplumber') diff --git a/include/wireplumber/wp.h b/include/wireplumber/wp.h deleted file mode 100644 index 94e68cc..0000000 --- a/include/wireplumber/wp.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef ASTAL_WIREPLUMBER_H -#define ASTAL_WIREPLUMBER_H - -#include - -#include "audio.h" -#include "endpoint.h" - -G_BEGIN_DECLS - -#define ASTAL_WP_TYPE_WP (astal_wp_wp_get_type()) - -G_DECLARE_FINAL_TYPE(AstalWpWp, astal_wp_wp, ASTAL_WP, WP, GObject) - -AstalWpWp* astal_wp_wp_get_default(); -AstalWpWp* astal_wp_get_default_wp(); - -AstalWpAudio* astal_wp_wp_get_audio(); -AstalWpEndpoint* astal_wp_wp_get_endpoint(AstalWpWp* self, guint id); -GList* astal_wp_wp_get_endpoints(AstalWpWp* self); -AstalWpEndpoint* astal_wp_wp_get_default_speaker(AstalWpWp* self); -AstalWpEndpoint* astal_wp_wp_get_default_microphone(AstalWpWp* self); - -G_END_DECLS - -#endif // !ASTAL_WIREPLUMBER_H -- cgit v1.2.3