mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-14 01:19:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'filenameexceptions' into 'master'

Browse Source 
Remove file name naming convention check exceptions (#7249)

Closes #7249

See merge request OpenMW/openmw!4551
This commit is contained in:
Alexei Kotov 2025-03-11 14:30:23 +03:00
commit ac8924b7e8
110 changed files with 352 additions and 391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CI/check_file_names.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash -ex
git ls-files -- ':(exclude)extern/' '*.cpp' '*.hpp' '*.h' |
grep -vP '/[a-z0-9]+\.(cpp|hpp|h)$' |
grep -vFf CI/file_name_exceptions.txt &&
grep -vP '/[a-z0-9]+\.(cpp|hpp|h)$' &&
( echo 'File names do not follow the naming convention, see https://wiki.openmw.org/index.php?title=Naming_Conventions#Files'; exit -1 )
exit 0

48
CI/file_name_exceptions.txt
View File

@ -1,48 +0,0 @@
apps/openmw/android_main.cpp
apps/openmw/mwsound/efx-presets.h
apps/openmw/mwsound/ffmpeg_decoder.cpp
apps/openmw/mwsound/ffmpeg_decoder.hpp
apps/openmw/mwsound/openal_output.cpp
apps/openmw/mwsound/openal_output.hpp
apps/openmw/mwsound/sound_buffer.cpp
apps/openmw/mwsound/sound_buffer.hpp
apps/openmw/mwsound/sound_decoder.hpp
apps/openmw/mwsound/sound_output.hpp
apps/components_tests/esm/test_fixed_string.cpp
apps/components_tests/files/conversion_tests.cpp
apps/components_tests/lua/test_async.cpp
apps/components_tests/lua/test_configuration.cpp
apps/components_tests/lua/test_l10n.cpp
apps/components_tests/lua/test_lua.cpp
apps/components_tests/lua/test_scriptscontainer.cpp
apps/components_tests/lua/test_serialization.cpp
apps/components_tests/lua/test_storage.cpp
apps/components_tests/lua/test_ui_content.cpp
apps/components_tests/lua/test_utilpackage.cpp
apps/components_tests/lua/test_inputactions.cpp
apps/components_tests/lua/test_yaml.cpp
apps/components_tests/misc/test_endianness.cpp
apps/components_tests/misc/test_resourcehelpers.cpp
apps/components_tests/misc/test_stringops.cpp
apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
apps/openmw_tests/mwscript/test_scripts.cpp
apps/openmw_tests/mwscript/test_utils.hpp
apps/openmw_tests/mwworld/test_store.cpp
components/bsa/bsa_file.cpp
components/bsa/bsa_file.hpp
components/crashcatcher/windows_crashcatcher.cpp
components/crashcatcher/windows_crashcatcher.hpp
components/crashcatcher/windows_crashmonitor.cpp
components/crashcatcher/windows_crashmonitor.hpp
components/crashcatcher/windows_crashshm.hpp
components/fx/lexer_types.hpp
components/fx/parse_constants.hpp
components/platform/file.posix.cpp
components/platform/file.stdio.cpp
components/platform/file.win32.cpp
components/sdlutil/gl4es_init.cpp
components/sdlutil/gl4es_init.h
components/to_utf8/gen_iconv.cpp
components/to_utf8/tables_gen.hpp
components/to_utf8/to_utf8.cpp
components/to_utf8/to_utf8.hpp

2
apps/bulletobjecttool/main.cpp
View File

@ -20,7 +20,7 @@
#include <components/resource/niffilemanager.hpp>
#include <components/resource/scenemanager.hpp>
#include <components/settings/settings.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include <components/version/version.hpp>
#include <components/vfs/manager.hpp>
#include <components/vfs/registerarchives.hpp>

35
apps/components_tests/CMakeLists.txt
View File

@ -4,29 +4,28 @@ include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS})
file(GLOB UNITTEST_SRC_FILES
main.cpp
esm/test_fixed_string.cpp
esm/variant.cpp
esm/testfixedstring.cpp
esm/testrefid.cpp
esm/variant.cpp
lua/test_lua.cpp
lua/test_scriptscontainer.cpp
lua/test_utilpackage.cpp
lua/test_serialization.cpp
lua/test_configuration.cpp
lua/test_l10n.cpp
lua/test_storage.cpp
lua/test_async.cpp
lua/test_inputactions.cpp
lua/test_yaml.cpp
lua/test_ui_content.cpp
lua/testasync.cpp
lua/testconfiguration.cpp
lua/testinputactions.cpp
lua/testl10n.cpp
lua/testlua.cpp
lua/testscriptscontainer.cpp
lua/testserialization.cpp
lua/teststorage.cpp
lua/testuicontent.cpp
lua/testutilpackage.cpp
lua/testyaml.cpp
misc/compression.cpp
misc/progressreporter.cpp
misc/test_endianness.cpp
misc/test_resourcehelpers.cpp
misc/test_stringops.cpp
misc/testendianness.cpp
misc/testmathutil.cpp
misc/testresourcehelpers.cpp
misc/teststringops.cpp
nifloader/testbulletnifloader.cpp
@ -64,8 +63,8 @@ file(GLOB UNITTEST_SRC_FILES
esmloader/esmdata.cpp
esmloader/record.cpp
files/conversiontests.cpp
files/hash.cpp
files/conversion_tests.cpp
toutf8/toutf8.cpp

0
apps/components_tests/esm/test_fixed_string.cpp → apps/components_tests/esm/testfixedstring.cpp
View File

2
apps/components_tests/esmloader/load.cpp
View File

@ -10,7 +10,7 @@
#include <components/esmloader/load.hpp>
#include <components/files/collections.hpp>
#include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include <gtest/gtest.h>

0
apps/components_tests/files/conversion_tests.cpp → apps/components_tests/files/conversiontests.cpp
View File

0
apps/components_tests/lua/test_async.cpp → apps/components_tests/lua/testasync.cpp
View File

0
apps/components_tests/lua/test_configuration.cpp → apps/components_tests/lua/testconfiguration.cpp
View File

0
apps/components_tests/lua/test_inputactions.cpp → apps/components_tests/lua/testinputactions.cpp
View File

0
apps/components_tests/lua/test_l10n.cpp → apps/components_tests/lua/testl10n.cpp
View File

0
apps/components_tests/lua/test_lua.cpp → apps/components_tests/lua/testlua.cpp
View File

0
apps/components_tests/lua/test_scriptscontainer.cpp → apps/components_tests/lua/testscriptscontainer.cpp
View File

0
apps/components_tests/lua/test_serialization.cpp → apps/components_tests/lua/testserialization.cpp
View File

0
apps/components_tests/lua/test_storage.cpp → apps/components_tests/lua/teststorage.cpp
View File

0
apps/components_tests/lua/test_ui_content.cpp → apps/components_tests/lua/testuicontent.cpp
View File

0
apps/components_tests/lua/test_utilpackage.cpp → apps/components_tests/lua/testutilpackage.cpp
View File

0
apps/components_tests/lua/test_yaml.cpp → apps/components_tests/lua/testyaml.cpp
View File

0
apps/components_tests/misc/test_endianness.cpp → apps/components_tests/misc/testendianness.cpp
View File

0
apps/components_tests/misc/test_resourcehelpers.cpp → apps/components_tests/misc/testresourcehelpers.cpp
View File

0
apps/components_tests/misc/test_stringops.cpp → apps/components_tests/misc/teststringops.cpp
View File

2
apps/components_tests/toutf8/toutf8.cpp
View File

@ -1,5 +1,5 @@
#include <components/misc/strings/conversion.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include <gtest/gtest.h>

2
apps/esmtool/tes4.cpp
View File

@ -15,7 +15,7 @@
#include <components/esm4/readerutils.hpp>
#include <components/esm4/records.hpp>
#include <components/esm4/typetraits.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
namespace EsmTool
{

2
apps/essimporter/importer.cpp
View File

@ -25,7 +25,7 @@
#include <components/misc/constants.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "importercontext.hpp"

2
apps/mwiniimporter/importer.hpp
View File

@ -8,7 +8,7 @@
#include <string>
#include <vector>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
class MwIniImporter
{

2
apps/navmeshtool/main.cpp
View File

@ -25,7 +25,7 @@
#include <components/resource/niffilemanager.hpp>
#include <components/resource/scenemanager.hpp>
#include <components/settings/values.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include <components/version/version.hpp>
#include <components/vfs/manager.hpp>
#include <components/vfs/registerarchives.hpp>

2
apps/opencs/editor.cpp
View File

@ -34,7 +34,7 @@
#include <components/misc/rng.hpp>
#include <components/nifosg/nifloader.hpp>
#include <components/settings/settings.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "view/doc/viewmanager.hpp"

2
apps/opencs/model/doc/document.hpp
View File

@ -12,7 +12,7 @@
#include <apps/opencs/model/world/universalid.hpp>
#include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "../world/data.hpp"
#include "../world/idcompletionmanager.hpp"

2
apps/opencs/model/doc/documentmanager.hpp
View File

@ -9,7 +9,7 @@
#include <vector>
#include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "loader.hpp"

2
apps/opencs/model/doc/saving.hpp
View File

@ -3,7 +3,7 @@
#include <QObject>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "operation.hpp"
#include "savingstate.hpp"

2
apps/opencs/model/doc/savingstate.hpp
View File

@ -9,7 +9,7 @@
#include <components/esm3/esmwriter.hpp>
#include <components/misc/algorithm.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
namespace CSMDoc
{

2
apps/opencs/model/tools/mergeoperation.hpp
View File

@ -3,7 +3,7 @@
#include <memory>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "../doc/operation.hpp"

2
apps/opencs/model/tools/mergestages.hpp
View File

@ -9,7 +9,7 @@
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "../doc/stage.hpp"

2
apps/opencs/model/tools/tools.hpp
View File

@ -6,7 +6,7 @@
#include <apps/opencs/model/world/universalid.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include <QObject>

2
apps/opencs/model/world/data.hpp
View File

@ -38,7 +38,7 @@
#include <components/esm3/selectiongroup.hpp>
#include <components/files/multidircollection.hpp>
#include <components/misc/algorithm.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "cell.hpp"
#include "idcollection.hpp"

8
apps/openmw/CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(OPENMW_HEADERS
profile.hpp
)
source_group(apps/openmw FILES main.cpp android_main.cpp ${OPENMW_SOURCES} ${OPENMW_HEADERS} ${OPENMW_RESOURCES})
source_group(apps/openmw FILES main.cpp androidmain.cpp ${OPENMW_SOURCES} ${OPENMW_HEADERS} ${OPENMW_RESOURCES})
add_openmw_dir (mwrender
actors objects renderingmanager animation rotatecontroller sky skyutil npcanimation esm4npcanimation vismask
@ -71,8 +71,8 @@ add_openmw_dir (mwlua
)
add_openmw_dir (mwsound
soundmanagerimp openal_output ffmpeg_decoder sound sound_buffer sound_decoder sound_output
loudness movieaudiofactory alext efx efx-presets regionsoundselector watersoundupdater
soundmanagerimp openaloutput ffmpegdecoder sound soundbuffer sounddecoder soundoutput
loudness movieaudiofactory alext efx efxpresets regionsoundselector watersoundupdater
)
add_openmw_dir (mwworld
@ -127,7 +127,7 @@ if(BUILD_OPENMW)
if (ANDROID)
add_library(openmw SHARED
main.cpp
android_main.cpp
androidmain.cpp
)
else()
openmw_add_executable(openmw

0
apps/openmw/android_main.cpp → apps/openmw/androidmain.cpp
View File

4
apps/openmw/mwbase/soundmanager.hpp
View File

@ -39,8 +39,8 @@ namespace MWSound
class Sound;
class Stream;
struct Sound_Decoder;
typedef std::shared_ptr<Sound_Decoder> DecoderPtr;
struct SoundDecoder;
typedef std::shared_ptr<SoundDecoder> DecoderPtr;
/* These must all fit together */
enum class PlayMode

2
apps/openmw/mwgui/journalbooks.hpp
View File

@ -4,7 +4,7 @@
#include "bookpage.hpp"
#include "journalviewmodel.hpp"
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
namespace MWGui
{

2
apps/openmw/mwgui/journalwindow.hpp
View File

@ -3,7 +3,7 @@
#include "windowbase.hpp"
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include <memory>

2
apps/openmw/mwgui/windowmanagerimp.hpp
View File

@ -22,7 +22,7 @@
#include <components/sdlutil/sdlcursormanager.hpp>
#include <components/sdlutil/sdlvideowrapper.hpp>
#include <components/settings/settings.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "charactercreation.hpp"
#include "draganddrop.hpp"

6
apps/openmw/mwsound/efx-presets.h → apps/openmw/mwsound/efxpresets.h
View File

@ -1,7 +1,7 @@
/* Reverb presets for EFX */
#ifndef EFX_PRESETS_H
#define EFX_PRESETS_H
#ifndef GAME_SOUND_EFXPRESETS_H
#define GAME_SOUND_EFXPRESETS_H
#ifndef EFXEAXREVERBPROPERTIES_DEFINED
#define EFXEAXREVERBPROPERTIES_DEFINED
@ -852,4 +852,4 @@ typedef struct
0.1900f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x0 \
}
#endif /* EFX_PRESETS_H */
#endif

40
apps/openmw/mwsound/ffmpeg_decoder.cpp → apps/openmw/mwsound/ffmpegdecoder.cpp
View File

@ -1,4 +1,4 @@
#include "ffmpeg_decoder.hpp"
#include "ffmpegdecoder.hpp"
#include <algorithm>
#include <memory>
@ -44,11 +44,11 @@ namespace MWSound
av_frame_free(&ptr);
}
int FFmpeg_Decoder::readPacket(void* user_data, uint8_t* buf, int buf_size)
int FFmpegDecoder::readPacket(void* user_data, uint8_t* buf, int buf_size)
{
try
{
std::istream& stream = *static_cast<FFmpeg_Decoder*>(user_data)->mDataStream;
std::istream& stream = *static_cast<FFmpegDecoder*>(user_data)->mDataStream;
stream.clear();
stream.read((char*)buf, buf_size);
std::streamsize count = stream.gcount();
@ -65,18 +65,18 @@ namespace MWSound
}
#if OPENMW_FFMPEG_CONST_WRITEPACKET
int FFmpeg_Decoder::writePacket(void*, const uint8_t*, int)
int FFmpegDecoder::writePacket(void*, const uint8_t*, int)
#else
int FFmpeg_Decoder::writePacket(void*, uint8_t*, int)
int FFmpegDecoder::writePacket(void*, uint8_t*, int)
#endif
{
Log(Debug::Error) << "can't write to read-only stream";
return -1;
}
int64_t FFmpeg_Decoder::seek(void* user_data, int64_t offset, int whence)
int64_t FFmpegDecoder::seek(void* user_data, int64_t offset, int whence)
{
std::istream& stream = *static_cast<FFmpeg_Decoder*>(user_data)->mDataStream;
std::istream& stream = *static_cast<FFmpegDecoder*>(user_data)->mDataStream;
whence &= ~AVSEEK_FORCE;
@ -106,7 +106,7 @@ namespace MWSound
/* Used by getAV*Data to search for more compressed data, and buffer it in the
* correct stream. It won't buffer data for streams that the app doesn't have a
* handle for. */
bool FFmpeg_Decoder::getNextPacket()
bool FFmpegDecoder::getNextPacket()
{
if (!mStream)
return false;
@ -129,7 +129,7 @@ namespace MWSound
return false;
}
bool FFmpeg_Decoder::getAVAudioData()
bool FFmpegDecoder::getAVAudioData()
{
bool got_frame = false;
@ -192,7 +192,7 @@ namespace MWSound
return true;
}
size_t FFmpeg_Decoder::readAVAudioData(void* data, size_t length)
size_t FFmpegDecoder::readAVAudioData(void* data, size_t length)
{
size_t dec = 0;
@ -227,7 +227,7 @@ namespace MWSound
return dec;
}
void FFmpeg_Decoder::open(VFS::Path::NormalizedView fname)
void FFmpegDecoder::open(VFS::Path::NormalizedView fname)
{
close();
mDataStream = mResourceMgr->get(fname);
@ -317,7 +317,7 @@ namespace MWSound
mStream = stream;
}
void FFmpeg_Decoder::close()
void FFmpegDecoder::close()
{
mStream = nullptr;
mCodecCtx.reset();
@ -332,7 +332,7 @@ namespace MWSound
mDataStream.reset();
}
std::string FFmpeg_Decoder::getName()
std::string FFmpegDecoder::getName()
{
// In the FFMpeg 4.0 a "filename" field was replaced by "url"
#if LIBAVCODEC_VERSION_INT < 3805796
@ -342,7 +342,7 @@ namespace MWSound
#endif
}
void FFmpeg_Decoder::getInfo(int* samplerate, ChannelConfig* chans, SampleType* type)
void FFmpegDecoder::getInfo(int* samplerate, ChannelConfig* chans, SampleType* type)
{
if (!mStream)
throw std::runtime_error("No audio stream info");
@ -459,7 +459,7 @@ namespace MWSound
}
}
size_t FFmpeg_Decoder::read(char* buffer, size_t bytes)
size_t FFmpegDecoder::read(char* buffer, size_t bytes)
{
if (!mStream)
{
@ -469,7 +469,7 @@ namespace MWSound
return readAVAudioData(buffer, bytes);
}
void FFmpeg_Decoder::readAll(std::vector<char>& output)
void FFmpegDecoder::readAll(std::vector<char>& output)
{
if (!mStream)
{
@ -490,7 +490,7 @@ namespace MWSound
}
}
size_t FFmpeg_Decoder::getSampleOffset()
size_t FFmpegDecoder::getSampleOffset()
{
#if OPENMW_FFMPEG_5_OR_GREATER
std::size_t delay = (mFrameSize - mFramePos) / mOutputChannelLayout.nb_channels
@ -501,8 +501,8 @@ namespace MWSound
return static_cast<std::size_t>(mNextPts * mCodecCtx->sample_rate) - delay;
}
FFmpeg_Decoder::FFmpeg_Decoder(const VFS::Manager* vfs)
: Sound_Decoder(vfs)
FFmpegDecoder::FFmpegDecoder(const VFS::Manager* vfs)
: SoundDecoder(vfs)
, mStream(nullptr)
, mFrameSize(0)
, mFramePos(0)
@ -534,7 +534,7 @@ namespace MWSound
}
}
FFmpeg_Decoder::~FFmpeg_Decoder()
FFmpegDecoder::~FFmpegDecoder()
{
close();
}

16
apps/openmw/mwsound/ffmpeg_decoder.hpp → apps/openmw/mwsound/ffmpegdecoder.hpp
View File

@ -1,5 +1,5 @@
#ifndef GAME_SOUND_FFMPEG_DECODER_H
#define GAME_SOUND_FFMPEG_DECODER_H
#ifndef GAME_SOUND_FFMPEGDECODER_H
#define GAME_SOUND_FFMPEGDECODER_H
#include <cstdint>
@ -31,7 +31,7 @@ extern "C"
#include <string>
#include "sound_decoder.hpp"
#include "sounddecoder.hpp"
namespace MWSound
{
@ -63,7 +63,7 @@ namespace MWSound
using AVFramePtr = std::unique_ptr<AVFrame, AVFrameDeleter>;
class FFmpeg_Decoder final : public Sound_Decoder
class FFmpegDecoder final : public SoundDecoder
{
AVIOContextPtr mIoCtx;
AVFormatContextPtr mFormatCtx;
@ -114,13 +114,13 @@ namespace MWSound
void readAll(std::vector<char>& output) override;
size_t getSampleOffset() override;
FFmpeg_Decoder& operator=(const FFmpeg_Decoder& rhs);
FFmpeg_Decoder(const FFmpeg_Decoder& rhs);
FFmpegDecoder& operator=(const FFmpegDecoder& rhs);
FFmpegDecoder(const FFmpegDecoder& rhs);
public:
explicit FFmpeg_Decoder(const VFS::Manager* vfs);
explicit FFmpegDecoder(const VFS::Manager* vfs);
virtual ~FFmpeg_Decoder();
virtual ~FFmpegDecoder();
friend class SoundManager;
};

2
apps/openmw/mwsound/loudness.hpp
View File

@ -4,7 +4,7 @@
#include <deque>
#include <vector>
#include "sound_decoder.hpp"
#include "sounddecoder.hpp"
namespace MWSound
{

6
apps/openmw/mwsound/movieaudiofactory.cpp
View File

@ -7,17 +7,17 @@
#include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp"
#include "sound_decoder.hpp"
#include "sounddecoder.hpp"
namespace MWSound
{
class MovieAudioDecoder;
class MWSoundDecoderBridge final : public Sound_Decoder
class MWSoundDecoderBridge final : public SoundDecoder
{
public:
MWSoundDecoderBridge(MWSound::MovieAudioDecoder* decoder)
: Sound_Decoder(nullptr)
: SoundDecoder(nullptr)
, mDecoder(decoder)
{
}

93
apps/openmw/mwsound/openal_output.cpp → apps/openmw/mwsound/openaloutput.cpp
View File

@ -17,14 +17,13 @@
#include <components/misc/thread.hpp>
#include <components/vfs/manager.hpp>
#include "efxpresets.h"
#include "loudness.hpp"
#include "openal_output.hpp"
#include "openaloutput.hpp"
#include "sound.hpp"
#include "sound_decoder.hpp"
#include "sounddecoder.hpp"
#include "soundmanagerimp.hpp"
#include "efx-presets.h"
#ifndef ALC_ALL_DEVICES_SPECIFIER
#define ALC_ALL_DEVICES_SPECIFIER 0x1013
#endif
@ -301,7 +300,7 @@ namespace MWSound
OpenAL_SoundStream(const OpenAL_SoundStream& rhs);
OpenAL_SoundStream& operator=(const OpenAL_SoundStream& rhs);
friend class OpenAL_Output;
friend class OpenALOutput;
public:
OpenAL_SoundStream(ALuint src, DecoderPtr decoder);
@ -323,7 +322,7 @@ namespace MWSound
//
// A background streaming thread (keeps active streams processed)
//
struct OpenAL_Output::StreamThread
struct OpenALOutput::StreamThread
{
std::vector<OpenAL_SoundStream*> mStreams;
@ -393,13 +392,13 @@ namespace MWSound
StreamThread& operator=(const StreamThread& rhs) = delete;
};
class OpenAL_Output::DefaultDeviceThread
class OpenALOutput::DefaultDeviceThread
{
public:
std::basic_string<ALCchar> mCurrentName;
private:
OpenAL_Output& mOutput;
OpenALOutput& mOutput;
std::atomic<bool> mQuitNow;
std::mutex mMutex;
@ -433,7 +432,7 @@ namespace MWSound
}
public:
DefaultDeviceThread(OpenAL_Output& output, std::basic_string_view<ALCchar> name = {})
DefaultDeviceThread(OpenALOutput& output, std::basic_string_view<ALCchar> name = {})
: mCurrentName(name)
, mOutput(output)
, mQuitNow(false)
@ -655,7 +654,7 @@ namespace MWSound
//
// An OpenAL output device
//
std::vector<std::string> OpenAL_Output::enumerate()
std::vector<std::string> OpenALOutput::enumerate()
{
std::vector<std::string> devlist;
const ALCchar* devnames;
@ -672,14 +671,14 @@ namespace MWSound
return devlist;
}
void OpenAL_Output::eventCallback(
void OpenALOutput::eventCallback(
ALenum eventType, ALuint object, ALuint param, ALsizei length, const ALchar* message, void* userParam)
{
if (eventType == AL_EVENT_TYPE_DISCONNECTED_SOFT)
static_cast<OpenAL_Output*>(userParam)->onDisconnect();
static_cast<OpenALOutput*>(userParam)->onDisconnect();
}
void OpenAL_Output::onDisconnect()
void OpenALOutput::onDisconnect()
{
if (!mInitialized || !alcReopenDeviceSOFT)
return;
@ -702,7 +701,7 @@ namespace MWSound
}
}
bool OpenAL_Output::init(const std::string& devname, const std::string& hrtfname, HrtfMode hrtfmode)
bool OpenALOutput::init(const std::string& devname, const std::string& hrtfname, HrtfMode hrtfmode)
{
deinit();
std::lock_guard<std::mutex> lock(mReopenMutex);
@ -802,7 +801,7 @@ namespace MWSound
{
static const std::array<ALenum, 1> events{ { AL_EVENT_TYPE_DISCONNECTED_SOFT } };
alEventControlSOFT(events.size(), events.data(), AL_TRUE);
alEventCallbackSOFT(&OpenAL_Output::eventCallback, this);
alEventCallbackSOFT(&OpenALOutput::eventCallback, this);
}
else
Log(Debug::Warning) << "Cannot detect audio device changes";
@ -970,7 +969,7 @@ namespace MWSound
return true;
}
void OpenAL_Output::deinit()
void OpenALOutput::deinit()
{
mStreamThread->removeAll();
mDefaultDeviceThread.reset();
@ -1006,7 +1005,7 @@ namespace MWSound
mInitialized = false;
}
std::vector<std::string> OpenAL_Output::enumerateHrtf()
std::vector<std::string> OpenALOutput::enumerateHrtf()
{
std::vector<std::string> ret;
@ -1028,7 +1027,7 @@ namespace MWSound
return ret;
}
std::pair<Sound_Handle, size_t> OpenAL_Output::loadSound(VFS::Path::NormalizedView fname)
std::pair<Sound_Handle, size_t> OpenALOutput::loadSound(VFS::Path::NormalizedView fname)
{
getALError();
@ -1076,7 +1075,7 @@ namespace MWSound
return std::make_pair(MAKE_PTRID(buf), size);
}
size_t OpenAL_Output::unloadSound(Sound_Handle data)
size_t OpenALOutput::unloadSound(Sound_Handle data)
{
ALuint buffer = GET_PTRID(data);
if (!buffer)
@ -1105,7 +1104,7 @@ namespace MWSound
return size;
}
void OpenAL_Output::initCommon2D(
void OpenALOutput::initCommon2D(
ALuint source, const osg::Vec3f& pos, ALfloat gain, ALfloat pitch, bool loop, bool useenv)
{
alSourcef(source, AL_REFERENCE_DISTANCE, 1.0f);
@ -1143,7 +1142,7 @@ namespace MWSound
alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
}
void OpenAL_Output::initCommon3D(ALuint source, const osg::Vec3f& pos, ALfloat mindist, ALfloat maxdist,
void OpenALOutput::initCommon3D(ALuint source, const osg::Vec3f& pos, ALfloat mindist, ALfloat maxdist,
ALfloat gain, ALfloat pitch, bool loop, bool useenv)
{
alSourcef(source, AL_REFERENCE_DISTANCE, mindist);
@ -1183,7 +1182,7 @@ namespace MWSound
alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
}
void OpenAL_Output::updateCommon(
void OpenALOutput::updateCommon(
ALuint source, const osg::Vec3f& pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv)
{
if (useenv && mListenerEnv == Env_Underwater && !mWaterFilter)
@ -1199,7 +1198,7 @@ namespace MWSound
alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
}
bool OpenAL_Output::playSound(Sound* sound, Sound_Handle data, float offset)
bool OpenALOutput::playSound(Sound* sound, Sound_Handle data, float offset)
{
ALuint source;
@ -1238,7 +1237,7 @@ namespace MWSound
return true;
}
bool OpenAL_Output::playSound3D(Sound* sound, Sound_Handle data, float offset)
bool OpenALOutput::playSound3D(Sound* sound, Sound_Handle data, float offset)
{
ALuint source;
@ -1277,7 +1276,7 @@ namespace MWSound
return true;
}
void OpenAL_Output::finishSound(Sound* sound)
void OpenALOutput::finishSound(Sound* sound)
{
if (!sound->mHandle)
return;
@ -1294,7 +1293,7 @@ namespace MWSound
mActiveSounds.erase(std::find(mActiveSounds.begin(), mActiveSounds.end(), sound));
}
bool OpenAL_Output::isSoundPlaying(Sound* sound)
bool OpenALOutput::isSoundPlaying(Sound* sound)
{
if (!sound->mHandle)
return false;
@ -1307,7 +1306,7 @@ namespace MWSound
return state == AL_PLAYING || state == AL_PAUSED;
}
void OpenAL_Output::updateSound(Sound* sound)
void OpenALOutput::updateSound(Sound* sound)
{
if (!sound->mHandle)
return;
@ -1318,7 +1317,7 @@ namespace MWSound
getALError();
}
bool OpenAL_Output::streamSound(DecoderPtr decoder, Stream* sound, bool getLoudnessData)
bool OpenALOutput::streamSound(DecoderPtr decoder, Stream* sound, bool getLoudnessData)
{
if (mFreeSources.empty())
{
@ -1349,7 +1348,7 @@ namespace MWSound
return true;
}
bool OpenAL_Output::streamSound3D(DecoderPtr decoder, Stream* sound, bool getLoudnessData)
bool OpenALOutput::streamSound3D(DecoderPtr decoder, Stream* sound, bool getLoudnessData)
{
if (mFreeSources.empty())
{
@ -1380,7 +1379,7 @@ namespace MWSound
return true;
}
void OpenAL_Output::finishStream(Stream* sound)
void OpenALOutput::finishStream(Stream* sound)
{
if (!sound->mHandle)
return;
@ -1402,7 +1401,7 @@ namespace MWSound
delete stream;
}
double OpenAL_Output::getStreamDelay(Stream* sound)
double OpenALOutput::getStreamDelay(Stream* sound)
{
if (!sound->mHandle)
return 0.0;
@ -1410,7 +1409,7 @@ namespace MWSound
return stream->getStreamDelay();
}
double OpenAL_Output::getStreamOffset(Stream* sound)
double OpenALOutput::getStreamOffset(Stream* sound)
{
if (!sound->mHandle)
return 0.0;
@ -1419,7 +1418,7 @@ namespace MWSound
return stream->getStreamOffset();
}
float OpenAL_Output::getStreamLoudness(Stream* sound)
float OpenALOutput::getStreamLoudness(Stream* sound)
{
if (!sound->mHandle)
return 0.0;
@ -1428,7 +1427,7 @@ namespace MWSound
return stream->getCurrentLoudness();
}
bool OpenAL_Output::isStreamPlaying(Stream* sound)
bool OpenALOutput::isStreamPlaying(Stream* sound)
{
if (!sound->mHandle)
return false;
@ -1437,7 +1436,7 @@ namespace MWSound
return stream->isPlaying();
}
void OpenAL_Output::updateStream(Stream* sound)
void OpenALOutput::updateStream(Stream* sound)
{
if (!sound->mHandle)
return;
@ -1449,17 +1448,17 @@ namespace MWSound
getALError();
}
void OpenAL_Output::startUpdate()
void OpenALOutput::startUpdate()
{
alcSuspendContext(alcGetCurrentContext());
}
void OpenAL_Output::finishUpdate()
void OpenALOutput::finishUpdate()
{
alcProcessContext(alcGetCurrentContext());
}
void OpenAL_Output::updateListener(
void OpenALOutput::updateListener(
const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, Environment env)
{
if (mContext)
@ -1501,7 +1500,7 @@ namespace MWSound
mListenerEnv = env;
}
void OpenAL_Output::pauseSounds(int types)
void OpenALOutput::pauseSounds(int types)
{
std::vector<ALuint> sources;
for (Sound* sound : mActiveSounds)
@ -1524,7 +1523,7 @@ namespace MWSound
}
}
void OpenAL_Output::pauseActiveDevice()
void OpenALOutput::pauseActiveDevice()
{
if (mDevice == nullptr)
return;
@ -1540,7 +1539,7 @@ namespace MWSound
alListenerf(AL_GAIN, 0.0f);
}
void OpenAL_Output::resumeActiveDevice()
void OpenALOutput::resumeActiveDevice()
{
if (mDevice == nullptr)
return;
@ -1556,7 +1555,7 @@ namespace MWSound
alListenerf(AL_GAIN, 1.0f);
}
void OpenAL_Output::resumeSounds(int types)
void OpenALOutput::resumeSounds(int types)
{
std::vector<ALuint> sources;
for (Sound* sound : mActiveSounds)
@ -1579,8 +1578,8 @@ namespace MWSound
}
}
OpenAL_Output::OpenAL_Output(SoundManager& mgr)
: Sound_Output(mgr)
OpenALOutput::OpenALOutput(SoundManager& mgr)
: SoundOutput(mgr)
, mDevice(nullptr)
, mContext(nullptr)
, mListenerPos(0.0f, 0.0f, 0.0f)
@ -1593,12 +1592,12 @@ namespace MWSound
{
}
OpenAL_Output::~OpenAL_Output()
OpenALOutput::~OpenALOutput()
{
OpenAL_Output::deinit();
OpenALOutput::deinit();
}
float OpenAL_Output::getTimeScaledPitch(SoundBase* sound)
float OpenALOutput::getTimeScaledPitch(SoundBase* sound)
{
const bool shouldScale = !(sound->mParams.mFlags & PlayMode::NoScaling);
return shouldScale ? sound->getPitch() * mManager.getSimulationTimeScale() : sound->getPitch();

16
apps/openmw/mwsound/openal_output.hpp → apps/openmw/mwsound/openaloutput.hpp
View File

@ -1,5 +1,5 @@
#ifndef GAME_SOUND_OPENAL_OUTPUT_H
#define GAME_SOUND_OPENAL_OUTPUT_H
#ifndef GAME_SOUND_OPENALOUTPUT_H
#define GAME_SOUND_OPENALOUTPUT_H
#include <deque>
#include <map>
@ -13,7 +13,7 @@
#include "alc.h"
#include "alext.h"
#include "sound_output.hpp"
#include "soundoutput.hpp"
namespace MWSound
{
@ -22,7 +22,7 @@ namespace MWSound
class Sound;
class Stream;
class OpenAL_Output : public Sound_Output
class OpenALOutput : public SoundOutput
{
ALCdevice* mDevice;
ALCcontext* mContext;
@ -72,8 +72,8 @@ namespace MWSound
float getTimeScaledPitch(SoundBase* sound);
OpenAL_Output& operator=(const OpenAL_Output& rhs);
OpenAL_Output(const OpenAL_Output& rhs);
OpenALOutput& operator=(const OpenALOutput& rhs);
OpenALOutput(const OpenALOutput& rhs);
static void eventCallback(
ALenum eventType, ALuint object, ALuint param, ALsizei length, const ALchar* message, void* userParam);
@ -117,8 +117,8 @@ namespace MWSound
void pauseActiveDevice() override;
void resumeActiveDevice() override;
OpenAL_Output(SoundManager& mgr);
virtual ~OpenAL_Output();
OpenALOutput(SoundManager& mgr);
virtual ~OpenALOutput();
};
}

4
apps/openmw/mwsound/sound.hpp
View File

@ -3,7 +3,7 @@
#include <algorithm>
#include "sound_output.hpp"
#include "soundoutput.hpp"
namespace MWSound
{
@ -53,7 +53,7 @@ namespace MWSound
protected:
Sound_Instance mHandle = nullptr;
friend class OpenAL_Output;
friend class OpenALOutput;
public:
void setPosition(const osg::Vec3f& pos) { mParams.mPos = pos; }

32
apps/openmw/mwsound/sound_buffer.cpp → apps/openmw/mwsound/soundbuffer.cpp
View File

@ -1,4 +1,4 @@
#include "sound_buffer.hpp"
#include "soundbuffer.hpp"
#include "../mwbase/environment.hpp"
#include "../mwworld/esmstore.hpp"
@ -35,7 +35,7 @@ namespace MWSound
}
}
SoundBufferPool::SoundBufferPool(Sound_Output& output)
SoundBufferPool::SoundBufferPool(SoundOutput& output)
: mOutput(&output)
, mBufferCacheMax(Settings::sound().mBufferCacheMax * 1024 * 1024)
, mBufferCacheMin(
@ -48,31 +48,31 @@ namespace MWSound
clear();
}
Sound_Buffer* SoundBufferPool::lookup(const ESM::RefId& soundId) const
SoundBuffer* SoundBufferPool::lookup(const ESM::RefId& soundId) const
{
const auto it = mBufferNameMap.find(soundId);
if (it != mBufferNameMap.end())
{
Sound_Buffer* sfx = it->second;
SoundBuffer* sfx = it->second;
if (sfx->getHandle() != nullptr)
return sfx;
}
return nullptr;
}
Sound_Buffer* SoundBufferPool::lookup(std::string_view fileName) const
SoundBuffer* SoundBufferPool::lookup(std::string_view fileName) const
{
const auto it = mBufferFileNameMap.find(std::string(fileName));
if (it != mBufferFileNameMap.end())
{
Sound_Buffer* sfx = it->second;
SoundBuffer* sfx = it->second;
if (sfx->getHandle() != nullptr)
return sfx;
}
return nullptr;
}
Sound_Buffer* SoundBufferPool::loadSfx(Sound_Buffer* sfx)
SoundBuffer* SoundBufferPool::loadSfx(SoundBuffer* sfx)
{
if (sfx->getHandle() != nullptr)
return sfx;
@ -95,7 +95,7 @@ namespace MWSound
return sfx;
}
Sound_Buffer* SoundBufferPool::load(const ESM::RefId& soundId)
SoundBuffer* SoundBufferPool::load(const ESM::RefId& soundId)
{
if (mBufferNameMap.empty())
{
@ -103,7 +103,7 @@ namespace MWSound
insertSound(sound.mId, sound);
}
Sound_Buffer* sfx;
SoundBuffer* sfx;
const auto it = mBufferNameMap.find(soundId);
if (it != mBufferNameMap.end())
sfx = it->second;
@ -118,9 +118,9 @@ namespace MWSound
return loadSfx(sfx);
}
Sound_Buffer* SoundBufferPool::load(std::string_view fileName)
SoundBuffer* SoundBufferPool::load(std::string_view fileName)
{
Sound_Buffer* sfx;
SoundBuffer* sfx;
const auto it = mBufferFileNameMap.find(std::string(fileName));
if (it != mBufferFileNameMap.end())
sfx = it->second;
@ -146,7 +146,7 @@ namespace MWSound
mUnusedBuffers.clear();
}
Sound_Buffer* SoundBufferPool::insertSound(std::string_view fileName)
SoundBuffer* SoundBufferPool::insertSound(std::string_view fileName)
{
static const AudioParams audioParams
= makeAudioParams(MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>());
@ -158,13 +158,13 @@ namespace MWSound
min = std::max(min, 1.0f);
max = std::max(min, max);
Sound_Buffer& sfx = mSoundBuffers.emplace_back(fileName, volume, min, max);
SoundBuffer& sfx = mSoundBuffers.emplace_back(fileName, volume, min, max);
mBufferFileNameMap.emplace(fileName, &sfx);
return &sfx;
}
Sound_Buffer* SoundBufferPool::insertSound(const ESM::RefId& soundId, const ESM::Sound& sound)
SoundBuffer* SoundBufferPool::insertSound(const ESM::RefId& soundId, const ESM::Sound& sound)
{
static const AudioParams audioParams
= makeAudioParams(MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>());
@ -183,7 +183,7 @@ namespace MWSound
min = std::max(min, 1.0f);
max = std::max(min, max);
Sound_Buffer& sfx = mSoundBuffers.emplace_back(
SoundBuffer& sfx = mSoundBuffers.emplace_back(
Misc::ResourceHelpers::correctSoundPath(VFS::Path::Normalized(sound.mSound)), volume, min, max);
mBufferNameMap.emplace(soundId, &sfx);
@ -194,7 +194,7 @@ namespace MWSound
{
while (!mUnusedBuffers.empty() && mBufferCacheSize > mBufferCacheMin)
{
Sound_Buffer* const unused = mUnusedBuffers.back();
SoundBuffer* const unused = mUnusedBuffers.back();
mBufferCacheSize -= mOutput->unloadSound(unused->getHandle());
unused->mHandle = nullptr;

43
apps/openmw/mwsound/sound_buffer.hpp → apps/openmw/mwsound/soundbuffer.hpp
View File

@ -1,14 +1,15 @@
#ifndef GAME_SOUND_SOUND_BUFFER_H
#define GAME_SOUND_SOUND_BUFFER_H
#ifndef GAME_SOUND_SOUNDBUFFER_H
#define GAME_SOUND_SOUNDBUFFER_H
#include <algorithm>
#include <deque>
#include <string>
#include <unordered_map>
#include "sound_output.hpp"
#include <components/esm/refid.hpp>
#include "soundoutput.hpp"
namespace ESM
{
struct Sound;
@ -23,11 +24,11 @@ namespace MWSound
{
class SoundBufferPool;
class Sound_Buffer
class SoundBuffer
{
public:
template <class T>
Sound_Buffer(T&& resname, float volume, float mindist, float maxdist)
SoundBuffer(T&& resname, float volume, float mindist, float maxdist)
: mResourceName(std::forward<T>(resname))
, mVolume(volume)
, mMinDist(mindist)
@ -59,7 +60,7 @@ namespace MWSound
class SoundBufferPool
{
public:
SoundBufferPool(Sound_Output& output);
SoundBufferPool(SoundOutput& output);
SoundBufferPool(const SoundBufferPool&) = delete;
@ -67,20 +68,20 @@ namespace MWSound
/// Lookup a soundId for its sound data (resource name, local volume,
/// minRange, and maxRange)
Sound_Buffer* lookup(const ESM::RefId& soundId) const;
SoundBuffer* lookup(const ESM::RefId& soundId) const;
/// Lookup a sound by file name for its sound data (resource name, local volume,
/// minRange, and maxRange)
Sound_Buffer* lookup(std::string_view fileName) const;
SoundBuffer* lookup(std::string_view fileName) const;
/// Lookup a soundId for its sound data (resource name, local volume,
/// minRange, and maxRange), and ensure it's ready for use.
Sound_Buffer* load(const ESM::RefId& soundId);
SoundBuffer* load(const ESM::RefId& soundId);
// Lookup for a sound by file name, and ensure it's ready for use.
Sound_Buffer* load(std::string_view fileName);
SoundBuffer* load(std::string_view fileName);
void use(Sound_Buffer& sfx)
void use(SoundBuffer& sfx)
{
if (sfx.mUses++ == 0)
{
@ -90,7 +91,7 @@ namespace MWSound
}
}
void release(Sound_Buffer& sfx)
void release(SoundBuffer& sfx)
{
if (--sfx.mUses == 0)
mUnusedBuffers.push_front(&sfx);
@ -99,23 +100,23 @@ namespace MWSound
void clear();
private:
Sound_Buffer* loadSfx(Sound_Buffer* sfx);
SoundBuffer* loadSfx(SoundBuffer* sfx);
Sound_Output* mOutput;
std::deque<Sound_Buffer> mSoundBuffers;
std::unordered_map<ESM::RefId, Sound_Buffer*> mBufferNameMap;
std::unordered_map<std::string, Sound_Buffer*> mBufferFileNameMap;
SoundOutput* mOutput;
std::deque<SoundBuffer> mSoundBuffers;
std::unordered_map<ESM::RefId, SoundBuffer*> mBufferNameMap;
std::unordered_map<std::string, SoundBuffer*> mBufferFileNameMap;
std::size_t mBufferCacheMax;
std::size_t mBufferCacheMin;
std::size_t mBufferCacheSize = 0;
// NOTE: unused buffers are stored in front-newest order.
std::deque<Sound_Buffer*> mUnusedBuffers;
std::deque<SoundBuffer*> mUnusedBuffers;
inline Sound_Buffer* insertSound(const ESM::RefId& soundId, const ESM::Sound& sound);
inline Sound_Buffer* insertSound(std::string_view fileName);
inline SoundBuffer* insertSound(const ESM::RefId& soundId, const ESM::Sound& sound);
inline SoundBuffer* insertSound(std::string_view fileName);
inline void unloadUnused();
};
}
#endif /* GAME_SOUND_SOUND_BUFFER_H */
#endif /* GAME_SOUND_SOUNDBUFFER_H */

14
apps/openmw/mwsound/sound_decoder.hpp → apps/openmw/mwsound/sounddecoder.hpp
View File

@ -1,5 +1,5 @@
#ifndef GAME_SOUND_SOUND_DECODER_H
#define GAME_SOUND_SOUND_DECODER_H
#ifndef GAME_SOUND_SOUNDDECODER_H
#define GAME_SOUND_SOUNDDECODER_H
#include <components/vfs/pathutil.hpp>
@ -34,7 +34,7 @@ namespace MWSound
size_t framesToBytes(size_t frames, ChannelConfig config, SampleType type);
size_t bytesToFrames(size_t bytes, ChannelConfig config, SampleType type);
struct Sound_Decoder
struct SoundDecoder
{
const VFS::Manager* mResourceMgr;
@ -48,15 +48,15 @@ namespace MWSound
virtual void readAll(std::vector<char>& output);
virtual size_t getSampleOffset() = 0;
Sound_Decoder(const VFS::Manager* resourceMgr)
SoundDecoder(const VFS::Manager* resourceMgr)
: mResourceMgr(resourceMgr)
{
}
virtual ~Sound_Decoder() {}
virtual ~SoundDecoder() {}
private:
Sound_Decoder(const Sound_Decoder& rhs);
Sound_Decoder& operator=(const Sound_Decoder& rhs);
SoundDecoder(const SoundDecoder& rhs);
SoundDecoder& operator=(const SoundDecoder& rhs);
};
}

50
apps/openmw/mwsound/soundmanagerimp.cpp
View File

@ -26,12 +26,12 @@
#include "../mwmechanics/actorutil.hpp"
#include "constants.hpp"
#include "ffmpeg_decoder.hpp"
#include "openal_output.hpp"
#include "ffmpegdecoder.hpp"
#include "openaloutput.hpp"
#include "sound.hpp"
#include "sound_buffer.hpp"
#include "sound_decoder.hpp"
#include "sound_output.hpp"
#include "soundbuffer.hpp"
#include "sounddecoder.hpp"
#include "soundoutput.hpp"
namespace MWSound
{
@ -57,7 +57,7 @@ namespace MWSound
return settings;
}
float initialFadeVolume(float squaredDist, Sound_Buffer* sfx, Type type, PlayMode mode)
float initialFadeVolume(float squaredDist, SoundBuffer* sfx, Type type, PlayMode mode)
{
// If a sound is farther away than its maximum distance, start playing it with a zero fade volume.
// It can still become audible once the player moves closer.
@ -111,7 +111,7 @@ namespace MWSound
SoundManager::SoundManager(const VFS::Manager* vfs, bool useSound)
: mVFS(vfs)
, mOutput(std::make_unique<OpenAL_Output>(*this))
, mOutput(std::make_unique<OpenALOutput>(*this))
, mWaterSoundUpdater(makeWaterSoundUpdaterSettings())
, mSoundBuffers(*mOutput)
, mMusicType(MWSound::MusicType::Normal)
@ -169,7 +169,7 @@ namespace MWSound
// Return a new decoder instance, used as needed by the output implementations
DecoderPtr SoundManager::getDecoder()
{
return std::make_shared<FFmpeg_Decoder>(mVFS);
return std::make_shared<FFmpegDecoder>(mVFS);
}
DecoderPtr SoundManager::loadVoice(VFS::Path::NormalizedView voicefile)
@ -459,7 +459,7 @@ namespace MWSound
return false;
}
Sound* SoundManager::playSound(Sound_Buffer* sfx, float volume, float pitch, Type type, PlayMode mode, float offset)
Sound* SoundManager::playSound(SoundBuffer* sfx, float volume, float pitch, Type type, PlayMode mode, float offset)
{
if (!mOutput->isInitialized())
return nullptr;
@ -495,7 +495,7 @@ namespace MWSound
if (!mVFS->exists(normalizedName))
return nullptr;
Sound_Buffer* sfx = mSoundBuffers.load(normalizedName);
SoundBuffer* sfx = mSoundBuffers.load(normalizedName);
if (!sfx)
return nullptr;
@ -508,14 +508,14 @@ namespace MWSound
if (!mOutput->isInitialized())
return nullptr;
Sound_Buffer* sfx = mSoundBuffers.load(soundId);
SoundBuffer* sfx = mSoundBuffers.load(soundId);
if (!sfx)
return nullptr;
return playSound(sfx, volume, pitch, type, mode, offset);
}
Sound* SoundManager::playSound3D(const MWWorld::ConstPtr& ptr, Sound_Buffer* sfx, float volume, float pitch,
Sound* SoundManager::playSound3D(const MWWorld::ConstPtr& ptr, SoundBuffer* sfx, float volume, float pitch,
Type type, PlayMode mode, float offset)
{
if (!mOutput->isInitialized())
@ -576,7 +576,7 @@ namespace MWSound
return nullptr;
// Look up the sound in the ESM data
Sound_Buffer* sfx = mSoundBuffers.load(soundId);
SoundBuffer* sfx = mSoundBuffers.load(soundId);
if (!sfx)
return nullptr;
@ -594,7 +594,7 @@ namespace MWSound
if (!mVFS->exists(normalizedName))
return nullptr;
Sound_Buffer* sfx = mSoundBuffers.load(normalizedName);
SoundBuffer* sfx = mSoundBuffers.load(normalizedName);
if (!sfx)
return nullptr;
@ -608,7 +608,7 @@ namespace MWSound
return nullptr;
// Look up the sound in the ESM data
Sound_Buffer* sfx = mSoundBuffers.load(soundId);
SoundBuffer* sfx = mSoundBuffers.load(soundId);
if (!sfx)
return nullptr;
@ -642,7 +642,7 @@ namespace MWSound
mOutput->finishSound(sound);
}
void SoundManager::stopSound(Sound_Buffer* sfx, const MWWorld::ConstPtr& ptr)
void SoundManager::stopSound(SoundBuffer* sfx, const MWWorld::ConstPtr& ptr)
{
SoundMap::iterator snditer = mActiveSounds.find(ptr.mRef);
if (snditer != mActiveSounds.end())
@ -660,7 +660,7 @@ namespace MWSound
if (!mOutput->isInitialized())
return;
Sound_Buffer* sfx = mSoundBuffers.lookup(soundId);
SoundBuffer* sfx = mSoundBuffers.lookup(soundId);
if (!sfx)
return;
@ -673,7 +673,7 @@ namespace MWSound
return;
std::string normalizedName = VFS::Path::normalizeFilename(fileName);
Sound_Buffer* sfx = mSoundBuffers.lookup(normalizedName);
SoundBuffer* sfx = mSoundBuffers.lookup(normalizedName);
if (!sfx)
return;
@ -725,7 +725,7 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.find(ptr.mRef);
if (snditer != mActiveSounds.end())
{
Sound_Buffer* sfx = mSoundBuffers.lookup(soundId);
SoundBuffer* sfx = mSoundBuffers.lookup(soundId);
if (sfx == nullptr)
return;
for (SoundBufferRefPair& sndbuf : snditer->second.mList)
@ -743,7 +743,7 @@ namespace MWSound
SoundMap::const_iterator snditer = mActiveSounds.find(ptr.mRef);
if (snditer != mActiveSounds.end())
{
Sound_Buffer* sfx = mSoundBuffers.lookup(normalizedName);
SoundBuffer* sfx = mSoundBuffers.lookup(normalizedName);
if (!sfx)
return false;
@ -761,7 +761,7 @@ namespace MWSound
SoundMap::const_iterator snditer = mActiveSounds.find(ptr.mRef);
if (snditer != mActiveSounds.end())
{
Sound_Buffer* sfx = mSoundBuffers.lookup(soundId);
SoundBuffer* sfx = mSoundBuffers.lookup(soundId);
if (!sfx)
return false;
@ -846,7 +846,7 @@ namespace MWSound
const auto update = mWaterSoundUpdater.update(player, *world);
WaterSoundAction action;
Sound_Buffer* sfx;
SoundBuffer* sfx;
std::tie(action, sfx) = getWaterSoundAction(update, curcell);
switch (action)
@ -870,7 +870,7 @@ namespace MWSound
mLastCell = curcell;
}
std::pair<SoundManager::WaterSoundAction, Sound_Buffer*> SoundManager::getWaterSoundAction(
std::pair<SoundManager::WaterSoundAction, SoundBuffer*> SoundManager::getWaterSoundAction(
const WaterSoundUpdate& update, const MWWorld::Cell* cell) const
{
if (mNearWaterSound)
@ -880,7 +880,7 @@ namespace MWSound
bool soundIdChanged = false;
Sound_Buffer* sfx = mSoundBuffers.lookup(update.mId);
SoundBuffer* sfx = mSoundBuffers.lookup(update.mId);
if (mLastCell != cell)
{
const auto snditer = mActiveSounds.find(nullptr);
@ -1168,7 +1168,7 @@ namespace MWSound
// Default readAll implementation, for decoders that can't do anything
// better
void Sound_Decoder::readAll(std::vector<char>& output)
void SoundDecoder::readAll(std::vector<char>& output)
{
size_t total = output.size();
size_t got;

22
apps/openmw/mwsound/soundmanagerimp.hpp
View File

@ -15,7 +15,7 @@
#include "../mwbase/soundmanager.hpp"
#include "regionsoundselector.hpp"
#include "sound_buffer.hpp"
#include "soundbuffer.hpp"
#include "type.hpp"
#include "watersoundupdater.hpp"
@ -37,8 +37,8 @@ namespace MWWorld
namespace MWSound
{
class Sound_Output;
struct Sound_Decoder;
class SoundOutput;
struct SoundDecoder;
class SoundBase;
class Sound;
class Stream;
@ -50,7 +50,7 @@ namespace MWSound
{
const VFS::Manager* mVFS;
std::unique_ptr<Sound_Output> mOutput;
std::unique_ptr<SoundOutput> mOutput;
WaterSoundUpdater mWaterSoundUpdater;
@ -60,7 +60,7 @@ namespace MWSound
Misc::ObjectPool<Stream> mStreams;
typedef std::pair<SoundPtr, Sound_Buffer*> SoundBufferRefPair;
typedef std::pair<SoundPtr, SoundBuffer*> SoundBufferRefPair;
typedef std::vector<SoundBufferRefPair> SoundBufferRefPairList;
struct ActiveSound
@ -109,7 +109,7 @@ namespace MWSound
Sound* mCurrentRegionSound;
Sound_Buffer* insertSound(const std::string& soundId, const ESM::Sound* sound);
SoundBuffer* insertSound(const std::string& soundId, const ESM::Sound* sound);
// returns a decoder to start streaming, or nullptr if the sound was not found
DecoderPtr loadVoice(VFS::Path::NormalizedView voicefile);
@ -126,9 +126,9 @@ namespace MWSound
bool remove3DSoundAtDistance(PlayMode mode, const MWWorld::ConstPtr& ptr) const;
Sound* playSound(Sound_Buffer* sfx, float volume, float pitch, Type type = Type::Sfx,
Sound* playSound(SoundBuffer* sfx, float volume, float pitch, Type type = Type::Sfx,
PlayMode mode = PlayMode::Normal, float offset = 0);
Sound* playSound3D(const MWWorld::ConstPtr& ptr, Sound_Buffer* sfx, float volume, float pitch, Type type,
Sound* playSound3D(const MWWorld::ConstPtr& ptr, SoundBuffer* sfx, float volume, float pitch, Type type,
PlayMode mode, float offset);
void updateSounds(float duration);
@ -144,7 +144,7 @@ namespace MWSound
PlaySound,
};
std::pair<WaterSoundAction, Sound_Buffer*> getWaterSoundAction(
std::pair<WaterSoundAction, SoundBuffer*> getWaterSoundAction(
const WaterSoundUpdate& update, const MWWorld::Cell* cell) const;
SoundManager(const SoundManager& rhs);
@ -152,9 +152,9 @@ namespace MWSound
protected:
DecoderPtr getDecoder();
friend class OpenAL_Output;
friend class OpenALOutput;
void stopSound(Sound_Buffer* sfx, const MWWorld::ConstPtr& ptr);
void stopSound(SoundBuffer* sfx, const MWWorld::ConstPtr& ptr);
///< Stop the given object from playing given sound buffer.
public:

18
apps/openmw/mwsound/sound_output.hpp → apps/openmw/mwsound/soundoutput.hpp
View File

@ -1,5 +1,5 @@
#ifndef GAME_SOUND_SOUND_OUTPUT_H
#define GAME_SOUND_SOUND_OUTPUT_H
#ifndef GAME_SOUND_SOUNDOUTPUT_H
#define GAME_SOUND_SOUNDOUTPUT_H
#include <memory>
#include <string>
@ -13,7 +13,7 @@
namespace MWSound
{
class SoundManager;
struct Sound_Decoder;
struct SoundDecoder;
class Sound;
class Stream;
@ -30,7 +30,7 @@ namespace MWSound
using HrtfMode = Settings::HrtfMode;
class Sound_Output
class SoundOutput
{
SoundManager& mManager;
@ -71,24 +71,24 @@ namespace MWSound
virtual void pauseActiveDevice() = 0;
virtual void resumeActiveDevice() = 0;
Sound_Output& operator=(const Sound_Output& rhs);
Sound_Output(const Sound_Output& rhs);
SoundOutput& operator=(const SoundOutput& rhs);
SoundOutput(const SoundOutput& rhs);
protected:
bool mInitialized;
Sound_Output(SoundManager& mgr)
SoundOutput(SoundManager& mgr)
: mManager(mgr)
, mInitialized(false)
{
}
public:
virtual ~Sound_Output() {}
virtual ~SoundOutput() {}
bool isInitialized() const { return mInitialized; }
friend class OpenAL_Output;
friend class OpenALOutput;
friend class SoundManager;
friend class SoundBufferPool;
};

6
apps/openmw_tests/CMakeLists.txt
View File

@ -6,14 +6,14 @@ file(GLOB UNITTEST_SRC_FILES
options.cpp
mwworld/test_store.cpp
mwworld/teststore.cpp
mwworld/testduration.cpp
mwworld/testtimestamp.cpp
mwworld/testptr.cpp
mwdialogue/test_keywordsearch.cpp
mwdialogue/testkeywordsearch.cpp
mwscript/test_scripts.cpp
mwscript/testscripts.cpp
)
source_group(apps\\openmw-tests FILES ${UNITTEST_SRC_FILES})

0
apps/openmw_tests/mwdialogue/test_keywordsearch.cpp → apps/openmw_tests/mwdialogue/testkeywordsearch.cpp
View File

4
apps/openmw_tests/mwscript/test_scripts.cpp → apps/openmw_tests/mwscript/testscripts.cpp
View File

@ -1,7 +1,7 @@
#include <gtest/gtest.h>
#include <sstream>
#include "test_utils.hpp"
#include "testutils.hpp"
namespace
{
@ -935,4 +935,4 @@ End)mwscript";
registerExtensions();
EXPECT_FALSE(!compile(sIssue6807));
}
}
}

0
apps/openmw_tests/mwscript/test_utils.hpp → apps/openmw_tests/mwscript/testutils.hpp
View File

0
apps/openmw_tests/mwworld/test_store.cpp → apps/openmw_tests/mwworld/teststore.cpp
View File

2
apps/wizard/inisettings.hpp
View File

@ -4,7 +4,7 @@
#include <QHash>
#include <QVariant>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
namespace Wizard
{

24
components/CMakeLists.txt
View File

@ -111,7 +111,7 @@ add_component_dir (bgsm
)
add_component_dir (bsa
bsa_file compressedbsafile ba2gnrlfile ba2dx10file ba2file memorystream
bsafile compressedbsafile ba2gnrlfile ba2dx10file ba2file memorystream
)
add_component_dir (bullethelpers
@ -155,9 +155,9 @@ add_component_dir (nifbullet
bulletnifloader
)
add_component_dir (to_utf8
tables_gen
to_utf8
add_component_dir (toutf8
tablesgen
toutf8
)
add_component_dir(esm attr common defs esmcommon records util luascripts format refid esmbridge esmterrain
@ -173,7 +173,7 @@ add_component_dir(esm attr common defs esmcommon records util luascripts format
exteriorcelllocation
)
add_component_dir(fx pass technique lexer lexer_types parse_constants widgets stateupdater)
add_component_dir(fx pass technique lexer lexertypes parseconstants widgets stateupdater)
add_component_dir(std140 ubo)
@ -362,7 +362,7 @@ add_component_dir (fontloader
add_component_dir (sdlutil
events
gl4es_init
gl4esinit
imagetosurface
sdlcursormanager
sdlgraphicswindow
@ -390,10 +390,10 @@ copy_resource_file("lua_ui/content.lua" "${OPENMW_RESOURCES_ROOT}" "resources/lu
if(WIN32)
add_component_dir (crashcatcher
windows_crashcatcher
windows_crashmonitor
windows_crashshm
windowscrashcatcher
windowscrashdumppathhelpers
windowscrashmonitor
windowscrashshm
)
elseif(NOT ANDROID)
add_component_dir (crashcatcher
@ -500,15 +500,15 @@ add_component_dir(platform
if (WIN32)
add_component_dir(platform
file.win32
filewin32
)
elseif (UNIX)
add_component_dir(platform
file.posix
fileposix
)
else ()
add_component_dir(platform
file.stdio
filestdio
)
endif()

6
components/bsa/ba2dx10file.cpp
View File

@ -24,13 +24,15 @@
#endif
#include <boost/iostreams/device/array.hpp>
#include <components/bsa/ba2file.hpp>
#include <components/bsa/memorystream.hpp>
#include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/strings/lower.hpp>
#include "ba2file.hpp"
#include "memorystream.hpp"
namespace Bsa
{
BA2DX10File::BA2DX10File() {}

6
components/bsa/ba2dx10file.hpp
View File

@ -1,5 +1,5 @@
#ifndef BSA_BA2_DX10_FILE_H
#define BSA_BA2_DX10_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_BA2DX10FILE_HPP
#define OPENMW_COMPONENTS_BSA_BA2DX10FILE_HPP
#include <list>
#include <map>
@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include <components/bsa/bsa_file.hpp>
#include "bsafile.hpp"
namespace Bsa
{

4
components/bsa/ba2file.hpp
View File

@ -1,5 +1,5 @@
#ifndef BSA_BA2_FILE_H
#define BSA_BA2_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_BA2FILE_HPP
#define OPENMW_COMPONENTS_BSA_BA2FILE_HPP
#include <cstdint>
#include <string>

6
components/bsa/ba2gnrlfile.cpp
View File

@ -22,13 +22,15 @@
#endif
#include <boost/iostreams/device/array.hpp>
#include <components/bsa/ba2file.hpp>
#include <components/bsa/memorystream.hpp>
#include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/strings/lower.hpp>
#include "ba2file.hpp"
#include "memorystream.hpp"
namespace Bsa
{
// special marker for invalid records,

6
components/bsa/ba2gnrlfile.hpp
View File

@ -1,12 +1,12 @@
#ifndef BSA_BA2_GNRL_FILE_H
#define BSA_BA2_GNRL_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_BA2GNRLFILE_HPP
#define OPENMW_COMPONENTS_BSA_BA2GNRLFILE_HPP
#include <list>
#include <map>
#include <string>
#include <vector>
#include <components/bsa/bsa_file.hpp>
#include "bsafile.hpp"
namespace Bsa
{

10
components/bsa/bsa_file.cpp → components/bsa/bsafile.cpp
View File

@ -4,7 +4,7 @@
Email: < korslund@gmail.com >
WWW: https://openmw.org/
This file (bsa_file.cpp) is part of the OpenMW package.
This file (bsafile.cpp) is part of the OpenMW package.
OpenMW is distributed as free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License
@ -21,10 +21,7 @@
*/
#include "bsa_file.hpp"
#include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp>
#include "bsafile.hpp"
#include <algorithm>
#include <cassert>
@ -32,6 +29,9 @@
#include <filesystem>
#include <fstream>
#include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp>
using namespace Bsa;
/// Error handling

6
components/bsa/bsa_file.hpp → components/bsa/bsafile.hpp
View File

@ -4,7 +4,7 @@
Email: < korslund@gmail.com >
WWW: https://openmw.org/
This file (bsa_file.h) is part of the OpenMW package.
This file (bsafile.hpp) is part of the OpenMW package.
OpenMW is distributed as free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License
@ -21,8 +21,8 @@
*/
#ifndef BSA_BSA_FILE_H
#define BSA_BSA_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_BSAFILE_HPP
#define OPENMW_COMPONENTS_BSA_BSAFILE_HPP
#include <cstdint>
#include <filesystem>

4
components/bsa/compressedbsafile.cpp
View File

@ -45,11 +45,13 @@
#endif
#include <boost/iostreams/device/array.hpp>
#include <components/bsa/memorystream.hpp>
#include <components/files/constrainedfilestream.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/strings/lower.hpp>
#include "memorystream.hpp"
namespace Bsa
{
/// Read header information from the input source

8
components/bsa/compressedbsafile.hpp
View File

@ -23,14 +23,14 @@
*/
#ifndef BSA_COMPRESSED_BSA_FILE_H
#define BSA_COMPRESSED_BSA_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_COMPRESSEDBSAFILE_HPP
#define OPENMW_COMPONENTS_BSA_COMPRESSEDBSAFILE_HPP
#include <filesystem>
#include <limits>
#include <map>
#include <components/bsa/bsa_file.hpp>
#include <filesystem>
#include "bsafile.hpp"
namespace Bsa
{

7
components/bsa/memorystream.hpp
View File

@ -23,13 +23,14 @@
*/
#ifndef BSA_MEMORY_STREAM_H
#define BSA_MEMORY_STREAM_H
#ifndef OPENMW_COMPONENTS_BSA_MEMORYSTREAM_HPP
#define OPENMW_COMPONENTS_BSA_MEMORYSTREAM_HPP
#include <components/files/memorystream.hpp>
#include <istream>
#include <vector>
#include <components/files/memorystream.hpp>
namespace Bsa
{
/**

4
components/crashcatcher/crashcatcher.hpp
View File

@ -1,5 +1,5 @@
#ifndef CRASHCATCHER_H
#define CRASHCATCHER_H
#ifndef OPENMW_COMPONENTS_CRASHCATCHER_CRASHCATCHER_HPP
#define OPENMW_COMPONENTS_CRASHCATCHER_CRASHCATCHER_HPP
#include <filesystem>

9
components/crashcatcher/windows_crashcatcher.cpp → components/crashcatcher/windowscrashcatcher.cpp
View File

@ -1,17 +1,18 @@
#include "windows_crashcatcher.hpp"
#include "windowscrashcatcher.hpp"
#include <cassert>
#include <cwchar>
#include <sstream>
#include <thread>
#include "windows_crashmonitor.hpp"
#include "windows_crashshm.hpp"
#include "windowscrashdumppathhelpers.hpp"
#include <SDL_messagebox.h>
#include <components/misc/strings/conversion.hpp>
#include "windowscrashdumppathhelpers.hpp"
#include "windowscrashmonitor.hpp"
#include "windowscrashshm.hpp"
namespace Crash
{
namespace

9
components/crashcatcher/windows_crashcatcher.hpp → components/crashcatcher/windowscrashcatcher.hpp
View File

@ -1,11 +1,12 @@
#ifndef WINDOWS_CRASHCATCHER_HPP
#define WINDOWS_CRASHCATCHER_HPP
#ifndef OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHCATCHER_HPP
#define OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHCATCHER_HPP
#include <filesystem>
#include <components/crashcatcher/crashcatcher.hpp>
#include <components/misc/windows.hpp>
#include "crashcatcher.hpp"
namespace Crash
{
@ -78,4 +79,4 @@ namespace Crash
} // namespace Crash
#endif // WINDOWS_CRASHCATCHER_HPP
#endif

6
components/crashcatcher/windowscrashdumppathhelpers.hpp
View File

@ -1,8 +1,10 @@
#ifndef COMPONENTS_CRASH_WINDOWSCRASHDUMPPATHHELPERS_H
#include "windows_crashshm.hpp"
#ifndef OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHDUMPPATHHELPERS_HPP
#define OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHDUMPPATHHELPERS_HPP
#include <filesystem>
#include "windowscrashshm.hpp"
namespace Crash
{
std::filesystem::path getCrashDumpPath(const CrashSHM& crashShm);

9
components/crashcatcher/windows_crashmonitor.cpp → components/crashcatcher/windowscrashmonitor.cpp
View File

@ -1,4 +1,4 @@
#include "windows_crashmonitor.hpp"
#include "windowscrashmonitor.hpp"
#include <Psapi.h>
#include <components/misc/windows.hpp>
@ -10,12 +10,13 @@
#include <SDL_messagebox.h>
#include "windows_crashcatcher.hpp"
#include "windows_crashshm.hpp"
#include "windowscrashdumppathhelpers.hpp"
#include <components/debug/debuglog.hpp>
#include <components/misc/strings/conversion.hpp>
#include "windowscrashcatcher.hpp"
#include "windowscrashdumppathhelpers.hpp"
#include "windowscrashshm.hpp"
namespace Crash
{
std::unordered_map<HWINEVENTHOOK, CrashMonitor*> CrashMonitor::smEventHookOwners{};

6
components/crashcatcher/windows_crashmonitor.hpp → components/crashcatcher/windowscrashmonitor.hpp
View File

@ -1,5 +1,5 @@
#ifndef WINDOWS_CRASHMONITOR_HPP
#define WINDOWS_CRASHMONITOR_HPP
#ifndef OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHMONITOR_HPP
#define OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHMONITOR_HPP
#include <components/misc/windows.hpp>
@ -60,4 +60,4 @@ namespace Crash
} // namespace Crash
#endif // WINDOWS_CRASHMONITOR_HPP
#endif

6
components/crashcatcher/windows_crashshm.hpp → components/crashcatcher/windowscrashshm.hpp
View File

@ -1,5 +1,5 @@
#ifndef WINDOWS_CRASHSHM_HPP
#define WINDOWS_CRASHSHM_HPP
#ifndef OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHSHM_HPP
#define OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHSHM_HPP
#include <components/misc/windows.hpp>
@ -44,4 +44,4 @@ namespace Crash
} // namespace Crash
#endif // WINDOWS_CRASHSHM_HPP
#endif

2
components/debug/debugging.cpp
View File

@ -22,7 +22,7 @@
#include <components/misc/strings/lower.hpp>
#ifdef _WIN32
#include <components/crashcatcher/windows_crashcatcher.hpp>
#include <components/crashcatcher/windowscrashcatcher.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/windows.hpp>

2
components/esm3/esmreader.hpp
View File

@ -10,7 +10,7 @@
#include <type_traits>
#include <vector>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "components/esm/decompose.hpp"
#include "components/esm/esmcommon.hpp"

2
components/esm3/esmwriter.cpp
View File

@ -7,7 +7,7 @@
#include <components/debug/debuglog.hpp>
#include <components/esm3/cellid.hpp>
#include <components/misc/notnullptr.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include "formatversion.hpp"

2
components/esm4/reader.cpp
View File

@ -40,7 +40,7 @@
#include <components/files/constrainedfilestream.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/strings/lower.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
#include <components/vfs/manager.hpp>
#include "grouptype.hpp"

2
components/fontloader/fontloader.hpp
View File

@ -5,7 +5,7 @@
#include <MyGUI_XmlDocument.h>
#include <components/myguiplatform/myguidatamanager.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include <components/toutf8/toutf8.hpp>
namespace VFS
{

1
components/fx/lexer.cpp
View File

@ -6,7 +6,6 @@
#include <string>
#include <string_view>
#include <components/fx/lexer_types.hpp>
#include <components/misc/strings/format.hpp>
namespace fx

6
components/fx/lexer.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_FX_LEXER_H
#define OPENMW_COMPONENTS_FX_LEXER_H
#ifndef OPENMW_COMPONENTS_FX_LEXER_HPP
#define OPENMW_COMPONENTS_FX_LEXER_HPP
#include <cstddef>
#include <optional>
@ -7,7 +7,7 @@
#include <string>
#include <string_view>
#include "lexer_types.hpp"
#include "lexertypes.hpp"
namespace fx
{

6
components/fx/lexer_types.hpp → components/fx/lexertypes.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_FX_LEXER_TYPES_H
#define OPENMW_COMPONENTS_FX_LEXER_TYPES_H
#ifndef OPENMW_COMPONENTS_FX_LEXERTYPES_HPP
#define OPENMW_COMPONENTS_FX_LEXERTYPES_HPP
#include <string_view>
#include <variant>
@ -165,4 +165,4 @@ namespace fx
}
}
#endif
#endif

4
components/fx/parse_constants.hpp → components/fx/parseconstants.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_FX_PARSE_CONSTANTS_H
#define OPENMW_COMPONENTS_FX_PARSE_CONSTANTS_H
#ifndef OPENMW_COMPONENTS_FX_PARSECONSTANTS_HPP
#define OPENMW_COMPONENTS_FX_PARSECONSTANTS_HPP
#include <array>
#include <string_view>

4
components/fx/pass.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_FX_PASS_H
#define OPENMW_COMPONENTS_FX_PASS_H
#ifndef OPENMW_COMPONENTS_FX_PASS_HPP
#define OPENMW_COMPONENTS_FX_PASS_HPP
#include <array>
#include <optional>

2
components/fx/technique.cpp
View File

@ -17,7 +17,7 @@
#include <components/stereo/multiview.hpp>
#include <components/vfs/manager.hpp>
#include "parse_constants.hpp"
#include "parseconstants.hpp"
namespace
{

4
components/fx/technique.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_FX_TECHNIQUE_H
#define OPENMW_COMPONENTS_FX_TECHNIQUE_H
#ifndef OPENMW_COMPONENTS_FX_TECHNIQUE_HPP
#define OPENMW_COMPONENTS_FX_TECHNIQUE_HPP
#include <filesystem>
#include <memory>

4
components/fx/types.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_FX_TYPES_H
#define OPENMW_COMPONENTS_FX_TYPES_H
#ifndef OPENMW_COMPONENTS_FX_TYPES_HPP
#define OPENMW_COMPONENTS_FX_TYPES_HPP
#include <optional>
#include <variant>

4
components/fx/widgets.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_FX_WIDGETS_H
#define OPENMW_COMPONENTS_FX_WIDGETS_H
#ifndef OPENMW_COMPONENTS_FX_WIDGETS_HPP
#define OPENMW_COMPONENTS_FX_WIDGETS_HPP
#include <MyGUI_Button.h>
#include <MyGUI_Delegate.h>

4
components/nif/nifstream.cpp
View File

@ -2,9 +2,9 @@
#include <span>
#include "niffile.hpp"
#include <components/toutf8/toutf8.hpp>
#include "../to_utf8/to_utf8.hpp"
#include "niffile.hpp"
namespace
{

0
components/platform/file.posix.cpp → components/platform/fileposix.cpp
View File

0
components/platform/file.stdio.cpp → components/platform/filestdio.cpp
View File

0
components/platform/file.win32.cpp → components/platform/filewin32.cpp
View File

2
components/sdlutil/gl4es_init.cpp → components/sdlutil/gl4esinit.cpp
View File

@ -1,7 +1,7 @@
// EGL does not work reliably for feature detection.
// Instead, we initialize gl4es manually.
#ifdef OPENMW_GL4ES_MANUAL_INIT
#include "gl4es_init.h"
#include "gl4esinit.h"
// For glHint
#include <GL/gl.h>

6
components/sdlutil/gl4es_init.h → components/sdlutil/gl4esinit.h
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_SDLUTIL_GL4ES_INIT_H
#define OPENMW_COMPONENTS_SDLUTIL_GL4ES_INIT_H
#ifndef OPENMW_COMPONENTS_SDLUTIL_GL4ESINIT_H
#define OPENMW_COMPONENTS_SDLUTIL_GL4ESINIT_H
#ifdef OPENMW_GL4ES_MANUAL_INIT
#include <SDL_video.h>
@ -10,4 +10,4 @@
extern "C" void openmw_gl4es_init(SDL_Window* window);
#endif // OPENMW_GL4ES_MANUAL_INIT
#endif // OPENMW_COMPONENTS_SDLUTIL_GL4ES_INIT_H
#endif // OPENMW_COMPONENTS_SDLUTIL_GL4ESINIT_H

2
components/sdlutil/sdlgraphicswindow.cpp
View File

@ -3,7 +3,7 @@
#include <SDL_video.h>
#ifdef OPENMW_GL4ES_MANUAL_INIT
#include "gl4es_init.h"
#include "gl4esinit.h"
#endif
namespace SDLUtil

Some files were not shown because too many files have changed in this diff Show More