ardour/livetrax
13
0
Fork 0
Code

temporal: TempoMap::Changed is now a static member named TempoMap::MapChanged

Browse Source
This commit is contained in:
Paul Davis 2020-12-30 22:27:37 -07:00
parent 657350455e
commit 364fffd458
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/surfaces/websockets/feedback.cc
View File

@ -230,9 +230,7 @@ ArdourFeedback::observe_transport ()
sess.RecordStateChanged.connect (_transport_connections, MISSING_INVALIDATOR, sess.RecordStateChanged.connect (_transport_connections, MISSING_INVALIDATOR,
boost::bind<void> (RecordStateObserver (), this), event_loop ()); boost::bind<void> (RecordStateObserver (), this), event_loop ());
#warning NUTEMPO this is not right. the actual map can change. static signal? Temporal::TempoMap::MapChanged.connect (_transport_connections, MISSING_INVALIDATOR, boost::bind<void> (TempoObserver (), this), event_loop ());
Temporal::TempoMap::use()->Changed.connect (_transport_connections, MISSING_INVALIDATOR,
boost::bind<void> (TempoObserver (), this), event_loop ());
} }
void void

23
libs/temporal/tempo.cc
View File

@ -41,6 +41,7 @@ std::string Meter::xml_node_name = X_("Meter");
SerializedRCUManager<TempoMap> TempoMap::_map_mgr (0); SerializedRCUManager<TempoMap> TempoMap::_map_mgr (0);
thread_local TempoMap::SharedPtr TempoMap::_tempo_map_p; thread_local TempoMap::SharedPtr TempoMap::_tempo_map_p;
PBD::Signal0<void> TempoMap::MapChanged;
void void
Point::add_state (XMLNode & node) const Point::add_state (XMLNode & node) const
@ -807,7 +808,7 @@ TempoMap::set_tempo (Tempo const & t, timepos_t const & time)
} }
Changed (); MapChanged ();
return *ret; return *ret;
} }
@ -879,7 +880,7 @@ TempoMap::remove_tempo (TempoPoint const & tp)
_tempos.erase (t); _tempos.erase (t);
reset_starting_at (sc); reset_starting_at (sc);
Changed (); MapChanged ();
} }
MusicTimePoint & MusicTimePoint &
@ -895,7 +896,7 @@ TempoMap::set_bartime (BBT_Time const & bbt, timepos_t const & pos)
ret = add_or_replace_bartime (tp); ret = add_or_replace_bartime (tp);
Changed (); MapChanged ();
return *ret; return *ret;
} }
@ -952,7 +953,7 @@ TempoMap::remove_bartime (MusicTimePoint const & tp)
_bartimes.erase (m); _bartimes.erase (m);
reset_starting_at (sc); reset_starting_at (sc);
Changed (); MapChanged ();
} }
void void
@ -1221,7 +1222,7 @@ TempoMap::move_meter (MeterPoint const & mp, timepos_t const & when, bool push)
/* recompute 3 domain positions for everything after this */ /* recompute 3 domain positions for everything after this */
reset_starting_at (std::min (sc, old_sc)); reset_starting_at (std::min (sc, old_sc));
Changed (); MapChanged ();
return true; return true;
} }
@ -1333,7 +1334,7 @@ TempoMap::move_tempo (TempoPoint const & tp, timepos_t const & when, bool push)
/* recompute 3 domain positions for everything after this */ /* recompute 3 domain positions for everything after this */
reset_starting_at (std::min (sc, old_sc)); reset_starting_at (std::min (sc, old_sc));
Changed (); MapChanged ();
return true; return true;
} }
@ -1385,7 +1386,7 @@ TempoMap::set_meter (Meter const & m, timepos_t const & time)
ret = add_meter (mp); ret = add_meter (mp);
} }
Changed (); MapChanged ();
return *ret; return *ret;
} }
@ -1408,7 +1409,7 @@ TempoMap::remove_meter (MeterPoint const & mp)
_meters.erase (m); _meters.erase (m);
reset_starting_at (sc); reset_starting_at (sc);
Changed (); MapChanged ();
} }
@ -2213,7 +2214,7 @@ TempoMap::set_state (XMLNode const & node, int /*version*/)
} }
} }
Changed (); MapChanged ();
return 0; return 0;
} }
@ -2564,7 +2565,7 @@ TempoMap::insert_time (timepos_t const & pos, timecnt_t const & duration)
break; break;
} }
Changed (); MapChanged ();
} }
bool bool
@ -2573,7 +2574,7 @@ TempoMap::remove_time (timepos_t const & pos, timecnt_t const & duration)
bool moved = false; bool moved = false;
if (moved) { if (moved) {
Changed (); MapChanged ();
} }
return moved; return moved;

2
libs/temporal/temporal/tempo.h
View File

@ -784,7 +784,7 @@ class LIBTEMPORAL_API TempoMap : public PBD::StatefulDestructible
void dump (std::ostream&) const; void dump (std::ostream&) const;
PBD::Signal0<void> Changed; static PBD::Signal0<void> MapChanged;
XMLNode& get_state(); XMLNode& get_state();