Fix SNAFU on region trimming with grid enabled caused by my recent supposed fix.

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index ebd735e335ef439f346eb794c6730fe99cf487b9..38129be33b874fdb57a0e1fe022a116ab8dec367 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -390,7 +390,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void scroll_tracks_down_line ();
        void scroll_tracks_up_line ();
 
-       bool new_regionviews_display_gain () { return _new_regionviews_show_envelope; }
        void prepare_for_cleanup ();
        void finish_cleanup ();
 
@@ -1041,7 +1040,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void toggle_region_lock ();
        void toggle_region_opaque ();
        void toggle_record_enable ();
-       void set_region_lock_style (ARDOUR::Region::PositionLockStyle);
+       void toggle_region_lock_style ();
        void raise_region ();
        void raise_region_to_top ();
        void lower_region ();
@@ -1455,15 +1454,16 @@ public:
        void update_punch_range_view (bool visibility=false);
         void new_transport_marker_menu_popdown ();
        void marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
-       void tm_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
+       void tempo_or_meter_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void build_range_marker_menu (bool loop_or_punch);
        void build_marker_menu (bool);
-       void build_tm_marker_menu ();
+       void build_tempo_or_meter_marker_menu (bool);
        void build_new_transport_marker_menu ();
+       void dynamic_cast_marker_object (void*, MeterMarker**, TempoMarker**) const;
 
-       Gtk::Menu* tm_marker_menu;
+       Gtk::Menu* tempo_or_meter_marker_menu;
        Gtk::Menu* marker_menu;
        Gtk::Menu* session_range_marker_menu;
        Gtk::Menu* range_marker_menu;
@@ -1676,9 +1676,9 @@ public:
 
        /* trimming */
        void point_trim (GdkEvent *, nframes64_t);
-       void single_contents_trim (RegionView&, nframes64_t, bool, bool, bool);
-       void single_start_trim (RegionView&, nframes64_t, bool, bool, bool);
-       void single_end_trim (RegionView&, nframes64_t, bool, bool, bool);
+       void single_contents_trim (RegionView&, nframes64_t, bool, bool);
+       void single_start_trim (RegionView&, nframes64_t, bool);
+       void single_end_trim (RegionView&, nframes64_t, bool);
 
        void thaw_region_after_trim (RegionView& rv);
 
@@ -1922,8 +1922,6 @@ public:
        void ensure_track_visible (TimeAxisView*);
        gint left_automation_track ();
 
-       bool _new_regionviews_show_envelope;
-
        void reset_canvas_action_sensitivity (bool);
        void toggle_gain_envelope_visibility ();
        void toggle_gain_envelope_active ();