Paweł Kołodziejski
72d59da6cb
missed setting trackId while starSound,
...
added more debug output,
verification of jump code, it might have regressions
svn-id: r30565
2008-01-19 16:06:20 +00:00
Paweł Kołodziejski
00de511335
fixed support for compressed streams in dimuse
...
svn-id: r30564
2008-01-19 13:26:53 +00:00
Paweł Kołodziejski
2671e5083c
malloc -> new, free -> delete, added few asserts
...
svn-id: r30561
2008-01-19 11:14:28 +00:00
Paweł Kołodziejski
f0e131c9c3
fixed, it might overflow int32
...
svn-id: r30560
2008-01-19 10:58:43 +00:00
Max Horn
eb03de63bc
iMuse Digital: Moved track & table definition from dimuse.h into separate header files
...
svn-id: r30550
2008-01-18 17:08:53 +00:00
Max Horn
c2d1554c7d
Don't hardcode value for which we have wonderful and nice constants defined ;)
...
svn-id: r30549
2008-01-18 16:38:11 +00:00
Paweł Kołodziejski
d85e148f4f
restore TrackId meaning
...
svn-id: r30541
2008-01-17 22:55:22 +00:00
Paweł Kołodziejski
9a699c9705
reduction a bit of code
...
svn-id: r30538
2008-01-17 21:46:17 +00:00
Paweł Kołodziejski
51ad8e29be
fixed regression in allocSlot in dimuse, that fix bug #1874045
...
svn-id: r30536
2008-01-17 21:06:29 +00:00
Paweł Kołodziejski
0db783608b
forgot disable that too
...
svn-id: r30522
2008-01-16 22:24:23 +00:00
Paweł Kołodziejski
bd32e7a6b0
experimental seek in compressed streams in dimuse in time ms resolution
...
svn-id: r30521
2008-01-16 22:20:34 +00:00
Paweł Kołodziejski
6b33041172
ops
...
svn-id: r30519
2008-01-16 20:03:54 +00:00
Paweł Kołodziejski
bb2c102cbb
clarify warning
...
svn-id: r30518
2008-01-16 20:01:35 +00:00
Torbjörn Andersson
fe12cf8096
Fixed bad memory access. (Wrong index variable when reading sound->marker[].)
...
svn-id: r30506
2008-01-15 21:56:53 +00:00
Torbjörn Andersson
08f1357451
Use scumm_stricmp() instead of plain stricmp().
...
svn-id: r30505
2008-01-15 21:46:12 +00:00
Paweł Kołodziejski
552353663d
ops
...
svn-id: r30504
2008-01-15 21:38:06 +00:00
Paweł Kołodziejski
6bb2f44472
implement dimuse transition 12, not tested yet
...
svn-id: r30503
2008-01-15 21:35:03 +00:00
Torbjörn Andersson
8935c574d5
Fixed warnings.
...
svn-id: r30502
2008-01-15 20:36:54 +00:00
Torbjörn Andersson
5dc2caa307
Since the mixer uses 'delete' to free memory, we should allocate it with 'new'.
...
I don't know if I got all cases, but I no longer get any Valgrind warnings at
the beginning of CoMI when using the original sound/music files.
svn-id: r30501
2008-01-15 20:30:48 +00:00
Paweł Kołodziejski
d0e5df5bfa
ops
...
svn-id: r30500
2008-01-15 20:11:28 +00:00
Paweł Kołodziejski
c3d4abe4b7
fix last commit to release, and add version 2 fallback for compressed files
...
svn-id: r30499
2008-01-15 20:09:56 +00:00
Paweł Kołodziejski
75099c6c20
forgot release string in the 'marker'
...
svn-id: r30495
2008-01-15 19:34:35 +00:00
Paweł Kołodziejski
4b9d2e9370
implement loading markers "exit". dumped version 3 for compressed bun files, compress tools are not ready
...
svn-id: r30494
2008-01-15 12:51:26 +00:00
Paweł Kołodziejski
86714835f1
back to previous way of copying stream, so it continue old stream
...
svn-id: r30491
2008-01-15 01:35:05 +00:00
Paweł Kołodziejski
9639666629
if track sound data is compressed reset data offset to beginning of region. we need implement seek in stream anyway or drop support
...
svn-id: r30490
2008-01-15 00:37:37 +00:00
Paweł Kołodziejski
f433c62112
implement force flush old fadeTrack. fixed trackId in new fadeTrack, it wasn't set properly, caused switching regions.
...
svn-id: r30489
2008-01-14 23:41:42 +00:00
Paweł Kołodziejski
8ada12d3d8
revert last experimental dimuse change, force flush
...
svn-id: r30488
2008-01-14 21:42:39 +00:00
Paweł Kołodziejski
6992238026
experimental force flush fade track if it's in use
...
svn-id: r30487
2008-01-14 20:35:58 +00:00
Paweł Kołodziejski
c36b44878a
put 'break' here too, only one music in non fade tracks allowed
...
svn-id: r30486
2008-01-14 20:17:19 +00:00
Paweł Kołodziejski
f2f0d084e7
i forgot 'break' in the loop
...
svn-id: r30485
2008-01-14 20:12:35 +00:00
Paweł Kołodziejski
f15b41596b
implement special case for playing music with beginning offset where other one stopped
...
svn-id: r30483
2008-01-14 17:26:49 +00:00
Paweł Kołodziejski
5870bebd6d
fixed setting hookId for music, it doesn't worked before
...
svn-id: r30481
2008-01-14 14:48:35 +00:00
Paweł Kołodziejski
a6f8e5c89a
correction fade out music times in comi demo
...
svn-id: r30480
2008-01-13 23:48:56 +00:00
Torbjörn Andersson
9948b667ba
Indentation.
...
svn-id: r30477
2008-01-13 22:16:46 +00:00
Torbjörn Andersson
7b15433572
Removed unnecessary semi-colons.
...
svn-id: r30476
2008-01-13 22:12:35 +00:00
Paweł Kołodziejski
16717ce5e1
revert updateFadeMusicTrack
...
svn-id: r30475
2008-01-13 22:02:27 +00:00
Paweł Kołodziejski
bf07f977e2
revert experimental hack
...
svn-id: r30466
2008-01-13 01:08:22 +00:00
Paweł Kołodziejski
9483400812
fixed fadeOutMusic in transitions
...
svn-id: r30465
2008-01-13 01:03:15 +00:00
Paweł Kołodziejski
d27c118acc
additional missing stoppingSequence to music transitions.
...
svn-id: r30464
2008-01-13 00:15:43 +00:00
Paweł Kołodziejski
6b34fcc2b4
added missing stoppingSequence to music transitions. still i'm not sure if it trigger properly in our imuse implementation
...
svn-id: r30463
2008-01-13 00:10:30 +00:00
Paweł Kołodziejski
ae9e25b30f
refreshScripts should check for music state not sequence. it will create regressions in comi :) that part need more investigation.
...
svn-id: r30462
2008-01-12 23:54:19 +00:00
Paweł Kołodziejski
68f41bd71b
seqId 4 should pass fadeout music not silence ignore
...
svn-id: r30461
2008-01-12 23:30:07 +00:00
Max Horn
84e5398b1c
store the disk sounds/music were actually *loaded* from, instead of the 'current' disk
...
svn-id: r30310
2008-01-06 16:02:38 +00:00
Max Horn
690d38cfc4
Unify mixer pan/vol setting code
...
svn-id: r30308
2008-01-06 14:59:46 +00:00
Max Horn
79ba9686eb
Fix bug #1864932 : COMI: Game crashes on difficulty selection screen
...
svn-id: r30298
2008-01-06 13:54:19 +00:00
Filippos Karapetis
71980d0fbd
Fixed compilation
...
svn-id: r30285
2008-01-06 00:28:36 +00:00
Max Horn
1194495ad3
cleanup
...
svn-id: r30284
2008-01-06 00:09:05 +00:00
Max Horn
e52591ac0e
clarify comment
...
svn-id: r30283
2008-01-06 00:00:53 +00:00
Max Horn
d340e77f24
Made IMuseDigital::stopSound use flushTrack instead of setting track->toBeRemoved = true; cleanup in flushTrack()
...
svn-id: r30282
2008-01-05 23:58:27 +00:00
Max Horn
1d34ce3baa
Let the audio mixer take care of (i.e. dispose) the Track::stream object, too
...
svn-id: r30277
2008-01-05 23:53:28 +00:00