Mercurial > audlegacy
diff audacious/input.c @ 1653:a6e6d3500c13 trunk
[svn] - revert back to r2216
| author | nenolod |
|---|---|
| date | Thu, 07 Sep 2006 22:26:54 -0700 |
| parents | f3934d790a2e |
| children | 600efc52c645 |
line wrap: on
line diff
--- a/audacious/input.c Thu Sep 07 22:00:35 2006 -0700 +++ b/audacious/input.c Thu Sep 07 22:26:54 2006 -0700 @@ -31,12 +31,13 @@ #include "fft.h" #include "input.h" #include "main.h" +#include "mainwin.h" #include "output.h" #include "util.h" #include "visualization.h" #include "playback.h" +#include "widgets/widgetcore.h" #include "pluginenum.h" -#include "interface.h" #include "libaudacious/titlestring.h" #include "libaudacious/util.h" @@ -314,7 +315,7 @@ GtkCellRenderer *renderer; dialog = - gtk_message_dialog_new_with_markup(GTK_WINDOW(current_interface->parentwin), + gtk_message_dialog_new_with_markup(GTK_WINDOW(mainwin), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, @@ -737,13 +738,15 @@ gchar * input_get_info_text(void) { - return current_interface->get_status_text(); + return g_strdup(input_info_text); } void input_set_info_text(const gchar * text) { - current_interface->set_status_text(text); + g_free(input_info_text); + input_info_text = g_strdup(text); + mainwin_set_info_text(); } void @@ -755,15 +758,11 @@ if (!get_current_input_plugin()) return; - current_interface->buffering_notify(ip_data.buffering); - -#if 0 ip_data.buffering = status; if (ip_data.buffering == TRUE && mainwin_playstatus->ps_status == STATUS_STOP) mainwin_playstatus->ps_status = STATUS_PLAY; playstatus_set_status_buffering(mainwin_playstatus, ip_data.buffering); -#endif } void
