Skip to content

Commit

Permalink
989snd: rename AMEHandler members
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziemas
Ziemas committed Nov 25, 2023
1 parent d3b4132 commit de2bb78
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
36 changes: 18 additions & 18 deletions game/sound/989snd/ame_handler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace snd {
u64 SoundFlavaHack = 0;
u8 GlobalExcite = 0;

ame_handler::ame_handler(MultiMidi* block,
AmeHandler::AmeHandler(MultiMidi* block,
VoiceManager& vm,
MusicBank::MIDISound& sound,
s32 vol,
Expand All @@ -35,10 +35,10 @@ ame_handler::ame_handler(MultiMidi* block,
m_pan = pan;
}

start_segment(0);
StartSegment(0);
};

bool ame_handler::Tick() {
bool AmeHandler::Tick() {
for (auto it = m_midis.begin(); it != m_midis.end();) {
bool done = it->second->Tick();
if (done) {
Expand All @@ -51,7 +51,7 @@ bool ame_handler::Tick() {
return m_midis.empty();
};

void ame_handler::start_segment(u32 id) {
void AmeHandler::StartSegment(u32 id) {
if (m_midis.find(id) == m_midis.end()) {
auto& midi = m_header->midi[id];

Expand All @@ -64,34 +64,34 @@ void ame_handler::start_segment(u32 id) {
}
}

void ame_handler::Stop() {
void AmeHandler::Stop() {
for (auto it = m_midis.begin(); it != m_midis.end();) {
it->second->Stop();
it = m_midis.erase(it);
}
}

void ame_handler::stop_segment(u32 id) {
void AmeHandler::StopSegment(u32 id) {
auto m = m_midis.find(id);
if (m == m_midis.end())
return;

m->second->Stop();
}

void ame_handler::Pause() {
void AmeHandler::Pause() {
for (auto& m : m_midis) {
m.second->Pause();
}
}

void ame_handler::Unpause() {
void AmeHandler::Unpause() {
for (auto& m : m_midis) {
m.second->Unpause();
}
}

void ame_handler::SetVolPan(s32 vol, s32 pan) {
void AmeHandler::SetVolPan(s32 vol, s32 pan) {
if (vol >= 0) {
if (vol != VOLUME_DONT_CHANGE) {
m_vol = (m_sound.Vol * vol) >> 10;
Expand All @@ -115,7 +115,7 @@ void ame_handler::SetVolPan(s32 vol, s32 pan) {
}
}

void ame_handler::SetPMod(s32 mod) {
void AmeHandler::SetPMod(s32 mod) {
for (auto& m : m_midis) {
m.second->SetPMod(mod);
}
Expand All @@ -134,7 +134,7 @@ void ame_handler::SetPMod(s32 mod) {
; \
stream += (x);

std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
std::pair<bool, u8*> AmeHandler::RunAME(MidiHandler& midi, u8* stream) {
int skip = 0;
bool done = false;
bool cont = true;
Expand Down Expand Up @@ -179,7 +179,7 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
} break;
case 0x3: {
AME_BEGIN(op)
stop_segment(stream[0]);
StopSegment(stream[0]);
AME_END(1)
} break;
case 0x4: {
Expand Down Expand Up @@ -218,7 +218,7 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
} break;
case 0xc: {
AME_BEGIN(op)
auto [sub_cont, ptr] = run_ame(midi, m_macro[stream[0]]);
auto [sub_cont, ptr] = RunAME(midi, m_macro[stream[0]]);
if (!sub_cont) {
cont = false;
done = true;
Expand All @@ -229,12 +229,12 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
AME_BEGIN(op)
cont = false;
done = true;
start_segment(m_register[stream[0]] - 1);
StartSegment(m_register[stream[0]] - 1);
AME_END(1)
} break;
case 0xe: {
AME_BEGIN(op)
start_segment(m_register[stream[0]] - 1);
StartSegment(m_register[stream[0]] - 1);
AME_END(1)
} break;
case 0xf: {
Expand Down Expand Up @@ -289,12 +289,12 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
AME_BEGIN(op)
done = true;
cont = false;
start_segment(stream[0]);
StartSegment(stream[0]);
AME_END(1)
} break;
case 0x12: {
AME_BEGIN(op)
start_segment(stream[0]);
StartSegment(stream[0]);
AME_END(1)
} break;
case 0x13: {
Expand Down Expand Up @@ -327,7 +327,7 @@ std::pair<bool, u8*> ame_handler::run_ame(MidiHandler& midi, u8* stream) {
AME_END(2)
} break;
default: {
throw ame_error(fmt::format("Unhandled AME event {:02x}", (u8)op));
throw AMEError(fmt::format("Unhandled AME event {:02x}", (u8)op));
} break;
}

Expand Down
16 changes: 8 additions & 8 deletions game/sound/989snd/ame_handler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ extern u64 SoundFlavaHack;
extern u8 GlobalExcite;

class MidiHandler;
class ame_handler : public SoundHandler {
class AmeHandler : public SoundHandler {
friend class MidiHandler;

public:
ame_handler(MultiMidi* block,
AmeHandler(MultiMidi* block,
VoiceManager& vm,
MusicBank::MIDISound& sound,
s32 vol,
Expand All @@ -42,9 +42,9 @@ class ame_handler : public SoundHandler {
void SetPMod(s32 mod) override;

private:
struct ame_error : public std::exception {
ame_error(std::string text) : msg(std::move(text)) {}
ame_error() : msg("Unknown AME error") {}
struct AMEError : public std::exception {
AMEError(std::string text) : msg(std::move(text)) {}
AMEError() : msg("Unknown AME error") {}
std::string msg;
const char* what() const noexcept override { return msg.c_str(); }
};
Expand All @@ -58,9 +58,9 @@ class ame_handler : public SoundHandler {
/* 24 */ s8 excite_max[16];
};

void start_segment(u32 id);
void stop_segment(u32 id);
std::pair<bool, u8*> run_ame(MidiHandler&, u8* stream);
void StartSegment(u32 id);
void StopSegment(u32 id);
std::pair<bool, u8*> RunAME(MidiHandler&, u8* stream);

MusicBank::MIDISound& m_sound;
SoundBank& m_bank;
Expand Down
4 changes: 2 additions & 2 deletions game/sound/989snd/midi_handler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ MidiHandler::MidiHandler(Midi* block,
s32 vol,
s32 pan,
SoundBank& bank,
std::optional<ame_handler*> parent)
std::optional<AmeHandler*> parent)
: m_parent(parent),
m_sound(sound),
m_vol(vol),
Expand Down Expand Up @@ -396,7 +396,7 @@ void MidiHandler::SystemEvent() {
case 0x75:
m_seq_ptr++;
if (m_parent.has_value()) {
auto [cont, ptr] = m_parent.value()->run_ame(*this, m_seq_ptr);
auto [cont, ptr] = m_parent.value()->RunAME(*this, m_seq_ptr);
m_seq_ptr = ptr;

if (!cont) {
Expand Down
6 changes: 3 additions & 3 deletions game/sound/989snd/midi_handler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class midi_voice : public VagVoice {
MusicBank::Prog& prog;
};

class ame_handler;
class AmeHandler;
class MidiHandler : public SoundHandler {
public:
MidiHandler(Midi* block,
Expand All @@ -42,7 +42,7 @@ class MidiHandler : public SoundHandler {
s32 vol,
s32 pan,
SoundBank& bank,
std::optional<ame_handler*> parent);
std::optional<AmeHandler*> parent);

~MidiHandler() override {
for (auto& p : m_voices) {
Expand Down Expand Up @@ -78,7 +78,7 @@ class MidiHandler : public SoundHandler {
const char* what() const noexcept override { return msg.c_str(); }
};

std::optional<ame_handler*> m_parent;
std::optional<AmeHandler*> m_parent;

std::list<std::weak_ptr<midi_voice>> m_voices;

Expand Down
2 changes: 1 addition & 1 deletion game/sound/989snd/musicbank.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ std::optional<std::unique_ptr<SoundHandler>> MusicBank::MakeHandler(VoiceManager
} else if (sound.Type == 5) {
auto& midi = std::get<MultiMidi>(MidiData);
if (sound.MIDIID == midi.ID) {
return std::make_unique<ame_handler>(&midi, vm, sound, vol, pan, *this);
return std::make_unique<AmeHandler>(&midi, vm, sound, vol, pan, *this);
}
return std::nullopt;
} else {
Expand Down

0 comments on commit de2bb78

Please sign in to comment.