From 6911573a11c646922a2d2fbb432a834971c6594b Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 26 Sep 2018 02:51:37 +0100
Subject: [PATCH] kodi: update Pulse/Alsa after PR14453

---
 ...i-100.14-use-alsa-and-pulse-together.patch | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch b/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch
index a7bf93ed54..93ddb912f4 100644
--- a/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch
+++ b/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch
@@ -1,20 +1,20 @@
-From 09ef179755107108722027dcc04ae62795c5d522 Mon Sep 17 00:00:00 2001
+From 0bb21ebfe5f26545ccc9f105560c6c0fcbce77b3 Mon Sep 17 00:00:00 2001
 From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Tue, 22 May 2018 00:28:13 +0100
+Date: Wed, 26 Sep 2018 02:47:03 +0100
 Subject: [PATCH] allow using alsa and pulse together
 
 ---
  xbmc/windowing/X11/WinSystemX11GLContext.cpp | 35 ++--------------------------
  xbmc/windowing/amlogic/WinSystemAmlogic.cpp  |  2 ++
  xbmc/windowing/gbm/WinSystemGbm.cpp          | 34 ++-------------------------
- xbmc/windowing/rpi/WinSystemRpi.cpp          |  4 ++++
- 4 files changed, 10 insertions(+), 65 deletions(-)
+ xbmc/windowing/rpi/WinSystemRpi.cpp          | 17 ++++----------
+ 4 files changed, 10 insertions(+), 78 deletions(-)
 
 diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
-index 6e31a80..2e76053 100644
+index 1980916..2524716 100644
 --- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
 +++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
-@@ -52,39 +52,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
+@@ -40,39 +40,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
  
  CWinSystemX11GLContext::CWinSystemX11GLContext()
  {
@@ -57,10 +57,10 @@ index 6e31a80..2e76053 100644
  }
  
 diff --git a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
-index 324d47f..1766308 100644
+index 9df83a6..5d41c1f 100644
 --- a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
 +++ b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
-@@ -32,6 +32,7 @@
+@@ -20,6 +20,7 @@
  // AESink Factory
  #include "cores/AudioEngine/AESinkFactory.h"
  #include "cores/AudioEngine/Sinks/AESinkALSA.h"
@@ -68,7 +68,7 @@ index 324d47f..1766308 100644
  #include "windowing/GraphicContext.h"
  #include "windowing/Resolution.h"
  #include "platform/linux/powermanagement/LinuxPowerSyscall.h"
-@@ -78,6 +79,7 @@ CWinSystemAmlogic::CWinSystemAmlogic() :
+@@ -66,6 +67,7 @@ CWinSystemAmlogic::CWinSystemAmlogic() :
    // Register sink
    AE::CAESinkFactory::ClearSinks();
    CAESinkALSA::Register();
@@ -77,11 +77,11 @@ index 324d47f..1766308 100644
    m_lirc.reset(OPTIONALS::LircRegister());
    m_libinput->Start();
 diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
-index 72ddf6a..79e81d5 100644
+index 12f2da6..c2bdd0e 100644
 --- a/xbmc/windowing/gbm/WinSystemGbm.cpp
 +++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
-@@ -43,38 +43,8 @@ CWinSystemGbm::CWinSystemGbm() :
-   m_delayDispReset(false),
+@@ -31,38 +31,8 @@ CWinSystemGbm::CWinSystemGbm() :
+   m_GBM(new CGBMUtils),
    m_libinput(new CLibInputHandler)
  {
 -  std::string envSink;
@@ -122,10 +122,10 @@ index 72ddf6a..79e81d5 100644
    CLinuxPowerSyscall::Register();
    m_lirc.reset(OPTIONALS::LircRegister());
 diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
-index fac5cc4..f90e46d 100644
+index a403464..6a68d9f 100644
 --- a/xbmc/windowing/rpi/WinSystemRpi.cpp
 +++ b/xbmc/windowing/rpi/WinSystemRpi.cpp
-@@ -33,7 +33,9 @@
+@@ -21,7 +21,9 @@
  #include "guilib/DispResource.h"
  #include "utils/log.h"
  #include "cores/AudioEngine/AESinkFactory.h"
@@ -135,10 +135,23 @@ index fac5cc4..f90e46d 100644
  #include "platform/linux/powermanagement/LinuxPowerSyscall.h"
  
  #include <EGL/egl.h>
-@@ -55,6 +57,8 @@ CWinSystemRpi::CWinSystemRpi() :
- 
+@@ -44,19 +46,8 @@ CWinSystemRpi::CWinSystemRpi() :
    AE::CAESinkFactory::ClearSinks();
+ 
    CAESinkPi::Register();
+-  std::string envSink;
+-  if (getenv("KODI_AE_SINK"))
+-    envSink = getenv("KODI_AE_SINK");
+-
+-  if (StringUtils::EqualsNoCase(envSink, "PULSE"))
+-  {
+-    OPTIONALS::PulseAudioRegister();
+-  }
+-  else
+-  {
+-    OPTIONALS::ALSARegister();
+-  }
+-
 +  CAESinkALSA::Register();
 +  CAESinkPULSE::Register();
    CLinuxPowerSyscall::Register();