Skip to content

[GEN][ZH] Unify and move Audio files to Core #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 2 commits into from
Jul 22, 2025
Merged

[GEN][ZH] Unify and move Audio files to Core #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df6761
[GEN] Backport all Audio changes, incl. localization lookup changes i…
xezon Jul 21, 2025
f4663b4
[CORE] Move Audio files to Core (#1330)
xezon Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ set(GAMEENGINE_SRC
Include/Common/ArchiveFile.h
Include/Common/ArchiveFileSystem.h
Include/Common/AsciiString.h
# Include/Common/AudioAffect.h
# Include/Common/AudioEventInfo.h
# Include/Common/AudioEventRTS.h
# Include/Common/AudioHandleSpecialValues.h
# Include/Common/AudioRandomValue.h
# Include/Common/AudioRequest.h
# Include/Common/AudioSettings.h
Include/Common/AudioAffect.h
Include/Common/AudioEventInfo.h
Include/Common/AudioEventRTS.h
Include/Common/AudioHandleSpecialValues.h
Include/Common/AudioRandomValue.h
Include/Common/AudioRequest.h
Include/Common/AudioSettings.h
# Include/Common/BattleHonors.h
# Include/Common/BezFwdIterator.h
# Include/Common/BezierSegment.h
Expand All @@ -33,21 +33,21 @@ set(GAMEENGINE_SRC
# Include/Common/DisabledTypes.h
# Include/Common/DiscreteCircle.h
# Include/Common/DrawModule.h
# Include/Common/DynamicAudioEventInfo.h
Include/Common/DynamicAudioEventInfo.h
# Include/Common/encrypt.h
# Include/Common/Energy.h
# Include/Common/Errors.h
Include/Common/file.h
Include/Common/FileSystem.h
# Include/Common/FunctionLexicon.h
# Include/Common/GameAudio.h
Include/Common/GameAudio.h
# Include/Common/GameCommon.h
Include/Common/GameDefines.h
# Include/Common/GameEngine.h
# Include/Common/GameLOD.h
# Include/Common/GameMemory.h
# Include/Common/GameMusic.h
# Include/Common/GameSounds.h
Include/Common/GameMusic.h
Include/Common/GameSounds.h
# Include/Common/GameSpyMiscPreferences.h
# Include/Common/GameState.h
# Include/Common/GameStateMap.h
Expand All @@ -69,7 +69,7 @@ set(GAMEENGINE_SRC
# Include/Common/MapReaderWriterInfo.h
# Include/Common/MessageStream.h
# Include/Common/MiniLog.h
# Include/Common/MiscAudio.h
Include/Common/MiscAudio.h
# Include/Common/MissionStats.h
# Include/Common/ModelState.h
# Include/Common/Module.h
Expand Down Expand Up @@ -100,7 +100,7 @@ set(GAMEENGINE_SRC
# Include/Common/Science.h
# Include/Common/ScopedMutex.h
# Include/Common/ScoreKeeper.h
# Include/Common/simpleplayer.h
#Include/Common/simpleplayer.h # unused
# Include/Common/SkirmishBattleHonors.h
# Include/Common/SkirmishPreferences.h
# Include/Common/Snapshot.h
Expand All @@ -127,7 +127,7 @@ set(GAMEENGINE_SRC
Include/Common/UnicodeString.h
# Include/Common/UnitTimings.h
# Include/Common/Upgrade.h
# Include/Common/urllaunch.h
#Include/Common/urllaunch.h # unused
# Include/Common/UserPreferences.h
# Include/Common/version.h
# Include/Common/WellKnownKeys.h
Expand Down Expand Up @@ -552,12 +552,12 @@ set(GAMEENGINE_SRC
# Include/GameNetwork/WOLBrowser/FEBDispatch.h
# Include/GameNetwork/WOLBrowser/WebBrowser.h
# Include/Precompiled/PreRTS.h
# Source/Common/Audio/AudioEventRTS.cpp
# Source/Common/Audio/AudioRequest.cpp
# Source/Common/Audio/DynamicAudioEventInfo.cpp
# Source/Common/Audio/GameAudio.cpp
# Source/Common/Audio/GameMusic.cpp
# Source/Common/Audio/GameSounds.cpp
Source/Common/Audio/AudioEventRTS.cpp
Source/Common/Audio/AudioRequest.cpp
Source/Common/Audio/DynamicAudioEventInfo.cpp
Source/Common/Audio/GameAudio.cpp
Source/Common/Audio/GameMusic.cpp
Source/Common/Audio/GameSounds.cpp
#Source/Common/Audio/simpleplayer.cpp # unused
#Source/Common/Audio/urllaunch.cpp # unused
# Source/Common/Bezier/BezFwdIterator.cpp
Expand All @@ -576,7 +576,7 @@ set(GAMEENGINE_SRC
# Source/Common/INI/INI.cpp
# Source/Common/INI/INIAiData.cpp
# Source/Common/INI/INIAnimation.cpp
# Source/Common/INI/INIAudioEventInfo.cpp
Source/Common/INI/INIAudioEventInfo.cpp
# Source/Common/INI/INICommandButton.cpp
# Source/Common/INI/INICommandSet.cpp
# Source/Common/INI/INIControlBarScheme.cpp
Expand All @@ -587,7 +587,7 @@ set(GAMEENGINE_SRC
# Source/Common/INI/INIMapCache.cpp
# Source/Common/INI/INIMapData.cpp
# Source/Common/INI/INIMappedImage.cpp
# Source/Common/INI/INIMiscAudio.cpp
Source/Common/INI/INIMiscAudio.cpp
# Source/Common/INI/INIModel.cpp
# Source/Common/INI/INIMultiplayer.cpp
# Source/Common/INI/INIObject.cpp
Expand Down Expand Up @@ -815,7 +815,7 @@ set(GAMEENGINE_SRC
# Source/GameClient/Statistics.cpp
# Source/GameClient/System/Anim2D.cpp
# Source/GameClient/System/CampaignManager.cpp
# "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
Source/GameClient/System/Debug/AudioDebugDisplay.cpp
# Source/GameClient/System/DebugDisplay.cpp
# Source/GameClient/System/Image.cpp
# Source/GameClient/System/ParticleSys.cpp
Expand Down
0 ...e/GameEngine/Include/Common/AudioAffect.h → Core/GameEngine/Include/Common/AudioAffect.h
View file
Open in desktop
File renamed without changes.
0 ...ameEngine/Include/Common/AudioEventInfo.h → ...ameEngine/Include/Common/AudioEventInfo.h
View file
Open in desktop
File renamed without changes.
0 ...GameEngine/Include/Common/AudioEventRTS.h → ...GameEngine/Include/Common/AudioEventRTS.h
View file
Open in desktop
File renamed without changes.
0 ...Include/Common/AudioHandleSpecialValues.h → ...Include/Common/AudioHandleSpecialValues.h
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Include/Common/AudioRandomValue.h → ...eEngine/Include/Common/AudioRandomValue.h
View file
Open in desktop
File renamed without changes.
0 .../GameEngine/Include/Common/AudioRequest.h → .../GameEngine/Include/Common/AudioRequest.h
View file
Open in desktop
File renamed without changes.
0 ...GameEngine/Include/Common/AudioSettings.h → ...GameEngine/Include/Common/AudioSettings.h
View file
Open in desktop
File renamed without changes.
0 ...ne/Include/Common/DynamicAudioEventInfo.h → ...ne/Include/Common/DynamicAudioEventInfo.h
View file
Open in desktop
File renamed without changes.
0 ...ode/GameEngine/Include/Common/GameAudio.h → Core/GameEngine/Include/Common/GameAudio.h
View file
Open in desktop
File renamed without changes.
0 ...ode/GameEngine/Include/Common/GameMusic.h → Core/GameEngine/Include/Common/GameMusic.h
View file
Open in desktop
File renamed without changes.
0 ...de/GameEngine/Include/Common/GameSounds.h → Core/GameEngine/Include/Common/GameSounds.h
View file
Open in desktop
File renamed without changes.
0 ...ode/GameEngine/Include/Common/MiscAudio.h → Core/GameEngine/Include/Common/MiscAudio.h
View file
Open in desktop
File renamed without changes.
0 .../GameEngine/Include/Common/simpleplayer.h → .../GameEngine/Include/Common/simpleplayer.h
View file
Open in desktop
File renamed without changes.
0 ...ode/GameEngine/Include/Common/urllaunch.h → Core/GameEngine/Include/Common/urllaunch.h
View file
Open in desktop
File renamed without changes.
0 ...ine/Source/Common/Audio/AudioEventRTS.cpp → ...ine/Source/Common/Audio/AudioEventRTS.cpp
View file
Open in desktop
File renamed without changes.
0 ...gine/Source/Common/Audio/AudioRequest.cpp → ...gine/Source/Common/Audio/AudioRequest.cpp
View file
Open in desktop
File renamed without changes.
0 ...ce/Common/Audio/DynamicAudioEventInfo.cpp → ...ce/Common/Audio/DynamicAudioEventInfo.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/Common/Audio/GameAudio.cpp → ...eEngine/Source/Common/Audio/GameAudio.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/Common/Audio/GameMusic.cpp → ...eEngine/Source/Common/Audio/GameMusic.cpp
View file
Open in desktop
File renamed without changes.
0 ...Engine/Source/Common/Audio/GameSounds.cpp → ...Engine/Source/Common/Audio/GameSounds.cpp
View file
Open in desktop
File renamed without changes.
0 ...gine/Source/Common/Audio/simpleplayer.cpp → ...gine/Source/Common/Audio/simpleplayer.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/Common/Audio/urllaunch.cpp → ...eEngine/Source/Common/Audio/urllaunch.cpp
View file
Open in desktop
File renamed without changes.
0 ...e/Source/Common/INI/INIAudioEventInfo.cpp → ...e/Source/Common/INI/INIAudioEventInfo.cpp
View file
Open in desktop
File renamed without changes.
0 ...Engine/Source/Common/INI/INIMiscAudio.cpp → ...Engine/Source/Common/INI/INIMiscAudio.cpp
View file
Open in desktop
File renamed without changes.
0 ...em/Debug Displayers/AudioDebugDisplay.cpp → ...Client/System/Debug/AudioDebugDisplay.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Core/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(GAMEENGINEDEVICE_SRC
# Include/MilesAudioDevice/MilesAudioManager.h
Include/MilesAudioDevice/MilesAudioManager.h
# Include/VideoDevice/Bink/BinkVideoPlayer.h
# Include/W3DDevice/Common/W3DConvert.h
# Include/W3DDevice/Common/W3DFunctionLexicon.h
Expand Down Expand Up @@ -90,7 +90,7 @@ set(GAMEENGINEDEVICE_SRC
# Include/Win32Device/GameClient/Win32DIKeyboard.h
# Include/Win32Device/GameClient/Win32DIMouse.h
# Include/Win32Device/GameClient/Win32Mouse.h
# Source/MilesAudioDevice/MilesAudioManager.cpp
Source/MilesAudioDevice/MilesAudioManager.cpp
# Source/VideoDevice/Bink/BinkVideoPlayer.cpp
# Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
# Source/W3DDevice/Common/System/W3DRadar.cpp
Expand Down
0 ...lude/MilesAudioDevice/MilesAudioManager.h → ...lude/MilesAudioDevice/MilesAudioManager.h
View file
Open in desktop
File renamed without changes.
0 ...ce/MilesAudioDevice/MilesAudioManager.cpp → ...ce/MilesAudioDevice/MilesAudioManager.cpp
View file
Open in desktop
File renamed without changes.
40 changes: 21 additions & 19 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ set(GAMEENGINE_SRC
# Include/Common/ArchiveFile.h
# Include/Common/ArchiveFileSystem.h
# Include/Common/AsciiString.h
Include/Common/AudioAffect.h
Include/Common/AudioEventInfo.h
Include/Common/AudioEventRTS.h
Include/Common/AudioHandleSpecialValues.h
Include/Common/AudioRandomValue.h
Include/Common/AudioRequest.h
Include/Common/AudioSettings.h
# Include/Common/AudioAffect.h
# Include/Common/AudioEventInfo.h
# Include/Common/AudioEventRTS.h
# Include/Common/AudioHandleSpecialValues.h
# Include/Common/AudioRandomValue.h
# Include/Common/AudioRequest.h
# Include/Common/AudioSettings.h
Include/Common/BattleHonors.h
Include/Common/BezFwdIterator.h
Include/Common/BezierSegment.h
Expand Down Expand Up @@ -37,14 +37,14 @@ set(GAMEENGINE_SRC
# Include/Common/file.h
# Include/Common/FileSystem.h
Include/Common/FunctionLexicon.h
Include/Common/GameAudio.h
# Include/Common/GameAudio.h
Include/Common/GameCommon.h
# Include/Common/GameDefines.h
Include/Common/GameEngine.h
Include/Common/GameLOD.h
Include/Common/GameMemory.h
Include/Common/GameMusic.h
Include/Common/GameSounds.h
# Include/Common/GameMusic.h
# Include/Common/GameSounds.h
Include/Common/GameSpyMiscPreferences.h
Include/Common/GameState.h
Include/Common/GameStateMap.h
Expand All @@ -66,7 +66,7 @@ set(GAMEENGINE_SRC
Include/Common/MapReaderWriterInfo.h
Include/Common/MessageStream.h
Include/Common/MiniLog.h
Include/Common/MiscAudio.h
# Include/Common/MiscAudio.h
Include/Common/MissionStats.h
Include/Common/ModelState.h
Include/Common/Module.h
Expand Down Expand Up @@ -512,11 +512,13 @@ set(GAMEENGINE_SRC
Include/GameNetwork/WOLBrowser/FEBDispatch.h
Include/GameNetwork/WOLBrowser/WebBrowser.h
Include/Precompiled/PreRTS.h
Source/Common/Audio/AudioEventRTS.cpp
Source/Common/Audio/AudioRequest.cpp
Source/Common/Audio/GameAudio.cpp
Source/Common/Audio/GameMusic.cpp
Source/Common/Audio/GameSounds.cpp
# Source/Common/Audio/AudioEventRTS.cpp
# Source/Common/Audio/AudioRequest.cpp
# Source/Common/Audio/GameAudio.cpp
# Source/Common/Audio/GameMusic.cpp
# Source/Common/Audio/GameSounds.cpp
#Source/Common/Audio/simpleplayer.cpp # unused
#Source/Common/Audio/urllaunch.cpp # unused
Source/Common/Bezier/BezFwdIterator.cpp
Source/Common/Bezier/BezierSegment.cpp
Source/Common/BitFlags.cpp
Expand All @@ -533,7 +535,7 @@ set(GAMEENGINE_SRC
Source/Common/INI/INI.cpp
Source/Common/INI/INIAiData.cpp
Source/Common/INI/INIAnimation.cpp
Source/Common/INI/INIAudioEventInfo.cpp
# Source/Common/INI/INIAudioEventInfo.cpp
Source/Common/INI/INICommandButton.cpp
Source/Common/INI/INICommandSet.cpp
Source/Common/INI/INIControlBarScheme.cpp
Expand All @@ -544,7 +546,7 @@ set(GAMEENGINE_SRC
Source/Common/INI/INIMapCache.cpp
Source/Common/INI/INIMapData.cpp
Source/Common/INI/INIMappedImage.cpp
Source/Common/INI/INIMiscAudio.cpp
# Source/Common/INI/INIMiscAudio.cpp
Source/Common/INI/INIModel.cpp
Source/Common/INI/INIMultiplayer.cpp
Source/Common/INI/INIObject.cpp
Expand Down Expand Up @@ -766,7 +768,7 @@ set(GAMEENGINE_SRC
Source/GameClient/Statistics.cpp
Source/GameClient/System/Anim2D.cpp
Source/GameClient/System/CampaignManager.cpp
"Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
# "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
Source/GameClient/System/DebugDisplay.cpp
Source/GameClient/System/Image.cpp
Source/GameClient/System/ParticleSys.cpp
Expand Down
48 changes: 0 additions & 48 deletions Generals/Code/GameEngine/Include/Common/AudioAffect.h
View file
Open in desktop

This file was deleted.

Loading
Loading