diff options
Diffstat (limited to 'libs/ptformat/ptfformat.cc')
| -rw-r--r-- | libs/ptformat/ptfformat.cc | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/libs/ptformat/ptfformat.cc b/libs/ptformat/ptfformat.cc index 62fc0293c7..6d055d4a36 100644 --- a/libs/ptformat/ptfformat.cc +++ b/libs/ptformat/ptfformat.cc @@ -589,18 +589,13 @@ PTFFormat::parserest5(void) { vector<track_t>::iterator ti; vector<track_t>::iterator bt = tracks.begin(); vector<track_t>::iterator et = tracks.end(); - track_t tr = { name, 0, 0, r }; + track_t tr ( name, 0, 0, &r); if ((ti = std::find(bt, et, tr)) != et) { tracknumber = (*ti).index; } else { tracknumber = tracks.size() + 1; } - track_t t = { - name, - (uint16_t)tracknumber, - uint8_t(0), - r - }; + track_t t ( name, (uint16_t)tracknumber, uint8_t(0), &r); tracks.push_back(t); } else { region_t r = { @@ -615,18 +610,13 @@ PTFFormat::parserest5(void) { vector<track_t>::iterator ti; vector<track_t>::iterator bt = tracks.begin(); vector<track_t>::iterator et = tracks.end(); - track_t tr = { name, 0, 0, r }; + track_t tr ( name, 0, 0, &r ); if ((ti = std::find(bt, et, tr)) != et) { tracknumber = (*ti).index; } else { tracknumber = tracks.size() + 1; } - track_t t = { - name, - (uint16_t)tracknumber, - uint8_t(0), - r - }; + track_t t ( name, (uint16_t)tracknumber, uint8_t(0), &r); tracks.push_back(t); } rindex++; @@ -1307,7 +1297,7 @@ PTFFormat::parserest10(void) { vector<region_t>::iterator finish = regions.end(); vector<region_t>::iterator found; if ((found = std::find(begin, finish, tr.reg)) != finish) { - tr.reg = (*found); + tr.set_region (&(*found)); } i = l+16; offset = 0; |