mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
This commit is contained in:
commit
bc003a1070
@ -17,6 +17,9 @@
|
||||
<description>
|
||||
@PKG_LONGDESC@
|
||||
</description>
|
||||
<disclaimer>
|
||||
@PKG_DISCLAIMER@
|
||||
</disclaimer>
|
||||
<platform>all</platform>
|
||||
</extension>
|
||||
</addon>
|
||||
|
25
packages/mediacenter/xbmc/patches/xbmc-990.13-PR2488.patch
Normal file
25
packages/mediacenter/xbmc/patches/xbmc-990.13-PR2488.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From befdcfad8d2b14c9d935c3662a56853d617f884d Mon Sep 17 00:00:00 2001
|
||||
From: Voyager1 <voyager@xbmc.org>
|
||||
Date: Sat, 23 Mar 2013 07:19:46 +0100
|
||||
Subject: [PATCH] [dvdplayer] fix deadlock when trying to go to disc menu
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
|
||||
index 3d2ca03..22c89dc 100644
|
||||
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
|
||||
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
|
||||
@@ -3511,7 +3511,7 @@ bool CDVDPlayer::OnAction(const CAction &action)
|
||||
pMenus->OnMenu();
|
||||
// send a message to everyone that we've gone to the menu
|
||||
CGUIMessage msg(GUI_MSG_VIDEO_MENU_STARTED, 0, 0);
|
||||
- g_windowManager.SendMessage(msg);
|
||||
+ g_windowManager.SendThreadMessage(msg);
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
--
|
||||
1.8.1.5
|
||||
|
@ -60,4 +60,80 @@ begin remote
|
||||
|
||||
end remote
|
||||
|
||||
# Please make this file available to others
|
||||
# by sending it to <lirc@bartelmus.de>
|
||||
#
|
||||
# this config file was automatically generated
|
||||
# using lirc-0.9.0-pre1(default) on Sat Feb 23 12:47:57 2013
|
||||
#
|
||||
# contributed by DynaMight
|
||||
#
|
||||
# brand: Xbox 360 remote (White) /home/pi/lircd.conf
|
||||
# model no. of remote control:
|
||||
# devices being controlled by this remote:
|
||||
#
|
||||
|
||||
begin remote
|
||||
|
||||
name Xbox 360 Remote
|
||||
bits 13
|
||||
flags RC6|CONST_LENGTH
|
||||
eps 30
|
||||
aeps 100
|
||||
|
||||
header 2685 886
|
||||
one 457 433
|
||||
zero 457 433
|
||||
pre_data_bits 24
|
||||
pre_data 0x1BFF80
|
||||
gap 107197
|
||||
toggle_bit_mask 0x8000
|
||||
rc6_mask 0x100000000
|
||||
|
||||
begin codes
|
||||
KEY_STOP 0x0BE6
|
||||
KEY_PLAY 0x0BE9
|
||||
KEY_VOLUMEDOWN 0x0BEE
|
||||
KEY_VOLUMEUP 0x0BEF
|
||||
KEY_MUTE 0x0BF1
|
||||
KEY_0 0x0BFF
|
||||
KEY_1 0x0BFE
|
||||
KEY_2 0x0BFD
|
||||
KEY_3 0x0BFC
|
||||
KEY_4 0x0BFB
|
||||
KEY_5 0x0BFA
|
||||
KEY_6 0x0BF9
|
||||
KEY_7 0x0BF8
|
||||
KEY_8 0x0BF7
|
||||
KEY_9 0x0BF6
|
||||
KEY_MENU 0x0BDB
|
||||
KEY_YELLOW 0x0BD9
|
||||
KEY_BLUE 0x0B97
|
||||
KEY_GREEN 0x0B99
|
||||
KEY_RED 0x0BDA
|
||||
KEY_REWIND 0x0BEA
|
||||
KEY_PLAYPAUSE 0x0BE9
|
||||
KEY_FASTFORWARD 0x0BEB
|
||||
KEY_BACK 0x0BDC
|
||||
KEY_TITLE 0x0BAE
|
||||
KEY_STOP 0x0BE6
|
||||
KEY_INFO 0x0BF0
|
||||
KEY_UP 0x0BE1
|
||||
KEY_DOWN 0x0BE0
|
||||
KEY_LEFT 0x0BDF
|
||||
KEY_RIGHT 0x0BDE
|
||||
KEY_OK 0x0BDD
|
||||
KEY_POWER 0x0BF3
|
||||
KEY_PAGEUP 0x0B93
|
||||
KEY_PAGEDOWN 0x0B92
|
||||
KEY_ENTER 0x0BF4
|
||||
KEY_RECORD 0x0BE8
|
||||
KEY_CLEAR 0x0BF5
|
||||
KEY_NEXTSONG 0x0BE5
|
||||
KEY_PREVIOUSSONG 0x0BE4
|
||||
KEY_DISPLAYTOGGLE 0x0BB0
|
||||
KEY_PAUSE 0x037FF00BE7
|
||||
end codes
|
||||
|
||||
end remote
|
||||
|
||||
|
@ -63,6 +63,7 @@ if [ -f $PKG_DIR/addon ]; then
|
||||
-e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
|
||||
-e "s|@OS_VERSION@|$OS_VERSION|g" \
|
||||
-e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
|
||||
-e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
|
||||
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
|
||||
fi
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user