Skip to content

Add per-song fade-in and fade-out to streamed audio #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bassdr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add per-song fade-in and fade-out to streamed audio #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions windows/CustomStreamedAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#define DR_FLAC_IMPLEMENTATION
#include "dr_flac.h"

#include <algorithm>
#include <ogg/ogg.h>
#include <vorbis/vorbisfile.h>
#include <vorbis/vorbisenc.h>
Expand Down Expand Up @@ -217,7 +218,8 @@ std::unique_ptr<char[]> CreateSampleXml(char* fileName, const char* audioType, u
return sampleXmlPath;
}

static void CreateSequenceXml(char* fileName, char* fontPath, unsigned int length, bool isFanfare, bool stereo, Archive* a) {
static void CreateSequenceXml(char* fileName, char* fontPath, unsigned int length, const SeqMetaInfo* info, bool stereo, Archive* a) {
const bool isFanfare = info->fanfare;
tinyxml2::XMLDocument seqBaseRoot;
tinyxml2::XMLError e = seqBaseRoot.LoadFile("assets/seq-base.xml");
if (e != 0) {
Expand Down Expand Up @@ -254,6 +256,13 @@ static void CreateSequenceXml(char* fileName, char* fontPath, unsigned int lengt
snprintf(seqXmlPath.get(), seqPathLen, "%s%s_SEQ.xml_fanfare", seqXmlBase, fileName);
}
root->SetAttribute("Stereo", stereo);
// Ship of Harkinian reads these as seconds, clamped to 0-60.
if (info->fadeInSeconds > 0.0f) {
root->SetAttribute("FadeIn", info->fadeInSeconds);
}
if (info->fadeOutSeconds > 0.0f) {
root->SetAttribute("FadeOut", info->fadeOutSeconds);
}
seqBaseRoot.InsertEndChild(root);
root->Accept(&p);

Expand Down Expand Up @@ -990,7 +999,7 @@ static void ProcessAudioFile(std::vector<char*>* fileQueue, std::unordered_map<c
float lengthF = (float)numFrames / (float)sampleRate;
lengthF = ceilf(lengthF);
unsigned int length = static_cast<unsigned int>(lengthF);
CreateSequenceXml(fileName, fontXmlPath.get(), length, seqMetaMap->at(fileName).fanfare, numChannels == 2, a);
CreateSequenceXml(fileName, fontXmlPath.get(), length, &seqMetaMap->at(fileName), numChannels == 2, a);
// Since the function that allocates the paths allocates them 2 byte aligned, we can use the lowest bit as a signal that this file has been processed.
uintptr_t inputU = reinterpret_cast<uintptr_t>(*inputp);
inputU |= 1;
Expand Down Expand Up @@ -1203,6 +1212,12 @@ void CustomStreamedAudioWindow::DrawPendingFilesList() {
const float endPos = ImGui::GetCursorPosX();
ImGui::TextUnformatted("LoopEnd");
ImGui::SameLine();
const float fadeInPos = ImGui::GetCursorPosX();
ImGui::TextUnformatted("Fade In (s)");
ImGui::SameLine();
const float fadeOutPos = ImGui::GetCursorPosX();
ImGui::TextUnformatted("Fade Out (s)");
ImGui::SameLine();
const float fanfarePos = ImGui::GetCursorPosX();
ImGui::TextUnformatted("Fanfare");
ImGui::SameLine();
Expand Down Expand Up @@ -1236,6 +1251,10 @@ void CustomStreamedAudioWindow::DrawPendingFilesList() {
sprintf(checkboxTag.get(), "##ff%s", fileName);
sprintf(loopStartTag.get(), "##start%s", fileName);
sprintf(loopEndTag.get(), "##end%s", fileName);
auto fadeInTag = std::make_unique<char[]>(len + sizeof("##fadein") + 1);
auto fadeOutTag = std::make_unique<char[]>(len + sizeof("##fadeout") + 1);
sprintf(fadeInTag.get(), "##fadein%s", fileName);
sprintf(fadeOutTag.get(), "##fadeout%s", fileName);
ImGui::Text("%s", fileName);
ImGui::SameLine(totalPadding);
ImGui::SetCursorPosX(startPos);
Expand All @@ -1245,6 +1264,16 @@ void CustomStreamedAudioWindow::DrawPendingFilesList() {
ImGui::SetCursorPosX(endPos);
ImGui::InputScalarN(loopEndTag.get(), type, &mSeqMetaMap.at(fileName).loopEnd, 1);
ImGui::SameLine();
ImGui::SetCursorPosX(fadeInPos);
if (ImGui::InputFloat(fadeInTag.get(), &mSeqMetaMap.at(fileName).fadeInSeconds, 0.0f, 0.0f, "%.2f")) {
mSeqMetaMap.at(fileName).fadeInSeconds = std::clamp(mSeqMetaMap.at(fileName).fadeInSeconds, 0.0f, 60.0f);
}
ImGui::SameLine();
ImGui::SetCursorPosX(fadeOutPos);
if (ImGui::InputFloat(fadeOutTag.get(), &mSeqMetaMap.at(fileName).fadeOutSeconds, 0.0f, 0.0f, "%.2f")) {
mSeqMetaMap.at(fileName).fadeOutSeconds = std::clamp(mSeqMetaMap.at(fileName).fadeOutSeconds, 0.0f, 60.0f);
}
ImGui::SameLine();
ImGui::PopItemWidth();
ImGui::SetCursorPosX(fanfareStartPos);
ImGui::Checkbox(checkboxTag.get(), &mSeqMetaMap.at(fileName).fanfare);
Expand Down
2 changes: 2 additions & 0 deletions windows/CustomStreamedAudio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ typedef union IntFloat {
typedef struct SeqMetaInfo {
IntFloat loopStart;
IntFloat loopEnd;
float fadeInSeconds = 0.0f;
float fadeOutSeconds = 0.0f;
bool fanfare;
} SeqMetaInfo;

Expand Down