mirror of
https://github.com/AxioDL/amuse.git
synced 2025-12-09 21:47:53 +00:00
More athena refactoring
This commit is contained in:
Jack Andersen
@@ -5,6 +5,8 @@
|
||||
#include "athena/MemoryReader.hpp"
|
||||
#include "logvisor/logvisor.hpp"
|
||||
|
||||
using namespace std::literals;
|
||||
|
||||
namespace amuse
|
||||
{
|
||||
static logvisor::Module Log("amuse::AudioGroupPool");
|
||||
@@ -75,8 +77,9 @@ AudioGroupPool AudioGroupPool::_AudioGroupPool(athena::io::IStreamReader& r)
|
||||
ObjectHeader<DNAE> objHead;
|
||||
atInt64 startPos = r.position();
|
||||
objHead.read(r);
|
||||
Keymap& km = ret.m_keymaps[objHead.objectId.id];
|
||||
km.read(r);
|
||||
KeymapDNA<DNAE> kmData;
|
||||
kmData.read(r);
|
||||
ret.m_keymaps[objHead.objectId.id] = kmData;
|
||||
r.seek(startPos + objHead.size, athena::Begin);
|
||||
}
|
||||
}
|
||||
@@ -95,8 +98,9 @@ AudioGroupPool AudioGroupPool::_AudioGroupPool(athena::io::IStreamReader& r)
|
||||
lm.reserve(count);
|
||||
for (uint32_t i = 0; i < count; ++i)
|
||||
{
|
||||
lm.emplace_back();
|
||||
lm.back().read(r);
|
||||
LayerMappingDNA<DNAE> lmData;
|
||||
lmData.read(r);
|
||||
lm.push_back(lmData);
|
||||
}
|
||||
r.seek(startPos + objHead.size, athena::Begin);
|
||||
}
|
||||
@@ -347,6 +351,408 @@ const ADSR* AudioGroupPool::tableAsAdsr(ObjectId id) const
|
||||
return static_cast<const ADSR*>(search->second.get());
|
||||
}
|
||||
|
||||
std::string_view SoundMacro::CmdOpToStr(CmdOp op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
case CmdOp::End:
|
||||
return "End"sv;
|
||||
case CmdOp::Stop:
|
||||
return "Stop"sv;
|
||||
case CmdOp::SplitKey:
|
||||
return "SplitKey"sv;
|
||||
case CmdOp::SplitVel:
|
||||
return "SplitVel"sv;
|
||||
case CmdOp::WaitTicks:
|
||||
return "WaitTicks"sv;
|
||||
case CmdOp::Loop:
|
||||
return "Loop"sv;
|
||||
case CmdOp::Goto:
|
||||
return "Goto"sv;
|
||||
case CmdOp::WaitMs:
|
||||
return "WaitMs"sv;
|
||||
case CmdOp::PlayMacro:
|
||||
return "PlayMacro"sv;
|
||||
case CmdOp::SendKeyOff:
|
||||
return "SendKeyOff"sv;
|
||||
case CmdOp::SplitMod:
|
||||
return "SplitMod"sv;
|
||||
case CmdOp::PianoPan:
|
||||
return "PianoPan"sv;
|
||||
case CmdOp::SetAdsr:
|
||||
return "SetAdsr"sv;
|
||||
case CmdOp::ScaleVolume:
|
||||
return "ScaleVolume"sv;
|
||||
case CmdOp::Panning:
|
||||
return "Panning"sv;
|
||||
case CmdOp::Envelope:
|
||||
return "Envelope"sv;
|
||||
case CmdOp::StartSample:
|
||||
return "StartSample"sv;
|
||||
case CmdOp::StopSample:
|
||||
return "StopSample"sv;
|
||||
case CmdOp::KeyOff:
|
||||
return "KeyOff"sv;
|
||||
case CmdOp::SplitRnd:
|
||||
return "SplitRnd"sv;
|
||||
case CmdOp::FadeIn:
|
||||
return "FadeIn"sv;
|
||||
case CmdOp::Spanning:
|
||||
return "Spanning"sv;
|
||||
case CmdOp::SetAdsrCtrl:
|
||||
return "SetAdsrCtrl"sv;
|
||||
case CmdOp::RndNote:
|
||||
return "RndNote"sv;
|
||||
case CmdOp::AddNote:
|
||||
return "AddNote"sv;
|
||||
case CmdOp::SetNote:
|
||||
return "SetNote"sv;
|
||||
case CmdOp::LastNote:
|
||||
return "LastNote"sv;
|
||||
case CmdOp::Portamento:
|
||||
return "Portamento"sv;
|
||||
case CmdOp::Vibrato:
|
||||
return "Vibrato"sv;
|
||||
case CmdOp::PitchSweep1:
|
||||
return "PitchSweep1"sv;
|
||||
case CmdOp::PitchSweep2:
|
||||
return "PitchSweep2"sv;
|
||||
case CmdOp::SetPitch:
|
||||
return "SetPitch"sv;
|
||||
case CmdOp::SetPitchAdsr:
|
||||
return "SetPitchAdsr"sv;
|
||||
case CmdOp::ScaleVolumeDLS:
|
||||
return "ScaleVolumeDLS"sv;
|
||||
case CmdOp::Mod2Vibrange:
|
||||
return "Mod2Vibrange"sv;
|
||||
case CmdOp::SetupTremolo:
|
||||
return "SetupTremolo"sv;
|
||||
case CmdOp::Return:
|
||||
return "Return"sv;
|
||||
case CmdOp::GoSub:
|
||||
return "GoSub"sv;
|
||||
case CmdOp::TrapEvent:
|
||||
return "TrapEvent"sv;
|
||||
case CmdOp::UntrapEvent:
|
||||
return "UntrapEvent"sv;
|
||||
case CmdOp::SendMessage:
|
||||
return "SendMessage"sv;
|
||||
case CmdOp::GetMessage:
|
||||
return "GetMessage"sv;
|
||||
case CmdOp::GetVid:
|
||||
return "GetVid"sv;
|
||||
case CmdOp::AddAgeCount:
|
||||
return "AddAgeCount"sv;
|
||||
case CmdOp::SetAgeCount:
|
||||
return "SetAgeCount"sv;
|
||||
case CmdOp::SendFlag:
|
||||
return "SendFlag"sv;
|
||||
case CmdOp::PitchWheelR:
|
||||
return "PitchWheelR"sv;
|
||||
case CmdOp::SetPriority:
|
||||
return "SetPriority"sv;
|
||||
case CmdOp::AddPriority:
|
||||
return "AddPriority"sv;
|
||||
case CmdOp::AgeCntSpeed:
|
||||
return "AgeCntSpeed"sv;
|
||||
case CmdOp::AgeCntVel:
|
||||
return "AgeCntVel"sv;
|
||||
case CmdOp::VolSelect:
|
||||
return "VolSelect"sv;
|
||||
case CmdOp::PanSelect:
|
||||
return "PanSelect"sv;
|
||||
case CmdOp::PitchWheelSelect:
|
||||
return "PitchWheelSelect"sv;
|
||||
case CmdOp::ModWheelSelect:
|
||||
return "ModWheelSelect"sv;
|
||||
case CmdOp::PedalSelect:
|
||||
return "PedalSelect"sv;
|
||||
case CmdOp::PortamentoSelect:
|
||||
return "PortamentoSelect"sv;
|
||||
case CmdOp::ReverbSelect:
|
||||
return "ReverbSelect"sv;
|
||||
case CmdOp::SpanSelect:
|
||||
return "SpanSelect"sv;
|
||||
case CmdOp::DopplerSelect:
|
||||
return "DopplerSelect"sv;
|
||||
case CmdOp::TremoloSelect:
|
||||
return "TremoloSelect"sv;
|
||||
case CmdOp::PreASelect:
|
||||
return "PreASelect"sv;
|
||||
case CmdOp::PreBSelect:
|
||||
return "PreBSelect"sv;
|
||||
case CmdOp::PostBSelect:
|
||||
return "PostBSelect"sv;
|
||||
case CmdOp::AuxAFXSelect:
|
||||
return "AuxAFXSelect"sv;
|
||||
case CmdOp::AuxBFXSelect:
|
||||
return "AuxBFXSelect"sv;
|
||||
case CmdOp::SetupLFO:
|
||||
return "SetupLFO"sv;
|
||||
case CmdOp::ModeSelect:
|
||||
return "ModeSelect"sv;
|
||||
case CmdOp::SetKeygroup:
|
||||
return "SetKeygroup"sv;
|
||||
case CmdOp::SRCmodeSelect:
|
||||
return "SRCmodeSelect"sv;
|
||||
case CmdOp::AddVars:
|
||||
return "AddVars"sv;
|
||||
case CmdOp::SubVars:
|
||||
return "SubVars"sv;
|
||||
case CmdOp::MulVars:
|
||||
return "MulVars"sv;
|
||||
case CmdOp::DivVars:
|
||||
return "DivVars"sv;
|
||||
case CmdOp::AddIVars:
|
||||
return "AddIVars"sv;
|
||||
case CmdOp::IfEqual:
|
||||
return "IfEqual"sv;
|
||||
case CmdOp::IfLess:
|
||||
return "IfLess"sv;
|
||||
default:
|
||||
return ""sv;
|
||||
}
|
||||
}
|
||||
|
||||
SoundMacro::CmdOp SoundMacro::CmdStrToOp(std::string_view op)
|
||||
{
|
||||
if (!CompareCaseInsensitive(op.data(), "End"))
|
||||
return CmdOp::End;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Stop"))
|
||||
return CmdOp::Stop;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SplitKey"))
|
||||
return CmdOp::SplitKey;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SplitVel"))
|
||||
return CmdOp::SplitVel;
|
||||
else if (!CompareCaseInsensitive(op.data(), "WaitTicks"))
|
||||
return CmdOp::WaitTicks;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Loop"))
|
||||
return CmdOp::Loop;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Goto"))
|
||||
return CmdOp::Goto;
|
||||
else if (!CompareCaseInsensitive(op.data(), "WaitMs"))
|
||||
return CmdOp::WaitMs;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PlayMacro"))
|
||||
return CmdOp::PlayMacro;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SendKeyOff"))
|
||||
return CmdOp::SendKeyOff;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SplitMod"))
|
||||
return CmdOp::SplitMod;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PianoPan"))
|
||||
return CmdOp::PianoPan;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetAdsr"))
|
||||
return CmdOp::SetAdsr;
|
||||
else if (!CompareCaseInsensitive(op.data(), "ScaleVolume"))
|
||||
return CmdOp::ScaleVolume;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Panning"))
|
||||
return CmdOp::Panning;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Envelope"))
|
||||
return CmdOp::Envelope;
|
||||
else if (!CompareCaseInsensitive(op.data(), "StartSample"))
|
||||
return CmdOp::StartSample;
|
||||
else if (!CompareCaseInsensitive(op.data(), "StopSample"))
|
||||
return CmdOp::StopSample;
|
||||
else if (!CompareCaseInsensitive(op.data(), "KeyOff"))
|
||||
return CmdOp::KeyOff;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SplitRnd"))
|
||||
return CmdOp::SplitRnd;
|
||||
else if (!CompareCaseInsensitive(op.data(), "FadeIn"))
|
||||
return CmdOp::FadeIn;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Spanning"))
|
||||
return CmdOp::Spanning;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetAdsrCtrl"))
|
||||
return CmdOp::SetAdsrCtrl;
|
||||
else if (!CompareCaseInsensitive(op.data(), "RndNote"))
|
||||
return CmdOp::RndNote;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AddNote"))
|
||||
return CmdOp::AddNote;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetNote"))
|
||||
return CmdOp::SetNote;
|
||||
else if (!CompareCaseInsensitive(op.data(), "LastNote"))
|
||||
return CmdOp::LastNote;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Portamento"))
|
||||
return CmdOp::Portamento;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Vibrato"))
|
||||
return CmdOp::Vibrato;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PitchSweep1"))
|
||||
return CmdOp::PitchSweep1;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PitchSweep2"))
|
||||
return CmdOp::PitchSweep2;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetPitch"))
|
||||
return CmdOp::SetPitch;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetPitchAdsr"))
|
||||
return CmdOp::SetPitchAdsr;
|
||||
else if (!CompareCaseInsensitive(op.data(), "ScaleVolumeDLS"))
|
||||
return CmdOp::ScaleVolumeDLS;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Mod2Vibrange"))
|
||||
return CmdOp::Mod2Vibrange;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetupTremolo"))
|
||||
return CmdOp::SetupTremolo;
|
||||
else if (!CompareCaseInsensitive(op.data(), "Return"))
|
||||
return CmdOp::Return;
|
||||
else if (!CompareCaseInsensitive(op.data(), "GoSub"))
|
||||
return CmdOp::GoSub;
|
||||
else if (!CompareCaseInsensitive(op.data(), "TrapEvent"))
|
||||
return CmdOp::TrapEvent;
|
||||
else if (!CompareCaseInsensitive(op.data(), "UntrapEvent"))
|
||||
return CmdOp::UntrapEvent;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SendMessage"))
|
||||
return CmdOp::SendMessage;
|
||||
else if (!CompareCaseInsensitive(op.data(), "GetMessage"))
|
||||
return CmdOp::GetMessage;
|
||||
else if (!CompareCaseInsensitive(op.data(), "GetVid"))
|
||||
return CmdOp::GetVid;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AddAgeCount"))
|
||||
return CmdOp::AddAgeCount;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetAgeCount"))
|
||||
return CmdOp::SetAgeCount;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SendFlag"))
|
||||
return CmdOp::SendFlag;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PitchWheelR"))
|
||||
return CmdOp::PitchWheelR;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetPriority"))
|
||||
return CmdOp::SetPriority;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AddPriority"))
|
||||
return CmdOp::AddPriority;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AgeCntSpeed"))
|
||||
return CmdOp::AgeCntSpeed;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AgeCntVel"))
|
||||
return CmdOp::AgeCntVel;
|
||||
else if (!CompareCaseInsensitive(op.data(), "VolSelect"))
|
||||
return CmdOp::VolSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PanSelect"))
|
||||
return CmdOp::PanSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PitchWheelSelect"))
|
||||
return CmdOp::PitchWheelSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "ModWheelSelect"))
|
||||
return CmdOp::ModWheelSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PedalSelect"))
|
||||
return CmdOp::PedalSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PortamentoSelect"))
|
||||
return CmdOp::PortamentoSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "ReverbSelect"))
|
||||
return CmdOp::ReverbSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SpanSelect"))
|
||||
return CmdOp::SpanSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "DopplerSelect"))
|
||||
return CmdOp::DopplerSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "TremoloSelect"))
|
||||
return CmdOp::TremoloSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PreASelect"))
|
||||
return CmdOp::PreASelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PreBSelect"))
|
||||
return CmdOp::PreBSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "PostBSelect"))
|
||||
return CmdOp::PostBSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AuxAFXSelect"))
|
||||
return CmdOp::AuxAFXSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AuxBFXSelect"))
|
||||
return CmdOp::AuxBFXSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetupLFO"))
|
||||
return CmdOp::SetupLFO;
|
||||
else if (!CompareCaseInsensitive(op.data(), "ModeSelect"))
|
||||
return CmdOp::ModeSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SetKeygroup"))
|
||||
return CmdOp::SetKeygroup;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SRCmodeSelect"))
|
||||
return CmdOp::SRCmodeSelect;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AddVars"))
|
||||
return CmdOp::AddVars;
|
||||
else if (!CompareCaseInsensitive(op.data(), "SubVars"))
|
||||
return CmdOp::SubVars;
|
||||
else if (!CompareCaseInsensitive(op.data(), "MulVars"))
|
||||
return CmdOp::MulVars;
|
||||
else if (!CompareCaseInsensitive(op.data(), "DivVars"))
|
||||
return CmdOp::DivVars;
|
||||
else if (!CompareCaseInsensitive(op.data(), "AddIVars"))
|
||||
return CmdOp::AddIVars;
|
||||
else if (!CompareCaseInsensitive(op.data(), "IfEqual"))
|
||||
return CmdOp::IfEqual;
|
||||
else if (!CompareCaseInsensitive(op.data(), "IfLess"))
|
||||
return CmdOp::IfLess;
|
||||
return CmdOp::Invalid;
|
||||
}
|
||||
|
||||
bool AudioGroupPool::toYAML(athena::io::IStreamWriter& writer) const
|
||||
{
|
||||
athena::io::YAMLDocWriter w("amuse::Pool");
|
||||
|
||||
if (!m_soundMacros.empty())
|
||||
{
|
||||
if (auto __r = w.enterSubRecord("soundMacros"))
|
||||
{
|
||||
for (const auto& p : SortUnorderedMap(m_soundMacros))
|
||||
{
|
||||
if (auto __v = w.enterSubVector(SoundMacroId::CurNameDB->resolveNameFromId(p.first).data()))
|
||||
{
|
||||
for (const auto& c : p.second.get().m_cmds)
|
||||
{
|
||||
if (auto __r2 = w.enterSubRecord(nullptr))
|
||||
{
|
||||
w.setStyle(athena::io::YAMLNodeStyle::Flow);
|
||||
w.writeString("cmdOp", SoundMacro::CmdOpToStr(c->Isa()));
|
||||
c->write(w);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!m_tables.empty())
|
||||
{
|
||||
if (auto __r = w.enterSubRecord("tables"))
|
||||
{
|
||||
for (const auto& p : SortUnorderedMap(m_tables))
|
||||
{
|
||||
if (auto __v = w.enterSubRecord(TableId::CurNameDB->resolveNameFromId(p.first).data()))
|
||||
{
|
||||
w.setStyle(athena::io::YAMLNodeStyle::Flow);
|
||||
p.second.get()->write(w);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!m_keymaps.empty())
|
||||
{
|
||||
if (auto __r = w.enterSubRecord("keymaps"))
|
||||
{
|
||||
for (const auto& p : SortUnorderedMap(m_keymaps))
|
||||
{
|
||||
if (auto __v = w.enterSubRecord(KeymapId::CurNameDB->resolveNameFromId(p.first).data()))
|
||||
{
|
||||
w.setStyle(athena::io::YAMLNodeStyle::Flow);
|
||||
p.second.get().write(w);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!m_layers.empty())
|
||||
{
|
||||
if (auto __r = w.enterSubRecord("layers"))
|
||||
{
|
||||
for (const auto& p : SortUnorderedMap(m_layers))
|
||||
{
|
||||
if (auto __v = w.enterSubVector(LayersId::CurNameDB->resolveNameFromId(p.first).data()))
|
||||
{
|
||||
for (const auto& lm : p.second.get())
|
||||
{
|
||||
if (auto __r2 = w.enterSubRecord(nullptr))
|
||||
{
|
||||
w.setStyle(athena::io::YAMLNodeStyle::Flow);
|
||||
lm.write(w);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return w.finish(&writer);
|
||||
}
|
||||
|
||||
template <>
|
||||
void amuse::Curve::Enumerate<LittleDNA::Read>(athena::io::IStreamReader& r)
|
||||
{
|
||||
@@ -368,17 +774,18 @@ void amuse::Curve::Enumerate<LittleDNA::BinarySize>(size_t& sz)
|
||||
template <>
|
||||
void amuse::Curve::Enumerate<LittleDNA::ReadYaml>(athena::io::YAMLDocReader& r)
|
||||
{
|
||||
r.enumerate(nullptr, data);
|
||||
r.enumerate("data", data);
|
||||
}
|
||||
|
||||
template <>
|
||||
void amuse::Curve::Enumerate<LittleDNA::WriteYaml>(athena::io::YAMLDocWriter& w)
|
||||
{
|
||||
w.enumerate(nullptr, data);
|
||||
w.enumerate("data", data);
|
||||
}
|
||||
|
||||
const char* amuse::Curve::DNAType()
|
||||
{
|
||||
return "amuse::ADSR";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user