gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change: Invalidate music volume when restarting music playback on Windows. (#11836)

Browse Source
This commit is contained in:
Peter Nelson 2024-01-19 17:01:36 +00:00 committed by GitHub
parent 6a2c37b4ed
commit 9cf47af490
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/music/dmusic.cpp
View File

@ -651,6 +651,9 @@ static void MidiThreadProc()
TransmitNotesOff(_buffer, block_time, cur_time); TransmitNotesOff(_buffer, block_time, cur_time);
MemSetT<byte>(channel_volumes, 127, lengthof(channel_volumes)); MemSetT<byte>(channel_volumes, 127, lengthof(channel_volumes));
/* Invalidate current volume. */
current_volume = UINT8_MAX;
last_volume_time = 0;
/* Take the current time plus the preload time as the music start time. */ /* Take the current time plus the preload time as the music start time. */
clock->GetTime(&playback_start_time); clock->GetTime(&playback_start_time);

6
src/music/win32_m.cpp
View File

@ -110,6 +110,8 @@ static void TransmitStandardSysex(MidiSysexMessage msg)
*/ */
void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR) void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR)
{ {
static int volume_throttle = 0;
/* Ensure only one timer callback is running at once, and prevent races on status flags */ /* Ensure only one timer callback is running at once, and prevent races on status flags */
std::unique_lock<std::mutex> mutex_lock(_midi.lock, std::defer_lock); std::unique_lock<std::mutex> mutex_lock(_midi.lock, std::defer_lock);
if (!mutex_lock.try_lock()) return; if (!mutex_lock.try_lock()) return;
@ -163,6 +165,9 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR
_midi.current_block = 0; _midi.current_block = 0;
MemSetT<byte>(_midi.channel_volumes, 127, lengthof(_midi.channel_volumes)); MemSetT<byte>(_midi.channel_volumes, 127, lengthof(_midi.channel_volumes));
/* Invalidate current volume. */
_midi.current_volume = UINT8_MAX;
volume_throttle = 0;
} }
} else if (!_midi.playing) { } else if (!_midi.playing) {
/* not playing, stop the timer */ /* not playing, stop the timer */
@ -173,7 +178,6 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR
} }
/* check for volume change */ /* check for volume change */
static int volume_throttle = 0;
if (_midi.current_volume != _midi.new_volume) { if (_midi.current_volume != _midi.new_volume) {
if (volume_throttle == 0) { if (volume_throttle == 0) {
Debug(driver, 2, "Win32-MIDI: timer: volume change"); Debug(driver, 2, "Win32-MIDI: timer: volume change");