elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-24 17:53:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

add support for 'sound' capability

Browse Source
This commit is contained in:
Tom Beckmann 2014-07-21 17:45:32 +02:00
parent 87ab6ea9df
commit 539bad0118
3 changed files with 142 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -164,6 +164,20 @@ if test "x$have_mutter314" = "xyes" ; then
MUTTER_API="3.14"
fi
# -----------------------------------------------------------
# Dependencies for Notifications plugin
# -----------------------------------------------------------
NOTIFICATION_PLUGIN_PKGS="libcanberra \
libcanberra-gtk"
NOTIFICATION_PLUGIN_VALA_PKGS="--pkg libcanberra \
--pkg libcanberra-gtk"
PKG_CHECK_MODULES(NOTIFICAION_PLUGIN, $NOTIFICATION_PLUGIN_PKGS)
AC_SUBST([NOTIFICATION_PLUGIN_VALA_PKGS])
# -----------------------------------------------------------
# Addional configure flags
# -----------------------------------------------------------

4
plugins/notify/Makefile.am
View File

@ -14,11 +14,13 @@ libgala_notify_ladir = $(pkglibdir)/plugins
libgala_notify_la_LDFLAGS = \
$(PLUGIN_LDFLAGS) \
$(GALA_CORE_LDFLAGS) \
$(NOTIFICATION_PLUGIN_LDFLAGS) \
$(top_builddir)/lib/libgala.la \
$(NULL)
libgala_notify_la_CFLAGS = \
$(GALA_CORE_CFLAGS) \
$(NOTIFICATION_PLUGIN_CFLAGS) \
-include config.h \
-w \
-I$(top_builddir)/lib \
@ -26,6 +28,7 @@ libgala_notify_la_CFLAGS = \
libgala_notify_la_VALAFLAGS = \
$(GALA_CORE_VALAFLAGS) \
$(NOTIFICATION_PLUGIN_VALA_PKGS) \
$(top_builddir)/lib/gala.vapi \
--vapidir $(VAPIDIR) \
$(VAPIDIR)/config.vapi \
@ -33,6 +36,7 @@ libgala_notify_la_VALAFLAGS = \
libgala_notify_la_LIBADD = \
$(GALA_CORE_LIBS) \
$(NOTIFICATION_PLUGIN_LIBS) \
$(NULL)
libgala_notify_la_VALASOURCES = \

126
plugins/notify/NotifyServer.vala
View File

@ -55,6 +55,8 @@ namespace Gala.Plugins.Notify
[DBus (visible = false)]
public NotificationStack stack { get; construct; }
[DBus (visible = false)]
public unowned Canberra.Context? ca_context { get; construct; }
uint32 id_counter = 0;
@ -62,7 +64,7 @@ namespace Gala.Plugins.Notify
public NotifyServer (NotificationStack stack)
{
Object (stack: stack);
Object (stack: stack, ca_context: CanberraGtk.context_get ());
}
construct
@ -73,6 +75,14 @@ namespace Gala.Plugins.Notify
warning (e.message);
bus_proxy = null;
}
var locale = Intl.setlocale (LocaleCategory.MESSAGES, null);
ca_context.change_props (Canberra.PROP_APPLICATION_NAME, "Gala",
Canberra.PROP_APPLICATION_ID, "org.pantheon.gala",
Canberra.PROP_APPLICATION_NAME, "start-here",
Canberra.PROP_APPLICATION_LANGUAGE, locale,
null);
ca_context.open ();
}
public string [] get_capabilities ()
@ -80,6 +90,7 @@ namespace Gala.Plugins.Notify
return {
"body",
"body-markup",
"sound",
"x-canonical-private-synchronous",
"x-canonical-private-icon-only"
};
@ -144,6 +155,8 @@ namespace Gala.Plugins.Notify
pid = bus_proxy.get_connection_unix_process_id (sender);
} catch (Error e) { warning (e.message); }
handle_sounds (hints);
foreach (var child in stack.get_children ()) {
unowned Notification notification = (Notification) child;
@ -307,7 +320,116 @@ namespace Gala.Plugins.Notify
var pixbuf = new Gdk.Pixbuf.with_unowned_data (pixel_data, Gdk.Colorspace.RGB, has_alpha, bits_per_sample, width, height, rowstride, null);
return pixbuf.scale_simple (size, size, Gdk.InterpType.BILINEAR);
}
}
void handle_sounds (HashTable<string,Variant> hints)
{
if (ca_context == null
|| ("suppress-sound" in hints
&& hints.lookup ("supress-sound").get_boolean ()))
return;
Canberra.Proplist props;
Canberra.Proplist.create (out props);
props.sets (Canberra.PROP_CANBERRA_CACHE_CONTROL, "volatile");
bool play_sound = false;
if ("x-canonical-private-synchronous" in hints) {
var confirmation_type = hints.lookup ("x-canonical-private-synchronous").get_string ();
// FIXME (or better GSD or something). Sound change confirmation notifications emit
// a sound by themselves, but don't send suppress-sound, which is bad because
// we get two sounds playing.
if (confirmation_type == "volume")
return;
// the indicator on the other hand won't emit a sound at all, even though for
// consistency it should.
if (confirmation_type == "indicator-sound") {
props.sets (Canberra.PROP_EVENT_ID, "audio-volume-change");
play_sound = true;
}
}
if ("sound-name" in hints) {
var sound_name = hints.lookup ("sound-name").get_string ();
props.sets (Canberra.PROP_EVENT_ID, sound_name);
play_sound = true;
}
if ("sound-file" in hints) {
var sound_file = hints.lookup ("sound-file").get_string ();
props.sets (Canberra.PROP_MEDIA_FILENAME, sound_file);
play_sound = true;
}
// use a generic sound
if (!play_sound && !("category" in hints)) {
props.sets (Canberra.PROP_EVENT_ID, "dialog-information");
play_sound = true;
}
if (!play_sound) {
var category = hints.lookup ("category").get_string ();
var sound_name = "dialog-information";
play_sound = true;
switch (category) {
case "device.added":
sound_name = "device-added";
break;
case "device.removed":
sound_name = "device-removed";
break;
case "im":
sound_name = "message";
break;
case "im.received":
sound_name = "message-new-instant";
break;
case "network.connected":
sound_name = "network-connectivity-established";
break;
case "network.disconnected":
sound_name = "network-connectivity-lost";
break;
case "presence.online":
sound_name = "service-login";
break;
case "presence.offline":
sound_name = "service-logout";
break;
// no sound at all
case "x-gnome.music":
play_sound = false;
break;
// generic errors
case "device.error":
case "email.bounced":
case "im.error":
case "network.error":
case "transfer.error":
sound_name = "dialog-error";
break;
// use generic default
case "network":
case "email":
case "email.arrived":
case "presence":
case "transfer":
case "transfer.complete":
default:
break;
}
props.sets (Canberra.PROP_EVENT_ID, sound_name);
}
if (play_sound)
ca_context.play_full (0, props);
}
void notification_closed_callback (Notification notification, uint32 id, uint32 reason)
{