mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 21:53:53 +00:00
Code Issues Releases Wiki Activity

Remove default argument

Browse source
This commit is contained in:
Andrei Kortunov 2023-09-12 14:04:30 +04:00
parent e1cae5a029
commit 18fe6a8ae7
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,9 +112,7 @@ namespace MWBase
virtual void stopMusic() = 0; virtual void stopMusic() = 0;
///< Stops music if it's playing ///< Stops music if it's playing
virtual void streamMusic( virtual void streamMusic(const std::string& filename, MWSound::MusicType type, float fade = 1.f) = 0;
const std::string& filename, MWSound::MusicType type = MWSound::MusicType::Scripted, float fade = 1.f)
= 0;
///< Play a soundifle ///< Play a soundifle
/// \param filename name of a sound file in the data directory. /// \param filename name of a sound file in the data directory.
/// \param type music type. /// \param type music type.

3
apps/openmw/mwlua/musicbindings.cpp
View file

@ -14,7 +14,8 @@ namespace MWLua
{ {
sol::table api(context.mLua->sol(), sol::create); sol::table api(context.mLua->sol(), sol::create);
api["streamMusic"] = [](std::string_view fileName) { api["streamMusic"] = [](std::string_view fileName) {
MWBase::Environment::get().getSoundManager()->streamMusic(std::string(fileName)); MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
sndMgr->streamMusic(std::string(fileName), MWSound::MusicType::Scripted);
}; };
api["stopMusic"] = []() { MWBase::Environment::get().getSoundManager()->stopMusic(); }; api["stopMusic"] = []() { MWBase::Environment::get().getSoundManager()->stopMusic(); };

2
apps/openmw/mwscript/soundextensions.cpp
View file

@ -67,7 +67,7 @@ namespace MWScript
runtime.pop(); runtime.pop();
MWBase::Environment::get().getSoundManager()->streamMusic( MWBase::Environment::get().getSoundManager()->streamMusic(
Misc::ResourceHelpers::correctMusicPath(music)); Misc::ResourceHelpers::correctMusicPath(music), MWSound::MusicType::Scripted);
} }
}; };

3
apps/openmw/mwsound/soundmanagerimp.hpp
View file

@ -176,8 +176,7 @@ namespace MWSound
void stopMusic() override; void stopMusic() override;
///< Stops music if it's playing ///< Stops music if it's playing
void streamMusic(const std::string& filename, MWSound::MusicType type = MWSound::MusicType::Scripted, void streamMusic(const std::string& filename, MWSound::MusicType type, float fade = 1.f) override;
float fade = 1.f) override;
///< Play a soundifle ///< Play a soundifle
/// \param filename name of a sound file in the data directory. /// \param filename name of a sound file in the data directory.
/// \param type music type. /// \param type music type.