Skip to content
Browse files

[pvr] make the state helper methods inline

  • Loading branch information...
1 parent 5aa9f75 commit bb98f728e99ad4614d2c5917953fbae355d1f4be @Jalle19 Jalle19 committed Nov 19, 2013
Showing with 21 additions and 29 deletions.
  1. +0 −20 xbmc/pvr/PVRManager.cpp
  2. +21 −9 xbmc/pvr/PVRManager.h
View
20 xbmc/pvr/PVRManager.cpp
@@ -1335,26 +1335,6 @@ void CPVRManager::LocalizationChanged(void)
}
}
-bool CPVRManager::IsInitialising(void) const
-{
- return GetState() == ManagerStateStarting;
-}
-
-bool CPVRManager::IsStarted(void) const
-{
- return GetState() == ManagerStateStarted;
-}
-
-bool CPVRManager::IsStopping() const
-{
- return GetState() == ManagerStateStopping;
-}
-
-bool CPVRManager::IsStopped() const
-{
- return GetState() == ManagerStateStopped;
-}
-
bool CPVRManager::EpgsCreated(void) const
{
CSingleLock lock(m_critSection);
View
30 xbmc/pvr/PVRManager.h
@@ -227,19 +227,37 @@ namespace PVR
/*!
* @return True while the PVRManager is initialising.
*/
- bool IsInitialising(void) const;
+ inline bool IsInitialising(void) const
+ {
+ return GetState() == ManagerStateStarting;
+ }
+
+ /*!
+ * @brief Check whether the PVRManager has fully started.
+ * @return True if started, false otherwise.
+ */
+ inline bool IsStarted(void) const
+ {
+ return GetState() == ManagerStateStarted;
+ }
/*!
* @brief Check whether the PVRManager is stopping
* @return True while the PVRManager is stopping.
*/
- bool IsStopping(void) const;
+ inline bool IsStopping(void) const
+ {
+ return GetState() == ManagerStateStopping;
+ }
/*!
* @brief Check whether the PVRManager has been stopped.
* @return True if stopped, false otherwise.
*/
- bool IsStopped(void) const;
+ inline bool IsStopped(void) const
+ {
+ return GetState() == ManagerStateStopped;
+ }
/*!
* @brief Return the channel that is currently playing.
@@ -256,12 +274,6 @@ namespace PVR
int GetCurrentEpg(CFileItemList &results) const;
/*!
- * @brief Check whether the PVRManager has fully started.
- * @return True if started, false otherwise.
- */
- bool IsStarted(void) const;
-
- /*!
* @brief Check whether EPG tags for channels have been created.
* @return True if EPG tags have been created, false otherwise.
*/

0 comments on commit bb98f72

Please sign in to comment.
Something went wrong with that request. Please try again.