Merge pull request #9309 from phil65/container_viewcount

[gui] add container.viewcount
xbmc · Mar 11, 2016 · 1b8404d · 1b8404d
2 parents 11912ea + ad3f874
commit 1b8404d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -455,6 +455,7 @@ const infomap mediacontainer[] = {{ "hasfiles",         CONTAINER_HASFILES },
                                   { "foldername",       CONTAINER_FOLDERNAME },
                                   { "pluginname",       CONTAINER_PLUGINNAME },
                                   { "viewmode",         CONTAINER_VIEWMODE },
+                                  { "viewcount",        CONTAINER_VIEWCOUNT },
                                   { "totaltime",        CONTAINER_TOTALTIME },
                                   { "totalwatched",     CONTAINER_TOTALWATCHED },
                                   { "totalunwatched",   CONTAINER_TOTALUNWATCHED },
@@ -1997,14 +1998,20 @@ std::string CGUIInfoManager::GetLabel(int info, int contextWindow, std::string *
       }
       break;
     }
+  case CONTAINER_VIEWCOUNT:
   case CONTAINER_VIEWMODE:
     {
       CGUIWindow *window = GetWindowWithCondition(contextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
       if (window)
       {
         const CGUIControl *control = window->GetControl(window->GetViewContainerID());
         if (control && control->IsContainer())
-          strLabel = ((IGUIContainer *)control)->GetLabel();
+        {
+          if (info == CONTAINER_VIEWMODE)
+            strLabel = ((IGUIContainer *)control)->GetLabel();
+          else if (info == CONTAINER_VIEWCOUNT)
+            strLabel = StringUtils::Format("%i", window->GetViewCount());
+        }
       }
       break;
     }

diff --git a/xbmc/guiinfo/GUIInfoLabels.h b/xbmc/guiinfo/GUIInfoLabels.h
@@ -307,13 +307,14 @@
 #define CONTAINER_SORT_ORDER        378
 #define CONTAINER_TOTALWATCHED      379
 #define CONTAINER_TOTALUNWATCHED    380
-#define MUSICPM_ENABLED             381
-#define MUSICPM_SONGSPLAYED         382
-#define MUSICPM_MATCHINGSONGS       383
-#define MUSICPM_MATCHINGSONGSPICKED 384
-#define MUSICPM_MATCHINGSONGSLEFT   385
-#define MUSICPM_RELAXEDSONGSPICKED  386
-#define MUSICPM_RANDOMSONGSPICKED   387
+#define CONTAINER_VIEWCOUNT         381
+#define MUSICPM_ENABLED             382
+#define MUSICPM_SONGSPLAYED         383
+#define MUSICPM_MATCHINGSONGS       384
+#define MUSICPM_MATCHINGSONGSPICKED 385
+#define MUSICPM_MATCHINGSONGSLEFT   386
+#define MUSICPM_RELAXEDSONGSPICKED  387
+#define MUSICPM_RANDOMSONGSPICKED   388
 
 #define PLAYLIST_LENGTH             390
 #define PLAYLIST_POSITION           391

diff --git a/xbmc/guilib/GUIWindow.h b/xbmc/guilib/GUIWindow.h
@@ -154,6 +154,7 @@ class CGUIWindow : public CGUIControlGroup, protected CCriticalSection
   virtual bool IsSoundEnabled() const { return true; };
   virtual CFileItemPtr GetCurrentListItem(int offset = 0) { return CFileItemPtr(); };
   virtual int GetViewContainerID() const { return 0; };
+  virtual int GetViewCount() const { return 0; };
   virtual bool CanBeActivated() const { return true; };
   virtual bool IsActive() const;
   void SetCoordsRes(const RESOLUTION_INFO &res) { m_coordsRes = res; };

diff --git a/xbmc/view/GUIViewControl.cpp b/xbmc/view/GUIViewControl.cpp
@@ -271,6 +271,12 @@ int CGUIViewControl::GetViewModeNumber(int number) const
   return 0;  // no view modes :(
 }
 
+// returns the amount of visible views
+int CGUIViewControl::GetViewModeCount() const
+{
+  return static_cast<int>(m_visibleViews.size());
+}
+
 int CGUIViewControl::GetViewModeByID(int id) const
 {
   for (unsigned int i = 0; i < m_visibleViews.size(); ++i)

diff --git a/xbmc/view/GUIViewControl.h b/xbmc/view/GUIViewControl.h
@@ -52,6 +52,7 @@ class CGUIViewControl
   bool HasControl(int controlID) const;
   int GetNextViewMode(int direction = 1) const;
   int GetViewModeNumber(int number) const;
+  int GetViewModeCount() const;
   int GetViewModeByID(int id) const;
 
   int GetCurrentControl() const;

diff --git a/xbmc/windows/GUIMediaWindow.h b/xbmc/windows/GUIMediaWindow.h
@@ -48,6 +48,7 @@ class CGUIMediaWindow : public CGUIWindow
   virtual void OnInitWindow();
   virtual bool IsMediaWindow() const { return true; }
   int GetViewContainerID() const { return m_viewControl.GetCurrentControl(); }
+  int GetViewCount() const { return m_viewControl.GetViewModeCount(); };
   virtual bool HasListItems() const { return true; }
   virtual CFileItemPtr GetCurrentListItem(int offset = 0);