Skip to content

Commit

Permalink
Merge pull request xbmc#22028 from ksooo/pvr-params-cleanup
Browse files Browse the repository at this point in the history 
[PVR] CPVRGUIActions*: Reduce usage of 'const shared_ptr<CFileItem>&' parameters.
  • Loading branch information
@ksooo
ksooo committed Oct 13, 2022
2 parents 58e6ecb + 3adf491 commit 5d89b25
Show file tree
Hide file tree
Showing 40 changed files with 552 additions and 527 deletions.
3 changes: 1 addition & 2 deletions xbmc/application/Application.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2259,8 +2259,7 @@ bool CApplication::PlayMedia(CFileItem& item, const std::string& player, PLAYLIS
}
else if (item.IsPVR())
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayMedia(
CFileItemPtr(new CFileItem(item)));
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayMedia(item);
}

CURL path(item.GetPath());
Expand Down
6 changes: 3 additions & 3 deletions xbmc/application/ApplicationPlayerCallback.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void CApplicationPlayerCallback::OnPlayBackEnded()
{
CLog::LogF(LOGDEBUG, "CApplicationPlayerCallback::OnPlayBackEnded");

CServiceBroker::GetPVRManager().OnPlaybackEnded(m_itemCurrentFile);
CServiceBroker::GetPVRManager().OnPlaybackEnded(*m_itemCurrentFile);

CVariant data(CVariant::VariantTypeObject);
data["end"] = true;
Expand Down Expand Up @@ -89,7 +89,7 @@ void CApplicationPlayerCallback::OnPlayBackStarted(const CFileItem& file)
CServiceBroker::GetJobManager()->PauseJobs();
}

CServiceBroker::GetPVRManager().OnPlaybackStarted(m_itemCurrentFile);
CServiceBroker::GetPVRManager().OnPlaybackStarted(*m_itemCurrentFile);
m_stackHelper.OnPlayBackStarted(file);

m_playerEvent.Reset();
Expand Down Expand Up @@ -199,7 +199,7 @@ void CApplicationPlayerCallback::OnPlayBackStopped()
{
CLog::LogF(LOGDEBUG, "CApplication::OnPlayBackStopped");

CServiceBroker::GetPVRManager().OnPlaybackStopped(m_itemCurrentFile);
CServiceBroker::GetPVRManager().OnPlaybackStopped(*m_itemCurrentFile);

CVariant data(CVariant::VariantTypeObject);
data["end"] = false;
Expand Down
8 changes: 3 additions & 5 deletions xbmc/interfaces/json-rpc/PlayerOperations.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,8 +752,7 @@ JSONRPC_STATUS CPlayerOperations::Open(const std::string &method, ITransportLaye
if (!epgTag || !epgTag->IsPlayable())
return InvalidParams;

if (!CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayEpgTag(
std::make_shared<CFileItem>(epgTag)))
if (!CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayEpgTag(CFileItem(epgTag)))
return FailedToExecute;

return ACK;
Expand All @@ -774,7 +773,7 @@ JSONRPC_STATUS CPlayerOperations::Open(const std::string &method, ITransportLaye
return InvalidParams;

if (!CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayMedia(
std::make_shared<CFileItem>(groupMember)))
CFileItem(groupMember)))
return FailedToExecute;

return ACK;
Expand All @@ -789,8 +788,7 @@ JSONRPC_STATUS CPlayerOperations::Open(const std::string &method, ITransportLaye
if (!recording)
return InvalidParams;

if (!CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayMedia(
std::make_shared<CFileItem>(recording)))
if (!CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayMedia(CFileItem(recording)))
return FailedToExecute;

return ACK;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/listproviders/DirectoryProvider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ bool CDirectoryProvider::OnInfo(const CGUIListItemPtr& item)
}
else if (fileItem->IsPVR())
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Utils>().OnInfo(fileItem);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Utils>().OnInfo(*fileItem);
}
else if (fileItem->HasVideoInfoTag())
{
Expand Down
48 changes: 24 additions & 24 deletions xbmc/pvr/PVRContextMenus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ bool PlayEpgTag::IsVisible(const CFileItem& item) const

bool PlayEpgTag::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayEpgTag(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayEpgTag(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -141,7 +141,7 @@ bool PlayRecording::IsVisible(const CFileItem& item) const
bool PlayRecording::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Playback>().PlayRecording(
item, true /* bCheckResume */);
*item, true /* bCheckResume */);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -177,9 +177,9 @@ bool ShowInformation::IsVisible(const CFileItem& item) const
bool ShowInformation::Execute(const CFileItemPtr& item) const
{
if (item->GetPVRRecordingInfoTag())
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().ShowRecordingInfo(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().ShowRecordingInfo(*item);

return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().ShowEPGInfo(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().ShowEPGInfo(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -196,7 +196,7 @@ bool ShowChannelGuide::IsVisible(const CFileItem& item) const

bool ShowChannelGuide::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().ShowChannelEPG(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().ShowChannelEPG(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -224,7 +224,7 @@ bool FindSimilar::IsVisible(const CFileItem& item) const

bool FindSimilar::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().FindSimilar(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().FindSimilar(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -278,7 +278,7 @@ bool StartRecording::Execute(const CFileItemPtr& item) const
true);
}

return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().AddTimer(item, false);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().AddTimer(*item, false);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -322,7 +322,7 @@ bool StopRecording::Execute(const CFileItemPtr& item) const
false);
}

return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().StopRecording(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().StopRecording(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -340,7 +340,7 @@ bool EditRecording::IsVisible(const CFileItem& item) const

bool EditRecording::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().EditRecording(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().EditRecording(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -378,7 +378,7 @@ bool DeleteRecording::IsVisible(const CFileItem& item) const

bool DeleteRecording::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().DeleteRecording(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().DeleteRecording(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -395,7 +395,7 @@ bool UndeleteRecording::IsVisible(const CFileItem& item) const

bool UndeleteRecording::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().UndeleteRecording(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().UndeleteRecording(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -412,7 +412,7 @@ bool DeleteWatchedRecordings::IsVisible(const CFileItem& item) const

bool DeleteWatchedRecordings::Execute(const std::shared_ptr<CFileItem>& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().DeleteWatchedRecordings(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Recordings>().DeleteWatchedRecordings(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -430,7 +430,7 @@ bool AddReminder::IsVisible(const CFileItem& item) const

bool AddReminder::Execute(const std::shared_ptr<CFileItem>& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().AddReminder(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().AddReminder(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -457,7 +457,7 @@ bool ToggleTimerState::IsVisible(const CFileItem& item) const

bool ToggleTimerState::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().ToggleTimerState(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().ToggleTimerState(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -472,7 +472,7 @@ bool AddTimerRule::IsVisible(const CFileItem& item) const

bool AddTimerRule::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().AddTimerRule(item, true, true);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().AddTimerRule(*item, true, true);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -506,7 +506,7 @@ bool EditTimerRule::IsVisible(const CFileItem& item) const

bool EditTimerRule::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().EditTimerRule(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().EditTimerRule(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -529,9 +529,9 @@ bool DeleteTimerRule::IsVisible(const CFileItem& item) const
bool DeleteTimerRule::Execute(const CFileItemPtr& item) const
{
auto& timers = CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>();
const std::shared_ptr<CFileItem> parentTimer = timers.GetTimerRule(item);
const std::shared_ptr<CFileItem> parentTimer = timers.GetTimerRule(*item);
if (parentTimer)
return timers.DeleteTimerRule(parentTimer);
return timers.DeleteTimerRule(*parentTimer);

return false;
}
Expand Down Expand Up @@ -569,7 +569,7 @@ bool EditTimer::IsVisible(const CFileItem& item) const

bool EditTimer::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().EditTimer(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().EditTimer(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -605,7 +605,7 @@ bool DeleteTimer::IsVisible(const CFileItem& item) const

bool DeleteTimer::Execute(const CFileItemPtr& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().DeleteTimer(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::Timers>().DeleteTimer(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -671,7 +671,7 @@ bool ExecuteSearch::IsVisible(const CFileItem& item) const

bool ExecuteSearch::Execute(const std::shared_ptr<CFileItem>& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().ExecuteSavedSearch(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().ExecuteSavedSearch(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -684,7 +684,7 @@ bool EditSearch::IsVisible(const CFileItem& item) const

bool EditSearch::Execute(const std::shared_ptr<CFileItem>& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().EditSavedSearch(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().EditSavedSearch(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -697,7 +697,7 @@ bool RenameSearch::IsVisible(const CFileItem& item) const

bool RenameSearch::Execute(const std::shared_ptr<CFileItem>& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().RenameSavedSearch(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().RenameSavedSearch(*item);
}

///////////////////////////////////////////////////////////////////////////////
Expand All @@ -710,7 +710,7 @@ bool DeleteSearch::IsVisible(const CFileItem& item) const

bool DeleteSearch::Execute(const std::shared_ptr<CFileItem>& item) const
{
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().DeleteSavedSearch(item);
return CServiceBroker::GetPVRManager().Get<PVR::GUI::EPG>().DeleteSavedSearch(*item);
}

} // namespace CONTEXTMENUITEM
Expand Down
1 change: 1 addition & 0 deletions xbmc/pvr/PVRItem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class CPVRItem
public:
explicit CPVRItem(const std::shared_ptr<CFileItem>& item) : m_item(item.get()) {}
explicit CPVRItem(const CFileItem* item) : m_item(item) {}
explicit CPVRItem(const CFileItem& item) : m_item(&item) {}

std::shared_ptr<CPVREpgInfoTag> GetEpgInfoTag() const;
std::shared_ptr<CPVREpgInfoTag> GetNextEpgInfoTag() const;
Expand Down
6 changes: 3 additions & 3 deletions xbmc/pvr/PVRManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -821,14 +821,14 @@ bool CPVRManager::IsCurrentlyParentalLocked(const std::shared_ptr<CPVRChannel>&
return bReturn;
}

void CPVRManager::OnPlaybackStarted(const CFileItemPtr& item)
void CPVRManager::OnPlaybackStarted(const CFileItem& item)
{
m_playbackState->OnPlaybackStarted(item);
Get<PVR::GUI::Channels>().OnPlaybackStarted(item);
m_epgContainer.OnPlaybackStarted();
}

void CPVRManager::OnPlaybackStopped(const CFileItemPtr& item)
void CPVRManager::OnPlaybackStopped(const CFileItem& item)
{
// Playback ended due to user interaction
if (m_playbackState->OnPlaybackStopped(item))
Expand All @@ -838,7 +838,7 @@ void CPVRManager::OnPlaybackStopped(const CFileItemPtr& item)
m_epgContainer.OnPlaybackStopped();
}

void CPVRManager::OnPlaybackEnded(const CFileItemPtr& item)
void CPVRManager::OnPlaybackEnded(const CFileItem& item)
{
// Playback ended, but not due to user interaction
OnPlaybackStopped(item);
Expand Down
6 changes: 3 additions & 3 deletions xbmc/pvr/PVRManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,19 +230,19 @@ class CPVRManager : private CThread, public ANNOUNCEMENT::IAnnouncer
* @brief Inform PVR manager that playback of an item just started.
* @param item The item that started to play.
*/
void OnPlaybackStarted(const std::shared_ptr<CFileItem>& item);
void OnPlaybackStarted(const CFileItem& item);

/*!
* @brief Inform PVR manager that playback of an item was stopped due to user interaction.
* @param item The item that stopped to play.
*/
void OnPlaybackStopped(const std::shared_ptr<CFileItem>& item);
void OnPlaybackStopped(const CFileItem& item);

/*!
* @brief Inform PVR manager that playback of an item has stopped without user interaction.
* @param item The item that ended to play.
*/
void OnPlaybackEnded(const std::shared_ptr<CFileItem>& item);
void OnPlaybackEnded(const CFileItem& item);

/*!
* @brief Let the background thread create epg tags for all channels.
Expand Down
Loading

0 comments on commit 5d89b25

Please sign in to comment.