Mercurial > audlegacy

changeset 4346:6a87d1c1da32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove more ui_* references
author mf0102 <0102@gmx.at>
date Sat, 15 Mar 2008 00:26:49 +0100
parents 51b7809c2d87
children f493c456c77f
files src/audacious/playback.c src/audacious/playlist.c src/audacious/playlist.h src/audacious/plugin.h src/audacious/pluginenum.c src/audacious/visualization.c
diffstat 6 files changed, 5 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/playback.c	Fri Mar 14 19:27:01 2008 +0100
+++ b/src/audacious/playback.c	Sat Mar 15 00:26:49 2008 +0100
@@ -41,21 +41,19 @@
 
 #include "configdb.h"
 
+#include "eventqueue.h"
 #include "hook.h"
-#include "eventqueue.h"
 #include "input.h"
 #include "main.h"
-#include "ui_equalizer.h"
 #include "output.h"
 #include "playlist.h"
+#include "pluginenum.h"
+#include "skin.h"
+#include "ui_equalizer.h"
 #include "ui_main.h"
-#include "ui_playlist.h"
-#include "ui_skinselector.h"
 #include "ui_skinned_playstatus.h"
 #include "util.h"
 #include "visualization.h"
-#include "skin.h"
-#include "pluginenum.h"
 
 #include "playback.h"
 #include "playback_evlisteners.h"
--- a/src/audacious/playlist.c	Fri Mar 14 19:27:01 2008 +0100
+++ b/src/audacious/playlist.c	Sat Mar 15 00:26:49 2008 +0100
@@ -599,44 +599,6 @@
 }
 
 void
-playlist_delete_filenames(Playlist * playlist, GList * filenames)
-{
-    GList *node, *fnode;
-    gboolean set_info_text = FALSE, restart_playing = FALSE;
-
-    PLAYLIST_LOCK(playlist);
-
-    for (fnode = filenames; fnode; fnode = g_list_next(fnode)) {
-        node = playlist->entries;
-
-        while (node) {
-            GList *next = g_list_next(node);
-            PlaylistEntry *entry = node->data;
-
-            if (!strcmp(entry->filename, fnode->data))
-                playlist_delete_node(playlist, node, &set_info_text, &restart_playing);
-
-            node = next;
-        }
-    }
-
-    PLAYLIST_UNLOCK(playlist);
-
-    playlist_recalc_total_time(playlist);
-    PLAYLIST_INCR_SERIAL(playlist);
-    playlistwin_update_list(playlist);
-
-    if (restart_playing) {
-        if (playlist->position)
-            playback_initiate();
-        else
-            mainwin_clear_song_info();
-    }
-
-    playlist_manager_update();
-}
-
-void
 playlist_delete(Playlist * playlist, gboolean crop)
 {
     gboolean restart_playing = FALSE, set_info_text = FALSE;
--- a/src/audacious/playlist.h	Fri Mar 14 19:27:01 2008 +0100
+++ b/src/audacious/playlist.h	Sat Mar 15 00:26:49 2008 +0100
@@ -180,7 +180,6 @@
 void playlist_fileinfo(Playlist *playlist, guint pos);
 
 void playlist_delete_index(Playlist *playlist, guint pos);
-void playlist_delete_filenames(Playlist *playlist, GList * filenames);
 
 PlaylistEntry *playlist_get_entry_to_play(Playlist *playlist);
 
--- a/src/audacious/plugin.h	Fri Mar 14 19:27:01 2008 +0100
+++ b/src/audacious/plugin.h	Sat Mar 15 00:26:49 2008 +0100
@@ -157,7 +157,6 @@
 #include "audacious/mime.h"
 #include "audacious/custom_uri.h"
 #include "audacious/hook.h"
-#include "audacious/ui_plugin_menu.h"
 #include "audacious/formatter.h"
 #include "audacious/flow.h"
 
--- a/src/audacious/pluginenum.c	Fri Mar 14 19:27:01 2008 +0100
+++ b/src/audacious/pluginenum.c	Sat Mar 15 00:26:49 2008 +0100
@@ -226,7 +226,7 @@
     .playlist_fileinfo = playlist_fileinfo,
 
     .playlist_delete_index = playlist_delete_index,
-    .playlist_delete_filenames = playlist_delete_filenames,
+    .playlist_delete_filenames = NULL, /* remove eventually --mf0102 */
 
     .playlist_get_entry_to_play = playlist_get_entry_to_play,
 
--- a/src/audacious/visualization.c	Fri Mar 14 19:27:01 2008 +0100
+++ b/src/audacious/visualization.c	Sat Mar 15 00:26:49 2008 +0100
@@ -36,7 +36,6 @@
 #include "playback.h"
 #include "pluginenum.h"
 #include "plugin.h"
-#include "ui_preferences.h"
 
 VisPluginData vp_data = {
     NULL,