/
kodi-999.99-PR10501.patch
116 lines (104 loc) · 4.37 KB
/
kodi-999.99-PR10501.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
From e0b1e6bd9afc7db17173200b21fcbf0084f83e78 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 19 Sep 2016 14:20:44 +0200
Subject: [PATCH] VideoPlayer: drop obsolete player method HasFrame, fix subs
for bypass renderer
---
xbmc/ApplicationPlayer.cpp | 9 ---------
xbmc/ApplicationPlayer.h | 1 -
xbmc/cores/IPlayer.h | 2 --
xbmc/cores/VideoPlayer/VideoPlayer.cpp | 5 -----
xbmc/cores/VideoPlayer/VideoPlayer.h | 1 -
xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp | 3 ++-
xbmc/video/windows/GUIWindowFullScreen.cpp | 2 +-
7 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp
index b76134d..205cdd5 100644
--- a/xbmc/ApplicationPlayer.cpp
+++ b/xbmc/ApplicationPlayer.cpp
@@ -762,15 +762,6 @@ void CApplicationPlayer::FrameMove()
player->FrameMove();
}
-bool CApplicationPlayer::HasFrame()
-{
- std::shared_ptr<IPlayer> player = GetInternal();
- if (player)
- return player->HasFrame();
- else
- return false;
-}
-
void CApplicationPlayer::Render(bool clear, uint32_t alpha, bool gui)
{
std::shared_ptr<IPlayer> player = GetInternal();
diff --git a/xbmc/ApplicationPlayer.h b/xbmc/ApplicationPlayer.h
index d27e8df..5144a0d 100644
--- a/xbmc/ApplicationPlayer.h
+++ b/xbmc/ApplicationPlayer.h
@@ -83,7 +83,6 @@ class CApplicationPlayer
void SetPlaySpeed(float speed);
void FrameMove();
- bool HasFrame();
void Render(bool clear, uint32_t alpha = 255, bool gui = true);
void FlushRenderer();
void SetRenderViewMode(int mode);
diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h
index 7bc005b..d004a4e 100644
--- a/xbmc/cores/IPlayer.h
+++ b/xbmc/cores/IPlayer.h
@@ -389,8 +389,6 @@ class IPlayer
*/
virtual void FrameMove() {};
- virtual bool HasFrame() { return false; };
-
virtual void Render(bool clear, uint32_t alpha = 255, bool gui = true) {};
virtual void FlushRenderer() {};
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
index b4a604c..ac67923 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -5039,11 +5039,6 @@ void CVideoPlayer::FrameMove()
m_renderManager.FrameMove();
}
-bool CVideoPlayer::HasFrame()
-{
- return m_renderManager.HasFrame();
-}
-
void CVideoPlayer::Render(bool clear, uint32_t alpha, bool gui)
{
m_renderManager.Render(clear, 0, alpha, gui);
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.h b/xbmc/cores/VideoPlayer/VideoPlayer.h
index 3f39706..d022ce2 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.h
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.h
@@ -368,7 +368,6 @@ class CVideoPlayer : public IPlayer, public CThread, public IVideoPlayer, public
virtual bool SwitchChannel(const PVR::CPVRChannelPtr &channel);
virtual void FrameMove();
- virtual bool HasFrame();
virtual void Render(bool clear, uint32_t alpha = 255, bool gui = true);
virtual void FlushRenderer();
virtual void SetRenderViewMode(int mode);
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
index bbdd403..52d418b 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
@@ -960,7 +960,8 @@ bool CRenderManager::IsGuiLayer()
if (!m_pRenderer)
return false;
- if (m_pRenderer->IsGuiLayer() || m_renderedOverlay || m_overlays.HasOverlay(m_presentsource))
+ if ((m_pRenderer->IsGuiLayer() && HasFrame()) ||
+ m_renderedOverlay || m_overlays.HasOverlay(m_presentsource))
return true;
if (m_renderDebug && m_debugTimer.IsTimePast())
diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp
index 7263752..72da165 100644
--- a/xbmc/video/windows/GUIWindowFullScreen.cpp
+++ b/xbmc/video/windows/GUIWindowFullScreen.cpp
@@ -485,7 +485,7 @@ void CGUIWindowFullScreen::FrameMove()
void CGUIWindowFullScreen::Process(unsigned int currentTime, CDirtyRegionList &dirtyregion)
{
- if (g_application.m_pPlayer->IsRenderingGuiLayer() && g_application.m_pPlayer->HasFrame())
+ if (g_application.m_pPlayer->IsRenderingGuiLayer())
MarkDirtyRegion();
CGUIWindow::Process(currentTime, dirtyregion);