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

Merge branch 'libmpdclient2'

Browse Source 
Conflicts:
	src/browser.cpp
	src/ncmpcpp.cpp
This commit is contained in:
Andrzej Rybczak
2009-10-04 16:23:42 +02:00
parent 008ba5fca8 b0212a3779
commit 409d60ed18
24 changed files with 579 additions and 3648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/browser.cpp
View File

@@ -431,13 +431,12 @@ void Browser::GetLocalDirectory(ItemList &v, const std::string &directory, bool
else if (hasSupportedExtension(file->d_name))
{
new_item.type = itSong;
mpd_Song *s = mpd_newSong();
s->file = str_pool_get(full_path.c_str());
mpd_pair file_pair = { "file", full_path.c_str() };
new_item.song = new Song(mpd_song_begin(&file_pair));
# ifdef HAVE_TAGLIB_H
if (!recursively)
TagEditor::ReadTags(s);
TagEditor::ReadTags(*new_item.song);
# endif // HAVE_TAGLIB_H
new_item.song = new Song(s);
v.push_back(new_item);
}
}