Reenable the correct sort column and type when redisplaying regions

[ardour.git] / gtk2_ardour / route_time_axis.h

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 3868dfebd18f9a878e7bfd387be5298d2d422ecb..cc4effd0492c851f0d5b1f481ad767bcf95079de 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -1,21 +1,26 @@
 /*
-    Copyright (C) 2006 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.
-
-*/
+ * Copyright (C) 2006-2008 Sampo Savolainen <v2@iki.fi>
+ * Copyright (C) 2006-2014 David Robillard <d@drobilla.net>
+ * Copyright (C) 2006-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2007 Doug McLain <doug@nostar.net>
+ * Copyright (C) 2008-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2014-2015 Ben Loftis <ben@harrisonconsoles.com>
+ * Copyright (C) 2014-2019 Robin Gareus <robin@gareus.org>
+ *
+ * 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 __ardour_route_time_axis_h__
 #define __ardour_route_time_axis_h__
@@ -90,22 +95,22 @@ public:
 
        void set_samples_per_pixel (double);
        void set_height (uint32_t h, TrackHeightMode m = OnlySelf);
-       void show_timestretch (framepos_t start, framepos_t end, int layers, int layer);
+       void show_timestretch (samplepos_t start, samplepos_t end, int layers, int layer);
        void hide_timestretch ();
        void selection_click (GdkEventButton*);
        void set_selected_points (PointSelection&);
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (ARDOUR::framepos_t start, ARDOUR::framepos_t end, double top, double bot, std::list<Selectable *>&, bool within = false);
+       void get_selectables (ARDOUR::samplepos_t start, ARDOUR::samplepos_t end, double top, double bot, std::list<Selectable *>&, bool within = false);
        void get_inverted_selectables (Selection&, std::list<Selectable*>&);
        void set_layer_display (LayerDisplay d, bool apply_to_selection = false);
        LayerDisplay layer_display () const;
 
-       boost::shared_ptr<ARDOUR::Region> find_next_region (framepos_t pos, ARDOUR::RegionPoint, int32_t dir);
-       framepos_t find_next_region_boundary (framepos_t pos, int32_t dir);
+       boost::shared_ptr<ARDOUR::Region> find_next_region (samplepos_t pos, ARDOUR::RegionPoint, int32_t dir);
+       samplepos_t find_next_region_boundary (samplepos_t pos, int32_t dir);
 
        /* Editing operations */
        void cut_copy_clear (Selection&, Editing::CutCopyOp);
-       bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num);
+       bool paste (ARDOUR::samplepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num);
        RegionView* combine_regions ();
        void uncombine_regions ();
        void uncombine_region (RegionView*);
@@ -161,9 +166,9 @@ protected:
 
        struct ProcessorAutomationInfo {
                boost::shared_ptr<ARDOUR::Processor> processor;
-               bool                                 valid;
-               Gtk::Menu*                           menu;
-               std::vector<ProcessorAutomationNode*>     lines;
+               bool                                  valid;
+               Gtk::Menu*                            menu;
+               std::vector<ProcessorAutomationNode*> lines;
 
                ProcessorAutomationInfo (boost::shared_ptr<ARDOUR::Processor> i)
                    : processor (i), valid (true), menu (0) {}
@@ -228,7 +233,7 @@ protected:
        virtual void show_existing_automation (bool apply_to_selection = false);
        virtual void hide_all_automation (bool apply_to_selection = false);
 
-       void timestretch (framepos_t start, framepos_t end);
+       void timestretch (samplepos_t start, samplepos_t end);
        void speed_changed ();
        void map_frozen ();
        void color_handler ();
@@ -255,10 +260,6 @@ protected:
        RouteGroupMenu*     route_group_menu;
        Gtk::Menu*          playlist_action_menu;
        Gtk::MenuItem*      playlist_item;
-       Gtk::Menu*          mode_menu;
-       Gtk::Menu*          color_mode_menu;
-
-       virtual Gtk::Menu* build_color_mode_menu() { return 0; }
 
        void use_playlist (Gtk::RadioMenuItem *item, boost::weak_ptr<ARDOUR::Playlist> wpl);