comparison src/audacious/pluginenum.c @ 4354:168479ee6aab

Automated merge with ssh://hg.atheme.org//hg/audacious
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 17 Mar 2008 00:14:21 +0200
parents 225d11441186
children 34d010af590b
comparison
equal deleted inserted replaced
4353:52902b89e1dd 4354:168479ee6aab
37 #include <gmodule.h> 37 #include <gmodule.h>
38 #include <string.h> 38 #include <string.h>
39 39
40 #include "main.h" 40 #include "main.h"
41 #include "dock.h" 41 #include "dock.h"
42 #include "ui_main.h"
43 #include "playback.h" 42 #include "playback.h"
44 #include "playlist.h" 43 #include "playlist.h"
45 #include "strings.h" 44 #include "strings.h"
46 #include "util.h" 45 #include "util.h"
47 46
60 #include "ui_preferences.h" 59 #include "ui_preferences.h"
61 #include "ui_fileinfopopup.h" 60 #include "ui_fileinfopopup.h"
62 61
63 #include "effect.h" 62 #include "effect.h"
64 #include "volumecontrol.h" 63 #include "volumecontrol.h"
64 #include "ui_plugin_menu.h"
65 65
66 const gchar *plugin_dir_list[] = { 66 const gchar *plugin_dir_list[] = {
67 PLUGINSUBS, 67 PLUGINSUBS,
68 NULL 68 NULL
69 }; 69 };
225 225
226 .playlist_fileinfo_current = playlist_fileinfo_current, 226 .playlist_fileinfo_current = playlist_fileinfo_current,
227 .playlist_fileinfo = playlist_fileinfo, 227 .playlist_fileinfo = playlist_fileinfo,
228 228
229 .playlist_delete_index = playlist_delete_index, 229 .playlist_delete_index = playlist_delete_index,
230 .playlist_delete_filenames = playlist_delete_filenames, 230 .playlist_delete_filenames = NULL, /* remove eventually --mf0102 */
231 231
232 .playlist_get_entry_to_play = playlist_get_entry_to_play, 232 .playlist_get_entry_to_play = playlist_get_entry_to_play,
233 233
234 .playlist_get_filename = playlist_get_filename, 234 .playlist_get_filename = playlist_get_filename,
235 .playlist_get_songtitle = playlist_get_songtitle, 235 .playlist_get_songtitle = playlist_get_songtitle,
549 /* Pretty const casts courtesy of XMMS's plugin.h legacy. Anyone 549 /* Pretty const casts courtesy of XMMS's plugin.h legacy. Anyone
550 else thinks we could use a CONST macro to solve the warnings? 550 else thinks we could use a CONST macro to solve the warnings?
551 - descender */ 551 - descender */
552 p->set_info = (void (*)(gchar *, gint, gint, gint, gint)) playlist_set_info_old_abi; 552 p->set_info = (void (*)(gchar *, gint, gint, gint, gint)) playlist_set_info_old_abi;
553 p->set_info_text = input_set_info_text; 553 p->set_info_text = input_set_info_text;
554 p->set_status_buffering = input_set_status_buffering; 554 p->set_status_buffering = NULL; /* XXX: remove this someday --mf0102 */
555 555
556 ip_data.input_list = g_list_append(ip_data.input_list, p); 556 ip_data.input_list = g_list_append(ip_data.input_list, p);
557 557
558 p->enabled = TRUE; 558 p->enabled = TRUE;
559 559