canberra-gtk.h   canberra-gtk.h 
skipping to change at line 29 skipping to change at line 29
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with libcanberra. If not, see License along with libcanberra. If not, see
<http://www.gnu.org/licenses/>. <http://www.gnu.org/licenses/>.
***/ ***/
#include <canberra.h> #include <canberra.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#ifndef GDK_MULTIHEAD_SAFE
ca_context *ca_gtk_context_get(void); ca_context *ca_gtk_context_get(void);
#endif
ca_context *ca_gtk_context_get_for_screen(GdkScreen *screen);
int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *w); int ca_gtk_proplist_set_for_widget(ca_proplist *p, GtkWidget *w);
int ca_gtk_play_for_widget(GtkWidget *w, uint32_t id, ...) G_GNUC_NULL_TERM INATED; int ca_gtk_play_for_widget(GtkWidget *w, uint32_t id, ...) G_GNUC_NULL_TERM INATED;
int ca_gtk_proplist_set_for_event(ca_proplist *p, GdkEvent *e); int ca_gtk_proplist_set_for_event(ca_proplist *p, GdkEvent *e);
int ca_gtk_play_for_event(GdkEvent *e, uint32_t id, ...) G_GNUC_NULL_TERMIN ATED; int ca_gtk_play_for_event(GdkEvent *e, uint32_t id, ...) G_GNUC_NULL_TERMIN ATED;
void ca_gtk_widget_disable_sounds(GtkWidget *w, gboolean enable); void ca_gtk_widget_disable_sounds(GtkWidget *w, gboolean enable);
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 canberra.h   canberra.h 
skipping to change at line 38 skipping to change at line 38
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef __GNUC__ #ifndef __GNUC__
/* Make sure __attribute__ works on non-gcc systems. Yes, might be a bit ug ly */ /* Make sure __attribute__ works on non-gcc systems. Yes, might be a bit ug ly */
#define __attribute__(x) #define __attribute__(x)
#endif #endif
/** /**
* CA_MAJOR:
*
* Evaluates to the major version number of libcanberra.
*/
#define CA_MAJOR (0)
/**
* CA_MINOR:
*
* Evaluates to the minor version number of libcanberra.
*/
#define CA_MINOR (13)
/**
* CA_CHECK_VERSION:
*
* Evaluates to TRUE when the library version is newer than the
* specified parameters.
*/
#define CA_CHECK_VERSION(major,minor) \
((CA_MAJOR > (major)) || \
(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:
* *
* A (song) title describing the media being played. Localized if possible and applicable. * A (song) title describing the media being played. Localized if possible and applicable.
skipping to change at line 370 skipping to change at line 394
* are played at all. If this property is "1" or unset sounds are * are played at all. If this property is "1" or unset sounds are
* played as normal. However, if it is "0" all calls to * played as normal. However, if it is "0" all calls to
* ca_context_play() will fail with CA_ERROR_DISABLED. * ca_context_play() will fail with CA_ERROR_DISABLED.
* *
* 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.
*/ */
#define CA_PROP_CANBERRA_ENABLE "canberra.enable" #define CA_PROP_CANBERRA_ENABLE "canberra.enable"
/** /**
* CA_PROP_CANBERRA_FORCE_CHANNEL:
*
* A special property that can be used to control on which channel a
* sound is played. The value should be one of mono, front-left,
* front-right, front-center, rear-left, rear-right, rear-center, lfe,
* front-left-of-center, front-right-of-center, side-left, side-right,
* top-center, top-front-left, top-front-right, top-front-center,
* top-rear-left, top-rear-right, top-rear-center. This property is
* only honoured by some backends, other backends may choose to ignore
* it completely.
*
* If the list of properties is handed on to the sound server this
* property is stripped from it.
*/
#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;
/** /**
* ca_finish_callback_t: * ca_finish_callback_t:
* @c: The libcanberra context this callback is called for * @c: The libcanberra context this callback is called for
* @id: The numerical id passed to the ca_context_play_full() when starting the event sound playback. * @id: The numerical id passed to the ca_context_play_full() when starting the event sound playback.
skipping to change at line 418 skipping to change at line 459
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_MAX = -18 CA_ERROR_DISCONNECTED = -18,
_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. 3 change blocks. 
1 lines changed or deleted 43 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/