libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-02 07:28:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,305 Commits 5 Branches 5 Tags 1.8 GiB
4b6c1a0c2b
Commit Graph

108 Commits

Author SHA1 Message Date
clone2727
49a8f7675f Merge pull request #20 from scott-t/t7g-ios 
T7G iOS support
 2011-06-01 07:04:05 -07:00
Max Horn
a4610df482 Merge branch 'branch-1-3-0' into master 
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.

Conflicts:
	NEWS
	backends/base-backend.cpp
	backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
	backends/module.mk
	backends/platform/ds/arm9/makefile
	backends/platform/psp/README.PSP
	backends/platform/samsungtv/main.cpp
	backends/platform/samsungtv/samsungtv.cpp
	backends/saves/posix/posix-saves.cpp
	base/commandLine.cpp
	base/internal_version.h
	base/main.cpp
	common/array.h
	configure
	devtools/create_project/create_project.cpp
	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml
	dists/iphone/Info.plist
	dists/irix/scummvm.spec
	dists/macosx/Info.plist
	dists/redhat/scummvm-tools.spec
	dists/redhat/scummvm.spec
	dists/scummvm.rc
	dists/slackware/scummvm.SlackBuild
	dists/wii/meta.xml
	engines/sci/parser/vocabulary.cpp
	engines/tinsel/handle.cpp
	gui/themes/translations.dat
 2011-06-01 15:15:31 +02:00
Matthew Hoops
aa49b38c5a Merge remote branch 'upstream/master' into t7g-ios 
Conflicts:
	engines/groovie/script.cpp
 2011-05-31 14:16:29 -04:00
Matthew Hoops
bf8cfcb6b7 AUDIO: Plug MPEG-4/QuickTime audio into openStreamFile 2011-05-31 13:58:05 -04:00
D G Turner
bea6858953 AUDIO: Fix GCC Compilation Warning in FM-Towns Softsynth. 2011-05-31 12:06:14 +01:00
athrxx
7f8a69d6fc FM-TOWNS AUDIO: fix destructors (thread safety) 2011-05-30 01:48:59 +02:00
athrxx
c60807cbb9 FM-TOWNS AUDIO: Unlock internal mutex before calling imuse timer proc. 2011-05-29 01:04:01 +02:00
Matthew Hoops
9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
Matthew Hoops
0104d56444 ALL: recognise -> recognize 2011-05-25 10:50:47 -04:00
Max Horn
e7c642b010 AUDIO: Explicitly instantiate & name RandomSource used by MAME OPL 2011-05-23 12:13:01 +02:00
md5
5838ef6719 SWORD25: Fix compilation when libvorbis is not present 
(cherry picked from commit 2d3ad096ab)
 2011-05-21 18:03:47 +02:00
agent-q
a9b5d5e2bb DS: Fix some OPL data which was incorrectly freed from the main heap on the DS port 2011-05-21 15:46:59 +01:00
athrxx
2ef8e9a202 FM-TOWNS AUDIO: fix gcc warnings 2011-05-20 20:28:18 +02:00
athrxx
2d1fa6c3f8 FM-TOWNS AUDIO: fix thread lockups and cleanup 
- fixed lockup situation in imuse destructor (only concerning the fm-towns driver)
- fixed lockup situation when AudioCDManager functions get called
(in both cases both the main thread and the mixer thread would get locked in different mutex belonging to the other thread)
 2011-05-20 20:28:15 +02:00
Johannes Schickel
ffc2a93daa AUDIO: Remove leftover "forward" declaration after real declaration in the TOWNS midi code. 2011-05-20 19:30:22 +02:00
Johannes Schickel
582827df40 AUDIO: Remove SVN Id/URL keywords from a few newly added files. 2011-05-17 23:23:44 +02:00
athrxx
7804afd4cb FM-TOWNS AUDIO: hopefully fix ps2 port compile 2011-05-17 21:43:07 +02:00
Willem Jan Palenstijn
d2d002bcc2 AUDIO: Fix warning 2011-05-17 21:24:00 +02:00
athrxx
726a7f3b1a FM-TOWNS AUDIO: Fix GCC warnings 2011-05-17 20:36:32 +02:00
athrxx
d3e92f0b81 FM-TOWNS AUDIO: Fix several CppCheck warnings 2011-05-17 20:36:32 +02:00
athrxx
b3476fc801 FM-TOWNS AUDIO: Some fixes and renaming 
- renamed some stuff in the new midi driver code
- fixed minor bug in midi driver code
- fixed minor bug in euphony driver code
- add some functionality to towns audio interface
 2011-05-17 20:36:32 +02:00
athrxx
15610b56db FM-TOWNS AUDIO: Fix some bugs and rename some stuff in the midi driver code 2011-05-17 20:36:32 +02:00
athrxx
95c059598d FM-TOWNS AUDIO: Fix note off event in midi driver 2011-05-17 20:36:32 +02:00
athrxx
c6f13d187e FM-TOWNS AUDIO: Fix some midi driver bugs 2011-05-17 20:36:32 +02:00
athrxx
8fb5906117 FM-TOWNS AUDIO: Some midi code fixes and some renaming 2011-05-17 20:36:31 +02:00
athrxx
90a300d86c FM-TOWNS AUDIO: Improve thread safety 2011-05-17 20:36:31 +02:00
athrxx
88896117da FM-TOWNS AUDIO: Some more midi driver code 2011-05-17 20:36:31 +02:00
athrxx
75770ae691 FM-TOWNS AUDIO: Fix mod wheel setting 2011-05-17 20:36:31 +02:00
athrxx
ca0e9cca3d FM-TOWNS AUDIO: Start fixing midi driver tempo 2011-05-17 20:36:31 +02:00
athrxx
9fa1b9aa36 FM-TOWNS AUDIO: More midi driver code 2011-05-17 20:36:26 +02:00
athrxx
d9772ff88f FM-TOWNS AUDIO: Some renaming in the euphony driver code 2011-05-17 20:33:03 +02:00
athrxx
bd2c84be89 FM-TOWNS AUDIO: More midi driver code (effect processing) 2011-05-17 20:33:03 +02:00
athrxx
25814e64ac FM-TOWNS AUDIO: Implement some midi commands 2011-05-17 20:33:03 +02:00
athrxx
8fe9e89c6c FM-TOWNS AUDIO: Some more midi driver code 2011-05-17 20:33:03 +02:00
athrxx
d4325a0411 FM-TOWNS AUDIO: Implement some more midi driver code 2011-05-17 20:32:53 +02:00
athrxx
2f9c5de7be FM-TOWNS AUDIO: Implement some midi driver functions 2011-05-17 20:24:30 +02:00
athrxx
6845f25f54 SCUMM: Adapt code to latest FM-TOWNS audio driver changes 2011-05-17 20:24:30 +02:00
athrxx
63a7859351 FM-TOWNS AUDIO: Change internal interface layout 2011-05-17 20:24:28 +02:00
athrxx
5c34e33c2c FM-TOWNS AUDIO: Some more midi driver code for FM-TOWNS monkey2 and indy4 2011-05-17 20:24:24 +02:00
Max Horn
9b2ef340dc COMMON: Forbid use of some more symbols 2011-05-17 12:58:34 +02:00
Max Horn
a03ed0a3f7 AUDIO: Fix typo 2011-05-17 12:57:46 +02:00
Alyssa Milburn
ed1739f419 AUDIO: Clarify required parameters for mixCallback. 
Also, add an assert() to make invalid lengths obvious.
 2011-05-16 15:09:05 +02:00
md5
2d3ad096ab SWORD25: Fix compilation when libvorbis is not present 2011-05-13 21:09:31 +03:00
Matthew Hoops
bc7ff27828 AUDIO: Fix QuickTime stereo audio seeking 2011-05-13 02:22:11 -04:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Matthew Hoops
d2f5b91a9a AUDIO: Fix usage of Timestamp::convertToFramerate 2011-05-11 14:48:13 -04:00
Matthew Hoops
a1d41da096 Merge remote branch 'upstream/master' into t7g-ios 
Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h
 2011-05-11 00:30:28 -04:00
Max Horn
b22ca4ffe8 AUDIO: Change byte data tables to type AdLibInstrument 2011-05-10 14:43:53 +02:00
Max Horn
59e77ed667 ALL: Mark printf and various other symbols as forbidden 
Right now, a few places in the frontend code still use printf and
consorts. We mark the affected files with a FIXME for now, and
add a dedicated exception for each. To be fixed!

Also tweak FORBIDDEN_SYMBOL_REPLACEMENT to hopefully really always
enforce a compiler error
 2011-05-02 16:31:31 +02:00
Max Horn
58eebff803 AUDIO: Rename clock() -> updateClock() in SID emulator 2011-05-02 16:31:30 +02:00