Merge pull request #8059 from ksooo/guiinfo-audio-channels-exclude-zero

[guiinfo] (VIDEOPLAYER|LISTITEM)_AUDIO_CHANNELS return empty string for 0 channels, not '0'.
xbmc · Sep 16, 2015 · a70fc8d · a70fc8d
2 parents 21034c8 + ed7fcac
commit a70fc8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/addons/skin.confluence/media/flagging/audio/0.png b/addons/skin.confluence/media/flagging/audio/0.png
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -1800,7 +1800,8 @@ std::string CGUIInfoManager::GetLabel(int info, int contextWindow, std::string *
   case VIDEOPLAYER_AUDIO_CHANNELS:
     if(g_application.m_pPlayer->IsPlaying())
     {
-      strLabel = StringUtils::Format("%i", m_audioInfo.channels);
+      if (m_audioInfo.channels > 0)
+        strLabel = StringUtils::Format("%i", m_audioInfo.channels);
     }
     break;
   case VIDEOPLAYER_AUDIO_LANG:
@@ -5529,7 +5530,7 @@ std::string CGUIInfoManager::GetItemLabel(const CFileItem *item, int info, std::
     {
       std::string strResult;
       int iChannels = item->GetVideoInfoTag()->m_streamDetails.GetAudioChannels();
-      if (iChannels > -1)
+      if (iChannels > 0)
         strResult = StringUtils::Format("%i", iChannels);
       return strResult;
     }