From 0dfba6c5529bcdc9025fc03ffeaf43e97a4f4f61 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 10 Dec 2023 15:26:43 +0100 Subject: [PATCH] Moved AudioStreamSample. --- editor/import/resource_importer_wav.cpp | 2 +- scene/{resources => audio}/audio_stream_sample.cpp | 0 scene/{resources => audio}/audio_stream_sample.h | 0 scene/register_scene_types.cpp | 2 +- servers/audio/effects/audio_effect_record.h | 2 +- servers/audio_server.cpp | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename scene/{resources => audio}/audio_stream_sample.cpp (100%) rename scene/{resources => audio}/audio_stream_sample.h (100%) diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index 36b9a1870..e37f97763 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -33,7 +33,7 @@ #include "core/io/marshalls.h" #include "core/io/resource_saver.h" #include "core/os/file_access.h" -#include "scene/resources/audio_stream_sample.h" +#include "scene/audio/audio_stream_sample.h" const float TRIM_DB_LIMIT = -50; const int TRIM_FADE_OUT_FRAMES = 500; diff --git a/scene/resources/audio_stream_sample.cpp b/scene/audio/audio_stream_sample.cpp similarity index 100% rename from scene/resources/audio_stream_sample.cpp rename to scene/audio/audio_stream_sample.cpp diff --git a/scene/resources/audio_stream_sample.h b/scene/audio/audio_stream_sample.h similarity index 100% rename from scene/resources/audio_stream_sample.h rename to scene/audio/audio_stream_sample.h diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index c7815491e..2440b89af 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -138,7 +138,7 @@ #include "scene/main/timer.h" #include "scene/main/viewport.h" #include "scene/main/world.h" -#include "scene/resources/audio_stream_sample.h" +#include "scene/audio/audio_stream_sample.h" #include "scene/resources/bit_map.h" #include "scene/resources/shapes/box_shape.h" #include "scene/resources/shapes/capsule_shape.h" diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h index 789076e14..34b93031e 100644 --- a/servers/audio/effects/audio_effect_record.h +++ b/servers/audio/effects/audio_effect_record.h @@ -35,7 +35,7 @@ #include "core/os/os.h" #include "core/os/thread.h" #include "editor/import/resource_importer_wav.h" -#include "scene/resources/audio_stream_sample.h" +#include "scene/audio/audio_stream_sample.h" #include "servers/audio/audio_effect.h" #include "servers/audio_server.h" diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 19eef6b85..f1dd70455 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -34,7 +34,7 @@ #include "core/io/resource_loader.h" #include "core/os/file_access.h" #include "core/os/os.h" -#include "scene/resources/audio_stream_sample.h" +#include "scene/audio/audio_stream_sample.h" #include "servers/audio/audio_driver_dummy.h" #include "servers/audio/effects/audio_effect_compressor.h"