ncmpcpp
diff --git a/‎src/actions.cpp‎
Lines changed: 6 additions & 6 deletions b/‎src/actions.cpp‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎src/browser.cpp‎
Lines changed: 1 addition & 1 deletion b/‎src/browser.cpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/helpers.h‎
Lines changed: 15 additions & 7 deletions b/‎src/helpers.h‎
Lines changed: 15 additions & 7 deletions
@@ -1167,7 +1167,7 @@ void TogglePlayingSongCentering::run()
 	{
 		auto s = myPlaylist->nowPlayingSong();
 		if (!s.empty())
-			myPlaylist->moveToSong(s);
+			myPlaylist->locateSong(s);
 	}
 }
 
@@ -1197,15 +1197,15 @@ void JumpToPlayingSong::run()
 		return;
 	if (myScreen == myPlaylist)
 	{
-		myPlaylist->moveToSong(s);
+		myPlaylist->locateSong(s);
 	}
 	else if (myScreen == myBrowser)
 	{
 		myBrowser->locateSong(s);
 	}
 	else if (myScreen == myLibrary)
 	{
-		myLibrary->LocateSong(s);
+		myLibrary->locateSong(s);
 	}
 }
 
@@ -1611,7 +1611,7 @@ bool JumpToMediaLibrary::canBeRun()
 
 void JumpToMediaLibrary::run()
 {
-	myLibrary->LocateSong(*m_song);
+	myLibrary->locateSong(*m_song);
 }
 
 bool JumpToPlaylistEditor::canBeRun()
@@ -2226,7 +2226,7 @@ void ToggleBrowserSortMode::run()
 bool ToggleLibraryTagType::canBeRun()
 {
 	return (myScreen->isActiveWindow(myLibrary->Tags))
-	    || (myLibrary->Columns() == 2 && myScreen->isActiveWindow(myLibrary->Albums));
+	    || (myLibrary->columns() == 2 && myScreen->isActiveWindow(myLibrary->Albums));
 }
 
 void ToggleLibraryTagType::run()
@@ -2257,7 +2257,7 @@ void ToggleLibraryTagType::run()
 		std::string and_mtime = Config.media_library_sort_by_mtime ?
 		                        " and mtime" :
 		                        "";
-		if (myLibrary->Columns() == 2)
+		if (myLibrary->columns() == 2)
 		{
 			myLibrary->Songs.clear();
 			myLibrary->Albums.reset();
 
@@ -456,7 +456,7 @@ bool Browser::enterDirectory()
 
 void Browser::getDirectory(std::string directory)
 {
-	ScopedUnfilteredMenu<MPD::Item, ReapplyFilter::Yes> sunfilter(w);
+	ScopedUnfilteredMenu<MPD::Item> sunfilter(ReapplyFilter::Yes, w);
 
 	m_scroll_beginning = 0;
 	w.clear();
 
@@ -34,11 +34,11 @@
 
 enum ReapplyFilter { Yes, No };
 
-template <typename ItemT, ReapplyFilter reapplyFilter>
+template <typename ItemT>
 struct ScopedUnfilteredMenu
 {
-	ScopedUnfilteredMenu(NC::Menu<ItemT> &menu)
-		: m_menu(menu)
+	ScopedUnfilteredMenu(ReapplyFilter reapply_filter, NC::Menu<ItemT> &menu)
+		: m_refresh(false), m_reapply_filter(reapply_filter), m_menu(menu)
 	{
 		m_is_filtered = m_menu.isFiltered();
 		if (m_is_filtered)
@@ -49,7 +49,7 @@ struct ScopedUnfilteredMenu
 	{
 		if (m_is_filtered)
 		{
-			switch (reapplyFilter)
+			switch (m_reapply_filter)
 			{
 			case ReapplyFilter::Yes:
 				m_menu.reapplyFilter();
@@ -59,10 +59,20 @@ struct ScopedUnfilteredMenu
 				break;
 			}
 		}
+		if (m_refresh)
+			m_menu.refresh();
+	}
+
+	void set(ReapplyFilter reapply_filter, bool refresh)
+	{
+		m_reapply_filter = reapply_filter;
+		m_refresh = refresh;
 	}
 
 private:
 	bool m_is_filtered;
+	bool m_refresh;
+	ReapplyFilter m_reapply_filter;
 	NC::Menu<ItemT> &m_menu;
 };
 
@@ -375,9 +385,7 @@ template <typename Iterator> std::string getSharedDirectory(Iterator first, Iter
 template <typename ListT>
 void markSongsInPlaylist(ListT &list)
 {
-	ScopedUnfilteredMenu<
-		typename ListT::Item::Type,
-		ReapplyFilter::No> sunfilter(list);
+	ScopedUnfilteredMenu<typename ListT::Item::Type> sunfilter(ReapplyFilter::No, list);
 	MPD::Song *s;
 	for (auto &p : static_cast<SongList &>(list))
 	{
Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ void TogglePlayingSongCentering::run()`
`1167`	`1167`	`{`
`1168`	`1168`	`auto s = myPlaylist->nowPlayingSong();`
`1169`	`1169`	`if (!s.empty())`
`1170`		`- myPlaylist->moveToSong(s);`
	`1170`	`+ myPlaylist->locateSong(s);`
`1171`	`1171`	`}`
`1172`	`1172`	`}`
`1173`	`1173`
`@@ -1197,15 +1197,15 @@ void JumpToPlayingSong::run()`
`1197`	`1197`	`return;`
`1198`	`1198`	`if (myScreen == myPlaylist)`
`1199`	`1199`	`{`
`1200`		`- myPlaylist->moveToSong(s);`
	`1200`	`+ myPlaylist->locateSong(s);`
`1201`	`1201`	`}`
`1202`	`1202`	`else if (myScreen == myBrowser)`
`1203`	`1203`	`{`
`1204`	`1204`	`myBrowser->locateSong(s);`
`1205`	`1205`	`}`
`1206`	`1206`	`else if (myScreen == myLibrary)`
`1207`	`1207`	`{`
`1208`		`- myLibrary->LocateSong(s);`
	`1208`	`+ myLibrary->locateSong(s);`
`1209`	`1209`	`}`
`1210`	`1210`	`}`
`1211`	`1211`
`@@ -1611,7 +1611,7 @@ bool JumpToMediaLibrary::canBeRun()`
`1611`	`1611`
`1612`	`1612`	`void JumpToMediaLibrary::run()`
`1613`	`1613`	`{`
`1614`		`- myLibrary->LocateSong(*m_song);`
	`1614`	`+ myLibrary->locateSong(*m_song);`
`1615`	`1615`	`}`
`1616`	`1616`
`1617`	`1617`	`bool JumpToPlaylistEditor::canBeRun()`
`@@ -2226,7 +2226,7 @@ void ToggleBrowserSortMode::run()`
`2226`	`2226`	`bool ToggleLibraryTagType::canBeRun()`
`2227`	`2227`	`{`
`2228`	`2228`	`return (myScreen->isActiveWindow(myLibrary->Tags))`
`2229`		`- \|\| (myLibrary->Columns() == 2 && myScreen->isActiveWindow(myLibrary->Albums));`
	`2229`	`+ \|\| (myLibrary->columns() == 2 && myScreen->isActiveWindow(myLibrary->Albums));`
`2230`	`2230`	`}`
`2231`	`2231`
`2232`	`2232`	`void ToggleLibraryTagType::run()`
`@@ -2257,7 +2257,7 @@ void ToggleLibraryTagType::run()`
`2257`	`2257`	`std::string and_mtime = Config.media_library_sort_by_mtime ?`
`2258`	`2258`	`" and mtime" :`
`2259`	`2259`	`"";`
`2260`		`- if (myLibrary->Columns() == 2)`
	`2260`	`+ if (myLibrary->columns() == 2)`
`2261`	`2261`	`{`
`2262`	`2262`	`myLibrary->Songs.clear();`
`2263`	`2263`	`myLibrary->Albums.reset();`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ bool Browser::enterDirectory()`
`456`	`456`
`457`	`457`	`void Browser::getDirectory(std::string directory)`
`458`	`458`	`{`
`459`		`- ScopedUnfilteredMenu<MPD::Item, ReapplyFilter::Yes> sunfilter(w);`
	`459`	`+ ScopedUnfilteredMenu<MPD::Item> sunfilter(ReapplyFilter::Yes, w);`
`460`	`460`
`461`	`461`	`m_scroll_beginning = 0;`
`462`	`462`	`w.clear();`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@`
`34`	`34`
`35`	`35`	`enum ReapplyFilter { Yes, No };`
`36`	`36`
`37`		`-template <typename ItemT, ReapplyFilter reapplyFilter>`
	`37`	`+template <typename ItemT>`
`38`	`38`	`struct ScopedUnfilteredMenu`
`39`	`39`	`{`
`40`		`- ScopedUnfilteredMenu(NC::Menu<ItemT> &menu)`
`41`		`- : m_menu(menu)`
	`40`	`+ ScopedUnfilteredMenu(ReapplyFilter reapply_filter, NC::Menu<ItemT> &menu)`
	`41`	`+ : m_refresh(false), m_reapply_filter(reapply_filter), m_menu(menu)`
`42`	`42`	`{`
`43`	`43`	`m_is_filtered = m_menu.isFiltered();`
`44`	`44`	`if (m_is_filtered)`
`@@ -49,7 +49,7 @@ struct ScopedUnfilteredMenu`
`49`	`49`	`{`
`50`	`50`	`if (m_is_filtered)`
`51`	`51`	`{`
`52`		`- switch (reapplyFilter)`
	`52`	`+ switch (m_reapply_filter)`
`53`	`53`	`{`
`54`	`54`	`case ReapplyFilter::Yes:`
`55`	`55`	`m_menu.reapplyFilter();`
`@@ -59,10 +59,20 @@ struct ScopedUnfilteredMenu`
`59`	`59`	`break;`
`60`	`60`	`}`
`61`	`61`	`}`
	`62`	`+ if (m_refresh)`
	`63`	`+ m_menu.refresh();`
	`64`	`+ }`
	`65`	`+`
	`66`	`+ void set(ReapplyFilter reapply_filter, bool refresh)`
	`67`	`+ {`
	`68`	`+ m_reapply_filter = reapply_filter;`
	`69`	`+ m_refresh = refresh;`
`62`	`70`	`}`
`63`	`71`
`64`	`72`	`private:`
`65`	`73`	`bool m_is_filtered;`
	`74`	`+ bool m_refresh;`
	`75`	`+ ReapplyFilter m_reapply_filter;`
`66`	`76`	`NC::Menu<ItemT> &m_menu;`
`67`	`77`	`};`
`68`	`78`
`@@ -375,9 +385,7 @@ template <typename Iterator> std::string getSharedDirectory(Iterator first, Iter`
`375`	`385`	`template <typename ListT>`
`376`	`386`	`void markSongsInPlaylist(ListT &list)`
`377`	`387`	`{`
`378`		`- ScopedUnfilteredMenu<`
`379`		`- typename ListT::Item::Type,`
`380`		`- ReapplyFilter::No> sunfilter(list);`
	`388`	`+ ScopedUnfilteredMenu<typename ListT::Item::Type> sunfilter(ReapplyFilter::No, list);`
`381`	`389`	`MPD::Song *s;`
`382`	`390`	`for (auto &p : static_cast<SongList &>(list))`
`383`	`391`	`{`