diff options
author | nick_m <mainsbridge@gmail.com> | 2017-01-27 03:05:32 +1100 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2017-01-27 03:05:32 +1100 |
commit | 7b9784fff4e36eb541e1423013590bc31bde69d5 (patch) | |
tree | f83e61cbdc16bee15e640b512997ca406b95903a /gtk2_ardour | |
parent | 666ed3a0bd31551dc9f07247d0c5d9db494188f1 (diff) |
mark session dirty when dragging tempo markers.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/audio_clock.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/audio_clock.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 2 |
5 files changed, 4 insertions, 11 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 8a951e9c34..61253ad16d 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -774,12 +774,6 @@ AudioClock::session_property_changed (const PropertyChange&) } void -AudioClock::metric_position_changed () -{ - set (last_when, true); -} - -void AudioClock::session_configuration_changed (std::string p) { if (_negative_allowed) { @@ -1194,7 +1188,7 @@ AudioClock::set_session (Session *s) Config->ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context()); _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_configuration_changed, this, _1), gui_context()); _session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this, _1), gui_context()); - _session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::metric_position_changed, this), gui_context()); + _session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&AudioClock::session_property_changed, this, _1), gui_context()); XMLProperty const * prop; XMLNode* node = _session->extra_xml (X_("ClockModes")); diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h index 62e62c5f8f..6b8c31d5ad 100644 --- a/gtk2_ardour/audio_clock.h +++ b/gtk2_ardour/audio_clock.h @@ -223,7 +223,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr void session_configuration_changed (std::string); void session_property_changed (const PBD::PropertyChange&); - void metric_position_changed (); Field index_to_field () const; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 0809ab61cb..e64e079808 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1395,7 +1395,7 @@ Editor::set_session (Session *t) _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&Editor::add_routes, this, _1), gui_context()); _session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::update_title, this), gui_context()); _session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::tempo_map_changed, this, _1), gui_context()); - _session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::marker_position_changed, this), gui_context()); + _session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::tempometric_position_changed, this, _1), gui_context()); _session->Located.connect (_session_connections, invalidator (*this), boost::bind (&Editor::located, this), gui_context()); _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::parameter_changed, this, _1), gui_context()); _session->StateSaved.connect (_session_connections, invalidator (*this), boost::bind (&Editor::session_state_saved, this, _1), gui_context()); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 2d7262ad6e..c2a2566873 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1729,7 +1729,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void compute_current_bbt_points (std::vector<ARDOUR::TempoMap::BBTPoint>& grid, framepos_t left, framepos_t right); void tempo_map_changed (const PBD::PropertyChange&); - void marker_position_changed (); + void tempometric_position_changed (const PBD::PropertyChange&); void redisplay_tempo (bool immediate_redraw); uint32_t bbt_beat_subdivision; diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 02ece32556..b863cb9901 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -189,7 +189,7 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/) } void -Editor::marker_position_changed () +Editor::tempometric_position_changed (const PropertyChange& /*ignored*/) { if (!_session) { return; |