"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xbmc/pvr/windows/GUIEPGGridContainer.cpp" between
xbmc-18.7.1-Leia.tar.gz and xbmc-18.8-Leia.tar.gz

About: XBMC is a software media player and entertainment hub for digital media that plays almost all popular audio and video formats around (new name "Kodi").

GUIEPGGridContainer.cpp  (xbmc-18.7.1-Leia):GUIEPGGridContainer.cpp  (xbmc-18.8-Leia)
skipping to change at line 1595 skipping to change at line 1595
} }
/* layout for the timeline for the grid */ /* layout for the timeline for the grid */
itemElement = layout->FirstChildElement("rulerlayout"); itemElement = layout->FirstChildElement("rulerlayout");
while (itemElement) while (itemElement)
{ {
m_rulerLayouts.emplace_back(); m_rulerLayouts.emplace_back();
m_rulerLayouts.back().LoadLayout(itemElement, GetParentID(), false, m_width, m_height); m_rulerLayouts.back().LoadLayout(itemElement, GetParentID(), false, m_width, m_height);
itemElement = itemElement->NextSiblingElement("rulerlayout"); itemElement = itemElement->NextSiblingElement("rulerlayout");
} }
UpdateLayout();
} }
std::string CGUIEPGGridContainer::GetDescription() const std::string CGUIEPGGridContainer::GetDescription() const
{ {
CSingleLock lock(m_critSection); CSingleLock lock(m_critSection);
std::string strLabel; std::string strLabel;
int item = GetSelectedItem(); int item = GetSelectedItem();
if (item >= 0 && item < m_gridModel->ProgrammeItemsSize()) if (item >= 0 && item < m_gridModel->ProgrammeItemsSize())
{ {
skipping to change at line 1717 skipping to change at line 1719
} }
void CGUIEPGGridContainer::SetTimelineItems(const std::unique_ptr<CFileItemList> &items, const CDateTime &gridStart, const CDateTime &gridEnd) void CGUIEPGGridContainer::SetTimelineItems(const std::unique_ptr<CFileItemList> &items, const CDateTime &gridStart, const CDateTime &gridEnd)
{ {
int iRulerUnit; int iRulerUnit;
int iBlocksPerPage; int iBlocksPerPage;
float fBlockSize; float fBlockSize;
{ {
CSingleLock lock(m_critSection); CSingleLock lock(m_critSection);
UpdateLayout();
iRulerUnit = m_rulerUnit; iRulerUnit = m_rulerUnit;
iBlocksPerPage = m_blocksPerPage; iBlocksPerPage = m_blocksPerPage;
fBlockSize = m_blockSize; fBlockSize = m_blockSize;
} }
std::unique_ptr<CGUIEPGGridContainerModel> oldUpdatedGridModel; std::unique_ptr<CGUIEPGGridContainerModel> oldUpdatedGridModel;
std::unique_ptr<CGUIEPGGridContainerModel> newUpdatedGridModel(new CGUIEPGGrid ContainerModel); std::unique_ptr<CGUIEPGGridContainerModel> newUpdatedGridModel(new CGUIEPGGrid ContainerModel);
// can be very expensive. never call with lock acquired. // can be very expensive. never call with lock acquired.
newUpdatedGridModel->Initialize(items, gridStart, gridEnd, iRulerUnit, iBlocks PerPage, fBlockSize); newUpdatedGridModel->Initialize(items, gridStart, gridEnd, iRulerUnit, iBlocks PerPage, fBlockSize);
skipping to change at line 1796 skipping to change at line 1797
// Note: m_rulerDateLayout is optional // Note: m_rulerDateLayout is optional
if (!m_focusedProgrammeLayout || !m_programmeLayout || !m_focusedChannelLayout || !m_channelLayout || !m_rulerLayout) if (!m_focusedProgrammeLayout || !m_programmeLayout || !m_focusedChannelLayout || !m_channelLayout || !m_rulerLayout)
return; return;
if (oldChannelLayout == m_channelLayout && oldFocusedChannelLayout == m_focuse dChannelLayout && if (oldChannelLayout == m_channelLayout && oldFocusedChannelLayout == m_focuse dChannelLayout &&
oldProgrammeLayout == m_programmeLayout && oldFocusedProgrammeLayout == m_ focusedProgrammeLayout && oldProgrammeLayout == m_programmeLayout && oldFocusedProgrammeLayout == m_ focusedProgrammeLayout &&
oldRulerLayout == m_rulerLayout && oldRulerDateLayout == m_rulerDateLayout ) oldRulerLayout == m_rulerLayout && oldRulerDateLayout == m_rulerDateLayout )
return; // nothing has changed, so don't update stuff return; // nothing has changed, so don't update stuff
CSingleLock lock(m_critSection);
m_channelHeight = m_channelLayout->Size(VERTICAL); m_channelHeight = m_channelLayout->Size(VERTICAL);
m_channelWidth = m_channelLayout->Size(HORIZONTAL); m_channelWidth = m_channelLayout->Size(HORIZONTAL);
m_rulerDateHeight = m_rulerDateLayout ? m_rulerDateLayout->Size(VERTICAL) : 0; m_rulerDateHeight = m_rulerDateLayout ? m_rulerDateLayout->Size(VERTICAL) : 0;
m_rulerDateWidth = m_rulerDateLayout ? m_rulerDateLayout->Size(HORIZONTAL) : 0 ; m_rulerDateWidth = m_rulerDateLayout ? m_rulerDateLayout->Size(HORIZONTAL) : 0 ;
if (m_orientation == VERTICAL) if (m_orientation == VERTICAL)
{ {
m_rulerHeight = m_rulerLayout->Size(VERTICAL); m_rulerHeight = m_rulerLayout->Size(VERTICAL);
m_gridPosX = m_posX + m_channelWidth; m_gridPosX = m_posX + m_channelWidth;
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)