diff src/audacious/playlist.c @ 4504:a47288ced5d5

- renamed some files to reflect their UI contents - use more hooks now to call stuff
author mf0102 <0102@gmx.at>
date Tue, 22 Apr 2008 10:55:35 +0200
parents 180996fcf12a
children a849b8af8db6
line wrap: on
line diff
--- a/src/audacious/playlist.c	Mon Apr 21 23:40:09 2008 +0300
+++ b/src/audacious/playlist.c	Tue Apr 22 10:55:35 2008 +0200
@@ -55,7 +55,6 @@
 #endif
 
 #include "input.h"
-#include "main.h"
 #include "ui_main.h"
 #include "util.h"
 #include "configdb.h"
@@ -75,7 +74,6 @@
 #include "pluginenum.h"
 
 #include "playlist_evmessages.h"
-#include "playlist_evlisteners.h"
 
 typedef gint (*PlaylistCompareFunc) (PlaylistEntry * a, PlaylistEntry * b);
 typedef void (*PlaylistSaveFunc) (FILE * file);
@@ -292,8 +290,6 @@
     initial_pl = playlist_new();
 
     playlist_add_playlist(initial_pl);
-
-    playlist_evlistener_init();
 }
 
 void
@@ -317,7 +313,7 @@
         ip_data.stop = TRUE;
         playback_stop();
         ip_data.stop = FALSE;
-        mainwin_clear_song_info();
+        hook_call("playlist end reached", NULL);
     }
 
     /* trying to free the last playlist simply clears and resets it */
@@ -591,7 +587,7 @@
         if (playlist->position)
             playback_initiate();
         else
-            mainwin_clear_song_info();
+            hook_call("playlist end reached", NULL);
     }
 
     playlist_manager_update();
@@ -631,7 +627,7 @@
         if (playlist->position)
             playback_initiate();
         else
-            mainwin_clear_song_info();
+            hook_call("playlist end reached", NULL);
     }
 
     playlistwin_update_list(playlist);
@@ -1495,15 +1491,16 @@
 
     if (cfg.no_playlist_advance) {
         PLAYLIST_UNLOCK(playlist);
-        mainwin_clear_song_info();
         if (cfg.repeat)
             playback_initiate();
+        else
+            hook_call("playlist end reached", NULL);
         return;
     }
 
     if (cfg.stopaftersong) {
         PLAYLIST_UNLOCK(playlist);
-        mainwin_clear_song_info();
+        hook_call("playlist end reached", NULL);
         mainwin_set_stopaftersong(FALSE);
         return;
     }
@@ -1521,8 +1518,7 @@
 
         if (!cfg.repeat) {
             PLAYLIST_UNLOCK(playlist);
-	    hook_call("playlist end reached", playlist->position);
-            mainwin_clear_song_info();
+            hook_call("playlist end reached", NULL);
             return;
         }
     }