X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpublic_editor.h;h=b5d2cd7b6e65d52df90547a8cc30fcb37cbbfdfd;hb=e344f57a305d7f33f883cd18abcf22bd6ad39e27;hp=c0c32a9becb160d99bf8dde255d64c75db7ac669;hpb=664cec21359ba055243c3feaf47c6eb16fccbb3b;p=ardour.git

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index c0c32a9bec..b5d2cd7b6e 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -36,7 +36,6 @@
 #include <sigc++/signal.h>
 
 #include "evoral/types.hpp"
-#include "ardour/route_group.h"
 
 #include "pbd/statefuldestructible.h"
 
@@ -62,32 +61,31 @@ namespace Gtkmm2ext {
         class TearOff;
 }
 
-class Editor;
-class TimeAxisViewItem;
-class TimeAxisView;
-class PluginUIWindow;
-class PluginSelector;
-class PlaylistSelector;
-class XMLNode;
-class Selection;
+class AudioRegionView;
 class AutomationLine;
+class AutomationTimeAxisView;
 class ControlPoint;
-class SelectionRect;
-class CrossfadeView;
-class RouteTimeAxisView;
-class RegionView;
-class AudioRegionView;
-class TempoMarker;
-class MeterMarker;
+class DragManager;
+class Editor;
+class ImageFrameTimeAxis;
+class ImageFrameView;
 class Marker;
-class AutomationTimeAxisView;
 class MarkerTimeAxis;
-class ImageFrameView;
-class ImageFrameTimeAxis;
 class MarkerView;
-class DragManager;
+class MeterMarker;
 class MouseCursors;
+class PlaylistSelector;
+class PluginSelector;
+class PluginUIWindow;
+class RegionView;
+class RouteTimeAxisView;
+class Selection;
+class TempoMarker;
+class TimeAxisView;
+class TimeAxisViewItem;
 class VerboseCursor;
+class XMLNode;
+struct SelectionRect;
 
 using ARDOUR::framepos_t;
 using ARDOUR::framecnt_t;
@@ -204,6 +202,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual framepos_t unit_to_frame (double unit) const = 0;
 	virtual double frame_to_unit (framepos_t frame) const = 0;
 	virtual double frame_to_unit (double frame) const = 0;
+	virtual double frame_to_unit_unrounded (framepos_t frame) const = 0;
 	virtual framepos_t pixel_to_frame (double pixel) const = 0;
 	virtual gulong frame_to_pixel (framepos_t frame) const = 0;
 	virtual Selection& get_selection () const = 0;
@@ -275,6 +274,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual void remove_last_capture () = 0;
 	virtual void maximise_editing_space () = 0;
 	virtual void restore_editing_space () = 0;
+	virtual void update_tearoff_visibility () = 0;
 	virtual framepos_t get_preferred_edit_position (bool ignore_playhead = false, bool from_context_menu = false) = 0;
 	virtual void toggle_meter_updating() = 0;
 	virtual void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false) = 0;
@@ -305,6 +305,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
         static sigc::signal<void> DropDownKeys;
 
 	Glib::RefPtr<Gtk::ActionGroup> editor_actions;
+	Glib::RefPtr<Gtk::ActionGroup> editor_menu_actions;
 	Glib::RefPtr<Gtk::ActionGroup> _region_actions;
 
 	virtual void reset_focus () = 0;
@@ -314,7 +315,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual bool canvas_selection_rect_event (GdkEvent* event, ArdourCanvas::Item*, SelectionRect*) = 0;
 	virtual bool canvas_selection_start_trim_event (GdkEvent* event, ArdourCanvas::Item*, SelectionRect*) = 0;
 	virtual bool canvas_selection_end_trim_event (GdkEvent* event, ArdourCanvas::Item*, SelectionRect*) = 0;
-	virtual bool canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item*, CrossfadeView*) = 0;
+	virtual bool canvas_start_xfade_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*) = 0;
+	virtual bool canvas_end_xfade_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*) = 0;
 	virtual bool canvas_fade_in_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*) = 0;
 	virtual bool canvas_fade_in_handle_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*) = 0;
 	virtual bool canvas_fade_out_event (GdkEvent* event, ArdourCanvas::Item*, AudioRegionView*) = 0;