From f23c152928faef7927a1e05da1d65c394dd88510 Mon Sep 17 00:00:00 2001 From: johndoe6345789 Date: Sun, 4 Jan 2026 14:45:38 +0000 Subject: [PATCH] feat: Integrate ILogger into SdlAudioService and PipelineService for enhanced logging --- src/app/service_based_app.cpp | 3 ++- src/services/impl/pipeline_service.cpp | 3 ++- src/services/impl/sdl_audio_service.cpp | 18 +++++++++--------- src/services/impl/sdl_audio_service.hpp | 4 +++- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/app/service_based_app.cpp b/src/app/service_based_app.cpp index e41afb2..90da409 100644 --- a/src/app/service_based_app.cpp +++ b/src/app/service_based_app.cpp @@ -194,7 +194,8 @@ void ServiceBasedApp::RegisterServices() { // Pipeline service registry_.RegisterService( - registry_.GetService()); + registry_.GetService(), + registry_.GetService()); // Buffer service registry_.RegisterService( diff --git a/src/services/impl/pipeline_service.cpp b/src/services/impl/pipeline_service.cpp index e6089ef..2beb4b8 100644 --- a/src/services/impl/pipeline_service.cpp +++ b/src/services/impl/pipeline_service.cpp @@ -57,6 +57,7 @@ void PipelineService::Cleanup() { } void PipelineService::Shutdown() noexcept { + logger_->TraceFunction(__func__); Cleanup(); } @@ -304,7 +305,7 @@ std::vector PipelineService::ReadShaderFile(const std::string& path) { file.read(buffer.data(), static_cast(fileSize)); file.close(); - logging::Logger::GetInstance().Debug("Read shader file: " + path + " (" + std::to_string(fileSize) + " bytes)"); + logger_->Debug("Read shader file: " + path + " (" + std::to_string(fileSize) + " bytes)"); return buffer; } diff --git a/src/services/impl/sdl_audio_service.cpp b/src/services/impl/sdl_audio_service.cpp index f6d5906..33d9788 100644 --- a/src/services/impl/sdl_audio_service.cpp +++ b/src/services/impl/sdl_audio_service.cpp @@ -1,10 +1,10 @@ #include "sdl_audio_service.hpp" -#include "../../logging/logger.hpp" #include namespace sdl3cpp::services::impl { -SdlAudioService::SdlAudioService() = default; +SdlAudioService::SdlAudioService(std::shared_ptr logger) + : logger_(logger) {} SdlAudioService::~SdlAudioService() { if (initialized_) { @@ -13,7 +13,7 @@ SdlAudioService::~SdlAudioService() { } void SdlAudioService::Initialize() { - logging::TraceGuard trace; + logger_->TraceFunction(__func__); if (initialized_) { return; @@ -22,11 +22,11 @@ void SdlAudioService::Initialize() { audioPlayer_ = std::make_unique(); initialized_ = true; - logging::Logger::GetInstance().Info("Audio service initialized"); + logger_->Info("Audio service initialized"); } void SdlAudioService::Shutdown() noexcept { - logging::TraceGuard trace; + logger_->TraceFunction(__func__); if (!initialized_) { return; @@ -35,11 +35,11 @@ void SdlAudioService::Shutdown() noexcept { audioPlayer_.reset(); initialized_ = false; - logging::Logger::GetInstance().Info("Audio service shutdown"); + logger_->Info("Audio service shutdown"); } void SdlAudioService::PlayBackground(const std::filesystem::path& path, bool loop) { - logging::TraceGuard trace; + logger_->TraceFunction(__func__); if (!audioPlayer_) { throw std::runtime_error("Audio service not initialized"); @@ -49,7 +49,7 @@ void SdlAudioService::PlayBackground(const std::filesystem::path& path, bool loo } void SdlAudioService::PlayEffect(const std::filesystem::path& path, bool loop) { - logging::TraceGuard trace; + logger_->TraceFunction(__func__); if (!audioPlayer_) { throw std::runtime_error("Audio service not initialized"); @@ -59,7 +59,7 @@ void SdlAudioService::PlayEffect(const std::filesystem::path& path, bool loop) { } void SdlAudioService::StopBackground() { - logging::TraceGuard trace; + logger_->TraceFunction(__func__); if (!audioPlayer_) { return; diff --git a/src/services/impl/sdl_audio_service.hpp b/src/services/impl/sdl_audio_service.hpp index 50aec6c..017fdb1 100644 --- a/src/services/impl/sdl_audio_service.hpp +++ b/src/services/impl/sdl_audio_service.hpp @@ -1,6 +1,7 @@ #pragma once #include "../interfaces/i_audio_service.hpp" +#include "../interfaces/i_logger.hpp" #include "../../app/audio_player.hpp" #include "../../di/lifecycle.hpp" #include @@ -17,7 +18,7 @@ class SdlAudioService : public IAudioService, public di::IInitializable, public di::IShutdownable { public: - SdlAudioService(); + explicit SdlAudioService(std::shared_ptr logger); ~SdlAudioService() override; // IAudioService interface @@ -34,6 +35,7 @@ public: bool IsBackgroundPlaying() const override; private: + std::shared_ptr logger_; std::unique_ptr audioPlayer_; float volume_ = 1.0f; bool initialized_ = false;