ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,292 Commits 45 Branches 139 Tags
7331a7cbefed7be415da170a32a2549b1c18fd12
Commit Graph
64 Commits
Author SHA1 Message Date
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Max Horn 42ab839dd6 AUDIO: Rename sound/ dir to audio/ 
svn-id: r55850
 2011-02-09 01:09:01 +00:00
Max Horn a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Max Horn 7ab85cd035 SCUMM: Get rid of some redundant enum vals in iMuse digitial 
svn-id: r47436
 2010-01-22 14:11:33 +00:00
Max Horn f0a0ed8f9e Get rid of Mixer::FLAG_REVERSE_STEREO; also change SCUMM's iMuse Digital emulation to reverse stereo again, as it once seems to have been intended 
svn-id: r47374
 2010-01-19 11:19:53 +00:00
Max Horn c489259353 Switch SCUMM from AppendableAudioStream to QueuingAudioStream 
svn-id: r47183
 2010-01-08 22:10:19 +00:00
Travis Howell cff307e55d Fix bug #2821986 - COMI: setting to 'subtitles only' does not disable speech. 
svn-id: r42548
 2009-07-17 00:25:27 +00:00
Max Horn 6f4b567124 SCUMM: Split intern.h into multiple headers 
svn-id: r39567
 2009-03-20 16:33:58 +00:00
Torbjörn Andersson 7aac83007d Fixed typo in debug message. 
svn-id: r30691
 2008-01-28 21:54:44 +00:00
Jordi Vilalta Prat 66e9d4f5e8 Removed trailing spaces. 
svn-id: r30664
 2008-01-27 19:47:41 +00:00
Paweł Kołodziejski 41e478d142 fix debug output 
svn-id: r30595
 2008-01-21 00:39:44 +00:00
Paweł Kołodziejski fe8c2b89b1 for debug logs for dimuse 
svn-id: r30594
 2008-01-21 00:10:14 +00:00
Paweł Kołodziejski ec66f6765c added experimental hack to code to prevent the same start music again if old one didn't have chance finish. it's fix bug #1861704, it may fix other similiar things when seq is to null. added few changes to debug logs. 
svn-id: r30590
 2008-01-20 19:30:48 +00:00
Paweł Kołodziejski 77838d91e6 fix/workaround for bug #1624464, as we do not support game playing on two different CDs 
svn-id: r30588
 2008-01-20 17:02:28 +00:00
Paweł Kołodziejski 703667b606 allow force flush fade track, it happen while very fast switching rooms 
svn-id: r30570
 2008-01-19 19:32:40 +00:00
Paweł Kołodziejski 78166fb40b changed warning into error, to be know for sure if it still trigger 
svn-id: r30568
 2008-01-19 17:35:06 +00:00
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
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 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 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
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 16717ce5e1 revert updateFadeMusicTrack 
svn-id: r30475
 2008-01-13 22:02:27 +00:00
Paweł Kołodziejski 9483400812 fixed fadeOutMusic in transitions 
svn-id: r30465
 2008-01-13 01:03:15 +00:00
Max Horn 1194495ad3 cleanup 
svn-id: r30284
 2008-01-06 00:09:05 +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
Max Horn ef9dac103f stop low priority sounds which we want to override immediatly 
svn-id: r30275
 2008-01-05 23:44:05 +00:00
Max Horn 56ad5f493e Play SOU data instantly, not slightly delayed -> allows us to get rid of Track::streamSou & Track::mixerStreamRunning (have not yet removed the latter to avoid introducing a new savegame version) 
svn-id: r30268
 2008-01-05 22:57:36 +00:00
Max Horn 7ebdffb0cd Seems IMuseDigital::cloneToFadeOutTrack was using the wrong pan value all the time 
svn-id: r30267
 2008-01-05 22:45:35 +00:00
Max Horn f68d84b54f Moved some code which was being duplicated to methods of class Track 
svn-id: r30266
 2008-01-05 22:44:39 +00:00
Max Horn 923ad313dc Let the audio mixer delete the streamSou object 
svn-id: r30265
 2008-01-05 22:35:30 +00:00
Max Horn 3f6b2c97b7 When loading and before starting an iMuse Digitial track, reset it completely to zero 
svn-id: r30262
 2008-01-05 20:59:33 +00:00
Max Horn 8b12998c72 Use souStreamUsed to distinguish between 'stream' and 'streamSou' usage 
svn-id: r30257
 2008-01-05 20:49:18 +00:00
Max Horn c9a8d02f6e Do not busy wait in IMuseDigital::allocSlot on *any* platform 
svn-id: r30255
 2008-01-05 20:43:07 +00:00
Max Horn 305f60e0db Patch #1839861 (Possible workaround for bugs related to cloneToFadeOutTrack): Fixes bug #1848399 and apparently also #1527274 & #1763227 
svn-id: r30111
 2008-01-01 11:27:29 +00:00
Max Horn b9a5e9ea0e Fix for bug #1635361: COMI: Music fade-out broken for compressed audio 
svn-id: r30081
 2007-12-30 16:32:30 +00:00
Gregory Montoir 1a2d4c9c28 revised mutex handling a bit in dimuse : 
- protected access to Track.used in startSound
- removed mutex lock in cloneToFadeOutTrack as it's always called with mutex already locked on (shouldn't change anything, though, due to mutex re-entrancy)

svn-id: r29705
 2007-12-02 14:34:33 +00:00
Nicola Mettifogo 258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated. 
svn-id: r28966
 2007-09-19 08:40:12 +00:00