AESinkFactory: Adjust Sndio

cmake/modules/FindSndio.cmake

@@ -25,15 +25,15 @@ find_package_handle_standard_args(Sndio
 if(SNDIO_FOUND)
   set(SNDIO_INCLUDE_DIRS ${SNDIO_INCLUDE_DIR})
   set(SNDIO_LIBRARIES ${SNDIO_LIBRARY})
-  set(SNDIO_DEFINITIONS -DHAVE_SNDIO=1)
+  set(SNDIO_DEFINITIONS -DHAS_SNDIO=1)
 
   if(NOT TARGET Sndio::Sndio)
     add_library(Sndio::Sndio UNKNOWN IMPORTED)
     set_target_properties(Sndio::Sndio PROPERTIES
                                        IMPORTED_LOCATION "${SNDIO_LIBRARY}"
                                        INTERFACE_INCLUDE_DIRECTORIES "${SNDIO_INCLUDE_DIR}")
     set_target_properties(Sndio::Sndio PROPERTIES
-                                       INTERFACE_COMPILE_DEFINITIONS -DHAVE_SNDIO=1)
+                                       INTERFACE_COMPILE_DEFINITIONS -DHAS_SNDIO=1)
   endif()
 endif()
 

xbmc/cores/AudioEngine/Sinks/AESinkSNDIO.cpp

@@ -21,6 +21,7 @@
 #include "system.h"
 #ifdef HAS_SNDIO
 #include "AESinkSNDIO.h"
+#include "cores/AudioEngine/AESinkFactory.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
 #include "utils/log.h"
 
@@ -158,6 +159,25 @@ CAESinkSNDIO::~CAESinkSNDIO()
   Deinitialize();
 }
 
+void CAESinkSNDIO::Register()
+{
+  AE::AESinkRegEntry entry;
+  entry.sinkName = "SNDIO";
+  entry.createFunc = CAESinkSNDIO::Create;
+  entry.enumerateFunc = CAESinkSNDIO::EnumerateDevicesEx;
+  AE::CAESinkFactory::RegisterSink(entry);
+}
+
+IAESink* CAESinkSNDIO::Create(std::string &device, AEAudioFormat& desiredFormat)
+{
+  IAESink* sink = new CAESinkSNDIO();
+  if (sink->Initialize(desiredFormat, device))
+    return sink;
+
+  delete sink;
+  return nullptr;
+}
+
 bool CAESinkSNDIO::Initialize(AEAudioFormat &format, std::string &device)
 {
   if ((m_hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0)) == nullptr)

xbmc/cores/AudioEngine/Sinks/AESinkSNDIO.h

@@ -35,6 +35,10 @@ class CAESinkSNDIO : public IAESink
   CAESinkSNDIO();
   ~CAESinkSNDIO() override;
 
+  static void Register();
+  static IAESink* Create(std::string &device, AEAudioFormat &desiredFormat);
+  static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
+
   bool Initialize(AEAudioFormat &format, std::string &device) override;
   void Deinitialize() override;
 
@@ -43,7 +47,6 @@ class CAESinkSNDIO : public IAESink
   double GetCacheTotal() override { return 0.0; }
   unsigned int AddPackets(uint8_t **data, unsigned int frames, unsigned int offset) override;
   void Drain() override;
-  static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false);
 private:
   void AudioFormatToPar(AEAudioFormat& format);
   bool ParToAudioFormat(AEAudioFormat& format);

xbmc/system.h

@@ -130,9 +130,6 @@
 #ifdef HAVE_LIRC
 #define HAS_LIRC
 #endif
-#ifdef HAVE_SNDIO
-#define HAS_SNDIO
-#endif
 #endif
 
 #ifdef HAVE_LIBSSH

xbmc/windowing/X11/OptionalsReg.cpp

@@ -218,3 +218,21 @@ bool X11::PulseAudioRegister()
   return false;
 }
 #endif
+
+//-----------------------------------------------------------------------------
+// sndio
+//-----------------------------------------------------------------------------
+
+#ifdef HAS_SNDIO
+#include "cores/AudioEngine/Sinks/AESinkSNDIO.h"
+bool X11::SndioRegister()
+{
+  CAESinkSNDIO::Register();
+  return true;
+}
+#else
+bool X11::SndioRegister()
+{
+  return false;
+}
+#endif

xbmc/windowing/X11/OptionalsReg.h

@@ -80,3 +80,12 @@ namespace X11
 {
 bool PulseAudioRegister();
 }
+
+//-----------------------------------------------------------------------------
+// sndio
+//-----------------------------------------------------------------------------
+
+namespace X11
+{
+bool SndioRegister();
+}

xbmc/windowing/X11/WinSystemX11GLContext.cpp

@@ -63,11 +63,18 @@ CWinSystemX11GLContext::CWinSystemX11GLContext()
   {
     X11::PulseAudioRegister();
   }
+  else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
+  {
+    X11::SndioRegister();
+  }
   else
   {
     if (!X11::PulseAudioRegister())
     {
-      X11::ALSARegister();
+      if (!X11::ALSARegister())
+      {
+        X11::SndioRegister();
+      }
     }
   }
 }

xbmc/windowing/gbm/OptionalsReg.cpp

@@ -161,3 +161,21 @@ bool GBM::PulseAudioRegister()
   return false;
 }
 #endif
+
+//-----------------------------------------------------------------------------
+// sndio
+//-----------------------------------------------------------------------------
+
+#ifdef HAS_SNDIO
+#include "cores/AudioEngine/Sinks/AESinkSNDIO.h"
+bool GBM::SndioRegister()
+{
+  CAESinkSNDIO::Register();
+  return true;
+}
+#else
+bool GBM::SndioRegister()
+{
+  return false;
+}
+#endif

xbmc/windowing/gbm/OptionalsReg.h

@@ -53,3 +53,12 @@ namespace GBM
 {
 bool PulseAudioRegister();
 }
+
+//-----------------------------------------------------------------------------
+// sndio
+//-----------------------------------------------------------------------------
+
+namespace GBM
+{
+bool SndioRegister();
+}

xbmc/windowing/gbm/WinSystemGbm.cpp

@@ -45,13 +45,20 @@ CWinSystemGbm::CWinSystemGbm() :
   }
   else if (StringUtils::EqualsNoCase(envSink, "PULSE"))
   {
-   GBM::PulseAudioRegister();
+    GBM::PulseAudioRegister();
+  }
+  else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
+  {
+    GBM::SndioRegister();
   }
   else
   {
     if (!GBM::PulseAudioRegister())
     {
-      GBM::ALSARegister();
+      if (!GBM::ALSARegister())
+      {
+        GBM::SndioRegister();
+      }
     }
   }
 

xbmc/windowing/wayland/OptionalsReg.cpp

@@ -135,3 +135,21 @@ bool WAYLAND::PulseAudioRegister()
   return false;
 }
 #endif
+
+//-----------------------------------------------------------------------------
+// sndio
+//-----------------------------------------------------------------------------
+
+#ifdef HAS_SNDIO
+#include "cores/AudioEngine/Sinks/AESinkSNDIO.h"
+bool WAYLAND::SndioRegister()
+{
+  CAESinkSNDIO::Register();
+  return true;
+}
+#else
+bool WAYLAND::SndioRegister()
+{
+  return false;
+}
+#endif

xbmc/windowing/wayland/OptionalsReg.h

@@ -54,3 +54,12 @@ namespace WAYLAND
 {
 bool PulseAudioRegister();
 }
+
+//-----------------------------------------------------------------------------
+// sndio
+//-----------------------------------------------------------------------------
+
+namespace WAYLAND
+{
+bool SndioRegister();
+}

xbmc/windowing/wayland/WinSystemWayland.cpp

@@ -155,11 +155,18 @@ CWinSystemWayland::CWinSystemWayland()
   {
     ::WAYLAND::PulseAudioRegister();
   }
+  else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
+  {
+    ::WAYLAND::SndioRegister();
+  }
   else
   {
     if (!::WAYLAND::PulseAudioRegister())
     {
-      ::WAYLAND::ALSARegister();
+      if (!::WAYLAND::ALSARegister())
+      {
+        ::WAYLAND::SndioRegister();
+      }
     }
   }
   m_winEvents.reset(new CWinEventsWayland());