cpp/openttd-patchpack/source Changeset - r28514:dc164dfdd1a1

Changeset - r28514:dc164dfdd1a1

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Peter Nelson - 3 months ago 2024-01-19 17:01:36
peter1138@openttd.org

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

2 files changed with 8 insertions and 1 deletions:

src/music/dmusic.cpp

src/music/win32_m.cpp

0 comments (0 inline, 0 general)

src/music/dmusic.cpp

➞

Show inline comments

@@ @@ -651,6 +651,9 @@ static void MidiThreadProc() @@
 				TransmitNotesOff(_buffer, block_time, cur_time);
 				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. */
 				clock->GetTime(&playback_start_time);

src/music/win32_m.cpp

➞

Show inline comments

@@ @@ -110,6 +110,8 @@ static void TransmitStandardSysex(MidiSy @@
  */
 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 */
 	std::unique_lock<std::mutex> mutex_lock(_midi.lock, std::defer_lock);
 	if (!mutex_lock.try_lock()) return;
@@ @@ -163,6 +165,9 @@ void CALLBACK TimerCallback(UINT uTimerI @@
 			_midi.current_block = 0;
 			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) {
 		/* not playing, stop the timer */
@@ @@ -173,7 +178,6 @@ void CALLBACK TimerCallback(UINT uTimerI @@
+	}
 	/* check for volume change */
 	static int volume_throttle = 0;
 	if (_midi.current_volume != _midi.new_volume) {
 		if (volume_throttle == 0) {
 			Debug(driver, 2, "Win32-MIDI: timer: volume change");

0 comments (0 inline, 0 general)