← Back to branch summary

~ps-jenkins/mediascanner2/trusty-proposed

« back to all changes in this revision

Viewing changes to src/mediascanner/MediaStore.hh

  • Committer: CI bot
  • Author(s): James Henstridge
  • Date: 2014-03-07 17:40:02 UTC
  • mfrom: (211.1.7 megamerge)
  • Revision ID: ps-jenkins@lists.canonical.com-20140307174002-udfe610ez85ixbik
Merge  lp:~jamesh/mediascanner2/qml-plugin,  lp:~jamesh/mediascanner2/short-searches,  lp:~jpakkane/mediascanner2/errmsg, lp:~jpakkane/mediascanner2/cleanshutdown,  lp:~jpakkane/mediascanner2/threadness and lp:~jamesh/mediascanner2/glib-main-loop 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mediascanner/MediaStore.hh
53
53
    std::vector<Album> queryAlbums(const std::string &core_term, int limit=-1) const;
54
54
    std::vector<MediaFile> getAlbumSongs(const Album& album) const;
55
55
    std::string getETag(const std::string &filename) const;
 
56
    std::vector<MediaFile> listSongs(const std::string& artist="", const std::string& album="", const std::string& album_artist="", int limit=-1) const;
 
57
    std::vector<Album> listAlbums(const std::string& artist="", const std::string& album_artist="", int limit=-1) const;
 
58
    std::vector<std::string> listArtists(bool album_artists, int limit=-1);
56
59
 
57
60
    size_t size() const;
58
61
    void pruneDeleted();