Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put check for playlist filtering in macro

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-03-13 14:35:35 +01:00
parent 2c1647d57a
commit 3477c1514d
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/ncmpcpp.cpp
View File

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