fixup: Fix GLES and MMAL builds

popcornmix · Sep 21, 2015 · 8c482e6 · 8c482e6
1 parent d4ee54f
commit 8c482e6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
@@ -293,9 +293,6 @@ bool CMMALRenderer::Configure(unsigned int width, unsigned int height, unsigned
 
   // calculate the input frame aspect ratio
   CalculateFrameAspectRatio(d_width, d_height);
-  ChooseBestResolution(fps);
-  m_destWidth = g_graphicsContext.GetResInfo(m_resolution).iWidth;
-  m_destHeight = g_graphicsContext.GetResInfo(m_resolution).iHeight;
   SetViewMode(CMediaSettings::GetInstance().GetCurrentVideoSettings().m_ViewMode);
   ManageDisplay();
 
@@ -536,10 +533,6 @@ void CMMALRenderer::PreInit()
 
   m_iFlags = 0;
 
-  m_resolution = CDisplaySettings::GetInstance().GetCurrentResolution();
-  if ( m_resolution == RES_WINDOW )
-    m_resolution = RES_DESKTOP;
-
   CLog::Log(LOGDEBUG, "%s::%s", CLASSNAME, __func__);
 
   m_formats.clear();

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h
@@ -109,8 +109,6 @@ class CMMALRenderer : public CBaseRenderer
   bool                 m_bConfigured;
   bool                 m_bMMALConfigured;
   unsigned int         m_extended_format;
-  unsigned int         m_destWidth;
-  unsigned int         m_destHeight;
   int                  m_neededBuffers;
 
   CRect                     m_src_rect;

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
@@ -171,7 +171,6 @@ bool CLinuxRendererGLES::Configure(unsigned int width, unsigned int height, unsi
 
   // Calculate the input frame aspect ratio.
   CalculateFrameAspectRatio(d_width, d_height);
-  ChooseBestResolution(fps);
   SetViewMode(CMediaSettings::GetInstance().GetCurrentVideoSettings().m_ViewMode);
   ManageDisplay();
 
@@ -538,9 +537,6 @@ void CLinuxRendererGLES::PreInit()
   m_bConfigured = false;
   m_bValidated = false;
   UnInit();
-  m_resolution = CDisplaySettings::GetInstance().GetCurrentResolution();
-  if ( m_resolution == RES_WINDOW )
-    m_resolution = RES_DESKTOP;
 
   m_iYV12RenderBuffer = 0;
   m_NumYV12Buffers = 2;