| canberra.h | | canberra.h | |
|---|
|
| | | /*-*- Mode: C; c-basic-offset: 8 -*-*/ | |
| | | | |
| #ifndef foocanberrahfoo | | #ifndef foocanberrahfoo | |
| #define foocanberrahfoo | | #define foocanberrahfoo | |
| | | | |
| /*** | | /*** | |
| This file is part of libcanberra. | | This file is part of libcanberra. | |
| | | | |
| Copyright 2008 Lennart Poettering | | Copyright 2008 Lennart Poettering | |
| | | | |
| libcanberra is free software; you can redistribute it and/or modify | | libcanberra is free software; you can redistribute it and/or modify | |
| it under the terms of the GNU Lesser General Public License as | | it under the terms of the GNU Lesser General Public License as | |
| | | | |
| skipping to change at line 49 | | skipping to change at line 51 | |
|---|
| * | | * | |
| * Evaluates to the major version number of libcanberra. | | * Evaluates to the major version number of libcanberra. | |
| */ | | */ | |
| #define CA_MAJOR (0) | | #define CA_MAJOR (0) | |
| | | | |
| /** | | /** | |
| * CA_MINOR: | | * CA_MINOR: | |
| * | | * | |
| * Evaluates to the minor version number of libcanberra. | | * Evaluates to the minor version number of libcanberra. | |
| */ | | */ | |
|
| #define CA_MINOR (22) | | #define CA_MINOR (23) | |
| | | | |
| /** | | /** | |
| * CA_CHECK_VERSION: | | * CA_CHECK_VERSION: | |
| * | | * | |
| * Evaluates to TRUE when the library version is newer than the | | * Evaluates to TRUE when the library version is newer than the | |
| * specified parameters. | | * specified parameters. | |
| */ | | */ | |
|
| #define CA_CHECK_VERSION(major,minor) \ | | #define CA_CHECK_VERSION(major,minor) \ | |
| ((CA_MAJOR > (major)) || \ | | ((CA_MAJOR > (major)) || \ | |
| (CA_MAJOR == (major) && CA_MINOR >= (minor))) | | (CA_MAJOR == (major) && CA_MINOR >= (minor))) | |
| | | | |
| /** | | /** | |
| * CA_PROP_MEDIA_NAME: | | * CA_PROP_MEDIA_NAME: | |
| * | | * | |
| * A name describing the media being played. Localized if possible and appl
icable. | | * A name describing the media being played. Localized if possible and appl
icable. | |
| */ | | */ | |
| #define CA_PROP_MEDIA_NAME "media.name" | | #define CA_PROP_MEDIA_NAME "media.name" | |
| | | | |
| /** | | /** | |
| * CA_PROP_MEDIA_TITLE: | | * CA_PROP_MEDIA_TITLE: | |
| | | | |
| skipping to change at line 486 | | skipping to change at line 488 | |
|---|
| * sound is played. The value should be one of mono, front-left, | | * sound is played. The value should be one of mono, front-left, | |
| * front-right, front-center, rear-left, rear-right, rear-center, lfe, | | * front-right, front-center, rear-left, rear-right, rear-center, lfe, | |
| * front-left-of-center, front-right-of-center, side-left, side-right, | | * front-left-of-center, front-right-of-center, side-left, side-right, | |
| * top-center, top-front-left, top-front-right, top-front-center, | | * top-center, top-front-left, top-front-right, top-front-center, | |
| * top-rear-left, top-rear-right, top-rear-center. This property is | | * top-rear-left, top-rear-right, top-rear-center. This property is | |
| * only honoured by some backends, other backends may choose to ignore | | * only honoured by some backends, other backends may choose to ignore | |
| * it completely. | | * it completely. | |
| * | | * | |
| * If the list of properties is handed on to the sound server this | | * If the list of properties is handed on to the sound server this | |
| * property is stripped from it. | | * property is stripped from it. | |
|
| | | * | |
| | | * Since: 0.13 | |
| */ | | */ | |
| #define CA_PROP_CANBERRA_FORCE_CHANNEL "canberra.force_channel" | | #define CA_PROP_CANBERRA_FORCE_CHANNEL "canberra.force_channel" | |
| | | | |
| /** | | /** | |
| * ca_context: | | * ca_context: | |
| * | | * | |
| * A libcanberra context object. | | * A libcanberra context object. | |
| */ | | */ | |
| typedef struct ca_context ca_context; | | typedef struct ca_context ca_context; | |
| | | | |
| | | | |
| skipping to change at line 520 | | skipping to change at line 524 | |
|---|
| */ | | */ | |
| typedef void (*ca_finish_callback_t)(ca_context *c, uint32_t id, int error_
code, void *userdata); | | typedef void (*ca_finish_callback_t)(ca_context *c, uint32_t id, int error_
code, void *userdata); | |
| | | | |
| /** | | /** | |
| * Error codes: | | * Error codes: | |
| * @CA_SUCCESS: Success | | * @CA_SUCCESS: Success | |
| * | | * | |
| * Error codes | | * Error codes | |
| */ | | */ | |
| enum { | | enum { | |
|
| CA_SUCCESS = 0, | | CA_SUCCESS = 0, | |
| CA_ERROR_NOTSUPPORTED = -1, | | CA_ERROR_NOTSUPPORTED = -1, | |
| CA_ERROR_INVALID = -2, | | CA_ERROR_INVALID = -2, | |
| CA_ERROR_STATE = -3, | | CA_ERROR_STATE = -3, | |
| CA_ERROR_OOM = -4, | | CA_ERROR_OOM = -4, | |
| CA_ERROR_NODRIVER = -5, | | CA_ERROR_NODRIVER = -5, | |
| CA_ERROR_SYSTEM = -6, | | CA_ERROR_SYSTEM = -6, | |
| CA_ERROR_CORRUPT = -7, | | CA_ERROR_CORRUPT = -7, | |
| CA_ERROR_TOOBIG = -8, | | CA_ERROR_TOOBIG = -8, | |
| CA_ERROR_NOTFOUND = -9, | | CA_ERROR_NOTFOUND = -9, | |
| CA_ERROR_DESTROYED = -10, | | CA_ERROR_DESTROYED = -10, | |
| CA_ERROR_CANCELED = -11, | | CA_ERROR_CANCELED = -11, | |
| CA_ERROR_NOTAVAILABLE = -12, | | CA_ERROR_NOTAVAILABLE = -12, | |
| CA_ERROR_ACCESS = -13, | | CA_ERROR_ACCESS = -13, | |
| CA_ERROR_IO = -14, | | CA_ERROR_IO = -14, | |
| CA_ERROR_INTERNAL = -15, | | CA_ERROR_INTERNAL = -15, | |
| CA_ERROR_DISABLED = -16, | | CA_ERROR_DISABLED = -16, | |
| CA_ERROR_FORKED = -17, | | CA_ERROR_FORKED = -17, | |
| CA_ERROR_DISCONNECTED = -18, | | CA_ERROR_DISCONNECTED = -18, | |
| _CA_ERROR_MAX = -19 | | _CA_ERROR_MAX = -19 | |
| }; | | }; | |
| | | | |
| /** | | /** | |
| * ca_proplist: | | * ca_proplist: | |
| * | | * | |
| * A canberra property list object. Basically a hashtable. | | * A canberra property list object. Basically a hashtable. | |
| */ | | */ | |
| typedef struct ca_proplist ca_proplist; | | typedef struct ca_proplist ca_proplist; | |
| | | | |
| int ca_proplist_create(ca_proplist **p); | | int ca_proplist_create(ca_proplist **p); | |
| | | | |
| End of changes. 5 change blocks. |
|---|
| 24 lines changed or deleted | | 28 lines changed or added | |
|---|
|