CEC support for Emulationstation

CMake/Packages/FindLibCEC.cmake

@@ -0,0 +1,37 @@
+# - Try to find libCEC
+# Once done, this will define
+#
+#  LIBCEC_FOUND - system has libCEC
+#  LIBCEC_INCLUDE_DIRS - the libCEC include directories 
+#  LIBCEC_LIBRARIES - link these to use libCEC
+
+include(FindPkgMacros)
+findpkg_begin(LIBCEC)
+
+# Get path, convert backslashes as ${ENV_${var}}
+getenv_path(LIBCEC_HOME)
+
+# construct search paths
+set(LIBCEC_PREFIX_PATH ${LIBCEC_HOME} ${ENV_LIBCEC_HOME})
+create_search_paths(LIBCEC)
+
+# redo search if prefix path changed
+clear_if_changed(
+  LIBCEC_PREFIX_PATH
+  LIBCEC_LIBRARY_REL
+  LIBCEC_INCLUDE_DIR
+)
+
+set(LIBCEC_LIBRARY_NAMES libcec.a libcec.dylib)
+
+use_pkgconfig(LIBCEC_PKGC libcec)
+
+findpkg_framework(libCEC)
+
+find_path(LIBCEC_INCLUDE_DIR NAMES cec.h HINTS ${LIBCEC_INC_SEARCH_PATH} ${LIBCEC_PKGC_INCLUDE_DIRS})
+
+find_library(LIBCEC_LIBRARY_REL NAMES ${LIBCEC_LIBRARY_NAMES} HINTS ${LIBCEC_LIB_SEARCH_PATH} ${LIBCEC_PKGC_LIBDIR})
+
+make_library_set(LIBCEC_LIBRARY)
+
+findpkg_finish(LIBCEC)

CMakeLists.txt

@@ -48,6 +48,7 @@ find_package(SDL2 REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system filesystem date_time locale)
 find_package(Eigen3 REQUIRED)
 find_package(CURL REQUIRED)
+find_package(LibCEC REQUIRED)
 
 #add ALSA for Linux
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -96,6 +97,7 @@ set(COMMON_INCLUDE_DIRS
     ${Boost_INCLUDE_DIRS}
     ${EIGEN3_INCLUDE_DIR}
     ${CURL_INCLUDE_DIR}
+    ${LIBCEC_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/external
     ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src
 )
@@ -143,8 +145,10 @@ set(COMMON_LIBRARIES
     ${Boost_LIBRARIES}
     ${FREETYPE_LIBRARIES}
     ${FreeImage_LIBRARIES}
-	${SDL2_LIBRARY}
+    ${SDL2_LIBRARY}
     ${CURL_LIBRARIES}
+    ${CMAKE_DL_LIBS}
+    ${LIBCEC_LIBRARY}
     pugixml
     nanosvg
 )

CREDITS.md

@@ -4,6 +4,8 @@ Programming
 UI Art & Design
 	Nils Bonenberger
 
+libCEC Support
+	Ismail "CeRiAl" Khatib
 
 Libraries
 =========
@@ -29,8 +31,11 @@ Boost
 nanosvg
 	https://github.com/memononen/nanosvg
 
+libCEC
+	http://www.pulse-eight.net/
+
 Resources
 =========
 
 Open Sans font
-	http://www.google.com/fonts/specimen/Open+Sans
+	http://www.google.com/fonts/specimen/Open+Sans

README.md

@@ -52,23 +52,32 @@ Building
 
 EmulationStation uses some C++11 code, which means you'll need to use at least g++-4.7 on Linux, or VS2010 on Windows, to compile.
 
-EmulationStation has a few dependencies. For building, you'll need CMake, SDL2, Boost (System, Filesystem, DateTime, Locale), FreeImage, FreeType, Eigen3, and cURL.  You also should probably install the `fonts-droid` package which contains fallback fonts for Chinese/Japanese/Korean characters, but ES will still work fine without it (this package is only used at run-time).
+EmulationStation has a few dependencies. For building, you'll need CMake, SDL2, Boost (System, Filesystem, DateTime, Locale), FreeImage, FreeType, Eigen3, libCEC, and cURL.  You also should probably install the `fonts-droid` package which contains fallback fonts for Chinese/Japanese/Korean characters, but ES will still work fine without it (this package is only used at run-time).
 
 **On Debian/Ubuntu:**
 All of this be easily installed with apt-get:
 ```bash
-sudo apt-get install libsdl2-dev libboost-system-dev libboost-filesystem-dev libboost-date-time-dev libboost-locale-dev libfreeimage-dev libfreetype6-dev libeigen3-dev libcurl4-openssl-dev libasound2-dev libgl1-mesa-dev build-essential cmake fonts-droid
+sudo apt-get install libsdl2-dev libboost-system-dev libboost-filesystem-dev libboost-date-time-dev libboost-locale-dev libfreeimage-dev libfreetype6-dev libeigen3-dev libcec-dev libcurl4-openssl-dev libasound2-dev libgl1-mesa-dev build-essential cmake fonts-droid
 ```
 
 Then, generate and build the Makefile with CMake:
 ```bash
 cd YourEmulationStationDirectory
-cmake .
+mkdir build && cd build
+cmake ..
 make
 ```
 
 **On the Raspberry Pi:**
 
+Short build instructions for Raspberry Pi 2:
+```bash
+cd YourEmulationStationDirectory
+mkdir build && cd build
+cmake -DCMAKE_CXX_COMPILER=g++-4.7 -DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 ..
+make
+```
+
 Complete Raspberry Pi build instructions at [emulationstation.org](http://emulationstation.org/gettingstarted.html#install_rpi_standalone).
 
 **On Windows:**
@@ -85,7 +94,9 @@ Complete Raspberry Pi build instructions at [emulationstation.org](http://emulat
 
 [cURL](http://curl.haxx.se/download.html) (you'll need to compile or get the pre-compiled DLL version)
 
-(Remember to copy necessary .DLLs into the same folder as the executable: probably FreeImage.dll, freetype6.dll, SDL2.dll, libcurl.dll, and zlib1.dll. Exact list depends on if you built your libraries in "static" mode or not.)
+[libCEC](http://packages.pulse-eight.net/)
+
+(Remember to copy necessary .DLLs into the same folder as the executable: probably FreeImage.dll, freetype6.dll, SDL2.dll, libcurl.dll, libcec.dll, and zlib1.dll. Exact list depends on if you built your libraries in "static" mode or not.)
 
 [CMake](http://www.cmake.org/cmake/resources/software.html) (this is used for generating the Visual Studio project)
 

es-app/src/main.cpp

@@ -315,29 +315,35 @@ int main(int argc, char* argv[])
 
 	int lastTime = SDL_GetTicks();
 	bool running = true;
+	Uint32 CecEventType = InputManager::getInstance()->getCecEventType();
 
 	while(running)
 	{
 		SDL_Event event;
 		while(SDL_PollEvent(&event))
 		{
-			switch(event.type)
+			if(CecEventType != ((Uint32)-1) && event.type == CecEventType)
 			{
-				case SDL_JOYHATMOTION:
-				case SDL_JOYBUTTONDOWN:
-				case SDL_JOYBUTTONUP:
-				case SDL_KEYDOWN:
-				case SDL_KEYUP:
-				case SDL_JOYAXISMOTION:
-				case SDL_TEXTINPUT:
-				case SDL_TEXTEDITING:
-				case SDL_JOYDEVICEADDED:
-				case SDL_JOYDEVICEREMOVED:
-					InputManager::getInstance()->parseEvent(event, &window);
-					break;
-				case SDL_QUIT:
-					running = false;
-					break;
+				InputManager::getInstance()->parseEvent(event, &window);
+			}else{
+				switch(event.type)
+				{
+					case SDL_JOYHATMOTION:
+					case SDL_JOYBUTTONDOWN:
+					case SDL_JOYBUTTONUP:
+					case SDL_KEYDOWN:
+					case SDL_KEYUP:
+					case SDL_JOYAXISMOTION:
+					case SDL_TEXTINPUT:
+					case SDL_TEXTEDITING:
+					case SDL_JOYDEVICEADDED:
+					case SDL_JOYDEVICEREMOVED:
+						InputManager::getInstance()->parseEvent(event, &window);
+						break;
+					case SDL_QUIT:
+						running = false;
+						break;
+				}
 			}
 		}
 

es-core/src/InputConfig.cpp

@@ -17,6 +17,8 @@ std::string inputTypeToString(InputType type)
 		return "axis";
 	case TYPE_BUTTON:
 		return "button";
+	case TYPE_CEC:
+		return "cec_key";
 	case TYPE_HAT:
 		return "hat";
 	case TYPE_KEY:
@@ -32,6 +34,8 @@ InputType stringToInputType(const std::string& type)
 		return TYPE_AXIS;
 	if(type == "button")
 		return TYPE_BUTTON;
+	if(type == "cec_key")
+		return TYPE_CEC;
 	if(type == "hat")
 		return TYPE_HAT;
 	if(type == "key")