diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-19 14:38:46 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-19 14:38:46 +0000 |
| commit | 6f8cd634501efd70711b148b4ac0e0ce2aa5cc95 (patch) | |
| tree | 07df4b771792ec9a0b8ba7c8c01db0234f1efe22 /gtk2_ardour/editor.h | |
| parent | 60f588f21d6ad62335d72e8dc682abf8859107ea (diff) | |
chris goddard's region list patch; port 2.X marker drag/move changes to 3.0; compilation fixes-post-evoral
git-svn-id: svn://localhost/ardour2/branches/3.0@3760 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 32de17a8a1..d2b0043d66 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -128,7 +128,7 @@ class Editor : public PublicEditor public: Editor (); ~Editor (); - + void connect_to_session (ARDOUR::Session *); ARDOUR::Session* current_session() const { return session; } void first_idle (); @@ -545,6 +545,8 @@ class Editor : public PublicEditor void set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false); void select_all_tracks (); + int get_regionview_count_from_region_list (boost::shared_ptr<ARDOUR::Region> region); + bool set_selected_control_point_from_click (Selection::Operation op = Selection::Set, bool no_remove=false); void set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool no_remove=false); void set_selected_track_as_side_effect (bool force = false); @@ -926,13 +928,23 @@ class Editor : public PublicEditor struct RegionListDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { RegionListDisplayModelColumns() { - add (name); + add (name); add (region); add (color_); + add (start); + add (end); + add (length); + add (used); + add (path); } - Gtk::TreeModelColumn<Glib::ustring> name; + Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region; Gtk::TreeModelColumn<Gdk::Color> color_; + Gtk::TreeModelColumn<Glib::ustring> start; + Gtk::TreeModelColumn<Glib::ustring> end; + Gtk::TreeModelColumn<Glib::ustring> length; + Gtk::TreeModelColumn<Glib::ustring> used; + Gtk::TreeModelColumn<Glib::ustring> path; }; RegionListDisplayModelColumns region_list_columns; @@ -1080,6 +1092,7 @@ class Editor : public PublicEditor void add_regions_to_region_display (std::vector<boost::weak_ptr<ARDOUR::Region> > & ); void region_hidden (boost::shared_ptr<ARDOUR::Region>); void redisplay_regions (); + void update_region_row (boost::shared_ptr<ARDOUR::Region>); bool no_region_list_redisplay; void insert_into_tmp_regionlist(boost::shared_ptr<ARDOUR::Region>); |