fix some thinkos with audio/midi port counting.

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 0274c404744da8ad8f72fd1a85b63438dda90601..519a714c79ce71969fe44b37d5dc7a7f3f34c282 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"
 
@@ -205,6 +205,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
        virtual void play_with_preroll () = 0;
        virtual void maybe_locate_with_edit_preroll (framepos_t location) = 0;
        virtual void goto_nth_marker (int nth) = 0;
+       virtual void trigger_script (int nth) = 0;
        virtual void add_location_from_playhead_cursor () = 0;
        virtual void remove_location_at_playhead_cursor () = 0;
        virtual void set_show_measures (bool yn) = 0;
@@ -318,7 +319,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;
@@ -386,6 +387,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;
 
@@ -422,8 +425,8 @@ class PublicEditor : public Gtkmm2ext::Tabbable {
        PBD::Signal0<void> SnapChanged;
        PBD::Signal0<void> MouseModeChanged;
 
-       Gtkmm2ext::Bindings  bindings;
-       
+       Gtkmm2ext::Bindings* bindings;
+
   protected:
        friend class DisplaySuspender;
        virtual void suspend_route_redisplay () = 0;