NotesLoader is just a namespace. If you want to load a particular directory, there's no need to create a specialized loader, just call NotesLoader::LoadFromDir().

2007-02-14 12:26:36 +00:00
parent c827907980
commit 61ae8c3c1b
9 changed files with 56 additions and 84 deletions
@@ -7,20 +7,11 @@

 class Song;

-class NotesLoader
+namespace NotesLoader
 {
-protected:
-	set<RString> BlacklistedImages;
-
-public:
-	virtual ~NotesLoader() { }
-	const set<RString> &GetBlacklistedImages() const { return BlacklistedImages; }
-	static void GetMainAndSubTitlesFromFullTitle( const RString &sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut );
-	virtual bool LoadFromDir( const RString &sPath, Song &out ) = 0;
-	virtual void TidyUpData( Song &song, bool cache ) { }
-
-	static NotesLoader *MakeLoader( const RString& sDir );
-};
+	void GetMainAndSubTitlesFromFullTitle( const RString &sFullTitle, RString &sMainTitleOut, RString &sSubTitleOut );
+	bool LoadFromDir( const RString &sPath, Song &out, set<RString> &BlacklistedImages );
+}

 #endif