remove extern int now_playing

2009-02-14 15:18:13 +01:00
parent 8653232a2a
commit 11622b7ba5
6 changed files with 61 additions and 47 deletions
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -20,11 +20,14 @@

 #include "display.h"
 #include "global.h"
+#include "helpers.h"
 #include "menu.h"
 #include "playlist.h"
 #include "song.h"
+#include "status_checker.h"

 using namespace Global;
+using std::vector;

 Playlist *myPlaylist = new Playlist;

@@ -141,3 +144,8 @@ std::string Playlist::TotalLength()
 	return result.str();
 }

+const MPD::Song &Playlist::NowPlayingSong()
+{
+	static MPD::Song null;
+	return isPlaying() ? w->at(NowPlaying) : null;
+}