Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="12.2-ad84e88"
+PKG_VERSION="12.2-49610fa"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="c218d5c"
 elif [ "$XBMC" = "xbmc-aml" ]; then

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.2-ad84e88"
+PKG_VERSION="12.2-49610fa"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="c218d5c"
 elif [ "$XBMC" = "xbmc-aml" ]; then

packages/mediacenter/xbmc/patches/12.2-ad84e88/todo/xbmc-990.26.01-PR2890.patch

@@ -1,29 +0,0 @@
-From 86a63c5040e307dcb633a5934ab1b3f9114009f5 Mon Sep 17 00:00:00 2001
-From: arnova <arnova@void.org>
-Date: Sun, 23 Jun 2013 23:16:55 +0200
-Subject: [PATCH] changed: Make more obvious we're passing a CFileItem
-
----
- xbmc/music/infoscanner/MusicInfoScanner.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
-index 84a155c..f93d613 100644
---- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
-+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
-@@ -1009,8 +1009,10 @@ void CMusicInfoScanner::FindArtForAlbums(VECALBUMS &albums, const CStdString &pa
-     }
-   }
-   if (albums.size() == 1 && !albumArt.empty())
--  { // assign to folder thumb as well
--    CMusicThumbLoader::SetCachedImage(path, "thumb", albumArt);
-+  {
-+    // assign to folder thumb as well
-+    CFileItem albumItem(path, true);
-+    CMusicThumbLoader::SetCachedImage(albumItem, "thumb", albumArt);
-   }
- }
- 
--- 
-1.8.1.6
-

packages/mediacenter/xbmc/patches/12.2-ad84e88/todo/xbmc-990.26.03-PR2890.patch

@@ -1,68 +0,0 @@
-From 94817e6fa85e2e0b39d1f0f96795435a4256fe7b Mon Sep 17 00:00:00 2001
-From: arnova <arnova@void.org>
-Date: Sun, 7 Jul 2013 12:27:08 +0200
-Subject: [PATCH] fixed: MusicInfoTag loader locked up after
- 9752e490e40e69d53e9dbb10a972dff533192570
-
----
- xbmc/BackgroundInfoLoader.cpp | 6 +++++-
- xbmc/BackgroundInfoLoader.h   | 1 +
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/BackgroundInfoLoader.cpp b/xbmc/BackgroundInfoLoader.cpp
-index 8e488d0..1cd6e62 100644
---- a/xbmc/BackgroundInfoLoader.cpp
-+++ b/xbmc/BackgroundInfoLoader.cpp
-@@ -32,6 +32,7 @@
-   m_pObserver=NULL;
-   m_pProgressCallback=NULL;
-   m_pVecItems = NULL;
-+  m_bIsLoading = false;
- }
- 
- CBackgroundInfoLoader::~CBackgroundInfoLoader()
-@@ -88,6 +89,7 @@ void CBackgroundInfoLoader::Run()
-       }
-     }
- 
-+    m_bIsLoading = false;
-     OnLoaderFinish();
-   }
-   catch (...)
-@@ -110,6 +112,7 @@ void CBackgroundInfoLoader::Load(CFileItemList& items)
- 
-   m_pVecItems = &items;
-   m_bStop = false;
-+  m_bIsLoading = true;
- 
-   m_thread = new CThread(this, "BackgroundLoader");
-   m_thread->Create();
-@@ -136,11 +139,12 @@ void CBackgroundInfoLoader::StopThread()
-   }
-   m_vecItems.clear();
-   m_pVecItems = NULL;
-+  m_bIsLoading = false;
- }
- 
- bool CBackgroundInfoLoader::IsLoading()
- {
--  return m_thread != NULL;
-+  return m_bIsLoading;
- }
- 
- void CBackgroundInfoLoader::SetObserver(IBackgroundLoaderObserver* pObserver)
-diff --git a/xbmc/BackgroundInfoLoader.h b/xbmc/BackgroundInfoLoader.h
-index 3a214a3..3cf28db 100644
---- a/xbmc/BackgroundInfoLoader.h
-+++ b/xbmc/BackgroundInfoLoader.h
-@@ -63,6 +63,7 @@ class CBackgroundInfoLoader : public IRunnable
-   std::vector<CFileItemPtr> m_vecItems; // FileItemList would delete the items and we only want to keep a reference.
-   CCriticalSection m_lock;
- 
-+  volatile bool m_bIsLoading;
-   volatile bool m_bStop;
-   CThread *m_thread;
- 
--- 
-1.8.1.6
-

packages/mediacenter/xbmc/patches/12.2-ad84e88/todo/xbmc-990.26.04-PR2890.patch

@@ -1,31 +0,0 @@
-From fe1856c912e47a86081d08e25d95b2efcc3e14ac Mon Sep 17 00:00:00 2001
-From: arnova <arnova@void.org>
-Date: Mon, 8 Jul 2013 08:29:37 +0200
-Subject: [PATCH] fixed: Little fixup for
- 94817e6fa85e2e0b39d1f0f96795435a4256fe7b (thanks JM)
-
----
- xbmc/BackgroundInfoLoader.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/BackgroundInfoLoader.cpp b/xbmc/BackgroundInfoLoader.cpp
-index 1cd6e62..43dfb49 100644
---- a/xbmc/BackgroundInfoLoader.cpp
-+++ b/xbmc/BackgroundInfoLoader.cpp
-@@ -89,11 +89,12 @@ void CBackgroundInfoLoader::Run()
-       }
-     }
- 
--    m_bIsLoading = false;
-     OnLoaderFinish();
-+    m_bIsLoading = false;
-   }
-   catch (...)
-   {
-+    m_bIsLoading = false;
-     CLog::Log(LOGERROR, "%s - Unhandled exception", __FUNCTION__);
-   }
- }
--- 
-1.8.1.6
-

packages/sysutils/remote/eventlircd/evmap/03_1241_e000.evmap

@@ -0,0 +1,58 @@
+# 1241:e000 HOLTEK USB receiver
+# mode 1, keyboard    red               # keyboard on
+# mode 2, mouse       blue              # mouse on
+
+ KEY_1              = KEY_NUMERIC_1     # 1
+ KEY_2              = KEY_NUMERIC_2     # 2
+ KEY_3              = KEY_NUMERIC_3     # 3
+ KEY_4              = KEY_NUMERIC_4     # 4
+ KEY_5              = KEY_NUMERIC_5     # 5
+ KEY_6              = KEY_NUMERIC_6     # 6
+ KEY_7              = KEY_NUMERIC_7     # 7
+ KEY_8              = KEY_NUMERIC_8     # 8
+ KEY_9              = KEY_NUMERIC_9     # 9
+ KEY_0              = KEY_NUMERIC_0     # 0
+ shift+KEY_8        = KEY_NUMERIC_STAR  # *
+ BTN_LEFT           = KEY_NUMERIC_POUND # #
+
+ KEY_POWER          = KEY_POWER         # Power
+ alt+KEY_F4         = KEY_POWER         # Power
+#? KEY_SLEEP          = KEY_POWER         # Sleep # remapped to Power
+#? KEY_WAKEUP         = KEY_POWER         # WakeUp # remapped to Power
+
+ ctrl+KEY_R         = KEY_RECORD        # Record
+ ctrl+KEY_P         = KEY_PAUSE         # Pause
+ ctrl+shift+KEY_S   = KEY_STOP          # Stop
+ ctrl+shift+KEY_B   = KEY_REWIND        # Rev
+ ctrl+shift+KEY_P   = KEY_PLAY          # Play
+ ctrl+shift+KEY_F   = KEY_FASTFORWARD   # Fwd
+ KEY_PREVIOUSSONG   = KEY_PREVIOUS      # Prev
+ KEY_NEXTSONG       = KEY_NEXT          # Next
+
+ KEY_BACKSPACE      = KEY_EXIT          # BACK/Clear
+ BTN_RIGHT          = KEY_INFO          # Info/EPG
+ alt+meta+KEY_ENTER = KEY_PROG1         # Media
+
+ KEY_LEFT           = KEY_LEFT          # Left Arrow
+ KEY_RIGHT          = KEY_RIGHT         # Right Arrow
+ KEY_UP             = KEY_UP            # Up Arrow
+ KEY_DOWN           = KEY_DOWN          # Down Arrow
+ KEY_ENTER          = KEY_OK            # Enter & Ok
+ KEY_VOLUMEUP       = KEY_VOLUMEUP      # Vol +
+ KEY_VOLUMEDOWN     = KEY_VOLUMEDOWN    # Vol -
+ KEY_PAGEUP         = KEY_CHANNELUP     # CH/PG up
+ KEY_PAGEDOWN       = KEY_CHANNELDOWN   # CH/PG down
+ KEY_F8             = KEY_MUTE          # Mute
+
+ ctrl+shift+KEY_T   = KEY_TEXT          # Teletext
+ ctrl+KEY_G         = KEY_EPG           # Program # remapped to EPG (Contextmenu)
+
+ KEY_VIDEO          = KEY_VIDEO         # Videos
+ KEY_DVD            = KEY_DVD           # DVD
+ KEY_MP3            = KEY_AUDIO         # Music
+ KEY_CAMERA         = KEY_CAMERA        # Pictures
+
+#  KEY_RED          = KEY_RED           # Red
+ ctrl+KEY_I         = KEY_GREEN         # Green
+ alt+KEY_TAB        = KEY_YELLOW        # Yellow
+#  KEY_BLUE         = KEY_BLUE          # Blue

packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules

@@ -131,6 +131,10 @@ ENV{ID_VENDOR_ID}=="0755", ENV{ID_MODEL_ID}=="2626", \
   ENV{eventlircd_enable}="true", \
   ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
 
+ENV{ID_VENDOR_ID}=="1241", ENV{ID_MODEL_ID}=="e000", \
+  ENV{eventlircd_enable}="true", \
+  ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
+
 ENV{ID_VENDOR_ID}=="13ec", ENV{ID_MODEL_ID}=="0006", \
   ENV{eventlircd_enable}="true", \
   ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"