projects/WeTek_Play: Update Kodi patches

This commit is contained in:
Alex Deryskyba 2016-08-03 18:11:37 +02:00
parent 0e73827f72
commit 4c8b564252
13 changed files with 106 additions and 113 deletions

View File

@ -1,17 +1,17 @@
From fde3d3d609e570aa3a8691a4e66e07dce1c80b25 Mon Sep 17 00:00:00 2001 From d692d81a72f47fa8fcc57063b0e54336399af811 Mon Sep 17 00:00:00 2001
From: Alex Deryskyba <alex@codesnake.com> From: Alex Deryskyba <alex@codesnake.com>
Date: Wed, 16 Apr 2014 22:02:01 +0300 Date: Wed, 16 Apr 2014 22:02:01 +0300
Subject: [PATCH] [aml] Fix ALSA sound output for Amlogic-based devices. Subject: [PATCH 01/10] [aml] Fix ALSA sound output for Amlogic-based devices.
--- ---
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 19 +++++++++++++++++++ xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 19 +++++++++++++++++++
1 file changed, 19 insertions(+) 1 file changed, 19 insertions(+)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index fbccce0..6bf2c53 100644 index 6a9066b..75f2cf0 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -84,6 +84,17 @@ static unsigned int ALSASampleRateList[] = @@ -88,6 +88,17 @@ static unsigned int ALSASampleRateList[] =
0 0
}; };
@ -29,7 +29,7 @@ index fbccce0..6bf2c53 100644
CAESinkALSA::CAESinkALSA() : CAESinkALSA::CAESinkALSA() :
m_bufferSize(0), m_bufferSize(0),
m_formatSampleRateMul(0.0), m_formatSampleRateMul(0.0),
@@ -748,12 +759,20 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig @@ -752,12 +763,20 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig
*/ */
periodSize = std::min(periodSize, (snd_pcm_uframes_t) sampleRate / 20); periodSize = std::min(periodSize, (snd_pcm_uframes_t) sampleRate / 20);
bufferSize = std::min(bufferSize, (snd_pcm_uframes_t) sampleRate / 5); bufferSize = std::min(bufferSize, (snd_pcm_uframes_t) sampleRate / 5);
@ -50,3 +50,6 @@ index fbccce0..6bf2c53 100644
CLog::Log(LOGDEBUG, "CAESinkALSA::InitializeHW - Request: periodSize %lu, bufferSize %lu", periodSize, bufferSize); CLog::Log(LOGDEBUG, "CAESinkALSA::InitializeHW - Request: periodSize %lu, bufferSize %lu", periodSize, bufferSize);
--
1.7.10.4

View File

@ -1,7 +1,7 @@
From 0367076d263846832cff68052f3de362f27e5bc6 Mon Sep 17 00:00:00 2001 From a1f4a5a74bb8e9fd48ec3d45bc908861dddb0296 Mon Sep 17 00:00:00 2001
From: Alex Deryskyba <alex@codesnake.com> From: Alex Deryskyba <alex@codesnake.com>
Date: Mon, 8 Sep 2014 23:29:40 +0300 Date: Mon, 8 Sep 2014 23:29:40 +0300
Subject: [PATCH] [wetek] Reorder libraries in configure script to prevent Subject: [PATCH 02/10] [aml] Reorder libraries in configure script to prevent
linker errors when linking with libsmbclient linker errors when linking with libsmbclient
Place libsmbclient before all other libraries to prevent linker errors when linking Place libsmbclient before all other libraries to prevent linker errors when linking
@ -13,10 +13,10 @@ libresolv.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index fbe2766..c668729 100644 index 5b8c04b..7869041 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1425,7 +1425,7 @@ fi @@ -1305,7 +1305,7 @@ fi
# samba # samba
if test "x$use_samba" != "xno"; then if test "x$use_samba" != "xno"; then
PKG_CHECK_MODULES([SAMBA], [smbclient], PKG_CHECK_MODULES([SAMBA], [smbclient],
@ -25,3 +25,6 @@ index fbe2766..c668729 100644
[AC_CHECK_LIB([smbclient], [main],, [AC_CHECK_LIB([smbclient], [main],,
use_samba=no;AC_MSG_ERROR($missing_library)) use_samba=no;AC_MSG_ERROR($missing_library))
USE_LIBSMBCLIENT=0 USE_LIBSMBCLIENT=0
--
1.7.10.4

View File

@ -1,18 +1,19 @@
From 813e6f31c8006190615cbf8ab031db2362bcf553 Mon Sep 17 00:00:00 2001 From 044271ec20fb82025c59fed81baddf766e28c28d Mon Sep 17 00:00:00 2001
From: Alex Deryskyba <alex@codesnake.com> From: Alex Deryskyba <alex@codesnake.com>
Date: Fri, 19 Sep 2014 01:55:12 +0300 Date: Fri, 19 Sep 2014 01:55:12 +0300
Subject: [PATCH] [aml] Change the sample rates that are supported by ALSA but Subject: [PATCH 03/10] [aml] Change the sample rates that are supported by
unsupported by HDMI to the closest supported value ALSA but unsupported by HDMI to the closest supported
value
--- ---
xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 20 ++++++++++++++++++++ xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+) 1 file changed, 20 insertions(+)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 6bf2c53..32ab888 100644 index 75f2cf0..08777aa 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -673,6 +673,26 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig @@ -677,6 +677,26 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig
snd_pcm_hw_params_set_access(m_pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); snd_pcm_hw_params_set_access(m_pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
unsigned int sampleRate = inconfig.sampleRate; unsigned int sampleRate = inconfig.sampleRate;
@ -39,3 +40,6 @@ index 6bf2c53..32ab888 100644
snd_pcm_hw_params_set_rate_near (m_pcm, hw_params, &sampleRate, NULL); snd_pcm_hw_params_set_rate_near (m_pcm, hw_params, &sampleRate, NULL);
unsigned int channelCount = inconfig.channels; unsigned int channelCount = inconfig.channels;
--
1.7.10.4

View File

@ -1,7 +1,7 @@
From b97f9b069a98984109829badcdf8ead92a29ee38 Mon Sep 17 00:00:00 2001 From a9be548866b1f01e5f467a6f92b731fa07f9ba9e Mon Sep 17 00:00:00 2001
From: Alex Deryskyba <alex@codesnake.com> From: Alex Deryskyba <alex@codesnake.com>
Date: Sat, 20 Sep 2014 04:43:52 +0300 Date: Sat, 20 Sep 2014 04:43:52 +0300
Subject: [PATCH] [aml] Fill audio packets completely when resampling to Subject: [PATCH 04/10] [aml] Fill audio packets completely when resampling to
prevent 'audio data unaligned' kernel warnings prevent 'audio data unaligned' kernel warnings
--- ---
@ -9,10 +9,10 @@ Subject: [PATCH] [aml] Fill audio packets completely when resampling to
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp
index dffded7..2f9dc47 100644 index 3ca667c..304cff8 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp
@@ -157,7 +157,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm @@ -162,7 +162,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm
m_inputFormat.m_channelLayout += AE_CH_FC; m_inputFormat.m_channelLayout += AE_CH_FC;
} }
m_resampler = NULL; m_resampler = NULL;
@ -24,3 +24,6 @@ index dffded7..2f9dc47 100644
m_drain = false; m_drain = false;
m_empty = true; m_empty = true;
m_procSample = NULL; m_procSample = NULL;
--
1.7.10.4

View File

@ -1,8 +1,8 @@
From 55a51ac4c992deaa1122ec8fccd21f8a336889e0 Mon Sep 17 00:00:00 2001 From 9936eb795dc53b7681540c57263d175907ae45ac Mon Sep 17 00:00:00 2001
From: Alex Deryskyba <alex@codesnake.com> From: Alex Deryskyba <alex@codesnake.com>
Date: Sun, 19 Oct 2014 16:20:33 +0300 Date: Sun, 19 Oct 2014 16:20:33 +0300
Subject: [PATCH 13/17] Save settings only if they were modified after the last Subject: [PATCH 05/10] Save settings only if they were modified after the
save last save
This prevents from multiple saving the same settings and helps to resolve This prevents from multiple saving the same settings and helps to resolve
the issue on Amlogic G18REF TV-boxes when setiings may be lost after a poweroff. the issue on Amlogic G18REF TV-boxes when setiings may be lost after a poweroff.
@ -24,10 +24,10 @@ note by seo:
1 file changed, 12 insertions(+) 1 file changed, 12 insertions(+)
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 2e690e3..bd0200d 100644 index a8114aa..e629e97 100644
--- a/xbmc/settings/Settings.cpp --- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp
@@ -72,6 +72,7 @@ @@ -75,6 +75,7 @@
#include "threads/SingleLock.h" #include "threads/SingleLock.h"
#include "utils/CharsetConverter.h" #include "utils/CharsetConverter.h"
#include "utils/log.h" #include "utils/log.h"
@ -35,7 +35,7 @@ index 2e690e3..bd0200d 100644
#include "utils/RssManager.h" #include "utils/RssManager.h"
#include "utils/StringUtils.h" #include "utils/StringUtils.h"
#include "utils/SystemInfo.h" #include "utils/SystemInfo.h"
@@ -206,6 +207,17 @@ bool CSettings::Save(const std::string &file) @@ -537,6 +538,17 @@ bool CSettings::Save(const std::string &file)
if (!m_settingsManager->Save(root)) if (!m_settingsManager->Save(root))
return false; return false;
@ -54,5 +54,5 @@ index 2e690e3..bd0200d 100644
} }
-- --
2.1.4 1.7.10.4

View File

@ -1,8 +1,8 @@
From a2adae2d6a5036b2af02448e6803175a02f368d1 Mon Sep 17 00:00:00 2001 From 50833b2af0c7c9aab3593ec8abf8e237851fff61 Mon Sep 17 00:00:00 2001
From: Alex Deryskyba <alex@codesnake.com> From: Alex Deryskyba <alex@codesnake.com>
Date: Tue, 3 Feb 2015 17:58:19 +0100 Date: Tue, 3 Feb 2015 17:58:19 +0100
Subject: [PATCH] [aml] Disable deinterlacing for HD content while video is Subject: [PATCH 06/10] [aml] Disable deinterlacing for HD content while video
being played in a window is being played in a window
... to prevent screen blinking in 1080p50/60hz display modes ... to prevent screen blinking in 1080p50/60hz display modes
--- ---
@ -10,10 +10,10 @@ Subject: [PATCH] [aml] Disable deinterlacing for HD content while video is
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
index 5dc6592..2103042 100644 index aa30474..1fb5e3e 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
@@ -2259,6 +2259,11 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect) @@ -2289,6 +2289,11 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)
CLog::Log(LOGDEBUG, "CAMLCodec::SetVideoRect:m_stereo_view(%d)", m_stereo_view); CLog::Log(LOGDEBUG, "CAMLCodec::SetVideoRect:m_stereo_view(%d)", m_stereo_view);
#endif #endif
@ -25,3 +25,6 @@ index 5dc6592..2103042 100644
// goofy 0/1 based difference in aml axis coordinates. // goofy 0/1 based difference in aml axis coordinates.
// fix them. // fix them.
dst_rect.x2--; dst_rect.x2--;
--
1.7.10.4

View File

@ -1,7 +1,7 @@
From 11435d47a5351c55ef12661baf1adb167da513ef Mon Sep 17 00:00:00 2001 From bd6b4809c2fac4ef7393e96c3c8b72a7faea2f85 Mon Sep 17 00:00:00 2001
From: Alex Deryskyba <alex@codesnake.com> From: Alex Deryskyba <alex@codesnake.com>
Date: Tue, 30 Jun 2015 11:19:57 +0200 Date: Tue, 30 Jun 2015 11:19:57 +0200
Subject: [PATCH] [aml] Ugly workaround to show DTS/AC3 caps Subject: [PATCH 07/10] [aml] Ugly workaround to show DTS/AC3 caps
... but don't run into multi channel issues as we can only open 2 pcm channels ... but don't run into multi channel issues as we can only open 2 pcm channels
--- ---
@ -9,10 +9,10 @@ Subject: [PATCH] [aml] Ugly workaround to show DTS/AC3 caps
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 32ab888..d4eb0be 100644 index 08777aa..c3f5fce 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -1336,6 +1336,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) @@ -1340,6 +1340,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name) AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name)
{ {
@ -25,3 +25,6 @@ index 32ab888..d4eb0be 100644
if (name.substr(0, 4) == "hdmi") if (name.substr(0, 4) == "hdmi")
return AE_DEVTYPE_HDMI; return AE_DEVTYPE_HDMI;
else if (name.substr(0, 6) == "iec958" || name.substr(0, 5) == "spdif") else if (name.substr(0, 6) == "iec958" || name.substr(0, 5) == "spdif")
--
1.7.10.4

View File

@ -0,0 +1,24 @@
From 56dac3c356e8419205eae251e76982be9a0da688 Mon Sep 17 00:00:00 2001
From: Alex Deryskyba <alex@codesnake.com>
Date: Tue, 14 Jul 2015 15:55:20 +0300
Subject: [PATCH 08/10] Add mapping for Browser Home key on Linux
---
xbmc/input/linux/LinuxInputDevices.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index 3875138..3643a96 100644
--- a/xbmc/input/linux/LinuxInputDevices.cpp
+++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -247,6 +247,7 @@ KeyMap keyMap[] = {
{ KEY_RECORD , XBMCK_RECORD },
{ KEY_REWIND , XBMCK_REWIND },
{ KEY_PHONE , XBMCK_PHONE },
+ { KEY_HOMEPAGE , XBMCK_BROWSER_HOME},
{ KEY_REFRESH , XBMCK_SHUFFLE },
{ KEY_SCROLLUP , XBMCK_PAGEUP },
{ KEY_SCROLLDOWN , XBMCK_PAGEDOWN },
--
1.7.10.4

View File

@ -1,7 +1,7 @@
From 55b3da7e97f6dc1e99724782253c35fe4c8b7c5a Mon Sep 17 00:00:00 2001 From 72497ca4d29af8ac224b826a3993bfdb76a7f9f6 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca> From: Alex Deryskyba <alex@codesnake.com>
Date: Sat, 7 Nov 2015 16:25:44 +0200 Date: Tue, 14 Jul 2015 16:02:35 +0300
Subject: [PATCH] [wetek] perform suspend instead of powerdown Subject: [PATCH 09/10] [powermanagement] Perform suspend instead of powerdown
--- ---
system/keymaps/keyboard.xml | 2 +- system/keymaps/keyboard.xml | 2 +-
@ -9,7 +9,7 @@ Subject: [PATCH] [wetek] perform suspend instead of powerdown
2 files changed, 3 insertions(+), 3 deletions(-) 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index 9833cff..0ce105e 100644 index 90517af..62cc847 100644
--- a/system/keymaps/keyboard.xml --- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
@ -43,3 +43,6 @@ index 4e5bcc6..ad5847d 100644
} }
bool CLogindUPowerSyscall::Reboot() bool CLogindUPowerSyscall::Reboot()
--
1.7.10.4

View File

@ -1,18 +1,19 @@
From 0cdf5c043e783e8d956c5d59be8a9ec13a53fee3 Mon Sep 17 00:00:00 2001 From 138e586520c2085e0b0989041a6d75af2692bd93 Mon Sep 17 00:00:00 2001
From: "Chris \\\"Koying\\\" Browet" <cbro@semperpax.com> From: "Chris \\\\\\\"Koying\\\\\\\" Browet" <cbro@semperpax.com>
Date: Fri, 19 Dec 2014 12:30:04 +0100 Date: Fri, 19 Dec 2014 12:30:04 +0100
Subject: [PATCH] [aml] FIX: [renderer] hide meaningless skips from users Subject: [PATCH 10/10] [aml] FIX: [renderer] hide meaningless skips from
users
--- ---
xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp | 3 ++- xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
index 70741be..15a484a 100644 index 558a1f3..7e25e16 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp --- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
@@ -1421,7 +1421,8 @@ void CRenderManager::PrepareNextRender() @@ -1351,7 +1351,8 @@ void CRenderManager::PrepareNextRender()
while(m_queued.front() != idx) while (m_queued.front() != idx)
{ {
requeue(m_discard, m_queued); requeue(m_discard, m_queued);
- m_QueueSkip++; - m_QueueSkip++;
@ -20,4 +21,7 @@ index 70741be..15a484a 100644
+ m_QueueSkip++; + m_QueueSkip++;
} }
m_presentstep = PRESENT_FLIP; int lateframes = (renderPts - m_Queue[idx].pts) / frametime;
--
1.7.10.4

View File

@ -1,17 +0,0 @@
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index e22db7a..dcdaf2e 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -1342,6 +1342,12 @@ void CAESinkALSA::EnumerateDevice(AEDeviceInfoList &list, const std::string &dev
if (snd_card_get_name(cardNr, &cardName) == 0)
info.m_displayName = cardName;
+ // ugly workaround to show DTS / AC3 caps
+ // but don't run into multi channel issues
+ // as we can only open 2 pcm channels
+ if (info.m_displayName == "AML-DUMMY-CODEC")
+ info.m_deviceType = AE_DEVTYPE_IEC958;
+
if (info.m_deviceType == AE_DEVTYPE_HDMI && info.m_displayName.size() > 5 &&
info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI")
{

View File

@ -1,19 +0,0 @@
diff -Naur kodi-14-4606179/xbmc/input/linux/LinuxInputDevices.cpp kodi-14-4606179.patch/xbmc/input/linux/LinuxInputDevices.cpp
--- kodi-14-4606179/xbmc/input/linux/LinuxInputDevices.cpp 2015-03-06 19:47:27.000000000 +0100
+++ kodi-14-4606179.patch/xbmc/input/linux/LinuxInputDevices.cpp 2015-03-07 14:42:33.260971676 +0100
@@ -225,6 +225,7 @@
{ KEY_VOLUMEDOWN , XBMCK_VOLUME_DOWN },
{ KEY_VOLUMEUP , XBMCK_VOLUME_UP },
{ KEY_POWER , XBMCK_POWER },
+ { KEY_COFFEE , XBMCK_VOLUME_MUTE },
{ KEY_KPEQUAL , XBMCK_KP_EQUALS },
{ KEY_PAUSE , XBMCK_PAUSE },
{ KEY_LEFTMETA , XBMCK_LMETA },
@@ -242,6 +243,7 @@
{ KEY_RECORD , XBMCK_RECORD },
{ KEY_REWIND , XBMCK_REWIND },
{ KEY_PHONE , XBMCK_PHONE },
+ { KEY_HOMEPAGE , XBMCK_BROWSER_HOME},
{ KEY_REFRESH , XBMCK_SHUFFLE },
{ KEY_SCROLLUP , XBMCK_PAGEUP },
{ KEY_SCROLLDOWN , XBMCK_PAGEDOWN },

View File

@ -1,21 +0,0 @@
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index 89254b8..2eefa75 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -67,7 +67,7 @@
<m>Menu</m>
<m mod="ctrl">ActivateWindow(PlayerControls)</m>
<s>ActivateWindow(shutdownmenu)</s>
- <escape>PreviousMenu</escape>
+ <escape>Back</escape>
<i>Info</i>
<menu>ContextMenu</menu>
<menu mod="longpress">Menu</menu>
@@ -201,6 +201,7 @@
<browser_back>Backspace</browser_back>
<backspace mod="longpress">PreviousMenu</backspace>
<browser_back mod="longpress">PreviousMenu</browser_back>
+ <escape>PreviousMenu</escape>
</keyboard>
</VirtualKeyboard>
<MyTVChannels>