Mercurial > audlegacy
changeset 1734:43c197f55dda trunk
[svn] - merge libaudacious (public) and audacious util APIs
| author | nenolod |
|---|---|
| date | Mon, 18 Sep 2006 01:44:39 -0700 |
| parents | e41a5d296e26 |
| children | 0617015a528b |
| files | ChangeLog audacious/util.h libaudacious/Makefile.in libaudacious/util.h |
| diffstat | 4 files changed, 33 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Sep 18 01:41:41 2006 -0700 +++ b/ChangeLog Mon Sep 18 01:44:39 2006 -0700 @@ -1,3 +1,12 @@ +2006-09-18 08:41:41 +0000 William Pitcock <nenolod@nenolod.net> + revision [2403] + - add the PlaylistContainer API to the SDK. + + + Changes: Modified: + +1 -0 trunk/audacious/Makefile + + 2006-09-18 08:40:53 +0000 William Pitcock <nenolod@nenolod.net> revision [2401] - add the playlist API to the SDK.
--- a/audacious/util.h Mon Sep 18 01:41:41 2006 -0700 +++ b/audacious/util.h Mon Sep 18 01:44:39 2006 -0700 @@ -128,4 +128,26 @@ gchar *chardet_to_utf8(const gchar *str, gssize len, gsize *arg_bytes_read, gsize *arg_bytes_write, GError **arg_error); +/* XMMS names */ + +#define bmp_info_dialog(title, text, button_text, model, button_action, action_data) \ + xmms_show_message(title, text, button_text, model, button_action, action_data) + +#define bmp_usleep(usec) \ + xmms_usleep(usec) + +#define bmp_check_realtime_priority() \ + xmms_check_realtime_priority() + +G_BEGIN_DECLS + +GtkWidget *xmms_show_message(const gchar * title, const gchar * text, + const gchar * button_text, gboolean modal, + GtkSignalFunc button_action, + gpointer action_data); +gboolean xmms_check_realtime_priority(void); +void xmms_usleep(gint usec); + +G_END_DECLS + #endif
--- a/libaudacious/Makefile.in Mon Sep 18 01:41:41 2006 -0700 +++ b/libaudacious/Makefile.in Mon Sep 18 01:44:39 2006 -0700 @@ -40,7 +40,7 @@ HEADERS = \ vfs.h rcfile.h configdb.h \ - beepctrl.h dirbrowser.h util.h \ + beepctrl.h dirbrowser.h \ formatter.h titlestring.h xml_document.h include ../mk/objective.mk
--- a/libaudacious/util.h Mon Sep 18 01:41:41 2006 -0700 +++ b/libaudacious/util.h Mon Sep 18 01:44:39 2006 -0700 @@ -1,32 +1,1 @@ -#ifndef XMMS_UTIL_H -#define XMMS_UTIL_H - - -#include <glib.h> -#include <gtk/gtk.h> - - -/* XMMS names */ - -#define bmp_info_dialog(title, text, button_text, model, button_action, action_data) \ - xmms_show_message(title, text, button_text, model, button_action, action_data) - -#define bmp_usleep(usec) \ - xmms_usleep(usec) - -#define bmp_check_realtime_priority() \ - xmms_check_realtime_priority() - - -G_BEGIN_DECLS - -GtkWidget *xmms_show_message(const gchar * title, const gchar * text, - const gchar * button_text, gboolean modal, - GtkSignalFunc button_action, - gpointer action_data); -gboolean xmms_check_realtime_priority(void); -void xmms_usleep(gint usec); - -G_END_DECLS - -#endif +#include "audacious/util.h"