X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdirectorysource.h;h=07e1664ee585cd348f79e893cb685c792382dd0a;hb=refs%2Fheads%2Fwip;hp=0710225cc519a6f8eb87c01101c563136b904899;hpb=c634c9a6aac3fbedecc6e2c8ef69fc11dabd49d0;p=libs%2Fdatafile.git

diff --git a/source/directorysource.h b/source/directorysource.h
index 0710225..07e1664 100644
--- a/source/directorysource.h
+++ b/source/directorysource.h
@@ -3,6 +3,7 @@
 
 #include <msp/fs/path.h>
 #include "collectionsource.h"
+#include "mspdatafile_api.h"
 
 namespace Msp {
 namespace DataFile {
@@ -10,17 +11,20 @@ namespace DataFile {
 /**
 A source that load items from files in a directory.
 */
-class DirectorySource: public CollectionSource
+class MSPDATAFILE_API DirectorySource: public CollectionSource
 {
 private:
-	std::list<FS::Path> dirs;
+	typedef std::map<std::string, FS::Path> ObjectMap;
+
+	ObjectMap objects;
 
 public:
-	void add_directory(const FS::Path &);
+	void add_directory(const FS::Path &, bool = true);
 
-	virtual bool is_loadable(const CollectionItemTypeBase &, const std::string &) const;
-	virtual NameList get_names(const CollectionItemTypeBase &) const;
-	virtual void load(Collection &, const CollectionItemTypeBase &, const std::string &) const;
+	bool is_loadable(const CollectionItemTypeBase &, const std::string &) const override;
+	NameList get_names(const CollectionItemTypeBase &) const override;
+	void load(Collection &, const CollectionItemTypeBase &, const std::string &) const override;
+	IO::Seekable *open(const std::string &) const override;
 
 	bool lookup_file(const std::string &, FS::Path &) const;
 };