[refactor] make m_pPlayer private and expose it through method GetAppPlayer() #13259

xhaggi · 2017-12-28T13:46:35Z

see commits

xbmc/Application.cpp

@@ -4864,6 +4865,11 @@ std::string CApplication::GetCurrentPlayer()
  return m_pPlayer->GetCurrentPlayer();
 }

+std::shared_ptr<CApplicationPlayer> CApplication::GetAppPlayer()
+{
+  return m_pPlayer;


xbmc/GUIInfoManager.cpp

    break;
  case PLAYER_CHAPTERNAME:
-    if(g_application.m_pPlayer->IsPlaying())
-      g_application.m_pPlayer->GetChapterName(strLabel);
+    if(g_application.GetAppPlayer()->IsPlaying())


xbmc/GUIInfoManager.cpp

    {
      strLabel = m_videoInfo.stereoMode;
    }
    break;
  case VIDEOPLAYER_SUBTITLES_LANG:
-    if(g_application.m_pPlayer && g_application.m_pPlayer->IsPlaying() && g_application.m_pPlayer->GetSubtitleVisible())
+    if(g_application.GetAppPlayer() && g_application.GetAppPlayer()->IsPlaying() && g_application.GetAppPlayer()->GetSubtitleVisible())


xbmc/Application.h

@@ -502,6 +501,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs
  std::atomic_uint m_WaitingExternalCalls;        /*!< counts threads wich are waiting to be processed in FrameMove */
  unsigned int m_ProcessedExternalCalls;          /*!< counts calls wich are processed during one "door open" cycle in FrameMove */
  unsigned int m_ProcessedExternalDecay = 0;      /*!< counts to close door after a few frames of no python activity */
+  std::shared_ptr<CApplicationPlayer> m_pPlayer;


xbmc/GUIInfoManager.cpp

@@ -6136,11 +6136,11 @@ std::string CGUIInfoManager::GetLabel(int info, int contextWindow, std::string *
    }
    break;
  case PLAYER_PLAYSPEED:
-      if(g_application.m_pPlayer->IsPlaying())
+      if(g_application.GetAppPlayer().IsPlaying())


xbmc/GUIInfoManager.cpp

    {
      strLabel = CStreamDetails::VideoAspectToAspectDescription(CServiceBroker::GetDataCacheCore().GetVideoDAR());
    }
    break;
  case VIDEOPLAYER_AUDIO_CHANNELS:
-    if(g_application.m_pPlayer->IsPlaying())
+    if(g_application.GetAppPlayer().IsPlaying())


xbmc/SeekHandler.cpp

-  int64_t playTime = g_application.m_pPlayer->GetTime();
-  double minSeekSize = (g_application.m_pPlayer->GetMinTime() - playTime) / 1000;
-  double maxSeekSize = (g_application.m_pPlayer->GetMaxTime() - playTime) / 1000;
+  int64_t playTime = g_application.GetAppPlayer().GetTime();


xhaggi · 2017-12-29T11:32:57Z

@Voyager1 FYI .. I changed the unique ptr CApplicationStackHelper to be a plain member of CApplication and made it private with a public method GetAppStackHelper.

xhaggi · 2017-12-29T11:33:55Z

jenkins build this please

…Player()

xhaggi · 2017-12-30T12:47:37Z

@FernetMenta would be nice if you could take another look so I don't need another rebase round.

xbmc/GUIInfoManager.cpp

@@ -7223,88 +7190,88 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
    CGUIWindowSlideShow *slideShow = g_windowManager.GetWindow<CGUIWindowSlideShow>(WINDOW_SLIDESHOW);
    bReturn = (slideShow && slideShow->GetCurrentSlide() && slideShow->GetCurrentSlide()->IsVideo());
  }
-  else if (g_application.m_pPlayer->IsPlaying())
+  else if (g_application.GetAppPlayer().IsPlaying())


…tAppStackHelper()

…etBool This reduces dupe code and is necessary to easily drop the IsPlaying condition in the middle of the previous elseif conditions.

FernetMenta · 2017-12-30T13:57:04Z

+1

Voyager1 · 2017-12-30T14:09:25Z

I changed the unique ptr CApplicationStackHelper to be a plain member of CApplication and made it private with a public method GetAppStackHelper.

seems ok to me.

xhaggi · 2017-12-30T14:23:41Z

Jenkins build this please

xhaggi added the Type: Cleanup non-breaking change which removes non-working or unmaintained functionality label Dec 28, 2017

xhaggi requested a review from FernetMenta December 28, 2017 13:46

xhaggi force-pushed the refactor-player-member-access branch from 18120ae to dde89f0 Compare December 28, 2017 14:46

FernetMenta reviewed Dec 28, 2017

View reviewed changes

xbmc/Application.cpp Outdated

@@ -4864,6 +4865,11 @@ std::string CApplication::GetCurrentPlayer()

return m_pPlayer->GetCurrentPlayer();

}

std::shared_ptr<CApplicationPlayer> CApplication::GetAppPlayer()

{

return m_pPlayer;

This comment was marked as spam.

Sign in to view

FernetMenta reviewed Dec 28, 2017

View reviewed changes

xbmc/GUIInfoManager.cpp Outdated

break;

case PLAYER_CHAPTERNAME:

if(g_application.m_pPlayer->IsPlaying())

g_application.m_pPlayer->GetChapterName(strLabel);

if(g_application.GetAppPlayer()->IsPlaying())

This comment was marked as spam.

Sign in to view

FernetMenta reviewed Dec 28, 2017

View reviewed changes

xhaggi force-pushed the refactor-player-member-access branch from dde89f0 to e60b29c Compare December 28, 2017 16:16

FernetMenta reviewed Dec 28, 2017

View reviewed changes

jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Dec 28, 2017

xhaggi force-pushed the refactor-player-member-access branch from c4372ef to 9ea824d Compare December 28, 2017 18:11

xhaggi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label Dec 28, 2017

xbmc deleted a comment from jenkins4kodi Dec 28, 2017

jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Dec 29, 2017

xhaggi force-pushed the refactor-player-member-access branch from 9ea824d to e930ba7 Compare December 29, 2017 11:30

jenkins4kodi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label Dec 29, 2017

jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Dec 30, 2017

xhaggi added 4 commits December 30, 2017 13:38

[cleanup] no need to cast to int in CSeekHandler::SetSeekSize

7534265

[cleanup] fix method scopes in CDataCacheCore

2272154

[refactor] make m_pPlayer private and expose it through method GetApp…

44b7853

…Player()

[refactor] rename m_pPlayer to m_appPlayer

746c21a

xhaggi force-pushed the refactor-player-member-access branch from e930ba7 to 395a82d Compare December 30, 2017 12:46

FernetMenta reviewed Dec 30, 2017

View reviewed changes

jenkins4kodi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label Dec 30, 2017

[refactor] make m_stackHelper private and expose it through method Ge…

c831cac

…tAppStackHelper()

xhaggi added 2 commits December 30, 2017 14:43

[refactor] use switch+case instead of if+elseif in CGUIInfoManager::G…

8b68dca

…etBool This reduces dupe code and is necessary to easily drop the IsPlaying condition in the middle of the previous elseif conditions.

[refactor] drop superfluous IsPlaying checks from GUIInfoManager

5decb14

xhaggi force-pushed the refactor-player-member-access branch from 395a82d to 5decb14 Compare December 30, 2017 13:50

xhaggi merged commit 012eaf4 into xbmc:master Dec 30, 2017

ksooo mentioned this pull request Dec 31, 2017

CGUIInfoManager Coverity fixes #13275

Merged

Rechi added the v18 Leia label Dec 31, 2017

Rechi added this to the L 18.0-alpha1 milestone Dec 31, 2017

xhaggi deleted the refactor-player-member-access branch January 4, 2018 11:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[refactor] make m_pPlayer private and expose it through method GetAppPlayer() #13259

[refactor] make m_pPlayer private and expose it through method GetAppPlayer() #13259

xhaggi commented Dec 28, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

xhaggi commented Dec 29, 2017

xhaggi commented Dec 29, 2017

xhaggi commented Dec 30, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

FernetMenta commented Dec 30, 2017

Voyager1 commented Dec 30, 2017

xhaggi commented Dec 30, 2017

[refactor] make m_pPlayer private and expose it through method GetAppPlayer() #13259

[refactor] make m_pPlayer private and expose it through method GetAppPlayer() #13259

Conversation

xhaggi commented Dec 28, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

xhaggi commented Dec 29, 2017

xhaggi commented Dec 29, 2017

xhaggi commented Dec 30, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

FernetMenta commented Dec 30, 2017

Voyager1 commented Dec 30, 2017

xhaggi commented Dec 30, 2017