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

replace ProxySongList with NC::List and SongList

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-05-10 12:14:56 +02:00
parent a7dab01eff
commit a8e2ec5ed0
32 changed files with 951 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/search_engine.h
View File

@@ -27,6 +27,7 @@
#include "mpdpp.h"
#include "regex_filter.h"
#include "screen.h"
#include "song_list.h"
struct SEItem
{
@@ -74,11 +75,27 @@ private:
MPD::Song m_song;
};
struct SearchEngine: Screen<NC::Menu<SEItem>>, HasSongs, Searchable, Tabbable
struct SearchEngineWindow: NC::Menu<SEItem>, SongList
{
SearchEngineWindow() { }
SearchEngineWindow(NC::Menu<SEItem> &&base)
: NC::Menu<SEItem>(std::move(base)) { }
virtual SongIterator currentS() OVERRIDE;
virtual ConstSongIterator currentS() const OVERRIDE;
virtual SongIterator beginS() OVERRIDE;
virtual ConstSongIterator beginS() const OVERRIDE;
virtual SongIterator endS() OVERRIDE;
virtual ConstSongIterator endS() const OVERRIDE;
virtual std::vector<MPD::Song> getSelectedSongs() OVERRIDE;
};
struct SearchEngine: Screen<SearchEngineWindow>, HasSongs, Searchable, Tabbable
{
SearchEngine();
// Screen< NC::Menu<SEItem> > implementation
// Screen<SearchEngineWindow> implementation
virtual void resize() OVERRIDE;
virtual void switchTo() OVERRIDE;
@@ -101,11 +118,6 @@ struct SearchEngine: Screen<NC::Menu<SEItem>>, HasSongs, Searchable, Tabbable
virtual bool find(SearchDirection direction, bool wrap, bool skip_current) OVERRIDE;
// HasSongs implementation
virtual ProxySongList proxySongList() OVERRIDE;
virtual bool allowsSelection() OVERRIDE;
virtual void selectCurrent() OVERRIDE;
virtual void reverseSelection() OVERRIDE;
virtual std::vector<MPD::Song> getSelectedSongs() OVERRIDE;
// private members