Merge pull request #1388 from vpeter4/imx6-kodi-master

imx6: update kodi patch for kodi 18
This commit is contained in:
CvH 2017-02-23 17:03:20 +01:00 committed by GitHub
commit 0d24524c19

View File

@ -1490,10 +1490,11 @@ diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
index e4ddf9e..34d0152 100644 index e4ddf9e..34d0152 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
@@ -20,6 +20,7 @@ @@ -20,6 +20,8 @@
#include "cores/AudioEngine/Utils/AEUtil.h" #include "cores/AudioEngine/Utils/AEUtil.h"
#include "ActiveAEResampleFFMPEG.h" #include "ActiveAEResampleFFMPEG.h"
+#include "ServiceBroker.h"
+#include "settings/Settings.h" +#include "settings/Settings.h"
#include "utils/log.h" #include "utils/log.h"
@ -1502,7 +1503,7 @@ index e4ddf9e..34d0152 100644
{ {
av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0);
} }
+ int boost_center = CSettings::GetInstance().GetInt("audiooutput.boostcenter"); + int boost_center = CServiceBroker::GetSettings().GetInt("audiooutput.boostcenter");
+ if (boost_center) + if (boost_center)
+ { + {
+ float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f); + float gain = pow(10.0f, ((float)(-3 + boost_center))/20.0f);