fix mistaken "do not roll" conclusion in TransportFSM::compute_should_roll()

[ardour.git] / gtk2_ardour / region_layering_order_editor.h

diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h
index 32d0971e5c2bb63f817fae1aef749e7e2616ce16..633f4916ed74b96ca9f156e363e858e07150af47 100644 (file)
--- a/gtk2_ardour/region_layering_order_editor.h
+++ b/gtk2_ardour/region_layering_order_editor.h
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2010-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2010-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2011 David Robillard <d@drobilla.net>
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef __gtk2_ardour_region_layering_order_editor_h__
 #define __gtk2_ardour_region_layering_order_editor_h__
 
@@ -6,10 +26,10 @@
 #include <gtkmm/treeview.h>
 #include <gtkmm/scrolledwindow.h>
 
-#include <ardour/region.h>
-#include <ardour/playlist.h>
+#include "ardour/region.h"
+#include "ardour/playlist.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "audio_clock.h"
 
 class PublicEditor;
@@ -18,33 +38,32 @@ namespace ARDOUR {
        class Session;
 }
 
-class RegionLayeringOrderEditor : public ArdourDialog
+class RegionLayeringOrderEditor : public ArdourWindow
 {
-  public:
+public:
        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::samplepos_t);
        void maybe_present ();
-       
-  protected:
+
+protected:
        virtual bool on_key_press_event (GdkEventKey* event);
 
-  private:
-       boost::shared_ptr<ARDOUR::Playlist> playlist;
-       framepos_t position;
+private:
+       samplepos_t position;
        bool in_row_change;
        uint32_t regions_at_position;
-       
-        PBD::ScopedConnection playlist_modified_connection;
+
+       PBD::ScopedConnection playlist_modified_connection;
 
        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,8 +74,9 @@ class RegionLayeringOrderEditor : public ArdourDialog
        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 row_selected ();
        void refill ();
        void playlist_modified ();
 };