summaryrefslogtreecommitdiff
path: root/tools/tracker_compiler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'tools/tracker_compiler.cc')
-rw-r--r--tools/tracker_compiler.cc25
1 files changed, 17 insertions, 8 deletions
diff --git a/tools/tracker_compiler.cc b/tools/tracker_compiler.cc
index 59d4187..314099d 100644
--- a/tools/tracker_compiler.cc
+++ b/tools/tracker_compiler.cc
@@ -99,7 +99,7 @@ struct Sample {
};
struct Event {
- float beat;
+ float unit_time; // Unit-less time within pattern
std::string sample_name;
float volume, pan;
};
@@ -107,6 +107,7 @@ struct Event {
struct Pattern {
std::string name;
std::vector<Event> events;
+ float unit_length; // Pattern duration in units (default 1.0 for 4-beat patterns)
};
struct Trigger {
@@ -177,6 +178,14 @@ int main(int argc, char** argv) {
} else if (cmd == "PATTERN") {
Pattern p;
ss >> p.name;
+ p.unit_length = 1.0f; // Default: 1 unit = 4 beats
+ // Check for optional LENGTH parameter
+ std::string next_token;
+ if (ss >> next_token) {
+ if (next_token == "LENGTH") {
+ ss >> p.unit_length;
+ }
+ }
current_section = "PATTERN:" + p.name;
patterns.push_back(p);
pattern_map[p.name] = patterns.size() - 1;
@@ -184,18 +193,18 @@ int main(int argc, char** argv) {
current_section = "SCORE";
} else {
if (current_section.rfind("PATTERN:", 0) == 0) {
- // Parse event: beat, sample, vol, pan
+ // Parse event: unit_time, sample, vol, pan
Event e;
- float beat;
+ float unit_time;
std::stringstream ss2(line);
- ss2 >> beat;
+ ss2 >> unit_time;
char comma;
ss2 >> comma;
std::string sname;
ss2 >> sname;
if (sname.back() == ',')
sname.pop_back();
- e.beat = beat;
+ e.unit_time = unit_time;
e.sample_name = sname;
ss2 >> e.volume >> comma >> e.pan;
@@ -276,7 +285,7 @@ int main(int argc, char** argv) {
// For now, assume sample_map is used for both generated and asset
// samples. This will need refinement if asset samples are not in
// sample_map directly.
- fprintf(out_file, " { %.1ff, %d, %.1ff, %.1ff },\n", e.beat,
+ fprintf(out_file, " { %.2ff, %d, %.1ff, %.1ff },\n", e.unit_time,
sample_map[e.sample_name], e.volume, e.pan);
}
fprintf(out_file, "};\n");
@@ -285,8 +294,8 @@ int main(int argc, char** argv) {
fprintf(out_file, "const TrackerPattern g_tracker_patterns[] = {\n");
for (const auto& p : patterns) {
- fprintf(out_file, " { PATTERN_EVENTS_%s, %zu, 4.0f }, // %s\n",
- p.name.c_str(), p.events.size(), p.name.c_str());
+ fprintf(out_file, " { PATTERN_EVENTS_%s, %zu, %.2ff }, // %s\n",
+ p.name.c_str(), p.events.size(), p.unit_length, p.name.c_str());
}
fprintf(out_file, "};\n");
fprintf(out_file, "const uint32_t g_tracker_patterns_count = %zu;\n\n",