Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3888 from vkosh/epg-grid

[pvr] show gaps on epg timeline grid
  • Loading branch information...
commit a4342cf0092a6036309e59071e08789a5adcd625 2 parents 0b15afa + eb113c5
Lars Op den Kamp opdenkamp authored
Showing with 13 additions and 10 deletions.
  1. +1 −1  xbmc/epg/Epg.cpp
  2. +12 −9 xbmc/epg/GUIEPGGridContainer.cpp
2  xbmc/epg/Epg.cpp
View
@@ -628,7 +628,7 @@ bool CEpg::FixOverlappingEvents(bool bUpdateDb /* = false */)
it->second->ClearTimer();
m_tags.erase(it++);
}
- else if (previousTag->EndAsUTC() != currentTag->StartAsUTC())
+ else if (previousTag->EndAsUTC() > currentTag->StartAsUTC())
{
previousTag->SetEndFromUTC(currentTag->StartAsUTC());
if (bUpdateDb)
21 xbmc/epg/GUIEPGGridContainer.cpp
View
@@ -962,22 +962,25 @@ void CGUIEPGGridContainer::UpdateItems()
for (int block = 0; block < m_blocks; block++)
{
- if (m_gridIndex[row][block].item != m_gridIndex[row][block+1].item)
+ CGUIListItemPtr item = m_gridIndex[row][block].item;
+
+ if (item != m_gridIndex[row][block+1].item)
{
- if (!m_gridIndex[row][block].item)
+ if (!item)
{
- CEpgInfoTag broadcast;
- CFileItemPtr unknown(new CFileItem(broadcast));
+ CEpgInfoTag gapTag;
+ CFileItemPtr gapItem(new CFileItem(gapTag));
for (int i = block ; i > block - itemSize; i--)
{
- m_gridIndex[row][i].item = unknown;
+ m_gridIndex[row][i].item = gapItem;
}
}
+ else
+ {
+ const CEpgInfoTag* tag = ((CFileItem *)item.get())->GetEPGInfoTag();
+ m_gridIndex[row][savedBlock].item->SetProperty("GenreType", tag->GenreType());
+ }
- CGUIListItemPtr item = m_gridIndex[row][block].item;
- CFileItem *fileItem = (CFileItem *)item.get();
-
- m_gridIndex[row][savedBlock].item->SetProperty("GenreType", fileItem->GetEPGInfoTag()->GenreType());
if (m_orientation == VERTICAL)
{
m_gridIndex[row][savedBlock].width = itemSize*m_blockSize;
Please sign in to comment.
Something went wrong with that request. Please try again.