Max Horn
d4558a5d3b
oops forgot this file
...
svn-id: r5213
2002-10-21 12:47:06 +00:00
Max Horn
6f1da52a64
fixed compilation on MacOS
...
svn-id: r5212
2002-10-21 12:43:18 +00:00
Jamieson Christian
7677e42ffe
Pitch bend fixes for QTMA
...
svn-id: r5208
2002-10-21 09:32:38 +00:00
Max Horn
6631df898c
compilation fix
...
svn-id: r5158
2002-10-16 00:24:45 +00:00
Paweł Kołodziejski
09225027f1
changes to imuse
...
svn-id: r5157
2002-10-15 21:55:04 +00:00
Paweł Kołodziejski
15ac1c1ee9
fix
...
svn-id: r5156
2002-10-15 18:08:20 +00:00
James Brown
bc6d4f130b
Sanity checking to fix crash caused by latest sound commits
...
svn-id: r5151
2002-10-15 14:17:59 +00:00
Paweł Kołodziejski
dc87eff416
changes to soundmixer - added timeout param to stream
...
svn-id: r5149
2002-10-15 07:01:34 +00:00
Jamieson Christian
40cf2ad639
Removed hard-coded pitch bend setup, now being handled on-the-fly in imuse.cpp
...
svn-id: r5146
2002-10-14 16:19:19 +00:00
Max Horn
cdb7b13789
revised options dialog
...
svn-id: r5130
2002-10-12 00:26:24 +00:00
Ruediger Hanke
8ea56e58a8
Close Etude midi driver on exit in the ugghliest way possible
...
svn-id: r5129
2002-10-11 13:08:02 +00:00
Jonathan Gray
1f41180f94
default port for alsa if env var isn't set
...
svn-id: r5119
2002-10-10 08:26:00 +00:00
Ruediger Hanke
2fd0a3d458
Renamed new AMidi to Etude
...
svn-id: r5079
2002-10-02 23:31:40 +00:00
Paweł Kołodziejski
98d90696ad
added panning control in imuse and reverse stereo support
...
svn-id: r5076
2002-10-02 17:31:55 +00:00
James Brown
b7e83decd7
Fix 'isSoundRunning' for Creative samples (eg, Full Throttle)
...
svn-id: r5072
2002-10-02 10:12:19 +00:00
Paweł Kołodziejski
bff43de73a
changes for stoping sounds
...
svn-id: r5062
2002-10-01 18:11:30 +00:00
Max Horn
31daec5e1c
temporary pitch bend fix for the QuickTime midi driver. not quite perfect... hrm
...
svn-id: r5041
2002-09-29 18:27:48 +00:00
James Brown
dfdb1f7547
Merge in 615745: GMD via AdLib emulation
...
Remove MIDIEMU driver obsoleted by patch.
Change functionality to fallback to AdLib/AdLibGMD Emulation where MIDI init fails
Switch to NewGUI by default (old code retained 'Just in case')
svn-id: r5033
2002-09-29 11:11:42 +00:00
Max Horn
1bfaa3c02f
removed even the last traces of Scumm dependencies from NewGUI. Yes, you heard right NewGUI is now 100% Scumm free and we can go for the launcher/message dialogs!
...
svn-id: r5016
2002-09-24 23:45:25 +00:00
James Brown
e4ce428bdd
Patch 610257jamieson630/Windows MMSYSTEM error reclassification
...
svn-id: r4955
2002-09-17 04:41:46 +00:00
Paweł Kołodziejski
e6751d0d8f
new smush player need bigger buffer
...
svn-id: r4942
2002-09-15 06:19:33 +00:00
Paweł Kołodziejski
2f91c18b22
speed changes to play smush movies
...
svn-id: r4941
2002-09-15 05:38:04 +00:00
Paweł Kołodziejski
fb91bdd21d
fixed stream in mixer, not completed yet - bad wrap around.
...
svn-id: r4940
2002-09-14 12:12:25 +00:00
Max Horn
523d8e64c0
rewrote config class; cleanup; code restructuring
...
svn-id: r4903
2002-09-08 01:08:12 +00:00
Paweł Kołodziejski
687e82c0fa
fixes
...
svn-id: r4897
2002-09-02 20:15:14 +00:00
Paweł Kołodziejski
ca03c9b5fc
changed file io in sounds to class File
...
svn-id: r4896
2002-09-02 07:53:43 +00:00
Max Horn
41c2d6fba3
sound system cleanup
...
svn-id: r4867
2002-08-29 23:45:15 +00:00
Paweł Kołodziejski
0ad222a7ad
better SFX suport in the Dig
...
svn-id: r4852
2002-08-25 15:06:53 +00:00
Paweł Kołodziejski
9f993a1d29
synced with scummvm
...
svn-id: r4821
2002-08-24 15:31:37 +00:00
Max Horn
08b161f113
fix for bug #598938 : sfx/music volume set 0 is not mute; some cleanup
...
svn-id: r4805
2002-08-23 20:33:29 +00:00
Paweł Kołodziejski
0a520b237b
fix for music loop, I think :)
...
svn-id: r4804
2002-08-23 20:27:42 +00:00
Ruediger Hanke
3b09051727
Changed MorphOS MIDI code so that data sent from different threads are no longer a problem. Ensure Midi driver is closed, otherwise no other MIDI application will run after ScummVM has exited.
...
svn-id: r4801
2002-08-22 12:09:06 +00:00
Max Horn
c0324a9e6d
fixed one-off-error (I hope this fix is right?); use calloc instead of malloc to ensure struct is zeroed
...
svn-id: r4795
2002-08-21 17:13:17 +00:00
Max Horn
7aac293726
fixed the 'intelligent' GCC build rules; added .cvsignore files
...
svn-id: r4790
2002-08-21 16:28:19 +00:00
Max Horn
ce46866403
Initial revision
...
svn-id: r4785
2002-08-21 16:07:07 +00:00
James Brown
662256f25d
Add missing iMUSE midi effect
...
svn-id: r4784
2002-08-21 11:24:33 +00:00
Paweł Kołodziejski
f3ceaf7f81
applied patch 597414, thanks Xavier
...
svn-id: r4778
2002-08-20 06:36:50 +00:00
Max Horn
8786311655
move _volume_table creation into constructor, and discard it in destructor
...
svn-id: r4764
2002-08-18 21:42:22 +00:00
Max Horn
edae5b06db
MAJOR change to the way how Engine objects are instantiated
...
svn-id: r4758
2002-08-18 17:48:18 +00:00
Max Horn
89cf95ce34
pedantic #define rename :-)
...
svn-id: r4755
2002-08-18 16:10:38 +00:00
Ruediger Hanke
b6091fd7c5
Removing some system ifdef's that won't be required anymore soon
...
svn-id: r4726
2002-08-11 11:56:06 +00:00
Paweł Kołodziejski
99e11501f4
this remove clicks end of sounds in smush
...
svn-id: r4724
2002-08-10 13:59:40 +00:00
Ruediger Hanke
e6b0eb5057
Got rid of annoying blips and scratches on my system. It's just for MorphOS not to annoy Ender (see his comment in the source). Happens probably only here.
...
svn-id: r4723
2002-08-09 13:35:01 +00:00
Ruediger Hanke
0e2f835d1f
Fixed Mixer full warnings, Dig music plays much better now on MorphOS
...
svn-id: r4722
2002-08-09 11:23:14 +00:00
Max Horn
30a2f9b23b
fixed compile error
...
svn-id: r4702
2002-08-04 16:54:59 +00:00
Paweł Kołodziejski
9fa6145d90
DIG: preliminarily support for music in the game
...
svn-id: r4701
2002-08-04 16:30:59 +00:00
Max Horn
c56c8ea5e6
patch 587769 by Fridvin Logi (supposedly helps with Nexus in The Dig)
...
svn-id: r4678
2002-07-29 16:18:32 +00:00
Max Horn
a99fe80d4b
fixed imuse volume bug introduced recently by me and painelf - iMuse internally does require the 0-127 change
...
svn-id: r4677
2002-07-29 16:12:15 +00:00
Max Horn
7117f5aec1
fixed volume table (that was a neat trick, that int8 cast, really got me; but I prefer readability over the 5 ns time saved <g>)
...
svn-id: r4675
2002-07-28 20:46:07 +00:00
Paweł Kołodziejski
0b3c263857
moved file bundle stuff into class Bundle
...
svn-id: r4671
2002-07-28 15:35:26 +00:00
Max Horn
6dd5de48f9
added constants for the default volumes; changed the volume ranges from 0-255 to 0-256
...
svn-id: r4670
2002-07-28 15:03:45 +00:00
Max Horn
7fb8139210
fixed some warnings, fixed clamped_add_16 to do the right thing now (wow, nobody noticed this.. :-)
...
svn-id: r4652
2002-07-27 13:16:32 +00:00
Max Horn
072ed82a37
when mixing data, clamp the addition - otherwise we might get overflows for high volumes
...
svn-id: r4647
2002-07-26 23:30:35 +00:00
Max Horn
84c8d4b689
added painelf's (still unfinished) sound dialog in NewGUI. Beware, this is work in progress, don't report problems with it just yet, we already know they are there :-)
...
svn-id: r4635
2002-07-26 00:41:07 +00:00
Max Horn
d6e1332f49
fixed Channel_MP3::mix to deal correctly with _silence_cut (this improves lip sync); put cubic interpolation code into a utility class, CubicInterpolator; now three mixers use this, converting the other ones should be simple
...
svn-id: r4623
2002-07-23 14:54:02 +00:00
Max Horn
07966f6ccc
renamed SPECIAL_CHANNEL to PERCUSSION_CHANNEL; don't apply MT32->GM conversion on percussion channel; some indention fixes
...
svn-id: r4621
2002-07-23 10:29:11 +00:00
Max Horn
1c4167f080
pulled out arisme's recent changes to pauseMode, they are not correct as they break pause mode for all systems that use real MIDI drivers (see bug #584684 ). If you need a mute music mode, then add an according function to iMUSE/mixer but don't abuse pause mode, please
...
svn-id: r4615
2002-07-22 12:44:57 +00:00
James Brown
8de1ace6c7
Apply patch from Torbj�rn Andersson to make MP3_CDMUSIC mixer use
...
music_volume instead of sfx_volume.
svn-id: r4611
2002-07-21 06:55:33 +00:00
Nicolas Bacca
74041e2120
Fixed Monkey Island 2 freeze when sound is paused
...
svn-id: r4608
2002-07-20 07:57:22 +00:00
Max Horn
5317b473b2
added cubic spline interpolation (only to mix_unsigned_mono_8 because that's what I used to test); next step will be to put this into a seperate function which all the 9 mixers (8 normal ones and one for MP3) will then use, but I gotta sleep now :-)
...
svn-id: r4585
2002-07-17 23:50:38 +00:00
Max Horn
2b97c496c2
indent run
...
svn-id: r4475
2002-07-07 18:04:03 +00:00
Max Horn
87cbab8d96
fixed compilation of imuse.cpp
...
svn-id: r4454
2002-07-04 10:05:40 +00:00
James Brown
9ac3f92be1
Hacks to make SMUSH mixer a bit more tollerable.
...
svn-id: r4429
2002-06-26 10:20:56 +00:00
Lionel Ulmer
f8190443ca
As long as I am fixing regression bug introduced by my streaming
...
patch, fix also the 'FLAG_FILE' stuff.
Endy, you should be able to revert your patch to Simon as it should
not be needed anymore now :-)
svn-id: r4412
2002-06-06 21:50:20 +00:00
Lionel Ulmer
6abeab5b5a
This should fix the regression introduced by my streaming changes (bug
...
#564756 ). Thanks Oliver Kiehl for the find :-)
svn-id: r4411
2002-06-06 21:42:11 +00:00
Lionel Ulmer
a639c1be6f
Added the mutex support to ease the streaming (ie to prevent all race
...
conditions between an 'append' and a playing by the sound
thread). Porters should add the relevant stuff to their OSystem
interfaces.
But finally, the bug reported by Valgrind was much more trivial than
that and is also fixed in this commit :-)
svn-id: r4398
2002-06-03 21:20:11 +00:00
Lionel Ulmer
8b7207666e
Fix the streaming used in the movies in TheDig (warning, did not test
...
Full Throttle).
This should be less buggy (ie crash less often, maybe not better
quality) than the previous code.
NOTE: the '1024 *' is here for testing purposes and will need to be
severely reduced :-/
svn-id: r4396
2002-06-02 20:30:21 +00:00
Paweł Kołodziejski
c9f67e27b3
Fix for mixer 16 bits samples. Samples are clear now.
...
bbrox: This patch works fine for me, previous not. (MSVC6 + SP5)
svn-id: r4368
2002-05-22 05:55:10 +00:00
Lionel Ulmer
f6b934e068
Add volume control like it is done for MP3 to the 16 bit 'mixers' (ie
...
using a 32 level only volume range).
svn-id: r4365
2002-05-20 20:35:25 +00:00
Paweł Kołodziejski
4aabb0378c
The Dig: stereo samples and mixer
...
svn-id: r4359
2002-05-19 20:38:53 +00:00
Paweł Kołodziejski
c9a53bcf76
The Dig: 16 bit samples and mixer
...
svn-id: r4358
2002-05-19 15:20:18 +00:00
Nicolas Noble
f453058bf2
The second part of armisme fix is here...
...
<Arisme> but on the bright side, now ScummVM will be #1 on Sourceforge :D
Oh well....
svn-id: r4353
2002-05-18 21:12:11 +00:00
Nicolas Noble
65b2c9793b
And now commiting the *REAL* arisme patch...
...
svn-id: r4352
2002-05-18 21:09:40 +00:00
Nicolas Noble
406d45cd0b
Next time, I'll have to kill you Arisme ok? ;-)
...
svn-id: r4351
2002-05-18 21:07:29 +00:00
Nicolas Bacca
481989c91e
Oops
...
svn-id: r4350
2002-05-18 20:56:04 +00:00
Nicolas Bacca
427cc598e0
Big ugly hairy hack to remove Scumm class dependencies to the MidiEmu driver, and add streaming (ahah) emulation - someone please fix this as soon as possible :)
...
svn-id: r4349
2002-05-18 20:12:41 +00:00
Lionel Ulmer
3b4c6ceb0f
Added infrastructure to support more than 8 bit signed / unsigned RAW
...
mixers. Porters, beware, the default configuration is now 16 bit
stereo instead of 16 mono as before (I changed X11 and SDL but no
others).
I did not add support for any other format yet, I will let Endy do it
when he needs it :-)
svn-id: r4348
2002-05-18 14:53:19 +00:00
Nicolas Noble
53f993be44
Fixing ALSA driver to not segfault when launching simon. It still isn't
...
supported but it's better signaled now. BTW I think there is a bug
somewhere since the close() method were called without beeing open()'d. Oh well...
svn-id: r4347
2002-05-18 11:48:48 +00:00
Max Horn
9c01a88e90
fixed shadow var warnings
...
svn-id: r4345
2002-05-17 17:41:07 +00:00
Nicolas Noble
9236c4f905
Cleaning up a little the ALSA driver, and removed the 'old beast': the old TiMidity code.
...
svn-id: r4344
2002-05-16 19:04:38 +00:00
Nicolas Noble
5edf1e6d7f
Added an ALSA sequencer support. Updated readme.txt to explain it, and
...
Makefile to allow the user to enable it. I also reorganised the Makefile
a bit, since there is now one more optionnal library. BBrox, I also
merged your Makefile.x11 in it, just take a look at it!
svn-id: r4341
2002-05-16 06:46:50 +00:00
Max Horn
4ac64b941d
added append() stubs for Channel_MP3/Channel_MP3_CDMUSIC
...
svn-id: r4296
2002-05-12 17:57:37 +00:00
James Brown
0d60185a88
Add new mixer 'append' function to allow pseudo-streaming for SMUSH
...
svn-id: r4291
2002-05-12 16:53:13 +00:00
James Brown
3beabb6c19
Fix crash if envvar not set.
...
svn-id: r4286
2002-05-12 10:18:40 +00:00
James Brown
b9e335ef0f
Add new MIDIPORT parameter to solve Linux sequencer issues.
...
svn-id: r4285
2002-05-12 09:21:27 +00:00
James Brown
ecbf23da72
Impliment what we call 'random guesses' for Sam and Max iMUSE
...
svn-id: r4271
2002-05-10 20:21:12 +00:00
James Brown
ceb97152c7
Fix odd Sam and Max iMUSE crash. Thread syncronisation bug?
...
svn-id: r4256
2002-05-09 18:03:07 +00:00
James Brown
539313fea4
Remove 373 type conversion warnings
...
svn-id: r4247
2002-05-08 10:51:48 +00:00
Lionel Ulmer
ca382bbc1d
Hacked away some code from Timidity to support 'Pitch wheel'. The DOTT
...
intro now sounds a bit better than before using the 'midiemu' driver.
svn-id: r4246
2002-05-08 10:41:30 +00:00
Lionel Ulmer
2676b82833
Remove the setting of 'adlib_mode' to _RYTHM value (did for testing).
...
svn-id: r4241
2002-05-08 08:49:23 +00:00
Lionel Ulmer
96beb07529
Fixed the 'myinsbank' init (to not read memory that it should
...
not). Change the 'write_adlib' function to be more in line to what
AdPlug does.
svn-id: r4240
2002-05-08 08:47:20 +00:00
James Brown
4d9db49484
Fix compile warnings.
...
svn-id: r4237
2002-05-08 06:17:59 +00:00
James Brown
a3edfd87ad
Add possible code for Modulation/Sustain to Emulated Midi Driver
...
svn-id: r4236
2002-05-08 05:32:59 +00:00
James Brown
b2afb797cd
Major cleanup of fmopl, and change incorrect uint32 typecasting.
...
Midi Emulation driver sounds a lot better now.
svn-id: r4235
2002-05-08 02:06:26 +00:00
Lionel Ulmer
dd3129b882
First commit of the OPL2 MIDI driver (to have MIDI music without
...
requiring any OS-level MIDI support).
This was taken from AdPlug.
This is *very* buggy for now (well, it works, but it sounds just plain
ugly :-) ).
svn-id: r4232
2002-05-07 22:07:28 +00:00
Lionel Ulmer
e08b53ce9c
Fix a (very rare outside of running with GDB) race condition between
...
thread start and the parameters used by the thread.
svn-id: r4230
2002-05-07 21:42:51 +00:00
Max Horn
2f2d4527ef
cleaning up the mess drigo left... <sigh>
...
svn-id: r4215
2002-05-05 20:04:26 +00:00
Enrico Rolfi
00f35bec5a
Fixed some things to support MacOS port and QuickTime
...
svn-id: r4211
2002-05-05 19:04:04 +00:00
Max Horn
c7002262bb
automatic detecion of MT32 vs. GM midi; removed obsolete -r command line option
...
svn-id: r4193
2002-05-04 00:20:39 +00:00
Max Horn
4e76591ba6
my version of MAD (0.14.2b) has no MAD_ERROR_NONE; where did that come from?
...
svn-id: r4191
2002-05-04 00:10:01 +00:00
