diff options
| -rw-r--r-- | xbmc/interfaces/legacy/Player.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/xbmc/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp index 433dea9356..10f789cf91 100644 --- a/xbmc/interfaces/legacy/Player.cpp +++ b/xbmc/interfaces/legacy/Player.cpp @@ -28,7 +28,6 @@ #include "ApplicationMessenger.h" #include "GUIInfoManager.h" #include "AddonUtils.h" -#include "utils/LangCodeExpander.h" #include "utils/log.h" #include "cores/IPlayer.h" @@ -396,11 +395,11 @@ namespace XBMCAddon { SPlayerSubtitleStreamInfo info; g_application.m_pPlayer->GetSubtitleStreamInfo(g_application.m_pPlayer->GetSubtitle(), info); - CStdString strName = info.name; - if (strName == "Unknown(Invalid)") - strName = ""; - return strName; + if (info.language.length() > 0) + return info.language; + else + return info.name; } return NULL; @@ -428,10 +427,10 @@ namespace XBMCAddon SPlayerSubtitleStreamInfo info; g_application.m_pPlayer->GetSubtitleStreamInfo(iStream, info); - CStdString FullLang; - if (!g_LangCodeExpander.Lookup(FullLang, info.name)) - FullLang = info.name; - (*ret)[iStream] = FullLang; + if (info.language.length() > 0) + (*ret)[iStream] = info.language; + else + (*ret)[iStream] = info.name; } return ret; } @@ -463,11 +462,10 @@ namespace XBMCAddon SPlayerAudioStreamInfo info; g_application.m_pPlayer->GetAudioStreamInfo(iStream, info); - CStdString FullLang; - g_LangCodeExpander.Lookup(FullLang, info.language); - if (FullLang.IsEmpty()) - FullLang = info.name; - (*ret)[iStream] = FullLang; + if (info.language.length() > 0) + (*ret)[iStream] = info.language; + else + (*ret)[iStream] = info.name; } return ret; } |