Commit Graph

172 Commits

Author SHA1 Message Date
athrxx
40422441af AUDIO: some more text tweaks 2011-06-06 17:26:36 +02:00
Alyssa Milburn
4af3045188 I18N: Make MidiDriver detection errors translatable. 2011-06-06 12:44:28 +02:00
Willem Jan Palenstijn
5da1427d0c AUDIO: Tweak warning text 2011-06-06 12:39:06 +02:00
athrxx
506bd3c3a6 AUDIO: cleanup MidiDriver::detectDevice()
(wrong enum usage)
2011-06-06 01:15:59 +02:00
athrxx
8d23f692f2 AUDIO: replaced kDriverName in MidiDriver::detectDevice()
(This is irrelevant for the MT-32 emulator, but makes sense for plugins which really have more than one device)
2011-06-06 00:20:05 +02:00
athrxx
6d80255cec AUDIO: replace GUIErrorMessage()
GUIErrorMessage() shouldn't be used since it changes the window caption and resets the graphics mode.
2011-06-05 22:05:37 +02:00
athrxx
43075248aa AUDIO: fix device detection (missing rom files for MT-32 emu)
This is an attempt to fix the problem Max described in his devel mail.
The presence of the rom files will now be checked in detectDevice().
In case of failure there will be fallback attempts.
The user will get notified of the detection failure if he has expressly selected the device that failed.

Please test with your platform / engine (with or without rom files).
2011-06-05 18:29:13 +02:00
athrxx
85f7a01d2a FM-TOWNS AUDIO: some cleanup in midi driver code 2011-06-03 22:08:22 +02:00
Matthew Hoops
547fd1bdca COMMON: Cleanup QuickTime variable and struct naming 2011-06-03 00:58:29 -04:00
Matthew Hoops
2e06681698 COMMON: Begin objectifying QuickTimeParser::SampleDesc further
This is preparation for multiple video and audio tracks
2011-06-02 23:44:40 -04:00
Alyssa Milburn
eb9ea8fee6 AUDIO: Fix custom AdLib percussion instruments.
The struct wasn't being zeroed out, a regression from b22ca4ff.
2011-06-03 00:06:02 +02:00
athrxx
c1f00b1e8b FM-TOWNS AUDIO: fix regression 2011-06-02 16:56:01 +02:00
athrxx
4b77a5a12e FM-TOWNS AUDIO: cleanup
(move some stuff from TownsAudioInterfaceInternal to TownsAudio_PcmChannel)
2011-06-02 12:10:51 +02:00
athrxx
d61dc2574b AUDIO: fix some typos in comments 2011-06-02 12:10:51 +02:00
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
dhewg
f484ec302a ARM: Fix compilation really hard 2011-04-28 20:08:52 +02:00
dhewg
a05e2b0f43 ANDROID: Fix compilation harder 2011-04-28 20:08:52 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Ori Avtalion
cd6ee0589d JANITORIAL: Format forward declarations to follow convention 2011-04-28 12:20:34 +03:00
Matthew Hoops
9d8874c707 AUDIO: Cleanup MS IMA handling
- Split The Last Express' ADPCM to the engine. Using the MS IMA routine was really a hack.
- Fixed stereo MS IMA ADPCM, the old routine was completely wrong.
2011-04-24 23:14:14 -04:00
dhewg
e19fe1c53f ASM: Defines do not get mangled 2011-04-23 03:39:38 +02:00
dhewg
e15f9cc072 AUDIO: Fix Tremolo support
Include by used library, not by backend
2011-04-22 21:43:42 +02:00
athrxx
b0008d2d33 FM-TOWNS AUDIO: fix memory leak 2011-04-21 20:22:12 +02:00
Johannes Schickel
7b4a4d9fa6 Merge pull request "New mixer mute handling."
See https://github.com/scummvm/scummvm/pull/12 for more information.
2011-04-18 15:59:34 +02:00
Johannes Schickel
1d60b26687 AUDIO: Cleanup sound type settings handling in MixerImpl. 2011-04-16 18:32:14 +02:00
Johannes Schickel
6b0ccbb095 AUDIO: Renamed mute related functions in Mixer.
This renames setMuteForSoundType to muteSoundType and getMuteForSoundType to
isSoundTypeMuted.
2011-04-16 18:30:45 +02:00
Alyssa Milburn
d23150ff78 AUDIO: Name the ADPCM status struct. 2011-04-14 23:47:50 +02:00
Matthew Hoops
76105b29b7 AUDIO: Split the QuickTimeAudioDecoder into a new header file
(Mirroring the new adpcm_intern.h file)
2011-04-14 10:25:02 -04:00
Matthew Hoops
f035c26301 AUDIO: Fix a typo 2011-04-14 10:20:51 -04:00
Max Horn
2e095e25f2 ALL: centre -> center 2011-04-14 14:34:28 +02:00
Johannes Schickel
12a31200f2 AUDIO: Add per sound type mute flag setting to Mixer(Impl).
This also adapts our default implementation MixerImpl to handle the newly
added flags properly.

Now we do not need to set the sound volume for all types to 0, in case we want
to mute them, but instead just set the mute flag for all types to true. This
allows engines to be a bit more agonstic about mute support, when it comes to
volume options etc. since they can just setup any volume they like, but are
still muted (and thus will not break muting anymore).

MIDI sound is of course not affected by this.
2011-04-13 23:48:51 +02:00
Matthew Hoops
6d153f311c Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	video/qt_decoder.cpp
2011-04-13 16:04:29 -04:00
Matthew Hoops
deb46ab38b AUDIO: Split the Intel DVI ADPCM into its own class
IMA is really just the definition on how to decode a sample from a nibble, DVI is just a way for those nibbles to be stored in the stream.
2011-04-13 09:45:13 -04:00
Max Horn
393c6f6ade AUDIO: Expose some internal ADPCM data tables 2011-04-13 12:48:57 +02:00
Max Horn
e0a30e0039 AUDIO: Stop adpcm.h from including common/stream.h 2011-04-13 12:48:57 +02:00
Max Horn
7607e351cc TINSEL: Move custom ADPCM decoders to tinsel engine 2011-04-13 12:48:57 +02:00
Max Horn
b9296a189e AUDIO: Expose ADPCM decoder internals via a new header
There are tons of ADPCM variants out there, and it is impractical to
stuff them all into a single adpcm.cpp file. By exposing the internals,
engines can implement their ADPCM decoder variants more easily.
2011-04-13 12:48:57 +02:00
Matthew Hoops
499753cbb8 AUDIO: Don't end the AAC stream if we still have buffered samples 2011-04-12 16:23:34 -04:00
Matthew Hoops
08b70fa1a7 AUDIO: Fix QuickTime/MPEG-4 seeking
MPEG-4 seeking was broken while QuickTime seeking was extremely slow. All is fixed now
2011-04-12 14:23:23 -04:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
Matthew Hoops
368e0e47b5 AUDIO: Remove unused variables 2011-04-10 18:20:53 -04:00
Matthew Hoops
9d0e5a7132 ALL: Add/update some comments 2011-04-10 15:11:03 -04:00
Matthew Hoops
f9413e4dc2 AUDIO: Add support for AAC audio 2011-04-10 14:51:24 -04:00
Matthew Hoops
7c5dfaa04c COMMON: Parse the MPEG-4 esds atom 2011-04-08 22:46:19 -04:00
Matthew Hoops
faee277978 COMMON: Add a DisposeAfterUse flag to QuickTimeParser 2011-04-08 17:04:29 -04:00
Matthew Hoops
88ebf13077 AUDIO: Allow for seeking in a QuickTimeAudioStream 2011-04-08 10:54:13 -04:00
Matthew Hoops
8cf73e3fb4 AUDIO: Split QuickTime audio into a new class
Standalone QuickTime files can now be played as an AudioStream
2011-04-07 19:40:07 -04:00
Max Horn
8c931fd1e8 AUDIO: Add Audio::MidiPlayer::createDriver(), let some engines use it 2011-03-28 18:06:36 +02:00
dhewg
b8a118eb0c ANDROID: Use the midi gain option for EAS 2011-03-27 15:30:17 +02:00
dhewg
153e67b37c ANDROID: Maybe working support for EAS DLS soundfonts 2011-03-26 11:54:17 +01:00
dhewg
703af39be5 ANDROID: Add code to dump the EAS stream to a file 2011-03-26 11:11:32 +01:00