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

mpd: make ItemType enum class

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-11-01 22:45:27 +01:00
parent 9a1afece86
commit fabd24c6a5
9 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mpdpp.cpp
View File

@@ -607,7 +607,7 @@ void Connection::SavePlaylist(const std::string &name)
void Connection::GetPlaylists(StringConsumer f)
{
GetDirectory("/", [&f](Item &&item) {
if (item.type == itPlaylist)
if (item.type == MPD::Item::Type::Playlist)
f(std::move(item.name));
});
}
@@ -688,15 +688,15 @@ void Connection::GetDirectory(const std::string &directory, ItemConsumer f)
{
case MPD_ENTITY_TYPE_DIRECTORY:
it.name = mpd_directory_get_path(mpd_entity_get_directory(item));
it.type = itDirectory;
it.type = MPD::Item::Type::Directory;
break;
case MPD_ENTITY_TYPE_SONG:
it.song = Song(mpd_song_dup(mpd_entity_get_song(item)));
it.type = itSong;
it.type = MPD::Item::Type::Song;
break;
case MPD_ENTITY_TYPE_PLAYLIST:
it.name = mpd_playlist_get_path(mpd_entity_get_playlist(item));
it.type = itPlaylist;
it.type = MPD::Item::Type::Playlist;
break;
default:
assert(false);