From bff82ef14b8abb289a557dc67dd67253e69ecf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 26 Jan 2025 13:55:05 +0100 Subject: [PATCH] fbd-feedback-sound: Allow to set file name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will be preferred over "effect" when set. Signed-off-by: Guido Günther --- src/fbd-feedback-sound.c | 33 +++++++++++++++++++++++++++++++-- src/fbd-feedback-sound.h | 4 +++- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/fbd-feedback-sound.c b/src/fbd-feedback-sound.c index e362245..8d26184 100644 --- a/src/fbd-feedback-sound.c +++ b/src/fbd-feedback-sound.c @@ -23,6 +23,7 @@ enum { PROP_0, PROP_EFFECT, + PROP_FILE_NAME, PROP_LAST_PROP, }; static GParamSpec *props[PROP_LAST_PROP]; @@ -30,7 +31,8 @@ static GParamSpec *props[PROP_LAST_PROP]; typedef struct _FbdFeedbackSound { FbdFeedbackBase parent; - gchar *effect; + char *effect; + char *file_name; } FbdFeedbackSound; G_DEFINE_TYPE (FbdFeedbackSound, fbd_feedback_sound, FBD_TYPE_FEEDBACK_BASE); @@ -86,6 +88,9 @@ fbd_feedback_sound_set_property (GObject *object, case PROP_EFFECT: self->effect = g_value_dup_string (value); break; + case PROP_FILE_NAME: + self->file_name = g_value_dup_string (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -104,6 +109,9 @@ fbd_feedback_sound_get_property (GObject *object, case PROP_EFFECT: g_value_set_string (value, fbd_feedback_sound_get_effect (self)); break; + case PROP_FILE_NAME: + g_value_set_string (value, fbd_feedback_sound_get_file_name (self)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -116,6 +124,7 @@ fbd_feedback_sound_finalize (GObject *object) FbdFeedbackSound *self = FBD_FEEDBACK_SOUND (object); g_clear_pointer (&self->effect, g_free); + g_clear_pointer (&self->file_name, g_free); G_OBJECT_CLASS (fbd_feedback_sound_parent_class)->finalize (object); } @@ -142,6 +151,11 @@ fbd_feedback_sound_class_init (FbdFeedbackSoundClass *klass) "", G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + props[PROP_FILE_NAME] = + g_param_spec_string ("file-name", "", "", + NULL, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + g_object_class_install_properties (object_class, PROP_LAST_PROP, props); } @@ -150,7 +164,22 @@ fbd_feedback_sound_init (FbdFeedbackSound *self) { } -const char *fbd_feedback_sound_get_effect (FbdFeedbackSound *self) + +FbdFeedbackSound * +fbd_feedback_sound_new_from_file_name (const char *filename) +{ + return g_object_new (FBD_TYPE_FEEDBACK_SOUND, "file-name", filename, NULL); +} + + +const char * +fbd_feedback_sound_get_effect (FbdFeedbackSound *self) { return self->effect; } + +const char * +fbd_feedback_sound_get_file_name (FbdFeedbackSound *self) +{ + return self->file_name; +} diff --git a/src/fbd-feedback-sound.h b/src/fbd-feedback-sound.h index 1df9c2e..c713c05 100644 --- a/src/fbd-feedback-sound.h +++ b/src/fbd-feedback-sound.h @@ -13,6 +13,8 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (FbdFeedbackSound, fbd_feedback_sound, FBD, FEEDBACK_SOUND, FbdFeedbackBase); -const char *fbd_feedback_sound_get_effect (FbdFeedbackSound *self); +FbdFeedbackSound *fbd_feedback_sound_new_from_file_name (const char *filename); +const char *fbd_feedback_sound_get_effect (FbdFeedbackSound *self); +const char *fbd_feedback_sound_get_file_name (FbdFeedbackSound *self); G_END_DECLS