Mercurial > audlegacy
changeset 4407:5a0f5ef1de61
Some stupid header cleanups.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 31 Mar 2008 05:59:24 +0300 |
| parents | 255f900b17c9 |
| children | 081839dd6664 |
| files | src/audacious/fft.h src/audacious/logger.h src/audacious/main.h src/audacious/plugin.h src/audacious/strings.h src/audacious/tuple.h src/audacious/tuple_compiler.h src/audacious/ui_manager.h src/audacious/ui_plugin_menu.h src/audacious/vfs.h |
| diffstat | 10 files changed, 46 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/fft.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/fft.h Mon Mar 31 05:59:24 2008 +0300 @@ -21,11 +21,13 @@ /* fft.h: header for iterative implementation of a FFT */ -#ifndef FFT_H -#define FFT_H +#ifndef __AUDACIOUS_FFT_H__ +#define __AUDACIOUS_FFT_H__ #include <glib.h> +G_BEGIN_DECLS + #define FFT_BUFFER_SIZE_LOG 9 #define FFT_BUFFER_SIZE (1 << FFT_BUFFER_SIZE_LOG) @@ -37,4 +39,6 @@ void fft_perform(const sound_sample * input, float *output, fft_state * state); void fft_close(fft_state * state); -#endif +G_END_DECLS + +#endif /* __AUDACIOUS_FFT_H__ */
--- a/src/audacious/logger.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/logger.h Mon Mar 31 05:59:24 2008 +0300 @@ -20,11 +20,12 @@ * Audacious or using our public API to be a derived work. */ -#ifndef LOGGER_H -#define LOGGER_H +#ifndef __AUDACIOUS_LOGGER_H__ +#define __AUDACIOUS_LOGGER_H__ #include <glib.h> +G_BEGIN_DECLS #define BMP_LOGGER_DEFAULT_LOG_LEVEL G_LOG_LEVEL_MESSAGE @@ -35,4 +36,6 @@ gboolean bmp_logger_start(const gchar * filename); void bmp_logger_stop(void); -#endif +G_END_DECLS + +#endif /* __AUDACIOUS_LOGGER_H__ */
--- a/src/audacious/main.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/main.h Mon Mar 31 05:59:24 2008 +0300 @@ -23,8 +23,8 @@ * Audacious or using our public API to be a derived work. */ -#ifndef AUD_MAIN_H -#define AUD_MAIN_H +#ifndef __AUDACIOUS_MAIN_H__ +#define __AUDACIOUS_MAIN_H__ #ifdef _AUDACIOUS_CORE # include "ui_main.h" @@ -94,4 +94,4 @@ G_END_DECLS -#endif +#endif /* __AUDACIOUS_MAIN_H__ */
--- a/src/audacious/plugin.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/plugin.h Mon Mar 31 05:59:24 2008 +0300 @@ -32,8 +32,8 @@ * SUCH DAMAGE. */ -#ifndef AUD_PLUGIN_H -#define AUD_PLUGIN_H +#ifndef __AUDACIOUS_PLUGIN_H__ +#define __AUDACIOUS_PLUGIN_H__ #include <glib.h> #include <gtk/gtk.h> @@ -1220,4 +1220,4 @@ /* undefine the macro -- struct Plugin should be used instead. */ #undef PLUGIN_COMMON_FIELDS -#endif +#endif /* __AUDACIOUS_PLUGIN_H__ */
--- a/src/audacious/strings.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/strings.h Mon Mar 31 05:59:24 2008 +0300 @@ -23,11 +23,13 @@ * Audacious or using our public API to be a derived work. */ -#ifndef AUD_STRINGS_H -#define AUD_STRINGS_H +#ifndef __AUDACIOUS_STRINGS_H__ +#define __AUDACIOUS_STRINGS_H__ #include <glib.h> +G_BEGIN_DECLS + gchar *escape_shell_chars(const gchar * string); gchar *str_append(gchar * str, const gchar * add_str); @@ -54,4 +56,6 @@ gsize *arg_bytes_read, gsize *arg_bytes_write, GError **arg_error); -#endif +G_END_DECLS + +#endif /* __AUDACIOUS_STRINGS_H__ */
--- a/src/audacious/tuple.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/tuple.h Mon Mar 31 05:59:24 2008 +0300 @@ -24,6 +24,7 @@ #include <glib.h> #include <mowgli.h> +G_BEGIN_DECLS enum { FIELD_ARTIST = 0, @@ -100,4 +101,6 @@ gint tuple_get_int(Tuple *tuple, const gint nfield, const gchar *field); #define tuple_free(x) mowgli_object_unref(x); -#endif +G_END_DECLS + +#endif /* __AUDACIOUS_TUPLE_H__ */
--- a/src/audacious/tuple_compiler.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/tuple_compiler.h Mon Mar 31 05:59:24 2008 +0300 @@ -108,4 +108,4 @@ TupleEvalNode *tuple_formatter_compile(TupleEvalContext *ctx, gchar *expr); gchar *tuple_formatter_eval(TupleEvalContext *ctx, TupleEvalNode *expr, Tuple *tuple); -#endif +#endif /* __AUDACIOUS_TUPLE_COMPILER_H__ */
--- a/src/audacious/ui_manager.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/ui_manager.h Mon Mar 31 05:59:24 2008 +0300 @@ -17,14 +17,14 @@ * Audacious or using our public API to be a derived work. */ -#ifndef AUD_UIMANAGER_H -#define AUD_UIMANAGER_H - +#ifndef __AUDACIOUS_UIMANAGER_H__ +#define __AUDACIOUS_UIMANAGER_H__ #include <glib.h> #include <glib/gi18n.h> #include <gtk/gtk.h> +G_BEGIN_DECLS GtkWidget *mainwin_songname_menu; GtkWidget *mainwin_general_menu; @@ -72,5 +72,6 @@ void ui_manager_popup_menu_show( GtkMenu * , gint , gint , guint , guint ); #define popup_menu_show(x1,x2,x3,x4,x5) ui_manager_popup_menu_show(x1,x2,x3,x4,x5) +G_END_DECLS -#endif /* AUD_UIMANAGER_H */ +#endif /* __AUDACIOUS_UIMANAGER_H__ */
--- a/src/audacious/ui_plugin_menu.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/ui_plugin_menu.h Mon Mar 31 05:59:24 2008 +0300 @@ -19,13 +19,13 @@ /* these functions are currently implemented in ui_manager.c */ -#ifndef AUD_UIPLUGINMENU_H -#define AUD_UIPLUGINMENU_H - +#ifndef __AUDACIOUS_UIPLUGINMENU_H__ +#define __AUDACIOUS_UIPLUGINMENU_H__ #include <glib.h> #include <gtk/gtk.h> +G_BEGIN_DECLS #define AUDACIOUS_MENU_MAIN 0 #define AUDACIOUS_MENU_PLAYLIST 1 @@ -38,5 +38,6 @@ gint menu_plugin_item_add( gint , GtkWidget * ); gint menu_plugin_item_remove( gint , GtkWidget * ); +G_END_DECLS -#endif /* AUD_UIPLUGINMENU_H */ +#endif /* __AUDACIOUS_UIPLUGINMENU_H__ */
--- a/src/audacious/vfs.h Mon Mar 31 00:49:26 2008 +0400 +++ b/src/audacious/vfs.h Mon Mar 31 05:59:24 2008 +0300 @@ -18,13 +18,15 @@ * Audacious or using our public API to be a derived work. */ -#ifndef VFS_H -#define VFS_H +#ifndef __AUDACIOUS_VFS_H__ +#define __AUDACIOUS_VFS_H__ #include <glib.h> #include <stdio.h> #include <sys/types.h> +G_BEGIN_DECLS + typedef struct _VFSFile VFSFile; typedef struct _VFSConstructor VFSConstructor; @@ -83,7 +85,6 @@ gchar *(*vfs_get_metadata_impl)(VFSFile *file, const gchar * field); }; -G_BEGIN_DECLS extern VFSFile * vfs_fopen(const gchar * path, const gchar * mode); @@ -145,4 +146,4 @@ G_END_DECLS -#endif /* VFS_H */ +#endif /* __AUDACIOUS_VFS_H__ */