Commit Graph
5295 Commits
Author SHA1 Message Date
Tony Puccinelli e8fc5f2070 various manual tweaks to get ds port compiling from branch again after earlier merge from trunk
svn-id: r51398
2010-07-28 00:08:32 +00:00
Torbjörn Andersson bbd3f0dbb3 ALSA: Be more intelligent when picking MIDI port
Often, a client has more than one available port. Pick the first one
that isn't already in use. For instance, on my computer client 17 is
the "Emu10k1 WaveTable", and it has four available ports. If, say,
aplaymidi is already playing on port 17:0, ScummVM will use port 17:1
instead. Otherwise the two programs will mess up each others
instruments and controller settings.

Of course, in reality I doubt that anyone will run two different MIDI
playing applications at once.

svn-id: r51380
2010-07-27 17:18:02 +00:00
Torbjörn Andersson 47f93e9d07 ALSA: Tweak capability and type flags for the MIDI port
This keeps ScummVM's own port from being included in the list of
available MIDI devices.

svn-id: r51378
2010-07-27 16:35:28 +00:00
Johannes Schickel 2db4e71b66 ALSA: Simplify device querying code.
Thanks to eriktorbjorn for some quick testing.

svn-id: r51366
2010-07-27 13:01:10 +00:00
Angus Lees d508ba6766 Remove Android themeengine patch - an improved version is now part of
the main ScummVM codebase thanks to fingolfin :)

svn-id: r51362
2010-07-27 11:16:44 +00:00
Max Horn 691d7cff28 Fix warnings about cast removing constness, and about implict conversion from float to int
svn-id: r51352
2010-07-27 09:34:11 +00:00
Alejandro Marzini 2636ac4f36 OPENGL: Implement aspect ratio support and toggling. Improve fullscreen switching. Fix cursor scaling bug.
Now the hotkey Ctrl-Alt-Enter will switch between all available fullscreen modes. Alt-Enter will only switch to the best mode available, and exit fullscreen mode if already on it.
The different aspect ratios can be switched with Ctrl-Alt-A. The normal mode will stretch the contents to the screen, while other modes will stretch only one dimension to the screen size, and maintain the aspect ratio for the other dimension.

svn-id: r51346
2010-07-27 07:30:56 +00:00
Tony Puccinelli 58f3e81f00 Continued abstraction of generic ELF-loader, splitting off MIPS-processor specific things into their own files and testing on the PS2
svn-id: r51345
2010-07-27 06:27:45 +00:00
Alejandro Marzini 591b371f2b OPENGL: Add shake effect.
svn-id: r51344
2010-07-27 03:16:10 +00:00
Alejandro Marzini 126fe84d3d OPENGL: Fix cursor scaling in overlay.
svn-id: r51339
2010-07-27 00:31:36 +00:00
Alejandro Marzini f7220cfea7 OPENGL: Commenting.
svn-id: r51338
2010-07-27 00:30:37 +00:00
Alejandro Marzini 141e101841 Formatted spaces.
svn-id: r51300
2010-07-26 06:58:33 +00:00
Alejandro Marzini 738a9e78d8 OPENGL: Implement saveScreenshot().
svn-id: r51299
2010-07-26 06:52:58 +00:00
Alejandro Marzini 856c6a18af OPENGL: Add OSD message.
svn-id: r51295
2010-07-26 06:03:55 +00:00
Alejandro Marzini 37cdff9277 OPENGL: Do not allow changing to a not supported scale while on fullscreen.
svn-id: r51292
2010-07-26 04:40:00 +00:00
Alejandro Marzini 19ce960868 OPENGL: Add cursor scaling.
svn-id: r51291
2010-07-26 04:17:37 +00:00
Alejandro Marzini c5037d7c6c OPENGL: Fixed alpha problem with overlay RGBA5551 format.
svn-id: r51290
2010-07-26 02:16:10 +00:00
Tony Puccinelli 4e530debd2 moved flushDataCache function from ds-loader.cpp to elf-loader.cpp and moved arm-relocations from ds-loader.cpp to arm-relocs.cpp; deleted ds-loader.cpp
svn-id: r51289
2010-07-26 00:41:31 +00:00
Tony Puccinelli 95f66e6fb2 changed ds makefile to use abstracted ELF-loader with ds-specific additions added to backends/plugins/ds
svn-id: r51236
2010-07-24 07:14:19 +00:00
Alejandro Marzini b89412d7e4 OPENGL: Redesign blitting system. Add basics for aspect correction.
Removed the extra surface in GLTexture. Now there are copies of the texture data in their original format (so engine can get the original data when lockScreen or grabOverlay is called). This copies will be updated when the engine calls a function that modifies the game screen/overlay, and the textures will be marked as dirty. When updating screen, the textures will be updated from the copies data if they are dirty.

svn-id: r51234
2010-07-24 05:54:51 +00:00
Tony Puccinelli 5d8f4b5062 Finished initial abstraction of ELF-loader (works for DS)
svn-id: r51233
2010-07-24 02:07:35 +00:00
Tony Puccinelli c39ca58683 renamed MIPS loader header to match file naming conventions
svn-id: r51219
2010-07-23 20:01:54 +00:00
Eugene Sandulenko b3f08d183b SDL: Fix bug #3025258
Bug #3025258: "Cursor Leaves Trail in GUI when Screen is Shaking". Based
on patch provided by eriktorbjorn but extended with another edge case.

svn-id: r51212
2010-07-23 16:38:31 +00:00
Willem Jan Palenstijn 7b485a7978 GP2XWIZ: Fix warning
svn-id: r51203
2010-07-23 12:09:54 +00:00
Tony Puccinelli 7694809b3d Began abstraction of generic ELF-loader
svn-id: r51195
2010-07-23 07:49:02 +00:00
Alejandro Marzini bbdb87a831 OPENGL: Add basic game screen drawing. Changed Overlay PixelFormat to RGBA5551.
svn-id: r51193
2010-07-23 06:57:23 +00:00
Tony Puccinelli 90e9282bf1 Added abstracted elf32 header file to plugins directory
svn-id: r51192
2010-07-23 05:15:11 +00:00
Tony Puccinelli 155f45cec1 Added linker flags to ensure R_ARM_TARGET1 is treated as R_ARM_ABS32
svn-id: r51188
2010-07-23 01:05:26 +00:00
Alejandro Marzini ef880dd5da OPENGL: Add antialiasing, hotkey: ctrl+alt+f. Fixed minor bugs.
svn-id: r51146
2010-07-22 15:36:50 +00:00
Tony Puccinelli 8d946ab847 Added code for relocation R_ARM_TARGET1 (untested)
svn-id: r51130
2010-07-22 01:44:45 +00:00
Tony Puccinelli da414e62b8 switched out linker script for plugin linking on ds, added in check for RELA type relocations in ARM loader and coded for REL type relocations (DS now runs many games with Dynamic Plugins enabled)
svn-id: r51083
2010-07-21 08:50:30 +00:00
Torbjörn Andersson 5b3f31feec General: Fixed building the SEQ MIDI driver
An #include was missing, causing the driver to never be built. Also fixed what
looked like a cut-and-paste error in generating the features string.

svn-id: r51056
2010-07-20 08:56:53 +00:00
Max Horn 37aa8a7499 BUILD: Unify adding -DUNIX to DEFINES; complete SEQ MIDI detection
* Added a yes/no variable _unix to configure, which controls when
  -DUNIX is added to DEFINES
* Enable SEQ MIDI via _seq_midi by default on UNIX type systems,
  except for those which override that.
* Switch SEQ MIDI code to check #define USE_SEQ_MIDI
  (alternatively, we could compile it only conditionally...)

svn-id: r51055
2010-07-20 08:25:13 +00:00
Max Horn 211fcfe7ba MIDI: Build and use ALSA driver if and only if USE_ALSA is defined
svn-id: r51053
2010-07-20 08:24:34 +00:00
Max Horn 0c2d90f090 Fix warning about float->int conversion
svn-id: r51051
2010-07-20 07:11:17 +00:00
Max Horn 5b626533cd Change CHECK_GL_ERROR to not take a 'call statement' as parameter
Passing a 'call statement' to CHECK_GL_ERROR has various issues.
For once, it confuses code parsers in many editors and other
tools that work with C++ source directly.
Moreover, this can lead to subtle bugs if a mistake is
made with the definition of CHECK_GL_ERROR.
It also causes incorrect warnings if CHECK_GL_ERROR is
used with an "empty" call statement.

svn-id: r51050
2010-07-20 07:10:25 +00:00
Alejandro Marzini 302400a701 OPENGL: Implement fullscreen mode.
svn-id: r51049
2010-07-20 04:32:31 +00:00
Tony Puccinelli 3d3e4e6c39 coded for more relocations, added check for RELA type relocations, added comments
svn-id: r51048
2010-07-20 04:04:13 +00:00
Alejandro Marzini 014d7b791c OPENGL: Fix SDL OpenGL context not resizing well on Linux.
svn-id: r51047
2010-07-20 00:21:17 +00:00
Alejandro Marzini f6e04fe03b OPENGL: Fix adjustment of mouse coordinates when screen is resized and scaled.
svn-id: r51046
2010-07-19 23:58:48 +00:00
Torbjörn Andersson abae29a2dc ALSA: Get ALSA port settings from the new device config settings.
This is also an attempt to make the transition from the old settings to the
new ones a little less rough, by trying to put something sensible into the
first device, which is what's used by default. Currently it prefers 17:x
and 65:x since they're the old defaults, followed by 128:x since that's
probably TiMidity.

The old SCUMMVM_PORT environment variable still overrides any config
settings. I haven't made up my mind whether or not that's a good idea, but
at least it prints a warning message.

TODO: The old 'alsa_port' setting is not handled. It should probably be
used to set sensible defaults for the new settings, but I'm not sure where
this should be done.

TODO: The documentation will need to be updated, once everything is working
the way it should.

svn-id: r51019
2010-07-19 07:47:11 +00:00
Alejandro Marzini 6f70a303bc OPENGL: Add basic scaler handle.
svn-id: r51016
2010-07-19 05:36:10 +00:00
Alejandro Marzini 38b4098f67 SDL: Hack to handle special SDL events.
svn-id: r51015
2010-07-19 05:33:58 +00:00
Torbjörn Andersson 75dd75a737 SUBSYSTEM: ALSA music driver
We should probably open the sequencer the exact same way, both when
opening the driver and when asking it for available MIDI devices. Not
that I've been able to figure out the difference between "hw" and
"default" from the fine ALSA manual...

And I'm not sure we really need to try and keep compatibility with
ancient (pre-0.9.0?) ALSA any longer...

svn-id: r51014
2010-07-19 05:30:40 +00:00
Alejandro Marzini 6215f2b6d4 OPENGL: Fix issue when GFX changes.
svn-id: r51013
2010-07-19 02:36:43 +00:00
Alejandro Marzini 7ad017bde0 OPENGL: Fix palette issues.
svn-id: r51012
2010-07-19 02:32:36 +00:00
Andre Heider 70dfcdfb54 trying to fix psp build for case sensitive filesystems.
svn-id: r50989
2010-07-18 12:53:24 +00:00
Yotam Barnoy 30d7517343 PSP: switched to using my memcpy
svn-id: r50982
2010-07-18 07:03:14 +00:00
Yotam Barnoy 844a332f8d PSP: forgot test files
svn-id: r50981
2010-07-18 06:59:25 +00:00
Yotam Barnoy 58a1fbc13c Made memcpy faster but not as fast with uncached mem.
svn-id: r50980
2010-07-18 06:49:56 +00:00