Allow group gain sharing + VCA again

[ardour.git] / libs / ardour / ardour / playlist.h

diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 580b245c47141dae9c446d27987ce79108c0d508..26c664b0f2c29ca0880de013289b5da31d397136 100644 (file)
--- 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<Region>, std::vector<boost::shared_ptr<Region> >&);
        void get_source_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&);
        void replace_region (boost::shared_ptr<Region> old, boost::shared_ptr<Region> newr, framepos_t pos);
-       void split_region (boost::shared_ptr<Region>, MusicFrame position);
-       void split (MusicFrame at);
+       void split_region (boost::shared_ptr<Region>, 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<Region>, framepos_t position, float times);
@@ -285,7 +285,7 @@ public:
        PBD::ScopedConnectionList region_state_changed_connections;
        PBD::ScopedConnectionList region_drop_references_connections;
        DataType        _type;
-       int             _sort_id;
+       uint32_t        _sort_id;
        mutable gint    block_notifications;
        mutable gint    ignore_state_changes;
        std::set<boost::shared_ptr<Region> > pending_adds;
@@ -390,7 +390,7 @@ public:
        void begin_undo ();
        void end_undo ();
 
-       virtual void _split_region (boost::shared_ptr<Region>, MusicFrame position);
+       virtual void _split_region (boost::shared_ptr<Region>, const MusicFrame& position);
 
        typedef std::pair<boost::shared_ptr<Region>, boost::shared_ptr<Region> > TwoRegions;