ardour/livetrax
13
0
Fork 0
Code

NO-OP: C++ify code

Browse Source 
* remove typdef for struct
* Remove {} struct initializer, use a dedicated c'tor
* scope variables
This commit is contained in:
Robin Gareus 2018-03-17 17:21:21 +01:00
parent 9777baae00
commit a36901a0d9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/editor_pt_import.cc
View File

@ -276,33 +276,35 @@ Editor::do_ptimport (std::string ptpath,
} }
/* MIDI - Find list of unique midi tracks first */ /* MIDI - Find list of unique midi tracks first */
typedef struct midipair { struct midipair {
midipair (uint16_t idx, string n)
: ptfindex (idx)
, trname (n)
{}
uint16_t ptfindex; uint16_t ptfindex;
string trname; string trname;
} midipair_t; };
vector<midipair_t> uniquetr; vector<midipair> uniquetr;
uint16_t ith = 0; uint16_t ith = 0;
bool found;
for (vector<PTFFormat::track_t>::iterator a = ptf.miditracks.begin (); a != ptf.miditracks.end (); ++a) { for (vector<PTFFormat::track_t>::iterator a = ptf.miditracks.begin (); a != ptf.miditracks.end (); ++a) {
found = false; bool found = false;
for (vector<midipair_t>::iterator b = uniquetr.begin (); b != uniquetr.end (); ++b) { for (vector<midipair>::iterator b = uniquetr.begin (); b != uniquetr.end (); ++b) {
if (b->trname == a->name) { if (b->trname == a->name) {
found = true; found = true;
break; break;
} }
} }
if (!found) { if (!found) {
uniquetr.push_back ({ith, a->name}); uniquetr.push_back (midipair (ith, a->name));
//printf(" : %d : %s\n", ith, a->name.c_str()); //printf(" : %d : %s\n", ith, a->name.c_str());
ith++; ith++;
} }
} }
/* MIDI - Create unique midi tracks and a lookup table for used tracks */ /* MIDI - Create unique midi tracks and a lookup table for used tracks */
for (vector<midipair_t>::iterator a = uniquetr.begin (); for (vector<midipair>::iterator a = uniquetr.begin (); a != uniquetr.end (); ++a) {
a != uniquetr.end (); ++a) {
ptflookup_t miditr; ptflookup_t miditr;
list<boost::shared_ptr<MidiTrack> > mt (_session->new_midi_track ( list<boost::shared_ptr<MidiTrack> > mt (_session->new_midi_track (
ChanCount (DataType::MIDI, 1), ChanCount (DataType::MIDI, 1),