From 1e9e02e42fa70d684caa2df7f3af2b2ebd25231a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 19 Dec 2020 18:29:44 -0700 Subject: [PATCH] temporal: fix setting tempos and meters from XML state --- libs/temporal/tempo.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index a3c4247776..d7b0220f6d 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -2149,9 +2149,8 @@ TempoMap::set_tempos_from_state (XMLNode const& tempos_node) try { _tempos.clear (); for (XMLNodeList::const_iterator c = children.begin(); c != children.end(); ++c) { - TempoPoint tp (*this, **c); - // _tempos.push_back (TempoPoint (*this, **c)); - _tempos.push_back (tp); + TempoPoint* tp = new TempoPoint (*this, **c); + _tempos.push_back (*tp); } } catch (...) { _tempos.clear (); /* remove any that were created */ @@ -2171,8 +2170,8 @@ TempoMap::set_meters_from_state (XMLNode const& meters_node) try { _meters.clear (); for (XMLNodeList::const_iterator c = children.begin(); c != children.end(); ++c) { - MeterPoint mp (*this, **c); - _meters.push_back (mp); + MeterPoint* mp = new MeterPoint (*this, **c); + _meters.push_back (*mp); } } catch (...) { _meters.clear (); /* remove any that were created */ @@ -2869,6 +2868,7 @@ void TempoMap::init () { SharedPtr new_map (new TempoMap (Tempo (120), Meter (4, 4))); + cerr << "\n\n\n INITIALIZE TMP MGR " << &_map_mgr << " \n\n\n"; _map_mgr.init (new_map); fetch (); }