Merge pull request #9516 from phil65/listitem_status

[gui] Add listitem.status
xbmc · Apr 2, 2016 · bf1ec6f · bf1ec6f
2 parents 4fbbcfb + 16f5864
commit bf1ec6f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -3731,6 +3731,7 @@ const infomap listitem_labels[]= {{ "thumb",            LISTITEM_THUMB },
                                   { "castandrole",      LISTITEM_CAST_AND_ROLE },
                                   { "writer",           LISTITEM_WRITER },
                                   { "tagline",          LISTITEM_TAGLINE },
+                                  { "status",           LISTITEM_STATUS },
                                   { "top250",           LISTITEM_TOP250 },
                                   { "trailer",          LISTITEM_TRAILER },
                                   { "sortletter",       LISTITEM_SORT_LETTER },
@@ -7444,8 +7445,6 @@ bool CGUIInfoManager::GetMultiInfoBool(const GUIInfo &info, int contextWindow, c
             strContent = "episodes";
           if (m_currentFile->HasVideoInfoTag() && m_currentFile->GetVideoInfoTag()->m_type == MediaTypeMusicVideo)
             strContent = "musicvideos";
-          if (m_currentFile->HasVideoInfoTag() && m_currentFile->GetVideoInfoTag()->m_strStatus == "livetv")
-            strContent = "livetv";
           if (m_currentFile->HasPVRChannelInfoTag())
             strContent = "livetv";
           bReturn = StringUtils::EqualsNoCase(m_stringParameters[info.GetData1()], strContent);
@@ -9786,6 +9785,10 @@ std::string CGUIInfoManager::GetItemLabel(const CFileItem *item, int info, std::
     if (item->HasVideoInfoTag())
       return item->GetVideoInfoTag()->m_strTagLine;
     break;
+  case LISTITEM_STATUS:
+    if (item->HasVideoInfoTag())
+      return item->GetVideoInfoTag()->m_strStatus;
+    break;
   case LISTITEM_TRAILER:
     if (item->HasVideoInfoTag())
       return item->GetVideoInfoTag()->m_strTrailer;

diff --git a/xbmc/guiinfo/GUIInfoLabels.h b/xbmc/guiinfo/GUIInfoLabels.h
@@ -754,6 +754,7 @@
 #define LISTITEM_ADDON_INSTALL_DATE (LISTITEM_START + 172)
 #define LISTITEM_ADDON_LAST_UPDATED (LISTITEM_START + 173)
 #define LISTITEM_ADDON_LAST_USED    (LISTITEM_START + 174)
+#define LISTITEM_STATUS             (LISTITEM_START + 175)
 
 #define LISTITEM_PROPERTY_START     (LISTITEM_START + 200)
 #define LISTITEM_PROPERTY_END       (LISTITEM_PROPERTY_START + 1300)

diff --git a/xbmc/interfaces/json-rpc/VideoLibrary.cpp b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
@@ -1113,6 +1113,8 @@ void CVideoLibrary::UpdateVideoTag(const CVariant &parameterObject, CVideoInfoTa
     details.SetTrailer(parameterObject["trailer"].asString());
   if (ParameterNotNull(parameterObject, "tagline"))
     details.SetTagLine(parameterObject["tagline"].asString());
+  if (ParameterNotNull(parameterObject, "status"))
+    details.SetStatus(parameterObject["status"].asString());
   if (ParameterNotNull(parameterObject, "plotoutline"))
     details.SetPlotOutline(parameterObject["plotoutline"].asString());