diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2015-02-22 12:39:11 +0100 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2015-02-22 12:39:11 +0100 |
| commit | 10d8d19162ba26ecc80f4c8966d338f841d6c44f (patch) | |
| tree | 01adc05fe7972653f687c25188faf859262abbe3 | |
| parent | 5c9c5d58852e96f5df2a729c348996f4e9312427 (diff) | |
| parent | c8da5116a2024fec632d849dd0c44b939242f120 (diff) | |
Merge pull request #6513 from FernetMenta/avinfo
dvdplayer: fix missing audio info
| -rw-r--r-- | xbmc/GUIInfoManager.cpp | 4 | ||||
| -rw-r--r-- | xbmc/cores/IPlayer.h | 2 | ||||
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDPlayer.cpp | 3 | ||||
| -rw-r--r-- | xbmc/video/dialogs/GUIDialogSubtitles.cpp | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index 3c5c30c27a..700c13d175 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -1680,7 +1680,7 @@ std::string CGUIInfoManager::GetLabel(int info, int contextWindow, std::string * if(g_application.m_pPlayer->IsPlaying()) { SPlayerAudioStreamInfo info; - g_application.m_pPlayer->GetAudioStreamInfo(g_application.m_pPlayer->GetAudioStream(), info); + g_application.m_pPlayer->GetAudioStreamInfo(CURRENT_STREAM, info); strLabel = info.language; } break; @@ -4368,7 +4368,7 @@ void CGUIInfoManager::UpdateAVInfo() SPlayerAudioStreamInfo audio; g_application.m_pPlayer->GetVideoStreamInfo(video); - g_application.m_pPlayer->GetAudioStreamInfo(g_application.m_pPlayer->GetAudioStream(), audio); + g_application.m_pPlayer->GetAudioStreamInfo(CURRENT_STREAM, audio); m_videoInfo = video; m_audioInfo = audio; diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h index 499ff94dbf..29705d951b 100644 --- a/xbmc/cores/IPlayer.h +++ b/xbmc/cores/IPlayer.h @@ -26,6 +26,8 @@ #include "guilib/Geometry.h" #include <string> +#define CURRENT_STREAM -1 + struct TextCacheStruct_t; class TiXmlElement; class CStreamDetails; diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp index 260dd9021d..470f736ba3 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -4156,6 +4156,9 @@ int CDVDPlayer::GetSourceBitrate() void CDVDPlayer::GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info) { + if (index == CURRENT_STREAM) + index = GetAudioStream(); + if (index < 0 || index > GetAudioStreamCount() - 1 ) return; diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp index 248240b9ac..688a7674ec 100644 --- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp +++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp @@ -341,8 +341,7 @@ void CGUIDialogSubtitles::Search(const std::string &search/*=""*/) SPlayerAudioStreamInfo info; std::string strLanguage; - int currentAudio = g_application.m_pPlayer->GetAudioStream(); - g_application.m_pPlayer->GetAudioStreamInfo(currentAudio, info); + g_application.m_pPlayer->GetAudioStreamInfo(CURRENT_STREAM, info); if (!g_LangCodeExpander.Lookup(strLanguage, info.language)) strLanguage = "Unknown"; |