song list: get rid of boost::zip_iterator and improve {Const,}SongIterator

2016-12-08 04:28:43 +01:00
parent 612f8c3145
commit b7386c4fa6
15 changed files with 244 additions and 161 deletions
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -87,8 +87,7 @@ void setProperties(NC::Menu<T> &menu, const MPD::Song &s, const SongList &list,
 		auto next = list.beginS() + drawn_pos + 1;
 		if (next != list.endS())
 		{
-			auto next_s = next->get<Bit::Song>();
-			if (next_s != nullptr && next_s->getAlbum() != s.getAlbum())
+			if (next->song() != nullptr && next->song()->getAlbum() != s.getAlbum())
 				separate_albums = true;
 		}
 	}