diff options
author | Carl Hetherington <carl@carlh.net> | 2012-01-24 01:31:42 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2012-01-24 01:31:42 +0000 |
commit | a0723271459cd3124a3ded4a961fd0d90ddc3aa3 (patch) | |
tree | aef027d013e725e16fbcfe2e08eda84475fc5c54 /gtk2_ardour/region_layering_order_editor.h | |
parent | d0ef18e94e107914f55de218889088f928faff3a (diff) |
Tidy up RegionLayeringOrderEditor a bit. Add GPL boilerplate. Make it respect edit groups (#3432).
git-svn-id: svn://localhost/ardour2/branches/3.0@11324 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_layering_order_editor.h')
-rw-r--r-- | gtk2_ardour/region_layering_order_editor.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h index aad8729759..acdb1e59a5 100644 --- a/gtk2_ardour/region_layering_order_editor.h +++ b/gtk2_ardour/region_layering_order_editor.h @@ -1,3 +1,22 @@ +/* + Copyright (C) 2011-2012 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + #ifndef __gtk2_ardour_region_layering_order_editor_h__ #define __gtk2_ardour_region_layering_order_editor_h__ @@ -24,14 +43,13 @@ class RegionLayeringOrderEditor : public ArdourWindow RegionLayeringOrderEditor (PublicEditor&); virtual ~RegionLayeringOrderEditor (); - void set_context(const std::string& name, ARDOUR::Session* s, const boost::shared_ptr<ARDOUR::Playlist> & pl, ARDOUR::framepos_t position); + void set_context (const std::string &, ARDOUR::Session *, TimeAxisView *, boost::shared_ptr<ARDOUR::Playlist>, ARDOUR::framepos_t); void maybe_present (); protected: virtual bool on_key_press_event (GdkEventKey* event); private: - boost::shared_ptr<ARDOUR::Playlist> playlist; framepos_t position; bool in_row_change; uint32_t regions_at_position; @@ -41,10 +59,10 @@ class RegionLayeringOrderEditor : public ArdourWindow struct LayeringOrderColumns : public Gtk::TreeModel::ColumnRecord { LayeringOrderColumns () { add (name); - add (region); + add (region_view); } Gtk::TreeModelColumn<std::string> name; - Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region; + Gtk::TreeModelColumn<RegionView *> region_view; }; LayeringOrderColumns layering_order_columns; Glib::RefPtr<Gtk::ListStore> layering_order_model; @@ -55,6 +73,7 @@ class RegionLayeringOrderEditor : public ArdourWindow Gtk::Label clock_label; Gtk::ScrolledWindow scroller; // Available layers PublicEditor& editor; + TimeAxisView* _time_axis_view; void row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column); void refill (); |