Merge pull request #3095 from HiassofT/le9-hyperion

hyperion: update to 1d125d8
This commit is contained in:
CvH 2018-11-13 12:14:46 +01:00 committed by GitHub
commit fcca549a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 30 deletions

View File

@ -1,3 +1,8 @@
108
- Update to version 1d125d8
* Kodi 18 fix merged
* Fix for segfaults
107 107
- Update to version dc6a602 - Update to version dc6a602
- Use correct OnAVStart event on Kodi 18 - Use correct OnAVStart event on Kodi 18

View File

@ -3,9 +3,9 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="hyperion" PKG_NAME="hyperion"
PKG_VERSION="dc6a602" PKG_VERSION="1d125d8df863ad176002f591d72dbba79ce9be63"
PKG_SHA256="d585b4e71aafd49f32ced6e27cc88db3c19278a7f258972c22a4e88cad981b0d" PKG_SHA256="1f3bcd1422dffb7c4398b1c22c63f78151c52c9a44505d1a4ba31278290fd47c"
PKG_REV="107" PKG_REV="108"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="https://github.com/hyperion-project/hyperion" PKG_SITE="https://github.com/hyperion-project/hyperion"

View File

@ -1,27 +0,0 @@
From 1c134f52389f93b94fa6db291b79ba3933a031f7 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Fri, 8 Jun 2018 17:19:35 +0200
Subject: [PATCH] XBMCVideoChecker: use OnAVStart event for Kodi 18
Signed-off-by: Matthias Reichl <hias@horus.com>
---
libsrc/xbmcvideochecker/XBMCVideoChecker.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libsrc/xbmcvideochecker/XBMCVideoChecker.cpp b/libsrc/xbmcvideochecker/XBMCVideoChecker.cpp
index f638888..054e462 100644
--- a/libsrc/xbmcvideochecker/XBMCVideoChecker.cpp
+++ b/libsrc/xbmcvideochecker/XBMCVideoChecker.cpp
@@ -62,7 +62,8 @@ void XBMCVideoChecker::receiveReply()
// silence - no "debug" code should be at the log
// std::cout << "KODICHECK INFO: Kodi Message: " << reply.toStdString() << std::endl;
- if (reply.contains("\"method\":\"Player.OnPlay\""))
+ if ( (_xbmcVersion < 18 && reply.contains("\"method\":\"Player.OnPlay\"")) ||
+ (_xbmcVersion >= 18 && reply.contains("\"method\":\"Player.OnAVStart\"")) )
{
// send a request for the current player state
_socket.write(_activePlayerRequest.toUtf8());
--
2.11.0