fix gcc4 builds C++98

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index d6aabaf229c4b7cd943efd8e944876801d154ad4..836f84901858d8ba8f4bc39c3699ce50efbeee93 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -35,8 +35,8 @@
 #include <gtkmm/notebook.h>
 #include <sigc++/signal.h>
 
+#include "evoral/Beats.hpp"
 #include "evoral/Note.hpp"
-#include "evoral/types.hpp"
 
 #include "pbd/statefuldestructible.h"
 
@@ -79,6 +79,7 @@ class PluginUIWindow;
 class RegionView;
 class RouteTimeAxisView;
 class Selection;
+class TempoCurve;
 class TempoMarker;
 class TimeAxisView;
 class TimeAxisViewItem;
@@ -198,6 +199,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
        virtual double sample_to_pixel (framepos_t frame) const = 0;
        virtual double sample_to_pixel_unrounded (framepos_t frame) const = 0;
        virtual Selection& get_selection () const = 0;
+       virtual bool get_selection_extents (framepos_t &start, framepos_t &end) const = 0;
        virtual Selection& get_cut_buffer () const = 0;
        virtual void track_mixer_selection () = 0;
        virtual bool extend_selection_to_track (TimeAxisView&) = 0;
@@ -211,6 +213,8 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
        virtual void set_show_measures (bool yn) = 0;
        virtual bool show_measures () const = 0;
        virtual void remove_tracks () = 0;
+       virtual void set_loop_range (framepos_t start, framepos_t end, std::string cmd) = 0;
+       virtual void set_punch_range (framepos_t start, framepos_t end, std::string cmd) = 0;
 
        virtual Editing::MouseMode effective_mouse_mode () const = 0;
 
@@ -293,6 +297,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
        virtual framecnt_t get_paste_offset (framepos_t pos, unsigned paste_count, framecnt_t duration) = 0;
        virtual unsigned get_grid_beat_divisions(framepos_t position) = 0;
        virtual Evoral::Beats get_grid_type_as_beats (bool& success, framepos_t position) = 0;
+       virtual unsigned get_grid_music_divisions (uint32_t event_state) = 0;
        virtual void edit_notes (MidiRegionView*) = 0;
 
        virtual void queue_visual_videotimeline_update () = 0;
@@ -319,7 +324,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
        Glib::RefPtr<Gtk::ActionGroup> editor_menu_actions;
        Glib::RefPtr<Gtk::ActionGroup> _region_actions;
 
-       virtual void reset_focus () = 0;
+       virtual void reset_focus (Gtk::Widget*) = 0;
 
        virtual bool canvas_scroll_event (GdkEventScroll* event, bool from_canvas) = 0;
        virtual bool canvas_control_point_event (GdkEvent* event, ArdourCanvas::Item*, ControlPoint*) = 0;
@@ -343,6 +348,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
        virtual bool canvas_marker_event (GdkEvent* event, ArdourCanvas::Item*, ArdourMarker*) = 0;
        virtual bool canvas_videotl_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
        virtual bool canvas_tempo_marker_event (GdkEvent* event, ArdourCanvas::Item*, TempoMarker*) = 0;
+       virtual bool canvas_tempo_curve_event (GdkEvent* event, ArdourCanvas::Item*, TempoCurve*) = 0;
        virtual bool canvas_meter_marker_event (GdkEvent* event, ArdourCanvas::Item*, MeterMarker*) = 0;
        virtual bool canvas_automation_track_event(GdkEvent* event, ArdourCanvas::Item*, AutomationTimeAxisView*) = 0;
 
@@ -387,6 +393,8 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
        virtual void abort_reversible_command () = 0;
        virtual void commit_reversible_command () = 0;
 
+       virtual void access_action (std::string,std::string) = 0;
+
        virtual MouseCursors const * cursors () const = 0;
        virtual VerboseCursor * verbose_cursor () const = 0;