Mercurial > audlegacy
comparison audacious/input.c @ 1649:f3934d790a2e trunk
[svn] - abstractionalize a lot of stuff, build still broken, live with it
author | nenolod |
---|---|
date | Thu, 07 Sep 2006 21:44:05 -0700 |
parents | 15d92c51bde6 |
children | a6e6d3500c13 |
comparison
equal
deleted
inserted
replaced
1648:d878473e6e3e | 1649:f3934d790a2e |
---|---|
29 #include <string.h> | 29 #include <string.h> |
30 | 30 |
31 #include "fft.h" | 31 #include "fft.h" |
32 #include "input.h" | 32 #include "input.h" |
33 #include "main.h" | 33 #include "main.h" |
34 #include "mainwin.h" | |
35 #include "output.h" | 34 #include "output.h" |
36 #include "util.h" | 35 #include "util.h" |
37 #include "visualization.h" | 36 #include "visualization.h" |
38 #include "playback.h" | 37 #include "playback.h" |
39 #include "widgets/widgetcore.h" | |
40 #include "pluginenum.h" | 38 #include "pluginenum.h" |
39 #include "interface.h" | |
41 | 40 |
42 #include "libaudacious/titlestring.h" | 41 #include "libaudacious/titlestring.h" |
43 #include "libaudacious/util.h" | 42 #include "libaudacious/util.h" |
44 #include "libaudacious/xentry.h" | 43 #include "libaudacious/xentry.h" |
45 | 44 |
313 GtkWidget *expander; | 312 GtkWidget *expander; |
314 GtkWidget *scrolled, *treeview; | 313 GtkWidget *scrolled, *treeview; |
315 GtkCellRenderer *renderer; | 314 GtkCellRenderer *renderer; |
316 | 315 |
317 dialog = | 316 dialog = |
318 gtk_message_dialog_new_with_markup(GTK_WINDOW(mainwin), | 317 gtk_message_dialog_new_with_markup(GTK_WINDOW(current_interface->parentwin), |
319 GTK_DIALOG_DESTROY_WITH_PARENT, | 318 GTK_DIALOG_DESTROY_WITH_PARENT, |
320 GTK_MESSAGE_ERROR, | 319 GTK_MESSAGE_ERROR, |
321 GTK_BUTTONS_OK, | 320 GTK_BUTTONS_OK, |
322 _(markup)); | 321 _(markup)); |
323 | 322 |
736 | 735 |
737 | 736 |
738 gchar * | 737 gchar * |
739 input_get_info_text(void) | 738 input_get_info_text(void) |
740 { | 739 { |
741 return g_strdup(input_info_text); | 740 return current_interface->get_status_text(); |
742 } | 741 } |
743 | 742 |
744 void | 743 void |
745 input_set_info_text(const gchar * text) | 744 input_set_info_text(const gchar * text) |
746 { | 745 { |
747 g_free(input_info_text); | 746 current_interface->set_status_text(text); |
748 input_info_text = g_strdup(text); | |
749 mainwin_set_info_text(); | |
750 } | 747 } |
751 | 748 |
752 void | 749 void |
753 input_set_status_buffering(gboolean status) | 750 input_set_status_buffering(gboolean status) |
754 { | 751 { |
756 return; | 753 return; |
757 | 754 |
758 if (!get_current_input_plugin()) | 755 if (!get_current_input_plugin()) |
759 return; | 756 return; |
760 | 757 |
758 current_interface->buffering_notify(ip_data.buffering); | |
759 | |
760 #if 0 | |
761 ip_data.buffering = status; | 761 ip_data.buffering = status; |
762 | 762 |
763 if (ip_data.buffering == TRUE && mainwin_playstatus->ps_status == STATUS_STOP) | 763 if (ip_data.buffering == TRUE && mainwin_playstatus->ps_status == STATUS_STOP) |
764 mainwin_playstatus->ps_status = STATUS_PLAY; | 764 mainwin_playstatus->ps_status = STATUS_PLAY; |
765 playstatus_set_status_buffering(mainwin_playstatus, ip_data.buffering); | 765 playstatus_set_status_buffering(mainwin_playstatus, ip_data.buffering); |
766 #endif | |
766 } | 767 } |
767 | 768 |
768 void | 769 void |
769 input_about(gint index) | 770 input_about(gint index) |
770 { | 771 { |