Commit graph

52 commits

Author SHA1 Message Date
Adrian Frühwirth
9bee9e1ba6 JANITORIAL: Fix whitespace 2018-04-19 12:08:31 +02:00
Eugene Sandulenko
dead4aa014 JANITORIAL: Remove trailing spaces 2016-10-09 14:59:58 +02:00
Strangerke
013406abdd SHERLOCK: Fix uninitialized variables 2016-06-13 07:33:17 +02:00
Ori Avtalion
3564032330 JANITORIAL: Reduce audio header dependencies 2016-04-14 16:10:21 +03:00
Paul Gilbert
456e5956e0 SHERLOCK: RT: Properly hook up volume and mute toggles in Options dialog 2016-02-05 19:31:35 -05:00
Paul Gilbert
5137d0d3f9 SHERLOCK: SS: Fix exit crash in Sherlock playable demo 2015-11-23 20:11:20 -05:00
Paul Gilbert
0a1f5dbd4c SHERLOCK: Fix memory leak playing music 2015-10-11 16:19:53 -04:00
Paul Gilbert
4850924b47 SHERLOCK: RT: Start next music song when a previous one finishes 2015-09-21 21:33:28 -04:00
Torbjörn Andersson
b11530d87c SHERLOCK: Finish implementation of song / songs debugger commands
This adds support for Rose Tattoo and 3DO version of Serrated
Scalpel.
2015-08-30 00:41:48 +02:00
Torbjörn Andersson
e734bb5078 SHERLOCK: Rework the "song" debugger command
Instead of taking a room number (which didn't work in Rose Tattoo),
it now takes a song name. To see which songs are available, use the
"songs" command.

Note that this is still only works for Serrated Scalpel, since I
haven't implemented getting a list of available songs for Rose
Tattoo. I need to study the resource manager a bit first...
2015-08-29 18:09:54 +02:00
Paul Gilbert
21028131cf SHERLOCK: RT: Implemented setMusicVolume, cleanup of sound code 2015-08-15 12:30:04 -04:00
Paul Gilbert
3ce7aaa6d9 SHERLOCK: RT: Removal of redundant music code 2015-08-13 20:01:35 -04:00
Paul Gilbert
23314ed5d8 SHERLOCK: SS: Fix crash in intro when music finishes 2015-07-04 16:23:24 -04:00
Paul Gilbert
e4b4fd0493 SHERLOCK: RT: Fix Coverity problems 2015-06-29 19:43:44 -04:00
Torbjörn Andersson
3c9bdaa04f SHERLOCK: Use standard MIDI driver for General MIDI in Rose Tattoo
Unlike Serrated Scalpel, Rose Tattoo's music sounds good as General
MIDI, and our standard driver should work well enough for that.
2015-06-28 22:47:21 +02:00
Martin Kiewitz
1ec6ccc668 SHERLOCK: RT: MT32: don't pass timbre file
because the game does not have one
2015-06-28 12:44:18 +02:00
Martin Kiewitz
0655839a4f COMMON: move Miles Audio AdLib+MT32 to common
- remove Miles Audio from Sherlock engine
- put Miles Audio into common audio (namespace Audio)
- Miles Audio is used at least by the engines
TINSEL, GROOVIE, TOLTECS, SAGA and KYRA
This way it can be used by the other engines
2015-06-27 22:44:39 +02:00
Martin Kiewitz
8faef1c52c SHERLOCK: remove outdated comments about Miles Aud
about Miles Audio 3
2015-06-27 20:25:50 +02:00
Martin Kiewitz
ce3ceb9296 SHERLOCK: RT: Miles Audio 3 MT32 driver
- implement Miles Audio 3 MT32 driver
- work in progress
- Miles Audio timbre files not supported atm b/c RT does not use them
2015-06-27 17:04:26 +02:00
Martin Kiewitz
57aa0984e5 SHERLOCK: Tattoo: Miles Audio 3 AdLib driver
- implement Miles Audio 3 AdLib driver
- also cleanup of Scalpel AdLib driver
- work in progress, sustain and for example OPL-3 missing
2015-06-26 02:52:07 +02:00
Martin Kiewitz
fac5c2d979 SHERLOCK: hopefully fix music crash when exiting 2015-06-17 17:10:16 +02:00
Martin Kiewitz
3aef3c396d SHERLOCK: intro: msec sync instead of ticks 2015-06-16 22:56:58 +02:00
Torbjörn Andersson
071de331c0 SHERLOCK: Remove obsolete comment 2015-06-16 19:27:03 +02:00
Filippos Karapetis
7e6539f400 SHERLOCK: Use IS_3DO in more places 2015-06-16 10:02:32 +03:00
Filippos Karapetis
25e729efe0 SHERLOCK: Introduce a IS_3DO define
This is similar to IS_SERRATED_SCALPEL and IS_ROSE_TATTOO, and makes
the code a bit easier to read
2015-06-16 09:59:27 +03:00
Filippos Karapetis
bd75fc1d11 SHERLOCK: Properly implement stopMusic() and freeSong()
Fixes the crashes when changing scenes
2015-06-16 09:55:50 +03:00
Torbjörn Andersson
861c97a05f SHERLOCK: Clarify TODO comment for Rose Tattoo MT-32 2015-06-15 07:39:34 +02:00
Torbjörn Andersson
1fc1d5cc88 SHERLOCK: Use standard MIDI drivers for Rose Tattoo
As far as I understand, the Rose Tattoo music is standard XMIDI, so
it can be played on any GM device. The music now sounds like I
remember it from DOSBox. (I'm currently limited to AdLib music in
DOSBox, so I can't make any proper comparison.)

AdLib support currently depends on ScummVM's GM -> AdLib conversion,
so that does not match the original.

I'm not sure about MT-32, but since I have no reason to believe that
there is MT-32 specific music - at least not in the way the Serrated
Scalpel MT-32 driver expects - we can probably rely on our default
driver to a reasonable job of it.
2015-06-15 07:24:10 +02:00
Filippos Karapetis
dd992772be SHERLOCK: RT: Initial implementation of XMI music support for RT 2015-06-15 03:15:08 +03:00
Torbjörn Andersson
870d0d23a3 SHERLOCK: Add mutex to Sherlock MIDI parser
Hopefully this will put a stop to random crashes when music starts
and/or stops. I'm never quite sure just how much locking is
necessary, though...
2015-06-14 10:33:31 +02:00
Paul Gilbert
40a3a3b835 SHERLOCK: RT map display partially working 2015-06-11 08:32:31 -04:00
Martin Kiewitz
256158cbe2 SHERLOCK: free midi music buffer 2015-06-10 07:14:15 +02:00
Martin Kiewitz
91d4b8df0f SHERLOCK: adjust music play code (file extension) 2015-06-08 20:29:22 +02:00
Martin Kiewitz
0d09049562 SHERLOCK: add music + sync to 3DO intro 2015-06-08 20:09:29 +02:00
Torbjörn Andersson
47d905486c SHERLOCK: Initialize _midiParser. Fixes crash on exit in 3DO version. 2015-06-07 19:35:24 +02:00
Martin Kiewitz
16d124b231 SHERLOCK: tiny bit of work on 3DO 2015-06-04 20:51:27 +02:00
Martin Kiewitz
4cf16a905b SHERLOCK: hopefully fix crash on exit/Music class 2015-06-02 18:17:25 +02:00
Martin Kiewitz
100dd52a8e SHERLOCK: rename MT32 driver, fix SysExPos 2015-06-02 17:36:22 +02:00
Martin Kiewitz
25c0e7ec33 SHERLOCK: add mt32 music driver 2015-06-02 16:42:31 +02:00
Martin Kiewitz
c20fbeaf6f SHERLOCK: add comments about waitUntilTick() 2015-06-01 13:26:34 +02:00
Martin Kiewitz
049ca42bb2 SHERLOCK: intro timing + fixes 2015-06-01 12:10:20 +02:00
Martin Kiewitz
90be81b284 SHERLOCK: debug levels for AdLib & Music 2015-05-31 23:28:28 +02:00
Martin Kiewitz
35fe594133 SHERLOCK: clean up adlib driver 2015-05-31 12:16:30 +02:00
Paul Gilbert
ec56344ed7 SHERLOCK: Free memory leaks from unreleased sound resources 2015-05-30 18:44:48 -04:00
Martin Kiewitz
52ca97fe63 SHERLOCK: midiparser block META event 0xFF for now 2015-05-30 22:56:13 +02:00
Martin Kiewitz
3dd81bfb35 SHERLOCK: renamed SysEx to System META event 2015-05-30 20:26:03 +02:00
Martin Kiewitz
8b9de5cdc9 SHERLOCK: implement SysEx 0xFC loop/not loop 2015-05-30 20:15:20 +02:00
Martin Kiewitz
0cc5313689 SHERLOCK: midi parser delta reading changed 2015-05-30 17:42:36 +02:00
Paul Gilbert
6b95fc6b11 Merge branch 'sherlock2' 2015-05-30 10:46:19 -04:00
Martin Kiewitz
f80cc4a84d SHERLOCK: add (unfinished) adlib driver 2015-05-30 01:48:30 +02:00