Skip to content

Commit 9854cac

Browse files
Swiftb0ySwiftb0y
committed
fixup! chore: update rekordbox kaitai definitions
1 parent 721cf1f commit 9854cac

3 files changed

Lines changed: 54 additions & 66 deletions

File tree

‎src/library/rekordbox/kaitaistructs/rekordbox_anlz.cpp‎

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
22

33
#include "rekordbox_anlz.h"
4-
54
#include "kaitai/exceptions.h"
65

76
rekordbox_anlz_t::rekordbox_anlz_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
87
m__parent = p__parent;
98
m__root = this;
109
m_sections = nullptr;
10+
_read();
1111
}
1212

1313
void rekordbox_anlz_t::_read() {
@@ -28,11 +28,8 @@ void rekordbox_anlz_t::_read() {
2828
{
2929
int i = 0;
3030
while (!m__io->is_eof()) {
31-
std::unique_ptr<tagged_section_t> _t_sections =
32-
std::unique_ptr<tagged_section_t>(
33-
new tagged_section_t(m__io, this, m__root));
34-
_t_sections->_read();
35-
m_sections->push_back(std::move(_t_sections));
31+
m_sections->push_back(std::move(std::unique_ptr<tagged_section_t>(
32+
new tagged_section_t(m__io, this, m__root))));
3633
i++;
3734
}
3835
}
@@ -51,6 +48,7 @@ rekordbox_anlz_t::phrase_mid_t::phrase_mid_t(kaitai::kstream* p__io,
5148
: kaitai::kstruct(p__io) {
5249
m__parent = p__parent;
5350
m__root = p__root;
51+
_read();
5452
}
5553

5654
void rekordbox_anlz_t::phrase_mid_t::_read() {
@@ -67,6 +65,7 @@ void rekordbox_anlz_t::phrase_mid_t::_clean_up() {
6765
rekordbox_anlz_t::path_tag_t::path_tag_t(kaitai::kstream* p__io, rekordbox_anlz_t::tagged_section_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
6866
m__parent = p__parent;
6967
m__root = p__root;
68+
_read();
7069
}
7170

7271
void rekordbox_anlz_t::path_tag_t::_read() {
@@ -90,6 +89,7 @@ void rekordbox_anlz_t::path_tag_t::_clean_up() {
9089
rekordbox_anlz_t::wave_preview_tag_t::wave_preview_tag_t(kaitai::kstream* p__io, rekordbox_anlz_t::tagged_section_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
9190
m__parent = p__parent;
9291
m__root = p__root;
92+
_read();
9393
}
9494

9595
void rekordbox_anlz_t::wave_preview_tag_t::_read() {
@@ -115,6 +115,7 @@ rekordbox_anlz_t::beat_grid_tag_t::beat_grid_tag_t(kaitai::kstream* p__io, rekor
115115
m__parent = p__parent;
116116
m__root = p__root;
117117
m_beats = nullptr;
118+
_read();
118119
}
119120

120121
void rekordbox_anlz_t::beat_grid_tag_t::_read() {
@@ -125,11 +126,8 @@ void rekordbox_anlz_t::beat_grid_tag_t::_read() {
125126
new std::vector<std::unique_ptr<beat_grid_beat_t>>());
126127
const int l_beats = num_beats();
127128
for (int i = 0; i < l_beats; i++) {
128-
std::unique_ptr<beat_grid_beat_t> _t_beats =
129-
std::unique_ptr<beat_grid_beat_t>(
130-
new beat_grid_beat_t(m__io, this, m__root));
131-
_t_beats->_read();
132-
m_beats->push_back(std::move(_t_beats));
129+
m_beats->push_back(std::move(std::unique_ptr<beat_grid_beat_t>(
130+
new beat_grid_beat_t(m__io, this, m__root))));
133131
}
134132
}
135133

@@ -148,6 +146,7 @@ rekordbox_anlz_t::song_structure_body_t::song_structure_body_t(
148146
m__parent = p__parent;
149147
m__root = p__root;
150148
m_entries = nullptr;
149+
_read();
151150
}
152151

153152
void rekordbox_anlz_t::song_structure_body_t::_read() {
@@ -162,11 +161,8 @@ void rekordbox_anlz_t::song_structure_body_t::_read() {
162161
new std::vector<std::unique_ptr<song_structure_entry_t>>());
163162
const int l_entries = _parent()->len_entries();
164163
for (int i = 0; i < l_entries; i++) {
165-
std::unique_ptr<song_structure_entry_t> _t_entries =
166-
std::unique_ptr<song_structure_entry_t>(
167-
new song_structure_entry_t(m__io, this, m__root));
168-
_t_entries->_read();
169-
m_entries->push_back(std::move(_t_entries));
164+
m_entries->push_back(std::move(std::unique_ptr<song_structure_entry_t>(
165+
new song_structure_entry_t(m__io, this, m__root))));
170166
}
171167
}
172168

@@ -180,6 +176,7 @@ void rekordbox_anlz_t::song_structure_body_t::_clean_up() {
180176
rekordbox_anlz_t::wave_color_preview_tag_t::wave_color_preview_tag_t(kaitai::kstream* p__io, rekordbox_anlz_t::tagged_section_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
181177
m__parent = p__parent;
182178
m__root = p__root;
179+
_read();
183180
}
184181

185182
void rekordbox_anlz_t::wave_color_preview_tag_t::_read() {
@@ -202,6 +199,7 @@ rekordbox_anlz_t::phrase_high_t::phrase_high_t(kaitai::kstream* p__io,
202199
: kaitai::kstruct(p__io) {
203200
m__parent = p__parent;
204201
m__root = p__root;
202+
_read();
205203
}
206204

207205
void rekordbox_anlz_t::phrase_high_t::_read() {
@@ -218,6 +216,7 @@ void rekordbox_anlz_t::phrase_high_t::_clean_up() {
218216
rekordbox_anlz_t::wave_scroll_tag_t::wave_scroll_tag_t(kaitai::kstream* p__io, rekordbox_anlz_t::tagged_section_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
219217
m__parent = p__parent;
220218
m__root = p__root;
219+
_read();
221220
}
222221

223222
void rekordbox_anlz_t::wave_scroll_tag_t::_read() {
@@ -242,6 +241,7 @@ rekordbox_anlz_t::song_structure_tag_t::song_structure_tag_t(kaitai::kstream* p_
242241
f_c = false;
243242
f_raw_mood = false;
244243
f_is_masked = false;
244+
_read();
245245
}
246246

247247
void rekordbox_anlz_t::song_structure_tag_t::_read() {
@@ -251,7 +251,6 @@ void rekordbox_anlz_t::song_structure_tag_t::_read() {
251251
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
252252
m_body = std::unique_ptr<song_structure_body_t>(
253253
new song_structure_body_t(m__io__raw_body.get(), this, m__root));
254-
m_body->_read();
255254
}
256255

257256
rekordbox_anlz_t::song_structure_tag_t::~song_structure_tag_t() {
@@ -293,6 +292,7 @@ bool rekordbox_anlz_t::song_structure_tag_t::is_masked() {
293292
rekordbox_anlz_t::cue_extended_entry_t::cue_extended_entry_t(kaitai::kstream* p__io, rekordbox_anlz_t::cue_extended_tag_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
294293
m__parent = p__parent;
295294
m__root = p__root;
295+
_read();
296296
}
297297

298298
void rekordbox_anlz_t::cue_extended_entry_t::_read() {
@@ -377,6 +377,7 @@ rekordbox_anlz_t::vbr_tag_t::vbr_tag_t(kaitai::kstream* p__io, rekordbox_anlz_t:
377377
m__parent = p__parent;
378378
m__root = p__root;
379379
m_index = nullptr;
380+
_read();
380381
}
381382

382383
void rekordbox_anlz_t::vbr_tag_t::_read() {
@@ -402,6 +403,7 @@ rekordbox_anlz_t::song_structure_entry_t::song_structure_entry_t(
402403
: kaitai::kstruct(p__io) {
403404
m__parent = p__parent;
404405
m__root = p__root;
406+
_read();
405407
}
406408

407409
void rekordbox_anlz_t::song_structure_entry_t::_read() {
@@ -410,22 +412,18 @@ void rekordbox_anlz_t::song_structure_entry_t::_read() {
410412
switch (_parent()->mood()) {
411413
case rekordbox_anlz_t::TRACK_MOOD_HIGH: {
412414
m_kind = std::unique_ptr<phrase_high_t>(new phrase_high_t(m__io, this, m__root));
413-
static_cast<std::unique_ptr<phrase_high_t>>(m_kind)->_read();
414415
break;
415416
}
416417
case rekordbox_anlz_t::TRACK_MOOD_MID: {
417418
m_kind = std::unique_ptr<phrase_mid_t>(new phrase_mid_t(m__io, this, m__root));
418-
static_cast<std::unique_ptr<phrase_mid_t>>(m_kind)->_read();
419419
break;
420420
}
421421
case rekordbox_anlz_t::TRACK_MOOD_LOW: {
422422
m_kind = std::unique_ptr<phrase_low_t>(new phrase_low_t(m__io, this, m__root));
423-
static_cast<std::unique_ptr<phrase_low_t>>(m_kind)->_read();
424423
break;
425424
}
426425
default: {
427426
m_kind = std::unique_ptr<phrase_mid_t>(new phrase_mid_t(m__io, this, m__root));
428-
static_cast<std::unique_ptr<phrase_mid_t>>(m_kind)->_read();
429427
break;
430428
}
431429
}
@@ -455,6 +453,7 @@ void rekordbox_anlz_t::song_structure_entry_t::_clean_up() {
455453
rekordbox_anlz_t::cue_entry_t::cue_entry_t(kaitai::kstream* p__io, rekordbox_anlz_t::cue_tag_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
456454
m__parent = p__parent;
457455
m__root = p__root;
456+
_read();
458457
}
459458

460459
void rekordbox_anlz_t::cue_entry_t::_read() {
@@ -490,6 +489,7 @@ void rekordbox_anlz_t::cue_entry_t::_clean_up() {
490489
rekordbox_anlz_t::beat_grid_beat_t::beat_grid_beat_t(kaitai::kstream* p__io, rekordbox_anlz_t::beat_grid_tag_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
491490
m__parent = p__parent;
492491
m__root = p__root;
492+
_read();
493493
}
494494

495495
void rekordbox_anlz_t::beat_grid_beat_t::_read() {
@@ -509,6 +509,7 @@ rekordbox_anlz_t::cue_extended_tag_t::cue_extended_tag_t(kaitai::kstream* p__io,
509509
m__parent = p__parent;
510510
m__root = p__root;
511511
m_cues = nullptr;
512+
_read();
512513
}
513514

514515
void rekordbox_anlz_t::cue_extended_tag_t::_read() {
@@ -520,11 +521,8 @@ void rekordbox_anlz_t::cue_extended_tag_t::_read() {
520521
new std::vector<std::unique_ptr<cue_extended_entry_t>>());
521522
const int l_cues = num_cues();
522523
for (int i = 0; i < l_cues; i++) {
523-
std::unique_ptr<cue_extended_entry_t> _t_cues =
524-
std::unique_ptr<cue_extended_entry_t>(
525-
new cue_extended_entry_t(m__io, this, m__root));
526-
_t_cues->_read();
527-
m_cues->push_back(std::move(_t_cues));
524+
m_cues->push_back(std::move(std::unique_ptr<cue_extended_entry_t>(
525+
new cue_extended_entry_t(m__io, this, m__root))));
528526
}
529527
}
530528

@@ -541,6 +539,7 @@ rekordbox_anlz_t::phrase_low_t::phrase_low_t(kaitai::kstream* p__io,
541539
: kaitai::kstruct(p__io) {
542540
m__parent = p__parent;
543541
m__root = p__root;
542+
_read();
544543
}
545544

546545
void rekordbox_anlz_t::phrase_low_t::_read() {
@@ -557,6 +556,7 @@ void rekordbox_anlz_t::phrase_low_t::_clean_up() {
557556
rekordbox_anlz_t::unknown_tag_t::unknown_tag_t(kaitai::kstream* p__io, rekordbox_anlz_t::tagged_section_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
558557
m__parent = p__parent;
559558
m__root = p__root;
559+
_read();
560560
}
561561

562562
void rekordbox_anlz_t::unknown_tag_t::_read() {
@@ -573,6 +573,7 @@ rekordbox_anlz_t::tagged_section_t::tagged_section_t(kaitai::kstream* p__io, rek
573573
m__parent = p__parent;
574574
m__root = p__root;
575575
m__io__raw_body = nullptr;
576+
_read();
576577
}
577578

578579
void rekordbox_anlz_t::tagged_section_t::_read() {
@@ -586,61 +587,53 @@ void rekordbox_anlz_t::tagged_section_t::_read() {
586587
m_body = std::unique_ptr<wave_color_scroll_tag_t>(
587588
new wave_color_scroll_tag_t(
588589
m__io__raw_body.get(), this, m__root));
589-
static_cast<std::unique_ptr<wave_color_scroll_tag_t>>(m_body)->_read();
590590
break;
591591
}
592592
case rekordbox_anlz_t::SECTION_TAGS_WAVE_SCROLL: {
593593
m__raw_body = m__io->read_bytes((len_tag() - 12));
594594
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
595595
m_body = std::unique_ptr<wave_scroll_tag_t>(
596596
new wave_scroll_tag_t(m__io__raw_body.get(), this, m__root));
597-
static_cast<std::unique_ptr<wave_scroll_tag_t>>(m_body)->_read();
598597
break;
599598
}
600599
case rekordbox_anlz_t::SECTION_TAGS_VBR: {
601600
m__raw_body = m__io->read_bytes((len_tag() - 12));
602601
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
603602
m_body = std::unique_ptr<vbr_tag_t>(new vbr_tag_t(m__io__raw_body.get(), this, m__root));
604-
static_cast<std::unique_ptr<vbr_tag_t>>(m_body)->_read();
605603
break;
606604
}
607605
case rekordbox_anlz_t::SECTION_TAGS_CUES_2: {
608606
m__raw_body = m__io->read_bytes((len_tag() - 12));
609607
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
610608
m_body = std::unique_ptr<cue_extended_tag_t>(
611609
new cue_extended_tag_t(m__io__raw_body.get(), this, m__root));
612-
static_cast<std::unique_ptr<cue_extended_tag_t>>(m_body)->_read();
613610
break;
614611
}
615612
case rekordbox_anlz_t::SECTION_TAGS_CUES: {
616613
m__raw_body = m__io->read_bytes((len_tag() - 12));
617614
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
618615
m_body = std::unique_ptr<cue_tag_t>(new cue_tag_t(m__io__raw_body.get(), this, m__root));
619-
static_cast<std::unique_ptr<cue_tag_t>>(m_body)->_read();
620616
break;
621617
}
622618
case rekordbox_anlz_t::SECTION_TAGS_SONG_STRUCTURE: {
623619
m__raw_body = m__io->read_bytes((len_tag() - 12));
624620
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
625621
m_body = std::unique_ptr<song_structure_tag_t>(
626622
new song_structure_tag_t(m__io__raw_body.get(), this, m__root));
627-
static_cast<std::unique_ptr<song_structure_tag_t>>(m_body)->_read();
628623
break;
629624
}
630625
case rekordbox_anlz_t::SECTION_TAGS_BEAT_GRID: {
631626
m__raw_body = m__io->read_bytes((len_tag() - 12));
632627
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
633628
m_body = std::unique_ptr<beat_grid_tag_t>(
634629
new beat_grid_tag_t(m__io__raw_body.get(), this, m__root));
635-
static_cast<std::unique_ptr<beat_grid_tag_t>>(m_body)->_read();
636630
break;
637631
}
638632
case rekordbox_anlz_t::SECTION_TAGS_WAVE_PREVIEW: {
639633
m__raw_body = m__io->read_bytes((len_tag() - 12));
640634
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
641635
m_body = std::unique_ptr<wave_preview_tag_t>(
642636
new wave_preview_tag_t(m__io__raw_body.get(), this, m__root));
643-
static_cast<std::unique_ptr<wave_preview_tag_t>>(m_body)->_read();
644637
break;
645638
}
646639
case rekordbox_anlz_t::SECTION_TAGS_WAVE_COLOR_PREVIEW: {
@@ -649,30 +642,26 @@ void rekordbox_anlz_t::tagged_section_t::_read() {
649642
m_body = std::unique_ptr<wave_color_preview_tag_t>(
650643
new wave_color_preview_tag_t(
651644
m__io__raw_body.get(), this, m__root));
652-
static_cast<std::unique_ptr<wave_color_preview_tag_t>>(m_body)->_read();
653645
break;
654646
}
655647
case rekordbox_anlz_t::SECTION_TAGS_PATH: {
656648
m__raw_body = m__io->read_bytes((len_tag() - 12));
657649
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
658650
m_body = std::unique_ptr<path_tag_t>(new path_tag_t(m__io__raw_body.get(), this, m__root));
659-
static_cast<std::unique_ptr<path_tag_t>>(m_body)->_read();
660651
break;
661652
}
662653
case rekordbox_anlz_t::SECTION_TAGS_WAVE_TINY: {
663654
m__raw_body = m__io->read_bytes((len_tag() - 12));
664655
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
665656
m_body = std::unique_ptr<wave_preview_tag_t>(
666657
new wave_preview_tag_t(m__io__raw_body.get(), this, m__root));
667-
static_cast<std::unique_ptr<wave_preview_tag_t>>(m_body)->_read();
668658
break;
669659
}
670660
default: {
671661
m__raw_body = m__io->read_bytes((len_tag() - 12));
672662
m__io__raw_body = std::unique_ptr<kaitai::kstream>(new kaitai::kstream(m__raw_body));
673663
m_body = std::unique_ptr<unknown_tag_t>(
674664
new unknown_tag_t(m__io__raw_body.get(), this, m__root));
675-
static_cast<std::unique_ptr<unknown_tag_t>>(m_body)->_read();
676665
break;
677666
}
678667
}
@@ -688,6 +677,7 @@ void rekordbox_anlz_t::tagged_section_t::_clean_up() {
688677
rekordbox_anlz_t::wave_color_scroll_tag_t::wave_color_scroll_tag_t(kaitai::kstream* p__io, rekordbox_anlz_t::tagged_section_t* p__parent, rekordbox_anlz_t* p__root) : kaitai::kstruct(p__io) {
689678
m__parent = p__parent;
690679
m__root = p__root;
680+
_read();
691681
}
692682

693683
void rekordbox_anlz_t::wave_color_scroll_tag_t::_read() {
@@ -708,6 +698,7 @@ rekordbox_anlz_t::cue_tag_t::cue_tag_t(kaitai::kstream* p__io, rekordbox_anlz_t:
708698
m__parent = p__parent;
709699
m__root = p__root;
710700
m_cues = nullptr;
701+
_read();
711702
}
712703

713704
void rekordbox_anlz_t::cue_tag_t::_read() {
@@ -719,10 +710,8 @@ void rekordbox_anlz_t::cue_tag_t::_read() {
719710
new std::vector<std::unique_ptr<cue_entry_t>>());
720711
const int l_cues = num_cues();
721712
for (int i = 0; i < l_cues; i++) {
722-
std::unique_ptr<cue_entry_t> _t_cues = std::unique_ptr<cue_entry_t>(
723-
new cue_entry_t(m__io, this, m__root));
724-
_t_cues->_read();
725-
m_cues->push_back(std::move(_t_cues));
713+
m_cues->push_back(std::move(std::unique_ptr<cue_entry_t>(
714+
new cue_entry_t(m__io, this, m__root))));
726715
}
727716
}
728717

0 commit comments

Comments
 (0)