From c80ad2a1c0f394040bd9e45638ea138deb4723d4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 21 Aug 2014 13:44:00 +0200
Subject: [PATCH] xbmc: update to xbmc-14-f735be9

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../xbmc-theme-Confluence/package.mk          |  2 +-
 packages/mediacenter/xbmc/package.mk          |  2 +-
 .../patches/xbmc-995.01-fernetmenta.patch     | 85 -------------------
 3 files changed, 2 insertions(+), 87 deletions(-)

diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk
index 1c636c5d4f..2c227f61b3 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/package.mk
+++ b/packages/mediacenter/xbmc-theme-Confluence/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="14-fa5bf23"
+PKG_VERSION="14-f735be9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index eaa5c90221..18c23fe610 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="14-fa5bf23"
+PKG_VERSION="14-f735be9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta.patch
index 39890fc15d..f11e816f06 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta.patch
@@ -7323,91 +7323,6 @@ index 9cffd25..7021031 100644
 2.0.3
 
 
-From 9a82708f3e74c1604084809be484a806f7b3a5dd Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Tue, 22 Jul 2014 15:36:31 +0200
-Subject: [PATCH 25/29] dvdplayer: get number of channels for active audio
- stream from audio player, ffmpeg demuxer does not update this info for codecs
- like AAC
-
----
- xbmc/cores/dvdplayer/DVDPlayer.cpp      | 7 ++++++-
- xbmc/cores/dvdplayer/DVDPlayerAudio.cpp | 7 +++++++
- xbmc/cores/dvdplayer/DVDPlayerAudio.h   | 1 +
- 3 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-index 09ba292..920c686 100644
---- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
-+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-@@ -3778,12 +3778,18 @@ void CDVDPlayer::GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info)
-     return;
- 
-   if (index == GetAudioStream())
-+  {
-     info.bitrate = m_dvdPlayerAudio.GetAudioBitrate();
-+    info.channels = m_dvdPlayerAudio.GetAudioChannels();
-+  }
-   else if (m_pDemuxer)
-   {
-     CDemuxStreamAudio* stream = m_pDemuxer->GetStreamFromAudioId(index);
-     if (stream)
-+    {
-       info.bitrate = stream->iBitRate;
-+      info.channels = stream->iChannels;
-+    }
-   }
- 
-   SelectionStream& s = m_SelectionStreams.Get(STREAM_AUDIO, index);
-@@ -3801,7 +3807,6 @@ void CDVDPlayer::GetAudioStreamInfo(int index, SPlayerAudioStreamInfo &info)
-     CDemuxStreamAudio* stream = static_cast<CDemuxStreamAudio*>(m_pDemuxer->GetStreamFromAudioId(index));
-     if (stream)
-     {
--      info.channels = stream->iChannels;
-       std::string codecName;
-       m_pDemuxer->GetStreamCodecName(stream->iId, codecName);
-       info.audioCodecName = codecName;
-diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
-index e4c6089..120cdde 100644
---- a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
-+++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
-@@ -552,6 +552,8 @@ void CDVDPlayerAudio::Process()
- 
-       if(!m_dvdAudio.Create(audioframe, m_streaminfo.codec, m_setsynctype == SYNC_RESAMPLE))
-         CLog::Log(LOGERROR, "%s - failed to create audio renderer", __FUNCTION__);
-+
-+      m_streaminfo.channels = audioframe.channel_count;
-     }
- 
-     // Zero out the frame data if we are supposed to silence the audio
-@@ -798,6 +800,11 @@ int CDVDPlayerAudio::GetAudioBitrate()
-   return (int)m_audioStats.GetBitrate();
- }
- 
-+int CDVDPlayerAudio::GetAudioChannels()
-+{
-+  return m_streaminfo.channels;
-+}
-+
- bool CDVDPlayerAudio::IsPassthrough() const
- {
-   CSingleLock lock(m_info_section);
-diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/dvdplayer/DVDPlayerAudio.h
-index 3f13c5a..3761912 100644
---- a/xbmc/cores/dvdplayer/DVDPlayerAudio.h
-+++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.h
-@@ -133,6 +133,7 @@ class CDVDPlayerAudio : public CThread, public IDVDStreamPlayer
- 
-   std::string GetPlayerInfo();
-   int GetAudioBitrate();
-+  int GetAudioChannels();
- 
-   // holds stream information for current playing stream
-   CDVDStreamInfo m_streaminfo;
--- 
-2.0.3
-
-
 From 27e84a033343e99678aee1a73a2ab6229eb01a78 Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Wed, 23 Jul 2014 15:07:37 +0200