Drop key event during playing vod.

Fix don’t check glxinfo.

diff --git a/tools/Linux/xbmc.sh.in b/tools/Linux/xbmc.sh.in
index db99670..a6322a5 100644 (file)
--- a/tools/Linux/xbmc.sh.in
+++ b/tools/Linux/xbmc.sh.in
@@ -114,11 +114,12 @@ print_crash_report()
   echo "Crash report available at $FILE"
 }
 
-python @datadir@/xbmc/FEH.py $SAVED_ARGS
-RET=$?
-if [ $RET -ne 0 ]; then
-  exit $RET
-fi
+# oskwon
+#python @datadir@/xbmc/FEH.py $SAVED_ARGS
+#RET=$?
+#if [ $RET -ne 0 ]; then
+#  exit $RET
+#fi
 
 if which gdb >/dev/null 2>&1; then
   # Output warning in case ulimit is unsupported by shell

diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index 0d31f61..e23d626 100644 (file)
--- a/xbmc/input/linux/LinuxInputDevices.cpp
+++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -6,7 +6,7 @@
  *      Written by Denis Oliver Kropp <dok@directfb.org>,
  *      Andreas Hundt <andi@fischlustig.de>,
  *      Sven Neumann <neo@directfb.org>,
- *      Ville Syrj��l�� <syrjala@sci.fi> and
+ *      Ville Syrj������l������ <syrjala@sci.fi> and
  *      Claudio Ciccani <klan@users.sf.net>.
  *
  *      Copyright (C) 2005-2013 Team XBMC
@@ -716,6 +716,12 @@ XBMC_Event CLinuxInputDevice::ReadEvent()
       break;
     }
 
+#ifdef TARGET_DVBBOX // oskwon
+    if (access("/tmp/playing.lock", F_OK) == 0) {
+       break;
+    }
+#endif /*TARGET_DVBBOX*/
+
     //printf("read event readlen = %d device name %s m_fileName %s\n", readlen, m_deviceName, m_fileName.c_str());
 
     // sanity check if we realy read the event