jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 22:47:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: update to xbmc-13.alpha-7f6c5e4

Browse Source
This commit is contained in:
Stefan Saraev 2013-12-10 21:43:17 +02:00
parent eb301356da
commit 5db44c51d8
4 changed files with 287 additions and 986 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-theme-Confluence/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="13.alpha-15bb590" PKG_VERSION="13.alpha-7f6c5e4"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc/package.mk
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="13.alpha-15bb590" PKG_VERSION="13.alpha-7f6c5e4"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

1225
packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-9e4195a.patch → packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-7f6c5e4.patch
View File

File diff suppressed because it is too large Load Diff

44
packages/mediacenter/xbmc/patches/xbmc-999.03-PR3794.patch
View File

@ -1,25 +1,31 @@
From 8553aa315efff535e51c4f91024a7e2f8a6ecb4a Mon Sep 17 00:00:00 2001 From 29e44bb9f93767fd1235c33afa4877544f0f95b3 Mon Sep 17 00:00:00 2001
From: xhaggi <sascha.woo@gmail.com> From: xhaggi <sascha.woo@gmail.com>
Date: Mon, 9 Dec 2013 15:25:11 +0100 Date: Mon, 9 Dec 2013 15:25:11 +0100
Subject: [PATCH] [pvr] observe PVRManager state to trigger epg create Subject: [PATCH] [pvr] observe PVRManager state to trigger epg create
--- ---
xbmc/pvr/PVRManager.cpp | 3 +++ xbmc/pvr/PVRManager.cpp | 9 +++++++--
xbmc/pvr/PVRManager.h | 3 ++- xbmc/pvr/PVRManager.h | 3 ++-
xbmc/pvr/channels/PVRChannelGroupInternal.cpp | 16 +++++++++++++++- xbmc/pvr/channels/PVRChannelGroupInternal.cpp | 12 +++++++++++-
xbmc/pvr/channels/PVRChannelGroupInternal.h | 5 ++++- xbmc/pvr/channels/PVRChannelGroupInternal.h | 5 ++++-
xbmc/utils/Observer.h | 1 + xbmc/utils/Observer.h | 1 +
5 files changed, 25 insertions(+), 3 deletions(-) 5 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
index 81d81c2..6080507 100644 index 81d81c2..d35df1c 100644
--- a/xbmc/pvr/PVRManager.cpp --- a/xbmc/pvr/PVRManager.cpp
+++ b/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp
@@ -395,6 +395,9 @@ void CPVRManager::SetState(ManagerState state) @@ -393,8 +393,13 @@ ManagerState CPVRManager::GetState(void) const
void CPVRManager::SetState(ManagerState state)
{ {
CSingleLock lock(m_managerStateMutex); - CSingleLock lock(m_managerStateMutex);
m_managerState = state; - m_managerState = state;
+ SetChanged(); + {
+ CSingleLock lock(m_managerStateMutex);
+ m_managerState = state;
+ SetChanged();
+ }
+ +
+ NotifyObservers(ObservableMessageManagerStateChanged); + NotifyObservers(ObservableMessageManagerStateChanged);
} }
@ -47,31 +53,28 @@ index 7038410..5359c05 100644
friend class CPVRClients; friend class CPVRClients;
diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
index 0bb07d2..1d292c9 100644 index 0bb07d2..ff06d48 100644
--- a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp --- a/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
+++ b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp +++ b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp
@@ -53,6 +53,8 @@ @@ -53,6 +53,7 @@
CPVRChannelGroupInternal::~CPVRChannelGroupInternal(void) CPVRChannelGroupInternal::~CPVRChannelGroupInternal(void)
{ {
Unload(); Unload();
+ if (Observer::IsObserving(g_PVRManager)) + g_PVRManager.UnregisterObserver(this);
+ g_PVRManager.UnregisterObserver(this);
} }
bool CPVRChannelGroupInternal::Load(void) bool CPVRChannelGroupInternal::Load(void)
@@ -60,7 +62,10 @@ bool CPVRChannelGroupInternal::Load(void) @@ -60,7 +61,8 @@ bool CPVRChannelGroupInternal::Load(void)
if (CPVRChannelGroup::Load()) if (CPVRChannelGroup::Load())
{ {
UpdateChannelPaths(); UpdateChannelPaths();
- g_PVRManager.TriggerEpgsCreate(); - g_PVRManager.TriggerEpgsCreate();
+ + g_PVRManager.RegisterObserver(this);
+ if (!Observer::IsObserving(g_PVRManager)) +
+ g_PVRManager.RegisterObserver(this);
+
return true; return true;
} }
@@ -385,3 +390,12 @@ bool CPVRChannelGroupInternal::CreateChannelEpgs(bool bForce /* = false */) @@ -385,3 +387,11 @@ bool CPVRChannelGroupInternal::CreateChannelEpgs(bool bForce /* = false */)
return true; return true;
} }
@ -80,8 +83,7 @@ index 0bb07d2..1d292c9 100644
+{ +{
+ if (msg == ObservableMessageManagerStateChanged) + if (msg == ObservableMessageManagerStateChanged)
+ { + {
+ if(g_PVRManager.IsStarted()) + g_PVRManager.TriggerEpgsCreate();
+ g_PVRManager.TriggerEpgsCreate();
+ } + }
+} +}
diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.h b/xbmc/pvr/channels/PVRChannelGroupInternal.h diff --git a/xbmc/pvr/channels/PVRChannelGroupInternal.h b/xbmc/pvr/channels/PVRChannelGroupInternal.h