Commit graph

254 commits

Author SHA1 Message Date
Bim Overbohm edc26aa4e1 Add Volume control in Windows and Linux
Add volume control int Windows through the mixer API (until XP) and the
EndpointVolume API (Vista and above). Add volume control in Linux
through ALSA.
Convert AudioManager to use shared_ptrs.
2013-05-22 19:11:10 +02:00
Aloshi 12b4b12103 Added comment to src/ImageIO.h 2013-05-22 11:30:14 -05:00
Bim Overbohm a1cb5bdda1 Fix sounds not playing after launching a game
Correctly re-initialize SDL_Audio after launching a game.
2013-05-21 10:40:01 +02:00
Aloshi eaf157a330 Merge branch 'master' into unstable 2013-05-20 11:51:50 -05:00
Aloshi f3229f111c Fix for audio not reinitializing on restart. 2013-05-20 10:57:04 -05:00
Aloshi 79b7ab10b1 Merge https://github.com/HorstBaerbel/EmulationStation into unstable
Conflicts:
	src/platform.cpp
2013-05-17 10:05:05 -05:00
Bim Overbohm 86f68f29f9 Revert "Improve CMake script for Windows builds"
This reverts commit e92a68fb46.
2013-05-17 11:55:50 +02:00
Bim Overbohm e92a68fb46 Improve CMake script for Windows builds
Enable multi-processor compilation in Visual Studio / NMake. Disable
console in release builds (broken in CMake atm, you have to set linker
/SUBSYSTEM:WINDOWS manually).
2013-05-17 11:43:50 +02:00
Aloshi c5e91da629 Fixed Raspberry Pi Makefile.
Fixed a reorder warning in InputManager.cpp.
2013-05-16 19:13:49 -05:00
Bim Overbohm 802aa50ad9 Fix compile errors on Ubuntu 2013-05-16 23:25:54 +02:00
Aloshi cd76e2a654 Added ability to skip all inputs beyond menu by pressing Accept. 2013-05-16 14:39:40 -05:00
Bim Overbohm 4b4c891b30 Find proper home path
Should work on more systems now.
2013-05-16 21:29:41 +02:00
Bim Overbohm 42829b3b6d Add version information, add window and file icon
Version information nowe resides in EmulationStation.h and is compiled
into the EXE on Windows. An icon file is also included and on
non-Windows systems the window icon is loaded from PNG data compiled
into the EXE and set via SDL_WM_SetIcon().
2013-05-16 21:26:19 +02:00
Aloshi ec48c5d3a4 Fixed a crash with empty path names in theme box definitions. 2013-05-16 13:27:19 -05:00
Aloshi 0f6338045a Added Windows compiled files to .gitignore.
Added "WIN32" preprocessor definition to the default VS2010 project.
Replaced getHomePath() with the one mentioned in the pull request comments.
2013-05-16 12:43:16 -05:00
Bim Overbohm 517ccbefb5 Fix that Sounds can't restart
Sounds now restart when e.g. scrolling up/down repeatedly.
2013-05-15 10:12:51 +02:00
Bim Overbohm a2c990bd26 Fix compile errors on Rasbian
Add proper EGL/GLES libraries. Change glVertexPointer() call, because
GLES only can use GL_BYTE, GL_SHORT, GL_FIXED and GL_FLOAT...
2013-05-15 09:50:59 +02:00
Bim Overbohm 1f91fe6cdf Fix compile errors on Ubuntu
Set the GCC compiler flags properly. Add missing include.
2013-05-15 09:40:16 +02:00
Bim Overbohm 288eb3c1b2 Update platform file to fit to CMakeLists
The #defines "USE_OPENGL_ES" and "USE_OPENGL_DESKTOP" to control GLES
vs. Desktop OpenGL usage. The #define _RPI_ is used solely on Raspberry
Pi now.
2013-05-14 22:07:19 +02:00
Bim Overbohm 2e09563544 Make GLES renderer work on other systems than RPI
The #define _RPI_ now does special stuff when setting up a GLES context
on the Raspberry Pi. This should hopefully make the code work on other
systems too.
2013-05-14 21:58:54 +02:00
Bim Overbohm acba3bd258 Remove .cpp #includes
It is cleaner to not do that and just include the proper file in the
build files if needed.
2013-05-14 21:54:47 +02:00
Bim Overbohm e8472581fa Minor cleanup
Move member initialization to initializer list. Add iostream to logger
for convenience.
2013-05-14 21:45:56 +02:00
Bim Overbohm af9b9f732f Remove the need for SDL_mixer
SDL_mixer is not in the standard SDL distribution. The mixing is now
done using regular SDL_Audio functions. AudioManager is converted to a
singleton and std::shared_ptrs are used for all Sound objects. Note that
for GCC "-std=c++11" might need to be added to the CMAKE_CXX_FLAGS.
2013-05-14 21:31:39 +02:00
Bim Overbohm a1353def89 Find proper font path in Windows
Build a font path boost can find. The font should be adjusted to
something that actually resembles DejaVuSerif...
2013-05-14 21:01:08 +02:00
Aloshi 54dfe2f24a Quick fix for Linux 2013-05-13 15:06:18 -05:00
Aloshi ffe573d1d6 Ported to Windows.
Added --windowed for desktop builds.
2013-05-13 14:53:28 -05:00
Aloshi 149c1bcbdd More descriptive names for inputs 2013-04-18 16:44:43 -05:00
Aloshi a119997ec7 Added page up/page down to the Input Config screen.
Updated the README.
2013-04-13 18:10:23 -05:00
Aloshi 608545118a Hopefully fixed infinite recursion. 2013-04-13 17:30:57 -05:00
Aloshi 4a05288e71 Started fix for infinite recursion in directory trees. 2013-04-13 16:33:18 -05:00
Aloshi 1e2cc1eb0a Moved an Error to a Warning. 2013-04-13 13:52:32 -05:00
Aloshi c6a7f8abf9 Fixed InputManager's handling of controllers with duplicate names.
Added emergency keyboard config if no players can be loaded.
Switched some console output to log output.
2013-04-13 13:19:06 -05:00
Aloshi 1007821ca3 Add device name to input config files.
Properly init/deinit renderer stuff in Renderer_init_rpi.cpp. Probably.
2013-04-11 21:59:19 -05:00
Aloshi a5f4749d5d Added InputConfig saving/loading. 2013-04-11 17:27:27 -05:00
Aloshi 14a05d4943 Init/deinit theme-declared fonts. 2013-04-11 16:33:12 -05:00
Aloshi b01f2705de More work on reinitialization. Fonts still not working. 2013-04-10 12:29:07 -05:00
Aloshi 05c258f515 Functionality seems to have been restored at last. 2013-04-09 13:13:47 -05:00
Aloshi 4747d70e1f More work. 2013-04-08 12:40:15 -05:00
Aloshi 04841ca436 More work.
I really am nuts.
2013-04-08 11:52:40 -05:00
Aloshi 4a35c34dc0 Began refactoring away the GuiComponent system in favor of ES-config's Gui system.
Man, I'm nuts.
2013-04-08 09:41:25 -05:00
Aloshi 3e6adf7be4 Backported InputConfig. 2013-04-08 09:28:28 -05:00
Aloshi 47dfe5d5fb Quick fix for the joystick event state with GuiInputConfig. 2013-03-28 21:57:01 -05:00
Aloshi e088fb9c35 Hopefully fixed issue #57. 2013-03-28 21:55:29 -05:00
Aloshi dc50170370 Hopefully fixed waking up from sleep with axes. 2013-03-25 08:16:54 -05:00
Aloshi 0d7ac5a10a Added sleep mode/dimming. Use --dimtime [seconds] to change behavior. Default is 30, use 0 for never. 2013-03-19 09:29:44 -05:00
Aloshi 34c3d607b5 Added fast select font tag. 2013-03-17 12:16:40 -05:00
Aloshi f336eece75 Added "Reload" menu option.
As usual, it's undertested, please report any problems.
2013-01-26 11:47:43 -06:00
Aloshi 9a27a868bb Fixed selected text color changes only applying to centered lists. 2013-01-08 23:01:52 -06:00
Aloshi 016df5864f Fixed game list rendering one entry short. 2013-01-08 11:34:17 -06:00
Aloshi 3d17f30f5b Changed OpenGL min texture filter to Linear for GuiImage. 2013-01-08 11:19:38 -06:00
Aloshi 8fc2b8377a Made the list selected color have no effect if zero. 2013-01-08 09:23:28 -06:00
Aloshi 9da01403a0 Fixed crash when the ~/.emulationstation folder does not exist. 2013-01-07 20:24:59 -06:00
Aloshi e59c430b89 Added <basicTheme> support. 2013-01-06 14:33:50 -06:00
Aloshi 2efca58869 Added a logging system to ES.
You should no longer see non-error output with ES except for "cleanly shutting down".
The new log file is located in ~/.emulationstation/es_log.txt.
If you notice any performance degredation, please tell me!
2013-01-04 17:31:51 -06:00
Aloshi cadc9a9ec6 Added Gentoo's directory for DejaVu Serif, /usr/share/fonts/dejavu/DejaVuSerif.ttf, to the list of fonts to try. 2012-12-30 10:40:07 -06:00
Aloshi d0cea1b8e7 Added --debug switch.
You no longer need a keyboard to save input configuration; that was stupid anyway. You should be able to set up ES without a keyboard now!
2012-12-20 12:29:05 -06:00
Aloshi af36932f30 Added --no-exit switch.
This switch will keep ES from displaying the "Exit" option in the menu.
2012-12-18 09:20:13 -06:00
Aloshi 529c3a24c7 Updated README.md/THEMES.md for twolife's changes.
DESCNAME is a new, optional tag.
You can now use ~/.emulationstation/SYSTEMNAME/ for theme and gamelist files!
2012-12-18 09:08:25 -06:00
Sébastien NOEL 3da7a0dd14 Add a new directory for gamelist.xml & theme.xml for each system 2012-12-17 20:29:43 +01:00
Aloshi 12a0843045 Added %BASENAME% tag. 2012-12-14 14:42:11 -06:00
Aloshi 3acbd0af9c Fixed a crash when opening the start menu.
Fixed PAGEDOWN/PAGEUP not appearing in the input config GUI.
Fixed PAGEDOWN/PAGEUP not properly updating detail data.
2012-12-08 12:55:54 -06:00
Aloshi 8a3eefcffc Merge pull request #34 from invisiblek/master
Add left and right brackets as PAGEUP and PAGEDOWN keys
2012-11-30 20:56:40 -08:00
invisiblek 667f5424cb Add left and right brackets as PAGEUP and PAGEDOWN keys
Some devices, such as an IPAC are hard to program for PGUP and PGDOWN.
This makes it much easier and they are two keys that usually won't get
used for anything.
2012-11-30 21:06:06 -06:00
Aloshi 807c4b2f5b Added Arch Linux's path for the Deja Vu Seriff font to the list of default fonts. 2012-11-19 19:57:34 -06:00
Aloshi 989ba9a8f9 Heavily refactored how theming data is accessed. 2012-11-17 12:39:49 -06:00
Aloshi 6e31f17c3b Fixed the default game image size to properly fit within the info column. 2012-11-17 11:29:20 -06:00
Aloshi 4bbec51a6f Added Exit command to the menu. 2012-11-14 09:07:09 -06:00
Aloshi 38bbbb3fb7 Moved PAGEUP/PAGEDOWN configuration to the end of the enums to preserve backwards compatibility with older es_input.cfgs. 2012-11-12 09:27:07 -06:00
Aloshi ae4498f5f4 Merge branch 'master' of https://github.com/Aloshi/EmulationStation 2012-11-12 09:21:57 -06:00
Aloshi 3e522998ce Removed LinLibertine font, instead opting for a system default. 2012-11-12 09:21:35 -06:00
invisiblek 8cf16af40b Add support for PAGEUP and PAGEDOWN
Also add functions to move 10 lines on these keystrokes
2012-11-12 02:06:33 +00:00
Aloshi fe030fb6c7 Added custom font support.
Check out THEMES.md for more information.
2012-10-31 09:46:06 -05:00
Aloshi 3ebb819a7c Fixed up some things that were causing compiler warnings. 2012-10-28 18:07:05 -05:00
Aloshi 35d8afc174 Hopefully fixed the black screen bug with certain emulators. 2012-10-26 15:28:15 -05:00
Aloshi bd41892cfd Fixed a crash bug related to sounds.
unloadFonts() is no longer called during re-initialization.
2012-10-25 18:23:26 -05:00
Aloshi 5b0166d294 Fixed an issue with skipping joystick input.
Fixed the selected text color in the restart/shutdown menu.
Updated README.md.
2012-10-25 13:03:35 -05:00
Aloshi 77e14423b9 Added the gameImageNotFound tag. See THEMES.md for details. 2012-10-25 12:36:30 -05:00
Aloshi aa6506aec1 Began paving the way for custom font support.
Font sizes might be a little different than they were before - sorry about that!
2012-10-24 10:28:37 -05:00
Aloshi 8b242a0532 Fixed listSelectorColor's alpha not working properly. 2012-10-17 13:32:01 -05:00
Aloshi 8b1e061929 Reworked opacity to be stored in that wasted color byte. 2012-10-17 13:21:56 -05:00
Aloshi 358658a36d Initial GuiAnimation added. 2012-10-17 12:15:58 -05:00
Aloshi c2b970f2cf Fixed game list continuing to scroll after you open a menu or start a game. 2012-10-14 12:49:57 -05:00
Aloshi 03995a66bb Fixed theming for game image dimensions. 2012-10-13 18:51:35 -05:00
Aloshi 8120fcb54d The game list can no longer be left-aligned unless the detailed view is active. 2012-10-13 18:40:44 -05:00
Aloshi 61c9b10abd New game image theming tags! See THEMES.md for details.
Also, some minor fixes all around (game descriptions no longer appear while scrolling, woo!).
2012-10-13 18:37:51 -05:00
Aloshi 65701c58c1 Added some more menu sound theming tags.
Menu scroll sound now also applies to the fast select menu.
2012-10-13 15:05:43 -05:00
Aloshi 7f50376fd0 Added SDL_INIT_AUDIO flag to SDL initialization. 2012-10-13 13:35:13 -05:00
Aloshi ea1a3117a5 Added menu sounds. See THENMES.md for more details. 2012-10-13 13:29:53 -05:00
Aloshi 20aa6d2a6e Updated THEMES.md to reflect tiling changes. 2012-10-10 10:26:14 -05:00
Aloshi 640c3b52bc Redid tiling!
Now faster (always uses 6 verticies thanks to wrapped textures) and precise (properly cuts off).
2012-10-10 10:21:03 -05:00
Aloshi b6264f4858 Fixed GuiBox/GuiFastSelect render order. 2012-10-10 08:56:34 -05:00
Aloshi b6afbd8c09 Fixed GuiBox's background being positioned wrong. 2012-10-10 08:54:39 -05:00
Aloshi 6de46003d9 Added theming tag for the Fast Select box's text color. 2012-10-10 08:51:48 -05:00
Aloshi 9b3589a22f Added theme tags for the Fast Select GuiBox.
See THEMES.md for more detail.
2012-10-07 17:59:20 -05:00
Aloshi 57461ba676 More progress with GuiBox. 2012-10-07 17:25:51 -05:00
Aloshi 41f164e53b Further work on GuiBox. 2012-10-07 16:56:33 -05:00
Aloshi 62336ab2fb Fixed a long-standing bug with detailed GuiGameList detection after mapping input. 2012-10-05 15:18:36 -05:00
Aloshi aea93748d5 Began working on GuiBox for theming of boxes (a revolutionary concept). 2012-10-05 15:04:12 -05:00
Aloshi a3c128f4ce GuiFastSelect is working.
Should be able to map a joystick input to Fast Select too, but untested.
2012-10-05 08:44:18 -05:00
Aloshi 31aebf3a7d Added <listSelectedColor> tag.
Began implementing GuiFastSelect. You can see what's currently in place by holding F2 and pressing up/down.
Hopefully fixed nearest neighbor filters with GuiImage.
2012-09-30 22:29:55 -05:00
Aloshi e08391080b SDL is now fully shut down with the RPi renderer. 2012-09-29 13:14:31 -05:00
Aloshi 7e6498df60 Fixed a crash bug with launch commands missing %ROM%.
Added relative path operator (".") support for gamelist.xml, in both game paths and image paths.
2012-09-23 16:01:56 -05:00
Aloshi 0468e64396 Fixed a bug with skipping over unicode characters. 2012-09-16 14:18:11 -05:00
Aloshi 9901a07fb6 Added some new theming tags.
See changelog.txt (September 15) for more details.
2012-09-15 16:24:33 -05:00
Aloshi f87b6c48d7 Added joystick identification support for those who have multiple joysticks.
If you'd like to use this, please remove ~/.emulationstation/es_input.cfg and reconfigure.
2012-09-14 13:22:01 -05:00
Aloshi 7795dd729d Added missing new files to the repo. 2012-09-10 13:48:00 -05:00
Aloshi e17499c9b3 Fixed multiple file extensions breaking stuff.
Added Makefile.x86 for building on a desktop (use SDL to acquire an OpenGL rendering context).
2012-09-10 13:10:59 -05:00
Aloshi 5786ecae7c Added support for lists of file extensions, delimited by a space. 2012-09-08 13:17:36 -05:00
Aloshi e479746bcb Fixed --help command doing terrible things. 2012-09-07 16:53:27 -05:00
Aloshi 80740a2bd0 Fixed tiling being super slow.
See changelog.txt (September 7) for a list of everything.
2012-09-07 16:44:07 -05:00
Aloshi cac43474aa Fixed reinitialization problems with the renderer. 2012-09-04 11:45:16 -05:00
Aloshi 07d8046a3e Images are almost fully reimplemented.
Font sizing is pretty much fixed.
Just need to re-initialize textures with the renderer.
2012-08-29 16:52:25 -05:00
Aloshi cdb63c4a4f Image loading working.
Still doesn't resize, tile, or render with alpha (though it loads it).
2012-08-29 14:22:05 -05:00
Aloshi 0314a14849 New renderer starting to work.
Image loading still not working and font sizing is still off. Resolution is hardcoded.
2012-08-29 13:53:53 -05:00
Aloshi bff542f076 Menu is now gray instead of pink. 2012-08-16 10:26:36 -05:00
Aloshi 67e657391a Fixed positioning on game images with the new 50/50 split.
Game images and descriptions are no longer displayed while scrolling - this should provide a better framerate for nicer scrolling.
2012-08-16 10:23:23 -05:00
Aloshi 7b1c4374ae Hopefully fixed hex colors being backwards, though in a pretty hacky way. 2012-08-15 06:05:34 -05:00
Aloshi 7b97a464c3 Hopefully fixed <origin> tag. In particular, it's now a float instead of an int (as it should've been!). 2012-08-15 01:18:06 -05:00
Aloshi e42568bc55 Removed framerate display. 2012-08-13 20:42:19 -05:00
Aloshi 114f0cf915 Fixed game description wrap length not using GuiGameList::sInfoWidth. 2012-08-13 20:34:23 -05:00
Aloshi 06dd1a9f60 Bug fixes and a few minor requested changes.
See changelog.txt (August 13, part 2) for specifics.
2012-08-13 20:27:39 -05:00
root d842d67557 Tons of new theming features!
Check out THEMES.md for more info.
2012-08-13 13:32:53 -05:00
Aloshi c7349cd99a Themes can now be used without the detailed GuiGameList.
If a theme.xml is not found in a system's directory, ES will now check for $HOME/.emulationstation/es_theme.xml. If present, it will load that.
Fixed GuiGameList image data not updating on system change/initial startup. (finally!)
2012-08-12 09:43:09 -05:00
Aloshi 878b384b02 Themes now load from system directories.
~ and . are now expanded in theme image paths.
Theme percentages should now work properly.
See changelog (August 10) for more.
2012-08-11 15:54:21 -05:00
Aloshi 2bd9c51447 Added check to make sure file names aren't empty. 2012-08-10 20:29:51 -05:00
Aloshi 5ae029cd89 Added initial theme support. More work on this to come.
Sped up image rendering a bit.
Added a framerate display - uncomment the #define DRAWFRAMERATE line in GuiGameList.cpp to see it.
2012-08-10 14:28:34 -05:00
Aloshi 2a0c338cdf Removed multithreaded image loader. 2012-08-09 21:17:48 -05:00
Aloshi 9c86241cf8 Simple resizing for GuiImages using SDL_gfx.
Added multithreaded image loading for the GuiImage class.
2012-08-09 16:19:07 -05:00
Aloshi 6cfe83e8fe Better gamelist.xml support. See changelog.txt (August 7) for more details. 2012-08-07 19:50:45 -05:00
root 284a7a5dc6 Sorted list after gamelist.xml is parsed. Added restart to GuiMenu. 2012-08-04 16:38:37 -05:00
Aloshi cd4ebeafa2 Finally made GuiList a template. 2012-08-01 23:50:18 -05:00
Aloshi eaf7df7ad5 Moved configuration files to $HOME/.emulationstation/
Folders should now be sorted alphabetically.
Will now fall back to a system font if LinLibertine.ttf is not found.
Added a Menu button.
Began working on a simple menu.
2012-08-01 23:03:15 -05:00
Aloshi b56094fe3d If LinLibertine.ttf can't be found, fall back to a system font. 2012-08-01 21:37:07 -05:00
Aloshi 4f99dec7c2 Font size is now dependent on resolution width.
Scrolling will now occur if the input is held (not just keyboards anymore!).
Initial XML gamelist support. If a file named gamelist.xml is present in the directory ES is run from, it will be parsed and the detailed GuiGameList will be used. Games are matched by absolute path, and a name, description, and image path can be read.
PugiXML is used for parsing XML files - its license can be found in src/pugiXML/pugiXML_license.txt.
SDL_image is used for loading screenshots with the detailed GuiGameList.
Almost all invalid bash characters should be escaped in ROM paths now - including !$^&*()[]<>?;'"\.
2012-08-01 20:43:55 -05:00
Aloshi fbfa0d436c Resolution now uses whatever the system was before.
A custom resolution can be used with the -w and -h switches.
For the old resolution, use "emulationstation -w 1024 -h 768".
2012-07-27 17:35:45 -05:00
Aloshi d736aba22c Now with folders! Folders will appear as a green entry in the games list. BUTTON2 can be used to 'go back.' If you're updating, you'll need to delete ~/.es_input.cfg to map BUTTON2. 2012-07-27 11:58:27 -05:00
Aloshi 77f82134bb Updated the README, and removed a hat debug message. 2012-07-23 21:15:09 -05:00
Aloshi 3b44f51a9b Fixed hats. 2012-07-23 21:10:05 -05:00
Aloshi b2d59d93e3 Added error if $HOME/.es_systems.cfg exists, but contains no systems. 2012-07-23 18:57:07 -05:00
Aloshi 6c5edd3284 Lots of cleaning up to improve user friendliness. Config files are now loaded from the $HOME variable - es_systems.cfg and es_input.cfg.
An example system config file will be created at runtime if one does not exist.
2012-07-23 18:53:33 -05:00
Aloshi 21bd83d5b2 Removed some fake testing files. Now only initialize SDL's video and joystick systems - this avoids audio conflicts with RetroArch. 2012-07-23 16:47:30 -05:00
Aloshi 59ca4f301a Axis support at last! 2012-07-23 12:27:38 -05:00
Aloshi 646cda75a6 Added joystick hat support. Began work on axis support (config should accept axes now, but my controller seems to be breaking). 2012-07-22 17:03:54 -05:00
Aloshi b3fb58ebdb An input configuration GUI was added, which allows a user to map an SDL Joystick's buttons to InputManager buttons.
This config file is saved/loaded from ./input.cfg.
Coming soon - axis support!
2012-07-22 16:15:55 -05:00
Aloshi ac0407c059 Increased resolution to 1024x768. 2012-07-21 16:02:37 -05:00
Aloshi f368a1f4cd Browsing multiple systems is now possible! Just press left or right.
Also, config files can have comments (lines that start wih #).
2012-07-21 15:57:53 -05:00
Aloshi 561e4a7f44 Renderer now uses an int for colors instead of mixing SDL_Color and ints. GuiList now scrolls. 2012-07-21 15:16:07 -05:00
Aloshi a801ad7505 Fix for the "stuck enter key" bug (now SDL's key repeat is disabled on game launch then re-eanbled on termination). 2012-07-21 14:16:53 -05:00
Aloshi bbfe35a36d Systems can be defined in the systems.cfg file (currently in the same directory as the executable). Games can now be launched with the enter key. Progress! 2012-07-21 14:06:24 -05:00
Aloshi 3df40182b1 Now searching a test directory for files matching an extension and displaying them. 2012-07-20 11:14:09 -05:00