diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/disk_reader.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_region.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_track.h | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index c9e4c0b6d4..80343a2029 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -128,7 +128,6 @@ protected: void resolve_tracker (Evoral::EventSink<samplepos_t>& buffer, samplepos_t time); - void playlist_changed (const PBD::PropertyChange&); int use_playlist (DataType, boost::shared_ptr<Playlist>); void playlist_ranges_moved (std::list< Evoral::RangeMove<samplepos_t> > const &, bool); diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 500c483827..6ae1375899 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -162,6 +162,7 @@ class LIBARDOUR_API MidiRegion : public Region void update_length_beats (const int32_t sub_num); void model_changed (); + void model_contents_changed (); void model_shifted (double qn_distance); void model_automation_state_changed (Evoral::Parameter const &); @@ -171,6 +172,7 @@ class LIBARDOUR_API MidiRegion : public Region std::set<Evoral::Parameter> _filtered_parameters; ///< parameters that we ask our source not to return when reading PBD::ScopedConnection _model_connection; PBD::ScopedConnection _model_shift_connection; + PBD::ScopedConnection _model_changed_connection; PBD::ScopedConnection _source_connection; PBD::ScopedConnection _model_contents_connection; bool _ignore_shift; diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index ebe4e9bd56..556ab890ff 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -139,6 +139,8 @@ public: void realtime_handle_transport_stopped (); void region_edited (boost::shared_ptr<Region>); + int use_playlist (DataType, boost::shared_ptr<Playlist>); + protected: XMLNode& state (bool save_template); @@ -174,6 +176,9 @@ private: /** Update automation controls to reflect any changes in buffers. */ void update_controls (BufferSet const& bufs); void restore_controls (); + + void playlist_contents_changed (); + PBD::ScopedConnection playlist_content_change_connection; }; } /* namespace ARDOUR*/ |