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] refactoring - review fixup after merge of 16677 #16680

Merged
merged 1 commit into from Oct 1, 2019

Conversation

phunkyfish
Copy link
Contributor

Description

Fixup for #16677 for review after it was merged.

No functional change

Motivation and Context

How Has This Been Tested?

OSX, latest Alpha.

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@phunkyfish phunkyfish added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Component: PVR v19 Matrix labels Sep 27, 2019
Copy link
Member

@Rechi Rechi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't add those changes now, as it just spams the commit history.

std::shared_ptr<CPVRClients> m_addons; /*!< pointer to the pvr addon container */
std::unique_ptr<CPVRGUIInfo> m_guiInfo; /*!< pointer to the guiinfo data */
std::shared_ptr<CPVRGUIActions> m_guiActions; /*!< pointer to the pvr gui actions */
CPVREpgContainer m_epgContainer; /*!< the epg container */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comments are still vertical aligned

std::shared_ptr<CPVRDatabase> m_database; /*!< the database for all PVR related data */
mutable CCriticalSection m_critSection; /*!< critical section for all changes to this class, except for changes to triggers */
bool m_bFirstStart = true; /*!< true when the PVR manager was started first, false otherwise */
bool m_bEpgsCreated = false; /*!< true if epg data for channels has been created */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comments are still vertical aligned

std::vector<std::shared_ptr<CPVRChannelGroup>> m_groups; /*!< the groups in this container */
bool m_bRadio; /*!< true if this is a container for radio channels, false if it is for tv channels */
std::shared_ptr<CPVRChannelGroup> m_selectedGroup; /*!< the group that's currently selected in the UI */
std::vector<std::shared_ptr<CPVRChannelGroup>> m_groups; /*!< the groups in this container */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comments are still vertical aligned

xbmc/pvr/channels/PVRChannelGroupsContainer.h Outdated Show resolved Hide resolved
xbmc/pvr/channels/PVRChannelGroupsContainer.h Outdated Show resolved Hide resolved
mutable CDateTime m_nowActiveStart; /*!< the start time of the tag that is currently active */
CDateTime m_lastScanTime; /*!< the last time the EPG has been updated */
mutable CCriticalSection m_critSection; /*!< critical section for changes in this table */
bool m_bUpdateLastScanTime = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comments are still vertical aligned

std::shared_ptr<CPVRTimerType> m_timerType; /*!< the type of this timer */
CDateTime m_StartTime; /*!< start time */
CDateTime m_StopTime; /*!< stop time */
CDateTime m_FirstDay; /*!< if it is a manual timer rule the first date it starts */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comments are still vertical aligned

@ksooo
Copy link
Member

ksooo commented Sep 27, 2019

I suggest to fix the "comments are still vertical aligned" issues in a follow-up PR - for the whole PVR component.

@phunkyfish
Copy link
Contributor Author

Fair, I’ll make the other changes later today.

@phunkyfish
Copy link
Contributor Author

Ok, should be ready.

@ksooo ksooo merged commit 31c550b into xbmc:master Oct 1, 2019
@phunkyfish phunkyfish added this to the Matrix 19.0-alpha 1 milestone Oct 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: PVR Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v19 Matrix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants