From f19cb7553405754ff847feca38a3183cee85acc5 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 27 Oct 2026 14:20:01 +0300 Subject: [PATCH] improve audio::ope_PCM_stream error messages & feat: specifying stream path without extension --- src/audio/audio.cpp | 12 ++++++++++++ src/logic/scripting/lua/libs/libaudio.cpp | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index ee35abeeb..be3495b95 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -262,6 +262,18 @@ std::unique_ptr audio::create_sound( } std::unique_ptr audio::open_PCM_stream(const io::path& file) { + if (!io::exists(file)) { + io::path candidate = file.string() + ".wav"; + if (io::exists(candidate)) { + return wav::create_stream(candidate); + } + candidate = file.string() + ".ogg"; + if (io::exists(candidate)) { + return ogg::create_stream(candidate); + } + throw std::runtime_error("file not found '" + file.string() + "'"); + } + std::string ext = file.extension(); if (ext == ".wav" || ext == ".WAV") { return wav::create_stream(file); diff --git a/src/logic/scripting/lua/libs/libaudio.cpp b/src/logic/scripting/lua/libs/libaudio.cpp index 31be7553f..bda2784e8 100644 --- a/src/logic/scripting/lua/libs/libaudio.cpp +++ b/src/logic/scripting/lua/libs/libaudio.cpp @@ -4,9 +4,9 @@ #include "engine/EnginePaths.hpp" #include "api_lua.hpp" -inline const char* DEFAULT_CHANNEL = "regular"; +static inline const char* DEFAULT_CHANNEL = "regular"; -inline int extract_channel_index(lua::State* L, int idx) { +static int extract_channel_index(lua::State* L, int idx) { const char* channel = DEFAULT_CHANNEL; if (lua::isstring(L, idx)) { channel = lua::tostring(L, idx); @@ -18,7 +18,7 @@ inline int extract_channel_index(lua::State* L, int idx) { return index; } -inline audio::speakerid_t play_sound( +static audio::speakerid_t play_sound( const char* name, bool relative, lua::Number x, @@ -54,7 +54,7 @@ inline audio::speakerid_t play_sound( ); } -inline audio::speakerid_t play_stream( +static audio::speakerid_t play_stream( const char* filename, bool relative, lua::Number x,