summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkotontrion <[email protected]>2024-08-15 10:11:16 +0200
committerkotontrion <[email protected]>2024-08-15 10:11:16 +0200
commite14677c877bb591ed496e60ad37113e1dc41d509 (patch)
tree53601e1a9048e780735d0d45fc00467f7b05f128
parent8f3eca7c0876fc8daf2cbc86bb7b83dd01fc2845 (diff)
add volume-icon
-rw-r--r--README.md30
-rw-r--r--include/astal/wireplumber/endpoint.h4
-rw-r--r--include/astal/wireplumber/wp.h9
-rw-r--r--include/private/endpoint-private.h1
-rw-r--r--src/endpoint.c16
5 files changed, 55 insertions, 5 deletions
diff --git a/README.md b/README.md
index fb051ba..cfbb6db 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,34 @@
# astal-wireplumber
+A libwireplumber wrapper.
+
+## Build from source
+### Dependencies
+
+- meson
+- libwireplumber
+- glib
+- gobject-introspection
+- vala (only required for the vapi option)
+
+### Meson options
+
+* `-Dintrospection` (default: `true`): build GObject Introspection data (needed for language bindings)
+* `-Dvapi` (default: `true`): build VAPI data (required to make this lib usable in vala). Requires `-Dintrospection=true`
+
+### build instructions
+
+```sh
+# Clone the repository
+git clone https://github.com/astal-sh/wireplumber
+cd wireplumber
+
+# Setup and build
+meson setup build
+meson compile -C build
+
+# Install
+meson install -C build
+```
diff --git a/include/astal/wireplumber/endpoint.h b/include/astal/wireplumber/endpoint.h
index e2e4065..6ae8b94 100644
--- a/include/astal/wireplumber/endpoint.h
+++ b/include/astal/wireplumber/endpoint.h
@@ -22,19 +22,19 @@ typedef enum {
ASTAL_WP_MEDIA_CLASS_VIDEO_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);
+void astal_wp_endpoint_set_is_default(AstalWpEndpoint *self, gboolean is_default);
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);
const gchar *astal_wp_endpoint_get_name(AstalWpEndpoint *self);
const gchar *astal_wp_endpoint_get_icon(AstalWpEndpoint *self);
+const gchar *astal_wp_endpoint_get_volume_icon(AstalWpEndpoint *self);
G_END_DECLS
diff --git a/include/astal/wireplumber/wp.h b/include/astal/wireplumber/wp.h
index 3b4b5e5..d054bee 100644
--- a/include/astal/wireplumber/wp.h
+++ b/include/astal/wireplumber/wp.h
@@ -6,6 +6,7 @@
#include "audio.h"
#include "device.h"
#include "endpoint.h"
+#include "video.h"
G_BEGIN_DECLS
@@ -17,13 +18,17 @@ AstalWpWp* astal_wp_wp_get_default();
AstalWpWp* astal_wp_get_default_wp();
AstalWpAudio* astal_wp_wp_get_audio();
+AstalWpVideo* astal_wp_wp_get_video();
+
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);
+
AstalWpDevice* astal_wp_wp_get_device(AstalWpWp* self, guint id);
GList* astal_wp_wp_get_devices(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/private/endpoint-private.h b/include/private/endpoint-private.h
index 765f4b8..171df3b 100644
--- a/include/private/endpoint-private.h
+++ b/include/private/endpoint-private.h
@@ -12,6 +12,7 @@ AstalWpEndpoint *astal_wp_endpoint_create(WpNode *node, WpPlugin *mixer, WpPlugi
AstalWpEndpoint *astal_wp_endpoint_init_as_default(AstalWpEndpoint *self, WpPlugin *mixer,
WpPlugin *defaults, AstalWpMediaClass type);
void astal_wp_endpoint_update_default(AstalWpEndpoint *self, gboolean is_default);
+void astal_wp_endpoint_update_volume(AstalWpEndpoint *self);
G_END_DECLS
diff --git a/src/endpoint.c b/src/endpoint.c
index e479d5b..4a11b9f 100644
--- a/src/endpoint.c
+++ b/src/endpoint.c
@@ -54,6 +54,7 @@ typedef enum {
ASTAL_WP_ENDPOINT_PROP_MEDIA_CLASS,
ASTAL_WP_ENDPOINT_PROP_DEFAULT,
ASTAL_WP_ENDPOINT_PROP_ICON,
+ ASTAL_WP_ENDPOINT_PROP_VOLUME_ICON,
ASTAL_WP_ENDPOINT_N_PROPERTIES,
} AstalWpEndpointProperties;
@@ -93,6 +94,7 @@ void astal_wp_endpoint_update_volume(AstalWpEndpoint *self) {
g_object_notify(G_OBJECT(self), "volume");
}
+ g_object_notify(G_OBJECT(self), "volume-icon");
g_signal_emit_by_name(self, "changed");
}
@@ -145,6 +147,13 @@ void astal_wp_endpoint_set_is_default(AstalWpEndpoint *self, gboolean is_default
&ret);
}
+const gchar *astal_wp_endpoint_get_volume_icon(AstalWpEndpoint *self) {
+ if (self->mute) return "audio-volume-muted-symbolic";
+ if (self->volume < 0.33) return "audio-volume-low-symbolic";
+ if (self->volume < 0.66) return "audio-volume-medium-symbolic";
+ return "audio-volume-high-symbolic";
+}
+
static void astal_wp_endpoint_get_property(GObject *object, guint property_id, GValue *value,
GParamSpec *pspec) {
AstalWpEndpoint *self = ASTAL_WP_ENDPOINT(object);
@@ -168,6 +177,9 @@ static void astal_wp_endpoint_get_property(GObject *object, guint property_id, G
case ASTAL_WP_ENDPOINT_PROP_ICON:
g_value_set_string(value, self->icon);
break;
+ case ASTAL_WP_ENDPOINT_PROP_VOLUME_ICON:
+ g_value_set_string(value, astal_wp_endpoint_get_volume_icon(self));
+ break;
case ASTAL_WP_ENDPOINT_PROP_MEDIA_CLASS:
g_value_set_enum(value, self->type);
break;
@@ -401,7 +413,7 @@ static void astal_wp_endpoint_class_init(AstalWpEndpointClass *class) {
astal_wp_endpoint_properties[ASTAL_WP_ENDPOINT_PROP_ID] =
g_param_spec_uint("id", "id", "id", 0, UINT_MAX, 0, G_PARAM_READABLE);
astal_wp_endpoint_properties[ASTAL_WP_ENDPOINT_PROP_VOLUME] =
- g_param_spec_double("volume", "volume", "volume", 0, 1, 0, G_PARAM_READWRITE);
+ g_param_spec_double("volume", "volume", "volume", 0, G_MAXFLOAT, 0, G_PARAM_READWRITE);
astal_wp_endpoint_properties[ASTAL_WP_ENDPOINT_PROP_MUTE] =
g_param_spec_boolean("mute", "mute", "mute", TRUE, G_PARAM_READWRITE);
astal_wp_endpoint_properties[ASTAL_WP_ENDPOINT_PROP_DESCRIPTION] =
@@ -410,6 +422,8 @@ static void astal_wp_endpoint_class_init(AstalWpEndpointClass *class) {
g_param_spec_string("name", "name", "name", NULL, G_PARAM_READABLE);
astal_wp_endpoint_properties[ASTAL_WP_ENDPOINT_PROP_ICON] = g_param_spec_string(
"icon", "icon", "icon", "audio-card-symbolic", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+ astal_wp_endpoint_properties[ASTAL_WP_ENDPOINT_PROP_VOLUME_ICON] = g_param_spec_string(
+ "volume-icon", "volume-icon", "volume-icon", "audio-volume-muted", G_PARAM_READABLE);
/**
* AstalWpEndpoint:media-class: (type AstalWpMediaClass)
*