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
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
45 Commits
Author SHA1 Message Date
Thierry Crozat 026d1e83ac AGS: don't start sound fadeout if skipping a cutscene 
From upstream d742c415a898e9c52875098f3f40ecffa57b22ee
 2022-10-09 17:58:53 +01:00
Thierry Crozat 025e89f6e3 AGS: Removed unused global variable 
(could be remains of an old audio threading code)

From upstream a0424b98c6096da653824ec6fc03521f3583558e
 2022-06-21 23:28:01 +01:00
Paul Gilbert d2b03800c6 AGS: Allow to place sounds on a crossfade channels for compatibility 
From upstream 86564e983572b4ffb3cd12b00c116ae91c6fcbe4
 2022-04-29 22:20:39 -07:00
Paul Gilbert a6f42ad1ab AGS: Fixing various "unused va/arg" warnings + removed empty funcs 
From upstream 61771ecd638338806c40d0da2bf1addea06cac90
 2022-04-25 21:44:40 -07:00
Paul Gilbert 5060848b48 AGS: Support requesting particular audio driver 
From upstream 076e675a3d031cd0a9d162f914e6d94c93a10d71
 2022-04-21 21:20:58 -07:00
Paul Gilbert 9f05a91eb5 AGS: Fixed engine crash in case of too many reserved channels 
From upstream b954ad324b6d0bc6b981419093c53062fc11f1f5
 2022-04-08 22:17:51 -07:00
Paul Gilbert 0e41656981 AGS: Fixed utility audio chans were missing a sync with audio core 
From upstream 6560bb43ee8723c160c8ccaa1fcff007b99f1aeb
 2022-03-27 19:14:54 -07:00
Paul Gilbert 0988fbbe78 AGS: Dispose SOUNDCLIP when stopped playing 
From upstream 60d40072b429a641f6fcbf3cdb8c60809fc3f770
 2022-03-19 21:25:09 -07:00
Paul Gilbert 16b89bd8ea AGS: tidy SOUNDCLIP's fields (volume, panning) and methods 
From upstream 66514167d3463f8191b10ec13898df136e8e33ee
 2022-03-19 21:25:08 -07:00
Paul Gilbert 699a72af3b AGS: Removed redundant sound destroy calls 
From upstream c8bedc8838635381fc186c9f54e8789a8c276063
 2022-03-19 21:25:08 -07:00
Paul Gilbert a4bf82bd35 AGS: Removed "volume" param out of load clip factory functions 
From upstream 903c4d7d69bf0400447b099cbd0b2818f3c1f7c7
 2022-03-19 21:25:08 -07:00
Paul Gilbert 07f36ce19b AGS: Store clip's ID in SOUNDCLIP instead of a pointer to unknown type 
From upstream 954e9bb27e7aea873931ba20ad89397d4dc004bd
 2022-03-18 21:29:56 -07:00
Paul Gilbert c25b08448d AGS: Removed AudioChannelsLock as it's no longer needed 
From upstream 43f9320f66bb881920e6f812d1c642e793b134b6
 2022-03-18 21:29:56 -07:00
Paul Gilbert b09a7d3bde AGS: Fixed engine crash in case of too many reserved channels 
From upstream 398783561b0079720950b117ba1db110100706f6
 2022-03-18 21:29:55 -07:00
Paul Gilbert ee311d660f AGS: Make game audiochannels limit defined by a game version 
From upstream 65f0b843dfd85967135eca1bda46976aa1ddcf26
 2022-03-17 21:49:25 -07:00
Paul Gilbert 3167bac67b AGS: More clear use of the "max channels" constants 
From upstream 2fd582a2a5fc9d38643277903854a977f8995e07
 2022-03-17 21:49:25 -07:00
Paul Gilbert 74254fdcf4 AGS: Simplified couple of set_volume calls 
From upstream 3d4187e64237a7fa6f7f7bf4fb6477369bae1af4
 2022-03-17 21:49:25 -07:00
Eugene Sandulenko abea37c9bb ALL: Update ScummVM project license to GPLv3+ 2021-12-26 18:48:43 +01:00
Paul Gilbert 7e7ac21f06 AGS: Delay starting sound playback until a channel is set 
In AGS, setting the channel for music, sfx, or voice
frequently happens after the call to play has already been done.
This poses a problem for ScummVM, since I need the sound type
directly for the playStream call. And it's not feasible to
refactor everywhere that plays a clip to set the channel first.
With this change, any play call sets a flag, and defers calling
playStream until the channel is set. Hopefully there aren't
any places that call play without setting the channel before/after.
 2021-08-28 12:18:02 -07:00
Paul Gilbert c7365214d1 AGS: improved the way view clips are remapped for old audio system 
From upstream 525e0bb3de701f1066ca7ff51cbb6a33877390fc
 2021-06-13 21:09:05 -07:00
Paul Gilbert 701396361c AGS: Import of fresh codebase 2021-06-13 21:08:44 -07:00
Paul Gilbert ce22f46e8a AGS: Respect ScummVM volume controls 
I experimented, but couldn't get the AGS in-game volume
controls to map to the ScummVM volume controls. The reason
being that the games frequently set the volume during their
startup, sometimes multiple times. The best I could do was
set up the different sound types in AGS to use the
Audio::Mixer::SoundType enum, so that any ScummVM volume
control will be respected in addition to the AGS volumes.
 2021-04-02 21:18:11 -07:00
Paul Gilbert dc019af530 AGS: Move character.cpp globals to Globals 2021-03-08 19:04:35 -08:00
Paul Gilbert 37b563ef35 AGS: Move game globals to Globals 2021-03-07 19:23:24 -08:00
Paul Gilbert 3fb4b083ec AGS: Move audio globals to Globals 2021-03-07 15:54:11 -08:00
Paul Gilbert fd5c11f382 AGS: Move debug globals to Globals 2021-03-06 15:11:38 -08:00
Paul Gilbert 94423abaa1 AGS: Move usetup to Globals 2021-03-05 21:36:00 -08:00
Paul Gilbert 8b158629c1 GLOBALS: Move audio.cpp globals to Globals 2021-03-02 18:53:52 -08:00
Paul Gilbert ef245e2104 AGS: Move thisroom to Globals 2021-02-28 13:27:21 -08:00
Paul Gilbert 334b2a9d48 AGS: Move play to Globals 2021-02-27 15:31:34 -08:00
Paul Gilbert 1a8ae27b58 AGS: Move game & spriteset into Globals 2021-02-26 21:28:53 -08:00
Cameron Cawley ff276f88ff AGS: Refactor audio code 2021-02-08 18:03:22 -08:00
Thierry Crozat 8659371368 AGS: Fix volume range in SOUNDCLIP::get_volume 
The original has an inline function that returns the volume as a
percentage. In ScummVM this was made pure virtual and derived
classes returned the volume from the mixer between 0 and 255.
The different range caused various asserts.

This commit restore the code to how it is in the original AGS.
If we find issues with synchronization that require using the
volume from the mixer, we can't change the code back to using
a virtual function but we will need to scale the mixer volume
to be in the [0, 100] range.
 2021-02-06 16:37:31 -08:00
Thierry Crozat 304ba31e4b AGS: Fix out of bound crossfade volume 
The code was trying to pass a volume defined between 0 and 255
to a function expecting a volume between 0 and 100, causing an
assert.
 2021-02-06 16:37:31 -08:00
Paul Gilbert cf9bbb2bb2 AGS: Beginnings of new Globals class 2021-02-06 16:37:31 -08:00
Paul Gilbert 6f7c777a21 AGS: Sound cleanup and hookup to ScummVM decoders 
It isn't perfect.. some of the SOUNDCLIP variables don't do
anything yet. But it at least properly implements playback
of sound now
 2021-02-06 16:37:31 -08:00
Paul Gilbert 8c72948dee AGS: Fix global objects crashing ScummVM on startup 2021-02-06 16:37:31 -08:00
Paul Gilbert 77cdd07d6f AGS: Added engine/media/audio/ folder 2021-02-06 16:37:31 -08:00
Paul Gilbert fe46be9223 AGS: Added engine/ac/ folder 2021-02-06 16:37:31 -08:00
Paul Gilbert 9a78e04039 AGS: Beginnings of engine/ inclusion 2021-02-06 16:37:31 -08:00
Paul Gilbert a7a9ca0543 AGS: Adding AGS3 namespace to cpp files 2021-02-06 16:37:31 -08:00
Paul Gilbert d8e471b03c AGS: Changing Common namespace to Shared 2021-02-06 16:37:31 -08:00
dreammaster 8026e4bb30 AGS: Run astyle formatting 2021-02-06 16:37:31 -08:00
Paul Gilbert bd6a58d1a1 AGS: Adding ScummVM comment headers 2021-02-06 16:37:31 -08:00
Paul Gilbert a60d290a08 AGS: Initial addition of engine/ and shared/ folders 2021-02-06 16:37:31 -08:00