diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-03-30 23:40:28 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-03-30 23:40:28 +0000 |
| commit | e3dd8cc3ee481924997a1650e3a130b2579be209 (patch) | |
| tree | c14bd1999d9e7887f6ec05dff2a697aa0323223a /gtk2_ardour/editor_regions.h | |
| parent | 6721d997b159842e2c977ec0dd0c94002c0e1e47 (diff) | |
Move region naming stuff from Session into RegionFactory, cleaning up some vestiges of when Session had a list of regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@6812 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_regions.h')
| -rw-r--r-- | gtk2_ardour/editor_regions.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h index c4ec4a1ba2..54f891950f 100644 --- a/gtk2_ardour/editor_regions.h +++ b/gtk2_ardour/editor_regions.h @@ -104,7 +104,7 @@ private: Columns _columns; - void region_changed (const PBD::PropertyChange&, 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,12 +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::shared_ptr<ARDOUR::Region> >& ); void add_region (boost::shared_ptr<ARDOUR::Region>); void add_regions (std::vector<boost::shared_ptr<ARDOUR::Region> > & ); - void region_hidden (boost::shared_ptr<ARDOUR::Region>); - void region_hidden_weak (boost::weak_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); @@ -149,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; }; |