diff options
| author | Max Kellermann <max@duempel.org> | 2014-07-12 17:22:39 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-07-12 17:22:39 +0200 |
| commit | 41a7203c28d2cc7550f1bb05f767950d388326cd (patch) | |
| tree | 0b0970bbaf06b66ec0c0b3a50d90b3f6ef65dd20 /src/SongFilter.cxx | |
| parent | 543a58bb874be8a510d54e91a37797b0c71b1160 (diff) | |
| download | mpd-41a7203c28d2cc7550f1bb05f767950d388326cd.tar.gz mpd-41a7203c28d2cc7550f1bb05f767950d388326cd.tar.xz mpd-41a7203c28d2cc7550f1bb05f767950d388326cd.zip | |
Tag: add class const_iterator and methods begin(), end()
Enables using range-based "for".
Diffstat (limited to '')
| -rw-r--r-- | src/SongFilter.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/SongFilter.cxx b/src/SongFilter.cxx index 0640ae19e..7a8e6fd12 100644 --- a/src/SongFilter.cxx +++ b/src/SongFilter.cxx @@ -92,10 +92,10 @@ SongFilter::Item::Match(const Tag &_tag) const bool visited_types[TAG_NUM_OF_ITEM_TYPES]; std::fill_n(visited_types, size_t(TAG_NUM_OF_ITEM_TYPES), false); - for (unsigned i = 0; i < _tag.num_items; i++) { - visited_types[_tag.items[i]->type] = true; + for (const auto &i : _tag) { + visited_types[i.type] = true; - if (Match(*_tag.items[i])) + if (Match(i)) return true; } @@ -112,12 +112,10 @@ SongFilter::Item::Match(const Tag &_tag) const if (tag == TAG_ALBUM_ARTIST && visited_types[TAG_ARTIST]) { /* if we're looking for "album artist", but only "artist" exists, use that */ - for (unsigned i = 0; i < _tag.num_items; i++) { - const TagItem &item = *_tag.items[i]; + for (const auto &item : _tag) if (item.type == TAG_ARTIST && StringMatch(item.value)) return true; - } } } |