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

follow modified Playlist ripple callback API

This commit is contained in:
Paul Davis 2021-05-31 13:20:58 -06:00
parent 815abed5c5
commit e7595f2cd5
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.h
View File

@ -2386,7 +2386,7 @@ private:
void radio_reg_sens (Glib::RefPtr<Gtk::ActionGroup> action_group, Gtk::RadioAction::Group& radio_group, char const* name, char const* label, sigc::slot<void> slot);
void remove_gap_marker_callback (samplepos_t at, samplecnt_t distance);
void _ripple_callback (ARDOUR::Playlist& playlist, bool run_rdiff);
void _ripple_callback (ARDOUR::Playlist& playlist, samplepos_t, samplecnt_t, bool run_rdiff);
friend class Drag;
friend class RegionCutDrag;

22
gtk2_ardour/editor_ops.cc
View File

@ -9190,11 +9190,11 @@ Editor::remove_gaps (samplecnt_t gap_threshold, samplecnt_t leave_gap, bool mark
ARDOUR::Playlist::RippleCallback
Editor::ripple_callback (bool run_rdiff)
{
return boost::bind (&Editor::_ripple_callback, this, _1, run_rdiff);
return boost::bind (&Editor::_ripple_callback, this, _1, _2, _3, run_rdiff);
}
void
Editor::_ripple_callback (Playlist& playlist, bool run_rdiff)
Editor::_ripple_callback (Playlist& playlist, samplepos_t at, samplecnt_t distance, bool run_rdiff)
{
if (!_session) {
return;
@ -9204,4 +9204,22 @@ Editor::_ripple_callback (Playlist& playlist, bool run_rdiff)
* calling rdiff_and_add_command() for each affected playlist if
* run_rdiff is true
*/
TrackViewList ts = track_views.filter_to_unique_playlists ();
boost::shared_ptr<Playlist> pl;
Playlist::RippleCallback null_callback;
for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) {
if ((pl = (*x)->playlist()) == 0) {
continue;
}
if (pl.get() == &playlist) {
continue;
}
pl->ripple (at, distance, 0, null_callback);
pl->rdiff_and_add_command (_session);
}
}