Skip to content

unify(video): Merge and move Video files to Core #1410

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
Aug 5, 2025
Merged

unify(video): Merge and move Video files to Core #1410

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
52cba22
unify(video): Merge Video code (#1410)
xezon Aug 2, 2025
da44191
unify(video): Move Video files to Core (#1410)
xezon Aug 2, 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
12 changes: 6 additions & 6 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,11 @@ set(GAMEENGINE_SRC
# Include/GameClient/Statistics.h
# Include/GameClient/TerrainRoads.h
# Include/GameClient/TerrainVisual.h
# Include/GameClient/VideoPlayer.h
Include/GameClient/VideoPlayer.h
# Include/GameClient/View.h
# Include/GameClient/Water.h
# Include/GameClient/WindowLayout.h
# Include/GameClient/WindowVideoManager.h
Include/GameClient/WindowVideoManager.h
# Include/GameClient/WindowXlat.h
# Include/GameClient/WinInstanceData.h
# Include/GameLogic/AI.h
Expand Down Expand Up @@ -597,7 +597,7 @@ set(GAMEENGINE_SRC
# Source/Common/INI/INITerrainBridge.cpp
# Source/Common/INI/INITerrainRoad.cpp
# Source/Common/INI/INIUpgrade.cpp
# Source/Common/INI/INIVideo.cpp
Source/Common/INI/INIVideo.cpp
# Source/Common/INI/INIWater.cpp
# Source/Common/INI/INIWeapon.cpp
# Source/Common/INI/INIWebpageURL.cpp
Expand Down Expand Up @@ -791,7 +791,7 @@ set(GAMEENGINE_SRC
# Source/GameClient/GUI/Shell/Shell.cpp
# Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
# Source/GameClient/GUI/WindowLayout.cpp
# Source/GameClient/GUI/WindowVideoManager.cpp
Source/GameClient/GUI/WindowVideoManager.cpp
# Source/GameClient/GUI/WinInstanceData.cpp
# Source/GameClient/InGameUI.cpp
# Source/GameClient/Input/Keyboard.cpp
Expand Down Expand Up @@ -823,8 +823,8 @@ set(GAMEENGINE_SRC
# Source/GameClient/System/Smudge.cpp
# Source/GameClient/Terrain/TerrainRoads.cpp
# Source/GameClient/Terrain/TerrainVisual.cpp
# Source/GameClient/VideoPlayer.cpp
# Source/GameClient/VideoStream.cpp
Source/GameClient/VideoPlayer.cpp
Source/GameClient/VideoStream.cpp
# Source/GameClient/View.cpp
# Source/GameClient/Water.cpp
# Source/GameLogic/AI/AI.cpp
Expand Down
0 ...meEngine/Include/GameClient/VideoPlayer.h → ...meEngine/Include/GameClient/VideoPlayer.h
View file
Open in desktop
File renamed without changes.
0 ...e/Include/GameClient/WindowVideoManager.h → ...e/Include/GameClient/WindowVideoManager.h
View file
Open in desktop
File renamed without changes.
0 ...GameEngine/Source/Common/INI/INIVideo.cpp → ...GameEngine/Source/Common/INI/INIVideo.cpp
View file
Open in desktop
File renamed without changes.
0 ...rce/GameClient/GUI/WindowVideoManager.cpp → ...rce/GameClient/GUI/WindowVideoManager.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/GameClient/VideoPlayer.cpp → ...eEngine/Source/GameClient/VideoPlayer.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/GameClient/VideoStream.cpp → ...eEngine/Source/GameClient/VideoStream.cpp
View file
Open in desktop
File renamed without changes.
41 changes: 20 additions & 21 deletions Core/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(GAMEENGINEDEVICE_SRC
Include/MilesAudioDevice/MilesAudioManager.h
# Include/VideoDevice/Bink/BinkVideoPlayer.h
Include/VideoDevice/Bink/BinkVideoPlayer.h
# Include/W3DDevice/Common/W3DConvert.h
# Include/W3DDevice/Common/W3DFunctionLexicon.h
# Include/W3DDevice/Common/W3DModuleFactory.h
Expand Down Expand Up @@ -70,7 +70,7 @@ set(GAMEENGINEDEVICE_SRC
# Include/W3DDevice/GameClient/W3DTerrainTracks.h
# Include/W3DDevice/GameClient/W3DTerrainVisual.h
# Include/W3DDevice/GameClient/W3DTreeBuffer.h
# Include/W3DDevice/GameClient/W3DVideobuffer.h
Include/W3DDevice/GameClient/W3DVideoBuffer.h
# Include/W3DDevice/GameClient/W3DView.h
# Include/W3DDevice/GameClient/W3DVolumetricShadow.h
# Include/W3DDevice/GameClient/W3DWater.h
Expand All @@ -91,7 +91,7 @@ set(GAMEENGINEDEVICE_SRC
# Include/Win32Device/GameClient/Win32DIMouse.h
# Include/Win32Device/GameClient/Win32Mouse.h
Source/MilesAudioDevice/MilesAudioManager.cpp
# Source/VideoDevice/Bink/BinkVideoPlayer.cpp
Source/VideoDevice/Bink/BinkVideoPlayer.cpp
# Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
# Source/W3DDevice/Common/System/W3DRadar.cpp
# Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
Expand Down Expand Up @@ -172,7 +172,7 @@ set(GAMEENGINEDEVICE_SRC
# Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
# Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
# Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
# Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
# Source/W3DDevice/GameClient/W3DView.cpp
# Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
# Source/W3DDevice/GameClient/W3DWebBrowser.cpp
Expand Down Expand Up @@ -229,20 +229,19 @@ target_link_libraries(corei_gameenginedevice_public INTERFACE
milesstub
)

#if(RTS_BUILD_OPTION_FFMPEG)
# find_package(FFMPEG REQUIRED)
#
# if(FFMPEG_FOUND)
# target_sources(z_gameenginedevice PRIVATE
# Include/VideoDevice/FFmpeg/FFmpegFile.h
# Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
# Source/VideoDevice/FFmpeg/FFmpegFile.cpp
# Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
# )
#
# target_include_directories(z_gameenginedevice PRIVATE ${FFMPEG_INCLUDE_DIRS})
# target_link_directories(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARY_DIRS})
# target_link_libraries(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARIES})
# target_compile_definitions(z_gameenginedevice PUBLIC RTS_HAS_FFMPEG)
# endif()
#endif()
if(RTS_BUILD_OPTION_FFMPEG)
find_package(FFMPEG REQUIRED)

if(FFMPEG_FOUND)
target_sources(corei_gameenginedevice_private INTERFACE
Include/VideoDevice/FFmpeg/FFmpegFile.h
Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
Source/VideoDevice/FFmpeg/FFmpegFile.cpp
Source/VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
)
target_include_directories(corei_gameenginedevice_private INTERFACE ${FFMPEG_INCLUDE_DIRS})
target_link_directories(corei_gameenginedevice_private INTERFACE ${FFMPEG_LIBRARY_DIRS})
target_link_libraries(corei_gameenginedevice_private INTERFACE ${FFMPEG_LIBRARIES})
target_compile_definitions(corei_gameenginedevice_public INTERFACE RTS_HAS_FFMPEG)
endif()
endif()
0 ...nclude/VideoDevice/Bink/BinkVideoPlayer.h → ...nclude/VideoDevice/Bink/BinkVideoPlayer.h
View file
Open in desktop
File renamed without changes.
0 ...e/Include/VideoDevice/FFmpeg/FFmpegFile.h → ...e/Include/VideoDevice/FFmpeg/FFmpegFile.h
View file
Open in desktop
File renamed without changes.
0 ...de/VideoDevice/FFmpeg/FFmpegVideoPlayer.h → ...de/VideoDevice/FFmpeg/FFmpegVideoPlayer.h
View file
Open in desktop
File renamed without changes.
0 ...ude/W3DDevice/GameClient/W3DVideobuffer.h → ...ude/W3DDevice/GameClient/W3DVideoBuffer.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...urce/VideoDevice/Bink/BinkVideoPlayer.cpp → ...urce/VideoDevice/Bink/BinkVideoPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ VideoStreamInterface* BinkVideoPlayer::open( AsciiString movieTitle )
const Video* pVideo = getVideo(movieTitle);
if (pVideo) {
DEBUG_LOG(("BinkVideoPlayer::createStream() - About to open bink file"));

if (TheGlobalData->m_modDir.isNotEmpty())
{
char filePath[ _MAX_PATH ];
Expand Down
0 .../Source/VideoDevice/FFmpeg/FFmpegFile.cpp → .../Source/VideoDevice/FFmpeg/FFmpegFile.cpp
View file
Open in desktop
File renamed without changes.
0 .../VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp → .../VideoDevice/FFmpeg/FFmpegVideoPlayer.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/W3DDevice/GameClient/W3DVideoBuffer.cpp → ...e/W3DDevice/GameClient/W3DVideoBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "Common/GameMemory.h"
#include "WW3D2/texture.h"
#include "WW3D2/textureloader.h"
#include "W3DDevice/GameClient/W3DVideobuffer.h"
#include "W3DDevice/GameClient/W3DVideoBuffer.h"

//----------------------------------------------------------------------------
// Externals
Expand Down
10 changes: 5 additions & 5 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,11 @@ set(GAMEENGINE_SRC
Include/GameClient/Statistics.h
Include/GameClient/TerrainRoads.h
Include/GameClient/TerrainVisual.h
Include/GameClient/VideoPlayer.h
# Include/GameClient/VideoPlayer.h
Include/GameClient/View.h
Include/GameClient/Water.h
Include/GameClient/WindowLayout.h
Include/GameClient/WindowVideoManager.h
# Include/GameClient/WindowVideoManager.h
Include/GameClient/WindowXlat.h
Include/GameClient/WinInstanceData.h
Include/GameLogic/AI.h
Expand Down Expand Up @@ -556,7 +556,7 @@ set(GAMEENGINE_SRC
Source/Common/INI/INITerrainBridge.cpp
Source/Common/INI/INITerrainRoad.cpp
Source/Common/INI/INIUpgrade.cpp
Source/Common/INI/INIVideo.cpp
# Source/Common/INI/INIVideo.cpp
Source/Common/INI/INIWater.cpp
Source/Common/INI/INIWeapon.cpp
Source/Common/INI/INIWebpageURL.cpp
Expand Down Expand Up @@ -746,7 +746,7 @@ set(GAMEENGINE_SRC
Source/GameClient/GUI/Shell/Shell.cpp
Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
Source/GameClient/GUI/WindowLayout.cpp
Source/GameClient/GUI/WindowVideoManager.cpp
# Source/GameClient/GUI/WindowVideoManager.cpp
Source/GameClient/GUI/WinInstanceData.cpp
Source/GameClient/InGameUI.cpp
Source/GameClient/Input/Keyboard.cpp
Expand Down Expand Up @@ -775,7 +775,7 @@ set(GAMEENGINE_SRC
Source/GameClient/System/RayEffect.cpp
Source/GameClient/Terrain/TerrainRoads.cpp
Source/GameClient/Terrain/TerrainVisual.cpp
Source/GameClient/VideoPlayer.cpp
# Source/GameClient/VideoPlayer.cpp
Source/GameClient/View.cpp
Source/GameClient/Water.cpp
Source/GameLogic/AI/AI.cpp
Expand Down
Loading
Loading