CEC support

.gitignore

@@ -28,4 +28,6 @@ RelWithDebInfo
 CMakeCache.txt
 CMakeFiles
 cmake_install.cmake
+CPackConfig.cmake
+CPackSourceConfig.cmake
 Makefile

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")
@@ -99,6 +100,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
 )
@@ -146,10 +148,12 @@ set(COMMON_LIBRARIES
     ${Boost_LIBRARIES}
     ${FREETYPE_LIBRARIES}
     ${FreeImage_LIBRARIES}
-	${SDL2_LIBRARY}
+    ${SDL2_LIBRARY}
     ${CURL_LIBRARIES}
+    ${LIBCEC_LIBRARY}
     pugixml
     nanosvg
+    sqlite3
 )
 
 #add ALSA for Linux

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

@@ -36,23 +36,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:**
@@ -69,7 +78,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/CMakeLists.txt

@@ -2,14 +2,14 @@ project("emulationstation")
 
 set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ESException.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ScraperCmdLine.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemManager.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/GamelistDB.h
 
     # GuiComponents
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/AsyncReqComponent.h
@@ -18,7 +18,6 @@ set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextListComponent.h
 
     # Guis
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiFastSelect.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.h
@@ -28,8 +27,10 @@ set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperStart.h
 
     # Scrapers
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/ROMHasher.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBScraper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBShaScraper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/TheArchiveScraper.h
 
     # Views
@@ -48,23 +49,21 @@ set(ES_HEADERS
 
 set(ES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MameNameMap.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ScraperCmdLine.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemManager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/GamelistDB.cpp
 
     # GuiComponents
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/AsyncReqComponent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/RatingComponent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ScraperSearchComponent.cpp
 
     # Guis
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiFastSelect.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.cpp
@@ -74,8 +73,10 @@ set(ES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperStart.cpp
 
     # Scrapers
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/ROMHasher.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBScraper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBShaScraper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/TheArchiveScraper.cpp
 
     # Views

es-app/src/ESException.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <exception>
+#include <sstream>
+
+class ESException : public std::exception
+{
+public:
+	const char* what() const throw() override
+	{
+		return mMsg.c_str();
+	}
+
+	template<typename T>
+	friend ESException& operator<<(ESException& e, const T& msg);
+
+	// for some reason gcc claims that "ESException()" has the type
+	// "ESException", but not the type "ESException&", so...this.
+	template<typename T>
+	friend ESException operator<<(ESException e, const T& msg);
+private:
+	std::string mMsg;
+};
+
+template<typename T>
+ESException& operator<<(ESException& e, const T& appendMsg)
+{
+	std::stringstream ss;
+	ss << e.mMsg << appendMsg;
+	e.mMsg = ss.str();
+	return e;
+}
+
+template<typename T>
+ESException operator<<(ESException e, const T& appendMsg)
+{
+	std::stringstream ss;
+	ss << e.mMsg << appendMsg;
+	e.mMsg = ss.str();
+	return e;
+}