ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Pass old and new TempoMap via MapChanged signal

This commit is contained in:
Robin Gareus 2023-09-10 22:30:40 +02:00
parent 0e3594bb1c
commit e45fcad607
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/temporal/tempo.cc
View File

@ -49,7 +49,8 @@ std::string Meter::xml_node_name = X_("Meter");
SerializedRCUManager<TempoMap> TempoMap::_map_mgr (0);
thread_local TempoMap::SharedPtr TempoMap::_tempo_map_p;
PBD::Signal0<void> TempoMap::MapChanged;
PBD::Signal3<void, TempoMap::SharedPtr, TempoMap::SharedPtr, bool> TempoMap::MapChanged;
#ifndef NDEBUG
#define TEMPO_MAP_ASSERT(expr) TempoMap::map_assert(expr, #expr, __FILE__, __LINE__)
@ -4357,8 +4358,10 @@ TempoMap::write_copy()
}
int
TempoMap::update (TempoMap::WritableSharedPtr m)
TempoMap::update (TempoMap::WritableSharedPtr m, bool from_undo)
{
SharedPtr old_map = read ();
if (!_map_mgr.update (m)) {
return -1;
}
@ -4372,7 +4375,7 @@ TempoMap::update (TempoMap::WritableSharedPtr m)
}
#endif
MapChanged (); /* EMIT SIGNAL */
MapChanged (old_map, read (), from_undo); /* EMIT SIGNAL */
return 0;
}
@ -5005,7 +5008,7 @@ TempoCommand::undo ()
TempoMap::WritableSharedPtr map (TempoMap::write_copy());
map->set_state (*_before, Stateful::current_state_version);
TempoMap::update (map);
TempoMap::update (map, true);
}
void

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

@ -791,7 +791,7 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
/* API for typical tempo map changes */
LIBTEMPORAL_API static WritableSharedPtr write_copy();
LIBTEMPORAL_API static int update (WritableSharedPtr m);
LIBTEMPORAL_API static int update (WritableSharedPtr m, bool from_undo = false);
LIBTEMPORAL_API static void abort_update ();
/* not part of public API */
@ -1010,7 +1010,7 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
LIBTEMPORAL_API void dump (std::ostream&) const;
LIBTEMPORAL_API static PBD::Signal0<void> MapChanged;
LIBTEMPORAL_API static PBD::Signal3<void, SharedPtr, SharedPtr, bool> MapChanged;
LIBTEMPORAL_API XMLNode& get_state() const;