Dominique Leuenberger
e472742099
Fix event sounds when pulse is disabled... should also go to 12.2 OBS-URL: https://build.opensuse.org/request/show/126954 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=51
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
Index: libcanberra-0.29/src/driver-order.c
|
|
===================================================================
|
|
--- libcanberra-0.29.orig/src/driver-order.c
|
|
+++ libcanberra-0.29/src/driver-order.c
|
|
@@ -30,6 +30,7 @@
|
|
#include "driver-order.h"
|
|
|
|
const char* const ca_driver_order[] = {
|
|
+ "multi",
|
|
#ifdef HAVE_PULSE
|
|
"pulse",
|
|
#endif
|
|
Index: libcanberra-0.29/src/multi.c
|
|
===================================================================
|
|
--- libcanberra-0.29.orig/src/multi.c
|
|
+++ libcanberra-0.29/src/multi.c
|
|
@@ -107,8 +107,7 @@ int driver_open(ca_context *c) {
|
|
int ret = CA_SUCCESS;
|
|
|
|
ca_return_val_if_fail(c, CA_ERROR_INVALID);
|
|
- ca_return_val_if_fail(c->driver, CA_ERROR_NODRIVER);
|
|
- ca_return_val_if_fail(!strncmp(c->driver, "multi", 5), CA_ERROR_NODRIVER);
|
|
+ ca_return_val_if_fail(!c->driver || strncmp(c->driver, "multi", 5) == 0, CA_ERROR_NODRIVER);
|
|
ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE);
|
|
|
|
if (!(c->private = p = ca_new0(struct private, 1)))
|