From 2f971147b143ee280965f413df676d5c128157d0 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Fri, 18 Sep 2009 02:17:30 +0000
Subject: [PATCH] change all Mpd.GetState </> psPlay/psStop to
 (!)Mpd.isPlaying()

---
 src/helpers.cpp    |  2 +-
 src/mpdpp.h        |  2 ++
 src/ncmpcpp.cpp    |  4 ++--
 src/status.cpp     | 12 ++++++------
 src/visualizer.cpp |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/helpers.cpp b/src/helpers.cpp
index f490de74..5711b0d2 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -142,7 +142,7 @@ void ParseArgv(int argc, char **argv)
 				std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
 				exit(1);
 			}
-			if (Mpd.GetState() > psStop)
+			if (Mpd.isPlaying())
 			{
 				if (argc > ++i)
 				{
diff --git a/src/mpdpp.h b/src/mpdpp.h
index da35f33d..1fecf015 100644
--- a/src/mpdpp.h
+++ b/src/mpdpp.h
@@ -118,6 +118,8 @@ namespace MPD
 			void Shuffle() const;
 			void ClearPlaylist() const;
 			
+			bool isPlaying() const { return GetState() > psStop; }
+			
 			PlayerState GetState() const { return isConnected && itsCurrentStatus ? PlayerState(itsCurrentStatus->state) : psUnknown; }
 			bool GetRepeat() const { return isConnected && itsCurrentStatus ? itsCurrentStatus->repeat : 0; }
 			bool GetRandom() const { return isConnected && itsCurrentStatus ? itsCurrentStatus->random : 0; }
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 7e4945fe..179ff432 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -394,7 +394,7 @@ int main(int argc, char *argv[])
 			}
 			else if (mouse_event.bstate & BUTTON1_PRESSED
 			     &&	 (Config.statusbar_visibility || Config.new_design)
-			     &&	 Mpd.GetState() > psStop
+			     &&	 Mpd.isPlaying()
 			     &&	 mouse_event.y == (Config.new_design ? 1 : LINES-1) && mouse_event.x < 9
 				) // playing/paused
 			{
@@ -474,7 +474,7 @@ int main(int argc, char *argv[])
 			myScreen->Refresh();
 			RedrawStatusbar = 1;
 			StatusChanges changes;
-			if (Mpd.GetState() < psPlay || design_changed)
+			if (!Mpd.isPlaying() || design_changed)
 			{
 				changes.PlayerState = 1;
 				if (design_changed)
diff --git a/src/status.cpp b/src/status.cpp
index a3986852..2f0f53d0 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -106,7 +106,7 @@ void UnlockStatusbar()
 		else
 			block_progressbar_update = 0;
 	}
-	if (Mpd.GetState() < psPlay)
+	if (!Mpd.isPlaying())
 		Statusbar() << wclrtoeol;
 }
 
@@ -144,7 +144,7 @@ void TraceMpdStatus()
 			else
 				block_progressbar_update = !allow_statusbar_unlock;
 			
-			if (Mpd.GetState() < psPlay && !block_statusbar_update && !block_progressbar_update)
+			if (!Mpd.isPlaying() && !block_statusbar_update && !block_progressbar_update)
 			{
 				if (Config.new_design)
 					mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
@@ -210,7 +210,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
 		if (!Playlist::BlockUpdate)
 		{
 			np = Mpd.GetCurrentSong();
-			if (Mpd.GetState() > psStop)
+			if (Mpd.isPlaying())
 				WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
 			
 			bool was_filtered = myPlaylist->Items->isFiltered();
@@ -372,7 +372,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
 			
 			if (!Config.execute_on_song_change.empty())
 				system(Config.execute_on_song_change.c_str());
-			if (Mpd.GetState() > psStop)
+			if (Mpd.isPlaying())
 				WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
 			if (Config.autocenter_mode && !myPlaylist->Items->isFiltered())
 				myPlaylist->Items->Highlight(myPlaylist->NowPlaying);
@@ -391,7 +391,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
 	}
 	static time_t now, past = 0;
 	time(&now);
-	if (((now > past || changed.SongID) && Mpd.GetState() > psStop) || RedrawStatusbar)
+	if (((now > past || changed.SongID) && Mpd.isPlaying()) || RedrawStatusbar)
 	{
 		time(&past);
 		if (np.Empty())
@@ -399,7 +399,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
 			np = Mpd.GetCurrentSong();
 			WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
 		}
-		if (!np.Empty() && Mpd.GetState() > psStop)
+		if (!np.Empty() && Mpd.isPlaying())
 		{
 			changed.ElapsedTime = 1;
 			
diff --git a/src/visualizer.cpp b/src/visualizer.cpp
index f8be0498..3979c1f7 100644
--- a/src/visualizer.cpp
+++ b/src/visualizer.cpp
@@ -94,7 +94,7 @@ void Visualizer::Update()
 		return;
 	
 	// if mpd is stopped, clear the screen
-	if (Mpd.GetState() < MPD::psPlay)
+	if (!Mpd.isPlaying())
 	{
 		w->Clear();
 		return;