Rename sound files with -fr suffix for French tones

Add country suffix to sound filenames to clarify the tone standard
in use. Remove the unsuffixed and North American variants.

data/meson.build

@@ -110,3 +110,10 @@ if compile_schemas.found()
     args: ['--strict', '--dry-run', meson.current_source_dir()],
   )
 endif
+
+# Sounds (fallback for systems without telephony events in sound theme)
+install_data(
+  'sounds/phone-outgoing-calling-fr.oga',
+  'sounds/phone-outgoing-busy-fr.oga',
+  install_dir: join_paths(datadir, calls_name, 'sounds'),
+)

meson.build

@@ -78,6 +78,8 @@ config_data.set_quoted('APP_DATA_NAME', calls_name)
 config_data.set_quoted('GETTEXT_PACKAGE', calls_name)
 config_data.set_quoted('LOCALEDIR', full_localedir)
 config_data.set_quoted('PLUGIN_LIBDIR', full_calls_plugin_libdir)
+config_data.set_quoted('CALLS_SOUNDS_DIR',
+  join_paths(prefix, get_option('datadir'), calls_name, 'sounds'))
 config_data.set_quoted('PACKAGE_URL', calls_homepage)
 config_data.set_quoted('PACKAGE_VERSION', calls_version)
 config_data.set('PACKAGE_URL_RAW', calls_homepage)

src/calls-media-playback.c

@@ -26,6 +26,8 @@
 
 #include "calls-media-playback.h"
 
+#include "calls-config.h"
+
 #include <gsound.h>
 
 
@@ -96,6 +98,23 @@ playback_event_to_string (PlaybackEvent event)
   }
 }
 
+
+static const char *
+playback_event_to_filename (PlaybackEvent event)
+{
+  switch (event) {
+  case PLAYBACK_CALLING:
+    return CALLS_SOUNDS_DIR "/phone-outgoing-calling-fr.oga";
+
+  case PLAYBACK_BUSY:
+    return CALLS_SOUNDS_DIR "/phone-outgoing-busy-fr.oga";
+
+  case PLAYBACK_LAST:
+  default:
+    return NULL;
+  }
+}
+
 static void
 calls_media_playback_dispose (GObject *object)
 {
@@ -156,6 +175,18 @@ on_playing_done (GObject      *object,
       g_warning ("Playing '%s' failed: %s",
                  playback_event_to_string (data->event),
                  error->message);
+
+    switch (data->event) {
+    case PLAYBACK_CALLING:
+      data->self->data_calling = NULL;
+      break;
+    case PLAYBACK_BUSY:
+      data->self->data_busy = NULL;
+      break;
+    case PLAYBACK_LAST:
+    default:
+      break;
+    }
   } else {
     if (g_timer_elapsed (data->timer, NULL) < data->min_playback_time) {
       playback_data (g_steal_pointer (&data));
@@ -182,11 +213,13 @@ static void
 playback_data (MediaPlaybackData *data)
 {
   const char *event_id;
+  const char *filename;
 
   g_assert (CALLS_IS_MEDIA_PLAYBACK (data->self));
   g_assert (data->self->context);
 
   event_id = playback_event_to_string (data->event);
+  filename = playback_event_to_filename (data->event);
 
   if (!event_id) {
     g_warning ("No event id found for %d", data->event);
@@ -201,6 +234,7 @@ playback_data (MediaPlaybackData *data)
                             data,
                             GSOUND_ATTR_CANBERRA_CACHE_CONTROL, "volatile",
                             GSOUND_ATTR_EVENT_ID, event_id,
+                            GSOUND_ATTR_MEDIA_FILENAME, filename,
                             NULL);
 }