Merge branch 'rarified/movieplayer'

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp

@@ -300,9 +300,11 @@ bool plMoviePlayer::ILoadAudio()
 
 bool plMoviePlayer::ICheckLanguage(const mkvparser::Track* track)
 {
+#if defined(_MSC_VER) && _MSC_VER >= 1800
     std::set<std::string> codes = plLocalization::GetLanguageCodes(plLocalization::GetLanguage());
     if (codes.find(track->GetLanguage()) != codes.end())
         return true;
+#endif
     return false;
 }
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp

@@ -57,6 +57,7 @@ const char* plLocalization::fLangTags[] =
 };
 const int kLangTagLen = 4;
 
+#if defined(_MSC_VER) && _MSC_VER >= 1800
 std::string fLangCodes_en[] = {"eng", "en"};
 std::string fLangCodes_fr[] = {"fre", "fra", "fr"};
 std::string fLangCodes_de[] = {"ger", "deu", "de"};
@@ -72,6 +73,7 @@ const std::set<std::string> plLocalization::fLangCodes[] =
 		std::set<std::string>(std::begin(fLangCodes_it), std::end(fLangCodes_it)),
 		std::set<std::string>(std::begin(fLangCodes_ja), std::end(fLangCodes_ja))
 };
+#endif
 
 const char* plLocalization::fLangNames[] =
 {

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h

@@ -77,7 +77,9 @@ public:
 protected:
 	static Language fLanguage;
 	static const char* fLangTags[kNumLanguages];
+#if defined(_MSC_VER) && _MSC_VER >= 1800
 	static const std::set<std::string> fLangCodes[kNumLanguages];
+#endif
 	static const char* fLangNames[kNumLanguages];
 	static bool fUsesUnicode[kNumLanguages];
 	static encodingTypes fUnicodeEncoding[kNumLanguages];