Added functions to ActorUtil for converting the extension to a file type and changed various places that had lists of extensions to use ActorUtil instead of duplicating the list of extensions. Added webm and wmv to list of video types.

2014-11-09 00:04:47 -07:00
parent 77130ed3c4
commit e22e99251e
12 changed files with 208 additions and 130 deletions
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "ActorUtil.h"
 #include "RageSurface_Load.h"
 #include "RageSurface_Load_PNG.h"
 #include "RageSurface_Load_JPEG.h"
@@ -85,11 +86,12 @@ RageSurface *RageSurfaceUtils::LoadFile( const RString &sPath, RString &error, b
 	}

 	set<RString> FileTypes;
-	FileTypes.insert("png");
-	FileTypes.insert("jpg");
-	FileTypes.insert("jpeg");
-	FileTypes.insert("gif");
-	FileTypes.insert("bmp");
+	vector<RString> const& exts= ActorUtil::GetTypeExtensionList(FT_Bitmap);
+	for(vector<RString>::const_iterator curr= exts.begin();
+			curr != exts.end(); ++curr)
+	{
+		FileTypes.insert(*curr);
+	}

 	RString format = GetExtension(sPath);
 	format.MakeLower();