From 48795cc6093b9b982b41daad71a8a797d9de27cc Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 7 Sep 2009 20:22:23 +0200 Subject: vala: include vala .vapi file for libcanberra, but don't install it for now --- canberra.vapi | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 canberra.vapi diff --git a/canberra.vapi b/canberra.vapi new file mode 100644 index 0000000..761c24f --- /dev/null +++ b/canberra.vapi @@ -0,0 +1,138 @@ +/*** + 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 + . +***/ + +using Posix; + +[CCode (cprefix = "CA_", lower_case_cprefix = "ca_", cheader_filename = "canberra.h")] +namespace Canberra { + + // + // properties + // + 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; + + // + // errors + // + [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 + } + + public unowned string strerror( Error code ); + + // + // callback + // + public delegate void FinishCallback( Context context, uint32 id, Error code ); + + // + // property list + // + [Compact] + [CCode (cname = "ca_proplist", free_function = "")] + public class Proplist { + + public static int create( Proplist* p ); + public Error destroy(); + public Error sets( string key, string value ); + [PrintfFormat] + public Error setf( string key, string format, ... ); + public Error set( string key, void* data, size_t nbytes ); + } + + [Compact] + [CCode (cname = "ca_context", free_function = "")] + public class Context { + + public static Error create( Context* context ); + public Error destroy(); + public Error set_driver( string driver ); + public Error change_device( string device ); + public Error open(); + [CCode (sentinel = "")] + public Error change_props( ... ); + public Error change_props_full( Proplist p ); + [CCode (instance_pos = 0)] + public Error play_full( uint32 id, Proplist p, FinishCallback cb ); + [CCode (sentinel = "")] + public Error play( uint32 id, ... ); + public Error cache_full( Proplist p ); + [CCode (sentinel = "")] + public Error cache( ... ); + public Error cancel( uint32 id ); + } +} -- cgit From c6f159a028d93ad1eaeb76346c47f6c64ed2df55 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 7 Sep 2009 20:40:13 +0200 Subject: vala: make a couple of constants static --- canberra.vapi | 78 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/canberra.vapi b/canberra.vapi index 761c24f..eb266c5 100644 --- a/canberra.vapi +++ b/canberra.vapi @@ -26,50 +26,50 @@ namespace Canberra { // // properties // - 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; + public static const string PROP_MEDIA_NAME; + public static const string PROP_MEDIA_TITLE; + public static const string PROP_MEDIA_ARTIST; + public static const string PROP_MEDIA_LANGUAGE; + public static const string PROP_MEDIA_FILENAME; + public static const string PROP_MEDIA_ICON; + public static const string PROP_MEDIA_ICON_NAME; + public static const string PROP_MEDIA_ROLE; + public static const string PROP_EVENT_ID; + public static const string PROP_EVENT_DESCRIPTION; + public static const string PROP_EVENT_MOUSE_X; + public static const string PROP_EVENT_MOUSE_Y; + public static const string PROP_EVENT_MOUSE_HPOS; + public static const string PROP_EVENT_MOUSE_VPOS; + public static const string PROP_EVENT_MOUSE_BUTTON; + public static const string PROP_WINDOW_NAME; + public static const string PROP_WINDOW_ID; + public static const string PROP_WINDOW_ICON; + public static const string PROP_WINDOW_ICON_NAME; + public static const string PROP_WINDOW_X11_DISPLAY; + public static const string PROP_WINDOW_X11_SCREEN; + public static const string PROP_WINDOW_X11_MONITOR; + public static const string PROP_WINDOW_X11_XID; + public static const string PROP_APPLICATION_NAME; + public static const string PROP_APPLICATION_ID; + public static const string PROP_APPLICATION_VERSION; + public static const string PROP_APPLICATION_ICON; + public static const string PROP_APPLICATION_ICON_NAME; + public static const string PROP_APPLICATION_LANGUAGE; + public static const string PROP_APPLICATION_PROCESS_ID; + public static const string PROP_APPLICATION_PROCESS_BINARY; + public static const string PROP_APPLICATION_PROCESS_USER; + public static const string PROP_APPLICATION_PROCESS_HOST; + public static const string PROP_CANBERRA_CACHE_CONTROL; + public static const string PROP_CANBERRA_VOLUME; + public static const string PROP_CANBERRA_XDG_THEME_NAME; + public static const string PROP_CANBERRA_XDG_THEME_OUTPUT_PROFILE; + public static const string PROP_CANBERRA_ENABLE; // // errors // [CCode (cname = "CA_SUCCESS")] - public const int SUCCESS; + public static const int SUCCESS; [CCode (cname = "int", cprefix = "CA_ERROR_")] public enum Error { -- cgit From 424b5fc6e2ecc244e04c932c14039b63c4fef14a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 7 Sep 2009 20:40:38 +0200 Subject: vala: change return values of functions to int from Error to mimic C API more closely --- canberra.vapi | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/canberra.vapi b/canberra.vapi index eb266c5..22298b2 100644 --- a/canberra.vapi +++ b/canberra.vapi @@ -107,32 +107,32 @@ namespace Canberra { public class Proplist { public static int create( Proplist* p ); - public Error destroy(); - public Error sets( string key, string value ); + public int destroy(); + public int sets( string key, string value ); [PrintfFormat] - public Error setf( string key, string format, ... ); - public Error set( string key, void* data, size_t nbytes ); + public int setf( string key, string format, ... ); + public int set( string key, void* data, size_t nbytes ); } [Compact] [CCode (cname = "ca_context", free_function = "")] public class Context { - public static Error create( Context* context ); - public Error destroy(); - public Error set_driver( string driver ); - public Error change_device( string device ); - public Error open(); + public static int create( Context* context ); + public int destroy(); + public int set_driver( string driver ); + public int change_device( string device ); + public int open(); [CCode (sentinel = "")] - public Error change_props( ... ); - public Error change_props_full( Proplist p ); + public int change_props( ... ); + public int change_props_full( Proplist p ); [CCode (instance_pos = 0)] - public Error play_full( uint32 id, Proplist p, FinishCallback cb ); + public int play_full( uint32 id, Proplist p, FinishCallback cb ); [CCode (sentinel = "")] - public Error play( uint32 id, ... ); - public Error cache_full( Proplist p ); + public int play( uint32 id, ... ); + public int cache_full( Proplist p ); [CCode (sentinel = "")] - public Error cache( ... ); - public Error cancel( uint32 id ); + public int cache( ... ); + public int cancel( uint32 id ); } } -- cgit From 1571495900f3d636c731f66398fe39f9f42410cd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 7 Sep 2009 20:43:36 +0200 Subject: vala: make a few arguments nullable --- canberra.vapi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/canberra.vapi b/canberra.vapi index 22298b2..8db3a11 100644 --- a/canberra.vapi +++ b/canberra.vapi @@ -92,7 +92,7 @@ namespace Canberra { FORKED } - public unowned string strerror( Error code ); + public unowned string? strerror( Error code ); // // callback @@ -120,14 +120,14 @@ namespace Canberra { public static int create( Context* context ); public int destroy(); - public int set_driver( string driver ); - public int change_device( string device ); + public int set_driver( string? driver = null); + public int change_device( string? device = null); public int open(); [CCode (sentinel = "")] public int change_props( ... ); public int change_props_full( Proplist p ); [CCode (instance_pos = 0)] - public int play_full( uint32 id, Proplist p, FinishCallback cb ); + public int play_full( uint32 id, Proplist p, FinishCallback? cb = null); [CCode (sentinel = "")] public int play( uint32 id, ... ); public int cache_full( Proplist p ); -- cgit From 1e2bf411054d99cee7c3088628095f57aa28011d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 7 Sep 2009 20:44:26 +0200 Subject: vala: fix indentation to mimic rest of canberra sources --- canberra.vapi | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/canberra.vapi b/canberra.vapi index 8db3a11..1e11008 100644 --- a/canberra.vapi +++ b/canberra.vapi @@ -92,12 +92,12 @@ namespace Canberra { FORKED } - public unowned string? strerror( Error code ); + public unowned string? strerror(Error code); // // callback // - public delegate void FinishCallback( Context context, uint32 id, Error code ); + public delegate void FinishCallback(Context context, uint32 id, Error code); // // property list @@ -106,33 +106,33 @@ namespace Canberra { [CCode (cname = "ca_proplist", free_function = "")] public class Proplist { - public static int create( Proplist* p ); + public static int create(out Proplist p); public int destroy(); - public int sets( string key, string value ); + 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 ); + public int setf(string key, string format, ...); + public int set(string key, void* data, size_t nbytes); } [Compact] [CCode (cname = "ca_context", free_function = "")] public class Context { - public static int create( Context* context ); + public static int create(out Context context); public int destroy(); - public int set_driver( string? driver = null); - public int change_device( string? device = null); + public int set_driver(string? driver = null); + public int change_device(string? device = null); public int open(); [CCode (sentinel = "")] - public int change_props( ... ); - public int change_props_full( Proplist p ); + public int change_props(...); + public int change_props_full(Proplist p); [CCode (instance_pos = 0)] - public int play_full( uint32 id, Proplist p, FinishCallback? cb = null); + public int play_full(uint32 id, Proplist p, FinishCallback? cb = null); [CCode (sentinel = "")] - public int play( uint32 id, ... ); - public int cache_full( Proplist p ); + public int play(uint32 id, ...); + public int cache_full(Proplist p); [CCode (sentinel = "")] - public int cache( ... ); - public int cancel( uint32 id ); + public int cache(...); + public int cancel(uint32 id); } } -- cgit From 1473ad9ee7fef4ed6439ff555603af2158e65562 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 7 Sep 2009 20:49:10 +0200 Subject: vala: fix return type of strerror() --- canberra.vapi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canberra.vapi b/canberra.vapi index 1e11008..a4e27bf 100644 --- a/canberra.vapi +++ b/canberra.vapi @@ -92,7 +92,7 @@ namespace Canberra { FORKED } - public unowned string? strerror(Error code); + public unowned string? strerror(int code); // // callback -- cgit