From 464728ac5a7df6973fa5de0346182c5e4f7fc070 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 12 Sep 2009 00:03:23 +0200 Subject: vala: install .vapi files by default --- Makefile.am | 13 ++++- canberra-gtk.vapi | 37 -------------- canberra.vapi | 126 ---------------------------------------------- vala/libcanberra-gtk.vapi | 37 ++++++++++++++ vala/libcanberra.vapi | 126 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 175 insertions(+), 164 deletions(-) delete mode 100644 canberra-gtk.vapi delete mode 100644 canberra.vapi create mode 100644 vala/libcanberra-gtk.vapi create mode 100644 vala/libcanberra.vapi diff --git a/Makefile.am b/Makefile.am index b875e14..a950a3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,14 @@ dist_doc_DATA = README -EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas +EXTRA_DIST = \ + bootstrap.sh \ + autogen.sh \ + LGPL \ + libcanberra.schemas \ + vala/libcanberra.vapi \ + vala/libcanberra-gtk.vapi + SUBDIRS = src gtkdoc doc MAINTAINERCLEANFILES = README @@ -27,8 +34,12 @@ noinst_DATA = README pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcanberra.pc +vapidir = $(datadir)/vala/vapi +vapi_DATA = vala/libcanberra.vapi + if HAVE_GTK pkgconfig_DATA += libcanberra-gtk.pc +vapi_DATA += vala/libcanberra-gtk.vapi schemasdir = $(GCONF_SCHEMA_FILE_DIR) schemas_DATA = libcanberra.schemas diff --git a/canberra-gtk.vapi b/canberra-gtk.vapi deleted file mode 100644 index f788f8e..0000000 --- a/canberra-gtk.vapi +++ /dev/null @@ -1,37 +0,0 @@ -/*** - This file is part of libcanberra. - - Copyright 2009 Lennart Poettering - - libcanberra is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 2.1 of the - License, or (at your option) any later version. - - libcanberra is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, see - . -***/ - -using Canberra; -using Gdk; -using Gtk; - -[CCode (cprefix = "CA_GTK_", lower_case_cprefix = "ca_gtk_", cheader_filename = "canberra-gtk.h")] -namespace CanberraGtk { - - public unowned Context? context_get(); - public unowned Context? context_get_for_screen(Gdk.Screen? screen); - - public int proplist_set_for_widget(Proplist p, Gtk.Widget w); - public int play_for_widget(Gtk.Widget w, uint32 id, ...); - public int proplist_set_for_event(Proplist p, Gdk.Event e); - public int play_for_event(Gdk.Event e, uint32 id, ...); - - public void widget_disable_sounds(Gtk.Widget w, bool enable = false); -} diff --git a/canberra.vapi b/canberra.vapi deleted file mode 100644 index 6a3d779..0000000 --- a/canberra.vapi +++ /dev/null @@ -1,126 +0,0 @@ -/*** - This file is part of libcanberra. - - Copyright (C) 2009 Michael 'Mickey' Lauer - - libcanberra is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 2.1 of the - License, or (at your option) any later version. - - libcanberra is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, see - . -***/ - -[CCode (cprefix = "CA_", lower_case_cprefix = "ca_", cheader_filename = "canberra.h")] -namespace Canberra { - - public const int MAJOR; - public const int MINOR; - - [CCode (cname="CA_CHECK_VERSION")] - public bool CHECK_VERSION(int major, int minor); - - public const string PROP_MEDIA_NAME; - public const string PROP_MEDIA_TITLE; - public const string PROP_MEDIA_ARTIST; - public const string PROP_MEDIA_LANGUAGE; - public const string PROP_MEDIA_FILENAME; - public const string PROP_MEDIA_ICON; - public const string PROP_MEDIA_ICON_NAME; - public const string PROP_MEDIA_ROLE; - public const string PROP_EVENT_ID; - public const string PROP_EVENT_DESCRIPTION; - public const string PROP_EVENT_MOUSE_X; - public const string PROP_EVENT_MOUSE_Y; - public const string PROP_EVENT_MOUSE_HPOS; - public const string PROP_EVENT_MOUSE_VPOS; - public const string PROP_EVENT_MOUSE_BUTTON; - public const string PROP_WINDOW_NAME; - public const string PROP_WINDOW_ID; - public const string PROP_WINDOW_ICON; - public const string PROP_WINDOW_ICON_NAME; - public const string PROP_WINDOW_X11_DISPLAY; - public const string PROP_WINDOW_X11_SCREEN; - public const string PROP_WINDOW_X11_MONITOR; - public const string PROP_WINDOW_X11_XID; - public const string PROP_APPLICATION_NAME; - public const string PROP_APPLICATION_ID; - public const string PROP_APPLICATION_VERSION; - public const string PROP_APPLICATION_ICON; - public const string PROP_APPLICATION_ICON_NAME; - public const string PROP_APPLICATION_LANGUAGE; - public const string PROP_APPLICATION_PROCESS_ID; - public const string PROP_APPLICATION_PROCESS_BINARY; - public const string PROP_APPLICATION_PROCESS_USER; - public const string PROP_APPLICATION_PROCESS_HOST; - public const string PROP_CANBERRA_CACHE_CONTROL; - public const string PROP_CANBERRA_VOLUME; - public const string PROP_CANBERRA_XDG_THEME_NAME; - public const string PROP_CANBERRA_XDG_THEME_OUTPUT_PROFILE; - public const string PROP_CANBERRA_ENABLE; - - [CCode (cname = "CA_SUCCESS")] - public const int SUCCESS; - - [CCode (cname = "int", cprefix = "CA_ERROR_")] - public enum Error { - NOTSUPPORTED, - INVALID, - STATE, - OOM, - NODRIVER, - SYSTEM, - CORRUPT, - TOOBIG, - NOTFOUND, - DESTROYED, - CANCELED, - NOTAVAILABLE, - ACCESS, - IO, - INTERNAL, - DISABLED, - FORKED, - - [CCode (cname = "_CA_ERROR_MAX")] - _MAX - } - - public unowned string? strerror(int code); - - public delegate void FinishCallback(Context c, uint32 id, int code); - - [Compact] - [CCode (cname = "ca_proplist", free_function = "ca_proplist_destroy")] - public class Proplist { - public static int create(out Proplist p); - public int sets(string key, string value); - [PrintfFormat] - public int setf(string key, string format, ...); - public int set(string key, void* data, size_t nbytes); - } - - [Compact] - [CCode (cname = "ca_context", free_function = "ca_context_destroy")] - public class Context { - public static int create(out Context context); - public int set_driver(string? driver = null); - public int change_device(string? device = null); - public int open(); - public int change_props(...); - public int change_props_full(Proplist p); - public int play_full(uint32 id, Proplist p, FinishCallback? cb = null); - public int play(uint32 id, ...); - public int cache_full(Proplist p); - public int cache(...); - public int cancel(uint32 id); - public int playing(uint32 id, out bool playing); - } -} diff --git a/vala/libcanberra-gtk.vapi b/vala/libcanberra-gtk.vapi new file mode 100644 index 0000000..f788f8e --- /dev/null +++ b/vala/libcanberra-gtk.vapi @@ -0,0 +1,37 @@ +/*** + This file is part of libcanberra. + + Copyright 2009 Lennart Poettering + + libcanberra is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 2.1 of the + License, or (at your option) any later version. + + libcanberra is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with libcanberra. If not, see + . +***/ + +using Canberra; +using Gdk; +using Gtk; + +[CCode (cprefix = "CA_GTK_", lower_case_cprefix = "ca_gtk_", cheader_filename = "canberra-gtk.h")] +namespace CanberraGtk { + + public unowned Context? context_get(); + public unowned Context? context_get_for_screen(Gdk.Screen? screen); + + public int proplist_set_for_widget(Proplist p, Gtk.Widget w); + public int play_for_widget(Gtk.Widget w, uint32 id, ...); + public int proplist_set_for_event(Proplist p, Gdk.Event e); + public int play_for_event(Gdk.Event e, uint32 id, ...); + + public void widget_disable_sounds(Gtk.Widget w, bool enable = false); +} diff --git a/vala/libcanberra.vapi b/vala/libcanberra.vapi new file mode 100644 index 0000000..6a3d779 --- /dev/null +++ b/vala/libcanberra.vapi @@ -0,0 +1,126 @@ +/*** + This file is part of libcanberra. + + Copyright (C) 2009 Michael 'Mickey' Lauer + + libcanberra is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 2.1 of the + License, or (at your option) any later version. + + libcanberra is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with libcanberra. If not, see + . +***/ + +[CCode (cprefix = "CA_", lower_case_cprefix = "ca_", cheader_filename = "canberra.h")] +namespace Canberra { + + public const int MAJOR; + public const int MINOR; + + [CCode (cname="CA_CHECK_VERSION")] + public bool CHECK_VERSION(int major, int minor); + + public const string PROP_MEDIA_NAME; + public const string PROP_MEDIA_TITLE; + public const string PROP_MEDIA_ARTIST; + public const string PROP_MEDIA_LANGUAGE; + public const string PROP_MEDIA_FILENAME; + public const string PROP_MEDIA_ICON; + public const string PROP_MEDIA_ICON_NAME; + public const string PROP_MEDIA_ROLE; + public const string PROP_EVENT_ID; + public const string PROP_EVENT_DESCRIPTION; + public const string PROP_EVENT_MOUSE_X; + public const string PROP_EVENT_MOUSE_Y; + public const string PROP_EVENT_MOUSE_HPOS; + public const string PROP_EVENT_MOUSE_VPOS; + public const string PROP_EVENT_MOUSE_BUTTON; + public const string PROP_WINDOW_NAME; + public const string PROP_WINDOW_ID; + public const string PROP_WINDOW_ICON; + public const string PROP_WINDOW_ICON_NAME; + public const string PROP_WINDOW_X11_DISPLAY; + public const string PROP_WINDOW_X11_SCREEN; + public const string PROP_WINDOW_X11_MONITOR; + public const string PROP_WINDOW_X11_XID; + public const string PROP_APPLICATION_NAME; + public const string PROP_APPLICATION_ID; + public const string PROP_APPLICATION_VERSION; + public const string PROP_APPLICATION_ICON; + public const string PROP_APPLICATION_ICON_NAME; + public const string PROP_APPLICATION_LANGUAGE; + public const string PROP_APPLICATION_PROCESS_ID; + public const string PROP_APPLICATION_PROCESS_BINARY; + public const string PROP_APPLICATION_PROCESS_USER; + public const string PROP_APPLICATION_PROCESS_HOST; + public const string PROP_CANBERRA_CACHE_CONTROL; + public const string PROP_CANBERRA_VOLUME; + public const string PROP_CANBERRA_XDG_THEME_NAME; + public const string PROP_CANBERRA_XDG_THEME_OUTPUT_PROFILE; + public const string PROP_CANBERRA_ENABLE; + + [CCode (cname = "CA_SUCCESS")] + public const int SUCCESS; + + [CCode (cname = "int", cprefix = "CA_ERROR_")] + public enum Error { + NOTSUPPORTED, + INVALID, + STATE, + OOM, + NODRIVER, + SYSTEM, + CORRUPT, + TOOBIG, + NOTFOUND, + DESTROYED, + CANCELED, + NOTAVAILABLE, + ACCESS, + IO, + INTERNAL, + DISABLED, + FORKED, + + [CCode (cname = "_CA_ERROR_MAX")] + _MAX + } + + public unowned string? strerror(int code); + + public delegate void FinishCallback(Context c, uint32 id, int code); + + [Compact] + [CCode (cname = "ca_proplist", free_function = "ca_proplist_destroy")] + public class Proplist { + public static int create(out Proplist p); + public int sets(string key, string value); + [PrintfFormat] + public int setf(string key, string format, ...); + public int set(string key, void* data, size_t nbytes); + } + + [Compact] + [CCode (cname = "ca_context", free_function = "ca_context_destroy")] + public class Context { + public static int create(out Context context); + public int set_driver(string? driver = null); + public int change_device(string? device = null); + public int open(); + public int change_props(...); + public int change_props_full(Proplist p); + public int play_full(uint32 id, Proplist p, FinishCallback? cb = null); + public int play(uint32 id, ...); + public int cache_full(Proplist p); + public int cache(...); + public int cancel(uint32 id); + public int playing(uint32 id, out bool playing); + } +} -- cgit