Commit Graph

262 Commits

Author SHA1 Message Date
Paweł Kołodziejski
eec8b61b8d tuned a little
svn-id: r13754
2004-05-02 17:48:30 +00:00
Paweł Kołodziejski
8e56e7b0bb - fix for cuting voices in comi,
- fix for lipsync stuff (compromise append buffer ahead to sync position)

svn-id: r13753
2004-05-02 16:46:51 +00:00
Paweł Kołodziejski
7da4eccb1d enabled save/load code for imuse digital
svn-id: r13746
2004-05-02 14:03:21 +00:00
Paweł Kołodziejski
f6b8830158 forgot it
svn-id: r13745
2004-05-02 13:58:57 +00:00
Paweł Kołodziejski
ffb842c026 this too
svn-id: r13743
2004-05-02 13:17:02 +00:00
Paweł Kołodziejski
8c6f3ddc0a changed from int to int32 to be sure
svn-id: r13742
2004-05-02 13:15:33 +00:00
Paweł Kołodziejski
7701fece20 disabled reset state while change bundle disks
svn-id: r13741
2004-05-02 13:06:40 +00:00
Paweł Kołodziejski
6c682fcfba fixed two arrays
svn-id: r13740
2004-05-02 12:52:19 +00:00
Paweł Kołodziejski
351eaff329 start only used tracks
svn-id: r13739
2004-05-02 12:46:01 +00:00
Paweł Kołodziejski
8bdab25b7a ops
svn-id: r13738
2004-05-02 12:23:51 +00:00
Paweł Kołodziejski
054acfbbd3 added rest of save/load code
svn-id: r13737
2004-05-02 12:20:55 +00:00
Paweł Kołodziejski
24ccdb85e9 ops
svn-id: r13736
2004-05-02 11:53:10 +00:00
Paweł Kołodziejski
b877df6da4 added some save/load code (in progress)
svn-id: r13735
2004-05-02 11:49:08 +00:00
Paweł Kołodziejski
cdc7324951 stub for digital imuse save/load
svn-id: r13734
2004-05-02 10:07:59 +00:00
Paweł Kołodziejski
0b86e3e69c - update names
- remove nonused access to atributes sequence in comi

svn-id: r13721
2004-05-01 18:36:13 +00:00
Paweł Kołodziejski
319ae4deed cleanup
svn-id: r13659
2004-04-28 05:39:53 +00:00
Paweł Kołodziejski
1e83b30b98 that is not need anymore
svn-id: r13656
2004-04-27 17:31:28 +00:00
Torbjörn Andersson
707e9a403b Fixed warning by removing unused variable.
svn-id: r13650
2004-04-27 09:53:44 +00:00
Paweł Kołodziejski
88643e3363 imuse audio stream are use dynamic append size now
svn-id: r13647
2004-04-26 21:29:49 +00:00
Paweł Kołodziejski
e256a54205 fixed logic code bug. it should not try start sound if not free slot
svn-id: r13641
2004-04-26 19:30:12 +00:00
Paweł Kołodziejski
f90a2a30c2 locking resource sounds while using them to prevent expire
svn-id: r13640
2004-04-26 19:22:27 +00:00
Paweł Kołodziejski
883fdfdb7c rename
svn-id: r13638
2004-04-26 08:58:03 +00:00
Paweł Kołodziejski
2ee813b7c2 forgot it
svn-id: r13637
2004-04-26 08:17:19 +00:00
Paweł Kołodziejski
6ca5f9a38e mixer buffer size depend on format of sound, it's 1 second timed buffer
svn-id: r13636
2004-04-26 08:06:53 +00:00
Paweł Kołodziejski
32d7c8c181 fixed stopping imuse sounds
svn-id: r13635
2004-04-26 07:47:12 +00:00
Paweł Kołodziejski
d2aa9b91b5 fixed cue music in FT
svn-id: r13633
2004-04-26 06:26:18 +00:00
Paweł Kołodziejski
bdf9867041 added some indexed comments
svn-id: r13632
2004-04-26 05:18:45 +00:00
Paweł Kołodziejski
7251d5324e - added workaround for strange regions length in some FT voc samples
- increased regions up to 70

svn-id: r13631
2004-04-25 19:51:46 +00:00
Paweł Kołodziejski
cc5fb7fc58 dropped pull method for imuse
svn-id: r13628
2004-04-25 17:24:17 +00:00
Paweł Kołodziejski
bcb5005c31 few corrections, more debug
svn-id: r13618
2004-04-24 20:41:30 +00:00
Paweł Kołodziejski
be28bc0403 add check if track is meanwhile stoped
svn-id: r13617
2004-04-24 20:02:17 +00:00
Paweł Kołodziejski
5241ae7368 forgot removed hack
svn-id: r13616
2004-04-24 20:00:15 +00:00
Paweł Kołodziejski
24e49664e4 in pull method code also
svn-id: r13615
2004-04-24 16:17:10 +00:00
Paweł Kołodziejski
415a0f6880 c&p bug, it should not break loop but continue
svn-id: r13614
2004-04-24 16:15:01 +00:00
Paweł Kołodziejski
443d7ec553 fixed bug related to regions. sound of status for remove should not processed anymore
svn-id: r13613
2004-04-24 15:58:51 +00:00
Paweł Kołodziejski
e369538e34 free slot and return NULL when it can't open bundle file
svn-id: r13612
2004-04-24 15:33:36 +00:00
Paweł Kołodziejski
6c94b42f90 added experimental and buggy pull method to imuse, it's disabled by default, to enable uncoment in dimuse.h define #ENABLE_PULLMETHOD
svn-id: r13571
2004-04-13 06:29:34 +00:00
Paweł Kołodziejski
8d6a1c1245 disabled wait in stopAllSounds in imuse digital, it can cause deadlock
svn-id: r13562
2004-04-12 13:34:34 +00:00
Paweł Kołodziejski
f41e7a1e81 pull not pool
svn-id: r13547
2004-04-11 18:58:50 +00:00
Paweł Kołodziejski
f489a2ae75 pull not pool
svn-id: r13546
2004-04-11 18:57:44 +00:00
Paweł Kołodziejski
b05cc19d0d add initial code for pull procedure
svn-id: r13545
2004-04-11 18:56:32 +00:00
Paweł Kołodziejski
3a04ee24cd exclude for FT sound loops
svn-id: r13543
2004-04-11 14:56:11 +00:00
Paweł Kołodziejski
def44acc6f implemented 'fade buffers' stuff
svn-id: r13542
2004-04-11 14:48:50 +00:00
Max Horn
a78fb36798 cleanup
svn-id: r13528
2004-04-10 00:17:42 +00:00
Paweł Kołodziejski
95c17148ae fixed 'region' code
svn-id: r13526
2004-04-09 21:44:29 +00:00
Paweł Kołodziejski
e795a7ce65 revert
svn-id: r13523
2004-04-09 18:19:22 +00:00
Paweł Kołodziejski
c2e0647f6a -fix for dig demo
-handle some music opcodes without filename

svn-id: r13514
2004-04-09 06:17:20 +00:00
Paweł Kołodziejski
5763122a69 back refreshScript only for DIG, add stopping music while changing bundle
svn-id: r13513
2004-04-09 05:43:24 +00:00
Paweł Kołodziejski
d368d2e7fa refreshScript was wrong used
svn-id: r13512
2004-04-09 04:56:18 +00:00
Paweł Kołodziejski
5f89f5b2b7 correction for stoping sequence
svn-id: r13511
2004-04-09 04:20:17 +00:00
Paweł Kołodziejski
6a175f294c rename to _nextSeqToPlay
svn-id: r13510
2004-04-09 03:57:18 +00:00
Paweł Kołodziejski
263bd0d0e7 another fix
svn-id: r13503
2004-04-08 22:46:22 +00:00
Paweł Kołodziejski
6da153dc12 fix for music code
svn-id: r13502
2004-04-08 21:59:40 +00:00
Paweł Kołodziejski
83b7d7f84c fix for region code
svn-id: r13501
2004-04-08 21:13:25 +00:00
Paweł Kołodziejski
c210064420 ops and forgot :)
svn-id: r13496
2004-04-07 17:49:22 +00:00
Paweł Kołodziejski
ad65c8e6b2 corections to music code
svn-id: r13492
2004-04-07 07:17:16 +00:00
Paweł Kołodziejski
2b9311aa26 - split imuse digital code,
- cleanup a little,
- added pool method for FT voc sample from resource,
- make struct sync, jump, regions dynamic memory allocation

svn-id: r13486
2004-04-06 19:46:43 +00:00
Paweł Kołodziejski
b973869456 that is not needed anymore
svn-id: r13481
2004-04-06 06:20:51 +00:00
Paweł Kołodziejski
1470818bc0 that is not needed anymore
svn-id: r13480
2004-04-06 06:19:52 +00:00
Paweł Kołodziejski
f44291f6b6 remove usage VAR_SYNC. in scripts used only one time, it's set to 0
svn-id: r13472
2004-04-05 20:07:04 +00:00
Paweł Kołodziejski
f141ad488b added voice group volume to scumm engine for imuse digital and implemeted volume groups control
svn-id: r13468
2004-04-05 18:24:36 +00:00
Max Horn
39765b0d19 Remove explicit OSystem parameter from StackLock constructor; added OSystem::displayMessageOnOSD (not yet used; default implementation provided)
svn-id: r13413
2004-03-28 20:31:18 +00:00
Paweł Kołodziejski
7041ba3568 implemented priorites for imuse sounds
svn-id: r13392
2004-03-27 20:26:25 +00:00
Paweł Kołodziejski
0974887290 cleanup, and fix bug in table
svn-id: r13389
2004-03-27 18:12:18 +00:00
Paweł Kołodziejski
f6d131f6c6 some changes to imuse digital
svn-id: r13387
2004-03-27 17:03:42 +00:00
Paweł Kołodziejski
dbf56846c9 changed a little hook id code
svn-id: r13374
2004-03-23 22:51:44 +00:00
Paweł Kołodziejski
e2a5b67e42 fixed fade out delay
svn-id: r13373
2004-03-23 21:42:47 +00:00
Paweł Kołodziejski
f2f6c75ba5 fix for voice bundle bug in german version comi
svn-id: r13260
2004-03-13 17:41:36 +00:00
Max Horn
ad820d7893 unsigned ints are always >= 0 (fix warnings)
svn-id: r13167
2004-03-03 10:56:46 +00:00
Paweł Kołodziejski
41e6bba009 synced local imuse. many bug fixes, and few new bugs :)
svn-id: r13153
2004-03-02 20:35:48 +00:00
Max Horn
c6752cccf5 renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend
svn-id: r13087
2004-02-28 12:58:13 +00:00
Paweł Kołodziejski
abdb4fbe87 fixed bug #892426 - improved FT sound loops
svn-id: r12886
2004-02-14 15:14:30 +00:00
Eugene Sandulenko
d51f4c3b46 Fix compilation
svn-id: r12883
2004-02-14 14:44:47 +00:00
Max Horn
7447ea8fb3 Explaining odd hacks with a comment is usually a good idea :-)
svn-id: r12875
2004-02-14 12:01:07 +00:00
Paweł Kołodziejski
a690c17bb2 fix for bug #896525, it align pull data and freq to 25 calls per sec.
svn-id: r12873
2004-02-14 10:52:08 +00:00
James Brown
5ee96b4625 Add mutex tracking to make it easier to debug imuse deadlocks
svn-id: r12870
2004-02-14 08:56:26 +00:00
Paweł Kołodziejski
d474ccf756 proper usage actor talkVolume
svn-id: r12841
2004-02-13 06:43:10 +00:00
Max Horn
c7424312c3 improved debug message; code simplification
svn-id: r12677
2004-01-30 20:49:26 +00:00
Max Horn
176aa74827 Renamed the 'pan' effect of the mixer to 'balance', since that is what we actually do; applied patch #886786 which corrects a bug in the balance code
svn-id: r12665
2004-01-29 18:15:27 +00:00
Max Horn
747cbef8d7 Fix for bug #882081
svn-id: r12574
2004-01-22 19:43:36 +00:00
Paweł Kołodziejski
b982864a8d fixed bug #881141
svn-id: r12569
2004-01-22 00:00:31 +00:00
Travis Howell
b8e739ae3d Add newline
Prevent overlapping speech in dig.

svn-id: r12530
2004-01-20 00:21:24 +00:00
Paweł Kołodziejski
bb8f156882 improved fade param for dig demo
svn-id: r12514
2004-01-19 19:25:11 +00:00
Paweł Kołodziejski
409c182b4a added continue play state song after sequence song finished
svn-id: r12508
2004-01-19 17:37:15 +00:00
Torbjörn Andersson
4b40dc8b40 Add newline to the last line to shut up GCC warning.
svn-id: r12496
2004-01-18 19:42:55 +00:00
Paweł Kołodziejski
c7a66d4498 right it should be signed :)
svn-id: r12495
2004-01-18 19:00:44 +00:00
Max Horn
c44bdf033e I recommend turning on signedness warnings, and honoring them :-)
svn-id: r12493
2004-01-18 18:42:44 +00:00
Paweł Kołodziejski
8f465b96bb fixed debug params
svn-id: r12492
2004-01-18 18:04:41 +00:00
Paweł Kołodziejski
14f80f9d6b this too
svn-id: r12491
2004-01-18 17:01:03 +00:00
Paweł Kołodziejski
b3c00e71ba removed markers
svn-id: r12490
2004-01-18 16:59:54 +00:00
Paweł Kołodziejski
f7a92ad02d volumes vars too
svn-id: r12489
2004-01-18 16:44:58 +00:00
Paweł Kołodziejski
2874917701 optimized types for tables
svn-id: r12488
2004-01-18 16:43:16 +00:00
Paweł Kołodziejski
fa354638c6 optimized tables a little
svn-id: r12487
2004-01-18 16:32:30 +00:00
Paweł Kołodziejski
5f2d92340e removed no needed call
svn-id: r12486
2004-01-18 16:07:49 +00:00
Chris Apers
130abce642 Fixed PalmOS stuffs
svn-id: r12485
2004-01-18 16:02:10 +00:00
Paweł Kołodziejski
f58962043f next cleanup
svn-id: r12475
2004-01-18 12:17:41 +00:00
Paweł Kołodziejski
b9e93634fb next cleanup
svn-id: r12472
2004-01-18 11:39:29 +00:00
Paweł Kołodziejski
4a0ec9638e cleanup
svn-id: r12471
2004-01-18 11:18:46 +00:00
Paweł Kołodziejski
f27e6a27d6 cleanup
svn-id: r12470
2004-01-18 09:35:05 +00:00
Paweł Kołodziejski
a2c0980aab fixed stupid bug
svn-id: r12458
2004-01-17 21:55:06 +00:00
Paweł Kołodziejski
3a4ee39448 added code for dig music
svn-id: r12445
2004-01-17 08:34:54 +00:00
Max Horn
c14e7a0259 pedantic change
svn-id: r12414
2004-01-15 20:37:26 +00:00
Paweł Kołodziejski
69c935a26e fix overload algo position music
svn-id: r12406
2004-01-15 08:01:28 +00:00
Paweł Kołodziejski
ea69029982 song scene now works better
svn-id: r12405
2004-01-15 07:02:29 +00:00
Paweł Kołodziejski
feb0b79e08 or rather like that
svn-id: r12404
2004-01-15 06:46:31 +00:00
Paweł Kołodziejski
5d9c4bfd1e position should be based on data offset
svn-id: r12403
2004-01-15 06:37:00 +00:00
Paweł Kołodziejski
6a85ab6af5 synced with local sources:
- comi music implementation(not finished),
- reorganized comi tables,
- some fixes for handling hookId

svn-id: r12395
2004-01-14 22:07:24 +00:00
Paweł Kołodziejski
89318f10fe fixed bundle decompression for some case
svn-id: r12394
2004-01-14 21:46:58 +00:00
Paweł Kołodziejski
ee3c512277 fix - stop played song when new
hack - for completable comi song scene

svn-id: r12390
2004-01-14 16:46:19 +00:00
Paweł Kołodziejski
dd2262b187 fixed crash on exit when using imuse digital
svn-id: r12389
2004-01-14 16:00:24 +00:00
Paweł Kołodziejski
b4655ff7f9 - fix: correct range
svn-id: r12349
2004-01-12 20:20:33 +00:00
Paweł Kołodziejski
a60c66564b - fix - proper place for stopallsound
- fix - correct fade value

svn-id: r12347
2004-01-12 19:32:44 +00:00
Paweł Kołodziejski
0058057d41 - added delay at stopAllsounds
- changes some struct names
- improved hadling FT music tables(seqence, cue point, ...)
- moved some music part into seperate file
- added fadeOut music for FT

svn-id: r12345
2004-01-12 19:15:07 +00:00
Paweł Kołodziejski
e792b1c715 update
svn-id: r12333
2004-01-12 07:51:34 +00:00
Paweł Kołodziejski
441fc1a0d7 some changes to ft music sequences
svn-id: r12332
2004-01-12 07:48:39 +00:00
Paweł Kołodziejski
158acbb70c added one opcode
svn-id: r12292
2004-01-10 09:44:22 +00:00
Paweł Kołodziejski
d2a7bf396d added two opcodes
svn-id: r12291
2004-01-10 09:29:34 +00:00
Paweł Kołodziejski
4654bab076 removed stackLock and added locking tracks to prevent removed
svn-id: r12290
2004-01-10 07:07:19 +00:00
Jonathan Gray
ab7db8fb04 remove unused vars
svn-id: r12288
2004-01-10 03:58:22 +00:00
Paweł Kołodziejski
9d7d23a7c6 some changes to sync stuff
svn-id: r12286
2004-01-09 22:36:40 +00:00
Paweł Kołodziejski
7ab3348329 added lipSync code
svn-id: r12284
2004-01-09 22:10:32 +00:00
Paweł Kołodziejski
25854050de added loading Sync datas
svn-id: r12283
2004-01-09 20:20:01 +00:00
Travis Howell
722de1e04a Regression fix from aquadran
svn-id: r12280
2004-01-09 15:13:56 +00:00
Jonathan Gray
f97819b1af another commit on aquadran's behalf; remove old hack
svn-id: r12277
2004-01-09 13:50:10 +00:00
Jonathan Gray
93f3c0df34 commit on aquadran's behalf that fixes music distortion
svn-id: r12275
2004-01-09 13:16:06 +00:00
Paweł Kołodziejski
2bc4c1e9cd moved malloc and free
svn-id: r12269
2004-01-08 23:22:51 +00:00
Paweł Kołodziejski
67dff87a92 revert - comp_input can be more than 0x2000 size
svn-id: r12268
2004-01-08 23:17:54 +00:00
Paweł Kołodziejski
9d21fd44f0 fix memleak
svn-id: r12267
2004-01-08 22:54:06 +00:00
Max Horn
ebecf1dbaa unify _vm / _scumm usage
svn-id: r12262
2004-01-08 20:37:26 +00:00
Paweł Kołodziejski
e68a365059 ops
svn-id: r12261
2004-01-08 18:32:29 +00:00
Paweł Kołodziejski
7169da6ee1 jumps are now better handled
svn-id: r12260
2004-01-08 18:25:30 +00:00
Paweł Kołodziejski
6d8c2d0461 synced with local sources
svn-id: r12257
2004-01-08 17:07:21 +00:00
Paweł Kołodziejski
afc254fa76 tuned max number
svn-id: r12255
2004-01-08 16:30:37 +00:00
Paweł Kołodziejski
7396b99f38 fixed comi bundle codec output_size and related stuff. also propably strange hang/100% cpu usage
svn-id: r12254
2004-01-08 15:48:41 +00:00
Oliver Kiehl
ea154852b7 add newlines to end of files
svn-id: r12249
2004-01-08 13:36:26 +00:00
Chris Apers
ac801f9828 Save more memory on PalmOS
svn-id: r12246
2004-01-08 12:14:48 +00:00
Paweł Kołodziejski
8c2da44b97 add name here too
svn-id: r12239
2004-01-08 09:00:29 +00:00
Paweł Kołodziejski
9931fe9a34 or maybe not :)
svn-id: r12237
2004-01-08 08:43:15 +00:00
Paweł Kołodziejski
201902bfef jumps only for the same hookid and ignore jumps for music for now. added sound names for checks if some sounds are really have a lot jumps and regions(it's posssible), in bundle loop size can be 0 and after that loops should be ended
svn-id: r12236
2004-01-08 08:39:25 +00:00
Max Horn
f224da09f4 fix a memory leak; re-add assert, just to be sure
svn-id: r12230
2004-01-08 01:59:11 +00:00
Paweł Kołodziejski
7698782979 fixed uninitialized warning
svn-id: r12227
2004-01-07 22:12:45 +00:00
Paweł Kołodziejski
d1b1cbf948 some cleanup
svn-id: r12226
2004-01-07 21:02:48 +00:00
Paweł Kołodziejski
0a93e978c5 some cleanup
svn-id: r12225
2004-01-07 20:17:51 +00:00
Paweł Kołodziejski
81c8c722f5 fixed size result related bug in imuse digi
svn-id: r12224
2004-01-07 19:38:37 +00:00
Max Horn
d2a56c01d6 is this discrepancy here intended?
svn-id: r12216
2004-01-07 14:03:40 +00:00
James Brown
a04b2fc020 Temporarly enabling this buffer underrun hack until aquadran looks at it. (See bug 872339)
svn-id: r12215
2004-01-07 13:40:54 +00:00
Max Horn
2e1026f8fe malloc/new are relatively slow operations; avoid doing them in tight loops, if possible
svn-id: r12213
2004-01-07 13:29:12 +00:00
Paweł Kołodziejski
9fc9e6be20 changed lipsync func param
svn-id: r12210
2004-01-07 06:51:45 +00:00
Jonathan Gray
3577dad949 comment unused vars
svn-id: r12208
2004-01-07 06:08:33 +00:00
Paweł Kołodziejski
1e2ff5a469 handle jumps
svn-id: r12207
2004-01-07 05:58:12 +00:00