Permalink
Browse files

[video] cosmetic: rename PresentBob to PresentFields and remove unuse…

…d PresentWeave
  • Loading branch information...
1 parent 6b63a1a commit 7f3fb695b44cac6667f7dcd36d57faa13d900816 @elupus committed Jun 17, 2012
Showing with 4 additions and 15 deletions.
  1. +3 −13 xbmc/cores/VideoRenderers/RenderManager.cpp
  2. +1 −2 xbmc/cores/VideoRenderers/RenderManager.h
@@ -652,9 +652,9 @@ void CXBMCRenderManager::Render(bool clear, DWORD flags, DWORD alpha)
CSharedLock lock(m_sharedSection);
if( m_presentmethod == PRESENT_METHOD_BOB )
- PresentBob(clear, flags, alpha);
+ PresentFields(clear, flags, alpha);
else if( m_presentmethod == PRESENT_METHOD_WEAVE )
- PresentBob(clear, flags | RENDER_FLAG_WEAVE, alpha);
+ PresentFields(clear, flags | RENDER_FLAG_WEAVE, alpha);
else if( m_presentmethod == PRESENT_METHOD_BLEND )
PresentBlend(clear, flags, alpha);
else
@@ -698,7 +698,7 @@ void CXBMCRenderManager::PresentSingle(bool clear, DWORD flags, DWORD alpha)
/* new simpler method of handling interlaced material, *
* we just render the two fields right after eachother */
-void CXBMCRenderManager::PresentBob(bool clear, DWORD flags, DWORD alpha)
+void CXBMCRenderManager::PresentFields(bool clear, DWORD flags, DWORD alpha)
{
CSingleLock lock(g_graphicsContext);
@@ -738,16 +738,6 @@ void CXBMCRenderManager::PresentBlend(bool clear, DWORD flags, DWORD alpha)
m_presentstep = PRESENT_IDLE;
}
-/* renders the two fields as one, but doing fieldbased *
- * scaling then reinterlaceing resulting image */
-void CXBMCRenderManager::PresentWeave(bool clear, DWORD flags, DWORD alpha)
-{
- CSingleLock lock(g_graphicsContext);
-
- m_pRenderer->RenderUpdate(clear, flags | RENDER_FLAG_BOTH, alpha);
- m_presentstep = PRESENT_IDLE;
-}
-
void CXBMCRenderManager::Recover()
{
#if defined(HAS_GL) && !defined(TARGET_DARWIN)
@@ -135,8 +135,7 @@ class CXBMCRenderManager
void Render(bool clear, DWORD flags, DWORD alpha);
void PresentSingle(bool clear, DWORD flags, DWORD alpha);
- void PresentWeave(bool clear, DWORD flags, DWORD alpha);
- void PresentBob(bool clear, DWORD flags, DWORD alpha);
+ void PresentFields(bool clear, DWORD flags, DWORD alpha);
void PresentBlend(bool clear, DWORD flags, DWORD alpha);
EINTERLACEMETHOD AutoInterlaceMethodInternal(EINTERLACEMETHOD mInt);

0 comments on commit 7f3fb69

Please sign in to comment.