Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1702 from axmhari/reclist-after-play

Show PVR recordings view after replaying a PVR item.
  • Loading branch information...
commit 4bf192d4c22763510086e7870ae0bace582c1f8a 2 parents 2ff8cca + 42ef712
Michal Piechowiak pieh authored
2  xbmc/pvr/windows/GUIWindowPVRChannels.cpp
View
@@ -207,7 +207,7 @@ void CGUIWindowPVRChannels::UpdateData(bool bUpdateSelectedFile /* = true */)
CPVRChannelGroupPtr selectedGroup = SelectedGroup();
m_iSelected = m_parent->m_viewControl.GetSelectedItem();
- m_parent->m_viewControl.Clear();
+ ShowBusyItem();
m_parent->m_vecItems->Clear();
m_parent->m_viewControl.SetCurrentView(m_iControlList);
14 xbmc/pvr/windows/GUIWindowPVRCommon.cpp
View
@@ -190,6 +190,7 @@ bool CGUIWindowPVRCommon::OnMessageFocus(CGUIMessage &message)
void CGUIWindowPVRCommon::OnWindowUnload(void)
{
m_iSelected = m_parent->m_viewControl.GetSelectedItem();
+ m_history = m_parent->m_history;
}
bool CGUIWindowPVRCommon::OnAction(const CAction &action)
@@ -869,3 +870,16 @@ bool CGUIWindowPVRCommon::OnContextButtonFind(CFileItem *item, CONTEXT_BUTTON bu
return bReturn;
}
+
+void CGUIWindowPVRCommon::ShowBusyItem(void)
+{
+ // FIXME: display a temporary entry so that the list can keep its focus
+ // busy_items has to be static, because m_viewControl holds the pointer to it
+ static CFileItemList busy_items;
+ if (busy_items.IsEmpty())
+ {
+ CFileItemPtr pItem(new CFileItem(g_localizeStrings.Get(1040)));
+ busy_items.AddFront(pItem, 0);
+ }
+ m_parent->m_viewControl.SetItems(busy_items);
+}
1  xbmc/pvr/windows/GUIWindowPVRCommon.h
View
@@ -119,6 +119,7 @@ namespace PVR
virtual bool UpdateEpgForChannel(CFileItem *item);
virtual bool ShowTimerSettings(CFileItem *item);
virtual bool ShowNewTimerDialog(void);
+ virtual void ShowBusyItem(void);
virtual bool OnContextButtonMenuHooks(CFileItem *item, CONTEXT_BUTTON button);
virtual bool OnContextButtonSortAsc(CFileItem *item, CONTEXT_BUTTON button);
2  xbmc/pvr/windows/GUIWindowPVRGuide.cpp
View
@@ -270,7 +270,7 @@ void CGUIWindowPVRGuide::UpdateData(bool bUpdateSelectedFile /* = true */)
/* lock the graphics context while updating */
CSingleLock graphicsLock(g_graphicsContext);
- m_parent->m_viewControl.Clear();
+ ShowBusyItem();
m_parent->m_vecItems->Clear();
if (m_iGuideView == GUIDE_VIEW_CHANNEL)
2  xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
View
@@ -208,7 +208,7 @@ void CGUIWindowPVRRecordings::UpdateData(bool bUpdateSelectedFile /* = true */)
else
m_strSelectedPath = m_parent->m_vecItems->GetPath();
- m_parent->m_viewControl.Clear();
+ ShowBusyItem();
m_parent->m_vecItems->Clear();
m_parent->m_viewControl.SetCurrentView(m_iControlList);
m_parent->m_vecItems->SetPath(m_strSelectedPath);
2  xbmc/pvr/windows/GUIWindowPVRSearch.cpp
View
@@ -101,7 +101,7 @@ void CGUIWindowPVRSearch::UpdateData(bool bUpdateSelectedFile /* = true */)
CSingleLock graphicsLock(g_graphicsContext);
m_iSelected = m_parent->m_viewControl.GetSelectedItem();
- m_parent->m_viewControl.Clear();
+ ShowBusyItem();
m_parent->m_vecItems->Clear();
m_parent->m_viewControl.SetCurrentView(m_iControlList);
2  xbmc/pvr/windows/GUIWindowPVRTimers.cpp
View
@@ -105,7 +105,7 @@ void CGUIWindowPVRTimers::UpdateData(bool bUpdateSelectedFile /* = true */)
CSingleLock graphicsLock(g_graphicsContext);
m_iSelected = m_parent->m_viewControl.GetSelectedItem();
- m_parent->m_viewControl.Clear();
+ ShowBusyItem();
m_parent->m_vecItems->Clear();
m_parent->m_viewControl.SetCurrentView(m_iControlList);
m_parent->m_vecItems->SetPath("pvr://timers/");

1 comment on commit 4bf192d

Ard van der Leeuw

This commit seems to break the EPG timeline for me... Haven't been able to figure out why, yet.

Please sign in to comment.
Something went wrong with that request. Please try again.