sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Utility module and move its content to Core and TextRenderer modules

Browse Source
This commit is contained in:
SirLynix
2024-02-10 22:46:53 +01:00
committed by Jérôme Leclercq
parent 965a00182c
commit e64c2b036e
364 changed files with 2336 additions and 2516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/FFmpeg/Plugin.cpp
View File

@@ -10,11 +10,11 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>
*/
#include <Nazara/Core/Algorithm.hpp>
#include <NazaraUtils/Algorithm.hpp>
#include <Nazara/Core/ByteStream.hpp>
#include <Nazara/Utility/ImageStream.hpp>
#include <Nazara/Utility/Utility.hpp>
#include <Nazara/Utility/Plugins/FFmpegPlugin.hpp>
#include <Nazara/Core/ImageStream.hpp>
#include <Nazara/Core/Core.hpp>
#include <Nazara/Core/Plugins/FFmpegPlugin.hpp>
extern "C"
{
@@ -434,8 +434,8 @@ namespace
public:
bool Activate() override
{
Nz::Utility* utility = Nz::Utility::Instance();
NazaraAssert(utility, "utility module is not instancied");
Nz::Core* core = Nz::Core::Instance();
NazaraAssert(core, "core module is not instancied");
Nz::ImageStreamLoader::Entry loaderEntry;
loaderEntry.extensionSupport = CheckVideoExtension;
@@ -450,7 +450,7 @@ namespace
return true;
};
Nz::ImageStreamLoader& imageStreamLoader = utility->GetImageStreamLoader();
Nz::ImageStreamLoader& imageStreamLoader = core->GetImageStreamLoader();
m_ffmpegLoaderEntry = imageStreamLoader.RegisterLoader(loaderEntry);
return true;
@@ -458,10 +458,10 @@ namespace
void Deactivate() override
{
Nz::Utility* utility = Nz::Utility::Instance();
NazaraAssert(utility, "utility module is not instanced");
Nz::Core* core = Nz::Core::Instance();
NazaraAssert(core, "core module is not instanced");
Nz::ImageStreamLoader& imageStreamLoader = utility->GetImageStreamLoader();
Nz::ImageStreamLoader& imageStreamLoader = core->GetImageStreamLoader();
imageStreamLoader.UnregisterLoader(m_ffmpegLoaderEntry);
m_ffmpegLoaderEntry = nullptr;
@@ -491,10 +491,10 @@ extern "C"
{
NAZARA_EXPORT Nz::PluginInterface* PluginLoad()
{
Nz::Utility* utility = Nz::Utility::Instance();
if (!utility)
Nz::Core* core = Nz::Core::Instance();
if (!core)
{
NazaraError("Utility module must be initialized");
NazaraError("Core module must be initialized");
return nullptr;
}

2
plugins/FFmpeg/xmake.lua
View File

@@ -7,7 +7,7 @@ if has_config("ffmpeg") then
set_group("Plugins")
add_rpathdirs("$ORIGIN")
add_deps("NazaraUtility")
add_deps("NazaraCore")
add_packages("ffmpeg")
add_headerfiles("**.hpp", "**.inl", { prefixdir = "private", install = false })