From a36901a0d9c7751f50d7a12583cc8f0f5036d33c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 17 Mar 2018 17:21:21 +0100 Subject: [PATCH] NO-OP: C++ify code * remove typdef for struct * Remove {} struct initializer, use a dedicated c'tor * scope variables --- gtk2_ardour/editor_pt_import.cc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc index f4069980a0..56a59fd3d0 100644 --- a/gtk2_ardour/editor_pt_import.cc +++ b/gtk2_ardour/editor_pt_import.cc @@ -276,33 +276,35 @@ Editor::do_ptimport (std::string ptpath, } /* 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; string trname; - } midipair_t; + }; - vector uniquetr; + vector uniquetr; uint16_t ith = 0; - bool found; for (vector::iterator a = ptf.miditracks.begin (); a != ptf.miditracks.end (); ++a) { - found = false; - for (vector::iterator b = uniquetr.begin (); b != uniquetr.end (); ++b) { + bool found = false; + for (vector::iterator b = uniquetr.begin (); b != uniquetr.end (); ++b) { if (b->trname == a->name) { found = true; break; } } if (!found) { - uniquetr.push_back ({ith, a->name}); + uniquetr.push_back (midipair (ith, a->name)); //printf(" : %d : %s\n", ith, a->name.c_str()); ith++; } } /* MIDI - Create unique midi tracks and a lookup table for used tracks */ - for (vector::iterator a = uniquetr.begin (); - a != uniquetr.end (); ++a) { + for (vector::iterator a = uniquetr.begin (); a != uniquetr.end (); ++a) { ptflookup_t miditr; list > mt (_session->new_midi_track ( ChanCount (DataType::MIDI, 1),