brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

workspace: Port to MetaSoundPlayer

Browse Source 
Use MetaSoundPlayer to play workspace switch sounds, instead of using
libcanberra directly.
This commit is contained in:
Carlos Garnacho 2018-12-17 23:38:43 +01:00
parent 8715f7481b
commit ebfc6184b2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/workspace.c
View File

@ -37,7 +37,6 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <string.h> #include <string.h>
#include <canberra-gtk.h>
#include "backends/meta-backend-private.h" #include "backends/meta-backend-private.h"
#include "backends/meta-logical-monitor.h" #include "backends/meta-logical-monitor.h"
@ -439,6 +438,7 @@ static void
workspace_switch_sound(MetaWorkspace *from, workspace_switch_sound(MetaWorkspace *from,
MetaWorkspace *to) MetaWorkspace *to)
{ {
MetaSoundPlayer *player;
MetaWorkspaceLayout layout; MetaWorkspaceLayout layout;
int i, nw, x, y, fi, ti; int i, nw, x, y, fi, ti;
const char *e; const char *e;
@ -486,11 +486,8 @@ workspace_switch_sound(MetaWorkspace *from,
goto finish; goto finish;
} }
ca_context_play(ca_gtk_context_get(), 1, player = meta_display_get_sound_player (from->display);
CA_PROP_EVENT_ID, e, meta_sound_player_play_from_theme (player, e, "Desktop switched", NULL);
CA_PROP_EVENT_DESCRIPTION, "Desktop switched",
CA_PROP_CANBERRA_CACHE_CONTROL, "permanent",
NULL);
finish: finish:
meta_workspace_manager_free_workspace_layout (&layout); meta_workspace_manager_free_workspace_layout (&layout);