X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_regions.h;h=c9d5ddf6f592787b9aae7a0b30a8fc84e6c783b1;hb=d0440362974d36432e54cb2c190bcea0b855770d;hp=c4ec4a1ba2f4bc1a7ff666605879e84398666f4f;hpb=b6b68881b2c59c216d2195b1cea5e667187d83ed;p=ardour.git

diff --git a/gtk2_ardour/editor_regions.h b/gtk2_ardour/editor_regions.h
index c4ec4a1ba2..c9d5ddf6f5 100644
--- a/gtk2_ardour/editor_regions.h
+++ b/gtk2_ardour/editor_regions.h
@@ -39,7 +39,6 @@ public:
 	void reset_sort_direction (bool);
 	void reset_sort_type (Editing::RegionListSortType, bool);
 	void set_selected (RegionSelection &);
-	void remove_region ();
 	void selection_mapover (sigc::slot<void,boost::shared_ptr<ARDOUR::Region> >);
 	boost::shared_ptr<ARDOUR::Region> get_dragged_region ();
 	boost::shared_ptr<ARDOUR::Region> get_single_selection ();
@@ -104,7 +103,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);
@@ -112,20 +111,14 @@ private:
 	void name_edit (const Glib::ustring&, const Glib::ustring&);
 
 	bool key_press (GdkEventKey *);
-	bool key_release (GdkEventKey *);
 	bool button_press (GdkEventButton *);
-	bool button_release (GdkEventButton *);
 	void build_menu ();
 	void show_context_menu (int button, int time);
 
 	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);
@@ -142,6 +135,8 @@ private:
 	Gtk::Frame _frame;
 	Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Region> > _display;
 	Glib::RefPtr<Gtk::TreeStore> _model;
+	Glib::RefPtr<Gtk::Action> _hide_action; ///< the action for our Hide menu option
+	Glib::RefPtr<Gtk::Action> _show_action; ///< the action for our Show menu option
 	Glib::RefPtr<Gtk::ToggleAction> _toggle_full_action;
 	Glib::RefPtr<Gtk::ToggleAction> _toggle_show_auto_regions_action;
 	bool _show_automatic_regions;
@@ -149,6 +144,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;
 };