From 3477c1514d92082ba72ff6dc529b19253304fc96 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Fri, 13 Mar 2009 14:35:35 +0100
Subject: [PATCH] put check for playlist filtering in macro

---
 src/ncmpcpp.cpp | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index a62c7df2..200b1d8b 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -46,6 +46,13 @@
 #include "status.h"
 #include "tag_editor.h"
 
+#define CHECK_PLAYLIST_FOR_FILTERING \
+			if (myPlaylist->Main()->isFiltered()) \
+			{ \
+				ShowMessage("%s", MPD::Message::FunctionDisabledFilteringEnabled); \
+				continue; \
+			}
+
 #define CHECK_MPD_MUSIC_DIR \
 			if (Config.mpd_music_dir.empty()) \
 			{ \
@@ -602,12 +609,7 @@ int main(int argc, char *argv[])
 		{
 			if (myScreen == myPlaylist && !myPlaylist->Main()->Empty())
 			{
-				if (myPlaylist->Main()->isFiltered())
-				{
-					ShowMessage("%s", MPD::Message::FunctionDisabledFilteringEnabled);
-					continue;
-				}
-				
+				CHECK_PLAYLIST_FOR_FILTERING;
 				Playlist::BlockUpdate = 1;
 				myPlaylist->Main()->SetTimeout(50);
 				if (myPlaylist->Main()->hasSelected())
@@ -717,12 +719,7 @@ int main(int argc, char *argv[])
 		{
 			if (myScreen == myPlaylist && !myPlaylist->Main()->Empty())
 			{
-				if (myPlaylist->Main()->isFiltered())
-				{
-					ShowMessage("%s", MPD::Message::FunctionDisabledFilteringEnabled);
-					continue;
-				}
-				
+				CHECK_PLAYLIST_FOR_FILTERING;
 				Playlist::BlockUpdate = 1;
 				myPlaylist->Main()->SetTimeout(50);
 				if (myPlaylist->Main()->hasSelected())
@@ -831,11 +828,7 @@ int main(int argc, char *argv[])
 		}
 		else if (Keypressed(input, Key.MoveTo) && myScreen == myPlaylist)
 		{
-			if (myPlaylist->Main()->isFiltered())
-			{
-				ShowMessage("%s", MPD::Message::FunctionDisabledFilteringEnabled);
-				continue;
-			}
+			CHECK_PLAYLIST_FOR_FILTERING;
 			if (!myPlaylist->Main()->hasSelected())
 			{
 				ShowMessage("No selected items to move!");
@@ -1036,11 +1029,7 @@ int main(int argc, char *argv[])
 		{
 			if (myScreen == myPlaylist && myPlaylist->isPlaying())
 			{
-				if (myPlaylist->Main()->isFiltered())
-				{
-					ShowMessage("%s", MPD::Message::FunctionDisabledFilteringEnabled);
-					continue;
-				}
+				CHECK_PLAYLIST_FOR_FILTERING;
 				myPlaylist->Main()->Highlight(myPlaylist->NowPlaying);
 			}
 			else if (myScreen == myBrowser)
@@ -1450,11 +1439,7 @@ int main(int argc, char *argv[])
 		}
 		else if (Keypressed(input, Key.Crop))
 		{
-			if (myPlaylist->Main()->isFiltered())
-			{
-				ShowMessage("%s", MPD::Message::FunctionDisabledFilteringEnabled);
-				continue;
-			}
+			CHECK_PLAYLIST_FOR_FILTERING;
 			if (myPlaylist->Main()->hasSelected())
 			{
 				Mpd->StartCommandsList();
@@ -1508,6 +1493,7 @@ int main(int argc, char *argv[])
 		}
 		else if (Keypressed(input, Key.SortPlaylist) && myScreen == myPlaylist)
 		{
+			CHECK_PLAYLIST_FOR_FILTERING;
 			myPlaylist->Sort();
 			myPlaylist->EnableHighlighting();
 		}