Move region naming stuff from Session into RegionFactory, cleaning up some vestiges...

[ardour.git] / gtk2_ardour / editor_regions.h

diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h
index 5a9c2aad5a72b44f465bec473533618fde9730f5..54f891950fc8446f9fd458bd5192924a78a0d514 100644 (file)
--- a/gtk2_ardour/editor_regions.h
+++ b/gtk2_ardour/editor_regions.h
@@ -104,7 +104,7 @@ private:
 
        Columns _columns;
 
-       void region_changed (ARDOUR::Change, boost::weak_ptr<ARDOUR::Region>);
+       void region_changed (boost::shared_ptr<ARDOUR::Region>, PBD::PropertyChange const &);
        void selection_changed ();
        sigc::connection _change_connection;
        bool set_selected_in_subrow (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
@@ -120,13 +120,8 @@ private:
 
        int sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator);
 
-       void handle_new_region (boost::weak_ptr<ARDOUR::Region>);
-       void handle_new_regions (std::vector<boost::weak_ptr<ARDOUR::Region> >& );
-       void handle_region_removed (boost::weak_ptr<ARDOUR::Region>);
        void add_region (boost::shared_ptr<ARDOUR::Region>);
-       void add_regions (std::vector<boost::weak_ptr<ARDOUR::Region> > & );
-       void region_hidden (boost::shared_ptr<ARDOUR::Region>);
-       void region_hidden_weak (boost::weak_ptr<ARDOUR::Region>);
+       void add_regions (std::vector<boost::shared_ptr<ARDOUR::Region> > & );
        void populate_row (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &);
        void update_row (boost::shared_ptr<ARDOUR::Region>);
        bool update_subrows (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
@@ -150,6 +145,7 @@ private:
        bool _no_redisplay;
        std::list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
        PBD::ScopedConnection region_property_connection;
+       PBD::ScopedConnection check_new_region_connection;
        bool ignore_region_list_selection_change;
        bool ignore_selected_region_change;
 };