[PVR] Cleanup: Remove a bunch of unused member functions.

xbmc/pvr/PVRDatabase.cpp

@@ -154,23 +154,6 @@ bool CPVRDatabase::DeleteChannels(void)
   return DeleteValues("channels");
 }
 
-bool CPVRDatabase::DeleteClientChannels(const CPVRClient &client)
-{
-  /* invalid client Id */
-  if (client.GetID() <= 0)
-  {
-    CLog::Log(LOGERROR, "PVR - %s - invalid client id: %i", __FUNCTION__, client.GetID());
-    return false;
-  }
-
-  CLog::Log(LOGDEBUG, "PVR - %s - deleting all channels from client '%i' from the database", __FUNCTION__, client.GetID());
-
-  Filter filter;
-  filter.AppendWhere(PrepareSQL("iClientId = %u", client.GetID()));
-
-  return DeleteValues("channels", filter);
-}
-
 bool CPVRDatabase::Delete(const CPVRChannel &channel)
 {
   /* invalid channel */
@@ -295,21 +278,6 @@ bool CPVRDatabase::GetCurrentGroupMembers(const CPVRChannelGroup &group, std::ve
   return bReturn;
 }
 
-bool CPVRDatabase::DeleteChannelsFromGroup(const CPVRChannelGroup &group)
-{
-  /* invalid group id */
-  if (group.GroupID() <= 0)
-  {
-    CLog::Log(LOGERROR, "PVR - %s - invalid group id: %d", __FUNCTION__, group.GroupID());
-    return false;
-  }
-
-  Filter filter;
-  filter.AppendWhere(PrepareSQL("idGroup = %u", group.GroupID()));
-
-  return DeleteValues("map_channelgroups_channels", filter);
-}
-
 bool CPVRDatabase::DeleteChannelsFromGroup(const CPVRChannelGroup &group, const std::vector<int> &channelsToDelete)
 {
   bool bDelete(true);

xbmc/pvr/PVRDatabase.h

@@ -75,13 +75,6 @@ namespace PVR
      */
     bool DeleteChannels(void);
 
-    /*!
-     * @brief Remove all channels from a client from the database.
-     * @param client The client to delete the channels for.
-     * @return True if the channels were deleted, false otherwise.
-     */
-    bool DeleteClientChannels(const CPVRClient &client);
-
     /*!
      * @brief Add or update a channel entry in the database
      * @param channel The channel to persist.
@@ -175,7 +168,6 @@ namespace PVR
     void CreateTables();
     void CreateAnalytics();
 
-    bool DeleteChannelsFromGroup(const CPVRChannelGroup &group);
     bool DeleteChannelsFromGroup(const CPVRChannelGroup &group, const std::vector<int> &channelsToDelete);
 
     bool GetCurrentGroupMembers(const CPVRChannelGroup &group, std::vector<int> &members);

xbmc/pvr/PVRManager.cpp

@@ -235,16 +235,6 @@ void CPVRManager::OnSettingAction(const CSetting *setting)
   }
 }
 
-bool CPVRManager::IsPVRWindowActive(void) const
-{
-  return (IsPVRWindow(g_windowManager.GetActiveWindow() & WINDOW_ID_MASK)) ? true : false;
-}
-
-bool CPVRManager::IsPVRWindow(int windowId)
-{
-  return (windowId >= WINDOW_PVR_ID_START && windowId <= WINDOW_PVR_ID_END) ? true : false;
-}
-
 void CPVRManager::Cleanup(void)
 {
   CSingleLock lock(m_critSection);
@@ -1506,29 +1496,11 @@ int CPVRManager::TranslateIntInfo(DWORD dwInfo) const
   return IsStarted() && m_guiInfo ? m_guiInfo->TranslateIntInfo(dwInfo) : 0;
 }
 
-bool CPVRManager::HasTimers(void) const
-{
-  return IsStarted() && m_timers ? m_timers->HasActiveTimers() : false;
-}
-
 bool CPVRManager::IsRecording(void) const
 {
   return IsStarted() && m_timers ? m_timers->IsRecording() : false;
 }
 
-bool CPVRManager::IsIdle(void) const
-{
-  bool bReturn(true);
-  if (IsStarted())
-  {
-    if (IsRecording() || IsPlaying()) // pvr recording or playing?
-      bReturn = false;
-    else
-      bReturn = !IsNextEventWithinBackendIdleTime();
-  }
-  return bReturn;
-}
-
 bool CPVRManager::CanSystemPowerdown(bool bAskUser /*= true*/) const
 {
   bool bReturn(true);

xbmc/pvr/PVRManager.h

@@ -172,16 +172,6 @@ namespace PVR
      */
     void Cleanup(void);
 
-    /*!
-     * @return True when a PVR window is active, false otherwise.
-     */
-    bool IsPVRWindowActive(void) const;
-
-    /*!
-     * @return True when the given window id is an PVR window, false otherwise.
-     */
-    static bool IsPVRWindow(int windowId);
-
     /*!
      * @brief Get the TV database.
      * @return The TV database.
@@ -353,24 +343,12 @@ namespace PVR
      */
     bool SetRecordingOnChannel(const CPVRChannelPtr &channel, bool bOnOff);
 
-    /*!
-     * @brief Check whether there are active timers.
-     * @return True if there are active timers, false otherwise.
-     */
-    bool HasTimers(void) const;
-
     /*!
      * @brief Check whether there are active recordings.
      * @return True if there are active recordings, false otherwise.
      */
     bool IsRecording(void) const;
 
-    /*!
-     * @brief Check whether the pvr backend is idle.
-     * @return True if there are no active timers/recordings/wake-ups within the configured time span.
-     */
-    bool IsIdle(void) const;
-
     /*!
      * @brief Check whether the system Kodi is running on can be powered down
      *        (shutdown/reboot/suspend/hibernate) without stopping any active
@@ -564,12 +542,6 @@ namespace PVR
      */
     void OnWake();
 
-    /*!
-     * @brief Wait until the pvr manager is loaded
-     * @return True when loaded, false otherwise
-     */
-    bool WaitUntilInitialised(void);
-
     /*!
      * @brief Create EPG tags for all channels in internal channel groups
      * @return True if EPG tags where created successfully, false otherwise

xbmc/pvr/addons/PVRClients.cpp

@@ -68,16 +68,6 @@ CPVRClients::~CPVRClients(void)
   Unload();
 }
 
-bool CPVRClients::IsInUse(const std::string& strAddonId) const
-{
-  CSingleLock lock(m_critSection);
-
-  for (const auto &client : m_clientMap)
-    if (!CAddonMgr::GetInstance().IsAddonDisabled(client.second->ID()) && client.second->ID() == strAddonId)
-      return true;
-  return false;
-}
-
 void CPVRClients::Start(void)
 {
   CAddonMgr::GetInstance().RegisterAddonMgrCallback(ADDON_PVRDLL, this);
@@ -888,23 +878,6 @@ bool CPVRClients::HasMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat)
       client->HaveMenuHooks(cat));
 }
 
-bool CPVRClients::GetMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat, PVR_MENUHOOKS *hooks)
-{
-  bool bReturn(false);
-
-  if (iClientID < 0)
-    iClientID = GetPlayingClientID();
-
-  PVR_CLIENT client;
-  if (GetCreatedClient(iClientID, client) && client->HaveMenuHooks(cat))
-  {
-    *hooks = *(client->GetMenuHooks());
-    bReturn = true;
-  }
-
-  return bReturn;
-}
-
 void CPVRClients::ProcessMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat, const CFileItem *item)
 {
   // get client id
@@ -1402,14 +1375,6 @@ int64_t CPVRClients::SeekStream(int64_t iFilePosition, int iWhence/* = SEEK_SET*
   return -EINVAL;
 }
 
-int64_t CPVRClients::GetStreamPosition(void)
-{
-  PVR_CLIENT client;
-  if (GetPlayingClient(client))
-    return client->GetStreamPosition();
-  return -EINVAL;
-}
-
 void CPVRClients::PauseStream(bool bPaused)
 {
   PVR_CLIENT client;
@@ -1455,12 +1420,6 @@ bool CPVRClients::IsPlayingRecording(void) const
   return m_bIsPlayingRecording;
 }
 
-bool CPVRClients::IsReadingLiveStream(void) const
-{
-  CSingleLock lock(m_critSection);
-  return m_bIsPlayingLiveTV;
-}
-
 bool CPVRClients::IsEncrypted(void) const
 {
   PVR_CLIENT client;

xbmc/pvr/addons/PVRClients.h

@@ -69,13 +69,6 @@ namespace PVR
     CPVRClients(void);
     virtual ~CPVRClients(void);
 
-    /*!
-     * @brief Checks whether an add-on is loaded by the pvr manager
-     * @param strAddonId The add-on id to check
-     * @return True when in use, false otherwise
-     */
-    bool IsInUse(const std::string& strAddonId) const;
-
     /*!
      * @brief Start the backend.
      */
@@ -229,12 +222,6 @@ namespace PVR
      */
     int64_t SeekStream(int64_t iFilePosition, int iWhence = SEEK_SET);
 
-    /*!
-     * @brief Get the currently playing position in a stream.
-     * @return The current position.
-     */
-    int64_t GetStreamPosition(void);
-
     /*!
      * @brief Close a PVR stream.
      */
@@ -261,11 +248,6 @@ namespace PVR
      */
     std::string GetCurrentInputFormat(void) const;
 
-    /*!
-     * @return True if a live stream is playing, false otherwise.
-     */
-    bool IsReadingLiveStream(void) const;
-
     /*!
      * @return True if a TV channel is playing, false otherwise.
      */
@@ -694,14 +676,6 @@ namespace PVR
      */
     void UpdateAddons(void);
 
-    /*!
-     * @brief Get the menu hooks for a client.
-     * @param iClientID The client to get the hooks for.
-     * @param hooks The container to add the hooks to.
-     * @return True if the hooks were added successfully (if any), false otherwise.
-     */
-    bool GetMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat, PVR_MENUHOOKS *hooks);
-
     /*!
      * @brief Get the instance of the client.
      * @param iClientId The id of the client to get.

xbmc/pvr/channels/PVRChannel.cpp

@@ -675,11 +675,6 @@ bool CPVRChannel::IsSubChannel(void) const
   return SubChannelNumber() > 0;
 }
 
-bool CPVRChannel::IsClientSubChannel(void) const
-{
-  return ClientSubChannelNumber() > 0;
-}
-
 std::string CPVRChannel::FormattedChannelNumber(void) const
 {
   return !IsSubChannel() ?

xbmc/pvr/channels/PVRChannel.h

@@ -149,11 +149,6 @@ namespace PVR
      */
     std::string FormattedChannelNumber(void) const;
 
-    /**
-     * @return True when this channel is marked as sub channel by the add-on, false if it's marked as main channel
-     */
-    bool IsClientSubChannel(void) const;
-
     /*!
      * @brief Set to true to hide this channel. Set to false to unhide it.
      *
@@ -364,7 +359,6 @@ namespace PVR
      */
     bool IsEncrypted(void) const;
 
-
     /*!
      * @brief Return the encryption system ID for this channel. 0 for FTA.
      *