Merge pull request #3542 from xhaggi/epg-time-indicator

[pvr] EPG content-progress indicator
xbmc · Nov 6, 2013 · d687d62 · d687d62
2 parents cb381b3 + 55ecae7
commit d687d62
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 3 deletions.
diff --git a/addons/skin.confluence/720p/ViewsPVR.xml b/addons/skin.confluence/720p/ViewsPVR.xml
@@ -855,6 +855,7 @@
 				<scrolltime>350</scrolltime>
 				<timeblocks>40</timeblocks>
 				<rulerunit>6</rulerunit>
+        <progresstexture border="5">PVR-EpgProgressIndicator.png</progresstexture>
 				<onleft>31</onleft>
 				<onright>31</onright>
 				<onup>10</onup>

diff --git a/addons/skin.confluence/media/PVR-EpgProgressIndicator.png b/addons/skin.confluence/media/PVR-EpgProgressIndicator.png
diff --git a/xbmc/XBDateTime.cpp b/xbmc/XBDateTime.cpp
@@ -211,6 +211,14 @@ int CDateTimeSpan::GetSeconds() const
   return (int)(((time.QuadPart/SECONDS_TO_FILETIME%SECONDS_PER_DAY)%SECONDS_PER_HOUR)%SECONDS_PER_MINUTE)%SECONDS_PER_MINUTE;
 }
 
+int CDateTimeSpan::GetSecondsTotal() const
+{
+  ULARGE_INTEGER time;
+  ToULargeInt(time);
+
+  return (int)(time.QuadPart/SECONDS_TO_FILETIME);
+}
+
 void CDateTimeSpan::SetFromPeriod(const CStdString &period)
 {
   long days = atoi(period.c_str());

diff --git a/xbmc/XBDateTime.h b/xbmc/XBDateTime.h
@@ -72,6 +72,7 @@ class CDateTimeSpan
   int GetHours() const;
   int GetMinutes() const;
   int GetSeconds() const;
+  int GetSecondsTotal() const;
 
 private:
   void ToULargeInt(ULARGE_INTEGER& time) const;

diff --git a/xbmc/epg/GUIEPGGridContainer.cpp b/xbmc/epg/GUIEPGGridContainer.cpp
@@ -46,8 +46,9 @@ using namespace std;
 
 CGUIEPGGridContainer::CGUIEPGGridContainer(int parentID, int controlID, float posX, float posY, float width,
                                            float height, ORIENTATION orientation, int scrollTime,
-                                           int preloadItems, int timeBlocks, int rulerUnit)
+                                           int preloadItems, int timeBlocks, int rulerUnit, const CTextureInfo& progressIndicatorTexture)
     : IGUIContainer(parentID, controlID, posX, posY, width, height)
+    , m_guiProgressIndicatorTexture(posX, posY, width, height, progressIndicatorTexture)
 {
   ControlType             = GUICONTAINER_EPGGRID;
   m_blocksPerPage         = timeBlocks;
@@ -108,6 +109,7 @@ void CGUIEPGGridContainer::Process(unsigned int currentTime, CDirtyRegionList &d
   ProcessChannels(currentTime, dirtyregions);
   ProcessRuler(currentTime, dirtyregions);
   ProcessProgrammeGrid(currentTime, dirtyregions);
+  ProcessProgressIndicator(currentTime, dirtyregions);
 
   CGUIControl::Process(currentTime, dirtyregions);
 }
@@ -117,6 +119,7 @@ void CGUIEPGGridContainer::Render()
   RenderChannels();
   RenderRuler();
   RenderProgrammeGrid();
+  RenderProgressIndicator();
 
   CGUIControl::Render();
 }
@@ -540,6 +543,41 @@ void CGUIEPGGridContainer::RenderProgrammeGrid()
   g_graphicsContext.RestoreClipRegion();
 }
 
+void CGUIEPGGridContainer::ProcessProgressIndicator(unsigned int currentTime, CDirtyRegionList &dirtyregions)
+{
+  CPoint originRuler = CPoint(m_rulerPosX, m_rulerPosY) + m_renderOffset;
+  float width = ((CDateTime::GetUTCDateTime() - m_gridStart).GetSecondsTotal() * m_blockSize) / (MINSPERBLOCK * 60) - m_programmeScrollOffset;
+
+  if (m_orientation == VERTICAL)
+  {
+    m_guiProgressIndicatorTexture.SetWidth(width);
+    m_guiProgressIndicatorTexture.SetPosition(originRuler.x, originRuler.y);
+  }
+  else
+  {
+    m_guiProgressIndicatorTexture.SetHeight(width);
+    m_guiProgressIndicatorTexture.SetPosition(originRuler.x, originRuler.y);
+  }
+
+  m_guiProgressIndicatorTexture.Process(currentTime);
+}
+
+void CGUIEPGGridContainer::RenderProgressIndicator()
+{
+  bool render = false;
+
+  if (m_orientation == VERTICAL)
+    render = g_graphicsContext.SetClipRegion(m_rulerPosX, m_rulerPosY, m_gridWidth, m_height);
+  else
+    render = g_graphicsContext.SetClipRegion(m_rulerPosX, m_rulerPosY, m_width, m_gridHeight);
+
+  if(render)
+  {
+    m_guiProgressIndicatorTexture.Render();
+    g_graphicsContext.RestoreClipRegion();
+  }
+}
+
 void CGUIEPGGridContainer::ProcessItem(float posX, float posY, CGUIListItem* item, CGUIListItem *&lastitem,
   bool focused, CGUIListItemLayout* normallayout, CGUIListItemLayout* focusedlayout,
   unsigned int currentTime, CDirtyRegionList &dirtyregions, float resize /* = -1.0f */)

diff --git a/xbmc/epg/GUIEPGGridContainer.h b/xbmc/epg/GUIEPGGridContainer.h
@@ -50,7 +50,7 @@ namespace EPG
   public:
     CGUIEPGGridContainer(int parentID, int controlID, float posX, float posY, float width, float height,
                          ORIENTATION orientation, int scrollTime, int preloadItems, int minutesPerPage,
-                         int rulerUnit);
+                         int rulerUnit, const CTextureInfo& progressIndicatorTexture);
     virtual ~CGUIEPGGridContainer(void);
     virtual CGUIEPGGridContainer *Clone() const { return new CGUIEPGGridContainer(*this); };
 
@@ -136,9 +136,11 @@ namespace EPG
     void ProcessChannels(unsigned int currentTime, CDirtyRegionList &dirtyregions);
     void ProcessRuler(unsigned int currentTime, CDirtyRegionList &dirtyregions);
     void ProcessProgrammeGrid(unsigned int currentTime, CDirtyRegionList &dirtyregions);
+    void ProcessProgressIndicator(unsigned int currentTime, CDirtyRegionList &dirtyregions);
     void RenderChannels();
     void RenderRuler();
     void RenderProgrammeGrid();
+    void RenderProgressIndicator();
 
     CPoint m_renderOffset; ///< \brief render offset of the first item in the list \sa SetRenderOffset
 
@@ -212,6 +214,8 @@ namespace EPG
     CDateTime m_gridStart;
     CDateTime m_gridEnd;
 
+    CGUITexture m_guiProgressIndicatorTexture;
+
     struct GridItemsPtr **m_gridIndex;
     GridItemsPtr *m_item;
     CGUIListItem *m_lastItem;

diff --git a/xbmc/guilib/GUIControlFactory.cpp b/xbmc/guilib/GUIControlFactory.cpp
@@ -707,6 +707,7 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
   CTextureInfo textureRadioOnFocus, textureRadioOnNoFocus;
   CTextureInfo textureRadioOffFocus, textureRadioOffNoFocus;
   CTextureInfo imageNoFocus, imageFocus;
+  CTextureInfo textureProgressIndicator;
   CGUIInfoLabel texturePath;
   CRect borderSize;
 
@@ -989,6 +990,7 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
   XMLUtils::GetBoolean(pControlNode,"pulseonselect", bPulse);
   XMLUtils::GetInt(pControlNode, "timeblocks", timeBlocks);
   XMLUtils::GetInt(pControlNode, "rulerunit", rulerUnit);
+  GetTexture(pControlNode, "progresstexture", textureProgressIndicator);
 
   GetInfoTexture(pControlNode, "imagepath", texture, texturePath, parentID);
 
@@ -1333,7 +1335,7 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
   }
   else if (type == CGUIControl::GUICONTAINER_EPGGRID)
   {
-    control = new CGUIEPGGridContainer(parentID, id, posX, posY, width, height, orientation, scrollTime, preloadItems, timeBlocks, rulerUnit);
+    control = new CGUIEPGGridContainer(parentID, id, posX, posY, width, height, orientation, scrollTime, preloadItems, timeBlocks, rulerUnit, textureProgressIndicator);
     ((CGUIEPGGridContainer *)control)->LoadLayout(pControlNode);
     ((CGUIEPGGridContainer *)control)->SetRenderOffset(offset);
     ((CGUIEPGGridContainer *)control)->SetType(viewType, viewLabel);