diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2011-08-01 15:40:33 +1200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2011-08-02 16:25:29 +1200 |
| commit | 3e34b2ab2ef12aa1f78c866463e116bd9349eb23 (patch) | |
| tree | 76609d8ebb310d59ed2f0c6eda0ded4fea0bbde8 | |
| parent | 720b7ece499a109c6e519e7f8a31e9e28ab3e483 (diff) | |
change container.content(foo) to operate the same as container.property(foo)
| -rw-r--r-- | xbmc/GUIInfoManager.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index b98b00e5a0..b66fa5b2a5 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -404,7 +404,8 @@ infomap container_ints[] = {{ "row", CONTAINER_ROW }, { "subitem", CONTAINER_SUBITEM }, { "hasfocus", CONTAINER_HAS_FOCUS }}; -infomap container_str[] = {{ "property", CONTAINER_PROPERTY }}; +infomap container_str[] = {{ "property", CONTAINER_PROPERTY }, + { "content", CONTAINER_CONTENT }}; infomap listitem_labels[]= {{ "thumb", LISTITEM_THUMB }, { "icon", LISTITEM_ICON }, @@ -766,9 +767,7 @@ int CGUIInfoManager::TranslateSingleString(const CStdString &strCondition) if (property == container_str[i].str) return AddMultiInfo(GUIInfo(container_str[i].val, id, ConditionalStringParameter(info[1].second))); } - if (property == "content") - return AddMultiInfo(GUIInfo(CONTAINER_CONTENT, ConditionalStringParameter(info[1].second), 0)); - else if (property == "sortdirection") + if (property == "sortdirection") { SORT_ORDER order = SORT_ORDER_NONE; if (info[1].second.Equals("ascending")) @@ -2381,7 +2380,7 @@ bool CGUIInfoManager::GetMultiInfoBool(const GUIInfo &info, int contextWindow, c if (window) content = ((CGUIMediaWindow *)window)->CurrentDirectory().GetContent(); } - bReturn = m_stringParameters[info.GetData1()].Equals(content); + bReturn = m_stringParameters[info.GetData2()].Equals(content); } break; case CONTAINER_ROW: |