ihhub/fheroes2
1
0
Fork 0
mirror of https://github.com/ihhub/fheroes2.git synced 2026-10-12 02:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: use the TiMidity backend instead of Fluidsynth for MIDI playback (#9750)

Browse Source
This commit is contained in:
Oleg Derevenetz
2025-04-25 23:29:36 +08:00
committed by GitHub
parent 04f2b1b575
commit 99d2ae5ff9
4 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/msvc.yml
+1 -1
View File
@@ -98,7 +98,7 @@ jobs:
.\\docs\\README.txt \
files\\data\\*.h2d \
files\\lang\\*.mo \
files\\soundfonts\\* \
files\\timidity\\* \
.\\script\\demo\\*.bat \
.\\script\\demo\\*.ps1 \
.\\script\\homm2\\*.bat \
VisualStudio/fheroes2/common.props
+1 -1
View File
@@ -27,7 +27,7 @@ if exist maps (
xcopy /Y /S /Q files\data "$(OutDir)files\data\"
xcopy /Y /Q files\lang\*.mo "$(OutDir)files\lang\"
xcopy /Y /S /Q files\soundfonts "$(OutDir)files\soundfonts\"
xcopy /Y /S /Q files\timidity "$(OutDir)files\timidity\"
%(Command)</Command>
</PostBuildEvent>
script/windows/fheroes2.iss
+1 -1
View File
@@ -30,7 +30,7 @@ Source: "..\..\changelog.txt"; DestDir: "{app}"
Source: "..\..\docs\README.txt"; DestDir: "{app}"
Source: "..\..\files\data\*.h2d"; DestDir: "{app}\files\data"
Source: "..\..\files\lang\*.mo"; DestDir: "{app}\files\lang"
Source: "..\..\files\soundfonts\*.*"; DestDir: "{app}\files\soundfonts"
Source: "..\..\files\timidity\*"; DestDir: "{app}\files\timidity"; Flags: recursesubdirs
Source: "..\demo\*.bat"; DestDir: "{app}"
Source: "..\demo\*.ps1"; DestDir: "{app}"
Source: "..\homm2\*.bat"; DestDir: "{app}"
src/engine/audio.cpp
+5 -34
View File
@@ -469,8 +469,7 @@ namespace
return;
}
// REWIND_AND_PLAY_INFINITE should be handled by the SDL_Mixer itself
if ( musicTrackManager.getCurrentTrackPlaybackMode() != Music::PlaybackMode::RESUME_AND_PLAY_INFINITE ) {
if ( musicTrackManager.getCurrentTrackPlaybackMode() == Music::PlaybackMode::PLAY_ONCE ) {
return;
}
@@ -500,16 +499,7 @@ namespace
musicRestartManager.restartCurrentMusicTrack();
}
bool isMusicResumeSupported( const Mix_Music * mus )
{
assert( mus != nullptr );
const Mix_MusicType musicType = Mix_GetMusicType( mus );
return ( musicType == Mix_MusicType::MUS_OGG ) || ( musicType == Mix_MusicType::MUS_MP3 ) || ( musicType == Mix_MusicType::MUS_FLAC );
}
void playMusic( const uint64_t musicUID, Music::PlaybackMode playbackMode )
void playMusic( const uint64_t musicUID, const Music::PlaybackMode playbackMode )
{
// This function should never be called if a music track is currently playing.
// Thus we have a guarantee that the Mix_HookMusicFinished()'s callback will
@@ -528,34 +518,15 @@ namespace
return;
}
bool resumePlayback = false;
bool autoLoop = false;
if ( playbackMode == Music::PlaybackMode::RESUME_AND_PLAY_INFINITE ) {
if ( isMusicResumeSupported( mus.get() ) ) {
resumePlayback = true;
}
else {
// It is impossible to resume this track, let's reflect it by changing the playback mode
playbackMode = Music::PlaybackMode::REWIND_AND_PLAY_INFINITE;
autoLoop = true;
}
}
else if ( playbackMode == Music::PlaybackMode::REWIND_AND_PLAY_INFINITE ) {
autoLoop = true;
}
// Update the current track information while the music playback is not yet started, so the
// Mix_HookMusicFinished()'s callback cannot be called
musicTrackManager.updateCurrentTrack( musicUID, playbackMode );
const int loopCount = autoLoop ? -1 : 0;
int returnCode = -1;
// Resume the music only if at least 1 second of the track has been played.
if ( resumePlayback && track->getPosition() > 1 ) {
returnCode = Mix_FadeInMusicPos( mus.get(), loopCount, musicFadeInMs, track->getPosition() );
if ( playbackMode == Music::PlaybackMode::RESUME_AND_PLAY_INFINITE && track->getPosition() > 1 ) {
returnCode = Mix_FadeInMusicPos( mus.get(), 0, musicFadeInMs, track->getPosition() );
if ( returnCode != 0 ) {
ERROR_LOG( "Failed to resume the music track. The error: " << Mix_GetError() )
@@ -567,7 +538,7 @@ namespace
if ( returnCode != 0 ) {
track->setPosition( 0 );
returnCode = Mix_FadeInMusic( mus.get(), loopCount, musicFadeInMs );
returnCode = Mix_FadeInMusic( mus.get(), 0, musicFadeInMs );
if ( returnCode != 0 ) {
ERROR_LOG( "Failed to play the music track. The error: " << Mix_GetError() )