Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

A few more issues found from Code Analysis in VS #1184

Closed
wants to merge 10 commits into from

3 participants

@jabbera

Just a couple of other easy things I found.

@jmarshallnz
Owner

Please rebase out the revert

@jabbera jabbera closed this
@tru tru referenced this pull request from a commit in plexinc/plex-home-theater-public
@tru tru Only open the OSD on FullScreen init if the app is not buffering
What we saw was that buffering at the start of a video could make the
OSD show up when app was starting up.

Fixes #1184
ab0f92a
@tru tru referenced this pull request from a commit in RasPlex/plex-home-theatre
@tru tru Only open the OSD on FullScreen init if the app is not buffering
What we saw was that buffering at the start of a video could make the
OSD show up when app was starting up.

Fixes #1184
e793f20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
4 xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -130,7 +130,7 @@ bool CAESinkDirectSound::Initialize(AEAudioFormat &format, std::string &device)
LPGUID deviceGUID = NULL;
RPC_CSTR wszUuid = NULL;
- HRESULT hr;
+ HRESULT hr = E_FAIL;
std::list<DSDevice> DSDeviceList;
std::string deviceFriendlyName;
DirectSoundEnumerate(DSEnumCallback, &DSDeviceList);
@@ -149,7 +149,7 @@ bool CAESinkDirectSound::Initialize(AEAudioFormat &format, std::string &device)
break;
}
}
- if (hr == RPC_S_OK) RpcStringFree(&wszUuid);
+ if (hr == RPC_S_OK) RpcStringFree(&wszUuid);
}
hr = DirectSoundCreate(deviceGUID, &m_pDSound, NULL);
View
10 xbmc/guilib/GraphicContext.cpp
@@ -280,14 +280,14 @@ void CGraphicContext::SetFullScreenVideo(bool bOnOff)
if(m_bFullScreenRoot)
{
if(m_bFullScreenVideo)
- g_graphicsContext.SetVideoResolution(g_renderManager.GetResolution());
+ SetVideoResolution(g_renderManager.GetResolution());
else if(g_guiSettings.m_LookAndFeelResolution > RES_DESKTOP)
- g_graphicsContext.SetVideoResolution(g_guiSettings.m_LookAndFeelResolution);
+ SetVideoResolution(g_guiSettings.m_LookAndFeelResolution);
else
- g_graphicsContext.SetVideoResolution(RES_DESKTOP);
+ SetVideoResolution(RES_DESKTOP);
}
else
- g_graphicsContext.SetVideoResolution(RES_WINDOW);
+ SetVideoResolution(RES_WINDOW);
#endif
Unlock();
@@ -783,7 +783,7 @@ bool CGraphicContext::ToggleFullScreenRoot ()
uiRes = newRes;
#if defined(HAS_VIDEO_PLAYBACK)
- if (g_graphicsContext.IsFullScreenVideo() || g_graphicsContext.IsCalibrating())
+ if (IsFullScreenVideo() || IsCalibrating())
{
/* we need to trick renderer that we are fullscreen already so it gives us a valid value */
m_bFullScreenRoot = true;
View
2  xbmc/network/websocket/WebSocketV8.cpp
@@ -185,7 +185,7 @@ const CWebSocketFrame* CWebSocketV8::close(WebSocketCloseReason reason /* = WebS
m_state = WebSocketStateClosed;
CWebSocketFrame* frame = new CWebSocketFrame(WebSocketConnectionClose, data, length);
- delete data;
+ delete[] data;
return frame;
}
View
2  xbmc/rendering/dx/RenderSystemDX.cpp
@@ -620,7 +620,7 @@ bool CRenderSystemDX::BeginRender()
if (!m_bRenderCreated)
return false;
- DWORD oldStatus = m_nDeviceStatus;
+ HRESULT oldStatus = m_nDeviceStatus;
if (m_useD3D9Ex)
{
m_nDeviceStatus = ((IDirect3DDevice9Ex*)m_pD3DDevice)->CheckDeviceState(m_hDeviceWnd);
Something went wrong with that request. Please try again.