Mercurial > audlegacy
changeset 4624:5523b30cb122
- don't export dock functions to plugins anymore
- some cleanups (sorry, i couldn't help it :P)
| author | mf0102 <0102@gmx.at> |
|---|---|
| date | Mon, 09 Jun 2008 20:02:30 +0200 |
| parents | 68e0859ad1a6 |
| children | 8c36787807de |
| files | src/audacious/plugin.h src/audacious/pluginenum.c src/audacious/pluginenum.h |
| diffstat | 3 files changed, 18 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/plugin.h Sun Jun 08 11:52:39 2008 +0900 +++ b/src/audacious/plugin.h Mon Jun 09 20:02:30 2008 +0200 @@ -623,6 +623,7 @@ gpointer iir_flow; /* old iir_flow */ void (*volumecontrol_flow)(FlowContext *context); +#if 0 /* Dock */ GList *(*get_dock_window_list)(void); GList *(*dock_add_window)(GList * window_list, GtkWindow * window); @@ -632,6 +633,7 @@ void (*dock_move_motion)(GtkWindow * w, GdkEventMotion * event); void (*dock_move_release)(GtkWindow * w); gboolean (*dock_is_moving)(GtkWindow * w); +#endif GList *(*get_output_list)(void);
--- a/src/audacious/pluginenum.c Sun Jun 08 11:52:39 2008 +0900 +++ b/src/audacious/pluginenum.c Mon Jun 09 20:02:30 2008 +0200 @@ -37,33 +37,29 @@ #include <gmodule.h> #include <string.h> +#include "pluginenum.h" + +#include "discovery.h" +#include "effect.h" +#include "general.h" +#include "input.h" #include "main.h" +#include "output.h" #include "playback.h" #include "playlist.h" #include "strings.h" #include "util.h" - -#include "effect.h" -#include "general.h" -#include "input.h" -#include "output.h" #include "visualization.h" -#include "discovery.h" #include "preferences.h" - -#include "pluginenum.h" - #include "vfs_buffer.h" #include "vfs_buffered_file.h" +#include "volumecontrol.h" -#include "ui_dock.h" -#include "ui_preferences.h" #include "ui_fileinfo.h" #include "ui_fileinfopopup.h" +#include "ui_plugin_menu.h" +#include "ui_preferences.h" -#include "effect.h" -#include "volumecontrol.h" -#include "ui_plugin_menu.h" const gchar *plugin_dir_list[] = { PLUGINSUBS, @@ -377,6 +373,7 @@ .util_menu_main_show = util_menu_main_show, +#if 0 .get_dock_window_list = get_dock_window_list, .dock_add_window = dock_add_window, .dock_remove_window = dock_remove_window, @@ -384,6 +381,7 @@ .dock_move_motion = dock_move_motion, .dock_move_release = dock_move_release, .dock_is_moving = dock_is_moving, +#endif .get_output_list = get_output_list,
--- a/src/audacious/pluginenum.h Sun Jun 08 11:52:39 2008 +0900 +++ b/src/audacious/pluginenum.h Mon Jun 09 20:02:30 2008 +0200 @@ -25,8 +25,11 @@ #ifndef AUDACIOUS_PLUGINENUM_H #define AUDACIOUS_PLUGINENUM_H +#include "config.h" + #include <glib.h> -#include "config.h" + +#include "plugin.h" #define PLUGIN_FILENAME(name) (name SHARED_SUFFIX)