build: Make libcanberra no longer optional

This is not the case anymore with MetaSoundPlayer in place, and also
important to get keyboard bell right.
This commit is contained in:
Carlos Garnacho
2018-12-17 23:52:03 +01:00
parent 58b5dee869
commit 956ab4bd58
8 changed files with 7 additions and 57 deletions

View File

@ -51,9 +51,7 @@
#include "core/bell.h"
#ifdef HAVE_LIBCANBERRA
#include <canberra-gtk.h>
#endif
#include "compositor/compositor-private.h"
#include "core/util-private.h"
@ -248,7 +246,6 @@ static gboolean
bell_audible_notify (MetaDisplay *display,
MetaWindow *window)
{
#ifdef HAVE_LIBCANBERRA
ca_proplist *p;
int res;
@ -270,9 +267,6 @@ bell_audible_notify (MetaDisplay *display,
ca_proplist_destroy (p);
return res == CA_SUCCESS || res == CA_ERROR_DISABLED;
#endif /* HAVE_LIBCANBERRA */
return FALSE;
}
gboolean

View File

@ -37,9 +37,7 @@
#include <X11/Xatom.h>
#include <string.h>
#ifdef HAVE_LIBCANBERRA
#include <canberra-gtk.h>
#endif
#include "backends/meta-backend-private.h"
#include "backends/meta-logical-monitor.h"
@ -441,7 +439,6 @@ static void
workspace_switch_sound(MetaWorkspace *from,
MetaWorkspace *to)
{
#ifdef HAVE_LIBCANBERRA
MetaWorkspaceLayout layout;
int i, nw, x, y, fi, ti;
const char *e;
@ -497,7 +494,6 @@ workspace_switch_sound(MetaWorkspace *from,
finish:
meta_workspace_manager_free_workspace_layout (&layout);
#endif /* HAVE_LIBCANBERRA */
}
/**