From 41c432ed3b47c8ed34d2a23116ebd52d39cbb374 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 15 Feb 2017 14:20:26 +0100 Subject: Don't copy-construct MusicFrame, pass const reference. --- libs/ardour/ardour/midi_playlist.h | 2 +- libs/ardour/ardour/playlist.h | 6 +++--- libs/ardour/midi_playlist.cc | 2 +- libs/ardour/playlist.cc | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libs') diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h index 49eb892e42..722808b2a4 100644 --- a/libs/ardour/ardour/midi_playlist.h +++ b/libs/ardour/ardour/midi_playlist.h @@ -87,7 +87,7 @@ public: int set_state (const XMLNode&, int version); bool destroy_region (boost::shared_ptr); - void _split_region (boost::shared_ptr, MusicFrame position); + void _split_region (boost::shared_ptr, const MusicFrame& position); void set_note_mode (NoteMode m) { _note_mode = m; } diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 580b245c47..0159914114 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -141,8 +141,8 @@ public: void get_region_list_equivalent_regions (boost::shared_ptr, std::vector >&); void get_source_equivalent_regions (boost::shared_ptr, std::vector >&); void replace_region (boost::shared_ptr old, boost::shared_ptr newr, framepos_t pos); - void split_region (boost::shared_ptr, MusicFrame position); - void split (MusicFrame at); + void split_region (boost::shared_ptr, const MusicFrame& position); + void split (const MusicFrame& at); void shift (framepos_t at, frameoffset_t distance, bool move_intersected, bool ignore_music_glue); void partition (framepos_t start, framepos_t end, bool cut = false); void duplicate (boost::shared_ptr, framepos_t position, float times); @@ -390,7 +390,7 @@ public: void begin_undo (); void end_undo (); - virtual void _split_region (boost::shared_ptr, MusicFrame position); + virtual void _split_region (boost::shared_ptr, const MusicFrame& position); typedef std::pair, boost::shared_ptr > TwoRegions; diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 20c1c77111..4d64a9ca19 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -384,7 +384,7 @@ MidiPlaylist::destroy_region (boost::shared_ptr region) return changed; } void -MidiPlaylist::_split_region (boost::shared_ptr region, MusicFrame playlist_position) +MidiPlaylist::_split_region (boost::shared_ptr region, const MusicFrame& playlist_position) { if (!region->covers (playlist_position.frame)) { return; diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 99e65ab3e2..19c02051c0 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -1413,7 +1413,7 @@ Playlist::duplicate_ranges (std::list& ranges, float times) } void - Playlist::split (MusicFrame at) + Playlist::split (const MusicFrame& at) { RegionWriteLock rlock (this); RegionList copy (regions.rlist()); @@ -1427,14 +1427,14 @@ Playlist::duplicate_ranges (std::list& ranges, float times) } void - Playlist::split_region (boost::shared_ptr region, MusicFrame playlist_position) + Playlist::split_region (boost::shared_ptr region, const MusicFrame& playlist_position) { RegionWriteLock rl (this); _split_region (region, playlist_position); } void - Playlist::_split_region (boost::shared_ptr region, MusicFrame playlist_position) + Playlist::_split_region (boost::shared_ptr region, const MusicFrame& playlist_position) { if (!region->covers (playlist_position.frame)) { return; -- cgit v1.2.3