Skip to content

Commit

Permalink
Merge pull request #1880 from pieh/epggrid_container
Browse files Browse the repository at this point in the history 
fix crash when using Container.NumItems infolabel with epggrid control
  • Loading branch information
@pieh
pieh committed Dec 5, 2012
2 parents f884cfc + fb6799e commit 3a2c959
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 40 deletions.
12 changes: 6 additions & 6 deletions xbmc/GUIInfoManager.cpp
View file
Expand Up @@ -1571,7 +1571,7 @@ CStdString CGUIInfoManager::GetLabel(int info, int contextWindow, CStdString *fa
{
const CGUIControl *control = window->GetControl(window->GetViewContainerID());
if (control && control->IsContainer())
strLabel = ((CGUIBaseContainer *)control)->GetLabel();
strLabel = ((IGUIContainer *)control)->GetLabel();
}
break;
}
Expand Down Expand Up @@ -2500,7 +2500,7 @@ bool CGUIInfoManager::GetMultiInfoBool(const GUIInfo &info, int contextWindow, c
{
const CGUIControl *control = window->GetControl(data1);
if (control && control->IsContainer())
item = ((CGUIBaseContainer *)control)->GetListItem(info.GetData2(), info.GetInfoFlag()).get();
item = ((IGUIContainer *)control)->GetListItem(info.GetData2(), info.GetInfoFlag()).get();
}
}
if (item) // If we got a valid item, do the lookup
Expand Down Expand Up @@ -2784,7 +2784,7 @@ bool CGUIInfoManager::GetMultiInfoBool(const GUIInfo &info, int contextWindow, c
const CGUIControl *control = window->GetControl(info.GetData1());
if (control && control->IsContainer())
{
CFileItemPtr item = boost::static_pointer_cast<CFileItem>(((CGUIBaseContainer *)control)->GetListItem(0));
CFileItemPtr item = boost::static_pointer_cast<CFileItem>(((IGUIContainer *)control)->GetListItem(0));
if (item && item->m_iprogramCount == info.GetData2()) // programcount used to store item id
bReturn = true;
}
Expand Down Expand Up @@ -2898,7 +2898,7 @@ bool CGUIInfoManager::GetMultiInfoInt(int &value, const GUIInfo &info, int conte
{
const CGUIControl *control = window->GetControl(data1);
if (control && control->IsContainer())
item = boost::static_pointer_cast<CFileItem>(((CGUIBaseContainer *)control)->GetListItem(info.GetData2(), info.GetInfoFlag()));
item = boost::static_pointer_cast<CFileItem>(((IGUIContainer *)control)->GetListItem(info.GetData2(), info.GetInfoFlag()));
}

if (item) // If we got a valid item, do the lookup
Expand Down Expand Up @@ -2941,7 +2941,7 @@ CStdString CGUIInfoManager::GetMultiInfoLabel(const GUIInfo &info, int contextWi
{
const CGUIControl *control = window->GetControl(data1);
if (control && control->IsContainer())
item = boost::static_pointer_cast<CFileItem>(((CGUIBaseContainer *)control)->GetListItem(info.GetData2(), info.GetInfoFlag()));
item = boost::static_pointer_cast<CFileItem>(((IGUIContainer *)control)->GetListItem(info.GetData2(), info.GetInfoFlag()));
}

if (item) // If we got a valid item, do the lookup
Expand Down Expand Up @@ -3038,7 +3038,7 @@ CStdString CGUIInfoManager::GetMultiInfoLabel(const GUIInfo &info, int contextWi
if (control)
{
if (control->IsContainer())
return ((CGUIBaseContainer *)control)->GetLabel(info.m_info);
return ((IGUIContainer *)control)->GetLabel(info.m_info);
else if (control->GetControlType() == CGUIControl::GUICONTROL_TEXTBOX)
return ((CGUITextBox *)control)->GetLabel(info.m_info);
}
Expand Down
16 changes: 8 additions & 8 deletions xbmc/GUIViewControl.cpp
View file
Expand Up @@ -125,7 +125,7 @@ void CGUIViewControl::SetCurrentView(int viewMode, bool bRefresh /* = false */)

// Update our view control only if we are not in the TV Window
if (m_parentWindow != WINDOW_PVR)
UpdateViewAsControl(((CGUIBaseContainer *)pNewView)->GetLabel());
UpdateViewAsControl(((IGUIContainer *)pNewView)->GetLabel());
}

void CGUIViewControl::SetItems(CFileItemList &items)
Expand Down Expand Up @@ -240,11 +240,11 @@ int CGUIViewControl::GetCurrentControl() const
// returns the number-th view's viewmode (type and id)
int CGUIViewControl::GetViewModeNumber(int number) const
{
CGUIBaseContainer *nextView = NULL;
IGUIContainer *nextView = NULL;
if (number >= 0 && number < (int)m_visibleViews.size())
nextView = (CGUIBaseContainer *)m_visibleViews[number];
nextView = (IGUIContainer *)m_visibleViews[number];
else if (m_visibleViews.size())
nextView = (CGUIBaseContainer *)m_visibleViews[0];
nextView = (IGUIContainer *)m_visibleViews[0];
if (nextView)
return (nextView->GetType() << 16) | nextView->GetID();
return 0; // no view modes :(
Expand All @@ -254,7 +254,7 @@ int CGUIViewControl::GetViewModeByID(int id) const
{
for (unsigned int i = 0; i < m_visibleViews.size(); ++i)
{
CGUIBaseContainer *view = (CGUIBaseContainer *)m_visibleViews[i];
IGUIContainer *view = (IGUIContainer *)m_visibleViews[i];
if (view->GetID() == id)
return (view->GetType() << 16) | view->GetID();
}
Expand All @@ -269,7 +269,7 @@ int CGUIViewControl::GetNextViewMode(int direction) const

int viewNumber = (m_currentView + direction) % (int)m_visibleViews.size();
if (viewNumber < 0) viewNumber += m_visibleViews.size();
CGUIBaseContainer *nextView = (CGUIBaseContainer *)m_visibleViews[viewNumber];
IGUIContainer *nextView = (IGUIContainer *)m_visibleViews[viewNumber];
return (nextView->GetType() << 16) | nextView->GetID();
}

Expand All @@ -286,7 +286,7 @@ int CGUIViewControl::GetView(VIEW_TYPE type, int id) const
{
for (int i = 0; i < (int)m_visibleViews.size(); i++)
{
CGUIBaseContainer *view = (CGUIBaseContainer *)m_visibleViews[i];
IGUIContainer *view = (IGUIContainer *)m_visibleViews[i];
if ((type == VIEW_TYPE_NONE || type == view->GetType()) && (!id || view->GetID() == id))
return i;
}
Expand All @@ -300,7 +300,7 @@ void CGUIViewControl::UpdateViewAsControl(const CStdString &viewLabel)
g_windowManager.SendMessage(msg);
for (unsigned int i = 0; i < m_visibleViews.size(); i++)
{
CGUIBaseContainer *view = (CGUIBaseContainer *)m_visibleViews[i];
IGUIContainer *view = (IGUIContainer *)m_visibleViews[i];
CGUIMessage msg(GUI_MSG_LABEL_ADD, m_parentWindow, m_viewAsControl, i);
CStdString label;
label.Format(g_localizeStrings.Get(534).c_str(), view->GetLabel().c_str()); // View: %s
Expand Down
46 changes: 42 additions & 4 deletions xbmc/epg/GUIEPGGridContainer.cpp
View file
Expand Up @@ -46,7 +46,7 @@ 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)
: CGUIControl(parentID, controlID, posX, posY, width, height)
: IGUIContainer(parentID, controlID, posX, posY, width, height)
{
ControlType = GUICONTAINER_EPGGRID;
m_blocksPerPage = timeBlocks;
Expand Down Expand Up @@ -1322,12 +1322,50 @@ int CGUIEPGGridContainer::GetSelectedItem() const
return 0;
}

CGUIListItemPtr CGUIEPGGridContainer::GetListItem(int offset) const
CGUIListItemPtr CGUIEPGGridContainer::GetListItem(int offset, unsigned int flag) const
{
if (!m_epgItemsPtr.size())
if (!m_channelItems.size())
return CGUIListItemPtr();

return m_item->item;
int item = m_channelCursor + m_channelOffset + offset;
if (flag & INFOFLAG_LISTITEM_POSITION)
item = (int)(m_channelScrollOffset / m_channelLayout->Size(VERTICAL));

if (flag & INFOFLAG_LISTITEM_WRAP)
{
item %= (int)m_channelItems.size();
if (item < 0) item += m_channelItems.size();
return m_channelItems[item];
}
else
{
if (item >= 0 && item < (int)m_channelItems.size())
return m_channelItems[item];
}
return CGUIListItemPtr();
}

CStdString CGUIEPGGridContainer::GetLabel(int info) const
{
CStdString label;
switch (info)
{
case CONTAINER_NUM_PAGES:
label.Format("%u", (m_channels + m_channelsPerPage - 1) / m_channelsPerPage);
break;
case CONTAINER_CURRENT_PAGE:
label.Format("%u", 1 + (m_channelCursor + m_channelOffset) / m_channelsPerPage );
break;
case CONTAINER_POSITION:
label.Format("%i", 1 + m_channelCursor + m_channelOffset);
break;
case CONTAINER_NUM_ITEMS:
label.Format("%u", m_channels);
break;
default:
break;
}
return label;
}

GridItemsPtr *CGUIEPGGridContainer::GetClosestItem(const int &channel)
Expand Down
7 changes: 4 additions & 3 deletions xbmc/epg/GUIEPGGridContainer.h
View file
Expand Up @@ -24,6 +24,7 @@
#include "FileItem.h"
#include "guilib/GUIControl.h"
#include "guilib/GUIListItemLayout.h"
#include "guilib/GUIBaseContainer.h"

namespace PVR
{
Expand All @@ -42,7 +43,7 @@ namespace EPG
float height;
};

class CGUIEPGGridContainer : public CGUIControl
class CGUIEPGGridContainer : public IGUIContainer
{
friend class PVR::CGUIWindowPVRGuide;

Expand Down Expand Up @@ -77,8 +78,8 @@ namespace EPG
void LoadLayout(TiXmlElement *layout);
void LoadContent(TiXmlElement *content);

virtual bool IsContainer() const { return true; };
CGUIListItemPtr GetListItem(int offset) const;
virtual CGUIListItemPtr GetListItem(int offset, unsigned int flag = 0) const;
virtual CStdString GetLabel(int info) const;

virtual int CorrectOffset(int offset, int cursor) const;

Expand Down
20 changes: 13 additions & 7 deletions xbmc/guilib/GUIBaseContainer.cpp
View file
Expand Up @@ -39,8 +39,20 @@ using namespace std;
#define SCROLLING_GAP 200U
#define SCROLLING_THRESHOLD 300U


IGUIContainer::IGUIContainer(int parentID, int controlID, float posX, float posY, float width, float height)
: CGUIControl(parentID, controlID, posX, posY, width, height)
{
}

void IGUIContainer::SetType(VIEW_TYPE type, const CStdString &label)
{
m_type = type;
m_label = label;
}

CGUIBaseContainer::CGUIBaseContainer(int parentID, int controlID, float posX, float posY, float width, float height, ORIENTATION orientation, const CScroller& scroller, int preloadItems)
: CGUIControl(parentID, controlID, posX, posY, width, height)
: IGUIContainer(parentID, controlID, posX, posY, width, height)
, m_scroller(scroller)
{
m_cursor = 0;
Expand Down Expand Up @@ -1068,12 +1080,6 @@ void CGUIBaseContainer::SetRenderOffset(const CPoint &offset)
m_renderOffset = offset;
}

void CGUIBaseContainer::SetType(VIEW_TYPE type, const CStdString &label)
{
m_type = type;
m_label = label;
}

void CGUIBaseContainer::FreeMemory(int keepStart, int keepEnd)
{
if (keepStart < keepEnd)
Expand Down
31 changes: 20 additions & 11 deletions xbmc/guilib/GUIBaseContainer.h
View file
Expand Up @@ -37,7 +37,24 @@ typedef boost::shared_ptr<CGUIListItem> CGUIListItemPtr;
\brief
*/

class CGUIBaseContainer : public CGUIControl
class IGUIContainer : public CGUIControl
{
protected:
VIEW_TYPE m_type;
CStdString m_label;
public:
IGUIContainer(int parentID, int controlID, float posX, float posY, float width, float height);
virtual bool IsContainer() const { return true; };

VIEW_TYPE GetType() const { return m_type; };
const CStdString &GetLabel() const { return m_label; };
void SetType(VIEW_TYPE type, const CStdString &label);

virtual CGUIListItemPtr GetListItem(int offset, unsigned int flag = 0) const = 0;
virtual CStdString GetLabel(int info) const = 0;
};

class CGUIBaseContainer : public IGUIContainer
{
public:
CGUIBaseContainer(int parentID, int controlID, float posX, float posY, float width, float height, ORIENTATION orientation, const CScroller& scroller, int preloadItems);
Expand Down Expand Up @@ -74,15 +91,10 @@ class CGUIBaseContainer : public CGUIControl
void LoadContent(TiXmlElement *content);
void SetDefaultControl(int id, bool always) { m_staticDefaultItem = id; m_staticDefaultAlways = always; };

VIEW_TYPE GetType() const { return m_type; };
const CStdString &GetLabel() const { return m_label; };
void SetType(VIEW_TYPE type, const CStdString &label);

virtual bool IsContainer() const { return true; };
CGUIListItemPtr GetListItem(int offset, unsigned int flag = 0) const;
virtual CGUIListItemPtr GetListItem(int offset, unsigned int flag = 0) const;

virtual bool GetCondition(int condition, int data) const;
CStdString GetLabel(int info) const;
virtual CStdString GetLabel(int info) const;

void SetStaticContent(const std::vector<CGUIListItemPtr> &items, bool forceUpdate = true);

Expand Down Expand Up @@ -158,9 +170,6 @@ class CGUIBaseContainer : public CGUIControl

CScroller m_scroller;

VIEW_TYPE m_type;
CStdString m_label;

bool m_staticContent;
bool m_staticDefaultAlways;
int m_staticDefaultItem;
Expand Down
1 change: 1 addition & 0 deletions xbmc/guilib/GUIControlFactory.cpp
View file
Expand Up @@ -1247,6 +1247,7 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
control = new CGUIEPGGridContainer(parentID, id, posX, posY, width, height, orientation, scrollTime, preloadItems, timeBlocks, rulerUnit);
((CGUIEPGGridContainer *)control)->LoadLayout(pControlNode);
((CGUIEPGGridContainer *)control)->SetRenderOffset(offset);
((CGUIEPGGridContainer *)control)->SetType(viewType, viewLabel);
}
else if (type == CGUIControl::GUICONTAINER_FIXEDLIST)
{
Expand Down
2 changes: 1 addition & 1 deletion xbmc/settings/GUIWindowSettingsCategory.cpp
View file
Expand Up @@ -2766,7 +2766,7 @@ void CGUIWindowSettingsCategory::FillInViewModes(CSetting *pSetting, int windowI
window->Initialize();
for (int i = 50; i < 60; i++)
{
CGUIBaseContainer *control = (CGUIBaseContainer *)window->GetControl(i);
IGUIContainer *control = (IGUIContainer *)window->GetControl(i);
if (control)
{
int type = (control->GetType() << 16) | i;
Expand Down

0 comments on commit 3a2c959

Please sign in to comment.