Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #279 from tomaz82/cleanupHeaderIncludes

Browse source 
Header inclusion cleanup
This commit is contained in:
Jools Wills 2017-11-02 19:36:59 +00:00 committed by GitHub
parent 7c35ad5005 a8fc560749
commit 5b792c4ef2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
169 changed files with 610 additions and 680 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
es-app/src/CollectionSystemManager.cpp
View file

@ -1,20 +1,20 @@
#include "SystemData.h" #include "CollectionSystemManager.h"
#include "Gamelist.h"
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/xpressive/xpressive.hpp>
#include "Util.h"
#include <algorithm>
#include <fstream>
#include <stdlib.h>
#include <SDL_joystick.h>
#include "Renderer.h"
#include "Log.h"
#include "InputManager.h"
#include <iostream>
#include "Settings.h"
#include "pugixml/src/pugixml.hpp"
#include "guis/GuiInfoPopup.h" #include "guis/GuiInfoPopup.h"
#include "views/gamelist/IGameListView.h"
#include "views/ViewController.h"
#include "FileData.h"
#include "FileFilterIndex.h"
#include "Log.h"
#include "Settings.h"
#include "SystemData.h"
#include "ThemeData.h"
#include "Util.h"
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/xpressive/xpressive.hpp>
#include <fstream>
#include <unordered_map>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
std::string myCollectionsName = "collections"; std::string myCollectionsName = "collections";

16
es-app/src/CollectionSystemManager.h
View file

@ -2,16 +2,14 @@
#ifndef ES_APP_COLLECTION_SYSTEM_MANAGER_H #ifndef ES_APP_COLLECTION_SYSTEM_MANAGER_H
#define ES_APP_COLLECTION_SYSTEM_MANAGER_H #define ES_APP_COLLECTION_SYSTEM_MANAGER_H
#include <vector> #include <map>
#include <string> #include <string>
#include "FileData.h" #include <vector>
#include "Window.h"
#include "MetaData.h" class FileData;
#include "PlatformId.h" class SystemData;
#include "ThemeData.h" class Window;
#include "FileFilterIndex.h" struct SystemEnvironmentData;
#include "SystemData.h"
#include "views/ViewController.h"
enum CollectionSystemType enum CollectionSystemType
{ {

17
es-app/src/FileData.cpp
View file

@ -1,11 +1,18 @@
#include "FileData.h" #include "FileData.h"
#include "FileSorts.h"
#include "views/ViewController.h"
#include "SystemData.h"
#include "Log.h"
#include "AudioManager.h" #include "AudioManager.h"
#include "VolumeControl.h" #include "CollectionSystemManager.h"
#include "FileFilterIndex.h"
#include "FileSorts.h"
#include "Log.h"
#include "platform.h"
#include "SystemData.h"
#include "Util.h" #include "Util.h"
#include "VolumeControl.h"
#include "Window.h"
#include <boost/algorithm/string/trim.hpp>
#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/filesystem/operations.hpp>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;

7
es-app/src/FileData.h
View file

@ -2,13 +2,12 @@
#ifndef ES_APP_FILE_DATA_H #ifndef ES_APP_FILE_DATA_H
#define ES_APP_FILE_DATA_H #define ES_APP_FILE_DATA_H
#include <unordered_map>
#include <string>
#include <vector>
#include <boost/filesystem.hpp>
#include "MetaData.h" #include "MetaData.h"
#include <boost/filesystem/path.hpp>
#include <unordered_map>
class SystemData; class SystemData;
class Window;
struct SystemEnvironmentData; struct SystemEnvironmentData;
enum FileType enum FileType

7
es-app/src/FileFilterIndex.cpp
View file

@ -1,5 +1,10 @@
#include "FileFilterIndex.h" #include "FileFilterIndex.h"
#include "FileData.h"
#include "Log.h"
#include "Util.h"
#include <boost/algorithm/string/trim.hpp>
#define UNKNOWN_LABEL "UNKNOWN" #define UNKNOWN_LABEL "UNKNOWN"
#define INCLUDE_UNKNOWN false; #define INCLUDE_UNKNOWN false;
@ -123,7 +128,7 @@ std::string FileFilterIndex::getIndexableKey(FileData* game, FilterIndexType typ
std::string ratingString = game->metadata.get("rating"); std::string ratingString = game->metadata.get("rating");
if (!ratingString.empty()) { if (!ratingString.empty()) {
try { try {
ratingNumber = boost::math::iround(std::stod(ratingString)*5); ratingNumber = (int)((std::stod(ratingString)*5)+0.5);
if (ratingNumber < 0) if (ratingNumber < 0)
ratingNumber = 0; ratingNumber = 0;

10
es-app/src/FileFilterIndex.h
View file

@ -3,13 +3,9 @@
#define ES_APP_FILE_FILTER_INDEX_H #define ES_APP_FILE_FILTER_INDEX_H
#include <map> #include <map>
#include "FileData.h" #include <vector>
#include "Log.h"
#include <boost/math/special_functions/round.hpp> class FileData;
#include <boost/algorithm/string.hpp>
#include <sstream>
#include <iostream>
#include "Util.h"
enum FilterIndexType enum FilterIndexType
{ {

3
es-app/src/FileSorts.h
View file

@ -2,9 +2,8 @@
#ifndef ES_APP_FILE_SORTS_H #ifndef ES_APP_FILE_SORTS_H
#define ES_APP_FILE_SORTS_H #define ES_APP_FILE_SORTS_H
#include <vector>
#include "FileData.h" #include "FileData.h"
#include "SystemData.h" #include <vector>
namespace FileSorts namespace FileSorts
{ {

9
es-app/src/Gamelist.cpp
View file

@ -1,10 +1,13 @@
#include "Gamelist.h" #include "Gamelist.h"
#include "SystemData.h"
#include "pugixml/src/pugixml.hpp" #include "FileData.h"
#include <boost/filesystem.hpp> #include "FileFilterIndex.h"
#include "Log.h" #include "Log.h"
#include "Settings.h" #include "Settings.h"
#include "SystemData.h"
#include "Util.h" #include "Util.h"
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;

3
es-app/src/MetaData.cpp
View file

@ -1,7 +1,8 @@
#include "MetaData.h" #include "MetaData.h"
#include "components/TextComponent.h"
#include "Log.h" #include "Log.h"
#include "Util.h" #include "Util.h"
#include <boost/date_time/posix_time/time_formatters.hpp>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;

9
es-app/src/MetaData.h
View file

@ -2,12 +2,9 @@
#ifndef ES_APP_META_DATA_H #ifndef ES_APP_META_DATA_H
#define ES_APP_META_DATA_H #define ES_APP_META_DATA_H
#include "pugixml/src/pugixml.hpp" #include <boost/date_time/posix_time/ptime.hpp>
#include <string> #include <boost/filesystem/path.hpp>
#include <map> #include <pugixml/src/pugixml.hpp>
#include "GuiComponent.h"
#include <boost/date_time.hpp>
#include <boost/filesystem.hpp>
enum MetaDataType enum MetaDataType
{ {

1
es-app/src/PlatformId.cpp
View file

@ -1,4 +1,5 @@
#include "PlatformId.h" #include "PlatformId.h"
#include <string.h> #include <string.h>
extern const char* mameNameToRealName[]; extern const char* mameNameToRealName[];

2
es-app/src/PlatformId.h
View file

@ -2,8 +2,6 @@
#ifndef ES_APP_PLATFORM_ID_H #ifndef ES_APP_PLATFORM_ID_H
#define ES_APP_PLATFORM_ID_H #define ES_APP_PLATFORM_ID_H
#include <map>
namespace PlatformIds namespace PlatformIds
{ {
enum PlatformId : unsigned int enum PlatformId : unsigned int

15
es-app/src/ScraperCmdLine.cpp
View file

@ -1,10 +1,15 @@
#include "ScraperCmdLine.h" #include "ScraperCmdLine.h"
#include <iostream>
#include <vector>
#include "SystemData.h"
#include "Settings.h"
#include <signal.h>
#include "Log.h" #include "Log.h"
#include "platform.h"
#include "SystemData.h"
#include <iostream>
#include <signal.h>
#if defined(__linux__)
#include <unistd.h>
#elif defined(WIN32)
#include <Windows.h>
#endif
std::ostream& out = std::cout; std::ostream& out = std::cout;

23
es-app/src/SystemData.cpp
View file

@ -1,15 +1,18 @@
#include "SystemData.h" #include "SystemData.h"
#include "Gamelist.h"
#include <boost/filesystem.hpp> #include "CollectionSystemManager.h"
#include <fstream> #include "FileFilterIndex.h"
#include <stdlib.h>
#include <SDL_joystick.h>
#include "Renderer.h"
#include "Log.h"
#include "InputManager.h"
#include <iostream>
#include "Settings.h"
#include "FileSorts.h" #include "FileSorts.h"
#include "Gamelist.h"
#include "Log.h"
#include "platform.h"
#include "Settings.h"
#include "ThemeData.h"
#include <boost/filesystem/operations.hpp>
#include <fstream>
#ifdef WIN32
#include <Windows.h>
#endif
std::vector<SystemData*> SystemData::sSystemVector; std::vector<SystemData*> SystemData::sSystemVector;

16
es-app/src/SystemData.h
View file

@ -2,15 +2,15 @@
#ifndef ES_APP_SYSTEM_DATA_H #ifndef ES_APP_SYSTEM_DATA_H
#define ES_APP_SYSTEM_DATA_H #define ES_APP_SYSTEM_DATA_H
#include <vector>
#include <string>
#include "FileData.h"
#include "Window.h"
#include "MetaData.h"
#include "PlatformId.h" #include "PlatformId.h"
#include "ThemeData.h" #include <algorithm>
#include "FileFilterIndex.h" #include <memory>
#include "CollectionSystemManager.h" #include <string>
#include <vector>
class FileData;
class FileFilterIndex;
class ThemeData;
struct SystemEnvironmentData struct SystemEnvironmentData
{ {

18
es-app/src/SystemScreenSaver.cpp
View file

@ -1,21 +1,21 @@
#include "SystemScreenSaver.h" #include "SystemScreenSaver.h"
#ifdef _RPI_ #ifdef _RPI_
#include "components/VideoPlayerComponent.h" #include "components/VideoPlayerComponent.h"
#endif #endif
#include "components/VideoVlcComponent.h" #include "components/VideoVlcComponent.h"
#include "components/ImageComponent.h" #include "views/gamelist/IGameListView.h"
#include "platform.h" #include "views/ViewController.h"
#include "FileData.h"
#include "FileFilterIndex.h"
#include "Log.h"
#include "PowerSaver.h" #include "PowerSaver.h"
#include "Renderer.h" #include "Renderer.h"
#include "Settings.h" #include "Sound.h"
#include "SystemData.h" #include "SystemData.h"
#include "Util.h" #include "Util.h"
#include "Log.h" #include <boost/filesystem/operations.hpp>
#include "AudioManager.h" #include <unordered_map>
#include "Sound.h"
#include "views/ViewController.h"
#include "views/gamelist/IGameListView.h"
#include <stdio.h>
#define FADE_TIME 300 #define FADE_TIME 300

2
es-app/src/SystemScreenSaver.h
View file

@ -4,9 +4,9 @@
#include "Window.h" #include "Window.h"
class VideoComponent;
class ImageComponent; class ImageComponent;
class Sound; class Sound;
class VideoComponent;
// Screensaver implementation for main window // Screensaver implementation for main window
class SystemScreenSaver : public Window::ScreenSaver class SystemScreenSaver : public Window::ScreenSaver

6
es-app/src/VolumeControl.cpp
View file

@ -1,8 +1,10 @@
#include "VolumeControl.h" #include "VolumeControl.h"
#include "Settings.h"
#include "Log.h" #include "Log.h"
#include "Settings.h"
#ifdef WIN32
#include <mmdeviceapi.h>
#endif
#if defined(__linux__) #if defined(__linux__)
#ifdef _RPI_ #ifdef _RPI_

4
es-app/src/VolumeControl.h
View file

@ -3,7 +3,6 @@
#define ES_APP_VOLUME_CONTROL_H #define ES_APP_VOLUME_CONTROL_H
#include <memory> #include <memory>
#include <stdint.h>
#if defined (__APPLE__) #if defined (__APPLE__)
#error TODO: Not implemented for MacOS yet!!! #error TODO: Not implemented for MacOS yet!!!
@ -13,9 +12,8 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#elif defined(WIN32) || defined(_WIN32) #elif defined(WIN32) || defined(_WIN32)
#include <Windows.h> #include <Windows.h>
#include <MMSystem.h>
#include <mmdeviceapi.h>
#include <endpointvolume.h> #include <endpointvolume.h>
#include <mmeapi.h>
#endif #endif
/*! /*!

1
es-app/src/animations/LaunchAnimation.h
View file

@ -3,7 +3,6 @@
#define ES_APP_ANIMATIONS_LAUNCH_ANIMATION_H #define ES_APP_ANIMATIONS_LAUNCH_ANIMATION_H
#include "animations/Animation.h" #include "animations/Animation.h"
#include "Log.h"
// let's look at the game launch effect: // let's look at the game launch effect:
// -move camera to center on point P (interpolation method: linear) // -move camera to center on point P (interpolation method: linear)

2
es-app/src/components/AsyncReqComponent.cpp
View file

@ -1,4 +1,6 @@
#include "components/AsyncReqComponent.h" #include "components/AsyncReqComponent.h"
#include "HttpReq.h"
#include "Renderer.h" #include "Renderer.h"
AsyncReqComponent::AsyncReqComponent(Window* window, std::shared_ptr<HttpReq> req, std::function<void(std::shared_ptr<HttpReq>)> onSuccess, std::function<void()> onCancel) AsyncReqComponent::AsyncReqComponent(Window* window, std::shared_ptr<HttpReq> req, std::function<void(std::shared_ptr<HttpReq>)> onSuccess, std::function<void()> onCancel)

5
es-app/src/components/AsyncReqComponent.h
View file

@ -3,9 +3,8 @@
#define ES_APP_COMPONENTS_ASYNC_REQ_COMPONENT_H #define ES_APP_COMPONENTS_ASYNC_REQ_COMPONENT_H
#include "GuiComponent.h" #include "GuiComponent.h"
#include "HttpReq.h"
#include <functional> class HttpReq;
#include <memory>
/* /*
Used to asynchronously run an HTTP request. Used to asynchronously run an HTTP request.

5
es-app/src/components/RatingComponent.cpp
View file

@ -1,7 +1,8 @@
#include "components/RatingComponent.h" #include "components/RatingComponent.h"
#include "resources/TextureResource.h"
#include "Renderer.h" #include "Renderer.h"
#include "Window.h" #include "ThemeData.h"
#include "Util.h"
RatingComponent::RatingComponent(Window* window) : GuiComponent(window), mColorShift(0xFFFFFFFF) RatingComponent::RatingComponent(Window* window) : GuiComponent(window), mColorShift(0xFFFFFFFF)
{ {

5
es-app/src/components/RatingComponent.h
View file

@ -3,7 +3,10 @@
#define ES_APP_COMPONENTS_RATING_COMPONENT_H #define ES_APP_COMPONENTS_RATING_COMPONENT_H
#include "GuiComponent.h" #include "GuiComponent.h"
#include "resources/TextureResource.h" #include "platform.h"
#include GLHEADER
class TextureResource;
#define NUM_RATING_STARS 5 #define NUM_RATING_STARS 5

18
es-app/src/components/ScraperSearchComponent.cpp
View file

@ -1,18 +1,18 @@
#include "components/ScraperSearchComponent.h" #include "components/ScraperSearchComponent.h"
#include "guis/GuiMsgBox.h" #include "components/ComponentList.h"
#include "components/TextComponent.h" #include "components/DateTimeComponent.h"
#include "components/ScrollableContainer.h"
#include "components/ImageComponent.h" #include "components/ImageComponent.h"
#include "components/RatingComponent.h" #include "components/RatingComponent.h"
#include "components/DateTimeComponent.h" #include "components/ScrollableContainer.h"
#include "components/AnimatedImageComponent.h" #include "components/TextComponent.h"
#include "components/ComponentList.h" #include "guis/GuiMsgBox.h"
#include "HttpReq.h" #include "guis/GuiTextEditPopup.h"
#include "Settings.h" #include "resources/Font.h"
#include "FileData.h"
#include "Log.h" #include "Log.h"
#include "Util.h" #include "Util.h"
#include "guis/GuiTextEditPopup.h" #include "Window.h"
ScraperSearchComponent::ScraperSearchComponent(Window* window, SearchType type) : GuiComponent(window), ScraperSearchComponent::ScraperSearchComponent(Window* window, SearchType type) : GuiComponent(window),
mGrid(window, Vector2i(4, 3)), mBusyAnim(window), mGrid(window, Vector2i(4, 3)), mBusyAnim(window),

13
es-app/src/components/ScraperSearchComponent.h
View file

@ -2,20 +2,17 @@
#ifndef ES_APP_COMPONENTS_SCRAPER_SEARCH_COMPONENT_H #ifndef ES_APP_COMPONENTS_SCRAPER_SEARCH_COMPONENT_H
#define ES_APP_COMPONENTS_SCRAPER_SEARCH_COMPONENT_H #define ES_APP_COMPONENTS_SCRAPER_SEARCH_COMPONENT_H
#include "GuiComponent.h"
#include "scrapers/Scraper.h"
#include "components/ComponentGrid.h"
#include "components/BusyComponent.h" #include "components/BusyComponent.h"
#include <functional> #include "components/ComponentGrid.h"
#include "scrapers/Scraper.h"
#include "GuiComponent.h"
class ComponentList; class ComponentList;
class DateTimeComponent;
class ImageComponent; class ImageComponent;
class RatingComponent; class RatingComponent;
class TextComponent;
class DateTimeComponent;
class ScrollableContainer; class ScrollableContainer;
class HttpReq; class TextComponent;
class AnimatedImageComponent;
class ScraperSearchComponent : public GuiComponent class ScraperSearchComponent : public GuiComponent
{ {

11
es-app/src/components/TextListComponent.h
View file

@ -3,17 +3,12 @@
#define ES_APP_COMPONENTS_TEXT_LIST_COMPONENT_H #define ES_APP_COMPONENTS_TEXT_LIST_COMPONENT_H
#include "components/IList.h" #include "components/IList.h"
#include "Renderer.h"
#include "resources/Font.h"
#include "InputManager.h"
#include "Sound.h"
#include "Log.h" #include "Log.h"
#include "ThemeData.h" #include "Sound.h"
#include "Util.h" #include "Util.h"
#include <vector>
#include <string>
#include <memory> #include <memory>
#include <functional>
class TextCache;
struct TextListData struct TextListData
{ {

13
es-app/src/guis/GuiCollectionSystemsOptions.cpp
View file

@ -1,13 +1,12 @@
#include "guis/GuiCollectionSystemsOptions.h" #include "guis/GuiCollectionSystemsOptions.h"
#include "guis/GuiMsgBox.h"
#include "guis/GuiTextEditPopup.h"
#include "Settings.h"
#include "views/ViewController.h"
#include "guis/GuiSettings.h"
#include "Util.h"
#include "components/TextComponent.h"
#include "components/OptionListComponent.h" #include "components/OptionListComponent.h"
#include "components/SwitchComponent.h"
#include "guis/GuiSettings.h"
#include "guis/GuiTextEditPopup.h"
#include "views/ViewController.h"
#include "CollectionSystemManager.h"
#include "Window.h"
GuiCollectionSystemsOptions::GuiCollectionSystemsOptions(Window* window) : GuiComponent(window), mMenu(window, "GAME COLLECTION SETTINGS") GuiCollectionSystemsOptions::GuiCollectionSystemsOptions(Window* window) : GuiComponent(window), mMenu(window, "GAME COLLECTION SETTINGS")
{ {

9
es-app/src/guis/GuiCollectionSystemsOptions.h
View file

@ -2,17 +2,12 @@
#ifndef ES_APP_GUIS_GUI_COLLECTION_SYSTEM_OPTIONS_H #ifndef ES_APP_GUIS_GUI_COLLECTION_SYSTEM_OPTIONS_H
#define ES_APP_GUIS_GUI_COLLECTION_SYSTEM_OPTIONS_H #define ES_APP_GUIS_GUI_COLLECTION_SYSTEM_OPTIONS_H
#include "GuiComponent.h"
#include "SystemData.h"
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#include "CollectionSystemManager.h"
#include "components/SwitchComponent.h"
#include "Log.h"
template<typename T> template<typename T>
class OptionListComponent; class OptionListComponent;
class SwitchComponent;
class SystemData;
class GuiCollectionSystemsOptions : public GuiComponent class GuiCollectionSystemsOptions : public GuiComponent
{ {

3
es-app/src/guis/GuiFastSelect.cpp
View file

@ -1,5 +1,6 @@
#include "guis/GuiFastSelect.h" #include "guis/GuiFastSelect.h"
#include "ThemeData.h"
#include "views/gamelist/IGameListView.h"
#include "FileSorts.h" #include "FileSorts.h"
#include "SystemData.h" #include "SystemData.h"

6
es-app/src/guis/GuiFastSelect.h
View file

@ -2,11 +2,11 @@
#ifndef ES_APP_GUIS_GUI_FAST_SELECT_H #ifndef ES_APP_GUIS_GUI_FAST_SELECT_H
#define ES_APP_GUIS_GUI_FAST_SELECT_H #define ES_APP_GUIS_GUI_FAST_SELECT_H
#include "GuiComponent.h"
#include "views/gamelist/IGameListView.h"
#include "components/NinePatchComponent.h" #include "components/NinePatchComponent.h"
#include "components/TextComponent.h" #include "components/TextComponent.h"
#include "GuiComponent.h"
class IGameListView;
class GuiFastSelect : public GuiComponent class GuiFastSelect : public GuiComponent
{ {

10
es-app/src/guis/GuiGameScraper.cpp
View file

@ -1,13 +1,11 @@
#include "guis/GuiGameScraper.h" #include "guis/GuiGameScraper.h"
#include "guis/GuiTextEditPopup.h"
#include "components/TextComponent.h"
#include "components/ButtonComponent.h" #include "components/ButtonComponent.h"
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#include "scrapers/Scraper.h" #include "components/TextComponent.h"
#include "Renderer.h" #include "FileData.h"
#include "Log.h"
#include "PowerSaver.h" #include "PowerSaver.h"
#include "Settings.h" #include "SystemData.h"
GuiGameScraper::GuiGameScraper(Window* window, ScraperSearchParams params, std::function<void(const ScraperSearchResult&)> doneFunc) : GuiComponent(window), GuiGameScraper::GuiGameScraper(Window* window, ScraperSearchParams params, std::function<void(const ScraperSearchResult&)> doneFunc) : GuiComponent(window),
mGrid(window, Vector2i(1, 7)), mGrid(window, Vector2i(1, 7)),

4
es-app/src/guis/GuiGameScraper.h
View file

@ -2,9 +2,9 @@
#ifndef ES_APP_GUIS_GUI_GAME_SCRAPER_H #ifndef ES_APP_GUIS_GUI_GAME_SCRAPER_H
#define ES_APP_GUIS_GUI_GAME_SCRAPER_H #define ES_APP_GUIS_GUI_GAME_SCRAPER_H
#include "GuiComponent.h"
#include "components/ScraperSearchComponent.h"
#include "components/NinePatchComponent.h" #include "components/NinePatchComponent.h"
#include "components/ScraperSearchComponent.h"
#include "GuiComponent.h"
class GuiGameScraper : public GuiComponent class GuiGameScraper : public GuiComponent
{ {

4
es-app/src/guis/GuiGamelistFilter.cpp
View file

@ -1,9 +1,7 @@
#include "guis/GuiGamelistFilter.h" #include "guis/GuiGamelistFilter.h"
#include "guis/GuiMsgBox.h"
#include "views/ViewController.h"
#include "components/TextComponent.h"
#include "components/OptionListComponent.h" #include "components/OptionListComponent.h"
#include "SystemData.h"
GuiGamelistFilter::GuiGamelistFilter(Window* window, SystemData* system) : GuiComponent(window), mMenu(window, "FILTER GAMELIST BY"), mSystem(system) GuiGamelistFilter::GuiGamelistFilter(Window* window, SystemData* system) : GuiComponent(window), mMenu(window, "FILTER GAMELIST BY"), mSystem(system)
{ {

7
es-app/src/guis/GuiGamelistFilter.h
View file

@ -2,16 +2,13 @@
#ifndef ES_APP_GUIS_GUI_GAME_LIST_FILTER_H #ifndef ES_APP_GUIS_GUI_GAME_LIST_FILTER_H
#define ES_APP_GUIS_GUI_GAME_LIST_FILTER_H #define ES_APP_GUIS_GUI_GAME_LIST_FILTER_H
#include "GuiComponent.h"
#include "SystemData.h"
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#include "FileFilterIndex.h" #include "FileFilterIndex.h"
#include "Log.h" #include "GuiComponent.h"
template<typename T> template<typename T>
class OptionListComponent; class OptionListComponent;
class SystemData;
class GuiGamelistFilter : public GuiComponent class GuiGamelistFilter : public GuiComponent
{ {

10
es-app/src/guis/GuiGamelistOptions.cpp
View file

@ -1,10 +1,14 @@
#include "GuiGamelistOptions.h" #include "GuiGamelistOptions.h"
#include "GuiMetaDataEd.h"
#include "Util.h" #include "guis/GuiGamelistFilter.h"
#include "Settings.h" #include "scrapers/Scraper.h"
#include "views/gamelist/IGameListView.h" #include "views/gamelist/IGameListView.h"
#include "views/ViewController.h" #include "views/ViewController.h"
#include "CollectionSystemManager.h" #include "CollectionSystemManager.h"
#include "FileFilterIndex.h"
#include "FileSorts.h"
#include "GuiMetaDataEd.h"
#include "SystemData.h"
GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system) : GuiComponent(window), GuiGamelistOptions::GuiGamelistOptions(Window* window, SystemData* system) : GuiComponent(window),
mSystem(system), mMenu(window, "OPTIONS"), fromPlaceholder(false), mFiltersChanged(false) mSystem(system), mMenu(window, "OPTIONS"), fromPlaceholder(false), mFiltersChanged(false)

6
es-app/src/guis/GuiGamelistOptions.h
View file

@ -2,13 +2,13 @@
#ifndef ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H #ifndef ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H
#define ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H #define ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H
#include "GuiComponent.h"
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#include "components/OptionListComponent.h" #include "components/OptionListComponent.h"
#include "GuiGamelistFilter.h" #include "FileData.h"
#include "FileSorts.h" #include "GuiComponent.h"
class IGameListView; class IGameListView;
class SystemData;
class GuiGamelistOptions : public GuiComponent class GuiGamelistOptions : public GuiComponent
{ {

14
es-app/src/guis/GuiGeneralScreensaverOptions.cpp
View file

@ -1,19 +1,11 @@
#include "guis/GuiGeneralScreensaverOptions.h" #include "guis/GuiGeneralScreensaverOptions.h"
#include "Window.h"
#include "Settings.h"
#include "PowerSaver.h"
#include "views/ViewController.h"
#include "components/ButtonComponent.h"
#include "components/SwitchComponent.h"
#include "components/SliderComponent.h"
#include "components/TextComponent.h"
//#include "components/TextEditComponent.h"
#include "components/OptionListComponent.h" #include "components/OptionListComponent.h"
#include "components/MenuComponent.h" #include "components/SliderComponent.h"
#include "guis/GuiMsgBox.h" #include "guis/GuiMsgBox.h"
#include "guis/GuiVideoScreensaverOptions.h"
#include "guis/GuiSlideshowScreensaverOptions.h" #include "guis/GuiSlideshowScreensaverOptions.h"
#include "guis/GuiVideoScreensaverOptions.h"
#include "Settings.h"
GuiGeneralScreensaverOptions::GuiGeneralScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title) GuiGeneralScreensaverOptions::GuiGeneralScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title)
{ {

1
es-app/src/guis/GuiGeneralScreensaverOptions.h
View file

@ -2,7 +2,6 @@
#ifndef ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H #ifndef ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H
#define ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H #define ES_APP_GUIS_GUI_GENERAL_SCREENSAVER_OPTIONS_H
#include "components/MenuComponent.h"
#include "GuiScreensaverOptions.h" #include "GuiScreensaverOptions.h"
class GuiGeneralScreensaverOptions : public GuiScreensaverOptions class GuiGeneralScreensaverOptions : public GuiScreensaverOptions

7
es-app/src/guis/GuiInfoPopup.cpp
View file

@ -1,7 +1,10 @@
#include "guis/GuiInfoPopup.h" #include "guis/GuiInfoPopup.h"
#include "Renderer.h"
#include "components/ComponentGrid.h"
#include "components/NinePatchComponent.h"
#include "components/TextComponent.h" #include "components/TextComponent.h"
#include "Log.h" #include "Renderer.h"
#include <SDL_timer.h>
GuiInfoPopup::GuiInfoPopup(Window* window, std::string message, int duration) : GuiInfoPopup::GuiInfoPopup(Window* window, std::string message, int duration) :
GuiComponent(window), mMessage(message), mDuration(duration), running(true) GuiComponent(window), mMessage(message), mDuration(duration), running(true)

6
es-app/src/guis/GuiInfoPopup.h
View file

@ -3,12 +3,10 @@
#define ES_APP_GUIS_GUI_INFO_POPUP_H #define ES_APP_GUIS_GUI_INFO_POPUP_H
#include "GuiComponent.h" #include "GuiComponent.h"
#include "components/NinePatchComponent.h"
#include "components/ComponentGrid.h"
#include "Window.h" #include "Window.h"
#include "Log.h"
class ComponentGrid;
class NinePatchComponent;
class GuiInfoPopup : public GuiComponent, public Window::InfoPopup class GuiInfoPopup : public GuiComponent, public Window::InfoPopup
{ {

32
es-app/src/guis/GuiMenu.cpp
View file

@ -1,26 +1,20 @@
#include "EmulationStation.h"
#include "guis/GuiMenu.h" #include "guis/GuiMenu.h"
#include "Window.h"
#include "Sound.h"
#include "Log.h"
#include "SystemData.h"
#include "Settings.h"
#include "PowerSaver.h"
#include "guis/GuiMsgBox.h"
#include "guis/GuiSettings.h"
#include "guis/GuiGeneralScreensaverOptions.h"
#include "guis/GuiCollectionSystemsOptions.h"
#include "guis/GuiScraperStart.h"
#include "guis/GuiDetectDevice.h"
#include "views/ViewController.h"
#include "components/ButtonComponent.h"
#include "components/SwitchComponent.h"
#include "components/SliderComponent.h"
#include "components/TextComponent.h"
#include "components/OptionListComponent.h" #include "components/OptionListComponent.h"
#include "components/MenuComponent.h" #include "components/SliderComponent.h"
#include "components/SwitchComponent.h"
#include "guis/GuiCollectionSystemsOptions.h"
#include "guis/GuiDetectDevice.h"
#include "guis/GuiGeneralScreensaverOptions.h"
#include "guis/GuiMsgBox.h"
#include "guis/GuiScraperStart.h"
#include "guis/GuiSettings.h"
#include "views/ViewController.h"
#include "CollectionSystemManager.h"
#include "EmulationStation.h"
#include "SystemData.h"
#include "VolumeControl.h" #include "VolumeControl.h"
#include <SDL_events.h>
GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MENU"), mVersion(window) GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MENU"), mVersion(window)
{ {

3
es-app/src/guis/GuiMenu.h
View file

@ -2,9 +2,8 @@
#ifndef ES_APP_GUIS_GUI_MENU_H #ifndef ES_APP_GUIS_GUI_MENU_H
#define ES_APP_GUIS_GUI_MENU_H #define ES_APP_GUIS_GUI_MENU_H
#include "GuiComponent.h"
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#include <functional> #include "GuiComponent.h"
class GuiMenu : public GuiComponent class GuiMenu : public GuiComponent
{ {

23
es-app/src/guis/GuiMetaDataEd.cpp
View file

@ -1,18 +1,23 @@
#include "guis/GuiMetaDataEd.h" #include "guis/GuiMetaDataEd.h"
#include "Renderer.h"
#include "Log.h"
#include "components/AsyncReqComponent.h"
#include "Settings.h"
#include "views/ViewController.h"
#include "guis/GuiGameScraper.h"
#include "guis/GuiMsgBox.h"
#include <boost/filesystem.hpp>
#include "components/TextEditComponent.h" #include "components/ButtonComponent.h"
#include "components/ComponentList.h"
#include "components/DateTimeComponent.h" #include "components/DateTimeComponent.h"
#include "components/MenuComponent.h"
#include "components/RatingComponent.h" #include "components/RatingComponent.h"
#include "components/SwitchComponent.h" #include "components/SwitchComponent.h"
#include "components/TextComponent.h"
#include "guis/GuiGameScraper.h"
#include "guis/GuiMsgBox.h"
#include "guis/GuiTextEditPopup.h" #include "guis/GuiTextEditPopup.h"
#include "resources/Font.h"
#include "views/ViewController.h"
#include "CollectionSystemManager.h"
#include "FileData.h"
#include "FileFilterIndex.h"
#include "SystemData.h"
#include "Util.h"
#include "Window.h"
GuiMetaDataEd::GuiMetaDataEd(Window* window, MetaDataList* md, const std::vector<MetaDataDecl>& mdd, ScraperSearchParams scraperParams, GuiMetaDataEd::GuiMetaDataEd(Window* window, MetaDataList* md, const std::vector<MetaDataDecl>& mdd, ScraperSearchParams scraperParams,
const std::string& header, std::function<void()> saveCallback, std::function<void()> deleteFunc) : GuiComponent(window), const std::string& header, std::function<void()> saveCallback, std::function<void()> deleteFunc) : GuiComponent(window),

10
es-app/src/guis/GuiMetaDataEd.h
View file

@ -2,12 +2,14 @@
#ifndef ES_APP_GUIS_GUI_META_DATA_ED_H #ifndef ES_APP_GUIS_GUI_META_DATA_ED_H
#define ES_APP_GUIS_GUI_META_DATA_ED_H #define ES_APP_GUIS_GUI_META_DATA_ED_H
#include "GuiComponent.h" #include "components/ComponentGrid.h"
#include "components/MenuComponent.h" #include "components/NinePatchComponent.h"
#include "MetaData.h"
#include "scrapers/Scraper.h" #include "scrapers/Scraper.h"
#include "GuiComponent.h"
#include "MetaData.h"
#include <functional> class ComponentList;
class TextComponent;
class GuiMetaDataEd : public GuiComponent class GuiMetaDataEd : public GuiComponent
{ {

16
es-app/src/guis/GuiScraperMulti.cpp
View file

@ -1,15 +1,15 @@
#include "guis/GuiScraperMulti.h" #include "guis/GuiScraperMulti.h"
#include "Renderer.h"
#include "Log.h" #include "components/ButtonComponent.h"
#include "components/MenuComponent.h"
#include "components/ScraperSearchComponent.h"
#include "components/TextComponent.h"
#include "guis/GuiMsgBox.h"
#include "views/ViewController.h" #include "views/ViewController.h"
#include "Gamelist.h" #include "Gamelist.h"
#include "PowerSaver.h" #include "PowerSaver.h"
#include "SystemData.h"
#include "components/TextComponent.h" #include "Window.h"
#include "components/ButtonComponent.h"
#include "components/ScraperSearchComponent.h"
#include "components/MenuComponent.h" // for makeButtonGrid
#include "guis/GuiMsgBox.h"
GuiScraperMulti::GuiScraperMulti(Window* window, const std::queue<ScraperSearchParams>& searches, bool approveResults) : GuiScraperMulti::GuiScraperMulti(Window* window, const std::queue<ScraperSearchParams>& searches, bool approveResults) :
GuiComponent(window), mBackground(window, ":/frame.png"), mGrid(window, Vector2i(1, 5)), GuiComponent(window), mBackground(window, ":/frame.png"), mGrid(window, Vector2i(1, 5)),

6
es-app/src/guis/GuiScraperMulti.h
View file

@ -2,12 +2,10 @@
#ifndef ES_APP_GUIS_GUI_SCRAPER_MULTI_H #ifndef ES_APP_GUIS_GUI_SCRAPER_MULTI_H
#define ES_APP_GUIS_GUI_SCRAPER_MULTI_H #define ES_APP_GUIS_GUI_SCRAPER_MULTI_H
#include "GuiComponent.h"
#include "components/NinePatchComponent.h"
#include "components/ComponentGrid.h" #include "components/ComponentGrid.h"
#include "components/NinePatchComponent.h"
#include "scrapers/Scraper.h" #include "scrapers/Scraper.h"
#include "GuiComponent.h"
#include <queue>
class ScraperSearchComponent; class ScraperSearchComponent;
class TextComponent; class TextComponent;

9
es-app/src/guis/GuiScraperStart.cpp
View file

@ -1,11 +1,12 @@
#include "guis/GuiScraperStart.h" #include "guis/GuiScraperStart.h"
#include "guis/GuiScraperMulti.h"
#include "guis/GuiMsgBox.h"
#include "views/ViewController.h"
#include "components/TextComponent.h"
#include "components/OptionListComponent.h" #include "components/OptionListComponent.h"
#include "components/SwitchComponent.h" #include "components/SwitchComponent.h"
#include "guis/GuiMsgBox.h"
#include "guis/GuiScraperMulti.h"
#include "views/ViewController.h"
#include "FileData.h"
#include "SystemData.h"
GuiScraperStart::GuiScraperStart(Window* window) : GuiComponent(window), GuiScraperStart::GuiScraperStart(Window* window) : GuiComponent(window),
mMenu(window, "SCRAPE NOW") mMenu(window, "SCRAPE NOW")

12
es-app/src/guis/GuiScraperStart.h
View file

@ -2,18 +2,16 @@
#ifndef ES_APP_GUIS_GUI_SCRAPER_START_H #ifndef ES_APP_GUIS_GUI_SCRAPER_START_H
#define ES_APP_GUIS_GUI_SCRAPER_START_H #define ES_APP_GUIS_GUI_SCRAPER_START_H
#include "GuiComponent.h"
#include "SystemData.h"
#include "scrapers/Scraper.h"
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#include <queue> #include "scrapers/Scraper.h"
typedef std::function<bool(SystemData*, FileData*)> GameFilterFunc;
class FileData;
template<typename T> template<typename T>
class OptionListComponent; class OptionListComponent;
class SwitchComponent; class SwitchComponent;
class SystemData;
typedef std::function<bool(SystemData*, FileData*)> GameFilterFunc;
//The starting point for a multi-game scrape. //The starting point for a multi-game scrape.
//Allows the user to set various parameters (to set filters, to set which systems to scrape, to enable manual mode). //Allows the user to set various parameters (to set filters, to set which systems to scrape, to enable manual mode).

8
es-app/src/guis/GuiScreensaverOptions.cpp
View file

@ -1,9 +1,9 @@
#include "guis/GuiScreensaverOptions.h" #include "guis/GuiScreensaverOptions.h"
#include "Window.h"
#include "Settings.h"
#include "views/ViewController.h"
#include "components/ButtonComponent.h" #include "views/ViewController.h"
#include "Settings.h"
#include "SystemData.h"
#include "Window.h"
GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const char* title) : GuiComponent(window), mMenu(window, title) GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const char* title) : GuiComponent(window), mMenu(window, title)
{ {

2
es-app/src/guis/GuiScreensaverOptions.h
View file

@ -2,9 +2,7 @@
#ifndef ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H #ifndef ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H
#define ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H #define ES_APP_GUIS_GUI_SCREENSAVER_OPTIONS_H
#include "GuiComponent.h"
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#include "SystemData.h"
// This is just a really simple template for a GUI that calls some save functions when closed. // This is just a really simple template for a GUI that calls some save functions when closed.
class GuiScreensaverOptions : public GuiComponent class GuiScreensaverOptions : public GuiComponent

6
es-app/src/guis/GuiSettings.cpp
View file

@ -1,7 +1,9 @@
#include "guis/GuiSettings.h" #include "guis/GuiSettings.h"
#include "Window.h"
#include "Settings.h"
#include "views/ViewController.h" #include "views/ViewController.h"
#include "Settings.h"
#include "SystemData.h"
#include "Window.h"
GuiSettings::GuiSettings(Window* window, const char* title) : GuiComponent(window), mMenu(window, title) GuiSettings::GuiSettings(Window* window, const char* title) : GuiComponent(window), mMenu(window, title)
{ {

2
es-app/src/guis/GuiSettings.h
View file

@ -2,9 +2,7 @@
#ifndef ES_APP_GUIS_GUI_SETTINGS_H #ifndef ES_APP_GUIS_GUI_SETTINGS_H
#define ES_APP_GUIS_GUI_SETTINGS_H #define ES_APP_GUIS_GUI_SETTINGS_H
#include "GuiComponent.h"
#include "components/MenuComponent.h" #include "components/MenuComponent.h"
#include "SystemData.h"
// This is just a really simple template for a GUI that calls some save functions when closed. // This is just a really simple template for a GUI that calls some save functions when closed.
class GuiSettings : public GuiComponent class GuiSettings : public GuiComponent

12
es-app/src/guis/GuiSlideshowScreensaverOptions.cpp
View file

@ -1,16 +1,10 @@
#include "guis/GuiSlideshowScreensaverOptions.h" #include "guis/GuiSlideshowScreensaverOptions.h"
#include "Window.h"
#include "Settings.h"
#include "views/ViewController.h"
#include "components/SwitchComponent.h"
#include "components/SliderComponent.h" #include "components/SliderComponent.h"
#include "components/TextComponent.h" #include "components/SwitchComponent.h"
#include "components/OptionListComponent.h"
#include "components/MenuComponent.h"
#include "guis/GuiMsgBox.h"
#include "guis/GuiTextEditPopup.h" #include "guis/GuiTextEditPopup.h"
#include "PowerSaver.h" #include "Settings.h"
#include "Window.h"
GuiSlideshowScreensaverOptions::GuiSlideshowScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title) GuiSlideshowScreensaverOptions::GuiSlideshowScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title)
{ {

1
es-app/src/guis/GuiSlideshowScreensaverOptions.h
View file

@ -2,7 +2,6 @@
#ifndef ES_APP_GUIS_GUI_SLIDESHOW_SCREENSAVER_OPTIONS_H #ifndef ES_APP_GUIS_GUI_SLIDESHOW_SCREENSAVER_OPTIONS_H
#define ES_APP_GUIS_GUI_SLIDESHOW_SCREENSAVER_OPTIONS_H #define ES_APP_GUIS_GUI_SLIDESHOW_SCREENSAVER_OPTIONS_H
#include "components/MenuComponent.h"
#include "GuiScreensaverOptions.h" #include "GuiScreensaverOptions.h"
class GuiSlideshowScreensaverOptions : public GuiScreensaverOptions class GuiSlideshowScreensaverOptions : public GuiScreensaverOptions

10
es-app/src/guis/GuiVideoScreensaverOptions.cpp
View file

@ -1,14 +1,10 @@
#include "guis/GuiVideoScreensaverOptions.h" #include "guis/GuiVideoScreensaverOptions.h"
#include "Window.h"
#include "Settings.h"
#include "views/ViewController.h"
#include "components/SwitchComponent.h"
#include "components/SliderComponent.h"
#include "components/OptionListComponent.h" #include "components/OptionListComponent.h"
#include "components/MenuComponent.h" #include "components/SliderComponent.h"
#include "components/SwitchComponent.h"
#include "guis/GuiMsgBox.h" #include "guis/GuiMsgBox.h"
#include "PowerSaver.h" #include "Settings.h"
GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title) GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const char* title) : GuiScreensaverOptions(window, title)
{ {

1
es-app/src/guis/GuiVideoScreensaverOptions.h
View file

@ -2,7 +2,6 @@
#ifndef ES_APP_GUIS_GUI_VIDEO_SCREENSAVER_OPTIONS_H #ifndef ES_APP_GUIS_GUI_VIDEO_SCREENSAVER_OPTIONS_H
#define ES_APP_GUIS_GUI_VIDEO_SCREENSAVER_OPTIONS_H #define ES_APP_GUIS_GUI_VIDEO_SCREENSAVER_OPTIONS_H
#include "components/MenuComponent.h"
#include "GuiScreensaverOptions.h" #include "GuiScreensaverOptions.h"
class GuiVideoScreensaverOptions : public GuiScreensaverOptions class GuiVideoScreensaverOptions : public GuiScreensaverOptions

31
es-app/src/main.cpp
View file

@ -1,31 +1,30 @@
//EmulationStation, a graphical front-end for ROM browsing. Created by Alec "Aloshi" Lofquist. //EmulationStation, a graphical front-end for ROM browsing. Created by Alec "Aloshi" Lofquist.
//http://www.aloshi.com //http://www.aloshi.com
#include <SDL.h>
#include <iostream>
#include <iomanip>
#include "Renderer.h"
#include "views/ViewController.h"
#include "SystemData.h"
#include <boost/filesystem.hpp>
#include "guis/GuiDetectDevice.h" #include "guis/GuiDetectDevice.h"
#include "guis/GuiMsgBox.h" #include "guis/GuiMsgBox.h"
#include "AudioManager.h" #include "views/ViewController.h"
#include "platform.h" #include "CollectionSystemManager.h"
#include "Log.h"
#include "Window.h"
#include "SystemScreenSaver.h"
#include "EmulationStation.h" #include "EmulationStation.h"
#include "InputManager.h"
#include "Log.h"
#include "platform.h"
#include "PowerSaver.h" #include "PowerSaver.h"
#include "Settings.h"
#include "ScraperCmdLine.h" #include "ScraperCmdLine.h"
#include <sstream> #include "Settings.h"
#include <FreeImage.h> #include "SystemData.h"
#include "SystemScreenSaver.h"
#include <boost/filesystem/operations.hpp>
#include <SDL_events.h>
#include <SDL_main.h>
#include <SDL_timer.h>
#include <iostream>
#ifdef WIN32 #ifdef WIN32
#include <Windows.h> #include <Windows.h>
#endif #endif
#include <FreeImage.h>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
bool scrape_cmdline = false; bool scrape_cmdline = false;

8
es-app/src/scrapers/GamesDBScraper.cpp
View file

@ -1,10 +1,12 @@
#include "scrapers/GamesDBScraper.h" #include "scrapers/GamesDBScraper.h"
#include "FileData.h"
#include "Log.h" #include "Log.h"
#include "pugixml/src/pugixml.hpp" #include "PlatformId.h"
#include "MetaData.h"
#include "Settings.h" #include "Settings.h"
#include "SystemData.h"
#include "Util.h" #include "Util.h"
#include <boost/assign.hpp> #include <boost/assign/list_of.hpp>
using namespace PlatformIds; using namespace PlatformIds;
const std::map<PlatformId, const char*> gamesdb_platformid_map = boost::assign::map_list_of const std::map<PlatformId, const char*> gamesdb_platformid_map = boost::assign::map_list_of

14
es-app/src/scrapers/Scraper.cpp
View file

@ -1,11 +1,15 @@
#include "scrapers/Scraper.h" #include "scrapers/Scraper.h"
#include "Log.h"
#include "Settings.h"
#include <FreeImage.h>
#include <boost/filesystem.hpp>
#include <boost/assign.hpp>
#include "FileData.h"
#include "GamesDBScraper.h" #include "GamesDBScraper.h"
#include "Log.h"
#include "platform.h"
#include "Settings.h"
#include "SystemData.h"
#include <boost/assign/list_of.hpp>
#include <boost/filesystem/operations.hpp>
#include <FreeImage.h>
#include <fstream>
const std::map<std::string, generate_scraper_requests_func> scraper_request_funcs = boost::assign::map_list_of const std::map<std::string, generate_scraper_requests_func> scraper_request_funcs = boost::assign::map_list_of
("TheGamesDB", &thegamesdb_generate_scraper_requests); ("TheGamesDB", &thegamesdb_generate_scraper_requests);

10
es-app/src/scrapers/Scraper.h
View file

@ -2,16 +2,16 @@
#ifndef ES_APP_SCRAPERS_SCRAPER_H #ifndef ES_APP_SCRAPERS_SCRAPER_H
#define ES_APP_SCRAPERS_SCRAPER_H #define ES_APP_SCRAPERS_SCRAPER_H
#include "MetaData.h"
#include "SystemData.h"
#include "HttpReq.h"
#include "AsyncHandle.h" #include "AsyncHandle.h"
#include <vector> #include "HttpReq.h"
#include <functional> #include "MetaData.h"
#include <queue> #include <queue>
#define MAX_SCRAPER_RESULTS 7 #define MAX_SCRAPER_RESULTS 7
class FileData;
class SystemData;
struct ScraperSearchParams struct ScraperSearchParams
{ {
SystemData* system; SystemData* system;

14
es-app/src/views/SystemView.cpp
View file

@ -1,14 +1,12 @@
#include "views/SystemView.h" #include "views/SystemView.h"
#include "SystemData.h"
#include "Renderer.h"
#include "Log.h"
#include "Window.h"
#include "views/ViewController.h"
#include "animations/LambdaAnimation.h" #include "animations/LambdaAnimation.h"
#include "PowerSaver.h" #include "views/ViewController.h"
#include "SystemData.h" #include "Log.h"
#include "Renderer.h"
#include "Settings.h" #include "Settings.h"
#include "Util.h" #include "SystemData.h"
#include "Window.h"
// buffer values for scrolling velocity (left, stopped, right) // buffer values for scrolling velocity (left, stopped, right)
const int logoBuffersLeft[] = { -5, -2, -1 }; const int logoBuffersLeft[] = { -5, -2, -1 };

11
es-app/src/views/SystemView.h
View file

@ -2,15 +2,14 @@
#ifndef ES_APP_VIEWS_SYSTEM_VIEW_H #ifndef ES_APP_VIEWS_SYSTEM_VIEW_H
#define ES_APP_VIEWS_SYSTEM_VIEW_H #define ES_APP_VIEWS_SYSTEM_VIEW_H
#include "GuiComponent.h"
#include "components/ImageComponent.h"
#include "components/TextComponent.h"
#include "components/ScrollableContainer.h"
#include "components/IList.h" #include "components/IList.h"
#include "resources/TextureResource.h" #include "components/TextComponent.h"
#include "resources/Font.h"
#include "GuiComponent.h"
#include <memory>
class SystemData;
class AnimatedImageComponent; class AnimatedImageComponent;
class SystemData;
enum CarouselType : unsigned int enum CarouselType : unsigned int
{ {

23
es-app/src/views/ViewController.cpp
View file

@ -1,19 +1,18 @@
#include "views/ViewController.h" #include "views/ViewController.h"
#include "Log.h"
#include "SystemData.h"
#include "Settings.h"
#include "PowerSaver.h"
#include "views/gamelist/BasicGameListView.h" #include "animations/Animation.h"
#include "views/gamelist/DetailedGameListView.h" #include "animations/LambdaAnimation.h"
#include "views/gamelist/VideoGameListView.h"
#include "views/gamelist/GridGameListView.h"
#include "guis/GuiMenu.h"
#include "guis/GuiMsgBox.h"
#include "animations/LaunchAnimation.h" #include "animations/LaunchAnimation.h"
#include "animations/MoveCameraAnimation.h" #include "animations/MoveCameraAnimation.h"
#include "animations/LambdaAnimation.h" #include "guis/GuiMenu.h"
#include <SDL.h> #include "views/gamelist/DetailedGameListView.h"
#include "views/gamelist/IGameListView.h"
#include "views/gamelist/VideoGameListView.h"
#include "views/SystemView.h"
#include "Log.h"
#include "Settings.h"
#include "SystemData.h"
#include "Window.h"
ViewController* ViewController::sInstance = NULL; ViewController* ViewController::sInstance = NULL;

8
es-app/src/views/ViewController.h
View file

@ -2,10 +2,14 @@
#ifndef ES_APP_VIEWS_VIEW_CONTROLLER_H #ifndef ES_APP_VIEWS_VIEW_CONTROLLER_H
#define ES_APP_VIEWS_VIEW_CONTROLLER_H #define ES_APP_VIEWS_VIEW_CONTROLLER_H
#include "views/gamelist/IGameListView.h" #include "FileData.h"
#include "views/SystemView.h" #include "GuiComponent.h"
#include "Renderer.h"
#include <vector>
class IGameListView;
class SystemData; class SystemData;
class SystemView;
const std::vector<std::string> UIModes = { "Full", "Kiosk" }; const std::vector<std::string> UIModes = { "Full", "Kiosk" };

9
es-app/src/views/gamelist/BasicGameListView.cpp
View file

@ -1,11 +1,10 @@
#include "views/gamelist/BasicGameListView.h" #include "views/gamelist/BasicGameListView.h"
#include "views/ViewController.h" #include "views/ViewController.h"
#include "Renderer.h" #include "CollectionSystemManager.h"
#include "Window.h"
#include "ThemeData.h"
#include "SystemData.h"
#include "Settings.h" #include "Settings.h"
#include "FileFilterIndex.h" #include "SystemData.h"
#include <boost/filesystem/operations.hpp>
BasicGameListView::BasicGameListView(Window* window, FileData* root) BasicGameListView::BasicGameListView(Window* window, FileData* root)
: ISimpleGameListView(window, root), mList(window) : ISimpleGameListView(window, root), mList(window)

2
es-app/src/views/gamelist/BasicGameListView.h
View file

@ -2,8 +2,8 @@
#ifndef ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H
#include "views/gamelist/ISimpleGameListView.h"
#include "components/TextListComponent.h" #include "components/TextListComponent.h"
#include "views/gamelist/ISimpleGameListView.h"
class BasicGameListView : public ISimpleGameListView class BasicGameListView : public ISimpleGameListView
{ {

4
es-app/src/views/gamelist/DetailedGameListView.cpp
View file

@ -1,7 +1,7 @@
#include "views/gamelist/DetailedGameListView.h" #include "views/gamelist/DetailedGameListView.h"
#include "views/ViewController.h"
#include "Window.h"
#include "animations/LambdaAnimation.h" #include "animations/LambdaAnimation.h"
#include "views/ViewController.h"
DetailedGameListView::DetailedGameListView(Window* window, FileData* root) : DetailedGameListView::DetailedGameListView(Window* window, FileData* root) :
BasicGameListView(window, root), BasicGameListView(window, root),

6
es-app/src/views/gamelist/DetailedGameListView.h
View file

@ -2,10 +2,10 @@
#ifndef ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H
#include "views/gamelist/BasicGameListView.h"
#include "components/ScrollableContainer.h"
#include "components/RatingComponent.h"
#include "components/DateTimeComponent.h" #include "components/DateTimeComponent.h"
#include "components/RatingComponent.h"
#include "components/ScrollableContainer.h"
#include "views/gamelist/BasicGameListView.h"
class DetailedGameListView : public BasicGameListView class DetailedGameListView : public BasicGameListView
{ {

3
es-app/src/views/gamelist/GridGameListView.cpp
View file

@ -1,6 +1,5 @@
#include "views/gamelist/GridGameListView.h" #include "views/gamelist/GridGameListView.h"
#include "ThemeData.h"
#include "Window.h"
#include "views/ViewController.h" #include "views/ViewController.h"
GridGameListView::GridGameListView(Window* window, FileData* root) : ISimpleGameListView(window, root), GridGameListView::GridGameListView(Window* window, FileData* root) : ISimpleGameListView(window, root),

4
es-app/src/views/gamelist/GridGameListView.h
View file

@ -2,10 +2,8 @@
#ifndef ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H
#include "views/gamelist/ISimpleGameListView.h"
#include "components/ImageGridComponent.h" #include "components/ImageGridComponent.h"
#include "components/ImageComponent.h" #include "views/gamelist/ISimpleGameListView.h"
#include <stack>
class GridGameListView : public ISimpleGameListView class GridGameListView : public ISimpleGameListView
{ {

7
es-app/src/views/gamelist/IGameListView.cpp
View file

@ -1,12 +1,9 @@
#include "views/gamelist/IGameListView.h" #include "views/gamelist/IGameListView.h"
#include "Window.h"
#include "guis/GuiMetaDataEd.h"
#include "guis/GuiMenu.h"
#include "guis/GuiGamelistOptions.h" #include "guis/GuiGamelistOptions.h"
#include "views/ViewController.h" #include "views/ViewController.h"
#include "Settings.h"
#include "Log.h"
#include "Sound.h" #include "Sound.h"
#include "Window.h"
bool IGameListView::input(InputConfig* config, Input input) bool IGameListView::input(InputConfig* config, Input input)
{ {

5
es-app/src/views/gamelist/IGameListView.h
View file

@ -3,12 +3,11 @@
#define ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H #define ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H
#include "FileData.h" #include "FileData.h"
#include "GuiComponent.h"
#include "Renderer.h" #include "Renderer.h"
class Window;
class GuiComponent;
class FileData;
class ThemeData; class ThemeData;
class Window;
// This is an interface that defines the minimum for a GameListView. // This is an interface that defines the minimum for a GameListView.
class IGameListView : public GuiComponent class IGameListView : public GuiComponent

9
es-app/src/views/gamelist/ISimpleGameListView.cpp
View file

@ -1,11 +1,10 @@
#include "views/gamelist/ISimpleGameListView.h" #include "views/gamelist/ISimpleGameListView.h"
#include "ThemeData.h"
#include "Window.h"
#include "views/ViewController.h" #include "views/ViewController.h"
#include "Sound.h"
#include "Log.h"
#include "Settings.h"
#include "CollectionSystemManager.h" #include "CollectionSystemManager.h"
#include "Settings.h"
#include "Sound.h"
#include "SystemData.h"
ISimpleGameListView::ISimpleGameListView(Window* window, FileData* root) : IGameListView(window, root), ISimpleGameListView::ISimpleGameListView(Window* window, FileData* root) : IGameListView(window, root),
mHeaderText(window), mHeaderImage(window), mBackground(window) mHeaderText(window), mHeaderImage(window), mBackground(window)

6
es-app/src/views/gamelist/ISimpleGameListView.h
View file

@ -2,10 +2,10 @@
#ifndef ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H
#include "views/gamelist/IGameListView.h"
#include "components/TextComponent.h"
#include "components/ImageComponent.h" #include "components/ImageComponent.h"
#include "components/TextComponent.h"
#include "views/gamelist/IGameListView.h"
#include <stack>
class ISimpleGameListView : public IGameListView class ISimpleGameListView : public IGameListView
{ {

11
es-app/src/views/gamelist/VideoGameListView.cpp
View file

@ -1,14 +1,15 @@
#include "views/gamelist/VideoGameListView.h" #include "views/gamelist/VideoGameListView.h"
#include "views/ViewController.h"
#include "Window.h"
#include "animations/LambdaAnimation.h" #include "animations/LambdaAnimation.h"
#include <sys/stat.h>
#include <fcntl.h>
#ifdef _RPI_ #ifdef _RPI_
#include "components/VideoPlayerComponent.h" #include "components/VideoPlayerComponent.h"
#include "Settings.h"
#endif #endif
#include "components/VideoVlcComponent.h" #include "components/VideoVlcComponent.h"
#include "views/ViewController.h"
#ifdef _RPI_
#include "Settings.h"
#endif
#include <boost/filesystem/operations.hpp>
VideoGameListView::VideoGameListView(Window* window, FileData* root) : VideoGameListView::VideoGameListView(Window* window, FileData* root) :
BasicGameListView(window, root), BasicGameListView(window, root),

9
es-app/src/views/gamelist/VideoGameListView.h
View file

@ -2,11 +2,12 @@
#ifndef ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H #ifndef ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H
#define ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H #define ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H
#include "views/gamelist/BasicGameListView.h"
#include "components/ScrollableContainer.h"
#include "components/RatingComponent.h"
#include "components/DateTimeComponent.h" #include "components/DateTimeComponent.h"
#include "components/VideoComponent.h" #include "components/RatingComponent.h"
#include "components/ScrollableContainer.h"
#include "views/gamelist/BasicGameListView.h"
class VideoComponent;
class VideoGameListView : public BasicGameListView class VideoGameListView : public BasicGameListView
{ {

2
es-core/src/AsyncHandle.h
View file

@ -2,6 +2,8 @@
#ifndef ES_CORE_ASYNC_HANDLE_H #ifndef ES_CORE_ASYNC_HANDLE_H
#define ES_CORE_ASYNC_HANDLE_H #define ES_CORE_ASYNC_HANDLE_H
#include <string>
enum AsyncHandleStatus enum AsyncHandleStatus
{ {
ASYNC_IN_PROGRESS, ASYNC_IN_PROGRESS,

5
es-core/src/AudioManager.cpp
View file

@ -1,8 +1,9 @@
#include "AudioManager.h" #include "AudioManager.h"
#include "Settings.h"
#include <SDL.h>
#include "Log.h" #include "Log.h"
#include "Settings.h"
#include "Sound.h"
#include <SDL.h>
std::vector<std::shared_ptr<Sound>> AudioManager::sSoundVector; std::vector<std::shared_ptr<Sound>> AudioManager::sSoundVector;
SDL_AudioSpec AudioManager::sAudioFormat; SDL_AudioSpec AudioManager::sAudioFormat;

8
es-core/src/AudioManager.h
View file

@ -2,13 +2,11 @@
#ifndef ES_CORE_AUDIO_MANAGER_H #ifndef ES_CORE_AUDIO_MANAGER_H
#define ES_CORE_AUDIO_MANAGER_H #define ES_CORE_AUDIO_MANAGER_H
#include <vector> #include <SDL_audio.h>
#include <memory> #include <memory>
#include <vector>
#include "SDL_audio.h" class Sound;
#include "Sound.h"
class AudioManager class AudioManager
{ {

6
es-core/src/GuiComponent.cpp
View file

@ -1,9 +1,11 @@
#include "GuiComponent.h" #include "GuiComponent.h"
#include "Window.h"
#include "animations/Animation.h"
#include "animations/AnimationController.h"
#include "Log.h" #include "Log.h"
#include "Renderer.h" #include "Renderer.h"
#include "animations/AnimationController.h"
#include "ThemeData.h" #include "ThemeData.h"
#include "Window.h"
GuiComponent::GuiComponent(Window* window) : mWindow(window), mParent(NULL), mOpacity(255), GuiComponent::GuiComponent(Window* window) : mWindow(window), mParent(NULL), mOpacity(255),
mPosition(Vector3f::Zero()), mOrigin(Vector2f::Zero()), mRotationOrigin(0.5, 0.5), mPosition(Vector3f::Zero()), mOrigin(Vector2f::Zero()), mRotationOrigin(0.5, 0.5),

17
es-core/src/GuiComponent.h
View file

@ -2,20 +2,19 @@
#ifndef ES_CORE_GUI_COMPONENT_H #ifndef ES_CORE_GUI_COMPONENT_H
#define ES_CORE_GUI_COMPONENT_H #define ES_CORE_GUI_COMPONENT_H
#include "InputConfig.h"
#include <memory>
#include <string>
#include <functional>
#include "HelpStyle.h"
#include "math/Transform4x4f.h" #include "math/Transform4x4f.h"
#include "HelpPrompt.h"
#include "HelpStyle.h"
#include "InputConfig.h"
#include <functional>
#include <memory>
class Window;
class Animation; class Animation;
class AnimationController; class AnimationController;
class ThemeData;
class Font; class Font;
class InputConfig;
typedef std::pair<std::string, std::string> HelpPrompt; class ThemeData;
class Window;
class GuiComponent class GuiComponent
{ {

9
es-core/src/HelpPrompt.h Normal file
View file

@ -0,0 +1,9 @@
#pragma once
#ifndef ES_CORE_HELP_PROMPT_H
#define ES_CORE_HELP_PROMPT_H
#include <string>
typedef std::pair<std::string, std::string> HelpPrompt;
#endif // ES_CORE_HELP_PROMPT_H

4
es-core/src/HelpStyle.cpp
View file

@ -1,7 +1,7 @@
#include "HelpStyle.h" #include "HelpStyle.h"
#include "ThemeData.h"
#include "Renderer.h"
#include "resources/Font.h" #include "resources/Font.h"
#include "Renderer.h"
HelpStyle::HelpStyle() HelpStyle::HelpStyle()
{ {

2
es-core/src/HelpStyle.h
View file

@ -6,8 +6,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
class ThemeData;
class Font; class Font;
class ThemeData;
struct HelpStyle struct HelpStyle
{ {

4
es-core/src/HttpReq.cpp
View file

@ -1,7 +1,7 @@
#include <iostream>
#include "HttpReq.h" #include "HttpReq.h"
#include "Log.h" #include "Log.h"
#include <boost/filesystem.hpp> #include <boost/filesystem/operations.hpp>
CURLM* HttpReq::s_multi_handle = curl_multi_init(); CURLM* HttpReq::s_multi_handle = curl_multi_init();

2
es-core/src/HttpReq.h
View file

@ -3,8 +3,8 @@
#define ES_CORE_HTTP_REQ_H #define ES_CORE_HTTP_REQ_H
#include <curl/curl.h> #include <curl/curl.h>
#include <sstream>
#include <map> #include <map>
#include <sstream>
/* Usage: /* Usage:
* HttpReq myRequest("www.google.com", "/index.html"); * HttpReq myRequest("www.google.com", "/index.html");

5
es-core/src/ImageIO.cpp
View file

@ -1,9 +1,8 @@
#include "ImageIO.h" #include "ImageIO.h"
#include <memory.h>
#include "Log.h" #include "Log.h"
#include <FreeImage.h>
#include <string.h>
std::vector<unsigned char> ImageIO::loadFromMemoryRGBA32(const unsigned char * data, const size_t size, size_t & width, size_t & height) std::vector<unsigned char> ImageIO::loadFromMemoryRGBA32(const unsigned char * data, const size_t size, size_t & width, size_t & height)
{ {

2
es-core/src/ImageIO.h
View file

@ -2,8 +2,8 @@
#ifndef ES_CORE_IMAGE_IO #ifndef ES_CORE_IMAGE_IO
#define ES_CORE_IMAGE_IO #define ES_CORE_IMAGE_IO
#include <stdlib.h>
#include <vector> #include <vector>
#include <FreeImage.h>
class ImageIO class ImageIO
{ {

6
es-core/src/InputConfig.cpp
View file

@ -1,10 +1,6 @@
#include "InputConfig.h" #include "InputConfig.h"
#include <string>
#include <algorithm>
#include <SDL.h>
#include <iostream>
#include "Log.h" #include "Log.h"
#include "InputManager.h"
//some util functions //some util functions
std::string inputTypeToString(InputType type) std::string inputTypeToString(InputType type)

8
es-core/src/InputConfig.h
View file

@ -2,12 +2,12 @@
#ifndef ES_CORE_INPUT_CONFIG_H #ifndef ES_CORE_INPUT_CONFIG_H
#define ES_CORE_INPUT_CONFIG_H #define ES_CORE_INPUT_CONFIG_H
#include <pugixml/src/pugixml.hpp>
#include <SDL_joystick.h>
#include <SDL_keyboard.h>
#include <map> #include <map>
#include <vector>
#include <string>
#include <SDL.h>
#include <sstream> #include <sstream>
#include "pugixml/src/pugixml.hpp" #include <vector>
#define DEVICE_KEYBOARD -1 #define DEVICE_KEYBOARD -1

10
es-core/src/InputManager.cpp
View file

@ -1,11 +1,11 @@
#include "InputManager.h" #include "InputManager.h"
#include "InputConfig.h"
#include "Settings.h"
#include "Window.h"
#include "Log.h" #include "Log.h"
#include "pugixml/src/pugixml.hpp"
#include <boost/filesystem.hpp>
#include "platform.h" #include "platform.h"
#include "Window.h"
#include <boost/filesystem/operations.hpp>
#include <SDL.h>
#include <iostream>
#define KEYBOARD_GUID_STRING "-1" #define KEYBOARD_GUID_STRING "-1"

5
es-core/src/InputManager.h
View file

@ -2,13 +2,12 @@
#ifndef ES_CORE_INPUT_MANAGER_H #ifndef ES_CORE_INPUT_MANAGER_H
#define ES_CORE_INPUT_MANAGER_H #define ES_CORE_INPUT_MANAGER_H
#include <SDL.h> #include <SDL_joystick.h>
#include <vector>
#include <map> #include <map>
#include <string>
class InputConfig; class InputConfig;
class Window; class Window;
union SDL_Event;
//you should only ever instantiate one of these, by the way //you should only ever instantiate one of these, by the way
class InputManager class InputManager

6
es-core/src/Log.cpp
View file

@ -1,9 +1,7 @@
#include "Log.h" #include "Log.h"
#include <stdio.h>
#include <stdlib.h>
#include <iostream>
#include <stdio.h>
#include "platform.h" #include "platform.h"
#include <iostream>
LogLevel Log::reportingLevel = LogInfo; LogLevel Log::reportingLevel = LogInfo;
FILE* Log::file = NULL; //fopen(getLogPath().c_str(), "w"); FILE* Log::file = NULL; //fopen(getLogPath().c_str(), "w");

6
es-core/src/Log.h
View file

@ -2,14 +2,12 @@
#ifndef ES_CORE_LOG_H #ifndef ES_CORE_LOG_H
#define ES_CORE_LOG_H #define ES_CORE_LOG_H
#include <sstream>
#define LOG(level) \ #define LOG(level) \
if(level > Log::getReportingLevel()) ; \ if(level > Log::getReportingLevel()) ; \
else Log().get(level) else Log().get(level)
#include <string>
#include <sstream>
#include <iostream>
enum LogLevel { LogError, LogWarning, LogInfo, LogDebug }; enum LogLevel { LogError, LogWarning, LogInfo, LogDebug };
class Log class Log

2
es-core/src/PowerSaver.cpp
View file

@ -1,7 +1,7 @@
#include "PowerSaver.h" #include "PowerSaver.h"
#include "AudioManager.h" #include "AudioManager.h"
#include "Settings.h" #include "Settings.h"
#include <string.h>
bool PowerSaver::mState = false; bool PowerSaver::mState = false;
bool PowerSaver::mRunningScreenSaver = false; bool PowerSaver::mRunningScreenSaver = false;

8
es-core/src/Renderer.h
View file

@ -2,15 +2,13 @@
#ifndef ES_CORE_RENDERER_H #ifndef ES_CORE_RENDERER_H
#define ES_CORE_RENDERER_H #define ES_CORE_RENDERER_H
#include <vector> #include "math/Vector2i.h"
#include <string>
#include "platform.h" #include "platform.h"
#include GLHEADER #include GLHEADER
#include "math/Transform4x4f.h"
#include "math/Vector2i.h"
class GuiComponent;
class Font; class Font;
class GuiComponent;
class Transform4x4f;
//The Renderer provides several higher-level functions for drawing (rectangles, text, etc.). //The Renderer provides several higher-level functions for drawing (rectangles, text, etc.).
//Renderer_draw_gl.cpp has most of the higher-level functions and wrappers. //Renderer_draw_gl.cpp has most of the higher-level functions and wrappers.

8
es-core/src/Renderer_draw_gl.cpp
View file

@ -1,12 +1,8 @@
#include "platform.h"
#include "Renderer.h" #include "Renderer.h"
#include GLHEADER
#include <iostream>
#include "resources/Font.h"
#include <boost/filesystem.hpp>
#include "Log.h" #include "Log.h"
#include <math.h>
#include <stack> #include <stack>
#include "Util.h"
namespace Renderer { namespace Renderer {
struct ClipRect { struct ClipRect {

11
es-core/src/Renderer_init_sdlgl.cpp
View file

@ -1,13 +1,10 @@
#include "Renderer.h" #include "Renderer.h"
#include <iostream>
#include "platform.h"
#include GLHEADER
#include "resources/Font.h"
#include <SDL.h>
#include "Log.h"
#include "ImageIO.h"
#include "../data/Resources.h" #include "../data/Resources.h"
#include "ImageIO.h"
#include "Log.h"
#include "Settings.h" #include "Settings.h"
#include <SDL.h>
#ifdef USE_OPENGL_ES #ifdef USE_OPENGL_ES
#define glOrtho glOrthof #define glOrtho glOrthof

7
es-core/src/Settings.cpp
View file

@ -1,9 +1,10 @@
#include "Settings.h" #include "Settings.h"
#include "Log.h" #include "Log.h"
#include "pugixml/src/pugixml.hpp"
#include "platform.h" #include "platform.h"
#include <boost/filesystem.hpp> #include <boost/assign/list_of.hpp>
#include <boost/assign.hpp> #include <boost/filesystem/operations.hpp>
#include <pugixml/src/pugixml.hpp>
Settings* Settings::sInstance = NULL; Settings* Settings::sInstance = NULL;

Some files were not shown because too many files have changed in this diff Show more