changeset 4345:51b7809c2d87

- removed some unused ui_*.h references - deprecated set_status_buffering() and buffering variable
author mf0102 <0102@gmx.at>
date Fri, 14 Mar 2008 19:27:01 +0100
parents db5555dcb744
children 6a87d1c1da32
files src/audacious/input.c src/audacious/input.h src/audacious/playback.c src/audacious/plugin.h src/audacious/pluginenum.c src/audacious/signals.c
diffstat 6 files changed, 2 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/input.c	Thu Mar 13 23:59:17 2008 +0100
+++ b/src/audacious/input.c	Fri Mar 14 19:27:01 2008 +0100
@@ -45,10 +45,8 @@
 #include "strings.h"
 #include "tuple.h"
 #include "tuple_formatter.h"
-#include "ui_main.h"
 #include "util.h"
 #include "visualization.h"
-#include "ui_skinned_playstatus.h"
 #include "hook.h"
 
 #include "vfs.h"
@@ -77,7 +75,6 @@
     FALSE,
     FALSE,
     FALSE,
-    FALSE,
     NULL
 };
 
@@ -786,22 +783,3 @@
     gchar *title = g_strdup(text);
     event_queue("title change", title);
 }
-
-void
-input_set_status_buffering(gboolean status)
-{
-    if (!playback_get_playing())
-        return;
-
-    if (!get_current_input_playback())
-        return;
-
-    ip_data.buffering = status;
-
-    g_return_if_fail(mainwin_playstatus != NULL);
-
-    if (ip_data.buffering == TRUE && mainwin_playstatus != NULL && UI_SKINNED_PLAYSTATUS(mainwin_playstatus)->status == STATUS_STOP)
-        UI_SKINNED_PLAYSTATUS(mainwin_playstatus)->status = STATUS_PLAY;
-
-    ui_skinned_playstatus_set_buffering(mainwin_playstatus, ip_data.buffering);
-}
--- a/src/audacious/input.h	Thu Mar 13 23:59:17 2008 +0100
+++ b/src/audacious/input.h	Fri Mar 14 19:27:01 2008 +0100
@@ -36,7 +36,6 @@
     gboolean playing;
     gboolean paused;
     gboolean stop;
-    gboolean buffering;
     GMutex *playback_mutex;
 };
 
@@ -66,7 +65,6 @@
 void input_update_vis(gint time);
 
 void input_set_info_text(gchar * text);
-void input_set_status_buffering(gboolean status);
 
 GList *input_scan_dir(const gchar * dir);
 void input_get_volume(gint * l, gint * r);
--- a/src/audacious/playback.c	Thu Mar 13 23:59:17 2008 +0100
+++ b/src/audacious/playback.c	Fri Mar 14 19:27:01 2008 +0100
@@ -332,7 +332,6 @@
 #endif
     }
 
-    ip_data.buffering = FALSE;
     ip_data.playing = FALSE;
 
     if (song_info_timeout_source)
--- a/src/audacious/plugin.h	Thu Mar 13 23:59:17 2008 +0100
+++ b/src/audacious/plugin.h	Fri Mar 14 19:27:01 2008 +0100
@@ -1144,7 +1144,7 @@
     /* Added in Audacious 1.1.0 */
     Tuple *(*get_song_tuple) (gchar * filename);
     void (*set_song_tuple) (Tuple * tuple); /* stillborn, obsoleted by update_song_tuple, which must be used for tag writing */
-    void (*set_status_buffering) (gboolean status);
+    void (*set_status_buffering) (gboolean status); /* unfunctional */
 
     /* Added in Audacious 1.3.0 */
     gint (*is_our_file_from_vfs) (gchar *filename, VFSFile *fd);
--- a/src/audacious/pluginenum.c	Thu Mar 13 23:59:17 2008 +0100
+++ b/src/audacious/pluginenum.c	Fri Mar 14 19:27:01 2008 +0100
@@ -39,7 +39,6 @@
 
 #include "main.h"
 #include "dock.h"
-#include "ui_main.h"
 #include "playback.h"
 #include "playlist.h"
 #include "strings.h"
@@ -551,7 +550,7 @@
        - descender */
     p->set_info = (void (*)(gchar *, gint, gint, gint, gint)) playlist_set_info_old_abi;
     p->set_info_text = input_set_info_text;
-    p->set_status_buffering = input_set_status_buffering;
+    p->set_status_buffering = NULL; /* XXX: remove this someday --mf0102 */
 
     ip_data.input_list = g_list_append(ip_data.input_list, p);
     
--- a/src/audacious/signals.c	Thu Mar 13 23:59:17 2008 +0100
+++ b/src/audacious/signals.c	Fri Mar 14 19:27:01 2008 +0100
@@ -33,7 +33,6 @@
 #endif
 
 #include "main.h"
-#include "ui_main.h"
 #include "signals.h"
 #include "build_stamp.h"
 #include "eggsmclient.h"