[Performous-commit] Tapio Vierros : Don't look for bmp or gif images.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: bd688a5ccb4749cb7f8ec29a69a20b7562375245

Author: Tapio Vierros <tap...@gm...>
Date:   Thu Jan 21 08:46:22 2010 +0200

Don't look for bmp or gif images.

---

 game/backgrounds.cc |    2 +-
 game/songparser.hh  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/game/backgrounds.cc b/game/backgrounds.cc
index 15f6611..fcc7fe2 100644
--- a/game/backgrounds.cc
+++ b/game/backgrounds.cc
@@ -51,7 +51,7 @@ void Backgrounds::reload_internal(fs::path const& parent) {
 	if (std::distance(parent.begin(), parent.end()) > 20) { std::cout << ">>> Not scanning: " << parent.string() << " (maximum depth reached, possibly due to cyclic symlinks)" << std::endl; return; }
 	try {
 		// Find suitable file formats
-		boost::regex expression("(.*\\.(png|jpeg|jpg|svg|bmp|gif))$", boost::regex_constants::icase);
+		boost::regex expression("(.*\\.(png|jpeg|jpg|svg))$", boost::regex_constants::icase);
 		boost::cmatch match;
 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
 			fs::path p = dirIt->path();
diff --git a/game/songparser.hh b/game/songparser.hh
index 8165d94..993a3ce 100644
--- a/game/songparser.hh
+++ b/game/songparser.hh
@@ -52,8 +52,8 @@ class SongParser {
 
 		// In case no images/videos were specified, try to guess them
 		if (m_song.cover.empty() || (m_song.background.empty() && m_song.video.empty())) {
-			boost::regex coverfile("((cover|album|label|\\[co\\])\\.(png|jpeg|jpg|svg|bmp|gif))$", boost::regex_constants::icase);
-			boost::regex backgroundfile("((background|bg||\\[bg\\])\\.(png|jpeg|jpg|svg|bmp|gif))$", boost::regex_constants::icase);
+			boost::regex coverfile("((cover|album|label|\\[co\\])\\.(png|jpeg|jpg|svg))$", boost::regex_constants::icase);
+			boost::regex backgroundfile("((background|bg||\\[bg\\])\\.(png|jpeg|jpg|svg))$", boost::regex_constants::icase);
 			boost::regex videofile("(.*\\.(avi|mpg|mpeg|flv|mov|mp4))$", boost::regex_constants::icase);
 			boost::cmatch match;