diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2018-09-25 12:52:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 12:52:19 -0700 |
| commit | 10b615c75027dbf9819a29bd488945a5cd55ecfd (patch) | |
| tree | b05e05bee7f9429f1e02782d439cdba2702b5927 | |
| parent | c001b085fad262e243baa93e6978ec9381c3375c (diff) | |
| parent | dcf73e14b924997e3836765fec7a24a7c467d8a2 (diff) | |
Merge pull request #14453 from nsenica/master
RPI: Be sure to register Alsa and Pulseaudio.
| -rw-r--r-- | system/settings/rbp.xml | 3 | ||||
| -rw-r--r-- | xbmc/windowing/rpi/WinSystemRpi.cpp | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml index 7337d13f4c..035b2b8ff4 100644 --- a/system/settings/rbp.xml +++ b/system/settings/rbp.xml @@ -95,6 +95,9 @@ <setting id="audiooutput.atempothreshold"> <default>100</default> <!-- disabled --> </setting> + <setting id="audiooutput.audiodevice"> + <default>PI:HDMI</default> + </setting> </group> <group id="3"> <setting id="audiooutput.ac3transcode" help="37024"> diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp index f98abadaf8..a403464d83 100644 --- a/xbmc/windowing/rpi/WinSystemRpi.cpp +++ b/xbmc/windowing/rpi/WinSystemRpi.cpp @@ -42,7 +42,21 @@ CWinSystemRpi::CWinSystemRpi() : m_rpi = new CRPIUtils(); 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(); + } + CLinuxPowerSyscall::Register(); m_lirc.reset(OPTIONALS::LircRegister()); m_libinput->Start(); |