diff --git a/src/AudioPlayerAsync.cpp b/src/AudioPlayerAsync.cpp index bbdcc27..5292dca 100644 --- a/src/AudioPlayerAsync.cpp +++ b/src/AudioPlayerAsync.cpp @@ -90,21 +90,16 @@ void AudioPlayerAsync::playSoundAsync(const std::string& filePath, int loops, in sound = it->second; } } - + if (!sound) { #ifdef __ANDROID__ - __android_log_print(ANDROID_LOG_ERROR, "Game", - "AudioPlayerAsync::playSoundAsync step x2"); std::vector buffer = FRG::readFile(filePath); if (buffer.empty()) { - __android_log_print(ANDROID_LOG_ERROR, "Game", - "AudioPlayerAsync::playSoundAsync step x3"); + FRG::logger() << "Failed to read sound file into buffer: " << filePath << std::endl; return; } - __android_log_print(ANDROID_LOG_ERROR, "Game", - "AudioPlayerAsync::playSoundAsync step x4"); SDL_RWops* rw = SDL_RWFromMem(buffer.data(), buffer.size()); if (!rw) { FRG::logger() << "Failed to create RWops from buffer for " << filePath << ": " << SDL_GetError() << std::endl; diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index ded4116..5501bdf 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -441,7 +441,11 @@ namespace FRG g_logFile.open(logPath, std::ios::out | std::ios::trunc); if (g_logFile.is_open()) { +#ifdef __ANDROID__ + g_teeBuffer = std::make_unique(&g_androidLogBuffer, g_logFile.rdbuf()); +#else g_teeBuffer = std::make_unique(std::cout.rdbuf(), g_logFile.rdbuf()); +#endif g_teeStream = std::make_unique(g_teeBuffer.get()); } else { @@ -459,8 +463,11 @@ namespace FRG if (g_teeStream) { return *g_teeStream; } - // Фолбэк на стандартный вывод, если файл по какой-то причине не открылся +#ifdef __ANDROID__ + return g_androidStream; +#else return std::cout; +#endif } // Если логирование отключено, возвращаем заглушку.