Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PVR][Estuary] Add support for ACTION_(PREV|NEXT)_ITEM for timeshift buffer navigation #14387

Merged
merged 5 commits into from Sep 5, 2018
Prev

[pvr] Some CPVRChannelGroup cleanup: remove unused method.

  • Loading branch information...
ksooo committed Sep 4, 2018
commit 37e5a8d43f75321e4a4c9380a8ac5e20676e3ddb
@@ -921,34 +921,6 @@ void CPVRChannelGroup::OnSettingChanged(std::shared_ptr<const CSetting> setting)
}
}

int CPVRChannelGroup::GetEPGNowOrNext(CFileItemList &results, bool bGetNext) const
{
int iInitialSize = results.Size();
CPVREpgInfoTagPtr epgNext;
CPVRChannelPtr channel;
CSingleLock lock(m_critSection);

for (PVR_CHANNEL_GROUP_SORTED_MEMBERS::const_iterator it = m_sortedMembers.begin(); it != m_sortedMembers.end(); ++it)
{
channel = (*it).channel;
CPVREpgPtr epg = channel->GetEPG();
if (epg && !channel->IsHidden())
{
epgNext = bGetNext ? epg->GetTagNext() : epg->GetTagNow();
if (epgNext)
{
CFileItemPtr entry(new CFileItem(epgNext));
entry->SetLabel2(epgNext->StartAsLocalTime().GetAsLocalizedTime("", false));
entry->SetPath(channel->Path());
entry->SetArt("thumb", channel->IconPath());
results.Add(entry);
}
}
}

return results.Size() - iInitialSize;
}

int CPVRChannelGroup::GetEPGAll(CFileItemList &results, bool bIncludeChannelsWithoutEPG /* = false */) const
{
int iInitialSize = results.Size();
@@ -387,20 +387,6 @@ namespace PVR
*/
int GetEPGAll(CFileItemList &results, bool bIncludeChannelsWithoutEPG = false) const;

/*!
* @brief Get all entries that are active now.
* @param results The fileitem list to store the results in.
* @return The amount of entries that were added.
*/
int GetEPGNow(CFileItemList &results) const { return GetEPGNowOrNext(results, false); }

/*!
* @brief Get all entries that will be active next.
* @param results The fileitem list to store the results in.
* @return The amount of entries that were added.
*/
int GetEPGNext(CFileItemList &results) const { return GetEPGNowOrNext(results, true); }

/*!
* @brief Get the start time of the first entry.
* @return The start time.
@@ -536,12 +522,5 @@ namespace PVR

private:
CDateTime GetEPGDate(EpgDateType epgDateType) const;
/*!
* @brief Get all entries that will be active next.
* @param results The fileitem list to store the results in.
* @param bGetNext True to get the next item, false to get the current one
* @return The amount of entries that were added.
*/
int GetEPGNowOrNext(CFileItemList &results, bool bGetNext) const;
};
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.