Commit Graph
13 Commits
Author SHA1 Message Date
Guido Günther c88c6cfff5 fbd-dev-sound: Delay sending ended signal
Remove the feedback and the associated callback data before invoking the
callback (which then triggers FbdFeebackBased:ended) since we otherwise
remove the data from the currently playing sound from the hash table
instead of removing the data from the sound that just finished playing.

Call flow for a repeating sound before:

  on_sound_play_finished_callback()
    data->callback()
      fbd_feedback_get_ended()
        on_fb_ended()
          fbd_feedback_run()
            g_hash_table_insert(..., feedback, data)
            fbd_dev_sound_play()
              gsound_context_play_full() [async]
    g_hash_table_remove (..., data->feedback) <- removes wrong feedback

So (since the feedback is still the same but only the callback data
changes) we end up removing the data from the currently playing sound
from the hash table and any calls to fbd_dev_sound_stop() would fail
to find data and hence not cancel the playing sound.

Call flow for a repeating sound now:

  on_sound_play_finished_callback()
    g_hash_table_remove (..., data->feedback)
    data->callback()
      fbd_feedback_get_ended()
        on_fb_ended()
          fbd_feedback_run()
            g_hash_table_insert(..., feedback, data)
            fbd_dev_sound_play()
              gsound_context_play_full() [async]

So we remove the data of the currently playing sound before adding
the feedback to the hash table again. No ownership is transfered to
the hash table so no cleanusp need to be changed.

Closes: https://source.puri.sm/Librem5/feedbackd/-/issues/46
2021-10-15 15:12:55 +02:00
Guido Günther 05bd9ae0cb fbd-dev-sounce: Name data consistently
We name it `data` elsewhere. Don't call it `object` in one function.
2021-10-15 15:10:31 +02:00
Guido Günther 48c05be29d fbd-dev-sound: Rename cancellable to cancel
The current name is just confusing
2021-10-15 15:10:31 +02:00
Evangelos Ribeiro Tzaras 1ed04e409d fbd-dev-sound: Honour sound theme name for all GNOME based desktops
Phosh recently changed to XDG_CURRENT_DESKTOP=GNOME:Phosh and has since stopped
using the configured theme and instead used the fallback freedesktop theme.

Closes #41
2021-07-23 04:35:21 +02:00
Evangelos Ribeiro Tzaras 63eba5d715 fbd-dev-sound: whitespace 2021-05-04 10:54:46 +02:00
Guido Günther 11aa38baba fbd-dev-sound: Use correct cleanup for hash table
This went unnoticed since the manager forgot to cleanup
this at all (see follow up commit).
2021-04-26 09:34:23 +00:00
Guido Günther 0a5dac1e53 fbd-dev-sound: Don't warn when sound was cancelled
This is not an error per se.
2021-02-05 16:56:24 +01:00
Guido Günther c95009afd1 fbd-dev-sound: Don't leak GError 2021-02-05 16:56:23 +01:00
Martin Bürgmann 4ba2889b90 implement fbd_dev_sound_stop
tracks the FdbFeedbackSounds in a GHashTable in the FdbDevSound
2021-02-04 21:16:39 +01:00
Guido Günther 99e39fba00 sound: Set 'event' media role
This allows pa to cork, duck, etc.
2020-09-30 19:16:25 +02:00
Guido Günther f950cfc3a2 fbd-dev-sound: Be less verbose on missing sound files
This is quite common so don't fill the logs at normal debug levels
but be more specific about what is missing.
2020-07-20 16:19:17 +02:00
Guido Günther 00c363293a Honor sound theme on GNOME
We don't set this for other DEs since they might want to pick
a good default from elsewhere.
2020-05-26 18:39:58 +02:00
Guido Günther 3663b7d149 Initial commit
Signed-off-by: Guido Günther <agx@sigxcpu.org>
2020-02-14 17:40:34 +01:00