smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Remove C++11isms (libptformat)

Browse source
This commit is contained in:
Robin Gareus 2018-03-17 19:59:38 +01:00
parent 37e5b705e7
commit 1de8bc3617
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libs/ptformat/ptfformat.cc
View file

@ -717,6 +717,17 @@ PTFFormat::parseaudio5(void) {
resort(audiofiles); resort(audiofiles);
} }
struct mchunk {
mchunk (uint64_t zt, uint64_t ml, std::vector<PTFFormat::midi_ev_t> const& c)
: zero (zt)
, maxlen (ml)
, chunk (c)
{}
uint64_t zero;
uint64_t maxlen;
std::vector<PTFFormat::midi_ev_t> chunk;
};
void void
PTFFormat::parsemidi(void) { PTFFormat::parsemidi(void) {
uint64_t tr, i, k, lastk, n_midi_events, zero_ticks; uint64_t tr, i, k, lastk, n_midi_events, zero_ticks;
@ -725,12 +736,8 @@ PTFFormat::parsemidi(void) {
uint16_t ridx; uint16_t ridx;
uint16_t nmiditracks, regionnumber = 0; uint16_t nmiditracks, regionnumber = 0;
uint32_t nregions, mr; uint32_t nregions, mr;
struct mchunk_t {
uint64_t zero; std::vector<mchunk> midichunks;
uint64_t maxlen;
std::vector<midi_ev_t> chunk;
};
std::vector<struct mchunk_t> midichunks;
midi_ev_t m; midi_ev_t m;
bool found = false; bool found = false;
@ -805,7 +812,7 @@ PTFFormat::parsemidi(void) {
#endif #endif
midi.push_back(m); midi.push_back(m);
} }
midichunks.push_back({zero_ticks, max_pos, midi}); midichunks.push_back(mchunk (zero_ticks, max_pos, midi));
} }
lastk = k; lastk = k;
@ -897,19 +904,19 @@ PTFFormat::parsemidi(void) {
ridx = ptfunxored[k]; ridx = ptfunxored[k];
ridx |= ptfunxored[k+1] << 8; ridx |= ptfunxored[k+1] << 8;
struct mchunk_t mchunk = *(midichunks.begin()+ridx); struct mchunk mc = *(midichunks.begin()+ridx);
wav_t w = { std::string(""), 0, 0, 0 }; wav_t w = { std::string(""), 0, 0, 0 };
region_t r = { region_t r = {
midiregionname, midiregionname,
regionnumber++, regionnumber++,
//(int64_t)mchunk.zero, //(int64_t)mc.zero,
(int64_t)0xe8d4a51000ull, (int64_t)0xe8d4a51000ull,
(int64_t)(0), (int64_t)(0),
//(int64_t)(max_pos*sessionrate*60/(960000*120)), //(int64_t)(max_pos*sessionrate*60/(960000*120)),
(int64_t)mchunk.maxlen, (int64_t)mc.maxlen,
w, w,
mchunk.chunk, mc.chunk,
}; };
midiregions.push_back(r); midiregions.push_back(r);
} }