Merge branch 'virbra-fix' into 'main'

vibra-pattern: Don't overwrite magnitudes

See merge request agx/feedbackd!177

src/fbd-feedback-vibra-pattern.c

@@ -184,29 +184,29 @@ do_pattern_step (FbdFeedbackVibraPattern *self)
 {
   FbdFeedbackManager *manager = fbd_feedback_manager_get_default ();
   FbdDevVibra *dev = fbd_feedback_manager_get_dev_vibra (manager);
-  double *magnitude;
+  double magnitude;
-  guint *duration;
+  guint duration;
 
-  magnitude = &g_array_index (self->magnitudes, double, self->pos);
+  magnitude = g_array_index (self->magnitudes, double, self->pos);
-  duration = &g_array_index (self->durations, guint, self->pos);
+  duration = g_array_index (self->durations, guint, self->pos);
 
   g_debug ("step: pos: %d/%d, magn: %f, timeout %u",
            self->pos,
            self->durations->len,
-           *magnitude,
+           magnitude,
-           *duration);
+           duration);
 
-  /* Removing any pending effect */
+  /* Remove any pending effect */
   fbd_dev_vibra_remove_effect (dev);
 
-  if (*magnitude != 0.0) {
+  if (magnitude != 0.0) {
     double max_strength = fbd_feedback_vibra_get_max_strength (FBD_FEEDBACK_VIBRA (self));
 
-    *magnitude = MIN (*magnitude, max_strength);
+    magnitude = MIN (magnitude, max_strength);
-    fbd_dev_vibra_rumble (dev, *magnitude, *duration, TRUE);
+    fbd_dev_vibra_rumble (dev, magnitude, duration, TRUE);
   }
 
-  self->timer_id = g_timeout_add_once (*duration,
+  self->timer_id = g_timeout_add_once (duration,
                                        on_timer_expired,
                                        self);
   g_source_set_name_by_id (self->timer_id, "feedback-vibra-pattern-timer");

src/fbd-feedback-vibra.c

@@ -1,6 +1,9 @@
 /*
  * Copyright (C) 2020 Purism SPC
+ *               2024-2025 The Phosh Developers
+ *
  * SPDX-License-Identifier: GPL-3.0+
+ *
  * Author: Guido Günther <agx@sigxcpu.org>
  */
 
@@ -94,7 +97,7 @@ fbd_feedback_vibra_end (FbdFeedbackBase *base)
   g_return_if_fail (klass->end_vibra);
   klass->end_vibra (self);
   g_clear_handle_id (&priv->timer_id, g_source_remove);
-  fbd_feedback_base_done (FBD_FEEDBACK_BASE(self));
+  fbd_feedback_base_done (FBD_FEEDBACK_BASE (self));
 }