mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 23:17:50 +00:00
xbmc: add upstream patch
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
32c3725b8b
commit
d17dd0a746
@ -0,0 +1,29 @@
|
|||||||
|
From 067004b0301366cb4bafc22dff21ec396e044bb7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: arnova <arnova@void.org>
|
||||||
|
Date: Wed, 21 Dec 2011 13:59:13 +0100
|
||||||
|
Subject: [PATCH] [SDL] fixed: Crash when mixer fails to initialise
|
||||||
|
|
||||||
|
---
|
||||||
|
xbmc/guilib/GUIAudioManager.cpp | 6 ++++--
|
||||||
|
1 files changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/xbmc/guilib/GUIAudioManager.cpp b/xbmc/guilib/GUIAudioManager.cpp
|
||||||
|
index 83f4e40..db58426 100644
|
||||||
|
--- a/xbmc/guilib/GUIAudioManager.cpp
|
||||||
|
+++ b/xbmc/guilib/GUIAudioManager.cpp
|
||||||
|
@@ -73,8 +73,10 @@ void CGUIAudioManager::Initialize(int iDevice)
|
||||||
|
#elif defined(HAS_SDL_AUDIO)
|
||||||
|
Mix_CloseAudio();
|
||||||
|
if (Mix_OpenAudio(44100, AUDIO_S16, 2, 4096))
|
||||||
|
- CLog::Log(LOGERROR, "Unable to open audio mixer");
|
||||||
|
- Mix_Volume(0, (int)(128.f * (g_settings.m_nVolumeLevel - VOLUME_MINIMUM) / (float)(VOLUME_MAXIMUM - VOLUME_MINIMUM)));
|
||||||
|
+ CLog::Log(LOGERROR, "Unable to open audio mixer");
|
||||||
|
+ else
|
||||||
|
+ Mix_Volume(0, (int)(128.f * (g_settings.m_nVolumeLevel - VOLUME_MINIMUM) / (float)(VOLUME_MAXIMUM - VOLUME_MINIMUM)));
|
||||||
|
+
|
||||||
|
m_bInitialized = true;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
--
|
||||||
|
1.7.5.4
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user