Merge with 2.0-ongoing R2988

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 62031bea64642cf38310a9d96334b5ee77855b76..5b4e54f4f66163b32b75e0a6a4f5eb0dcf06b407 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -107,6 +107,7 @@ class StreamView;
 class AudioStreamView;
 class ControlPoint;
 class SoundFileOmega;
+class RhythmFerret;
 #ifdef FFT_ANALYSIS
 class AnalysisWindow;
 #endif
@@ -371,6 +372,8 @@ class Editor : public PublicEditor
 
        void toggle_meter_updating();
 
+       void show_rhythm_ferret();
+
   protected:
        void map_transport_state ();
        void map_position_change (nframes_t);
@@ -1016,7 +1019,7 @@ class Editor : public PublicEditor
        void toggle_region_mute ();
        void toggle_region_lock ();
        void toggle_region_opaque ();
-       void toggle_region_position_lock ();
+       void set_region_lock_style (ARDOUR::Region::PositionLockStyle);
        void raise_region ();
        void raise_region_to_top ();
        void lower_region ();
@@ -1024,6 +1027,8 @@ class Editor : public PublicEditor
        void split_region ();
        void split_region_at (nframes_t);
        void split_regions_at (nframes_t, RegionSelection&);
+       void split_region_at_transients ();
+       void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&);
        void crop_region_to_selection ();
        void crop_region_to (nframes_t start, nframes_t end);
        void set_sync_point (nframes64_t, const RegionSelection&);
@@ -1048,8 +1053,16 @@ class Editor : public PublicEditor
        void reverse_region ();
        void normalize_region ();
        void denormalize_region ();
+       void adjust_region_scale_amplitude (bool up);
        void quantize_region ();
 
+       void tab_to_transient (bool forward);
+
+       void use_region_as_bar ();
+       void use_range_as_bar ();
+
+       void define_one_bar (nframes64_t start, nframes64_t end);
+
        void audition_region_from_region_list ();
        void hide_region_from_region_list ();
        void remove_region_from_region_list ();
@@ -1321,6 +1334,8 @@ class Editor : public PublicEditor
 
        void show_verbose_time_cursor (nframes_t frame, double offset = 0, double xpos=-1, double ypos=-1);
        void show_verbose_duration_cursor (nframes_t start, nframes_t end, double offset = 0, double xpos=-1, double ypos=-1);
+       double clamp_verbose_cursor_x (double);
+       double clamp_verbose_cursor_y (double);
 
        /* Canvas event handlers */
 
@@ -2163,6 +2178,8 @@ class Editor : public PublicEditor
 
        void select_next_route ();
        void select_prev_route ();
+
+       RhythmFerret* rhythm_ferret;
 };
 
 #endif /* __ardour_editor_h__ */