[PVR] Cleanup: Remove unused member CPVRTimerInfoTag::m_iChannelNumbe…

…r (was set from several places, but never read.
garbear · Nov 20, 2017 · 9a9a393 · 9a9a393
1 parent 30b5b59
commit 9a9a393
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
@@ -569,7 +569,6 @@ void CGUIDialogPVRTimerSettings::Save()
     m_timerInfoTag->m_iClientChannelUid = channel->UniqueID();
     m_timerInfoTag->m_iClientId         = channel->ClientID();
     m_timerInfoTag->m_bIsRadio          = channel->IsRadio();
-    m_timerInfoTag->m_iChannelNumber    = channel->ChannelNumber();
 
     m_timerInfoTag->UpdateChannel();
   }

diff --git a/xbmc/pvr/timers/PVRTimerInfoTag.cpp b/xbmc/pvr/timers/PVRTimerInfoTag.cpp
@@ -60,7 +60,6 @@ CPVRTimerInfoTag::CPVRTimerInfoTag(bool bRadio /* = false */) :
   m_iMaxRecordings(0),
   m_iPreventDupEpisodes(DEFAULT_RECORDING_DUPLICATEHANDLING),
   m_iRecordingGroup(0),
-  m_iChannelNumber(0),
   m_bIsRadio(bRadio),
   m_iTimerId(0),
   m_iMarginStart(CServiceBroker::GetSettings().GetInt(CSettings::SETTING_PVRRECORD_MARGINSTART)),
@@ -114,7 +113,6 @@ CPVRTimerInfoTag::CPVRTimerInfoTag(const PVR_TIMER &timer, const CPVRChannelPtr
   m_iPreventDupEpisodes(timer.iPreventDuplicateEpisodes),
   m_iRecordingGroup(timer.iRecordingGroup),
   m_strFileNameAndPath(StringUtils::Format("pvr://client%i/timers/%i", m_iClientId, m_iClientIndex)),
-  m_iChannelNumber(channel ? CServiceBroker::GetPVRManager().ChannelGroups()->GetGroupAll(channel->IsRadio())->GetChannelNumber(channel) : 0),
   m_bIsRadio(channel && channel->IsRadio()),
   m_iTimerId(0),
   m_iMarginStart(timer.iMarginStart),
@@ -600,7 +598,6 @@ bool CPVRTimerInfoTag::UpdateEntry(const CPVRTimerInfoTagPtr &tag)
   m_iPreventDupEpisodes = tag->m_iPreventDupEpisodes;
   m_iRecordingGroup     = tag->m_iRecordingGroup;
   m_iWeekdays           = tag->m_iWeekdays;
-  m_iChannelNumber      = tag->m_iChannelNumber;
   m_bIsRadio            = tag->m_bIsRadio;
   m_iMarginStart        = tag->m_iMarginStart;
   m_iMarginEnd          = tag->m_iMarginEnd;
@@ -744,7 +741,6 @@ CPVRTimerInfoTagPtr CPVRTimerInfoTag::CreateInstantTimerTag(const CPVRChannelPtr
     newTimer->m_iParentClientIndex = PVR_TIMER_NO_PARENT;
     newTimer->m_channel            = channel;
     newTimer->m_strTitle           = channel->ChannelName();
-    newTimer->m_iChannelNumber     = channel->ChannelNumber();
     newTimer->m_iClientChannelUid  = channel->UniqueID();
     newTimer->m_iClientId          = channel->ClientID();
     newTimer->m_bIsRadio           = channel->IsRadio();
@@ -810,7 +806,6 @@ CPVRTimerInfoTagPtr CPVRTimerInfoTag::CreateFromEpg(const CPVREpgInfoTagPtr &tag
   newTag->m_iClientIndex       = PVR_TIMER_NO_CLIENT_INDEX;
   newTag->m_iParentClientIndex = PVR_TIMER_NO_PARENT;
   newTag->m_strTitle           = tag->Title().empty() ? channel->ChannelName() : tag->Title();
-  newTag->m_iChannelNumber     = channel->ChannelNumber();
   newTag->m_iClientChannelUid  = channel->UniqueID();
   newTag->m_iClientId          = channel->ClientID();
   newTag->m_bIsRadio           = channel->IsRadio();

diff --git a/xbmc/pvr/timers/PVRTimerInfoTag.h b/xbmc/pvr/timers/PVRTimerInfoTag.h
@@ -278,7 +278,6 @@ namespace PVR
     unsigned int          m_iPreventDupEpisodes; /*!< @brief only record new episodes for epg-based timer rules */
     unsigned int          m_iRecordingGroup;     /*!< @brief (optional) if set, the addon/backend stores the recording to a group (sub-folder) */
     std::string           m_strFileNameAndPath;  /*!< @brief file name is only for reference */
-    int                   m_iChannelNumber;      /*!< @brief integer value of the channel number */
     bool                  m_bIsRadio;            /*!< @brief is radio channel if set */
     unsigned int          m_iTimerId;            /*!< @brief id that won't change as long as XBMC is running */